429239: [Resource Management] Refactoring of the 3-files model and

PageManager
https://bugs.eclipse.org/bugs/show_bug.cgi?id=429239

- Add support for DiModel and HistoryModel
- Deprecate the di.ecore PageList

12 files changed, 129 insertions, 92 deletions

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/META-INF/MANIFEST.MF b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/META-INF/MANIFEST.MF
index eb0ec07bd5b..6501e5b761d 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/META-INF/MANIFEST.MF
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.swt;bundle-version="3.5.0",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.0";visibility:=reexport,

+ org.eclipse.papyrus.infra.core.sasheditor;visibility:=reexport;bundle-version="1.0.0",

  org.eclipse.ui;bundle-version="3.6.0",

  org.eclipse.core.runtime;bundle-version="3.6.0",

  org.eclipse.emf.ecore,

@@ -21,7 +21,6 @@ Bundle-Version: 1.0.0.qualifier
 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.core.sasheditor.di;sing

- leton:=true

+Bundle-SymbolicName: org.eclipse.papyrus.infra.core.sasheditor.di;singleton:=true

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

 

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/model/di.ecore b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/model/di.ecore
index 58387547e11..bf8d06eb5e8 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/model/di.ecore
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/model/di.ecore
@@ -184,7 +184,7 @@
   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="SashWindowsMngr">

     <eStructuralFeatures xsi:type="ecore:EReference" name="pageList" ordered="false"

-        unique="false" lowerBound="1" eType="#//PageList" containment="true"/>

+        unique="false" eType="#//PageList" containment="true"/>

     <eStructuralFeatures xsi:type="ecore:EReference" name="sashModel" ordered="false"

         unique="false" lowerBound="1" eType="#//SashModel" containment="true"/>

   </eClassifiers>

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/plugin.xml b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/plugin.xml
index 392840484d8..bf5e305d70c 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/plugin.xml
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/plugin.xml
@@ -17,4 +17,11 @@
             genModel="model/sashwindowsdi.genmodel"/>

    </extension>

 

+   <extension point="org.eclipse.emf.ecore.extension_parser">

+      <!-- @generated sashwindowsdi -->

+      <parser

+            type="di"

+            class="org.eclipse.papyrus.infra.core.sashwindows.di.util.DiResourceFactoryImpl"/>

+   </extension>

