TMP commit

2 files changed, 26 insertions, 36 deletions

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/IPageManager.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/IPageManager.java
index 70634c2be42..800c2cc5bd4 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/IPageManager.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/IPageManager.java
@@ -1,6 +1,6 @@
 /*****************************************************************************

  * Copyright (c) 2013 CEA LIST.

- * 

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -14,6 +14,8 @@ package org.eclipse.papyrus.infra.core.sasheditor.contentprovider;
 

 import java.util.List;

 

+import org.eclipse.papyrus.infra.core.sasheditor.internal.SashWindowsContainer;

+

 

 /**

  * Interface providing method to manage pages in the Sash Windows system.

@@ -22,42 +24,23 @@ import java.util.List;
  * This interface provide basic access to the Sash Windows system.

  * It is intended to be used from the application in order to interact with the ContentProvider. Then,

  * the {@link SashWindowsContainer} will refresh its views.

- * 

- * 

+ *

+ *

  * @author dumoulin

  */

 public interface IPageManager extends IPageMngr {

 

 	/**

-	 * Add a Page identifier to the list of pages, do not open it.

-	 * 

-	 * @param page

-	 *        The object identifying the page to add. This object will be passed to the {@link IPageModelFactory#createIPageModel(EObject)}. This

-	 *        identifier is stored in the sash model.

-	 *        It should be a reference on a EMF object identifying the page.

-	 */

-	public void addPage(Object pageIdentifier);

-

-	/**

-	 * Remove the page from the SashWindows system and from the list of page.

-	 * The page will not be available anymore.

-	 * 

-	 * @param pageIdentifier

-	 *        The object identifying the page

-	 */

-	public void removePage(Object pageIdentifier);

-

-	/**

 	 * Close the page corresponding to the identifier.

 	 * The identifier is removed from the Sash Windows, but not from the list of pages.

-	 * 

+	 *

 	 * If the page is open more than once on the current Sash windows, only

 	 * one instance will be closed.

-	 * 

+	 *

 	 * @param pageIdentifier

 	 *        The object identifying the page

-	 * 

-	 * 

+	 *

+	 *

 	 * @see {@link #closeAllOpenedPages(Object)}

 	 */

 	public void closePage(Object pageIdentifier);

@@ -65,13 +48,13 @@ public interface IPageManager extends IPageMngr {
 

 	/**

 	 * Close all opened pages.

-	 * 

+	 *

 	 */

 	public void closeAllOpenedPages();

 

 	/**

 	 * Close all opened pages except the one provided as parameter.

-	 * 

+	 *

 	 * @param pageIdentifier

 	 */

 	public void closeOtherPages(Object pageIdentifier);

@@ -82,7 +65,7 @@ public interface IPageManager extends IPageMngr {
 	 * ask the {@link IPageModelFactory} to create the IPageModel. This later is then used to create the

 	 * SWT page.

 	 * If

-	 * 

+	 *

 	 * @param page

 	 *        The object identifying the page to add. This object will be passed to the {@link IPageModelFactory#createIPageModel(EObject)}. This

 	 *        identifier is stored in the sash model.

@@ -92,14 +75,14 @@ public interface IPageManager extends IPageMngr {
 

 	/**

 	 * Return all available page identifiers (open and closed pages).

-	 * 

+	 *

 	 * @return List of registered page identifiers.

 	 */

 	public List<Object> allPages();

 

 	/**

 	 * Return true if a page is open for the specified pageIdentifier.

-	 * 

+	 *

 	 * @param diagram

 	 * @return

 	 */

@@ -109,7 +92,7 @@ public interface IPageManager extends IPageMngr {
 	 * Remove all pages used to render the specified pageIndentifier.

 	 * If the pageIdentifier has more than one page rendering it, each of these

 	 * pages are closed.

-	 * 

+	 *

 	 * @param pageIdentifier

 	 */

 	public void closeAllOpenedPages(Object pageIdentifier);

@@ -117,14 +100,14 @@ public interface IPageManager extends IPageMngr {
 	/**

 	 * Select the first page used to render the specified pageIdentifier.

 	 * Do nothing if this page identifier is not rendered.

-	 * 

+	 *

 	 * @param pageIdentifier

 	 */

 	public void selectPage(Object pageIdentifier);

 

 	/**

 	 * Returns the active page identifier

-	 * 

+	 *

 	 * @return

 	 */

 	//	public Object getActivePage();

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/IPageMngr.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/IPageMngr.java
index 9c3d9fdfb5f..13c1ac7d409 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/IPageMngr.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/IPageMngr.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

- * Copyright (c) 2009 CEA LIST & LIFL 

+ * Copyright (c) 2009 CEA LIST & LIFL

+ *

  *

- *    

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -16,6 +16,8 @@ package org.eclipse.papyrus.infra.core.sasheditor.contentprovider;
 

 import java.util.List;

 

+import org.eclipse.papyrus.infra.core.sasheditor.internal.SashWindowsContainer;

+

 

 /**

  * Interface providing method to manage pages in the Sash Windows system.

@@ -40,7 +42,9 @@ public interface IPageMngr {
 	 *        The object identifying the page to add. This object will be passed to the {@link IPageModelFactory#createIPageModel(EObject)}. This

 	 *        identifier is stored in the sash model.

 	 *        It should be a reference on a EMF object identifying the page.

+	 * @deprecated The pages are now computed dynamically

 	 */

+	@Deprecated

 	public void addPage(Object pageIdentifier);

 

 	/**

@@ -49,7 +53,10 @@ public interface IPageMngr {
 	 * 

 	 * @param pageIdentifier

 	 *        The object identifying the page

+	 * 

+	 * @deprecated The pages are now computed dynamically

 	 */

+	@Deprecated

 	public void removePage(Object pageIdentifier);

 

 	/**