Bug 541346: [Welcome Page] Remove the generation of the cache adapter method in the welcome page framework

Change-Id: Ie313bb4256532dbfbedbebef73ee4760160587c5
Signed-off-by: Vincent Lorenzo <vincent.lorenzo@cea.fr>

16 files changed, 42 insertions, 141 deletions

diff --git a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/META-INF/MANIFEST.MF b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/META-INF/MANIFEST.MF
index 88a2872fda5..71104403bd5 100644
--- a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/META-INF/MANIFEST.MF
+++ b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/META-INF/MANIFEST.MF
@@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.uml2.types;bundle-version="[2.0.0,3.0.0)";visibility
  org.eclipse.papyrus.infra.properties.ui;bundle-version="[3.0.0,4.0.0)"
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy;exclude:="org.eclipse.papyrus.infra.editor.welcome.internal.constraints"
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.100.qualifier
 Bundle-ClassPath: .
 Bundle-Localization: plugin
 Bundle-Name: %pluginName
diff --git a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/model/welcome.genmodel b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/model/welcome.genmodel
index d216dcd4d5a..9e206c10fc7 100644
--- a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/model/welcome.genmodel
+++ b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/model/welcome.genmodel
@@ -7,9 +7,9 @@
     modelName="Welcome" nonNLSMarkers="true" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
     codeFormatting="true" commentFormatting="true" testsDirectory="/org.eclipse.papyrus.infra.editor.welcome.tests/src-gen"
     importerID="org.eclipse.uml2.uml.ecore.importer" complianceLevel="8.0" copyrightFields="false"
-    usedGenPackages="../../org.eclipse.uml2.types/model/Types.genmodel#//types"
-    operationReflection="true" importOrganizing="true" cleanup="true" factoryMethods="true"
-    pluralizedGetters="true" cacheAdapterSupport="true" invariantPrefix="">
+    usedGenPackages="../../org.eclipse.uml2.types/model/Types.genmodel#//types" operationReflection="true"
+    importOrganizing="true" cleanup="true" factoryMethods="true" pluralizedGetters="true"
+    invariantPrefix="">
   <genAnnotations source="http://www.eclipse.org/emf/2002/GenModel/importer/org.eclipse.uml2.uml.ecore.importer">
     <details key="OPPOSITE_ROLE_NAMES" value="IGNORE"/>
     <details key="DUPLICATE_FEATURES" value="DISCARD"/>
diff --git a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/plugin.xml b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/plugin.xml
index c3228fec61c..72ed689face 100644
--- a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/plugin.xml
+++ b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/plugin.xml
@@ -155,26 +155,6 @@
             name="%prefpage.welcome.name">
       </page>
    </extension>
-   <extension
-         point="org.eclipse.papyrus.infra.properties.contexts">
-      <context
-            contextModel="model/general/general.ctx">
-      </context>
-   </extension>
-   <extension
-         point="org.eclipse.papyrus.infra.properties.ui.context">
-      <preferencePageBinding
-            context="welcome-general"
-            page="org.eclipse.papyrus.infra.editor.welcome.content">
-      </preferencePageBinding>
-   </extension>
-   <extension
-         point="org.eclipse.papyrus.infra.properties.environments">
-      <environment
-            environmentModel="model/environment.xmi">
-      </environment>
-   </extension>
-
    <extension point="org.eclipse.emf.ecore.generated_package">
       <!-- @generated welcome -->
       <package