+

 </plugin>

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/DiFactory.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/DiFactory.java
index 002acd1521d..13e91a30041 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/DiFactory.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/DiFactory.java
@@ -105,6 +105,7 @@ public interface DiFactory extends EFactory {
 	 * @return a new object of class '<em>Page List</em>'.

 	 * @generated

 	 */

+	@Deprecated

 	PageList createPageList();

 

 	/**

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/DiPackage.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/DiPackage.java
index 8b4363125ef..191ca2041f4 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/DiPackage.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/DiPackage.java
@@ -466,6 +466,7 @@ public interface DiPackage extends EPackage {
 	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getPageList()

 	 * @generated

 	 */

+	@Deprecated

 	int PAGE_LIST = 10;

 

 	/**

@@ -475,6 +476,7 @@ public interface DiPackage extends EPackage {
 	 * @generated

 	 * @ordered

 	 */

+	@Deprecated

 	int PAGE_LIST__AVAILABLE_PAGE = 0;

 

 	/**

@@ -878,6 +880,7 @@ public interface DiPackage extends EPackage {
 	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.PageList

 	 * @generated

 	 */

+	@Deprecated

 	EClass getPageList();

 

 	/**

@@ -889,6 +892,7 @@ public interface DiPackage extends EPackage {
 	 * @see #getPageList()

 	 * @generated

 	 */

+	@Deprecated

 	EReference getPageList_AvailablePage();

 

 	/**

@@ -910,6 +914,7 @@ public interface DiPackage extends EPackage {
 	 * @see #getSashWindowsMngr()

 	 * @generated

 	 */

+	@Deprecated

 	EReference getSashWindowsMngr_PageList();

 

 	/**

@@ -1247,6 +1252,7 @@ public interface DiPackage extends EPackage {
 		 * @see org.eclipse.papyrus.infra.core.sashwindows.di.impl.DiPackageImpl#getPageList()

 		 * @generated

 		 */

+		@Deprecated

 		EClass PAGE_LIST = eINSTANCE.getPageList();

 

 		/**

@@ -1255,6 +1261,7 @@ public interface DiPackage extends EPackage {
 		 * <!-- end-user-doc -->

 		 * @generated

 		 */

+		@Deprecated

 		EReference PAGE_LIST__AVAILABLE_PAGE = eINSTANCE.getPageList_AvailablePage();

 

 		/**

@@ -1273,6 +1280,7 @@ public interface DiPackage extends EPackage {
 		 * <!-- end-user-doc -->

 		 * @generated

 		 */

+		@Deprecated

 		EReference SASH_WINDOWS_MNGR__PAGE_LIST = eINSTANCE.getSashWindowsMngr_PageList();

 

 		/**

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/PageList.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/PageList.java
index e0badfc16f4..7181b5abc16 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/PageList.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/PageList.java
@@ -25,6 +25,7 @@ import org.eclipse.emf.ecore.EObject;
  * @model

  * @generated

  */

+@Deprecated

 public interface PageList extends EObject {

 

 	/**

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/SashWindowsMngr.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/SashWindowsMngr.java
index cc3b34c10f5..717976c0b5c 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/SashWindowsMngr.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/SashWindowsMngr.java
@@ -12,7 +12,7 @@ import org.eclipse.emf.ecore.EObject;
  * <!-- begin-user-doc -->

  * A representation of the model object '<em><b>Sash Windows Mngr</b></em>'.

  * <!-- end-user-doc -->

- * 

+ *

  * <p>

  * The following features are supported:

  * <ul>

@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.EObject;
  * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr#getSashModel <em>Sash Model</em>}</li>

  * </ul>

  * </p>

- * 

+ *

  * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getSashWindowsMngr()

  * @model

  * @generated

@@ -34,11 +34,11 @@ public interface SashWindowsMngr extends EObject {
 	 * If the meaning of the '<em>Page List</em>' containment reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Page List</em>' containment reference.

 	 * @see #setPageList(PageList)

 	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getSashWindowsMngr_PageList()

-	 * @model containment="true" required="true" ordered="false"

+	 * @model containment="true" ordered="false"

 	 * @generated

 	 */

 	@Deprecated

@@ -49,7 +49,7 @@ public interface SashWindowsMngr extends EObject {
 	 * reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param value

 	 *        the new value of the '<em>Page List</em>' containment reference.

 	 * @see #getPageList()

@@ -65,7 +65,7 @@ public interface SashWindowsMngr extends EObject {
 	 * If the meaning of the '<em>Sash Model</em>' containment reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @return the value of the '<em>Sash Model</em>' containment reference.

 	 * @see #setSashModel(SashModel)

 	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getSashWindowsMngr_SashModel()

@@ -79,7 +79,7 @@ public interface SashWindowsMngr extends EObject {
 	 * reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @param value

 	 *        the new value of the '<em>Sash Model</em>' containment reference.

 	 * @see #getSashModel()

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/DiFactoryImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/DiFactoryImpl.java
index 722a16dabd8..2499d2b7291 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/DiFactoryImpl.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/DiFactoryImpl.java
@@ -42,7 +42,7 @@ public class DiFactoryImpl extends EFactoryImpl implements DiFactory {
 	 */

 	public static DiFactory init() {

 		try {

-			DiFactory theDiFactory = (DiFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/papyrus/0.7.0/sashdi"); 

+			DiFactory theDiFactory = (DiFactory)EPackage.Registry.INSTANCE.getEFactory(DiPackage.eNS_URI);

 			if (theDiFactory != null) {

 				return theDiFactory;

 			}

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/DiPackageImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/DiPackageImpl.java
index aa324aa7bc8..359f2a89292 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/DiPackageImpl.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/DiPackageImpl.java
@@ -788,7 +788,7 @@ public class DiPackageImpl extends EPackageImpl implements DiPackage {
 		addEParameter(op, this.getJavaObject(), "pageIdentifier", 1, 1, IS_UNIQUE, !IS_ORDERED);

 

 		initEClass(sashWindowsMngrEClass, SashWindowsMngr.class, "SashWindowsMngr", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getSashWindowsMngr_PageList(), this.getPageList(), null, "pageList", null, 1, 1, SashWindowsMngr.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

+		initEReference(getSashWindowsMngr_PageList(), this.getPageList(), null, "pageList", null, 0, 1, SashWindowsMngr.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

 		initEReference(getSashWindowsMngr_SashModel(), this.getSashModel(), null, "sashModel", null, 1, 1, SashWindowsMngr.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

 

 		// Initialize data types

@@ -812,12 +812,12 @@ public class DiPackageImpl extends EPackageImpl implements DiPackage {
 	 * @generated

 	 */

 	protected void createResourceXMIAnnotations() {

-		String source = "resource=XMI";		

+		String source = "resource=XMI";	

 		addAnnotation

 		  (this, 

 		   source, 

 		   new String[] {

-		   });											

+		   });

 	}

 

 } //DiPackageImpl

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/PageRefImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/PageRefImpl.java
index b7b9ea3f30a..c8cdc379a20 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/PageRefImpl.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/PageRefImpl.java
@@ -31,7 +31,7 @@ import org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder;
  * <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.PageRefImpl#getParent <em>Parent</em>}</li>

  * </ul>

  * </p>

- * 

+ *

  * @generated

  */

 public class PageRefImpl extends EObjectImpl implements PageRef {

@@ -40,7 +40,7 @@ public class PageRefImpl extends EObjectImpl implements PageRef {
 	 * The cached value of the '{@link #getEmfPageIdentifier() <em>Emf Page Identifier</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #getEmfPageIdentifier()

 	 * @generated

 	 * @ordered

@@ -51,7 +51,7 @@ public class PageRefImpl extends EObjectImpl implements PageRef {
 	 * The default value of the '{@link #getPageIdentifier() <em>Page Identifier</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #getPageIdentifier()

 	 * @generated

 	 * @ordered

@@ -62,7 +62,7 @@ public class PageRefImpl extends EObjectImpl implements PageRef {
 	 * The default value of the '{@link #getObjectPageIdentifier() <em>Object Page Identifier</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #getObjectPageIdentifier()

 	 * @generated

 	 * @ordered

@@ -73,7 +73,7 @@ public class PageRefImpl extends EObjectImpl implements PageRef {
 	 * The cached value of the '{@link #getObjectPageIdentifier() <em>Object Page Identifier</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @see #getObjectPageIdentifier()

 	 * @generated

 	 * @ordered

@@ -83,7 +83,7 @@ public class PageRefImpl extends EObjectImpl implements PageRef {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	protected PageRefImpl() {

@@ -93,7 +93,7 @@ public class PageRefImpl extends EObjectImpl implements PageRef {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -104,9 +104,10 @@ public class PageRefImpl extends EObjectImpl implements PageRef {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

+	@Override

 	public EObject getEmfPageIdentifier() {

 		if(emfPageIdentifier != null && emfPageIdentifier.eIsProxy()) {

 			InternalEObject oldEmfPageIdentifier = (InternalEObject)emfPageIdentifier;

@@ -123,7 +124,7 @@ public class PageRefImpl extends EObjectImpl implements PageRef {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public EObject basicGetEmfPageIdentifier() {

@@ -133,9 +134,10 @@ public class PageRefImpl extends EObjectImpl implements PageRef {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

+	@Override

 	public void setEmfPageIdentifier(EObject newEmfPageIdentifier) {

 		EObject oldEmfPageIdentifier = emfPageIdentifier;

 		emfPageIdentifier = newEmfPageIdentifier;

@@ -147,9 +149,10 @@ public class PageRefImpl extends EObjectImpl implements PageRef {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated NOT

 	 */

+	@Override

 	public Object getPageIdentifier() {

 		Object res = getEmfPageIdentifier();

 

@@ -163,9 +166,10 @@ public class PageRefImpl extends EObjectImpl implements PageRef {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated NOT

 	 */

+	@Override

 	public boolean isForIdentifier(Object pageIdentifier) {

 		//Avoid npe when there is an invalid "availablePage". See Bug 398712: Multiple issues with the PageManager

 		if(getPageIdentifier() == null) {

@@ -177,7 +181,7 @@ public class PageRefImpl extends EObjectImpl implements PageRef {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -195,7 +199,7 @@ public class PageRefImpl extends EObjectImpl implements PageRef {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -210,7 +214,7 @@ public class PageRefImpl extends EObjectImpl implements PageRef {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -225,7 +229,7 @@ public class PageRefImpl extends EObjectImpl implements PageRef {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -249,7 +253,7 @@ public class PageRefImpl extends EObjectImpl implements PageRef {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -274,7 +278,7 @@ public class PageRefImpl extends EObjectImpl implements PageRef {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -299,7 +303,7 @@ public class PageRefImpl extends EObjectImpl implements PageRef {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -320,7 +324,7 @@ public class PageRefImpl extends EObjectImpl implements PageRef {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	@Override

@@ -339,9 +343,10 @@ public class PageRefImpl extends EObjectImpl implements PageRef {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated NOT

 	 */

+	@Override

 	public void setPageIdentifier(Object newPageIdentifier) {

 

 		if(newPageIdentifier instanceof EObject) {

@@ -362,9 +367,10 @@ public class PageRefImpl extends EObjectImpl implements PageRef {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

+	@Override

 	public Object getObjectPageIdentifier() {

 		return objectPageIdentifier;

 	}

@@ -372,9 +378,10 @@ public class PageRefImpl extends EObjectImpl implements PageRef {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

+	@Override

 	public void setObjectPageIdentifier(Object newObjectPageIdentifier) {

 		Object oldObjectPageIdentifier = objectPageIdentifier;

 		objectPageIdentifier = newObjectPageIdentifier;

@@ -386,9 +393,10 @@ public class PageRefImpl extends EObjectImpl implements PageRef {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

+	@Override

 	public TabFolder getParent() {

 		if(eContainerFeatureID() != DiPackage.PAGE_REF__PARENT) {

 			return null;

@@ -399,7 +407,7 @@ public class PageRefImpl extends EObjectImpl implements PageRef {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

 	public NotificationChain basicSetParent(TabFolder newParent, NotificationChain msgs) {

@@ -410,9 +418,10 @@ public class PageRefImpl extends EObjectImpl implements PageRef {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated

 	 */

+	@Override

 	public void setParent(TabFolder newParent) {

 		if(newParent != eInternalContainer() || (eContainerFeatureID() != DiPackage.PAGE_REF__PARENT && newParent != null)) {

 			if(EcoreUtil.isAncestor(this, newParent)) {

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/SashModelImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/SashModelImpl.java
index 56c4f4f25d0..06db7cf5740 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/SashModelImpl.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/impl/SashModelImpl.java
@@ -95,6 +95,7 @@ public class SashModelImpl extends EObjectImpl implements SashModel {
 	 * 

 	 * @generated

 	 */

+	@Override

 	public EList<Window> getWindows() {

 		if(windows == null) {

 			windows = new EObjectContainmentEList<Window>(Window.class, this, DiPackage.SASH_MODEL__WINDOWS);

@@ -108,6 +109,7 @@ public class SashModelImpl extends EObjectImpl implements SashModel {
 	 * 

 	 * @generated

 	 */

+	@Override

 	public TabFolder getCurrentSelection() {

 		if(currentSelection != null && currentSelection.eIsProxy()) {

 			InternalEObject oldCurrentSelection = (InternalEObject)currentSelection;

@@ -137,6 +139,7 @@ public class SashModelImpl extends EObjectImpl implements SashModel {
 	 * 

 	 * @generated

 	 */

+	@Override

 	public void setCurrentSelection(TabFolder newCurrentSelection) {

 		TabFolder oldCurrentSelection = currentSelection;

 		currentSelection = newCurrentSelection;

@@ -148,9 +151,10 @@ public class SashModelImpl extends EObjectImpl implements SashModel {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated NOT

 	 */

+	@Override

 	public void addPage(Object pageIdentifier) {

 		getCurrentSelection().addPage(pageIdentifier);

 	}

@@ -158,9 +162,10 @@ public class SashModelImpl extends EObjectImpl implements SashModel {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated NOT

 	 */

+	@Override

 	public void addPage(TabFolder folder, Object pageIdentifier) {

 		//		if(folder==null) {

 		//			// Use first folder

@@ -172,19 +177,20 @@ public class SashModelImpl extends EObjectImpl implements SashModel {
 	/**

 	 * Get the first folder in the model.

 	 * Return null if no folder exist.

-	 * 

+	 *

 	 * @return

 	 */

 	//	public TabFolder getFirstFolder() {

-	//		

+	//

 	//	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated NOT

 	 */

+	@Override

 	public void removePage(Object pageIdentifier) {

 		PageRef pageRef = lookupPage(pageIdentifier);

 		if(pageRef == null) {

@@ -200,9 +206,10 @@ public class SashModelImpl extends EObjectImpl implements SashModel {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated NOT

 	 */

+	@Override

 	public void removePageAndEmptyFolder(Object pageIdentifier) {

 		PageRef pageRef;

 

@@ -220,9 +227,10 @@ public class SashModelImpl extends EObjectImpl implements SashModel {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated NOT

 	 */

+	@Override

 	public void setCurrentSelectionSilently(TabFolder selection) {

 		currentSelection = selection;

 	}

@@ -230,9 +238,10 @@ public class SashModelImpl extends EObjectImpl implements SashModel {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated NOT

 	 */

+	@Override

 	public PageRef lookupPage(final Object pageIdentifier) {

 

 		// Create appropriate visitor.

@@ -240,9 +249,9 @@ public class SashModelImpl extends EObjectImpl implements SashModel {
 

 			/**

 			 * Iterate over windows

-			 * 

+			 *

 			 * @see org.eclipse.papyrus.infra.core.sashwindows.di.util.DiSwitch#caseSashModel(org.eclipse.papyrus.infra.core.sashwindows.di.SashModel)

-			 * 

+			 *

 			 * @param object

 			 * @return

 			 */

@@ -260,9 +269,9 @@ public class SashModelImpl extends EObjectImpl implements SashModel {
 			}

 

 			/**

-			 * 

+			 *

 			 * @see org.eclipse.papyrus.infra.core.sashwindows.di.util.DiSwitch#caseWindow(org.eclipse.papyrus.infra.core.sashwindows.di.Window)

-			 * 

+			 *

 			 * @param object

 			 * @return

 			 */

@@ -285,9 +294,9 @@ public class SashModelImpl extends EObjectImpl implements SashModel {
 

 			/**

 			 * Iterate over children

-			 * 

+			 *

 			 * @see org.eclipse.papyrus.infra.core.sashwindows.di.util.DiSwitch#caseSashPanel(org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel)

-			 * 

+			 *

 			 * @param object

 			 * @return

 			 */

@@ -306,9 +315,9 @@ public class SashModelImpl extends EObjectImpl implements SashModel {
 

 			/**

 			 * Iterate over PageRef

-			 * 

+			 *

 			 * @see org.eclipse.papyrus.infra.core.sashwindows.di.util.DiSwitch#caseTabFolder(org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder)

-			 * 

+			 *

 			 * @param object

 			 * @return

 			 */

@@ -336,9 +345,10 @@ public class SashModelImpl extends EObjectImpl implements SashModel {
 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * TODO Add method to metamodel

-	 * 

+	 *

 	 * @generated NOT

 	 */

+	@Override

 	public TabFolder lookupFirstFolder() {

 

 		// Create appropriate visitor.

@@ -346,9 +356,9 @@ public class SashModelImpl extends EObjectImpl implements SashModel {
 

 			/**

 			 * Iterate over windows

-			 * 

+			 *

 			 * @see org.eclipse.papyrus.infra.core.sashwindows.di.util.DiSwitch#caseSashModel(org.eclipse.papyrus.infra.core.sashwindows.di.SashModel)

-			 * 

+			 *

 			 * @param object

 			 * @return

 			 */

@@ -366,9 +376,9 @@ public class SashModelImpl extends EObjectImpl implements SashModel {
 			}

 

 			/**

-			 * 

+			 *

 			 * @see org.eclipse.papyrus.infra.core.sashwindows.di.util.DiSwitch#caseWindow(org.eclipse.papyrus.infra.core.sashwindows.di.Window)

-			 * 

+			 *

 			 * @param object

 			 * @return

 			 */

@@ -391,9 +401,9 @@ public class SashModelImpl extends EObjectImpl implements SashModel {
 

 			/**

 			 * Iterate over children

-			 * 

+			 *

 			 * @see org.eclipse.papyrus.infra.core.sashwindows.di.util.DiSwitch#caseSashPanel(org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel)

-			 * 

+			 *

 			 * @param object

 			 * @return

 			 */

@@ -412,9 +422,9 @@ public class SashModelImpl extends EObjectImpl implements SashModel {
 

 			/**

 			 * Iterate over PageRef

-			 * 

+			 *

 			 * @see org.eclipse.papyrus.infra.core.sashwindows.di.util.DiSwitch#caseTabFolder(org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder)

-			 * 

+			 *

 			 * @param object

 			 * @return

 			 */

@@ -435,9 +445,10 @@ public class SashModelImpl extends EObjectImpl implements SashModel {
 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * TODO Add method to metamodel

-	 * 

+	 *

 	 * @generated NOT

 	 */

+	@Override

 	public Window lookupFirstWindow() {

 

 		List<Window> list = getWindows();

@@ -451,9 +462,10 @@ public class SashModelImpl extends EObjectImpl implements SashModel {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated NOT

 	 */

+	@Override

 	public void movePage(TabFolder srcParentFolder, int srcIndex, TabFolder targetParentFolder, int targetIndex) {

 

 

@@ -492,9 +504,10 @@ public class SashModelImpl extends EObjectImpl implements SashModel {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated NOT

 	 */

+	@Override

 	public void insertFolder(TabFolder folderToInsert, TabFolder refFolder, int side) {

 

 		// Get the parent under which the sash will be inserted

@@ -526,9 +539,10 @@ public class SashModelImpl extends EObjectImpl implements SashModel {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated NOT

 	 */

+	@Override

 	public void movePage(TabFolder srcParentFolder, int srcIndex, TabFolder targetParentFolder) {

 

 		// Check if we move all pages of srcFolder

@@ -553,9 +567,10 @@ public class SashModelImpl extends EObjectImpl implements SashModel {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated NOT

 	 */

+	@Override

 	public void removeEmptyFolder(TabFolder folder) {

 

 		EList<PageRef> children = folder.getChildren();

@@ -582,9 +597,10 @@ public class SashModelImpl extends EObjectImpl implements SashModel {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated NOT

 	 */

+	@Override

 	public void removeAllPages() {

 

 		// Get a the first window and a folder.

@@ -600,9 +616,10 @@ public class SashModelImpl extends EObjectImpl implements SashModel {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

+	 *

 	 * @generated NOT

 	 */

+	@Override

 	public void removeOtherPages(Object pageIdentifier) {

 		// Get a the first window and a folder.

 		// Clear the folder and set it as the root folder.

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/util/DiUtils.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/util/DiUtils.java
index b776f59cce9..816db00fe3a 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/util/DiUtils.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/util/DiUtils.java
@@ -28,7 +28,7 @@ import org.eclipse.papyrus.infra.core.sashwindows.di.exception.SashEditorExcepti
 

 /**

  * Set of utility methods

- *

+ * 

  * @author dumoulin

  */

 public class DiUtils {

@@ -36,7 +36,7 @@ public class DiUtils {
 	/**

 	 * Create a default SashModel with one window and one folder.

 	 * Set the current folder.

-	 *

+	 * 

 	 * @param diResource

 	 * @return

 	 */

@@ -58,7 +58,7 @@ public class DiUtils {
 	/**

 	 * Create a default SashWindowsMngr with one PageLit and one default SashModel.

 	 * Set the current folder.

-	 *

+	 * 

 	 * @param diResource

 	 * @return

 	 */

@@ -76,7 +76,7 @@ public class DiUtils {
 

 	/**

 	 * Lookup for the SashModel object in the resource.

-	 *

+	 * 

 	 * @param diResource

 	 * @return The {@link DiSashModel} or null if not found.

 	 */

@@ -92,15 +92,15 @@ public class DiUtils {
 

 	/**

 	 * Gets the page reference of the specified eObject

-	 *

+	 * 

 	 * @param diResource

 	 * @param eObject

-	 *

+	 * 

 	 * @return the page ref of eObject, null if not found

 	 *         TODO This method use too low level mechanism for its implementation. Consider to move it in a

 	 *         more appropriate class. Furthermore, some similar methods already exist. Can't we use them

 	 *         instead ?

-	 * 

+	 *

 	 * @deprecated Should use IPageMngr instead.

 	 */

 	@Deprecated

@@ -121,7 +121,7 @@ public class DiUtils {
 

 	/**

 	 * Adds page to the page list of the sash windows manager

-	 *

+	 * 

 	 * @param diResource

 	 * @param pageRef

 	 * @throws SashEditorException

@@ -132,41 +132,36 @@ public class DiUtils {
 	 */

 	@Deprecated

 	static public void addPageToPageList(Resource diResource, PageRef pageRef) throws SashEditorException {

-		SashWindowsMngr windowsMngr = lookupSashWindowsMngr(diResource);

-		addPageToPageList(windowsMngr, pageRef);

+		//Do nothing. The page list is not used anymore

 	}

 

 	/**

 	 * Adds page to the page list of the sash windows manager.

-	 *

+	 * 

 	 * @param pageRef

 	 * @param windowsMngr

 	 * @throws SashEditorException

 	 *         TODO This method use too low level mechanism for its implementation. Consider to move it in a

 	 *         more appropriate class. Furthermore, some similar methods already exist. Can't we use them

 	 *         instead ?

-	 * 

+	 *

 	 * @deprecated Should use IPageMngr instead.

 	 */

 	@Deprecated

 	static public void addPageToPageList(SashWindowsMngr windowsMngr, PageRef pageRef) throws SashEditorException {

-		if(windowsMngr != null && windowsMngr.getPageList() != null) {

-			windowsMngr.getPageList().addPage(pageRef.getPageIdentifier());

-		} else {

-			throw new SashEditorException("Unable to add the page to the windows manager");

-		}

+		//Do nothing. The page list is not used anymore

 	}

 

 	/**

 	 * Adds page to tab folder.

-	 *

+	 * 

 	 * @param windowsMngr

 	 * @param pageRef

 	 * @throws SashEditorException

 	 *         TODO This method use too low level mechanism for its implementation. Consider to move it in a

 	 *         more appropriate class. Furthermore, some similar methods already exist. Can't we use them

 	 *         instead ?

-	 * 

+	 *

 	 * @deprecated Should use IPageMngr instead.

 	 */

 	@Deprecated