diff --git a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/pom.xml b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/pom.xml
index 5a2aed3131c..9fc9ba9ca02 100644
--- a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/pom.xml
+++ b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/pom.xml
@@ -1,11 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.infra-editor</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
+		<groupId>org.eclipse.papyrus</groupId>
+		<artifactId>org.eclipse.papyrus.infra-editor</artifactId>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.editor.welcome</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
+	<version>2.0.100-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src-gen/org/eclipse/papyrus/infra/editor/welcome/SashColumn.java b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src-gen/org/eclipse/papyrus/infra/editor/welcome/SashColumn.java
index da2a410b8e3..d57bfe29371 100644
--- a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src-gen/org/eclipse/papyrus/infra/editor/welcome/SashColumn.java
+++ b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src-gen/org/eclipse/papyrus/infra/editor/welcome/SashColumn.java
@@ -62,7 +62,7 @@ public interface SashColumn extends EObject {
 	 * <!-- end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>X</em>' attribute.
+	 *                  the new value of the '<em>X</em>' attribute.
 	 * @see #isSetX()
 	 * @see #unsetX()
 	 * @see #getX()
@@ -150,7 +150,7 @@ public interface SashColumn extends EObject {
 	 * <!-- end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Page</em>' container reference.
+	 *                  the new value of the '<em>Page</em>' container reference.
 	 * @see #getPage()
 	 * @generated
 	 */
diff --git a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src-gen/org/eclipse/papyrus/infra/editor/welcome/SashRow.java b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src-gen/org/eclipse/papyrus/infra/editor/welcome/SashRow.java
index b28dfe49533..7b53f098b51 100644
--- a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src-gen/org/eclipse/papyrus/infra/editor/welcome/SashRow.java
+++ b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src-gen/org/eclipse/papyrus/infra/editor/welcome/SashRow.java
@@ -60,7 +60,7 @@ public interface SashRow extends EObject {
 	 * <!-- end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Y</em>' attribute.
+	 *                  the new value of the '<em>Y</em>' attribute.
 	 * @see #isSetY()
 	 * @see #unsetY()
 	 * @see #getY()
@@ -116,7 +116,7 @@ public interface SashRow extends EObject {
 	 * <!-- end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Page</em>' reference.
+	 *                  the new value of the '<em>Page</em>' reference.
 	 * @see #getPage()
 	 * @generated
 	 */
@@ -147,7 +147,7 @@ public interface SashRow extends EObject {
 	 * <!-- end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Column</em>' container reference.
+	 *                  the new value of the '<em>Column</em>' container reference.
 	 * @see #getColumn()
 	 * @generated
 	 */
diff --git a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src-gen/org/eclipse/papyrus/infra/editor/welcome/Welcome.java b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src-gen/org/eclipse/papyrus/infra/editor/welcome/Welcome.java
index bf294efba77..b60f274dcd1 100644
--- a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src-gen/org/eclipse/papyrus/infra/editor/welcome/Welcome.java
+++ b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src-gen/org/eclipse/papyrus/infra/editor/welcome/Welcome.java
@@ -57,7 +57,7 @@ public interface Welcome extends EObject {
 	 * <!-- end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Welcome Page</em>' containment reference.
+	 *                  the new value of the '<em>Welcome Page</em>' containment reference.
 	 * @see #getWelcomePage()
 	 * @generated
 	 */
diff --git a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src-gen/org/eclipse/papyrus/infra/editor/welcome/WelcomeSection.java b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src-gen/org/eclipse/papyrus/infra/editor/welcome/WelcomeSection.java
index a5a490efea6..1c4fc9ba09c 100644
--- a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src-gen/org/eclipse/papyrus/infra/editor/welcome/WelcomeSection.java
+++ b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src-gen/org/eclipse/papyrus/infra/editor/welcome/WelcomeSection.java
@@ -76,7 +76,7 @@ public interface WelcomeSection extends EObject {
 	 * <!-- end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Hidden</em>' attribute.
+	 *                  the new value of the '<em>Hidden</em>' attribute.
 	 * @see #isHidden()
 	 * @generated
 	 */
@@ -107,7 +107,7 @@ public interface WelcomeSection extends EObject {
 	 * <!-- end-user-doc -->
 	 *
 	 * @param value
-	 *            the new value of the '<em>Page</em>' container reference.
+	 *                  the new value of the '<em>Page</em>' container reference.
 	 * @see #getPage()
 	 * @generated
 	 */
diff --git a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src-gen/org/eclipse/papyrus/infra/editor/welcome/internal/impl/SashColumnImpl.java b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src-gen/org/eclipse/papyrus/infra/editor/welcome/internal/impl/SashColumnImpl.java
index 0bfa1b087e9..f2a35361c92 100644
--- a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src-gen/org/eclipse/papyrus/infra/editor/welcome/internal/impl/SashColumnImpl.java
+++ b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src-gen/org/eclipse/papyrus/infra/editor/welcome/internal/impl/SashColumnImpl.java
@@ -41,8 +41,6 @@ import org.eclipse.papyrus.infra.editor.welcome.WelcomePage;
 
 import org.eclipse.papyrus.infra.editor.welcome.internal.operations.SashColumnOperations;
 
-import org.eclipse.uml2.common.util.CacheAdapter;
-
 /**
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Sash Column</b></em>'.
@@ -188,7 +186,7 @@ public class SashColumnImpl extends MinimalEObjectImpl.Container implements Sash
 	@Override
 	public EList<SashRow> getSashRows() {
 		if (sashRows == null) {
-			sashRows = new EObjectContainmentWithInverseEList<SashRow>(SashRow.class, this, WelcomePackage.SASH_COLUMN__SASH_ROW, WelcomePackage.SASH_ROW__COLUMN);
+			sashRows = new EObjectContainmentWithInverseEList<>(SashRow.class, this, WelcomePackage.SASH_COLUMN__SASH_ROW, WelcomePackage.SASH_ROW__COLUMN);
 		}
 		return sashRows;
 	}
@@ -240,8 +238,7 @@ public class SashColumnImpl extends MinimalEObjectImpl.Container implements Sash
 	@Override
 	public void setPage(WelcomePage newPage) {
 		if (newPage != eInternalContainer() || (eContainerFeatureID() != WelcomePackage.SASH_COLUMN__PAGE && newPage != null)) {
-			if (EcoreUtil.isAncestor(this, newPage))
-			 {
+			if (EcoreUtil.isAncestor(this, newPage)) {
 				throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); //$NON-NLS-1$
 			}
 			NotificationChain msgs = null;
@@ -435,12 +432,11 @@ public class SashColumnImpl extends MinimalEObjectImpl.Container implements Sash
 			return super.toString();
 		}
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (x: "); //$NON-NLS-1$
 		if (xESet) {
 			result.append(x);
-		}
-		else {
+		} else {
 			result.append("<unset>"); //$NON-NLS-1$
 		}
 		result.append(')');
@@ -461,16 +457,4 @@ public class SashColumnImpl extends MinimalEObjectImpl.Container implements Sash
 		return EcoreUtil.create(eClass);
 	}
 
-	/**
-	 * Retrieves the cache adapter for this '<em><b>Sash Column</b></em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return The cache adapter for this '<em><b>Sash Column</b></em>'.
-	 * @generated
-	 */
-	protected CacheAdapter getCacheAdapter() {
-		return CacheAdapter.getCacheAdapter(this);
-	}
-
 } // SashColumnImpl
diff --git a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src-gen/org/eclipse/papyrus/infra/editor/welcome/internal/impl/SashRowImpl.java b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src-gen/org/eclipse/papyrus/infra/editor/welcome/internal/impl/SashRowImpl.java
index 736b10d2f2a..ebda97b21a7 100644
--- a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src-gen/org/eclipse/papyrus/infra/editor/welcome/internal/impl/SashRowImpl.java
+++ b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src-gen/org/eclipse/papyrus/infra/editor/welcome/internal/impl/SashRowImpl.java
@@ -31,8 +31,6 @@ import org.eclipse.papyrus.infra.editor.welcome.SashRow;
 import org.eclipse.papyrus.infra.editor.welcome.WelcomePackage;
 import org.eclipse.papyrus.infra.editor.welcome.WelcomePage;
 
-import org.eclipse.uml2.common.util.CacheAdapter;
-
 /**
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Sash Row</b></em>'.
@@ -248,8 +246,7 @@ public class SashRowImpl extends MinimalEObjectImpl.Container implements SashRow
 	@Override
 	public void setColumn(SashColumn newColumn) {
 		if (newColumn != eInternalContainer() || (eContainerFeatureID() != WelcomePackage.SASH_ROW__COLUMN && newColumn != null)) {
-			if (EcoreUtil.isAncestor(this, newColumn))
-			 {
+			if (EcoreUtil.isAncestor(this, newColumn)) {
 				throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); //$NON-NLS-1$
 			}
 			NotificationChain msgs = null;
@@ -413,12 +410,11 @@ public class SashRowImpl extends MinimalEObjectImpl.Container implements SashRow
 			return super.toString();
 		}
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (y: "); //$NON-NLS-1$
 		if (yESet) {
 			result.append(y);
-		}
-		else {
+		} else {
 			result.append("<unset>"); //$NON-NLS-1$
 		}
 		result.append(')');
@@ -439,16 +435,4 @@ public class SashRowImpl extends MinimalEObjectImpl.Container implements SashRow
 		return EcoreUtil.create(eClass);
 	}
 
-	/**
-	 * Retrieves the cache adapter for this '<em><b>Sash Row</b></em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return The cache adapter for this '<em><b>Sash Row</b></em>'.
-	 * @generated
-	 */
-	protected CacheAdapter getCacheAdapter() {
-		return CacheAdapter.getCacheAdapter(this);
-	}
-
 } // SashRowImpl
diff --git a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src-gen/org/eclipse/papyrus/infra/editor/welcome/internal/impl/WelcomeImpl.java b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src-gen/org/eclipse/papyrus/infra/editor/welcome/internal/impl/WelcomeImpl.java
index 340c8a226a5..88fb4f4045a 100644
--- a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src-gen/org/eclipse/papyrus/infra/editor/welcome/internal/impl/WelcomeImpl.java
+++ b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src-gen/org/eclipse/papyrus/infra/editor/welcome/internal/impl/WelcomeImpl.java
@@ -29,7 +29,6 @@ import org.eclipse.papyrus.infra.editor.welcome.Welcome;
 import org.eclipse.papyrus.infra.editor.welcome.WelcomePackage;
 
 import org.eclipse.papyrus.infra.editor.welcome.WelcomePage;
-import org.eclipse.uml2.common.util.CacheAdapter;
 
 /**
  * <!-- begin-user-doc -->
@@ -237,16 +236,4 @@ public class WelcomeImpl extends MinimalEObjectImpl.Container implements Welcome
 		return EcoreUtil.create(eClass);
 	}
 
-	/**
-	 * Retrieves the cache adapter for this '<em><b>Welcome</b></em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return The cache adapter for this '<em><b>Welcome</b></em>'.
-	 * @generated
-	 */
-	protected CacheAdapter getCacheAdapter() {
-		return CacheAdapter.getCacheAdapter(this);
-	}
-
 } // WelcomeImpl
diff --git a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src-gen/org/eclipse/papyrus/infra/editor/welcome/internal/impl/WelcomePackageImpl.java b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src-gen/org/eclipse/papyrus/infra/editor/welcome/internal/impl/WelcomePackageImpl.java
index 3bea5767824..28088ec8ef1 100644
--- a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src-gen/org/eclipse/papyrus/infra/editor/welcome/internal/impl/WelcomePackageImpl.java
+++ b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src-gen/org/eclipse/papyrus/infra/editor/welcome/internal/impl/WelcomePackageImpl.java
@@ -128,7 +128,8 @@ public class WelcomePackageImpl extends EPackageImpl implements WelcomePackage {
 		}
 
 		// Obtain or create and register package
-		WelcomePackageImpl theWelcomePackage = (WelcomePackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof WelcomePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new WelcomePackageImpl());
+		Object registeredWelcomePackage = EPackage.Registry.INSTANCE.get(eNS_URI);
+		WelcomePackageImpl theWelcomePackage = registeredWelcomePackage instanceof WelcomePackageImpl ? (WelcomePackageImpl) registeredWelcomePackage : new WelcomePackageImpl();
 
 		isInited = true;
 
@@ -144,7 +145,6 @@ public class WelcomePackageImpl extends EPackageImpl implements WelcomePackage {
 		// Mark meta-data to indicate it can't be changed
 		theWelcomePackage.freeze();
 
-
 		// Update the registry and return the package
 		EPackage.Registry.INSTANCE.put(WelcomePackage.eNS_URI, theWelcomePackage);
 		return theWelcomePackage;
diff --git a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src-gen/org/eclipse/papyrus/infra/editor/welcome/internal/impl/WelcomePageImpl.java b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src-gen/org/eclipse/papyrus/infra/editor/welcome/internal/impl/WelcomePageImpl.java
index 665deafeea2..66752b0193b 100644
--- a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src-gen/org/eclipse/papyrus/infra/editor/welcome/internal/impl/WelcomePageImpl.java
+++ b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src-gen/org/eclipse/papyrus/infra/editor/welcome/internal/impl/WelcomePageImpl.java
@@ -38,7 +38,6 @@ import org.eclipse.papyrus.infra.editor.welcome.WelcomePage;
 import org.eclipse.papyrus.infra.editor.welcome.WelcomeSection;
 
 import org.eclipse.papyrus.infra.editor.welcome.internal.operations.WelcomePageOperations;
-import org.eclipse.uml2.common.util.CacheAdapter;
 
 /**
  * <!-- begin-user-doc -->
@@ -108,7 +107,7 @@ public class WelcomePageImpl extends MinimalEObjectImpl.Container implements Wel
 	@Override
 	public EList<WelcomeSection> getSections() {
 		if (sections == null) {
-			sections = new EObjectContainmentWithInverseEList<WelcomeSection>(WelcomeSection.class, this, WelcomePackage.WELCOME_PAGE__SECTION, WelcomePackage.WELCOME_SECTION__PAGE);
+			sections = new EObjectContainmentWithInverseEList<>(WelcomeSection.class, this, WelcomePackage.WELCOME_PAGE__SECTION, WelcomePackage.WELCOME_SECTION__PAGE);
 		}
 		return sections;
 	}
@@ -134,15 +133,6 @@ public class WelcomePageImpl extends MinimalEObjectImpl.Container implements Wel
 	 */
 	@Override
 	public EList<WelcomeSection> getVisibleSections() {
-		CacheAdapter cache = getCacheAdapter();
-		if (cache != null) {
-			@SuppressWarnings("unchecked")
-			EList<WelcomeSection> result = (EList<WelcomeSection>) cache.get(eResource(), this, WelcomePackage.Literals.WELCOME_PAGE__VISIBLE_SECTION);
-			if (result == null) {
-				cache.put(eResource(), this, WelcomePackage.Literals.WELCOME_PAGE__VISIBLE_SECTION, result = WelcomePageOperations.getVisibleSections(this));
-			}
-			return result;
-		}
 		return WelcomePageOperations.getVisibleSections(this);
 	}
 
@@ -179,7 +169,7 @@ public class WelcomePageImpl extends MinimalEObjectImpl.Container implements Wel
 	@Override
 	public EList<SashColumn> getSashColumns() {
 		if (sashColumns == null) {
-			sashColumns = new EObjectContainmentWithInverseEList<SashColumn>(SashColumn.class, this, WelcomePackage.WELCOME_PAGE__SASH_COLUMN, WelcomePackage.SASH_COLUMN__PAGE);
+			sashColumns = new EObjectContainmentWithInverseEList<>(SashColumn.class, this, WelcomePackage.WELCOME_PAGE__SASH_COLUMN, WelcomePackage.SASH_COLUMN__PAGE);
 		}
 		return sashColumns;
 	}
@@ -384,16 +374,4 @@ public class WelcomePageImpl extends MinimalEObjectImpl.Container implements Wel
 		return EcoreUtil.create(eClass);
 	}
 
-	/**
-	 * Retrieves the cache adapter for this '<em><b>Page</b></em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return The cache adapter for this '<em><b>Page</b></em>'.
-	 * @generated
-	 */
-	protected CacheAdapter getCacheAdapter() {
-		return CacheAdapter.getCacheAdapter(this);
-	}
-
 } // WelcomePageImpl
diff --git a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src-gen/org/eclipse/papyrus/infra/editor/welcome/internal/impl/WelcomeSectionImpl.java b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src-gen/org/eclipse/papyrus/infra/editor/welcome/internal/impl/WelcomeSectionImpl.java
index d23781dc937..7dc5fe5a089 100644
--- a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src-gen/org/eclipse/papyrus/infra/editor/welcome/internal/impl/WelcomeSectionImpl.java
+++ b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src-gen/org/eclipse/papyrus/infra/editor/welcome/internal/impl/WelcomeSectionImpl.java
@@ -38,8 +38,6 @@ import org.eclipse.papyrus.infra.editor.welcome.WelcomeSection;
 
 import org.eclipse.papyrus.infra.editor.welcome.internal.operations.WelcomeSectionOperations;
 
-import org.eclipse.uml2.common.util.CacheAdapter;
-
 /**
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Section</b></em>'.
@@ -119,7 +117,7 @@ public class WelcomeSectionImpl extends MinimalEObjectImpl.Container implements
 	@Override
 	public EList<String> getIdentifiers() {
 		if (identifiers == null) {
-			identifiers = new EDataTypeUniqueEList<String>(String.class, this, WelcomePackage.WELCOME_SECTION__IDENTIFIER);
+			identifiers = new EDataTypeUniqueEList<>(String.class, this, WelcomePackage.WELCOME_SECTION__IDENTIFIER);
 		}
 		return identifiers;
 	}
@@ -184,8 +182,7 @@ public class WelcomeSectionImpl extends MinimalEObjectImpl.Container implements
 	@Override
 	public void setPage(WelcomePage newPage) {
 		if (newPage != eInternalContainer() || (eContainerFeatureID() != WelcomePackage.WELCOME_SECTION__PAGE && newPage != null)) {
-			if (EcoreUtil.isAncestor(this, newPage))
-			 {
+			if (EcoreUtil.isAncestor(this, newPage)) {
 				throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); //$NON-NLS-1$
 			}
 			NotificationChain msgs = null;
@@ -374,7 +371,7 @@ public class WelcomeSectionImpl extends MinimalEObjectImpl.Container implements
 			return super.toString();
 		}
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (identifier: "); //$NON-NLS-1$
 		result.append(identifiers);
 		result.append(", hidden: "); //$NON-NLS-1$
@@ -397,16 +394,4 @@ public class WelcomeSectionImpl extends MinimalEObjectImpl.Container implements
 		return EcoreUtil.create(eClass);
 	}
 
-	/**
-	 * Retrieves the cache adapter for this '<em><b>Section</b></em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return The cache adapter for this '<em><b>Section</b></em>'.
-	 * @generated
-	 */
-	protected CacheAdapter getCacheAdapter() {
-		return CacheAdapter.getCacheAdapter(this);
-	}
-
 } // WelcomeSectionImpl
diff --git a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src-gen/org/eclipse/papyrus/infra/editor/welcome/util/WelcomeAdapterFactory.java b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src-gen/org/eclipse/papyrus/infra/editor/welcome/util/WelcomeAdapterFactory.java
index a9094ee14b8..aa51d5109ae 100644
--- a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src-gen/org/eclipse/papyrus/infra/editor/welcome/util/WelcomeAdapterFactory.java
+++ b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src-gen/org/eclipse/papyrus/infra/editor/welcome/util/WelcomeAdapterFactory.java
@@ -120,7 +120,7 @@ public class WelcomeAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- end-user-doc -->
 	 *
 	 * @param target
-	 *            the object to adapt.
+	 *                   the object to adapt.
 	 * @return the adapter for the <code>target</code>.
 	 * @generated
 	 */
diff --git a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src-gen/org/eclipse/papyrus/infra/editor/welcome/util/WelcomeSwitch.java b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src-gen/org/eclipse/papyrus/infra/editor/welcome/util/WelcomeSwitch.java
index 10ddc86a94f..2c044084795 100644
--- a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src-gen/org/eclipse/papyrus/infra/editor/welcome/util/WelcomeSwitch.java
+++ b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src-gen/org/eclipse/papyrus/infra/editor/welcome/util/WelcomeSwitch.java
@@ -64,7 +64,7 @@ public class WelcomeSwitch<T> extends Switch<T> {
 	 * <!-- end-user-doc -->
 	 *
 	 * @param ePackage
-	 *            the package in question.
+	 *                     the package in question.
 	 * @return whether this is a switch for the given package.
 	 * @generated
 	 */
@@ -137,7 +137,7 @@ public class WelcomeSwitch<T> extends Switch<T> {
 	 * <!-- end-user-doc -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *                   the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Welcome</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -154,7 +154,7 @@ public class WelcomeSwitch<T> extends Switch<T> {
 	 * <!-- end-user-doc -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *                   the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Page</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -171,7 +171,7 @@ public class WelcomeSwitch<T> extends Switch<T> {
 	 * <!-- end-user-doc -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *                   the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Section</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -188,7 +188,7 @@ public class WelcomeSwitch<T> extends Switch<T> {
 	 * <!-- end-user-doc -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *                   the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Sash Column</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -205,7 +205,7 @@ public class WelcomeSwitch<T> extends Switch<T> {
 	 * <!-- end-user-doc -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *                   the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Sash Row</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -222,7 +222,7 @@ public class WelcomeSwitch<T> extends Switch<T> {
 	 * <!-- end-user-doc -->
 	 *
 	 * @param object
-	 *            the target of the switch.
+	 *                   the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
 	 * @generated