Attachment 205521 Details for Bug 354245 – More improvements.

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] More improvements.

354245.patch (text/plain), 542.62 KB, created by Ed Merks

on 2011-10-19 09:01:22 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ed Merks

Created: 2011-10-19 09:01:22 EDT

Size: 542.62 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.emf.codegen
>Index: src/org/eclipse/emf/codegen/util/ImportManager.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/util/ImportManager.java,v
>retrieving revision 1.9
>diff -u -r1.9 ImportManager.java
>--- src/org/eclipse/emf/codegen/util/ImportManager.java	3 Jun 2009 23:50:59 -0000	1.9
>+++ src/org/eclipse/emf/codegen/util/ImportManager.java	19 Oct 2011 13:00:30 -0000
>@@ -495,7 +495,7 @@
> importedPackages.add(packageName);
> imports.add(importName);
> }
>- else if (!shortNameToImportMap.containsKey(shortName) && (!CodeGenUtil.isJavaDefaultType(shortName)))
>+ else if (!shortNameToImportMap.containsKey(shortName) && shouldImport(packageName, shortName, importName))
> {
> shortNameToImportMap.put(shortName, importName);
> 
>@@ -505,6 +505,16 @@
> }
> }
> }
>+ 
>+ /**
>+ * Determines whether the given non-wildcard import should be added.
>+ * By default, this returns false if the short name is a built-in Java language type name.
>+ * @since 2.8
>+ */
>+ protected boolean shouldImport(String packageName, String shortName, String importName)
>+ {
>+ return !CodeGenUtil.isJavaDefaultType(shortName);
>+ }
> 
> /**
> * Registers a pseudo-import for the given qualified name.
>#P org.eclipse.emf.codegen.ecore
>Index: .project
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/plugins/org.eclipse.emf.codegen.ecore/.project,v
>retrieving revision 1.3
>diff -u -r1.3 .project
>--- .project	24 Oct 2005 17:48:16 -0000	1.3
>+++ .project	19 Oct 2011 13:00:31 -0000
>@@ -25,10 +25,16 @@
> 			<arguments>
> 			</arguments>
> 		</buildCommand>
>+		<buildCommand>
>+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
>+			<arguments>
>+			</arguments>
>+		</buildCommand>
> 	</buildSpec>
> 	<natures>
> 		<nature>org.eclipse.emf.codegen.jet.IJETNature</nature>
> 		<nature>org.eclipse.jdt.core.javanature</nature>
> 		<nature>org.eclipse.pde.PluginNature</nature>
>+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
> 	</natures>
> </projectDescription>
>Index: src/org/eclipse/emf/codegen/ecore/Generator.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/Generator.java,v
>retrieving revision 1.40
>diff -u -r1.40 Generator.java
>--- src/org/eclipse/emf/codegen/ecore/Generator.java	24 Aug 2010 16:59:38 -0000	1.40
>+++ src/org/eclipse/emf/codegen/ecore/Generator.java	19 Oct 2011 13:00:31 -0000
>@@ -882,6 +882,7 @@
> }
> else
> {
>+ /*
> CodeGenUtil.EclipseUtil.addClasspathEntries(classpathEntries, "ECLIPSE_CORE_RUNTIME", "org.eclipse.core.runtime");
> CodeGenUtil.EclipseUtil.addClasspathEntries(classpathEntries, "ECLIPSE_CORE_RESOURCES", "org.eclipse.core.resources");
> CodeGenUtil.EclipseUtil.addClasspathEntries(classpathEntries, "EMF_COMMON", "org.eclipse.emf.common");
>@@ -947,6 +948,7 @@
> }
> }
> }
>+ */
> }
> }
> 
>Index: src/org/eclipse/emf/codegen/ecore/genmodel/GenClass.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenClass.java,v
>retrieving revision 1.36
>diff -u -r1.36 GenClass.java
>--- src/org/eclipse/emf/codegen/ecore/genmodel/GenClass.java	21 Jan 2011 07:19:08 -0000	1.36
>+++ src/org/eclipse/emf/codegen/ecore/genmodel/GenClass.java	19 Oct 2011 13:00:31 -0000
>@@ -624,4 +624,11 @@
> * @since 2.4
> */
> boolean hasCollidingUnsetAccessorOperation(GenFeature genFeature);
>+
>+ /**
>+ * Returns as list that corresponds to {@link #getInterfaceExtends()}.
>+ * @since 2.8
>+ */
>+ List<String >getQualifiedInterfaceExtendsList();
>+ 
> }
>Index: src/org/eclipse/emf/codegen/ecore/genmodel/GenDataType.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenDataType.java,v
>retrieving revision 1.11
>diff -u -r1.11 GenDataType.java
>--- src/org/eclipse/emf/codegen/ecore/genmodel/GenDataType.java	4 May 2008 17:03:27 -0000	1.11
>+++ src/org/eclipse/emf/codegen/ecore/genmodel/GenDataType.java	19 Oct 2011 13:00:31 -0000
>@@ -121,4 +121,24 @@
> void initialize(EDataType eDataType);
> 
> boolean reconcile(GenDataType oldGenDataVersion);
>+ 
>+ /**
>+ * @since 2.8
>+ */
>+ boolean hasCreatorBody();
>+ 
>+ /**
>+ * @since 2.8
>+ */
>+ String getCreatorBody(String indentation);
>+ 
>+ /**
>+ * @since 2.8
>+ */
>+ boolean hasConverterBody();
>+ 
>+ /**
>+ * @since 2.8
>+ */
>+ String getConverterBody(String indentation);
> }
>Index: src/org/eclipse/emf/codegen/ecore/genmodel/GenFeature.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenFeature.java,v
>retrieving revision 1.27
>diff -u -r1.27 GenFeature.java
>--- src/org/eclipse/emf/codegen/ecore/genmodel/GenFeature.java	16 Nov 2009 19:26:45 -0000	1.27
>+++ src/org/eclipse/emf/codegen/ecore/genmodel/GenFeature.java	19 Oct 2011 13:00:31 -0000
>@@ -452,4 +452,14 @@
> * @since 2.6
> */
> boolean hasSettingDelegate();
>+ 
>+ /**
>+ * @since 2.8
>+ */
>+ boolean hasGetterBody();
>+ 
>+ /**
>+ * @since 2.8
>+ */
>+ String getGetterBody(String indentation);
> }
>Index: src/org/eclipse/emf/codegen/ecore/genmodel/GenModel.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/GenModel.java,v
>retrieving revision 1.69
>diff -u -r1.69 GenModel.java
>--- src/org/eclipse/emf/codegen/ecore/genmodel/GenModel.java	24 Aug 2010 16:59:38 -0000	1.69
>+++ src/org/eclipse/emf/codegen/ecore/genmodel/GenModel.java	19 Oct 2011 13:00:31 -0000
>@@ -32,7 +32,10 @@
> import org.eclipse.emf.common.util.EList;
> import org.eclipse.emf.ecore.EClass;
> import org.eclipse.emf.ecore.EClassifier;
>+import org.eclipse.emf.ecore.EOperation;
> import org.eclipse.emf.ecore.EPackage;
>+import org.eclipse.emf.ecore.EStructuralFeature;
>+import org.eclipse.emf.ecore.ETypeParameter;
> import org.eclipse.emf.ecore.util.ExtendedMetaData;
> import org.eclipse.jdt.core.formatter.CodeFormatter;
> 
>@@ -2794,4 +2797,25 @@
> * @since 2.7
> */
> String getQualifiedEditorEntryPointClassName();
>+ 
>+ /**
>+ * Set up reasonable initial defaults.
>+ * @since 2.8
>+ */
>+ void initialize();
>+ 
>+ /**
>+ * @since 2.8
>+ */
>+ GenTypeParameter findGenTypeParameter(ETypeParameter eTypeParameter);
>+ 
>+ /**
>+ * @since 2.8
>+ */
>+ GenFeature findGenFeature(EStructuralFeature eStructuralFeature);
>+ 
>+ /**
>+ * @since 2.8
>+ */
>+ GenOperation findGenOperation(EOperation eOperation);
> }
>Index: src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenBaseImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenBaseImpl.java,v
>retrieving revision 1.75
>diff -u -r1.75 GenBaseImpl.java
>--- src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenBaseImpl.java	18 Oct 2010 12:44:41 -0000	1.75
>+++ src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenBaseImpl.java	19 Oct 2011 13:00:32 -0000
>@@ -3532,4 +3532,46 @@
> }
> return false;
> }
>+ 
>+ /**
>+ * @since 2.8
>+ */
>+ protected String indentAndImport(String body, String indentation)
>+ {
>+ if (body != null)
>+ {
>+ StringBuffer stringBuffer = new StringBuffer(indent(body, indentation));
>+
>+ for (int i = 0; i < stringBuffer.length(); )
>+ {
>+ int start = stringBuffer.indexOf("<%", i);
>+ if (start == -1)
>+ {
>+ break;
>+ }
>+ else
>+ {
>+ int end = stringBuffer.indexOf("%>", start + 2);
>+ if (end == -1)
>+ {
>+ break;
>+ }
>+ else
>+ {
>+ String qualifiedName = stringBuffer.substring(start + 2, end);
>+ String importedName = getGenModel().getImportedName(qualifiedName);
>+ stringBuffer.replace(start, end + 2, importedName);
>+ i += importedName.length();
>+ }
>+ }
>+ }
>+
>+ return stringBuffer.toString();
>+ }
>+ else
>+ {
>+ return null;
>+ }
>+ }
>+
> }
>Index: src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenClassImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenClassImpl.java,v
>retrieving revision 1.110
>diff -u -r1.110 GenClassImpl.java
>--- src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenClassImpl.java	21 Jan 2011 07:19:09 -0000	1.110
>+++ src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenClassImpl.java	19 Oct 2011 13:00:32 -0000
>@@ -1288,7 +1288,7 @@
> 
> public boolean isEObject()
> {
>- return getName().equals("EObject") && getGenPackage().isEcorePackage();
>+ return "EObject".equals(getName()) && getGenPackage().isEcorePackage();
> }
> 
> public boolean isEObjectExtension()
>Index: src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenDataTypeImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenDataTypeImpl.java,v
>retrieving revision 1.39
>diff -u -r1.39 GenDataTypeImpl.java
>--- src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenDataTypeImpl.java	17 Jan 2011 20:47:48 -0000	1.39
>+++ src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenDataTypeImpl.java	19 Oct 2011 13:00:32 -0000
>@@ -31,6 +31,7 @@
> import org.eclipse.emf.codegen.ecore.genmodel.GenTypeParameter;
> import org.eclipse.emf.common.notify.Notification;
> import org.eclipse.emf.common.util.UniqueEList;
>+import org.eclipse.emf.ecore.EAnnotation;
> import org.eclipse.emf.ecore.EClass;
> import org.eclipse.emf.ecore.EClassifier;
> import org.eclipse.emf.ecore.EDataType;
>@@ -350,8 +351,9 @@
> 
> public String getImportedParameterizedObjectInstanceClassName()
> {
>- String result = getObjectInstanceClassName();
>- if (getEffectiveComplianceLevel().getValue() >= GenJDKLevel.JDK50)
>+ boolean erased = getEffectiveComplianceLevel().getValue() < GenJDKLevel.JDK50;
>+ String result = getImportedType(null, getEcoreDataType(), true, erased);
>+ if (!erased)
> {
> if (getEffectiveItemType() != null)
> {
>@@ -1169,4 +1171,38 @@
> }
> return result.toString();
> }
>+ 
>+ protected String getCreatorBody()
>+ {
>+ EDataType eDataType = getEcoreDataType();
>+ EAnnotation eAnnotation = eDataType.getEAnnotation(GenModelPackage.eNS_URI);
>+ return eAnnotation == null ? null : (String)eAnnotation.getDetails().get("create");
>+ }
>+
>+ public boolean hasCreatorBody()
>+ {
>+ return getCreatorBody() != null;
>+ }
>+
>+ public String getCreatorBody(String indentation)
>+ {
>+ return indentAndImport(getCreatorBody(), indentation);
>+ }
>+
>+ protected String getConverterBody()
>+ {
>+ EDataType eDataType = getEcoreDataType();
>+ EAnnotation eAnnotation = eDataType.getEAnnotation(GenModelPackage.eNS_URI);
>+ return eAnnotation == null ? null : (String)eAnnotation.getDetails().get("convert");
>+ }
>+
>+ public boolean hasConverterBody()
>+ {
>+ return getConverterBody() != null;
>+ }
>+
>+ public String getConverterBody(String indentation)
>+ {
>+ return indentAndImport(getConverterBody(), indentation);
>+ }
> }
>Index: src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenFeatureImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenFeatureImpl.java,v
>retrieving revision 1.61
>diff -u -r1.61 GenFeatureImpl.java
>--- src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenFeatureImpl.java	22 Feb 2010 15:30:16 -0000	1.61
>+++ src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenFeatureImpl.java	19 Oct 2011 13:00:32 -0000
>@@ -37,6 +37,7 @@
> import org.eclipse.emf.common.notify.Notification;
> import org.eclipse.emf.common.notify.NotificationChain;
> import org.eclipse.emf.common.util.EList;
>+import org.eclipse.emf.ecore.EAnnotation;
> import org.eclipse.emf.ecore.EAttribute;
> import org.eclipse.emf.ecore.EClass;
> import org.eclipse.emf.ecore.EClassifier;
>@@ -1914,4 +1915,22 @@
> }
> return false;
> }
>+ 
>+ protected String getGetterBody()
>+ {
>+ EStructuralFeature eStructuralFeature = getEcoreFeature();
>+ EAnnotation eAnnotation = eStructuralFeature.getEAnnotation(GenModelPackage.eNS_URI);
>+ return eAnnotation == null ? null : (String)eAnnotation.getDetails().get("get");
>+ }
>+
>+ public boolean hasGetterBody()
>+ {
>+ return getGetterBody() != null;
>+ }
>+
>+ public String getGetterBody(String indentation)
>+ {
>+ return indentAndImport(getGetterBody(), indentation);
>+ }
>+
> } //GenFeatureImpl
>Index: src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenModelImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenModelImpl.java,v
>retrieving revision 1.117
>diff -u -r1.117 GenModelImpl.java
>--- src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenModelImpl.java	6 Jan 2011 21:03:33 -0000	1.117
>+++ src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenModelImpl.java	19 Oct 2011 13:00:33 -0000
>@@ -29,8 +29,18 @@
> import java.util.Locale;
> import java.util.Map;
> import java.util.Set;
>+import java.util.jar.Attributes;
>+import java.util.jar.Manifest;
> 
>+import org.eclipse.core.resources.IFile;
>+import org.eclipse.core.resources.IProject;
>+import org.eclipse.core.resources.IWorkspace;
>+import org.eclipse.core.resources.ResourcesPlugin;
> import org.eclipse.core.runtime.IStatus;
>+import org.eclipse.core.runtime.Path;
>+import org.eclipse.jdt.core.IClasspathEntry;
>+import org.eclipse.jdt.core.IJavaProject;
>+import org.eclipse.jdt.core.JavaCore;
> import org.eclipse.jdt.core.ToolFactory;
> import org.eclipse.jdt.core.formatter.CodeFormatter;
> 
>@@ -75,13 +85,18 @@
> import org.eclipse.emf.common.util.TreeIterator;
> import org.eclipse.emf.common.util.URI;
> import org.eclipse.emf.common.util.UniqueEList;
>+import org.eclipse.emf.ecore.EAnnotation;
>+import org.eclipse.emf.ecore.EAttribute;
> import org.eclipse.emf.ecore.EClass;
> import org.eclipse.emf.ecore.EClassifier;
> import org.eclipse.emf.ecore.EDataType;
> import org.eclipse.emf.ecore.EEnum;
>+import org.eclipse.emf.ecore.EModelElement;
> import org.eclipse.emf.ecore.EObject;
>+import org.eclipse.emf.ecore.EOperation;
> import org.eclipse.emf.ecore.EPackage;
> import org.eclipse.emf.ecore.EStructuralFeature;
>+import org.eclipse.emf.ecore.ETypeParameter;
> import org.eclipse.emf.ecore.EValidator;
> import org.eclipse.emf.ecore.EcorePackage;
> import org.eclipse.emf.ecore.InternalEObject;
>@@ -2127,36 +2142,41 @@
> @Override
> public void setImportManager(ImportManager importManager)
> {
>- this.importManager = importManager;
>-
>- // We also need to set it on any GenModels holding any used or static packages that may be refered to.
>- //
>- for (GenPackage genPackage : getUsedGenPackages())
>- {
>- genPackage.getGenModel().setImportManager(importManager);
>- }
>-
>- for (GenPackage genPackage : getStaticGenPackages())
>- {
>- genPackage.getGenModel().setImportManager(importManager);
>- }
>-
>- // And we need to set it on any cached GenModels holding the special Ecore and XML packages.
>+ // Avoid doing this cyclically.
> //
>- GenPackage ecore = getEcoreGenPackage();
>- if (ecore != null && ecore.getGenModel().getImportManager() != importManager)
>+ if (this.importManager != importManager)
> {
>- ecore.getGenModel().setImportManager(importManager);
>- }
>- GenPackage xmlType = getXMLTypeGenPackage();
>- if (xmlType != null && xmlType.getGenModel().getImportManager() != importManager)
>- {
>- xmlType.getGenModel().setImportManager(importManager);
>- }
>- GenPackage xmlNamespace = getXMLNamespaceGenPackage();
>- if (xmlNamespace != null && xmlNamespace.getGenModel().getImportManager() != importManager)
>- {
>- xmlNamespace.getGenModel().setImportManager(importManager);
>+ this.importManager = importManager;
>+ 
>+ // We also need to set it on any GenModels holding any used or static packages that may be refered to.
>+ //
>+ for (GenPackage genPackage : getUsedGenPackages())
>+ {
>+ genPackage.getGenModel().setImportManager(importManager);
>+ }
>+ 
>+ for (GenPackage genPackage : getStaticGenPackages())
>+ {
>+ genPackage.getGenModel().setImportManager(importManager);
>+ }
>+ 
>+ // And we need to set it on any cached GenModels holding the special Ecore and XML packages.
>+ //
>+ GenPackage ecore = getEcoreGenPackage();
>+ if (ecore != null && ecore.getGenModel().getImportManager() != importManager)
>+ {
>+ ecore.getGenModel().setImportManager(importManager);
>+ }
>+ GenPackage xmlType = getXMLTypeGenPackage();
>+ if (xmlType != null && xmlType.getGenModel().getImportManager() != importManager)
>+ {
>+ xmlType.getGenModel().setImportManager(importManager);
>+ }
>+ GenPackage xmlNamespace = getXMLNamespaceGenPackage();
>+ if (xmlNamespace != null && xmlNamespace.getGenModel().getImportManager() != importManager)
>+ {
>+ xmlNamespace.getGenModel().setImportManager(importManager);
>+ }
> }
> }
> 
>@@ -2173,26 +2193,31 @@
> 
> public void setLineDelimiter(String lineDelimiter)
> {
>- this.lineDelimiter = lineDelimiter;
>- if (importManager != null)
>- {
>- importManager.setLineDelimiter(lineDelimiter);
>- }
>-
>- // We also need to set it on any GenModels holding any used or static packages that may be refered to.
>+ // Avoid cycles
> //
>- for (GenPackage genPackage : getUsedGenPackages())
>- {
>- genPackage.getGenModel().setLineDelimiter(lineDelimiter);
>- }
>-
>- for (GenPackage genPackage : getStaticGenPackages())
>+ if (this.lineDelimiter != lineDelimiter)
> {
>- genPackage.getGenModel().setLineDelimiter(lineDelimiter);
>+ this.lineDelimiter = lineDelimiter;
>+ if (importManager != null)
>+ {
>+ importManager.setLineDelimiter(lineDelimiter);
>+ }
>+ 
>+ // We also need to set it on any GenModels holding any used or static packages that may be refered to.
>+ //
>+ for (GenPackage genPackage : getUsedGenPackages())
>+ {
>+ genPackage.getGenModel().setLineDelimiter(lineDelimiter);
>+ }
>+ 
>+ for (GenPackage genPackage : getStaticGenPackages())
>+ {
>+ genPackage.getGenModel().setLineDelimiter(lineDelimiter);
>+ }
>+ 
>+ // There was previously code intended to set it on the cached GenModels holding the special Ecore and XML packages,
>+ // but it erroneously set the import manager. So, it seems that was not necessary.
> }
>-
>- // There was previously code intended to set it on the cached GenModels holding the special Ecore and XML packages,
>- // but it erroneously set the import manager. So, it seems that was not necessary.
> }
> 
> public String getDriverNumber()
>@@ -8995,6 +9020,46 @@
> {
> return super.findGenClassifier(classifier);
> }
>+
>+ @Override
>+ public GenFeature findGenFeature(EStructuralFeature feature)
>+ {
>+ return super.findGenFeature(feature);
>+ }
>+
>+ @Override
>+ public GenOperation findGenOperation(EOperation operation)
>+ {
>+ return super.findGenOperation(operation);
>+ }
>+ 
>+ public GenTypeParameter findGenTypeParameter(ETypeParameter eTypeParameter)
>+ {
>+ for (EObject eObject = eTypeParameter.eContainer(); eObject != null; eObject = eObject.eContainer())
>+ {
>+ if (eObject instanceof EOperation)
>+ {
>+ EOperation eOperation = (EOperation)eObject;
>+ int index = eOperation.getETypeParameters().indexOf(eTypeParameter);
>+ if (index != -1)
>+ {
>+ GenOperation genOperation = findGenOperation(eOperation);
>+ return genOperation.getGenTypeParameters().get(index);
>+ }
>+ }
>+ else if (eObject instanceof EClassifier)
>+ {
>+ EClassifier eClassifier = (EClassifier)eObject;
>+ int index = eClassifier.getETypeParameters().indexOf(eTypeParameter);
>+ if (index != -1)
>+ {
>+ GenClassifier genClassifier = findGenClassifier(eClassifier);
>+ return genClassifier.getGenTypeParameters().get(index);
>+ }
>+ }
>+ }
>+ return null;
>+ }
> 
> public boolean isSuppressedAnnotation(String source)
> {
>@@ -9201,7 +9266,12 @@
> 
> public void setMainGenModel(GenModel genModel)
> {
>- mainGenModel = genModel;
>+ // Avoid creating a cycle.
>+ // 
>+ if (genModel == null || genModel.getMainGenModel() != this)
>+ {
>+ mainGenModel = genModel;
>+ }
> }
> 
> protected boolean isMainGenModel()
>@@ -9378,4 +9448,159 @@
> return getEditorModuleName();
> }
> 
>+ public void initialize()
>+ {
>+ Resource resource = eResource();
>+ if (resource != null)
>+ {
>+ URI uri = resource.getURI();
>+ setModelDirectory(EclipseHelper.getModelDirectory(uri));
>+ setComplianceLevel(EclipseHelper.getComplianceLevel(uri));
>+ setModelPluginID(EclipseHelper.getPluginID(uri));
>+ }
>+ setOperationReflection(true);
>+ setMinimalReflectiveMethods(true);
>+ setRootExtendsClass("org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container");
>+ GenPackage mainGenPackage = getMainGenPackage();
>+ setModelName(mainGenPackage.getPrefix());
>+ GenRuntimeVersion[] values = GenRuntimeVersion.values();
>+ setRuntimeVersion(values[values.length - 1]);
>+ 
>+ handleAnnotations(this, mainGenPackage.getEcorePackage());
>+ for (TreeIterator<EObject> i = eAllContents(); i.hasNext();)
>+ {
>+ EObject content = i.next();
>+ if (content instanceof GenBase)
>+ {
>+ GenBase genBase = (GenBase)content;
>+ EModelElement eModelElement = genBase.getEcoreModelElement();
>+ if (eModelElement != null)
>+ {
>+ handleAnnotations(genBase, eModelElement);
>+ }
>+ }
>+ }
>+ }
>+ 
>+ protected void handleAnnotations(GenBase genBase, EModelElement eModelElement)
>+ {
>+ EAnnotation eAnnotation = eModelElement.getEAnnotation(GenModelPackage.eNS_URI);
>+ if (eAnnotation != null)
>+ {
>+ EClass eClass = genBase.eClass();
>+ for (Map.Entry<String, String> entry : eAnnotation.getDetails())
>+ {
>+ EStructuralFeature eStructuralFeature = eClass.getEStructuralFeature(entry.getKey());
>+ if (eStructuralFeature instanceof EAttribute)
>+ {
>+ EAttribute eAttribute = (EAttribute)eStructuralFeature;
>+ genBase.eSet(eStructuralFeature, EcoreUtil.createFromString(eAttribute.getEAttributeType(), entry.getValue()));
>+ }
>+ }
>+ }
>+ }
>+
>+ private static class EclipseHelper
>+ {
>+ static String getModelDirectory(URI uri)
>+ {
>+ if (EMFPlugin.IS_RESOURCES_BUNDLE_AVAILABLE)
>+ {
>+ try
>+ {
>+ IWorkspace workspace = ResourcesPlugin.getWorkspace();
>+ IProject project = workspace.getRoot().getProject(uri.segment(1));
>+ IJavaProject javaProject = JavaCore.create(project);
>+ IClasspathEntry[] classpath = javaProject.getRawClasspath();
>+ IClasspathEntry bestEntry = null;
>+ for (IClasspathEntry classpathEntry : classpath)
>+ {
>+ if (classpathEntry.getEntryKind() == IClasspathEntry.CPE_SOURCE)
>+ {
>+ // Look for the first entry that's Java source.
>+ if (bestEntry == null)
>+ {
>+ bestEntry = classpathEntry;
>+ }
>+ // If there's a src-gen entry, prefer that over all others.
>+ //
>+ else if (classpathEntry.getPath().toString().endsWith("src-gen"))
>+ {
>+ bestEntry = classpathEntry;
>+ }
>+ }
>+ }
>+ return bestEntry == null ? project.getFullPath() + "/src" : bestEntry.getPath().toString();
>+ }
>+ catch (Exception exception)
>+ {
>+ CodeGenEcorePlugin.INSTANCE.log(exception);
>+ }
>+ }
>+ return null;
>+ }
>+ 
>+ static GenJDKLevel getComplianceLevel(URI uri)
>+ {
>+ if (EMFPlugin.IS_RESOURCES_BUNDLE_AVAILABLE)
>+ {
>+ try
>+ {
>+ IWorkspace workspace = ResourcesPlugin.getWorkspace();
>+ IProject project = workspace.getRoot().getProject(uri.segment(2));
>+ String complianceLevel = CodeGenUtil.EclipseUtil.getJavaComplianceLevel(project);
>+ if ("1.5".equals(complianceLevel))
>+ {
>+ return GenJDKLevel.JDK50_LITERAL;
>+ }
>+ else if ("1.6".equals(complianceLevel))
>+ {
>+ return GenJDKLevel.JDK60_LITERAL;
>+ }
>+ else if ("1.4".equals(complianceLevel))
>+ {
>+ return GenJDKLevel.JDK14_LITERAL;
>+ }
>+ }
>+ catch (Exception exception)
>+ {
>+ CodeGenEcorePlugin.INSTANCE.log(exception);
>+ }
>+ }
>+ return GenJDKLevel.JDK50_LITERAL;
>+ }
>+
>+ static String getPluginID(URI uri)
>+ {
>+ String pluginID = uri != null && uri.segmentCount() > 2 ? uri.segment(1) : null;
>+ if (EMFPlugin.IS_RESOURCES_BUNDLE_AVAILABLE)
>+ {
>+ try
>+ {
>+ IWorkspace workspace = ResourcesPlugin.getWorkspace();
>+ IFile manifestFile = workspace.getRoot().getFile(new Path(pluginID + "/META-INF/MANIFEST.MF"));
>+ if (manifestFile.exists())
>+ {
>+ Manifest manifest = new Manifest(manifestFile.getContents());
>+ String name = manifest.getMainAttributes().getValue("Bundle-SymbolicName");
>+ if (name != null)
>+ {
>+ int index = name.indexOf(';');
>+ if (index > 0) 
>+ {
>+ name = name.substring(0, index);
>+ }
>+ pluginID = name.trim();
>+ }
>+ }
>+ }
>+ catch (Exception exception)
>+ {
>+ CodeGenEcorePlugin.INSTANCE.log(exception);
>+ }
>+ }
>+ return pluginID;
>+ }
>+ }
>+
> } //GenModelImpl
>Index: src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenOperationImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenOperationImpl.java,v
>retrieving revision 1.41
>diff -u -r1.41 GenOperationImpl.java
>--- src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenOperationImpl.java	4 Jun 2010 14:14:15 -0000	1.41
>+++ src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenOperationImpl.java	19 Oct 2011 13:00:33 -0000
>@@ -937,44 +937,7 @@
> 
> public String getBody(String indentation)
> {
>- String body = getBody();
>- if (body != null)
>- {
>- StringBuffer stringBuffer = new StringBuffer(indent(body, indentation));
>-
>- for (int i = 0; i < stringBuffer.length(); )
>- {
>- // EATM in JDK 1.4 there will be an indexOf on StringBuffer.
>- //
>- String string = stringBuffer.toString();
>- int start = string.indexOf("<%", i);
>- if (start == -1)
>- {
>- break;
>- }
>- else
>- {
>- int end = string.indexOf("%>", start + 2);
>- if (end == -1)
>- {
>- break;
>- }
>- else
>- {
>- String qualifiedName = stringBuffer.substring(start + 2, end);
>- String importedName = getGenModel().getImportedName(qualifiedName);
>- stringBuffer.replace(start, end + 2, importedName);
>- i += importedName.length();
>- }
>- }
>- }
>-
>- return stringBuffer.toString();
>- }
>- else
>- {
>- return null;
>- }
>+ return indentAndImport(getBody(), indentation);
> }
> 
> protected String getInvariantExpression()
>@@ -1086,7 +1049,8 @@
> 
> public boolean isOverrideOf(GenClass context, GenOperation genOperation)
> {
>- if (genOperation.getName().equals(getName()))
>+ String operationName = genOperation.getName();
>+ if (operationName != null && operationName.equals(getName()))
> {
> List<GenParameter> parameters = getGenParameters();
> List<GenParameter> otherParameters = genOperation.getGenParameters();
>Index: src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenPackageImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenPackageImpl.java,v
>retrieving revision 1.95
>diff -u -r1.95 GenPackageImpl.java
>--- src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenPackageImpl.java	4 Feb 2010 20:56:54 -0000	1.95
>+++ src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenPackageImpl.java	19 Oct 2011 13:00:33 -0000
>@@ -2372,6 +2372,25 @@
> 
> initializationDependencies.remove(GenPackageImpl.this);
> initializationDependencies.remove(findGenPackage(EcorePackage.eINSTANCE));
>+ 
>+ // These are used packages upon for which there is a cyclic dependency.
>+ // So they're not really simple dependencies.
>+ //
>+ List<GenPackage> nonSimpleDependencies = new ArrayList<GenPackage>(initializationDependencies);
>+ nonSimpleDependencies.retainAll(initializationDependencies);
>+ simpleDependencies.removeAll(nonSimpleDependencies);
>+ collectPackages(interDependencies, nonSimpleDependencies, -1);
>+ for (GenPackage genPackage : nonSimpleDependencies)
>+ {
>+ if (genPackage.isLoadedInitialization())
>+ {
>+ loadInterDependencies.add(genPackage);
>+ }
>+ else
>+ {
>+ buildInterDependencies.add(genPackage);
>+ }
>+ }
> }
> 
> protected void handle(EList<EGenericType> eGenericTypes)
>Index: src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenTypeParameterImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenTypeParameterImpl.java,v
>retrieving revision 1.5
>diff -u -r1.5 GenTypeParameterImpl.java
>--- src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenTypeParameterImpl.java	11 Jun 2007 21:09:49 -0000	1.5
>+++ src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenTypeParameterImpl.java	19 Oct 2011 13:00:33 -0000
>@@ -23,6 +23,7 @@
> import org.eclipse.emf.common.notify.Notification;
> import org.eclipse.emf.ecore.EClass;
> import org.eclipse.emf.ecore.EGenericType;
>+import org.eclipse.emf.ecore.EModelElement;
> import org.eclipse.emf.ecore.EObject;
> import org.eclipse.emf.ecore.ETypeParameter;
> import org.eclipse.emf.ecore.InternalEObject;
>@@ -252,5 +253,11 @@
> }
> return result.toString().trim();
> }
>+ 
>+ @Override
>+ public EModelElement getEcoreModelElement()
>+ {
>+ return getEcoreTypeParameter();
>+ }
> 
> } //GenTypeParameterImpl
>Index: src/org/eclipse/emf/codegen/ecore/templates/model/Class.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/templates/model/Class.java,v
>retrieving revision 1.93
>diff -u -r1.93 Class.java
>--- src/org/eclipse/emf/codegen/ecore/templates/model/Class.java	29 Aug 2011 20:16:46 -0000	1.93
>+++ src/org/eclipse/emf/codegen/ecore/templates/model/Class.java	19 Oct 2011 13:00:34 -0000
>@@ -514,1265 +514,1266 @@
> protected final String TEXT_496 = "()";
> protected final String TEXT_497 = ";";
> protected final String TEXT_498 = NL + "\t\t";
>- protected final String TEXT_499 = NL + "\t\t// TODO: implement this method to return the '";
>- protected final String TEXT_500 = "' ";
>- protected final String TEXT_501 = NL + "\t\t// Ensure that you remove @generated or mark it @generated NOT";
>- protected final String TEXT_502 = NL + "\t\t// The list is expected to implement org.eclipse.emf.ecore.util.InternalEList and org.eclipse.emf.ecore.EStructuralFeature.Setting" + NL + "\t\t// so it's likely that an appropriate subclass of org.eclipse.emf.ecore.util.";
>- protected final String TEXT_503 = "EcoreEMap";
>- protected final String TEXT_504 = "BasicFeatureMap";
>- protected final String TEXT_505 = "EcoreEList";
>- protected final String TEXT_506 = " should be used.";
>- protected final String TEXT_507 = NL + "\t\tthrow new UnsupportedOperationException();";
>- protected final String TEXT_508 = NL + "\t}" + NL;
>- protected final String TEXT_509 = NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */";
>- protected final String TEXT_510 = NL + "\tpublic ";
>- protected final String TEXT_511 = " basicGet";
>- protected final String TEXT_512 = "()" + NL + "\t{";
>- protected final String TEXT_513 = NL + "\t\treturn (";
>- protected final String TEXT_514 = ")eDynamicGet(";
>- protected final String TEXT_515 = ", ";
>- protected final String TEXT_516 = ", false, ";
>- protected final String TEXT_517 = ");";
>- protected final String TEXT_518 = NL + "\t\treturn ";
>- protected final String TEXT_519 = "(";
>+ protected final String TEXT_499 = NL + "\t\t";
>+ protected final String TEXT_500 = NL + "\t\t// TODO: implement this method to return the '";
>+ protected final String TEXT_501 = "' ";
>+ protected final String TEXT_502 = NL + "\t\t// Ensure that you remove @generated or mark it @generated NOT";
>+ protected final String TEXT_503 = NL + "\t\t// The list is expected to implement org.eclipse.emf.ecore.util.InternalEList and org.eclipse.emf.ecore.EStructuralFeature.Setting" + NL + "\t\t// so it's likely that an appropriate subclass of org.eclipse.emf.ecore.util.";
>+ protected final String TEXT_504 = "EcoreEMap";
>+ protected final String TEXT_505 = "BasicFeatureMap";
>+ protected final String TEXT_506 = "EcoreEList";
>+ protected final String TEXT_507 = " should be used.";
>+ protected final String TEXT_508 = NL + "\t\tthrow new UnsupportedOperationException();";
>+ protected final String TEXT_509 = NL + "\t}" + NL;
>+ protected final String TEXT_510 = NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */";
>+ protected final String TEXT_511 = NL + "\tpublic ";
>+ protected final String TEXT_512 = " basicGet";
>+ protected final String TEXT_513 = "()" + NL + "\t{";
>+ protected final String TEXT_514 = NL + "\t\treturn (";
>+ protected final String TEXT_515 = ")eDynamicGet(";
>+ protected final String TEXT_516 = ", ";
>+ protected final String TEXT_517 = ", false, ";
>+ protected final String TEXT_518 = ");";
>+ protected final String TEXT_519 = NL + "\t\treturn ";
> protected final String TEXT_520 = "(";
>- protected final String TEXT_521 = ")";
>- protected final String TEXT_522 = "__ESETTING_DELEGATE.dynamicGet(this, null, 0, false, false)";
>- protected final String TEXT_523 = ").";
>- protected final String TEXT_524 = "()";
>- protected final String TEXT_525 = ";";
>- protected final String TEXT_526 = NL + "\t\tif (eContainerFeatureID() != ";
>- protected final String TEXT_527 = ") return null;" + NL + "\t\treturn (";
>- protected final String TEXT_528 = ")eInternalContainer();";
>- protected final String TEXT_529 = NL + "\t\treturn (";
>- protected final String TEXT_530 = ")eVirtualGet(";
>- protected final String TEXT_531 = ");";
>- protected final String TEXT_532 = NL + "\t\treturn ";
>- protected final String TEXT_533 = ";";
>- protected final String TEXT_534 = NL + "\t\treturn (";
>- protected final String TEXT_535 = ")((";
>- protected final String TEXT_536 = ".Internal.Wrapper)get";
>- protected final String TEXT_537 = "()).featureMap().get(";
>- protected final String TEXT_538 = ", false);";
>- protected final String TEXT_539 = NL + "\t\treturn (";
>- protected final String TEXT_540 = ")get";
>- protected final String TEXT_541 = "().get(";
>- protected final String TEXT_542 = ", false);";
>- protected final String TEXT_543 = NL + "\t\t// TODO: implement this method to return the '";
>- protected final String TEXT_544 = "' ";
>- protected final String TEXT_545 = NL + "\t\t// -> do not perform proxy resolution" + NL + "\t\t// Ensure that you remove @generated or mark it @generated NOT" + NL + "\t\tthrow new UnsupportedOperationException();";
>- protected final String TEXT_546 = NL + "\t}" + NL;
>- protected final String TEXT_547 = NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */";
>- protected final String TEXT_548 = NL + "\tpublic ";
>- protected final String TEXT_549 = " basicSet";
>- protected final String TEXT_550 = "(";
>- protected final String TEXT_551 = " new";
>- protected final String TEXT_552 = ", ";
>- protected final String TEXT_553 = " msgs)" + NL + "\t{";
>- protected final String TEXT_554 = NL + "\t\tmsgs = eBasicSetContainer((";
>- protected final String TEXT_555 = ")new";
>- protected final String TEXT_556 = ", ";
>- protected final String TEXT_557 = ", msgs);";
>- protected final String TEXT_558 = NL + "\t\treturn msgs;";
>- protected final String TEXT_559 = NL + "\t\tmsgs = eDynamicInverseAdd((";
>- protected final String TEXT_560 = ")new";
>- protected final String TEXT_561 = ", ";
>- protected final String TEXT_562 = ", msgs);";
>- protected final String TEXT_563 = NL + "\t\treturn msgs;";
>- protected final String TEXT_564 = NL + "\t\tObject old";
>- protected final String TEXT_565 = " = eVirtualSet(";
>- protected final String TEXT_566 = ", new";
>- protected final String TEXT_567 = ");";
>- protected final String TEXT_568 = NL + "\t\t";
>- protected final String TEXT_569 = " old";
>- protected final String TEXT_570 = " = ";
>- protected final String TEXT_571 = ";" + NL + "\t\t";
>- protected final String TEXT_572 = " = new";
>- protected final String TEXT_573 = ";";
>- protected final String TEXT_574 = NL + "\t\tboolean isSetChange = old";
>- protected final String TEXT_575 = " == EVIRTUAL_NO_VALUE;";
>- protected final String TEXT_576 = NL + "\t\tboolean old";
>- protected final String TEXT_577 = "ESet = (";
>- protected final String TEXT_578 = " & ";
>- protected final String TEXT_579 = "_ESETFLAG) != 0;";
>- protected final String TEXT_580 = NL + "\t\t";
>- protected final String TEXT_581 = " |= ";
>- protected final String TEXT_582 = "_ESETFLAG;";
>- protected final String TEXT_583 = NL + "\t\tboolean old";
>- protected final String TEXT_584 = "ESet = ";
>- protected final String TEXT_585 = "ESet;";
>- protected final String TEXT_586 = NL + "\t\t";
>- protected final String TEXT_587 = "ESet = true;";
>- protected final String TEXT_588 = NL + "\t\tif (eNotificationRequired())" + NL + "\t\t{";
>- protected final String TEXT_589 = NL + "\t\t\t";
>- protected final String TEXT_590 = " notification = new ";
>- protected final String TEXT_591 = "(this, ";
>- protected final String TEXT_592 = ".SET, ";
>- protected final String TEXT_593 = ", ";
>- protected final String TEXT_594 = "isSetChange ? null : old";
>- protected final String TEXT_595 = "old";
>- protected final String TEXT_596 = ", new";
>- protected final String TEXT_597 = ", ";
>- protected final String TEXT_598 = "isSetChange";
>- protected final String TEXT_599 = "!old";
>- protected final String TEXT_600 = "ESet";
>- protected final String TEXT_601 = ");";
>- protected final String TEXT_602 = NL + "\t\t\t";
>- protected final String TEXT_603 = " notification = new ";
>- protected final String TEXT_604 = "(this, ";
>- protected final String TEXT_605 = ".SET, ";
>- protected final String TEXT_606 = ", ";
>- protected final String TEXT_607 = "old";
>- protected final String TEXT_608 = " == EVIRTUAL_NO_VALUE ? null : old";
>- protected final String TEXT_609 = "old";
>- protected final String TEXT_610 = ", new";
>- protected final String TEXT_611 = ");";
>- protected final String TEXT_612 = NL + "\t\t\tif (msgs == null) msgs = notification; else msgs.add(notification);" + NL + "\t\t}";
>- protected final String TEXT_613 = NL + "\t\treturn msgs;";
>- protected final String TEXT_614 = NL + "\t\treturn ((";
>- protected final String TEXT_615 = ".Internal)((";
>- protected final String TEXT_616 = ".Internal.Wrapper)get";
>- protected final String TEXT_617 = "()).featureMap()).basicAdd(";
>- protected final String TEXT_618 = ", new";
>- protected final String TEXT_619 = ", msgs);";
>- protected final String TEXT_620 = NL + "\t\treturn ((";
>- protected final String TEXT_621 = ".Internal)get";
>- protected final String TEXT_622 = "()).basicAdd(";
>- protected final String TEXT_623 = ", new";
>- protected final String TEXT_624 = ", msgs);";
>- protected final String TEXT_625 = NL + "\t\t// TODO: implement this method to set the contained '";
>- protected final String TEXT_626 = "' ";
>- protected final String TEXT_627 = NL + "\t\t// -> this method is automatically invoked to keep the containment relationship in synch" + NL + "\t\t// -> do not modify other features" + NL + "\t\t// -> return msgs, after adding any generated Notification to it (if it is null, a NotificationChain object must be created first)" + NL + "\t\t// Ensure that you remove @generated or mark it @generated NOT" + NL + "\t\tthrow new UnsupportedOperationException();";
>- protected final String TEXT_628 = NL + "\t}" + NL;
>- protected final String TEXT_629 = NL + "\t/**" + NL + "\t * Sets the value of the '{@link ";
>- protected final String TEXT_630 = "#";
>- protected final String TEXT_631 = " ";
>- protected final String TEXT_632 = "}' ";
>- protected final String TEXT_633 = ".";
>- protected final String TEXT_634 = NL + "\t * " + NL + "\t * " + NL + "\t * @param value the new value of the '";
>- protected final String TEXT_635 = "' ";
>- protected final String TEXT_636 = ".";
>- protected final String TEXT_637 = NL + "\t * @see ";
>- protected final String TEXT_638 = NL + "\t * @see #isSet";
>- protected final String TEXT_639 = "()";
>- protected final String TEXT_640 = NL + "\t * @see #unset";
>- protected final String TEXT_641 = "()";
>- protected final String TEXT_642 = NL + "\t * @see #";
>- protected final String TEXT_643 = "()" + NL + "\t * @generated" + NL + "\t */";
>- protected final String TEXT_644 = NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */";
>- protected final String TEXT_645 = NL + "\tvoid set";
>- protected final String TEXT_646 = "(";
>- protected final String TEXT_647 = " value);" + NL;
>- protected final String TEXT_648 = NL + "\tpublic void set";
>- protected final String TEXT_649 = "_";
>- protected final String TEXT_650 = "(";
>- protected final String TEXT_651 = " ";
>- protected final String TEXT_652 = ")" + NL + "\t{";
>- protected final String TEXT_653 = NL + "\t\teDynamicSet(";
>- protected final String TEXT_654 = ", ";
>+ protected final String TEXT_521 = "(";
>+ protected final String TEXT_522 = ")";
>+ protected final String TEXT_523 = "__ESETTING_DELEGATE.dynamicGet(this, null, 0, false, false)";
>+ protected final String TEXT_524 = ").";
>+ protected final String TEXT_525 = "()";
>+ protected final String TEXT_526 = ";";
>+ protected final String TEXT_527 = NL + "\t\tif (eContainerFeatureID() != ";
>+ protected final String TEXT_528 = ") return null;" + NL + "\t\treturn (";
>+ protected final String TEXT_529 = ")eInternalContainer();";
>+ protected final String TEXT_530 = NL + "\t\treturn (";
>+ protected final String TEXT_531 = ")eVirtualGet(";
>+ protected final String TEXT_532 = ");";
>+ protected final String TEXT_533 = NL + "\t\treturn ";
>+ protected final String TEXT_534 = ";";
>+ protected final String TEXT_535 = NL + "\t\treturn (";
>+ protected final String TEXT_536 = ")((";
>+ protected final String TEXT_537 = ".Internal.Wrapper)get";
>+ protected final String TEXT_538 = "()).featureMap().get(";
>+ protected final String TEXT_539 = ", false);";
>+ protected final String TEXT_540 = NL + "\t\treturn (";
>+ protected final String TEXT_541 = ")get";
>+ protected final String TEXT_542 = "().get(";
>+ protected final String TEXT_543 = ", false);";
>+ protected final String TEXT_544 = NL + "\t\t// TODO: implement this method to return the '";
>+ protected final String TEXT_545 = "' ";
>+ protected final String TEXT_546 = NL + "\t\t// -> do not perform proxy resolution" + NL + "\t\t// Ensure that you remove @generated or mark it @generated NOT" + NL + "\t\tthrow new UnsupportedOperationException();";
>+ protected final String TEXT_547 = NL + "\t}" + NL;
>+ protected final String TEXT_548 = NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */";
>+ protected final String TEXT_549 = NL + "\tpublic ";
>+ protected final String TEXT_550 = " basicSet";
>+ protected final String TEXT_551 = "(";
>+ protected final String TEXT_552 = " new";
>+ protected final String TEXT_553 = ", ";
>+ protected final String TEXT_554 = " msgs)" + NL + "\t{";
>+ protected final String TEXT_555 = NL + "\t\tmsgs = eBasicSetContainer((";
>+ protected final String TEXT_556 = ")new";
>+ protected final String TEXT_557 = ", ";
>+ protected final String TEXT_558 = ", msgs);";
>+ protected final String TEXT_559 = NL + "\t\treturn msgs;";
>+ protected final String TEXT_560 = NL + "\t\tmsgs = eDynamicInverseAdd((";
>+ protected final String TEXT_561 = ")new";
>+ protected final String TEXT_562 = ", ";
>+ protected final String TEXT_563 = ", msgs);";
>+ protected final String TEXT_564 = NL + "\t\treturn msgs;";
>+ protected final String TEXT_565 = NL + "\t\tObject old";
>+ protected final String TEXT_566 = " = eVirtualSet(";
>+ protected final String TEXT_567 = ", new";
>+ protected final String TEXT_568 = ");";
>+ protected final String TEXT_569 = NL + "\t\t";
>+ protected final String TEXT_570 = " old";
>+ protected final String TEXT_571 = " = ";
>+ protected final String TEXT_572 = ";" + NL + "\t\t";
>+ protected final String TEXT_573 = " = new";
>+ protected final String TEXT_574 = ";";
>+ protected final String TEXT_575 = NL + "\t\tboolean isSetChange = old";
>+ protected final String TEXT_576 = " == EVIRTUAL_NO_VALUE;";
>+ protected final String TEXT_577 = NL + "\t\tboolean old";
>+ protected final String TEXT_578 = "ESet = (";
>+ protected final String TEXT_579 = " & ";
>+ protected final String TEXT_580 = "_ESETFLAG) != 0;";
>+ protected final String TEXT_581 = NL + "\t\t";
>+ protected final String TEXT_582 = " |= ";
>+ protected final String TEXT_583 = "_ESETFLAG;";
>+ protected final String TEXT_584 = NL + "\t\tboolean old";
>+ protected final String TEXT_585 = "ESet = ";
>+ protected final String TEXT_586 = "ESet;";
>+ protected final String TEXT_587 = NL + "\t\t";
>+ protected final String TEXT_588 = "ESet = true;";
>+ protected final String TEXT_589 = NL + "\t\tif (eNotificationRequired())" + NL + "\t\t{";
>+ protected final String TEXT_590 = NL + "\t\t\t";
>+ protected final String TEXT_591 = " notification = new ";
>+ protected final String TEXT_592 = "(this, ";
>+ protected final String TEXT_593 = ".SET, ";
>+ protected final String TEXT_594 = ", ";
>+ protected final String TEXT_595 = "isSetChange ? null : old";
>+ protected final String TEXT_596 = "old";
>+ protected final String TEXT_597 = ", new";
>+ protected final String TEXT_598 = ", ";
>+ protected final String TEXT_599 = "isSetChange";
>+ protected final String TEXT_600 = "!old";
>+ protected final String TEXT_601 = "ESet";
>+ protected final String TEXT_602 = ");";
>+ protected final String TEXT_603 = NL + "\t\t\t";
>+ protected final String TEXT_604 = " notification = new ";
>+ protected final String TEXT_605 = "(this, ";
>+ protected final String TEXT_606 = ".SET, ";
>+ protected final String TEXT_607 = ", ";
>+ protected final String TEXT_608 = "old";
>+ protected final String TEXT_609 = " == EVIRTUAL_NO_VALUE ? null : old";
>+ protected final String TEXT_610 = "old";
>+ protected final String TEXT_611 = ", new";
>+ protected final String TEXT_612 = ");";
>+ protected final String TEXT_613 = NL + "\t\t\tif (msgs == null) msgs = notification; else msgs.add(notification);" + NL + "\t\t}";
>+ protected final String TEXT_614 = NL + "\t\treturn msgs;";
>+ protected final String TEXT_615 = NL + "\t\treturn ((";
>+ protected final String TEXT_616 = ".Internal)((";
>+ protected final String TEXT_617 = ".Internal.Wrapper)get";
>+ protected final String TEXT_618 = "()).featureMap()).basicAdd(";
>+ protected final String TEXT_619 = ", new";
>+ protected final String TEXT_620 = ", msgs);";
>+ protected final String TEXT_621 = NL + "\t\treturn ((";
>+ protected final String TEXT_622 = ".Internal)get";
>+ protected final String TEXT_623 = "()).basicAdd(";
>+ protected final String TEXT_624 = ", new";
>+ protected final String TEXT_625 = ", msgs);";
>+ protected final String TEXT_626 = NL + "\t\t// TODO: implement this method to set the contained '";
>+ protected final String TEXT_627 = "' ";
>+ protected final String TEXT_628 = NL + "\t\t// -> this method is automatically invoked to keep the containment relationship in synch" + NL + "\t\t// -> do not modify other features" + NL + "\t\t// -> return msgs, after adding any generated Notification to it (if it is null, a NotificationChain object must be created first)" + NL + "\t\t// Ensure that you remove @generated or mark it @generated NOT" + NL + "\t\tthrow new UnsupportedOperationException();";
>+ protected final String TEXT_629 = NL + "\t}" + NL;
>+ protected final String TEXT_630 = NL + "\t/**" + NL + "\t * Sets the value of the '{@link ";
>+ protected final String TEXT_631 = "#";
>+ protected final String TEXT_632 = " ";
>+ protected final String TEXT_633 = "}' ";
>+ protected final String TEXT_634 = ".";
>+ protected final String TEXT_635 = NL + "\t * " + NL + "\t * " + NL + "\t * @param value the new value of the '";
>+ protected final String TEXT_636 = "' ";
>+ protected final String TEXT_637 = ".";
>+ protected final String TEXT_638 = NL + "\t * @see ";
>+ protected final String TEXT_639 = NL + "\t * @see #isSet";
>+ protected final String TEXT_640 = "()";
>+ protected final String TEXT_641 = NL + "\t * @see #unset";
>+ protected final String TEXT_642 = "()";
>+ protected final String TEXT_643 = NL + "\t * @see #";
>+ protected final String TEXT_644 = "()" + NL + "\t * @generated" + NL + "\t */";
>+ protected final String TEXT_645 = NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */";
>+ protected final String TEXT_646 = NL + "\tvoid set";
>+ protected final String TEXT_647 = "(";
>+ protected final String TEXT_648 = " value);" + NL;
>+ protected final String TEXT_649 = NL + "\tpublic void set";
>+ protected final String TEXT_650 = "_";
>+ protected final String TEXT_651 = "(";
>+ protected final String TEXT_652 = " ";
>+ protected final String TEXT_653 = ")" + NL + "\t{";
>+ protected final String TEXT_654 = NL + "\t\teDynamicSet(";
> protected final String TEXT_655 = ", ";
>- protected final String TEXT_656 = "new ";
>- protected final String TEXT_657 = "(";
>- protected final String TEXT_658 = "new";
>- protected final String TEXT_659 = ")";
>- protected final String TEXT_660 = ");";
>- protected final String TEXT_661 = NL + "\t\teSet(";
>- protected final String TEXT_662 = ", ";
>- protected final String TEXT_663 = "new ";
>- protected final String TEXT_664 = "(";
>- protected final String TEXT_665 = "new";
>- protected final String TEXT_666 = ")";
>- protected final String TEXT_667 = ");";
>- protected final String TEXT_668 = NL + "\t\t";
>- protected final String TEXT_669 = "__ESETTING_DELEGATE.dynamicSet(this, null, 0, ";
>- protected final String TEXT_670 = "new ";
>- protected final String TEXT_671 = "(";
>- protected final String TEXT_672 = "new";
>- protected final String TEXT_673 = ")";
>- protected final String TEXT_674 = ");";
>- protected final String TEXT_675 = NL + "\t\tif (new";
>- protected final String TEXT_676 = " != eInternalContainer() || (eContainerFeatureID() != ";
>- protected final String TEXT_677 = " && new";
>- protected final String TEXT_678 = " != null))" + NL + "\t\t{" + NL + "\t\t\tif (";
>- protected final String TEXT_679 = ".isAncestor(this, ";
>- protected final String TEXT_680 = "new";
>- protected final String TEXT_681 = "))" + NL + "\t\t\t\tthrow new ";
>- protected final String TEXT_682 = "(\"Recursive containment not allowed for \" + toString());";
>- protected final String TEXT_683 = NL + "\t\t\t";
>- protected final String TEXT_684 = " msgs = null;" + NL + "\t\t\tif (eInternalContainer() != null)" + NL + "\t\t\t\tmsgs = eBasicRemoveFromContainer(msgs);" + NL + "\t\t\tif (new";
>- protected final String TEXT_685 = " != null)" + NL + "\t\t\t\tmsgs = ((";
>- protected final String TEXT_686 = ")new";
>- protected final String TEXT_687 = ").eInverseAdd(this, ";
>- protected final String TEXT_688 = ", ";
>- protected final String TEXT_689 = ".class, msgs);" + NL + "\t\t\tmsgs = basicSet";
>- protected final String TEXT_690 = "(";
>- protected final String TEXT_691 = "new";
>- protected final String TEXT_692 = ", msgs);" + NL + "\t\t\tif (msgs != null) msgs.dispatch();" + NL + "\t\t}";
>- protected final String TEXT_693 = NL + "\t\telse if (eNotificationRequired())" + NL + "\t\t\teNotify(new ";
>- protected final String TEXT_694 = "(this, ";
>- protected final String TEXT_695 = ".SET, ";
>- protected final String TEXT_696 = ", new";
>+ protected final String TEXT_656 = ", ";
>+ protected final String TEXT_657 = "new ";
>+ protected final String TEXT_658 = "(";
>+ protected final String TEXT_659 = "new";
>+ protected final String TEXT_660 = ")";
>+ protected final String TEXT_661 = ");";
>+ protected final String TEXT_662 = NL + "\t\teSet(";
>+ protected final String TEXT_663 = ", ";
>+ protected final String TEXT_664 = "new ";
>+ protected final String TEXT_665 = "(";
>+ protected final String TEXT_666 = "new";
>+ protected final String TEXT_667 = ")";
>+ protected final String TEXT_668 = ");";
>+ protected final String TEXT_669 = NL + "\t\t";
>+ protected final String TEXT_670 = "__ESETTING_DELEGATE.dynamicSet(this, null, 0, ";
>+ protected final String TEXT_671 = "new ";
>+ protected final String TEXT_672 = "(";
>+ protected final String TEXT_673 = "new";
>+ protected final String TEXT_674 = ")";
>+ protected final String TEXT_675 = ");";
>+ protected final String TEXT_676 = NL + "\t\tif (new";
>+ protected final String TEXT_677 = " != eInternalContainer() || (eContainerFeatureID() != ";
>+ protected final String TEXT_678 = " && new";
>+ protected final String TEXT_679 = " != null))" + NL + "\t\t{" + NL + "\t\t\tif (";
>+ protected final String TEXT_680 = ".isAncestor(this, ";
>+ protected final String TEXT_681 = "new";
>+ protected final String TEXT_682 = "))" + NL + "\t\t\t\tthrow new ";
>+ protected final String TEXT_683 = "(\"Recursive containment not allowed for \" + toString());";
>+ protected final String TEXT_684 = NL + "\t\t\t";
>+ protected final String TEXT_685 = " msgs = null;" + NL + "\t\t\tif (eInternalContainer() != null)" + NL + "\t\t\t\tmsgs = eBasicRemoveFromContainer(msgs);" + NL + "\t\t\tif (new";
>+ protected final String TEXT_686 = " != null)" + NL + "\t\t\t\tmsgs = ((";
>+ protected final String TEXT_687 = ")new";
>+ protected final String TEXT_688 = ").eInverseAdd(this, ";
>+ protected final String TEXT_689 = ", ";
>+ protected final String TEXT_690 = ".class, msgs);" + NL + "\t\t\tmsgs = basicSet";
>+ protected final String TEXT_691 = "(";
>+ protected final String TEXT_692 = "new";
>+ protected final String TEXT_693 = ", msgs);" + NL + "\t\t\tif (msgs != null) msgs.dispatch();" + NL + "\t\t}";
>+ protected final String TEXT_694 = NL + "\t\telse if (eNotificationRequired())" + NL + "\t\t\teNotify(new ";
>+ protected final String TEXT_695 = "(this, ";
>+ protected final String TEXT_696 = ".SET, ";
> protected final String TEXT_697 = ", new";
>- protected final String TEXT_698 = "));";
>- protected final String TEXT_699 = NL + "\t\t";
>- protected final String TEXT_700 = " ";
>- protected final String TEXT_701 = " = (";
>- protected final String TEXT_702 = ")eVirtualGet(";
>- protected final String TEXT_703 = ");";
>- protected final String TEXT_704 = NL + "\t\tif (new";
>- protected final String TEXT_705 = " != ";
>- protected final String TEXT_706 = ")" + NL + "\t\t{" + NL + "\t\t\t";
>- protected final String TEXT_707 = " msgs = null;" + NL + "\t\t\tif (";
>- protected final String TEXT_708 = " != null)";
>- protected final String TEXT_709 = NL + "\t\t\t\tmsgs = ((";
>- protected final String TEXT_710 = ")";
>- protected final String TEXT_711 = ").eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ";
>- protected final String TEXT_712 = ", null, msgs);" + NL + "\t\t\tif (new";
>- protected final String TEXT_713 = " != null)" + NL + "\t\t\t\tmsgs = ((";
>- protected final String TEXT_714 = ")new";
>- protected final String TEXT_715 = ").eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ";
>- protected final String TEXT_716 = ", null, msgs);";
>- protected final String TEXT_717 = NL + "\t\t\t\tmsgs = ((";
>- protected final String TEXT_718 = ")";
>- protected final String TEXT_719 = ").eInverseRemove(this, ";
>- protected final String TEXT_720 = ", ";
>- protected final String TEXT_721 = ".class, msgs);" + NL + "\t\t\tif (new";
>- protected final String TEXT_722 = " != null)" + NL + "\t\t\t\tmsgs = ((";
>- protected final String TEXT_723 = ")new";
>- protected final String TEXT_724 = ").eInverseAdd(this, ";
>- protected final String TEXT_725 = ", ";
>- protected final String TEXT_726 = ".class, msgs);";
>- protected final String TEXT_727 = NL + "\t\t\tmsgs = basicSet";
>- protected final String TEXT_728 = "(";
>- protected final String TEXT_729 = "new";
>- protected final String TEXT_730 = ", msgs);" + NL + "\t\t\tif (msgs != null) msgs.dispatch();" + NL + "\t\t}";
>- protected final String TEXT_731 = NL + "\t\telse" + NL + "\t\t{";
>- protected final String TEXT_732 = NL + "\t\t\tboolean old";
>- protected final String TEXT_733 = "ESet = eVirtualIsSet(";
>- protected final String TEXT_734 = ");";
>- protected final String TEXT_735 = NL + "\t\t\tboolean old";
>- protected final String TEXT_736 = "ESet = (";
>- protected final String TEXT_737 = " & ";
>- protected final String TEXT_738 = "_ESETFLAG) != 0;";
>- protected final String TEXT_739 = NL + "\t\t\t";
>- protected final String TEXT_740 = " |= ";
>- protected final String TEXT_741 = "_ESETFLAG;";
>- protected final String TEXT_742 = NL + "\t\t\tboolean old";
>- protected final String TEXT_743 = "ESet = ";
>- protected final String TEXT_744 = "ESet;";
>- protected final String TEXT_745 = NL + "\t\t\t";
>- protected final String TEXT_746 = "ESet = true;";
>- protected final String TEXT_747 = NL + "\t\t\tif (eNotificationRequired())" + NL + "\t\t\t\teNotify(new ";
>- protected final String TEXT_748 = "(this, ";
>- protected final String TEXT_749 = ".SET, ";
>- protected final String TEXT_750 = ", new";
>+ protected final String TEXT_698 = ", new";
>+ protected final String TEXT_699 = "));";
>+ protected final String TEXT_700 = NL + "\t\t";
>+ protected final String TEXT_701 = " ";
>+ protected final String TEXT_702 = " = (";
>+ protected final String TEXT_703 = ")eVirtualGet(";
>+ protected final String TEXT_704 = ");";
>+ protected final String TEXT_705 = NL + "\t\tif (new";
>+ protected final String TEXT_706 = " != ";
>+ protected final String TEXT_707 = ")" + NL + "\t\t{" + NL + "\t\t\t";
>+ protected final String TEXT_708 = " msgs = null;" + NL + "\t\t\tif (";
>+ protected final String TEXT_709 = " != null)";
>+ protected final String TEXT_710 = NL + "\t\t\t\tmsgs = ((";
>+ protected final String TEXT_711 = ")";
>+ protected final String TEXT_712 = ").eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ";
>+ protected final String TEXT_713 = ", null, msgs);" + NL + "\t\t\tif (new";
>+ protected final String TEXT_714 = " != null)" + NL + "\t\t\t\tmsgs = ((";
>+ protected final String TEXT_715 = ")new";
>+ protected final String TEXT_716 = ").eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ";
>+ protected final String TEXT_717 = ", null, msgs);";
>+ protected final String TEXT_718 = NL + "\t\t\t\tmsgs = ((";
>+ protected final String TEXT_719 = ")";
>+ protected final String TEXT_720 = ").eInverseRemove(this, ";
>+ protected final String TEXT_721 = ", ";
>+ protected final String TEXT_722 = ".class, msgs);" + NL + "\t\t\tif (new";
>+ protected final String TEXT_723 = " != null)" + NL + "\t\t\t\tmsgs = ((";
>+ protected final String TEXT_724 = ")new";
>+ protected final String TEXT_725 = ").eInverseAdd(this, ";
>+ protected final String TEXT_726 = ", ";
>+ protected final String TEXT_727 = ".class, msgs);";
>+ protected final String TEXT_728 = NL + "\t\t\tmsgs = basicSet";
>+ protected final String TEXT_729 = "(";
>+ protected final String TEXT_730 = "new";
>+ protected final String TEXT_731 = ", msgs);" + NL + "\t\t\tif (msgs != null) msgs.dispatch();" + NL + "\t\t}";
>+ protected final String TEXT_732 = NL + "\t\telse" + NL + "\t\t{";
>+ protected final String TEXT_733 = NL + "\t\t\tboolean old";
>+ protected final String TEXT_734 = "ESet = eVirtualIsSet(";
>+ protected final String TEXT_735 = ");";
>+ protected final String TEXT_736 = NL + "\t\t\tboolean old";
>+ protected final String TEXT_737 = "ESet = (";
>+ protected final String TEXT_738 = " & ";
>+ protected final String TEXT_739 = "_ESETFLAG) != 0;";
>+ protected final String TEXT_740 = NL + "\t\t\t";
>+ protected final String TEXT_741 = " |= ";
>+ protected final String TEXT_742 = "_ESETFLAG;";
>+ protected final String TEXT_743 = NL + "\t\t\tboolean old";
>+ protected final String TEXT_744 = "ESet = ";
>+ protected final String TEXT_745 = "ESet;";
>+ protected final String TEXT_746 = NL + "\t\t\t";
>+ protected final String TEXT_747 = "ESet = true;";
>+ protected final String TEXT_748 = NL + "\t\t\tif (eNotificationRequired())" + NL + "\t\t\t\teNotify(new ";
>+ protected final String TEXT_749 = "(this, ";
>+ protected final String TEXT_750 = ".SET, ";
> protected final String TEXT_751 = ", new";
>- protected final String TEXT_752 = ", !old";
>- protected final String TEXT_753 = "ESet));";
>- protected final String TEXT_754 = NL + "\t\t}";
>- protected final String TEXT_755 = NL + "\t\telse if (eNotificationRequired())" + NL + "\t\t\teNotify(new ";
>- protected final String TEXT_756 = "(this, ";
>- protected final String TEXT_757 = ".SET, ";
>- protected final String TEXT_758 = ", new";
>+ protected final String TEXT_752 = ", new";
>+ protected final String TEXT_753 = ", !old";
>+ protected final String TEXT_754 = "ESet));";
>+ protected final String TEXT_755 = NL + "\t\t}";
>+ protected final String TEXT_756 = NL + "\t\telse if (eNotificationRequired())" + NL + "\t\t\teNotify(new ";
>+ protected final String TEXT_757 = "(this, ";
>+ protected final String TEXT_758 = ".SET, ";
> protected final String TEXT_759 = ", new";
>- protected final String TEXT_760 = "));";
>- protected final String TEXT_761 = NL + "\t\t";
>- protected final String TEXT_762 = " old";
>- protected final String TEXT_763 = " = (";
>- protected final String TEXT_764 = " & ";
>- protected final String TEXT_765 = "_EFLAG) != 0;";
>- protected final String TEXT_766 = NL + "\t\t";
>- protected final String TEXT_767 = " old";
>- protected final String TEXT_768 = " = ";
>- protected final String TEXT_769 = "_EFLAG_VALUES[(";
>- protected final String TEXT_770 = " & ";
>- protected final String TEXT_771 = "_EFLAG) >>> ";
>- protected final String TEXT_772 = "_EFLAG_OFFSET];";
>- protected final String TEXT_773 = NL + "\t\tif (new";
>- protected final String TEXT_774 = ") ";
>- protected final String TEXT_775 = " |= ";
>- protected final String TEXT_776 = "_EFLAG; else ";
>- protected final String TEXT_777 = " &= ~";
>- protected final String TEXT_778 = "_EFLAG;";
>- protected final String TEXT_779 = NL + "\t\tif (new";
>- protected final String TEXT_780 = " == null) new";
>- protected final String TEXT_781 = " = ";
>- protected final String TEXT_782 = "_EDEFAULT;" + NL + "\t\t";
>- protected final String TEXT_783 = " = ";
>- protected final String TEXT_784 = " & ~";
>- protected final String TEXT_785 = "_EFLAG | ";
>- protected final String TEXT_786 = "new";
>- protected final String TEXT_787 = ".ordinal()";
>- protected final String TEXT_788 = ".VALUES.indexOf(new";
>- protected final String TEXT_789 = ")";
>- protected final String TEXT_790 = " << ";
>- protected final String TEXT_791 = "_EFLAG_OFFSET;";
>- protected final String TEXT_792 = NL + "\t\t";
>- protected final String TEXT_793 = " old";
>- protected final String TEXT_794 = " = ";
>- protected final String TEXT_795 = ";";
>- protected final String TEXT_796 = NL + "\t\t";
>- protected final String TEXT_797 = " ";
>- protected final String TEXT_798 = " = new";
>- protected final String TEXT_799 = " == null ? ";
>- protected final String TEXT_800 = " : new";
>- protected final String TEXT_801 = ";";
>- protected final String TEXT_802 = NL + "\t\t";
>- protected final String TEXT_803 = " = new";
>- protected final String TEXT_804 = " == null ? ";
>- protected final String TEXT_805 = " : new";
>- protected final String TEXT_806 = ";";
>- protected final String TEXT_807 = NL + "\t\t";
>- protected final String TEXT_808 = " ";
>- protected final String TEXT_809 = " = ";
>- protected final String TEXT_810 = "new";
>- protected final String TEXT_811 = ";";
>- protected final String TEXT_812 = NL + "\t\t";
>- protected final String TEXT_813 = " = ";
>- protected final String TEXT_814 = "new";
>- protected final String TEXT_815 = ";";
>- protected final String TEXT_816 = NL + "\t\tObject old";
>- protected final String TEXT_817 = " = eVirtualSet(";
>- protected final String TEXT_818 = ", ";
>- protected final String TEXT_819 = ");";
>- protected final String TEXT_820 = NL + "\t\tboolean isSetChange = old";
>- protected final String TEXT_821 = " == EVIRTUAL_NO_VALUE;";
>- protected final String TEXT_822 = NL + "\t\tboolean old";
>- protected final String TEXT_823 = "ESet = (";
>- protected final String TEXT_824 = " & ";
>- protected final String TEXT_825 = "_ESETFLAG) != 0;";
>- protected final String TEXT_826 = NL + "\t\t";
>- protected final String TEXT_827 = " |= ";
>- protected final String TEXT_828 = "_ESETFLAG;";
>- protected final String TEXT_829 = NL + "\t\tboolean old";
>- protected final String TEXT_830 = "ESet = ";
>- protected final String TEXT_831 = "ESet;";
>- protected final String TEXT_832 = NL + "\t\t";
>- protected final String TEXT_833 = "ESet = true;";
>- protected final String TEXT_834 = NL + "\t\tif (eNotificationRequired())" + NL + "\t\t\teNotify(new ";
>- protected final String TEXT_835 = "(this, ";
>- protected final String TEXT_836 = ".SET, ";
>- protected final String TEXT_837 = ", ";
>- protected final String TEXT_838 = "isSetChange ? ";
>- protected final String TEXT_839 = " : old";
>- protected final String TEXT_840 = "old";
>- protected final String TEXT_841 = ", ";
>- protected final String TEXT_842 = "new";
>- protected final String TEXT_843 = ", ";
>- protected final String TEXT_844 = "isSetChange";
>- protected final String TEXT_845 = "!old";
>- protected final String TEXT_846 = "ESet";
>- protected final String TEXT_847 = "));";
>- protected final String TEXT_848 = NL + "\t\tif (eNotificationRequired())" + NL + "\t\t\teNotify(new ";
>- protected final String TEXT_849 = "(this, ";
>- protected final String TEXT_850 = ".SET, ";
>- protected final String TEXT_851 = ", ";
>- protected final String TEXT_852 = "old";
>- protected final String TEXT_853 = " == EVIRTUAL_NO_VALUE ? ";
>- protected final String TEXT_854 = " : old";
>- protected final String TEXT_855 = "old";
>- protected final String TEXT_856 = ", ";
>- protected final String TEXT_857 = "new";
>- protected final String TEXT_858 = "));";
>- protected final String TEXT_859 = NL + "\t\t((";
>- protected final String TEXT_860 = ".Internal)((";
>- protected final String TEXT_861 = ".Internal.Wrapper)get";
>- protected final String TEXT_862 = "()).featureMap()).set(";
>- protected final String TEXT_863 = ", ";
>- protected final String TEXT_864 = "new ";
>- protected final String TEXT_865 = "(";
>- protected final String TEXT_866 = "new";
>- protected final String TEXT_867 = ")";
>- protected final String TEXT_868 = ");";
>- protected final String TEXT_869 = NL + "\t\t((";
>- protected final String TEXT_870 = ".Internal)get";
>- protected final String TEXT_871 = "()).set(";
>- protected final String TEXT_872 = ", ";
>- protected final String TEXT_873 = "new ";
>- protected final String TEXT_874 = "(";
>- protected final String TEXT_875 = "new";
>- protected final String TEXT_876 = ")";
>- protected final String TEXT_877 = ");";
>- protected final String TEXT_878 = NL + "\t\t";
>- protected final String TEXT_879 = NL + "\t\t// TODO: implement this method to set the '";
>- protected final String TEXT_880 = "' ";
>- protected final String TEXT_881 = NL + "\t\t// Ensure that you remove @generated or mark it @generated NOT" + NL + "\t\tthrow new UnsupportedOperationException();";
>- protected final String TEXT_882 = NL + "\t}" + NL;
>- protected final String TEXT_883 = NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */";
>- protected final String TEXT_884 = NL + "\tpublic ";
>- protected final String TEXT_885 = " basicUnset";
>- protected final String TEXT_886 = "(";
>- protected final String TEXT_887 = " msgs)" + NL + "\t{";
>- protected final String TEXT_888 = NL + "\t\treturn eDynamicInverseRemove((";
>- protected final String TEXT_889 = ")";
>- protected final String TEXT_890 = "basicGet";
>- protected final String TEXT_891 = "(), ";
>- protected final String TEXT_892 = ", msgs);";
>- protected final String TEXT_893 = "Object old";
>- protected final String TEXT_894 = " = ";
>- protected final String TEXT_895 = "eVirtualUnset(";
>- protected final String TEXT_896 = ");";
>- protected final String TEXT_897 = NL + "\t\t";
>- protected final String TEXT_898 = " old";
>- protected final String TEXT_899 = " = ";
>- protected final String TEXT_900 = ";";
>- protected final String TEXT_901 = NL + "\t\t";
>- protected final String TEXT_902 = " = null;";
>- protected final String TEXT_903 = NL + "\t\tboolean isSetChange = old";
>- protected final String TEXT_904 = " != EVIRTUAL_NO_VALUE;";
>- protected final String TEXT_905 = NL + "\t\tboolean old";
>- protected final String TEXT_906 = "ESet = (";
>- protected final String TEXT_907 = " & ";
>- protected final String TEXT_908 = "_ESETFLAG) != 0;";
>- protected final String TEXT_909 = NL + "\t\t";
>- protected final String TEXT_910 = " &= ~";
>- protected final String TEXT_911 = "_ESETFLAG;";
>- protected final String TEXT_912 = NL + "\t\tboolean old";
>- protected final String TEXT_913 = "ESet = ";
>- protected final String TEXT_914 = "ESet;";
>- protected final String TEXT_915 = NL + "\t\t";
>- protected final String TEXT_916 = "ESet = false;";
>- protected final String TEXT_917 = NL + "\t\tif (eNotificationRequired())" + NL + "\t\t{" + NL + "\t\t\t";
>- protected final String TEXT_918 = " notification = new ";
>- protected final String TEXT_919 = "(this, ";
>- protected final String TEXT_920 = ".UNSET, ";
>- protected final String TEXT_921 = ", ";
>- protected final String TEXT_922 = "isSetChange ? old";
>- protected final String TEXT_923 = " : null";
>- protected final String TEXT_924 = "old";
>- protected final String TEXT_925 = ", null, ";
>- protected final String TEXT_926 = "isSetChange";
>- protected final String TEXT_927 = "old";
>- protected final String TEXT_928 = "ESet";
>- protected final String TEXT_929 = ");" + NL + "\t\t\tif (msgs == null) msgs = notification; else msgs.add(notification);" + NL + "\t\t}" + NL + "\t\treturn msgs;";
>- protected final String TEXT_930 = NL + "\t\t// TODO: implement this method to unset the contained '";
>- protected final String TEXT_931 = "' ";
>- protected final String TEXT_932 = NL + "\t\t// -> this method is automatically invoked to keep the containment relationship in synch" + NL + "\t\t// -> do not modify other features" + NL + "\t\t// -> return msgs, after adding any generated Notification to it (if it is null, a NotificationChain object must be created first)" + NL + "\t\t// Ensure that you remove @generated or mark it @generated NOT" + NL + "\t\tthrow new UnsupportedOperationException();";
>- protected final String TEXT_933 = NL + "\t}" + NL;
>- protected final String TEXT_934 = NL + "\t/**" + NL + "\t * Unsets the value of the '{@link ";
>- protected final String TEXT_935 = "#";
>- protected final String TEXT_936 = " ";
>- protected final String TEXT_937 = "}' ";
>- protected final String TEXT_938 = ".";
>- protected final String TEXT_939 = NL + "\t * " + NL + "\t * ";
>- protected final String TEXT_940 = NL + "\t * @see #isSet";
>- protected final String TEXT_941 = "()";
>- protected final String TEXT_942 = NL + "\t * @see #";
>- protected final String TEXT_943 = "()";
>- protected final String TEXT_944 = NL + "\t * @see #set";
>- protected final String TEXT_945 = "(";
>- protected final String TEXT_946 = ")";
>- protected final String TEXT_947 = NL + "\t * @generated" + NL + "\t */";
>- protected final String TEXT_948 = NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */";
>- protected final String TEXT_949 = NL + "\tvoid unset";
>- protected final String TEXT_950 = "();" + NL;
>- protected final String TEXT_951 = NL + "\tpublic void unset";
>- protected final String TEXT_952 = "_";
>- protected final String TEXT_953 = "()" + NL + "\t{";
>- protected final String TEXT_954 = NL + "\t\teDynamicUnset(";
>- protected final String TEXT_955 = ", ";
>- protected final String TEXT_956 = ");";
>- protected final String TEXT_957 = NL + "\t\teUnset(";
>- protected final String TEXT_958 = ");";
>- protected final String TEXT_959 = NL + "\t\t";
>- protected final String TEXT_960 = "__ESETTING_DELEGATE.dynamicUnset(this, null, 0);";
>- protected final String TEXT_961 = NL + "\t\t";
>- protected final String TEXT_962 = " ";
>- protected final String TEXT_963 = " = (";
>- protected final String TEXT_964 = ")eVirtualGet(";
>- protected final String TEXT_965 = ");";
>- protected final String TEXT_966 = NL + "\t\tif (";
>- protected final String TEXT_967 = " != null) ((";
>- protected final String TEXT_968 = ".Unsettable";
>- protected final String TEXT_969 = ")";
>- protected final String TEXT_970 = ").unset();";
>- protected final String TEXT_971 = NL + "\t\t";
>- protected final String TEXT_972 = " ";
>- protected final String TEXT_973 = " = (";
>- protected final String TEXT_974 = ")eVirtualGet(";
>- protected final String TEXT_975 = ");";
>- protected final String TEXT_976 = NL + "\t\tif (";
>- protected final String TEXT_977 = " != null)" + NL + "\t\t{" + NL + "\t\t\t";
>- protected final String TEXT_978 = " msgs = null;";
>- protected final String TEXT_979 = NL + "\t\t\tmsgs = ((";
>- protected final String TEXT_980 = ")";
>- protected final String TEXT_981 = ").eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ";
>- protected final String TEXT_982 = ", null, msgs);";
>- protected final String TEXT_983 = NL + "\t\t\tmsgs = ((";
>- protected final String TEXT_984 = ")";
>- protected final String TEXT_985 = ").eInverseRemove(this, ";
>- protected final String TEXT_986 = ", ";
>- protected final String TEXT_987 = ".class, msgs);";
>- protected final String TEXT_988 = NL + "\t\t\tmsgs = basicUnset";
>- protected final String TEXT_989 = "(msgs);" + NL + "\t\t\tif (msgs != null) msgs.dispatch();" + NL + "\t\t}" + NL + "\t\telse" + NL + "\t\t{";
>- protected final String TEXT_990 = NL + "\t\t\tboolean old";
>- protected final String TEXT_991 = "ESet = eVirtualIsSet(";
>- protected final String TEXT_992 = ");";
>- protected final String TEXT_993 = NL + "\t\t\tboolean old";
>- protected final String TEXT_994 = "ESet = (";
>- protected final String TEXT_995 = " & ";
>- protected final String TEXT_996 = "_ESETFLAG) != 0;";
>- protected final String TEXT_997 = NL + "\t\t\t";
>- protected final String TEXT_998 = " &= ~";
>- protected final String TEXT_999 = "_ESETFLAG;";
>- protected final String TEXT_1000 = NL + "\t\t\tboolean old";
>- protected final String TEXT_1001 = "ESet = ";
>- protected final String TEXT_1002 = "ESet;";
>- protected final String TEXT_1003 = NL + "\t\t\t";
>- protected final String TEXT_1004 = "ESet = false;";
>- protected final String TEXT_1005 = NL + "\t\t\tif (eNotificationRequired())" + NL + "\t\t\t\teNotify(new ";
>- protected final String TEXT_1006 = "(this, ";
>- protected final String TEXT_1007 = ".UNSET, ";
>- protected final String TEXT_1008 = ", null, null, old";
>- protected final String TEXT_1009 = "ESet));";
>- protected final String TEXT_1010 = NL + "\t\t}";
>- protected final String TEXT_1011 = NL + "\t\t";
>- protected final String TEXT_1012 = " old";
>- protected final String TEXT_1013 = " = (";
>- protected final String TEXT_1014 = " & ";
>- protected final String TEXT_1015 = "_EFLAG) != 0;";
>- protected final String TEXT_1016 = NL + "\t\t";
>- protected final String TEXT_1017 = " old";
>- protected final String TEXT_1018 = " = ";
>- protected final String TEXT_1019 = "_EFLAG_VALUES[(";
>- protected final String TEXT_1020 = " & ";
>- protected final String TEXT_1021 = "_EFLAG) >>> ";
>- protected final String TEXT_1022 = "_EFLAG_OFFSET];";
>- protected final String TEXT_1023 = NL + "\t\tObject old";
>- protected final String TEXT_1024 = " = eVirtualUnset(";
>- protected final String TEXT_1025 = ");";
>- protected final String TEXT_1026 = NL + "\t\t";
>- protected final String TEXT_1027 = " old";
>- protected final String TEXT_1028 = " = ";
>- protected final String TEXT_1029 = ";";
>- protected final String TEXT_1030 = NL + "\t\tboolean isSetChange = old";
>- protected final String TEXT_1031 = " != EVIRTUAL_NO_VALUE;";
>- protected final String TEXT_1032 = NL + "\t\tboolean old";
>- protected final String TEXT_1033 = "ESet = (";
>- protected final String TEXT_1034 = " & ";
>- protected final String TEXT_1035 = "_ESETFLAG) != 0;";
>- protected final String TEXT_1036 = NL + "\t\tboolean old";
>- protected final String TEXT_1037 = "ESet = ";
>- protected final String TEXT_1038 = "ESet;";
>- protected final String TEXT_1039 = NL + "\t\t";
>- protected final String TEXT_1040 = " = null;";
>- protected final String TEXT_1041 = NL + "\t\t";
>- protected final String TEXT_1042 = " &= ~";
>- protected final String TEXT_1043 = "_ESETFLAG;";
>- protected final String TEXT_1044 = NL + "\t\t";
>- protected final String TEXT_1045 = "ESet = false;";
>- protected final String TEXT_1046 = NL + "\t\tif (eNotificationRequired())" + NL + "\t\t\teNotify(new ";
>- protected final String TEXT_1047 = "(this, ";
>- protected final String TEXT_1048 = ".UNSET, ";
>- protected final String TEXT_1049 = ", ";
>- protected final String TEXT_1050 = "isSetChange ? old";
>- protected final String TEXT_1051 = " : null";
>- protected final String TEXT_1052 = "old";
>- protected final String TEXT_1053 = ", null, ";
>- protected final String TEXT_1054 = "isSetChange";
>- protected final String TEXT_1055 = "old";
>- protected final String TEXT_1056 = "ESet";
>- protected final String TEXT_1057 = "));";
>- protected final String TEXT_1058 = NL + "\t\tif (";
>- protected final String TEXT_1059 = ") ";
>- protected final String TEXT_1060 = " |= ";
>- protected final String TEXT_1061 = "_EFLAG; else ";
>- protected final String TEXT_1062 = " &= ~";
>- protected final String TEXT_1063 = "_EFLAG;";
>- protected final String TEXT_1064 = NL + "\t\t";
>- protected final String TEXT_1065 = " = ";
>- protected final String TEXT_1066 = " & ~";
>- protected final String TEXT_1067 = "_EFLAG | ";
>- protected final String TEXT_1068 = "_EFLAG_DEFAULT;";
>- protected final String TEXT_1069 = NL + "\t\t";
>- protected final String TEXT_1070 = " = ";
>- protected final String TEXT_1071 = ";";
>- protected final String TEXT_1072 = NL + "\t\t";
>- protected final String TEXT_1073 = " &= ~";
>- protected final String TEXT_1074 = "_ESETFLAG;";
>- protected final String TEXT_1075 = NL + "\t\t";
>- protected final String TEXT_1076 = "ESet = false;";
>- protected final String TEXT_1077 = NL + "\t\tif (eNotificationRequired())" + NL + "\t\t\teNotify(new ";
>- protected final String TEXT_1078 = "(this, ";
>- protected final String TEXT_1079 = ".UNSET, ";
>- protected final String TEXT_1080 = ", ";
>- protected final String TEXT_1081 = "isSetChange ? old";
>- protected final String TEXT_1082 = " : ";
>- protected final String TEXT_1083 = "old";
>- protected final String TEXT_1084 = ", ";
>+ protected final String TEXT_760 = ", new";
>+ protected final String TEXT_761 = "));";
>+ protected final String TEXT_762 = NL + "\t\t";
>+ protected final String TEXT_763 = " old";
>+ protected final String TEXT_764 = " = (";
>+ protected final String TEXT_765 = " & ";
>+ protected final String TEXT_766 = "_EFLAG) != 0;";
>+ protected final String TEXT_767 = NL + "\t\t";
>+ protected final String TEXT_768 = " old";
>+ protected final String TEXT_769 = " = ";
>+ protected final String TEXT_770 = "_EFLAG_VALUES[(";
>+ protected final String TEXT_771 = " & ";
>+ protected final String TEXT_772 = "_EFLAG) >>> ";
>+ protected final String TEXT_773 = "_EFLAG_OFFSET];";
>+ protected final String TEXT_774 = NL + "\t\tif (new";
>+ protected final String TEXT_775 = ") ";
>+ protected final String TEXT_776 = " |= ";
>+ protected final String TEXT_777 = "_EFLAG; else ";
>+ protected final String TEXT_778 = " &= ~";
>+ protected final String TEXT_779 = "_EFLAG;";
>+ protected final String TEXT_780 = NL + "\t\tif (new";
>+ protected final String TEXT_781 = " == null) new";
>+ protected final String TEXT_782 = " = ";
>+ protected final String TEXT_783 = "_EDEFAULT;" + NL + "\t\t";
>+ protected final String TEXT_784 = " = ";
>+ protected final String TEXT_785 = " & ~";
>+ protected final String TEXT_786 = "_EFLAG | ";
>+ protected final String TEXT_787 = "new";
>+ protected final String TEXT_788 = ".ordinal()";
>+ protected final String TEXT_789 = ".VALUES.indexOf(new";
>+ protected final String TEXT_790 = ")";
>+ protected final String TEXT_791 = " << ";
>+ protected final String TEXT_792 = "_EFLAG_OFFSET;";
>+ protected final String TEXT_793 = NL + "\t\t";
>+ protected final String TEXT_794 = " old";
>+ protected final String TEXT_795 = " = ";
>+ protected final String TEXT_796 = ";";
>+ protected final String TEXT_797 = NL + "\t\t";
>+ protected final String TEXT_798 = " ";
>+ protected final String TEXT_799 = " = new";
>+ protected final String TEXT_800 = " == null ? ";
>+ protected final String TEXT_801 = " : new";
>+ protected final String TEXT_802 = ";";
>+ protected final String TEXT_803 = NL + "\t\t";
>+ protected final String TEXT_804 = " = new";
>+ protected final String TEXT_805 = " == null ? ";
>+ protected final String TEXT_806 = " : new";
>+ protected final String TEXT_807 = ";";
>+ protected final String TEXT_808 = NL + "\t\t";
>+ protected final String TEXT_809 = " ";
>+ protected final String TEXT_810 = " = ";
>+ protected final String TEXT_811 = "new";
>+ protected final String TEXT_812 = ";";
>+ protected final String TEXT_813 = NL + "\t\t";
>+ protected final String TEXT_814 = " = ";
>+ protected final String TEXT_815 = "new";
>+ protected final String TEXT_816 = ";";
>+ protected final String TEXT_817 = NL + "\t\tObject old";
>+ protected final String TEXT_818 = " = eVirtualSet(";
>+ protected final String TEXT_819 = ", ";
>+ protected final String TEXT_820 = ");";
>+ protected final String TEXT_821 = NL + "\t\tboolean isSetChange = old";
>+ protected final String TEXT_822 = " == EVIRTUAL_NO_VALUE;";
>+ protected final String TEXT_823 = NL + "\t\tboolean old";
>+ protected final String TEXT_824 = "ESet = (";
>+ protected final String TEXT_825 = " & ";
>+ protected final String TEXT_826 = "_ESETFLAG) != 0;";
>+ protected final String TEXT_827 = NL + "\t\t";
>+ protected final String TEXT_828 = " |= ";
>+ protected final String TEXT_829 = "_ESETFLAG;";
>+ protected final String TEXT_830 = NL + "\t\tboolean old";
>+ protected final String TEXT_831 = "ESet = ";
>+ protected final String TEXT_832 = "ESet;";
>+ protected final String TEXT_833 = NL + "\t\t";
>+ protected final String TEXT_834 = "ESet = true;";
>+ protected final String TEXT_835 = NL + "\t\tif (eNotificationRequired())" + NL + "\t\t\teNotify(new ";
>+ protected final String TEXT_836 = "(this, ";
>+ protected final String TEXT_837 = ".SET, ";
>+ protected final String TEXT_838 = ", ";
>+ protected final String TEXT_839 = "isSetChange ? ";
>+ protected final String TEXT_840 = " : old";
>+ protected final String TEXT_841 = "old";
>+ protected final String TEXT_842 = ", ";
>+ protected final String TEXT_843 = "new";
>+ protected final String TEXT_844 = ", ";
>+ protected final String TEXT_845 = "isSetChange";
>+ protected final String TEXT_846 = "!old";
>+ protected final String TEXT_847 = "ESet";
>+ protected final String TEXT_848 = "));";
>+ protected final String TEXT_849 = NL + "\t\tif (eNotificationRequired())" + NL + "\t\t\teNotify(new ";
>+ protected final String TEXT_850 = "(this, ";
>+ protected final String TEXT_851 = ".SET, ";
>+ protected final String TEXT_852 = ", ";
>+ protected final String TEXT_853 = "old";
>+ protected final String TEXT_854 = " == EVIRTUAL_NO_VALUE ? ";
>+ protected final String TEXT_855 = " : old";
>+ protected final String TEXT_856 = "old";
>+ protected final String TEXT_857 = ", ";
>+ protected final String TEXT_858 = "new";
>+ protected final String TEXT_859 = "));";
>+ protected final String TEXT_860 = NL + "\t\t((";
>+ protected final String TEXT_861 = ".Internal)((";
>+ protected final String TEXT_862 = ".Internal.Wrapper)get";
>+ protected final String TEXT_863 = "()).featureMap()).set(";
>+ protected final String TEXT_864 = ", ";
>+ protected final String TEXT_865 = "new ";
>+ protected final String TEXT_866 = "(";
>+ protected final String TEXT_867 = "new";
>+ protected final String TEXT_868 = ")";
>+ protected final String TEXT_869 = ");";
>+ protected final String TEXT_870 = NL + "\t\t((";
>+ protected final String TEXT_871 = ".Internal)get";
>+ protected final String TEXT_872 = "()).set(";
>+ protected final String TEXT_873 = ", ";
>+ protected final String TEXT_874 = "new ";
>+ protected final String TEXT_875 = "(";
>+ protected final String TEXT_876 = "new";
>+ protected final String TEXT_877 = ")";
>+ protected final String TEXT_878 = ");";
>+ protected final String TEXT_879 = NL + "\t\t";
>+ protected final String TEXT_880 = NL + "\t\t// TODO: implement this method to set the '";
>+ protected final String TEXT_881 = "' ";
>+ protected final String TEXT_882 = NL + "\t\t// Ensure that you remove @generated or mark it @generated NOT" + NL + "\t\tthrow new UnsupportedOperationException();";
>+ protected final String TEXT_883 = NL + "\t}" + NL;
>+ protected final String TEXT_884 = NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */";
>+ protected final String TEXT_885 = NL + "\tpublic ";
>+ protected final String TEXT_886 = " basicUnset";
>+ protected final String TEXT_887 = "(";
>+ protected final String TEXT_888 = " msgs)" + NL + "\t{";
>+ protected final String TEXT_889 = NL + "\t\treturn eDynamicInverseRemove((";
>+ protected final String TEXT_890 = ")";
>+ protected final String TEXT_891 = "basicGet";
>+ protected final String TEXT_892 = "(), ";
>+ protected final String TEXT_893 = ", msgs);";
>+ protected final String TEXT_894 = "Object old";
>+ protected final String TEXT_895 = " = ";
>+ protected final String TEXT_896 = "eVirtualUnset(";
>+ protected final String TEXT_897 = ");";
>+ protected final String TEXT_898 = NL + "\t\t";
>+ protected final String TEXT_899 = " old";
>+ protected final String TEXT_900 = " = ";
>+ protected final String TEXT_901 = ";";
>+ protected final String TEXT_902 = NL + "\t\t";
>+ protected final String TEXT_903 = " = null;";
>+ protected final String TEXT_904 = NL + "\t\tboolean isSetChange = old";
>+ protected final String TEXT_905 = " != EVIRTUAL_NO_VALUE;";
>+ protected final String TEXT_906 = NL + "\t\tboolean old";
>+ protected final String TEXT_907 = "ESet = (";
>+ protected final String TEXT_908 = " & ";
>+ protected final String TEXT_909 = "_ESETFLAG) != 0;";
>+ protected final String TEXT_910 = NL + "\t\t";
>+ protected final String TEXT_911 = " &= ~";
>+ protected final String TEXT_912 = "_ESETFLAG;";
>+ protected final String TEXT_913 = NL + "\t\tboolean old";
>+ protected final String TEXT_914 = "ESet = ";
>+ protected final String TEXT_915 = "ESet;";
>+ protected final String TEXT_916 = NL + "\t\t";
>+ protected final String TEXT_917 = "ESet = false;";
>+ protected final String TEXT_918 = NL + "\t\tif (eNotificationRequired())" + NL + "\t\t{" + NL + "\t\t\t";
>+ protected final String TEXT_919 = " notification = new ";
>+ protected final String TEXT_920 = "(this, ";
>+ protected final String TEXT_921 = ".UNSET, ";
>+ protected final String TEXT_922 = ", ";
>+ protected final String TEXT_923 = "isSetChange ? old";
>+ protected final String TEXT_924 = " : null";
>+ protected final String TEXT_925 = "old";
>+ protected final String TEXT_926 = ", null, ";
>+ protected final String TEXT_927 = "isSetChange";
>+ protected final String TEXT_928 = "old";
>+ protected final String TEXT_929 = "ESet";
>+ protected final String TEXT_930 = ");" + NL + "\t\t\tif (msgs == null) msgs = notification; else msgs.add(notification);" + NL + "\t\t}" + NL + "\t\treturn msgs;";
>+ protected final String TEXT_931 = NL + "\t\t// TODO: implement this method to unset the contained '";
>+ protected final String TEXT_932 = "' ";
>+ protected final String TEXT_933 = NL + "\t\t// -> this method is automatically invoked to keep the containment relationship in synch" + NL + "\t\t// -> do not modify other features" + NL + "\t\t// -> return msgs, after adding any generated Notification to it (if it is null, a NotificationChain object must be created first)" + NL + "\t\t// Ensure that you remove @generated or mark it @generated NOT" + NL + "\t\tthrow new UnsupportedOperationException();";
>+ protected final String TEXT_934 = NL + "\t}" + NL;
>+ protected final String TEXT_935 = NL + "\t/**" + NL + "\t * Unsets the value of the '{@link ";
>+ protected final String TEXT_936 = "#";
>+ protected final String TEXT_937 = " ";
>+ protected final String TEXT_938 = "}' ";
>+ protected final String TEXT_939 = ".";
>+ protected final String TEXT_940 = NL + "\t * " + NL + "\t * ";
>+ protected final String TEXT_941 = NL + "\t * @see #isSet";
>+ protected final String TEXT_942 = "()";
>+ protected final String TEXT_943 = NL + "\t * @see #";
>+ protected final String TEXT_944 = "()";
>+ protected final String TEXT_945 = NL + "\t * @see #set";
>+ protected final String TEXT_946 = "(";
>+ protected final String TEXT_947 = ")";
>+ protected final String TEXT_948 = NL + "\t * @generated" + NL + "\t */";
>+ protected final String TEXT_949 = NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */";
>+ protected final String TEXT_950 = NL + "\tvoid unset";
>+ protected final String TEXT_951 = "();" + NL;
>+ protected final String TEXT_952 = NL + "\tpublic void unset";
>+ protected final String TEXT_953 = "_";
>+ protected final String TEXT_954 = "()" + NL + "\t{";
>+ protected final String TEXT_955 = NL + "\t\teDynamicUnset(";
>+ protected final String TEXT_956 = ", ";
>+ protected final String TEXT_957 = ");";
>+ protected final String TEXT_958 = NL + "\t\teUnset(";
>+ protected final String TEXT_959 = ");";
>+ protected final String TEXT_960 = NL + "\t\t";
>+ protected final String TEXT_961 = "__ESETTING_DELEGATE.dynamicUnset(this, null, 0);";
>+ protected final String TEXT_962 = NL + "\t\t";
>+ protected final String TEXT_963 = " ";
>+ protected final String TEXT_964 = " = (";
>+ protected final String TEXT_965 = ")eVirtualGet(";
>+ protected final String TEXT_966 = ");";
>+ protected final String TEXT_967 = NL + "\t\tif (";
>+ protected final String TEXT_968 = " != null) ((";
>+ protected final String TEXT_969 = ".Unsettable";
>+ protected final String TEXT_970 = ")";
>+ protected final String TEXT_971 = ").unset();";
>+ protected final String TEXT_972 = NL + "\t\t";
>+ protected final String TEXT_973 = " ";
>+ protected final String TEXT_974 = " = (";
>+ protected final String TEXT_975 = ")eVirtualGet(";
>+ protected final String TEXT_976 = ");";
>+ protected final String TEXT_977 = NL + "\t\tif (";
>+ protected final String TEXT_978 = " != null)" + NL + "\t\t{" + NL + "\t\t\t";
>+ protected final String TEXT_979 = " msgs = null;";
>+ protected final String TEXT_980 = NL + "\t\t\tmsgs = ((";
>+ protected final String TEXT_981 = ")";
>+ protected final String TEXT_982 = ").eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ";
>+ protected final String TEXT_983 = ", null, msgs);";
>+ protected final String TEXT_984 = NL + "\t\t\tmsgs = ((";
>+ protected final String TEXT_985 = ")";
>+ protected final String TEXT_986 = ").eInverseRemove(this, ";
>+ protected final String TEXT_987 = ", ";
>+ protected final String TEXT_988 = ".class, msgs);";
>+ protected final String TEXT_989 = NL + "\t\t\tmsgs = basicUnset";
>+ protected final String TEXT_990 = "(msgs);" + NL + "\t\t\tif (msgs != null) msgs.dispatch();" + NL + "\t\t}" + NL + "\t\telse" + NL + "\t\t{";
>+ protected final String TEXT_991 = NL + "\t\t\tboolean old";
>+ protected final String TEXT_992 = "ESet = eVirtualIsSet(";
>+ protected final String TEXT_993 = ");";
>+ protected final String TEXT_994 = NL + "\t\t\tboolean old";
>+ protected final String TEXT_995 = "ESet = (";
>+ protected final String TEXT_996 = " & ";
>+ protected final String TEXT_997 = "_ESETFLAG) != 0;";
>+ protected final String TEXT_998 = NL + "\t\t\t";
>+ protected final String TEXT_999 = " &= ~";
>+ protected final String TEXT_1000 = "_ESETFLAG;";
>+ protected final String TEXT_1001 = NL + "\t\t\tboolean old";
>+ protected final String TEXT_1002 = "ESet = ";
>+ protected final String TEXT_1003 = "ESet;";
>+ protected final String TEXT_1004 = NL + "\t\t\t";
>+ protected final String TEXT_1005 = "ESet = false;";
>+ protected final String TEXT_1006 = NL + "\t\t\tif (eNotificationRequired())" + NL + "\t\t\t\teNotify(new ";
>+ protected final String TEXT_1007 = "(this, ";
>+ protected final String TEXT_1008 = ".UNSET, ";
>+ protected final String TEXT_1009 = ", null, null, old";
>+ protected final String TEXT_1010 = "ESet));";
>+ protected final String TEXT_1011 = NL + "\t\t}";
>+ protected final String TEXT_1012 = NL + "\t\t";
>+ protected final String TEXT_1013 = " old";
>+ protected final String TEXT_1014 = " = (";
>+ protected final String TEXT_1015 = " & ";
>+ protected final String TEXT_1016 = "_EFLAG) != 0;";
>+ protected final String TEXT_1017 = NL + "\t\t";
>+ protected final String TEXT_1018 = " old";
>+ protected final String TEXT_1019 = " = ";
>+ protected final String TEXT_1020 = "_EFLAG_VALUES[(";
>+ protected final String TEXT_1021 = " & ";
>+ protected final String TEXT_1022 = "_EFLAG) >>> ";
>+ protected final String TEXT_1023 = "_EFLAG_OFFSET];";
>+ protected final String TEXT_1024 = NL + "\t\tObject old";
>+ protected final String TEXT_1025 = " = eVirtualUnset(";
>+ protected final String TEXT_1026 = ");";
>+ protected final String TEXT_1027 = NL + "\t\t";
>+ protected final String TEXT_1028 = " old";
>+ protected final String TEXT_1029 = " = ";
>+ protected final String TEXT_1030 = ";";
>+ protected final String TEXT_1031 = NL + "\t\tboolean isSetChange = old";
>+ protected final String TEXT_1032 = " != EVIRTUAL_NO_VALUE;";
>+ protected final String TEXT_1033 = NL + "\t\tboolean old";
>+ protected final String TEXT_1034 = "ESet = (";
>+ protected final String TEXT_1035 = " & ";
>+ protected final String TEXT_1036 = "_ESETFLAG) != 0;";
>+ protected final String TEXT_1037 = NL + "\t\tboolean old";
>+ protected final String TEXT_1038 = "ESet = ";
>+ protected final String TEXT_1039 = "ESet;";
>+ protected final String TEXT_1040 = NL + "\t\t";
>+ protected final String TEXT_1041 = " = null;";
>+ protected final String TEXT_1042 = NL + "\t\t";
>+ protected final String TEXT_1043 = " &= ~";
>+ protected final String TEXT_1044 = "_ESETFLAG;";
>+ protected final String TEXT_1045 = NL + "\t\t";
>+ protected final String TEXT_1046 = "ESet = false;";
>+ protected final String TEXT_1047 = NL + "\t\tif (eNotificationRequired())" + NL + "\t\t\teNotify(new ";
>+ protected final String TEXT_1048 = "(this, ";
>+ protected final String TEXT_1049 = ".UNSET, ";
>+ protected final String TEXT_1050 = ", ";
>+ protected final String TEXT_1051 = "isSetChange ? old";
>+ protected final String TEXT_1052 = " : null";
>+ protected final String TEXT_1053 = "old";
>+ protected final String TEXT_1054 = ", null, ";
>+ protected final String TEXT_1055 = "isSetChange";
>+ protected final String TEXT_1056 = "old";
>+ protected final String TEXT_1057 = "ESet";
>+ protected final String TEXT_1058 = "));";
>+ protected final String TEXT_1059 = NL + "\t\tif (";
>+ protected final String TEXT_1060 = ") ";
>+ protected final String TEXT_1061 = " |= ";
>+ protected final String TEXT_1062 = "_EFLAG; else ";
>+ protected final String TEXT_1063 = " &= ~";
>+ protected final String TEXT_1064 = "_EFLAG;";
>+ protected final String TEXT_1065 = NL + "\t\t";
>+ protected final String TEXT_1066 = " = ";
>+ protected final String TEXT_1067 = " & ~";
>+ protected final String TEXT_1068 = "_EFLAG | ";
>+ protected final String TEXT_1069 = "_EFLAG_DEFAULT;";
>+ protected final String TEXT_1070 = NL + "\t\t";
>+ protected final String TEXT_1071 = " = ";
>+ protected final String TEXT_1072 = ";";
>+ protected final String TEXT_1073 = NL + "\t\t";
>+ protected final String TEXT_1074 = " &= ~";
>+ protected final String TEXT_1075 = "_ESETFLAG;";
>+ protected final String TEXT_1076 = NL + "\t\t";
>+ protected final String TEXT_1077 = "ESet = false;";
>+ protected final String TEXT_1078 = NL + "\t\tif (eNotificationRequired())" + NL + "\t\t\teNotify(new ";
>+ protected final String TEXT_1079 = "(this, ";
>+ protected final String TEXT_1080 = ".UNSET, ";
>+ protected final String TEXT_1081 = ", ";
>+ protected final String TEXT_1082 = "isSetChange ? old";
>+ protected final String TEXT_1083 = " : ";
>+ protected final String TEXT_1084 = "old";
> protected final String TEXT_1085 = ", ";
>- protected final String TEXT_1086 = "isSetChange";
>- protected final String TEXT_1087 = "old";
>- protected final String TEXT_1088 = "ESet";
>- protected final String TEXT_1089 = "));";
>- protected final String TEXT_1090 = NL + "\t\t((";
>- protected final String TEXT_1091 = ".Internal)((";
>- protected final String TEXT_1092 = ".Internal.Wrapper)get";
>- protected final String TEXT_1093 = "()).featureMap()).clear(";
>- protected final String TEXT_1094 = ");";
>- protected final String TEXT_1095 = NL + "\t\t((";
>- protected final String TEXT_1096 = ".Internal)get";
>- protected final String TEXT_1097 = "()).clear(";
>- protected final String TEXT_1098 = ");";
>- protected final String TEXT_1099 = NL + "\t\t";
>- protected final String TEXT_1100 = NL + "\t\t// TODO: implement this method to unset the '";
>- protected final String TEXT_1101 = "' ";
>- protected final String TEXT_1102 = NL + "\t\t// Ensure that you remove @generated or mark it @generated NOT" + NL + "\t\tthrow new UnsupportedOperationException();";
>- protected final String TEXT_1103 = NL + "\t}" + NL;
>- protected final String TEXT_1104 = NL + "\t/**" + NL + "\t * Returns whether the value of the '{@link ";
>- protected final String TEXT_1105 = "#";
>- protected final String TEXT_1106 = " ";
>- protected final String TEXT_1107 = "}' ";
>- protected final String TEXT_1108 = " is set.";
>- protected final String TEXT_1109 = NL + "\t * " + NL + "\t * " + NL + "\t * @return whether the value of the '";
>- protected final String TEXT_1110 = "' ";
>- protected final String TEXT_1111 = " is set.";
>- protected final String TEXT_1112 = NL + "\t * @see #unset";
>- protected final String TEXT_1113 = "()";
>- protected final String TEXT_1114 = NL + "\t * @see #";
>- protected final String TEXT_1115 = "()";
>- protected final String TEXT_1116 = NL + "\t * @see #set";
>- protected final String TEXT_1117 = "(";
>- protected final String TEXT_1118 = ")";
>- protected final String TEXT_1119 = NL + "\t * @generated" + NL + "\t */";
>- protected final String TEXT_1120 = NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */";
>- protected final String TEXT_1121 = NL + "\tboolean isSet";
>- protected final String TEXT_1122 = "();" + NL;
>- protected final String TEXT_1123 = NL + "\tpublic boolean isSet";
>- protected final String TEXT_1124 = "_";
>- protected final String TEXT_1125 = "()" + NL + "\t{";
>- protected final String TEXT_1126 = NL + "\t\treturn eDynamicIsSet(";
>- protected final String TEXT_1127 = ", ";
>- protected final String TEXT_1128 = ");";
>- protected final String TEXT_1129 = NL + "\t\treturn eIsSet(";
>- protected final String TEXT_1130 = ");";
>- protected final String TEXT_1131 = NL + "\t\treturn ";
>- protected final String TEXT_1132 = "__ESETTING_DELEGATE.dynamicIsSet(this, null, 0);";
>- protected final String TEXT_1133 = NL + "\t\t";
>- protected final String TEXT_1134 = " ";
>- protected final String TEXT_1135 = " = (";
>- protected final String TEXT_1136 = ")eVirtualGet(";
>- protected final String TEXT_1137 = ");";
>- protected final String TEXT_1138 = NL + "\t\treturn ";
>- protected final String TEXT_1139 = " != null && ((";
>- protected final String TEXT_1140 = ".Unsettable";
>- protected final String TEXT_1141 = ")";
>- protected final String TEXT_1142 = ").isSet();";
>- protected final String TEXT_1143 = NL + "\t\treturn eVirtualIsSet(";
>- protected final String TEXT_1144 = ");";
>- protected final String TEXT_1145 = NL + "\t\treturn (";
>- protected final String TEXT_1146 = " & ";
>- protected final String TEXT_1147 = "_ESETFLAG) != 0;";
>- protected final String TEXT_1148 = NL + "\t\treturn ";
>- protected final String TEXT_1149 = "ESet;";
>- protected final String TEXT_1150 = NL + "\t\treturn !((";
>- protected final String TEXT_1151 = ".Internal)((";
>- protected final String TEXT_1152 = ".Internal.Wrapper)get";
>- protected final String TEXT_1153 = "()).featureMap()).isEmpty(";
>- protected final String TEXT_1154 = ");";
>- protected final String TEXT_1155 = NL + "\t\treturn !((";
>- protected final String TEXT_1156 = ".Internal)get";
>- protected final String TEXT_1157 = "()).isEmpty(";
>- protected final String TEXT_1158 = ");";
>- protected final String TEXT_1159 = NL + "\t\t";
>- protected final String TEXT_1160 = NL + "\t\t// TODO: implement this method to return whether the '";
>- protected final String TEXT_1161 = "' ";
>- protected final String TEXT_1162 = " is set" + NL + "\t\t// Ensure that you remove @generated or mark it @generated NOT" + NL + "\t\tthrow new UnsupportedOperationException();";
>- protected final String TEXT_1163 = NL + "\t}" + NL;
>- protected final String TEXT_1164 = NL + "\t/**" + NL + "\t * The cached validation expression for the '{@link #";
>- protected final String TEXT_1165 = "(";
>- protected final String TEXT_1166 = ") ";
>- protected final String TEXT_1167 = "}' invariant operation." + NL + "\t * " + NL + "\t * " + NL + "\t * @see #";
>- protected final String TEXT_1168 = "(";
>- protected final String TEXT_1169 = ")" + NL + "\t * @generated" + NL + "\t * @ordered" + NL + "\t */" + NL + "\tprotected static final ";
>- protected final String TEXT_1170 = " ";
>- protected final String TEXT_1171 = "__EEXPRESSION = \"";
>- protected final String TEXT_1172 = "\";";
>- protected final String TEXT_1173 = NL;
>- protected final String TEXT_1174 = NL + "\t/**" + NL + "\t * The cached invocation delegate for the '{@link #";
>- protected final String TEXT_1175 = "(";
>- protected final String TEXT_1176 = ") ";
>- protected final String TEXT_1177 = "}' operation." + NL + "\t * " + NL + "\t * " + NL + "\t * @see #";
>- protected final String TEXT_1178 = "(";
>- protected final String TEXT_1179 = ")" + NL + "\t * @generated" + NL + "\t * @ordered" + NL + "\t */" + NL + "\tprotected static final ";
>- protected final String TEXT_1180 = ".Internal.InvocationDelegate ";
>- protected final String TEXT_1181 = "__EINVOCATION_DELEGATE = ((";
>- protected final String TEXT_1182 = ".Internal)";
>- protected final String TEXT_1183 = ").getInvocationDelegate();" + NL;
>- protected final String TEXT_1184 = NL + "\t/**";
>- protected final String TEXT_1185 = NL + "\t * " + NL + "\t * ";
>- protected final String TEXT_1186 = NL + "\t * ";
>- protected final String TEXT_1187 = NL + "\t * ";
>- protected final String TEXT_1188 = NL + "\t * @param ";
>- protected final String TEXT_1189 = NL + "\t * ";
>- protected final String TEXT_1190 = NL + "\t * @param ";
>- protected final String TEXT_1191 = " ";
>- protected final String TEXT_1192 = NL + "\t * ";
>- protected final String TEXT_1193 = NL + "\t * @model ";
>- protected final String TEXT_1194 = NL + "\t * ";
>- protected final String TEXT_1195 = NL + "\t * @model";
>- protected final String TEXT_1196 = NL + "\t * @generated" + NL + "\t */";
>- protected final String TEXT_1197 = NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */";
>- protected final String TEXT_1198 = NL + "\t";
>- protected final String TEXT_1199 = " ";
>- protected final String TEXT_1200 = "(";
>- protected final String TEXT_1201 = ")";
>- protected final String TEXT_1202 = ";" + NL;
>- protected final String TEXT_1203 = NL + "\t@SuppressWarnings(\"unchecked\")";
>- protected final String TEXT_1204 = NL + "\tpublic ";
>- protected final String TEXT_1205 = " ";
>- protected final String TEXT_1206 = "(";
>- protected final String TEXT_1207 = ")";
>- protected final String TEXT_1208 = NL + "\t{";
>- protected final String TEXT_1209 = NL + "\t\t";
>- protected final String TEXT_1210 = NL + "\t\treturn" + NL + "\t\t\t";
>- protected final String TEXT_1211 = ".validate" + NL + "\t\t\t\t(";
>- protected final String TEXT_1212 = "," + NL + "\t\t\t\t this," + NL + "\t\t\t\t ";
>- protected final String TEXT_1213 = "," + NL + "\t\t\t\t ";
>- protected final String TEXT_1214 = "," + NL + "\t\t\t\t \"";
>- protected final String TEXT_1215 = "\",";
>- protected final String TEXT_1216 = NL + "\t\t\t\t ";
>- protected final String TEXT_1217 = "," + NL + "\t\t\t\t ";
>- protected final String TEXT_1218 = "__EEXPRESSION," + NL + "\t\t\t\t ";
>- protected final String TEXT_1219 = ".ERROR," + NL + "\t\t\t\t ";
>- protected final String TEXT_1220 = ".DIAGNOSTIC_SOURCE," + NL + "\t\t\t\t ";
>- protected final String TEXT_1221 = ".";
>- protected final String TEXT_1222 = ");";
>- protected final String TEXT_1223 = NL + "\t\t// TODO: implement this method" + NL + "\t\t// -> specify the condition that violates the invariant" + NL + "\t\t// -> verify the details of the diagnostic, including severity and message" + NL + "\t\t// Ensure that you remove @generated or mark it @generated NOT" + NL + "\t\tif (false)" + NL + "\t\t{" + NL + "\t\t\tif (";
>- protected final String TEXT_1224 = " != null)" + NL + "\t\t\t{" + NL + "\t\t\t\t";
>- protected final String TEXT_1225 = ".add" + NL + "\t\t\t\t\t(new ";
>- protected final String TEXT_1226 = NL + "\t\t\t\t\t\t(";
>- protected final String TEXT_1227 = ".ERROR," + NL + "\t\t\t\t\t\t ";
>- protected final String TEXT_1228 = ".DIAGNOSTIC_SOURCE," + NL + "\t\t\t\t\t\t ";
>- protected final String TEXT_1229 = ".";
>- protected final String TEXT_1230 = "," + NL + "\t\t\t\t\t\t ";
>- protected final String TEXT_1231 = ".INSTANCE.getString(\"_UI_GenericInvariant_diagnostic\", new Object[] { \"";
>- protected final String TEXT_1232 = "\", ";
>- protected final String TEXT_1233 = ".getObjectLabel(this, ";
>- protected final String TEXT_1234 = ") }),";
>- protected final String TEXT_1235 = NL + "\t\t\t\t\t\t new Object [] { this }));" + NL + "\t\t\t}" + NL + "\t\t\treturn false;" + NL + "\t\t}" + NL + "\t\treturn true;";
>- protected final String TEXT_1236 = NL + "\t\ttry" + NL + "\t\t{";
>- protected final String TEXT_1237 = NL + "\t\t\t";
>- protected final String TEXT_1238 = "__EINVOCATION_DELEGATE.dynamicInvoke(this, ";
>- protected final String TEXT_1239 = "new ";
>- protected final String TEXT_1240 = ".UnmodifiableEList<Object>(";
>- protected final String TEXT_1241 = ", ";
>- protected final String TEXT_1242 = ")";
>- protected final String TEXT_1243 = "null";
>- protected final String TEXT_1244 = ");";
>- protected final String TEXT_1245 = NL + "\t\t\treturn ";
>- protected final String TEXT_1246 = "(";
>+ protected final String TEXT_1086 = ", ";
>+ protected final String TEXT_1087 = "isSetChange";
>+ protected final String TEXT_1088 = "old";
>+ protected final String TEXT_1089 = "ESet";
>+ protected final String TEXT_1090 = "));";
>+ protected final String TEXT_1091 = NL + "\t\t((";
>+ protected final String TEXT_1092 = ".Internal)((";
>+ protected final String TEXT_1093 = ".Internal.Wrapper)get";
>+ protected final String TEXT_1094 = "()).featureMap()).clear(";
>+ protected final String TEXT_1095 = ");";
>+ protected final String TEXT_1096 = NL + "\t\t((";
>+ protected final String TEXT_1097 = ".Internal)get";
>+ protected final String TEXT_1098 = "()).clear(";
>+ protected final String TEXT_1099 = ");";
>+ protected final String TEXT_1100 = NL + "\t\t";
>+ protected final String TEXT_1101 = NL + "\t\t// TODO: implement this method to unset the '";
>+ protected final String TEXT_1102 = "' ";
>+ protected final String TEXT_1103 = NL + "\t\t// Ensure that you remove @generated or mark it @generated NOT" + NL + "\t\tthrow new UnsupportedOperationException();";
>+ protected final String TEXT_1104 = NL + "\t}" + NL;
>+ protected final String TEXT_1105 = NL + "\t/**" + NL + "\t * Returns whether the value of the '{@link ";
>+ protected final String TEXT_1106 = "#";
>+ protected final String TEXT_1107 = " ";
>+ protected final String TEXT_1108 = "}' ";
>+ protected final String TEXT_1109 = " is set.";
>+ protected final String TEXT_1110 = NL + "\t * " + NL + "\t * " + NL + "\t * @return whether the value of the '";
>+ protected final String TEXT_1111 = "' ";
>+ protected final String TEXT_1112 = " is set.";
>+ protected final String TEXT_1113 = NL + "\t * @see #unset";
>+ protected final String TEXT_1114 = "()";
>+ protected final String TEXT_1115 = NL + "\t * @see #";
>+ protected final String TEXT_1116 = "()";
>+ protected final String TEXT_1117 = NL + "\t * @see #set";
>+ protected final String TEXT_1118 = "(";
>+ protected final String TEXT_1119 = ")";
>+ protected final String TEXT_1120 = NL + "\t * @generated" + NL + "\t */";
>+ protected final String TEXT_1121 = NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */";
>+ protected final String TEXT_1122 = NL + "\tboolean isSet";
>+ protected final String TEXT_1123 = "();" + NL;
>+ protected final String TEXT_1124 = NL + "\tpublic boolean isSet";
>+ protected final String TEXT_1125 = "_";
>+ protected final String TEXT_1126 = "()" + NL + "\t{";
>+ protected final String TEXT_1127 = NL + "\t\treturn eDynamicIsSet(";
>+ protected final String TEXT_1128 = ", ";
>+ protected final String TEXT_1129 = ");";
>+ protected final String TEXT_1130 = NL + "\t\treturn eIsSet(";
>+ protected final String TEXT_1131 = ");";
>+ protected final String TEXT_1132 = NL + "\t\treturn ";
>+ protected final String TEXT_1133 = "__ESETTING_DELEGATE.dynamicIsSet(this, null, 0);";
>+ protected final String TEXT_1134 = NL + "\t\t";
>+ protected final String TEXT_1135 = " ";
>+ protected final String TEXT_1136 = " = (";
>+ protected final String TEXT_1137 = ")eVirtualGet(";
>+ protected final String TEXT_1138 = ");";
>+ protected final String TEXT_1139 = NL + "\t\treturn ";
>+ protected final String TEXT_1140 = " != null && ((";
>+ protected final String TEXT_1141 = ".Unsettable";
>+ protected final String TEXT_1142 = ")";
>+ protected final String TEXT_1143 = ").isSet();";
>+ protected final String TEXT_1144 = NL + "\t\treturn eVirtualIsSet(";
>+ protected final String TEXT_1145 = ");";
>+ protected final String TEXT_1146 = NL + "\t\treturn (";
>+ protected final String TEXT_1147 = " & ";
>+ protected final String TEXT_1148 = "_ESETFLAG) != 0;";
>+ protected final String TEXT_1149 = NL + "\t\treturn ";
>+ protected final String TEXT_1150 = "ESet;";
>+ protected final String TEXT_1151 = NL + "\t\treturn !((";
>+ protected final String TEXT_1152 = ".Internal)((";
>+ protected final String TEXT_1153 = ".Internal.Wrapper)get";
>+ protected final String TEXT_1154 = "()).featureMap()).isEmpty(";
>+ protected final String TEXT_1155 = ");";
>+ protected final String TEXT_1156 = NL + "\t\treturn !((";
>+ protected final String TEXT_1157 = ".Internal)get";
>+ protected final String TEXT_1158 = "()).isEmpty(";
>+ protected final String TEXT_1159 = ");";
>+ protected final String TEXT_1160 = NL + "\t\t";
>+ protected final String TEXT_1161 = NL + "\t\t// TODO: implement this method to return whether the '";
>+ protected final String TEXT_1162 = "' ";
>+ protected final String TEXT_1163 = " is set" + NL + "\t\t// Ensure that you remove @generated or mark it @generated NOT" + NL + "\t\tthrow new UnsupportedOperationException();";
>+ protected final String TEXT_1164 = NL + "\t}" + NL;
>+ protected final String TEXT_1165 = NL + "\t/**" + NL + "\t * The cached validation expression for the '{@link #";
>+ protected final String TEXT_1166 = "(";
>+ protected final String TEXT_1167 = ") ";
>+ protected final String TEXT_1168 = "}' invariant operation." + NL + "\t * " + NL + "\t * " + NL + "\t * @see #";
>+ protected final String TEXT_1169 = "(";
>+ protected final String TEXT_1170 = ")" + NL + "\t * @generated" + NL + "\t * @ordered" + NL + "\t */" + NL + "\tprotected static final ";
>+ protected final String TEXT_1171 = " ";
>+ protected final String TEXT_1172 = "__EEXPRESSION = \"";
>+ protected final String TEXT_1173 = "\";";
>+ protected final String TEXT_1174 = NL;
>+ protected final String TEXT_1175 = NL + "\t/**" + NL + "\t * The cached invocation delegate for the '{@link #";
>+ protected final String TEXT_1176 = "(";
>+ protected final String TEXT_1177 = ") ";
>+ protected final String TEXT_1178 = "}' operation." + NL + "\t * " + NL + "\t * " + NL + "\t * @see #";
>+ protected final String TEXT_1179 = "(";
>+ protected final String TEXT_1180 = ")" + NL + "\t * @generated" + NL + "\t * @ordered" + NL + "\t */" + NL + "\tprotected static final ";
>+ protected final String TEXT_1181 = ".Internal.InvocationDelegate ";
>+ protected final String TEXT_1182 = "__EINVOCATION_DELEGATE = ((";
>+ protected final String TEXT_1183 = ".Internal)";
>+ protected final String TEXT_1184 = ").getInvocationDelegate();" + NL;
>+ protected final String TEXT_1185 = NL + "\t/**";
>+ protected final String TEXT_1186 = NL + "\t * " + NL + "\t * ";
>+ protected final String TEXT_1187 = NL + "\t * ";
>+ protected final String TEXT_1188 = NL + "\t * ";
>+ protected final String TEXT_1189 = NL + "\t * @param ";
>+ protected final String TEXT_1190 = NL + "\t * ";
>+ protected final String TEXT_1191 = NL + "\t * @param ";
>+ protected final String TEXT_1192 = " ";
>+ protected final String TEXT_1193 = NL + "\t * ";
>+ protected final String TEXT_1194 = NL + "\t * @model ";
>+ protected final String TEXT_1195 = NL + "\t * ";
>+ protected final String TEXT_1196 = NL + "\t * @model";
>+ protected final String TEXT_1197 = NL + "\t * @generated" + NL + "\t */";
>+ protected final String TEXT_1198 = NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */";
>+ protected final String TEXT_1199 = NL + "\t";
>+ protected final String TEXT_1200 = " ";
>+ protected final String TEXT_1201 = "(";
>+ protected final String TEXT_1202 = ")";
>+ protected final String TEXT_1203 = ";" + NL;
>+ protected final String TEXT_1204 = NL + "\t@SuppressWarnings(\"unchecked\")";
>+ protected final String TEXT_1205 = NL + "\tpublic ";
>+ protected final String TEXT_1206 = " ";
>+ protected final String TEXT_1207 = "(";
>+ protected final String TEXT_1208 = ")";
>+ protected final String TEXT_1209 = NL + "\t{";
>+ protected final String TEXT_1210 = NL + "\t\t";
>+ protected final String TEXT_1211 = NL + "\t\treturn" + NL + "\t\t\t";
>+ protected final String TEXT_1212 = ".validate" + NL + "\t\t\t\t(";
>+ protected final String TEXT_1213 = "," + NL + "\t\t\t\t this," + NL + "\t\t\t\t ";
>+ protected final String TEXT_1214 = "," + NL + "\t\t\t\t ";
>+ protected final String TEXT_1215 = "," + NL + "\t\t\t\t \"";
>+ protected final String TEXT_1216 = "\",";
>+ protected final String TEXT_1217 = NL + "\t\t\t\t ";
>+ protected final String TEXT_1218 = "," + NL + "\t\t\t\t ";
>+ protected final String TEXT_1219 = "__EEXPRESSION," + NL + "\t\t\t\t ";
>+ protected final String TEXT_1220 = ".ERROR," + NL + "\t\t\t\t ";
>+ protected final String TEXT_1221 = ".DIAGNOSTIC_SOURCE," + NL + "\t\t\t\t ";
>+ protected final String TEXT_1222 = ".";
>+ protected final String TEXT_1223 = ");";
>+ protected final String TEXT_1224 = NL + "\t\t// TODO: implement this method" + NL + "\t\t// -> specify the condition that violates the invariant" + NL + "\t\t// -> verify the details of the diagnostic, including severity and message" + NL + "\t\t// Ensure that you remove @generated or mark it @generated NOT" + NL + "\t\tif (false)" + NL + "\t\t{" + NL + "\t\t\tif (";
>+ protected final String TEXT_1225 = " != null)" + NL + "\t\t\t{" + NL + "\t\t\t\t";
>+ protected final String TEXT_1226 = ".add" + NL + "\t\t\t\t\t(new ";
>+ protected final String TEXT_1227 = NL + "\t\t\t\t\t\t(";
>+ protected final String TEXT_1228 = ".ERROR," + NL + "\t\t\t\t\t\t ";
>+ protected final String TEXT_1229 = ".DIAGNOSTIC_SOURCE," + NL + "\t\t\t\t\t\t ";
>+ protected final String TEXT_1230 = ".";
>+ protected final String TEXT_1231 = "," + NL + "\t\t\t\t\t\t ";
>+ protected final String TEXT_1232 = ".INSTANCE.getString(\"_UI_GenericInvariant_diagnostic\", new Object[] { \"";
>+ protected final String TEXT_1233 = "\", ";
>+ protected final String TEXT_1234 = ".getObjectLabel(this, ";
>+ protected final String TEXT_1235 = ") }),";
>+ protected final String TEXT_1236 = NL + "\t\t\t\t\t\t new Object [] { this }));" + NL + "\t\t\t}" + NL + "\t\t\treturn false;" + NL + "\t\t}" + NL + "\t\treturn true;";
>+ protected final String TEXT_1237 = NL + "\t\ttry" + NL + "\t\t{";
>+ protected final String TEXT_1238 = NL + "\t\t\t";
>+ protected final String TEXT_1239 = "__EINVOCATION_DELEGATE.dynamicInvoke(this, ";
>+ protected final String TEXT_1240 = "new ";
>+ protected final String TEXT_1241 = ".UnmodifiableEList<Object>(";
>+ protected final String TEXT_1242 = ", ";
>+ protected final String TEXT_1243 = ")";
>+ protected final String TEXT_1244 = "null";
>+ protected final String TEXT_1245 = ");";
>+ protected final String TEXT_1246 = NL + "\t\t\treturn ";
> protected final String TEXT_1247 = "(";
>- protected final String TEXT_1248 = ")";
>- protected final String TEXT_1249 = "__EINVOCATION_DELEGATE.dynamicInvoke(this, ";
>- protected final String TEXT_1250 = "new ";
>- protected final String TEXT_1251 = ".UnmodifiableEList<Object>(";
>- protected final String TEXT_1252 = ", ";
>- protected final String TEXT_1253 = ")";
>- protected final String TEXT_1254 = "null";
>- protected final String TEXT_1255 = ")";
>- protected final String TEXT_1256 = ").";
>- protected final String TEXT_1257 = "()";
>- protected final String TEXT_1258 = ";";
>- protected final String TEXT_1259 = NL + "\t\t}" + NL + "\t\tcatch (";
>- protected final String TEXT_1260 = " ite)" + NL + "\t\t{" + NL + "\t\t\tthrow new ";
>- protected final String TEXT_1261 = "(ite);" + NL + "\t\t}";
>- protected final String TEXT_1262 = NL + "\t\t// TODO: implement this method" + NL + "\t\t// Ensure that you remove @generated or mark it @generated NOT" + NL + "\t\tthrow new UnsupportedOperationException();";
>- protected final String TEXT_1263 = NL + "\t}" + NL;
>- protected final String TEXT_1264 = NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */";
>- protected final String TEXT_1265 = NL + "\t@SuppressWarnings(\"unchecked\")";
>- protected final String TEXT_1266 = NL + "\t@Override";
>- protected final String TEXT_1267 = NL + "\tpublic ";
>- protected final String TEXT_1268 = " eInverseAdd(";
>- protected final String TEXT_1269 = " otherEnd, int featureID, ";
>- protected final String TEXT_1270 = " msgs)" + NL + "\t{" + NL + "\t\tswitch (featureID";
>- protected final String TEXT_1271 = ")" + NL + "\t\t{";
>- protected final String TEXT_1272 = NL + "\t\t\tcase ";
>- protected final String TEXT_1273 = ":";
>- protected final String TEXT_1274 = NL + "\t\t\t\treturn ((";
>- protected final String TEXT_1275 = "(";
>- protected final String TEXT_1276 = ".InternalMapView";
>- protected final String TEXT_1277 = ")";
>- protected final String TEXT_1278 = "()).eMap()).basicAdd(otherEnd, msgs);";
>- protected final String TEXT_1279 = NL + "\t\t\t\treturn (";
>- protected final String TEXT_1280 = "()).basicAdd(otherEnd, msgs);";
>- protected final String TEXT_1281 = NL + "\t\t\t\tif (eInternalContainer() != null)" + NL + "\t\t\t\t\tmsgs = eBasicRemoveFromContainer(msgs);";
>- protected final String TEXT_1282 = NL + "\t\t\t\treturn basicSet";
>- protected final String TEXT_1283 = "((";
>- protected final String TEXT_1284 = ")otherEnd, msgs);";
>- protected final String TEXT_1285 = NL + "\t\t\t\treturn eBasicSetContainer(otherEnd, ";
>- protected final String TEXT_1286 = ", msgs);";
>- protected final String TEXT_1287 = NL + "\t\t\t\t";
>- protected final String TEXT_1288 = " ";
>- protected final String TEXT_1289 = " = (";
>- protected final String TEXT_1290 = ")eVirtualGet(";
>- protected final String TEXT_1291 = ");";
>- protected final String TEXT_1292 = NL + "\t\t\t\t";
>- protected final String TEXT_1293 = " ";
>- protected final String TEXT_1294 = " = ";
>- protected final String TEXT_1295 = "basicGet";
>- protected final String TEXT_1296 = "();";
>- protected final String TEXT_1297 = NL + "\t\t\t\tif (";
>- protected final String TEXT_1298 = " != null)";
>- protected final String TEXT_1299 = NL + "\t\t\t\t\tmsgs = ((";
>- protected final String TEXT_1300 = ")";
>- protected final String TEXT_1301 = ").eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ";
>- protected final String TEXT_1302 = ", null, msgs);";
>- protected final String TEXT_1303 = NL + "\t\t\t\t\tmsgs = ((";
>- protected final String TEXT_1304 = ")";
>- protected final String TEXT_1305 = ").eInverseRemove(this, ";
>- protected final String TEXT_1306 = ", ";
>- protected final String TEXT_1307 = ".class, msgs);";
>- protected final String TEXT_1308 = NL + "\t\t\t\treturn basicSet";
>- protected final String TEXT_1309 = "((";
>- protected final String TEXT_1310 = ")otherEnd, msgs);";
>- protected final String TEXT_1311 = NL + "\t\t}";
>- protected final String TEXT_1312 = NL + "\t\treturn super.eInverseAdd(otherEnd, featureID, msgs);";
>- protected final String TEXT_1313 = NL + "\t\treturn eDynamicInverseAdd(otherEnd, featureID, msgs);";
>- protected final String TEXT_1314 = NL + "\t}" + NL;
>- protected final String TEXT_1315 = NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */";
>- protected final String TEXT_1316 = NL + "\t@Override";
>- protected final String TEXT_1317 = NL + "\tpublic ";
>- protected final String TEXT_1318 = " eInverseRemove(";
>- protected final String TEXT_1319 = " otherEnd, int featureID, ";
>- protected final String TEXT_1320 = " msgs)" + NL + "\t{" + NL + "\t\tswitch (featureID";
>- protected final String TEXT_1321 = ")" + NL + "\t\t{";
>- protected final String TEXT_1322 = NL + "\t\t\tcase ";
>- protected final String TEXT_1323 = ":";
>- protected final String TEXT_1324 = NL + "\t\t\t\treturn ((";
>- protected final String TEXT_1325 = ")((";
>- protected final String TEXT_1326 = ".InternalMapView";
>- protected final String TEXT_1327 = ")";
>- protected final String TEXT_1328 = "()).eMap()).basicRemove(otherEnd, msgs);";
>- protected final String TEXT_1329 = NL + "\t\t\t\treturn ((";
>- protected final String TEXT_1330 = ")((";
>- protected final String TEXT_1331 = ".Internal.Wrapper)";
>- protected final String TEXT_1332 = "()).featureMap()).basicRemove(otherEnd, msgs);";
>- protected final String TEXT_1333 = NL + "\t\t\t\treturn ((";
>- protected final String TEXT_1334 = ")";
>- protected final String TEXT_1335 = "()).basicRemove(otherEnd, msgs);";
>- protected final String TEXT_1336 = NL + "\t\t\t\treturn eBasicSetContainer(null, ";
>- protected final String TEXT_1337 = ", msgs);";
>- protected final String TEXT_1338 = NL + "\t\t\t\treturn basicUnset";
>- protected final String TEXT_1339 = "(msgs);";
>- protected final String TEXT_1340 = NL + "\t\t\t\treturn basicSet";
>- protected final String TEXT_1341 = "(null, msgs);";
>- protected final String TEXT_1342 = NL + "\t\t}";
>- protected final String TEXT_1343 = NL + "\t\treturn super.eInverseRemove(otherEnd, featureID, msgs);";
>- protected final String TEXT_1344 = NL + "\t\treturn eDynamicInverseRemove(otherEnd, featureID, msgs);";
>- protected final String TEXT_1345 = NL + "\t}" + NL;
>- protected final String TEXT_1346 = NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */";
>- protected final String TEXT_1347 = NL + "\t@Override";
>- protected final String TEXT_1348 = NL + "\tpublic ";
>- protected final String TEXT_1349 = " eBasicRemoveFromContainerFeature(";
>- protected final String TEXT_1350 = " msgs)" + NL + "\t{" + NL + "\t\tswitch (eContainerFeatureID()";
>- protected final String TEXT_1351 = ")" + NL + "\t\t{";
>- protected final String TEXT_1352 = NL + "\t\t\tcase ";
>- protected final String TEXT_1353 = ":" + NL + "\t\t\t\treturn eInternalContainer().eInverseRemove(this, ";
>- protected final String TEXT_1354 = ", ";
>- protected final String TEXT_1355 = ".class, msgs);";
>- protected final String TEXT_1356 = NL + "\t\t}";
>- protected final String TEXT_1357 = NL + "\t\treturn super.eBasicRemoveFromContainerFeature(msgs);";
>- protected final String TEXT_1358 = NL + "\t\treturn eDynamicBasicRemoveFromContainer(msgs);";
>- protected final String TEXT_1359 = NL + "\t}" + NL;
>- protected final String TEXT_1360 = NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */";
>- protected final String TEXT_1361 = NL + "\t@Override";
>- protected final String TEXT_1362 = NL + "\tpublic Object eGet(int featureID, boolean resolve, boolean coreType)" + NL + "\t{" + NL + "\t\tswitch (featureID";
>- protected final String TEXT_1363 = ")" + NL + "\t\t{";
>- protected final String TEXT_1364 = NL + "\t\t\tcase ";
>- protected final String TEXT_1365 = ":";
>- protected final String TEXT_1366 = NL + "\t\t\t\treturn ";
>- protected final String TEXT_1367 = "();";
>- protected final String TEXT_1368 = NL + "\t\t\t\treturn ";
>- protected final String TEXT_1369 = "() ? Boolean.TRUE : Boolean.FALSE;";
>- protected final String TEXT_1370 = NL + "\t\t\t\treturn new ";
>- protected final String TEXT_1371 = "(";
>- protected final String TEXT_1372 = "());";
>- protected final String TEXT_1373 = NL + "\t\t\t\tif (resolve) return ";
>- protected final String TEXT_1374 = "();" + NL + "\t\t\t\treturn basicGet";
>- protected final String TEXT_1375 = "();";
>- protected final String TEXT_1376 = NL + "\t\t\t\tif (coreType) return ((";
>- protected final String TEXT_1377 = ".InternalMapView";
>- protected final String TEXT_1378 = ")";
>- protected final String TEXT_1379 = "()).eMap();" + NL + "\t\t\t\telse return ";
>- protected final String TEXT_1380 = "();";
>- protected final String TEXT_1381 = NL + "\t\t\t\tif (coreType) return ";
>- protected final String TEXT_1382 = "();" + NL + "\t\t\t\telse return ";
>- protected final String TEXT_1383 = "().map();";
>- protected final String TEXT_1384 = NL + "\t\t\t\tif (coreType) return ((";
>- protected final String TEXT_1385 = ".Internal.Wrapper)";
>- protected final String TEXT_1386 = "()).featureMap();" + NL + "\t\t\t\treturn ";
>- protected final String TEXT_1387 = "();";
>- protected final String TEXT_1388 = NL + "\t\t\t\tif (coreType) return ";
>- protected final String TEXT_1389 = "();" + NL + "\t\t\t\treturn ((";
>- protected final String TEXT_1390 = ".Internal)";
>- protected final String TEXT_1391 = "()).getWrapper();";
>- protected final String TEXT_1392 = NL + "\t\t\t\treturn ";
>- protected final String TEXT_1393 = "();";
>- protected final String TEXT_1394 = NL + "\t\t}";
>- protected final String TEXT_1395 = NL + "\t\treturn super.eGet(featureID, resolve, coreType);";
>- protected final String TEXT_1396 = NL + "\t\treturn eDynamicGet(featureID, resolve, coreType);";
>- protected final String TEXT_1397 = NL + "\t}" + NL;
>- protected final String TEXT_1398 = NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */";
>- protected final String TEXT_1399 = NL + "\t@SuppressWarnings(\"unchecked\")";
>- protected final String TEXT_1400 = NL + "\t@Override";
>- protected final String TEXT_1401 = NL + "\tpublic void eSet(int featureID, Object newValue)" + NL + "\t{" + NL + "\t\tswitch (featureID";
>- protected final String TEXT_1402 = ")" + NL + "\t\t{";
>- protected final String TEXT_1403 = NL + "\t\t\tcase ";
>- protected final String TEXT_1404 = ":";
>- protected final String TEXT_1405 = NL + "\t\t\t\t((";
>- protected final String TEXT_1406 = ".Internal)((";
>- protected final String TEXT_1407 = ".Internal.Wrapper)";
>- protected final String TEXT_1408 = "()).featureMap()).set(newValue);";
>- protected final String TEXT_1409 = NL + "\t\t\t\t((";
>- protected final String TEXT_1410 = ".Internal)";
>- protected final String TEXT_1411 = "()).set(newValue);";
>- protected final String TEXT_1412 = NL + "\t\t\t\t((";
>- protected final String TEXT_1413 = ".Setting)((";
>- protected final String TEXT_1414 = ".InternalMapView";
>- protected final String TEXT_1415 = ")";
>- protected final String TEXT_1416 = "()).eMap()).set(newValue);";
>- protected final String TEXT_1417 = NL + "\t\t\t\t((";
>- protected final String TEXT_1418 = ".Setting)";
>- protected final String TEXT_1419 = "()).set(newValue);";
>- protected final String TEXT_1420 = NL + "\t\t\t\t";
>- protected final String TEXT_1421 = "().clear();" + NL + "\t\t\t\t";
>- protected final String TEXT_1422 = "().addAll((";
>- protected final String TEXT_1423 = "<? extends ";
>- protected final String TEXT_1424 = ">";
>- protected final String TEXT_1425 = ")newValue);";
>- protected final String TEXT_1426 = NL + "\t\t\t\tset";
>- protected final String TEXT_1427 = "(((";
>- protected final String TEXT_1428 = ")newValue).";
>- protected final String TEXT_1429 = "());";
>- protected final String TEXT_1430 = NL + "\t\t\t\tset";
>- protected final String TEXT_1431 = "(";
>+ protected final String TEXT_1248 = "(";
>+ protected final String TEXT_1249 = ")";
>+ protected final String TEXT_1250 = "__EINVOCATION_DELEGATE.dynamicInvoke(this, ";
>+ protected final String TEXT_1251 = "new ";
>+ protected final String TEXT_1252 = ".UnmodifiableEList<Object>(";
>+ protected final String TEXT_1253 = ", ";
>+ protected final String TEXT_1254 = ")";
>+ protected final String TEXT_1255 = "null";
>+ protected final String TEXT_1256 = ")";
>+ protected final String TEXT_1257 = ").";
>+ protected final String TEXT_1258 = "()";
>+ protected final String TEXT_1259 = ";";
>+ protected final String TEXT_1260 = NL + "\t\t}" + NL + "\t\tcatch (";
>+ protected final String TEXT_1261 = " ite)" + NL + "\t\t{" + NL + "\t\t\tthrow new ";
>+ protected final String TEXT_1262 = "(ite);" + NL + "\t\t}";
>+ protected final String TEXT_1263 = NL + "\t\t// TODO: implement this method" + NL + "\t\t// Ensure that you remove @generated or mark it @generated NOT" + NL + "\t\tthrow new UnsupportedOperationException();";
>+ protected final String TEXT_1264 = NL + "\t}" + NL;
>+ protected final String TEXT_1265 = NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */";
>+ protected final String TEXT_1266 = NL + "\t@SuppressWarnings(\"unchecked\")";
>+ protected final String TEXT_1267 = NL + "\t@Override";
>+ protected final String TEXT_1268 = NL + "\tpublic ";
>+ protected final String TEXT_1269 = " eInverseAdd(";
>+ protected final String TEXT_1270 = " otherEnd, int featureID, ";
>+ protected final String TEXT_1271 = " msgs)" + NL + "\t{" + NL + "\t\tswitch (featureID";
>+ protected final String TEXT_1272 = ")" + NL + "\t\t{";
>+ protected final String TEXT_1273 = NL + "\t\t\tcase ";
>+ protected final String TEXT_1274 = ":";
>+ protected final String TEXT_1275 = NL + "\t\t\t\treturn ((";
>+ protected final String TEXT_1276 = "(";
>+ protected final String TEXT_1277 = ".InternalMapView";
>+ protected final String TEXT_1278 = ")";
>+ protected final String TEXT_1279 = "()).eMap()).basicAdd(otherEnd, msgs);";
>+ protected final String TEXT_1280 = NL + "\t\t\t\treturn (";
>+ protected final String TEXT_1281 = "()).basicAdd(otherEnd, msgs);";
>+ protected final String TEXT_1282 = NL + "\t\t\t\tif (eInternalContainer() != null)" + NL + "\t\t\t\t\tmsgs = eBasicRemoveFromContainer(msgs);";
>+ protected final String TEXT_1283 = NL + "\t\t\t\treturn basicSet";
>+ protected final String TEXT_1284 = "((";
>+ protected final String TEXT_1285 = ")otherEnd, msgs);";
>+ protected final String TEXT_1286 = NL + "\t\t\t\treturn eBasicSetContainer(otherEnd, ";
>+ protected final String TEXT_1287 = ", msgs);";
>+ protected final String TEXT_1288 = NL + "\t\t\t\t";
>+ protected final String TEXT_1289 = " ";
>+ protected final String TEXT_1290 = " = (";
>+ protected final String TEXT_1291 = ")eVirtualGet(";
>+ protected final String TEXT_1292 = ");";
>+ protected final String TEXT_1293 = NL + "\t\t\t\t";
>+ protected final String TEXT_1294 = " ";
>+ protected final String TEXT_1295 = " = ";
>+ protected final String TEXT_1296 = "basicGet";
>+ protected final String TEXT_1297 = "();";
>+ protected final String TEXT_1298 = NL + "\t\t\t\tif (";
>+ protected final String TEXT_1299 = " != null)";
>+ protected final String TEXT_1300 = NL + "\t\t\t\t\tmsgs = ((";
>+ protected final String TEXT_1301 = ")";
>+ protected final String TEXT_1302 = ").eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ";
>+ protected final String TEXT_1303 = ", null, msgs);";
>+ protected final String TEXT_1304 = NL + "\t\t\t\t\tmsgs = ((";
>+ protected final String TEXT_1305 = ")";
>+ protected final String TEXT_1306 = ").eInverseRemove(this, ";
>+ protected final String TEXT_1307 = ", ";
>+ protected final String TEXT_1308 = ".class, msgs);";
>+ protected final String TEXT_1309 = NL + "\t\t\t\treturn basicSet";
>+ protected final String TEXT_1310 = "((";
>+ protected final String TEXT_1311 = ")otherEnd, msgs);";
>+ protected final String TEXT_1312 = NL + "\t\t}";
>+ protected final String TEXT_1313 = NL + "\t\treturn super.eInverseAdd(otherEnd, featureID, msgs);";
>+ protected final String TEXT_1314 = NL + "\t\treturn eDynamicInverseAdd(otherEnd, featureID, msgs);";
>+ protected final String TEXT_1315 = NL + "\t}" + NL;
>+ protected final String TEXT_1316 = NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */";
>+ protected final String TEXT_1317 = NL + "\t@Override";
>+ protected final String TEXT_1318 = NL + "\tpublic ";
>+ protected final String TEXT_1319 = " eInverseRemove(";
>+ protected final String TEXT_1320 = " otherEnd, int featureID, ";
>+ protected final String TEXT_1321 = " msgs)" + NL + "\t{" + NL + "\t\tswitch (featureID";
>+ protected final String TEXT_1322 = ")" + NL + "\t\t{";
>+ protected final String TEXT_1323 = NL + "\t\t\tcase ";
>+ protected final String TEXT_1324 = ":";
>+ protected final String TEXT_1325 = NL + "\t\t\t\treturn ((";
>+ protected final String TEXT_1326 = ")((";
>+ protected final String TEXT_1327 = ".InternalMapView";
>+ protected final String TEXT_1328 = ")";
>+ protected final String TEXT_1329 = "()).eMap()).basicRemove(otherEnd, msgs);";
>+ protected final String TEXT_1330 = NL + "\t\t\t\treturn ((";
>+ protected final String TEXT_1331 = ")((";
>+ protected final String TEXT_1332 = ".Internal.Wrapper)";
>+ protected final String TEXT_1333 = "()).featureMap()).basicRemove(otherEnd, msgs);";
>+ protected final String TEXT_1334 = NL + "\t\t\t\treturn ((";
>+ protected final String TEXT_1335 = ")";
>+ protected final String TEXT_1336 = "()).basicRemove(otherEnd, msgs);";
>+ protected final String TEXT_1337 = NL + "\t\t\t\treturn eBasicSetContainer(null, ";
>+ protected final String TEXT_1338 = ", msgs);";
>+ protected final String TEXT_1339 = NL + "\t\t\t\treturn basicUnset";
>+ protected final String TEXT_1340 = "(msgs);";
>+ protected final String TEXT_1341 = NL + "\t\t\t\treturn basicSet";
>+ protected final String TEXT_1342 = "(null, msgs);";
>+ protected final String TEXT_1343 = NL + "\t\t}";
>+ protected final String TEXT_1344 = NL + "\t\treturn super.eInverseRemove(otherEnd, featureID, msgs);";
>+ protected final String TEXT_1345 = NL + "\t\treturn eDynamicInverseRemove(otherEnd, featureID, msgs);";
>+ protected final String TEXT_1346 = NL + "\t}" + NL;
>+ protected final String TEXT_1347 = NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */";
>+ protected final String TEXT_1348 = NL + "\t@Override";
>+ protected final String TEXT_1349 = NL + "\tpublic ";
>+ protected final String TEXT_1350 = " eBasicRemoveFromContainerFeature(";
>+ protected final String TEXT_1351 = " msgs)" + NL + "\t{" + NL + "\t\tswitch (eContainerFeatureID()";
>+ protected final String TEXT_1352 = ")" + NL + "\t\t{";
>+ protected final String TEXT_1353 = NL + "\t\t\tcase ";
>+ protected final String TEXT_1354 = ":" + NL + "\t\t\t\treturn eInternalContainer().eInverseRemove(this, ";
>+ protected final String TEXT_1355 = ", ";
>+ protected final String TEXT_1356 = ".class, msgs);";
>+ protected final String TEXT_1357 = NL + "\t\t}";
>+ protected final String TEXT_1358 = NL + "\t\treturn super.eBasicRemoveFromContainerFeature(msgs);";
>+ protected final String TEXT_1359 = NL + "\t\treturn eDynamicBasicRemoveFromContainer(msgs);";
>+ protected final String TEXT_1360 = NL + "\t}" + NL;
>+ protected final String TEXT_1361 = NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */";
>+ protected final String TEXT_1362 = NL + "\t@Override";
>+ protected final String TEXT_1363 = NL + "\tpublic Object eGet(int featureID, boolean resolve, boolean coreType)" + NL + "\t{" + NL + "\t\tswitch (featureID";
>+ protected final String TEXT_1364 = ")" + NL + "\t\t{";
>+ protected final String TEXT_1365 = NL + "\t\t\tcase ";
>+ protected final String TEXT_1366 = ":";
>+ protected final String TEXT_1367 = NL + "\t\t\t\treturn ";
>+ protected final String TEXT_1368 = "();";
>+ protected final String TEXT_1369 = NL + "\t\t\t\treturn ";
>+ protected final String TEXT_1370 = "() ? Boolean.TRUE : Boolean.FALSE;";
>+ protected final String TEXT_1371 = NL + "\t\t\t\treturn new ";
>+ protected final String TEXT_1372 = "(";
>+ protected final String TEXT_1373 = "());";
>+ protected final String TEXT_1374 = NL + "\t\t\t\tif (resolve) return ";
>+ protected final String TEXT_1375 = "();" + NL + "\t\t\t\treturn basicGet";
>+ protected final String TEXT_1376 = "();";
>+ protected final String TEXT_1377 = NL + "\t\t\t\tif (coreType) return ((";
>+ protected final String TEXT_1378 = ".InternalMapView";
>+ protected final String TEXT_1379 = ")";
>+ protected final String TEXT_1380 = "()).eMap();" + NL + "\t\t\t\telse return ";
>+ protected final String TEXT_1381 = "();";
>+ protected final String TEXT_1382 = NL + "\t\t\t\tif (coreType) return ";
>+ protected final String TEXT_1383 = "();" + NL + "\t\t\t\telse return ";
>+ protected final String TEXT_1384 = "().map();";
>+ protected final String TEXT_1385 = NL + "\t\t\t\tif (coreType) return ((";
>+ protected final String TEXT_1386 = ".Internal.Wrapper)";
>+ protected final String TEXT_1387 = "()).featureMap();" + NL + "\t\t\t\treturn ";
>+ protected final String TEXT_1388 = "();";
>+ protected final String TEXT_1389 = NL + "\t\t\t\tif (coreType) return ";
>+ protected final String TEXT_1390 = "();" + NL + "\t\t\t\treturn ((";
>+ protected final String TEXT_1391 = ".Internal)";
>+ protected final String TEXT_1392 = "()).getWrapper();";
>+ protected final String TEXT_1393 = NL + "\t\t\t\treturn ";
>+ protected final String TEXT_1394 = "();";
>+ protected final String TEXT_1395 = NL + "\t\t}";
>+ protected final String TEXT_1396 = NL + "\t\treturn super.eGet(featureID, resolve, coreType);";
>+ protected final String TEXT_1397 = NL + "\t\treturn eDynamicGet(featureID, resolve, coreType);";
>+ protected final String TEXT_1398 = NL + "\t}" + NL;
>+ protected final String TEXT_1399 = NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */";
>+ protected final String TEXT_1400 = NL + "\t@SuppressWarnings(\"unchecked\")";
>+ protected final String TEXT_1401 = NL + "\t@Override";
>+ protected final String TEXT_1402 = NL + "\tpublic void eSet(int featureID, Object newValue)" + NL + "\t{" + NL + "\t\tswitch (featureID";
>+ protected final String TEXT_1403 = ")" + NL + "\t\t{";
>+ protected final String TEXT_1404 = NL + "\t\t\tcase ";
>+ protected final String TEXT_1405 = ":";
>+ protected final String TEXT_1406 = NL + "\t\t\t\t((";
>+ protected final String TEXT_1407 = ".Internal)((";
>+ protected final String TEXT_1408 = ".Internal.Wrapper)";
>+ protected final String TEXT_1409 = "()).featureMap()).set(newValue);";
>+ protected final String TEXT_1410 = NL + "\t\t\t\t((";
>+ protected final String TEXT_1411 = ".Internal)";
>+ protected final String TEXT_1412 = "()).set(newValue);";
>+ protected final String TEXT_1413 = NL + "\t\t\t\t((";
>+ protected final String TEXT_1414 = ".Setting)((";
>+ protected final String TEXT_1415 = ".InternalMapView";
>+ protected final String TEXT_1416 = ")";
>+ protected final String TEXT_1417 = "()).eMap()).set(newValue);";
>+ protected final String TEXT_1418 = NL + "\t\t\t\t((";
>+ protected final String TEXT_1419 = ".Setting)";
>+ protected final String TEXT_1420 = "()).set(newValue);";
>+ protected final String TEXT_1421 = NL + "\t\t\t\t";
>+ protected final String TEXT_1422 = "().clear();" + NL + "\t\t\t\t";
>+ protected final String TEXT_1423 = "().addAll((";
>+ protected final String TEXT_1424 = "<? extends ";
>+ protected final String TEXT_1425 = ">";
>+ protected final String TEXT_1426 = ")newValue);";
>+ protected final String TEXT_1427 = NL + "\t\t\t\tset";
>+ protected final String TEXT_1428 = "(((";
>+ protected final String TEXT_1429 = ")newValue).";
>+ protected final String TEXT_1430 = "());";
>+ protected final String TEXT_1431 = NL + "\t\t\t\tset";
> protected final String TEXT_1432 = "(";
>- protected final String TEXT_1433 = ")";
>- protected final String TEXT_1434 = "newValue);";
>- protected final String TEXT_1435 = NL + "\t\t\t\treturn;";
>- protected final String TEXT_1436 = NL + "\t\t}";
>- protected final String TEXT_1437 = NL + "\t\tsuper.eSet(featureID, newValue);";
>- protected final String TEXT_1438 = NL + "\t\teDynamicSet(featureID, newValue);";
>- protected final String TEXT_1439 = NL + "\t}" + NL;
>- protected final String TEXT_1440 = NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */";
>- protected final String TEXT_1441 = NL + "\t@Override";
>- protected final String TEXT_1442 = NL + "\tpublic void eUnset(int featureID)" + NL + "\t{" + NL + "\t\tswitch (featureID";
>- protected final String TEXT_1443 = ")" + NL + "\t\t{";
>- protected final String TEXT_1444 = NL + "\t\t\tcase ";
>- protected final String TEXT_1445 = ":";
>- protected final String TEXT_1446 = NL + "\t\t\t\t((";
>- protected final String TEXT_1447 = ".Internal.Wrapper)";
>- protected final String TEXT_1448 = "()).featureMap().clear();";
>- protected final String TEXT_1449 = NL + "\t\t\t\t";
>- protected final String TEXT_1450 = "().clear();";
>- protected final String TEXT_1451 = NL + "\t\t\t\tunset";
>- protected final String TEXT_1452 = "();";
>- protected final String TEXT_1453 = NL + "\t\t\t\tset";
>- protected final String TEXT_1454 = "((";
>- protected final String TEXT_1455 = ")null);";
>- protected final String TEXT_1456 = NL + "\t\t\t\tset";
>- protected final String TEXT_1457 = "(";
>- protected final String TEXT_1458 = ");";
>- protected final String TEXT_1459 = NL + "\t\t\t\treturn;";
>- protected final String TEXT_1460 = NL + "\t\t}";
>- protected final String TEXT_1461 = NL + "\t\tsuper.eUnset(featureID);";
>- protected final String TEXT_1462 = NL + "\t\teDynamicUnset(featureID);";
>- protected final String TEXT_1463 = NL + "\t}" + NL;
>- protected final String TEXT_1464 = NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */";
>- protected final String TEXT_1465 = NL + "\t@SuppressWarnings(\"unchecked\")";
>- protected final String TEXT_1466 = NL + "\t@Override";
>- protected final String TEXT_1467 = NL + "\tpublic boolean eIsSet(int featureID)" + NL + "\t{" + NL + "\t\tswitch (featureID";
>- protected final String TEXT_1468 = ")" + NL + "\t\t{";
>- protected final String TEXT_1469 = NL + "\t\t\tcase ";
>- protected final String TEXT_1470 = ":";
>- protected final String TEXT_1471 = NL + "\t\t\t\treturn isSet";
>- protected final String TEXT_1472 = "();";
>- protected final String TEXT_1473 = NL + "\t\t\t\treturn ";
>- protected final String TEXT_1474 = "__ESETTING_DELEGATE.dynamicIsSet(this, null, 0);";
>- protected final String TEXT_1475 = NL + "\t\t\t\treturn !((";
>- protected final String TEXT_1476 = ".Internal.Wrapper)";
>- protected final String TEXT_1477 = "()).featureMap().isEmpty();";
>- protected final String TEXT_1478 = NL + "\t\t\t\treturn ";
>- protected final String TEXT_1479 = " != null && !";
>- protected final String TEXT_1480 = ".featureMap().isEmpty();";
>- protected final String TEXT_1481 = NL + "\t\t\t\treturn ";
>- protected final String TEXT_1482 = " != null && !";
>- protected final String TEXT_1483 = ".isEmpty();";
>- protected final String TEXT_1484 = NL + "\t\t\t\t";
>- protected final String TEXT_1485 = " ";
>- protected final String TEXT_1486 = " = (";
>- protected final String TEXT_1487 = ")eVirtualGet(";
>- protected final String TEXT_1488 = ");" + NL + "\t\t\t\treturn ";
>- protected final String TEXT_1489 = " != null && !";
>- protected final String TEXT_1490 = ".isEmpty();";
>- protected final String TEXT_1491 = NL + "\t\t\t\treturn !";
>- protected final String TEXT_1492 = "().isEmpty();";
>- protected final String TEXT_1493 = NL + "\t\t\t\treturn isSet";
>- protected final String TEXT_1494 = "();";
>- protected final String TEXT_1495 = NL + "\t\t\t\treturn ";
>- protected final String TEXT_1496 = " != null;";
>- protected final String TEXT_1497 = NL + "\t\t\t\treturn eVirtualGet(";
>- protected final String TEXT_1498 = ") != null;";
>- protected final String TEXT_1499 = NL + "\t\t\t\treturn basicGet";
>- protected final String TEXT_1500 = "() != null;";
>- protected final String TEXT_1501 = NL + "\t\t\t\treturn ";
>- protected final String TEXT_1502 = " != null;";
>- protected final String TEXT_1503 = NL + "\t\t\t\treturn eVirtualGet(";
>- protected final String TEXT_1504 = ") != null;";
>- protected final String TEXT_1505 = NL + "\t\t\t\treturn ";
>- protected final String TEXT_1506 = "() != null;";
>- protected final String TEXT_1507 = NL + "\t\t\t\treturn ((";
>- protected final String TEXT_1508 = " & ";
>- protected final String TEXT_1509 = "_EFLAG) != 0) != ";
>- protected final String TEXT_1510 = ";";
>- protected final String TEXT_1511 = NL + "\t\t\t\treturn (";
>- protected final String TEXT_1512 = " & ";
>- protected final String TEXT_1513 = "_EFLAG) != ";
>- protected final String TEXT_1514 = "_EFLAG_DEFAULT;";
>- protected final String TEXT_1515 = NL + "\t\t\t\treturn ";
>- protected final String TEXT_1516 = " != ";
>- protected final String TEXT_1517 = ";";
>- protected final String TEXT_1518 = NL + "\t\t\t\treturn eVirtualGet(";
>- protected final String TEXT_1519 = ", ";
>- protected final String TEXT_1520 = ") != ";
>- protected final String TEXT_1521 = ";";
>- protected final String TEXT_1522 = NL + "\t\t\t\treturn ";
>- protected final String TEXT_1523 = "() != ";
>- protected final String TEXT_1524 = ";";
>- protected final String TEXT_1525 = NL + "\t\t\t\treturn ";
>- protected final String TEXT_1526 = " == null ? ";
>- protected final String TEXT_1527 = " != null : !";
>- protected final String TEXT_1528 = ".equals(";
>- protected final String TEXT_1529 = ");";
>- protected final String TEXT_1530 = NL + "\t\t\t\t";
>- protected final String TEXT_1531 = " ";
>- protected final String TEXT_1532 = " = (";
>- protected final String TEXT_1533 = ")eVirtualGet(";
>- protected final String TEXT_1534 = ", ";
>- protected final String TEXT_1535 = ");" + NL + "\t\t\t\treturn ";
>- protected final String TEXT_1536 = " == null ? ";
>- protected final String TEXT_1537 = " != null : !";
>- protected final String TEXT_1538 = ".equals(";
>- protected final String TEXT_1539 = ");";
>- protected final String TEXT_1540 = NL + "\t\t\t\treturn ";
>- protected final String TEXT_1541 = " == null ? ";
>- protected final String TEXT_1542 = "() != null : !";
>- protected final String TEXT_1543 = ".equals(";
>- protected final String TEXT_1544 = "());";
>- protected final String TEXT_1545 = NL + "\t\t}";
>- protected final String TEXT_1546 = NL + "\t\treturn super.eIsSet(featureID);";
>- protected final String TEXT_1547 = NL + "\t\treturn eDynamicIsSet(featureID);";
>- protected final String TEXT_1548 = NL + "\t}" + NL;
>- protected final String TEXT_1549 = NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */";
>- protected final String TEXT_1550 = NL + "\t@Override";
>- protected final String TEXT_1551 = NL + "\tpublic int eBaseStructuralFeatureID(int derivedFeatureID, Class";
>- protected final String TEXT_1552 = " baseClass)" + NL + "\t{";
>- protected final String TEXT_1553 = NL + "\t\tif (baseClass == ";
>- protected final String TEXT_1554 = ".class)" + NL + "\t\t{" + NL + "\t\t\tswitch (derivedFeatureID";
>- protected final String TEXT_1555 = ")" + NL + "\t\t\t{";
>- protected final String TEXT_1556 = NL + "\t\t\t\tcase ";
>- protected final String TEXT_1557 = ": return ";
>- protected final String TEXT_1558 = ";";
>- protected final String TEXT_1559 = NL + "\t\t\t\tdefault: return -1;" + NL + "\t\t\t}" + NL + "\t\t}";
>- protected final String TEXT_1560 = NL + "\t\treturn super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);" + NL + "\t}";
>- protected final String TEXT_1561 = NL + NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */";
>- protected final String TEXT_1562 = NL + "\t@Override";
>- protected final String TEXT_1563 = NL + "\tpublic int eDerivedStructuralFeatureID(int baseFeatureID, Class";
>- protected final String TEXT_1564 = " baseClass)" + NL + "\t{";
>- protected final String TEXT_1565 = NL + "\t\tif (baseClass == ";
>- protected final String TEXT_1566 = ".class)" + NL + "\t\t{" + NL + "\t\t\tswitch (baseFeatureID)" + NL + "\t\t\t{";
>- protected final String TEXT_1567 = NL + "\t\t\t\tcase ";
>- protected final String TEXT_1568 = ": return ";
>- protected final String TEXT_1569 = ";";
>- protected final String TEXT_1570 = NL + "\t\t\t\tdefault: return -1;" + NL + "\t\t\t}" + NL + "\t\t}";
>- protected final String TEXT_1571 = NL + "\t\tif (baseClass == ";
>- protected final String TEXT_1572 = ".class)" + NL + "\t\t{" + NL + "\t\t\tswitch (baseFeatureID";
>- protected final String TEXT_1573 = ")" + NL + "\t\t\t{";
>- protected final String TEXT_1574 = NL + "\t\t\t\tcase ";
>- protected final String TEXT_1575 = ": return ";
>- protected final String TEXT_1576 = ";";
>- protected final String TEXT_1577 = NL + "\t\t\t\tdefault: return -1;" + NL + "\t\t\t}" + NL + "\t\t}";
>- protected final String TEXT_1578 = NL + "\t\treturn super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);" + NL + "\t}" + NL;
>- protected final String TEXT_1579 = NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */";
>- protected final String TEXT_1580 = NL + "\t@Override";
>- protected final String TEXT_1581 = NL + "\tpublic int eDerivedOperationID(int baseOperationID, Class";
>- protected final String TEXT_1582 = " baseClass)" + NL + "\t{";
>- protected final String TEXT_1583 = NL + "\t\tif (baseClass == ";
>- protected final String TEXT_1584 = ".class)" + NL + "\t\t{" + NL + "\t\t\tswitch (baseOperationID)" + NL + "\t\t\t{";
>- protected final String TEXT_1585 = NL + "\t\t\t\tcase ";
>- protected final String TEXT_1586 = ": return ";
>- protected final String TEXT_1587 = ";";
>- protected final String TEXT_1588 = NL + "\t\t\t\tdefault: return super.eDerivedOperationID(baseOperationID, baseClass);" + NL + "\t\t\t}" + NL + "\t\t}";
>- protected final String TEXT_1589 = NL + "\t\tif (baseClass == ";
>- protected final String TEXT_1590 = ".class)" + NL + "\t\t{" + NL + "\t\t\tswitch (baseOperationID)" + NL + "\t\t\t{";
>- protected final String TEXT_1591 = NL + "\t\t\t\tcase ";
>- protected final String TEXT_1592 = ": return ";
>- protected final String TEXT_1593 = ";";
>- protected final String TEXT_1594 = NL + "\t\t\t\tdefault: return -1;" + NL + "\t\t\t}" + NL + "\t\t}";
>- protected final String TEXT_1595 = NL + "\t\tif (baseClass == ";
>- protected final String TEXT_1596 = ".class)" + NL + "\t\t{" + NL + "\t\t\tswitch (baseOperationID";
>- protected final String TEXT_1597 = ")" + NL + "\t\t\t{";
>- protected final String TEXT_1598 = NL + "\t\t\t\tcase ";
>- protected final String TEXT_1599 = ": return ";
>- protected final String TEXT_1600 = ";";
>- protected final String TEXT_1601 = NL + "\t\t\t\tdefault: return -1;" + NL + "\t\t\t}" + NL + "\t\t}";
>- protected final String TEXT_1602 = NL + "\t\treturn super.eDerivedOperationID(baseOperationID, baseClass);" + NL + "\t}" + NL;
>- protected final String TEXT_1603 = NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */";
>- protected final String TEXT_1604 = NL + "\t@Override";
>- protected final String TEXT_1605 = NL + "\tprotected Object[] eVirtualValues()" + NL + "\t{" + NL + "\t\treturn ";
>- protected final String TEXT_1606 = ";" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */";
>- protected final String TEXT_1607 = NL + "\t@Override";
>- protected final String TEXT_1608 = NL + "\tprotected void eSetVirtualValues(Object[] newValues)" + NL + "\t{" + NL + "\t\t";
>- protected final String TEXT_1609 = " = newValues;" + NL + "\t}" + NL;
>- protected final String TEXT_1610 = NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */";
>- protected final String TEXT_1611 = NL + "\t@Override";
>- protected final String TEXT_1612 = NL + "\tprotected int eVirtualIndexBits(int offset)" + NL + "\t{" + NL + "\t\tswitch (offset)" + NL + "\t\t{";
>- protected final String TEXT_1613 = NL + "\t\t\tcase ";
>- protected final String TEXT_1614 = " :" + NL + "\t\t\t\treturn ";
>- protected final String TEXT_1615 = ";";
>- protected final String TEXT_1616 = NL + "\t\t\tdefault :" + NL + "\t\t\t\tthrow new IndexOutOfBoundsException();" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */";
>- protected final String TEXT_1617 = NL + "\t@Override";
>- protected final String TEXT_1618 = NL + "\tprotected void eSetVirtualIndexBits(int offset, int newIndexBits)" + NL + "\t{" + NL + "\t\tswitch (offset)" + NL + "\t\t{";
>- protected final String TEXT_1619 = NL + "\t\t\tcase ";
>- protected final String TEXT_1620 = " :" + NL + "\t\t\t\t";
>- protected final String TEXT_1621 = " = newIndexBits;" + NL + "\t\t\t\tbreak;";
>- protected final String TEXT_1622 = NL + "\t\t\tdefault :" + NL + "\t\t\t\tthrow new IndexOutOfBoundsException();" + NL + "\t\t}" + NL + "\t}" + NL;
>- protected final String TEXT_1623 = NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */";
>- protected final String TEXT_1624 = NL + "\t@Override";
>- protected final String TEXT_1625 = NL + "\t@SuppressWarnings(\"unchecked\")";
>- protected final String TEXT_1626 = NL + "\tpublic Object eInvoke(int operationID, ";
>- protected final String TEXT_1627 = " arguments) throws ";
>- protected final String TEXT_1628 = NL + "\t{" + NL + "\t\tswitch (operationID";
>- protected final String TEXT_1629 = ")" + NL + "\t\t{";
>- protected final String TEXT_1630 = NL + "\t\t\tcase ";
>- protected final String TEXT_1631 = ":";
>- protected final String TEXT_1632 = NL + "\t\t\t\t";
>- protected final String TEXT_1633 = "(";
>+ protected final String TEXT_1433 = "(";
>+ protected final String TEXT_1434 = ")";
>+ protected final String TEXT_1435 = "newValue);";
>+ protected final String TEXT_1436 = NL + "\t\t\t\treturn;";
>+ protected final String TEXT_1437 = NL + "\t\t}";
>+ protected final String TEXT_1438 = NL + "\t\tsuper.eSet(featureID, newValue);";
>+ protected final String TEXT_1439 = NL + "\t\teDynamicSet(featureID, newValue);";
>+ protected final String TEXT_1440 = NL + "\t}" + NL;
>+ protected final String TEXT_1441 = NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */";
>+ protected final String TEXT_1442 = NL + "\t@Override";
>+ protected final String TEXT_1443 = NL + "\tpublic void eUnset(int featureID)" + NL + "\t{" + NL + "\t\tswitch (featureID";
>+ protected final String TEXT_1444 = ")" + NL + "\t\t{";
>+ protected final String TEXT_1445 = NL + "\t\t\tcase ";
>+ protected final String TEXT_1446 = ":";
>+ protected final String TEXT_1447 = NL + "\t\t\t\t((";
>+ protected final String TEXT_1448 = ".Internal.Wrapper)";
>+ protected final String TEXT_1449 = "()).featureMap().clear();";
>+ protected final String TEXT_1450 = NL + "\t\t\t\t";
>+ protected final String TEXT_1451 = "().clear();";
>+ protected final String TEXT_1452 = NL + "\t\t\t\tunset";
>+ protected final String TEXT_1453 = "();";
>+ protected final String TEXT_1454 = NL + "\t\t\t\tset";
>+ protected final String TEXT_1455 = "((";
>+ protected final String TEXT_1456 = ")null);";
>+ protected final String TEXT_1457 = NL + "\t\t\t\tset";
>+ protected final String TEXT_1458 = "(";
>+ protected final String TEXT_1459 = ");";
>+ protected final String TEXT_1460 = NL + "\t\t\t\treturn;";
>+ protected final String TEXT_1461 = NL + "\t\t}";
>+ protected final String TEXT_1462 = NL + "\t\tsuper.eUnset(featureID);";
>+ protected final String TEXT_1463 = NL + "\t\teDynamicUnset(featureID);";
>+ protected final String TEXT_1464 = NL + "\t}" + NL;
>+ protected final String TEXT_1465 = NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */";
>+ protected final String TEXT_1466 = NL + "\t@SuppressWarnings(\"unchecked\")";
>+ protected final String TEXT_1467 = NL + "\t@Override";
>+ protected final String TEXT_1468 = NL + "\tpublic boolean eIsSet(int featureID)" + NL + "\t{" + NL + "\t\tswitch (featureID";
>+ protected final String TEXT_1469 = ")" + NL + "\t\t{";
>+ protected final String TEXT_1470 = NL + "\t\t\tcase ";
>+ protected final String TEXT_1471 = ":";
>+ protected final String TEXT_1472 = NL + "\t\t\t\treturn isSet";
>+ protected final String TEXT_1473 = "();";
>+ protected final String TEXT_1474 = NL + "\t\t\t\treturn ";
>+ protected final String TEXT_1475 = "__ESETTING_DELEGATE.dynamicIsSet(this, null, 0);";
>+ protected final String TEXT_1476 = NL + "\t\t\t\treturn !((";
>+ protected final String TEXT_1477 = ".Internal.Wrapper)";
>+ protected final String TEXT_1478 = "()).featureMap().isEmpty();";
>+ protected final String TEXT_1479 = NL + "\t\t\t\treturn ";
>+ protected final String TEXT_1480 = " != null && !";
>+ protected final String TEXT_1481 = ".featureMap().isEmpty();";
>+ protected final String TEXT_1482 = NL + "\t\t\t\treturn ";
>+ protected final String TEXT_1483 = " != null && !";
>+ protected final String TEXT_1484 = ".isEmpty();";
>+ protected final String TEXT_1485 = NL + "\t\t\t\t";
>+ protected final String TEXT_1486 = " ";
>+ protected final String TEXT_1487 = " = (";
>+ protected final String TEXT_1488 = ")eVirtualGet(";
>+ protected final String TEXT_1489 = ");" + NL + "\t\t\t\treturn ";
>+ protected final String TEXT_1490 = " != null && !";
>+ protected final String TEXT_1491 = ".isEmpty();";
>+ protected final String TEXT_1492 = NL + "\t\t\t\treturn !";
>+ protected final String TEXT_1493 = "().isEmpty();";
>+ protected final String TEXT_1494 = NL + "\t\t\t\treturn isSet";
>+ protected final String TEXT_1495 = "();";
>+ protected final String TEXT_1496 = NL + "\t\t\t\treturn ";
>+ protected final String TEXT_1497 = " != null;";
>+ protected final String TEXT_1498 = NL + "\t\t\t\treturn eVirtualGet(";
>+ protected final String TEXT_1499 = ") != null;";
>+ protected final String TEXT_1500 = NL + "\t\t\t\treturn basicGet";
>+ protected final String TEXT_1501 = "() != null;";
>+ protected final String TEXT_1502 = NL + "\t\t\t\treturn ";
>+ protected final String TEXT_1503 = " != null;";
>+ protected final String TEXT_1504 = NL + "\t\t\t\treturn eVirtualGet(";
>+ protected final String TEXT_1505 = ") != null;";
>+ protected final String TEXT_1506 = NL + "\t\t\t\treturn ";
>+ protected final String TEXT_1507 = "() != null;";
>+ protected final String TEXT_1508 = NL + "\t\t\t\treturn ((";
>+ protected final String TEXT_1509 = " & ";
>+ protected final String TEXT_1510 = "_EFLAG) != 0) != ";
>+ protected final String TEXT_1511 = ";";
>+ protected final String TEXT_1512 = NL + "\t\t\t\treturn (";
>+ protected final String TEXT_1513 = " & ";
>+ protected final String TEXT_1514 = "_EFLAG) != ";
>+ protected final String TEXT_1515 = "_EFLAG_DEFAULT;";
>+ protected final String TEXT_1516 = NL + "\t\t\t\treturn ";
>+ protected final String TEXT_1517 = " != ";
>+ protected final String TEXT_1518 = ";";
>+ protected final String TEXT_1519 = NL + "\t\t\t\treturn eVirtualGet(";
>+ protected final String TEXT_1520 = ", ";
>+ protected final String TEXT_1521 = ") != ";
>+ protected final String TEXT_1522 = ";";
>+ protected final String TEXT_1523 = NL + "\t\t\t\treturn ";
>+ protected final String TEXT_1524 = "() != ";
>+ protected final String TEXT_1525 = ";";
>+ protected final String TEXT_1526 = NL + "\t\t\t\treturn ";
>+ protected final String TEXT_1527 = " == null ? ";
>+ protected final String TEXT_1528 = " != null : !";
>+ protected final String TEXT_1529 = ".equals(";
>+ protected final String TEXT_1530 = ");";
>+ protected final String TEXT_1531 = NL + "\t\t\t\t";
>+ protected final String TEXT_1532 = " ";
>+ protected final String TEXT_1533 = " = (";
>+ protected final String TEXT_1534 = ")eVirtualGet(";
>+ protected final String TEXT_1535 = ", ";
>+ protected final String TEXT_1536 = ");" + NL + "\t\t\t\treturn ";
>+ protected final String TEXT_1537 = " == null ? ";
>+ protected final String TEXT_1538 = " != null : !";
>+ protected final String TEXT_1539 = ".equals(";
>+ protected final String TEXT_1540 = ");";
>+ protected final String TEXT_1541 = NL + "\t\t\t\treturn ";
>+ protected final String TEXT_1542 = " == null ? ";
>+ protected final String TEXT_1543 = "() != null : !";
>+ protected final String TEXT_1544 = ".equals(";
>+ protected final String TEXT_1545 = "());";
>+ protected final String TEXT_1546 = NL + "\t\t}";
>+ protected final String TEXT_1547 = NL + "\t\treturn super.eIsSet(featureID);";
>+ protected final String TEXT_1548 = NL + "\t\treturn eDynamicIsSet(featureID);";
>+ protected final String TEXT_1549 = NL + "\t}" + NL;
>+ protected final String TEXT_1550 = NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */";
>+ protected final String TEXT_1551 = NL + "\t@Override";
>+ protected final String TEXT_1552 = NL + "\tpublic int eBaseStructuralFeatureID(int derivedFeatureID, Class";
>+ protected final String TEXT_1553 = " baseClass)" + NL + "\t{";
>+ protected final String TEXT_1554 = NL + "\t\tif (baseClass == ";
>+ protected final String TEXT_1555 = ".class)" + NL + "\t\t{" + NL + "\t\t\tswitch (derivedFeatureID";
>+ protected final String TEXT_1556 = ")" + NL + "\t\t\t{";
>+ protected final String TEXT_1557 = NL + "\t\t\t\tcase ";
>+ protected final String TEXT_1558 = ": return ";
>+ protected final String TEXT_1559 = ";";
>+ protected final String TEXT_1560 = NL + "\t\t\t\tdefault: return -1;" + NL + "\t\t\t}" + NL + "\t\t}";
>+ protected final String TEXT_1561 = NL + "\t\treturn super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);" + NL + "\t}";
>+ protected final String TEXT_1562 = NL + NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */";
>+ protected final String TEXT_1563 = NL + "\t@Override";
>+ protected final String TEXT_1564 = NL + "\tpublic int eDerivedStructuralFeatureID(int baseFeatureID, Class";
>+ protected final String TEXT_1565 = " baseClass)" + NL + "\t{";
>+ protected final String TEXT_1566 = NL + "\t\tif (baseClass == ";
>+ protected final String TEXT_1567 = ".class)" + NL + "\t\t{" + NL + "\t\t\tswitch (baseFeatureID)" + NL + "\t\t\t{";
>+ protected final String TEXT_1568 = NL + "\t\t\t\tcase ";
>+ protected final String TEXT_1569 = ": return ";
>+ protected final String TEXT_1570 = ";";
>+ protected final String TEXT_1571 = NL + "\t\t\t\tdefault: return -1;" + NL + "\t\t\t}" + NL + "\t\t}";
>+ protected final String TEXT_1572 = NL + "\t\tif (baseClass == ";
>+ protected final String TEXT_1573 = ".class)" + NL + "\t\t{" + NL + "\t\t\tswitch (baseFeatureID";
>+ protected final String TEXT_1574 = ")" + NL + "\t\t\t{";
>+ protected final String TEXT_1575 = NL + "\t\t\t\tcase ";
>+ protected final String TEXT_1576 = ": return ";
>+ protected final String TEXT_1577 = ";";
>+ protected final String TEXT_1578 = NL + "\t\t\t\tdefault: return -1;" + NL + "\t\t\t}" + NL + "\t\t}";
>+ protected final String TEXT_1579 = NL + "\t\treturn super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);" + NL + "\t}" + NL;
>+ protected final String TEXT_1580 = NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */";
>+ protected final String TEXT_1581 = NL + "\t@Override";
>+ protected final String TEXT_1582 = NL + "\tpublic int eDerivedOperationID(int baseOperationID, Class";
>+ protected final String TEXT_1583 = " baseClass)" + NL + "\t{";
>+ protected final String TEXT_1584 = NL + "\t\tif (baseClass == ";
>+ protected final String TEXT_1585 = ".class)" + NL + "\t\t{" + NL + "\t\t\tswitch (baseOperationID)" + NL + "\t\t\t{";
>+ protected final String TEXT_1586 = NL + "\t\t\t\tcase ";
>+ protected final String TEXT_1587 = ": return ";
>+ protected final String TEXT_1588 = ";";
>+ protected final String TEXT_1589 = NL + "\t\t\t\tdefault: return super.eDerivedOperationID(baseOperationID, baseClass);" + NL + "\t\t\t}" + NL + "\t\t}";
>+ protected final String TEXT_1590 = NL + "\t\tif (baseClass == ";
>+ protected final String TEXT_1591 = ".class)" + NL + "\t\t{" + NL + "\t\t\tswitch (baseOperationID)" + NL + "\t\t\t{";
>+ protected final String TEXT_1592 = NL + "\t\t\t\tcase ";
>+ protected final String TEXT_1593 = ": return ";
>+ protected final String TEXT_1594 = ";";
>+ protected final String TEXT_1595 = NL + "\t\t\t\tdefault: return -1;" + NL + "\t\t\t}" + NL + "\t\t}";
>+ protected final String TEXT_1596 = NL + "\t\tif (baseClass == ";
>+ protected final String TEXT_1597 = ".class)" + NL + "\t\t{" + NL + "\t\t\tswitch (baseOperationID";
>+ protected final String TEXT_1598 = ")" + NL + "\t\t\t{";
>+ protected final String TEXT_1599 = NL + "\t\t\t\tcase ";
>+ protected final String TEXT_1600 = ": return ";
>+ protected final String TEXT_1601 = ";";
>+ protected final String TEXT_1602 = NL + "\t\t\t\tdefault: return -1;" + NL + "\t\t\t}" + NL + "\t\t}";
>+ protected final String TEXT_1603 = NL + "\t\treturn super.eDerivedOperationID(baseOperationID, baseClass);" + NL + "\t}" + NL;
>+ protected final String TEXT_1604 = NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */";
>+ protected final String TEXT_1605 = NL + "\t@Override";
>+ protected final String TEXT_1606 = NL + "\tprotected Object[] eVirtualValues()" + NL + "\t{" + NL + "\t\treturn ";
>+ protected final String TEXT_1607 = ";" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */";
>+ protected final String TEXT_1608 = NL + "\t@Override";
>+ protected final String TEXT_1609 = NL + "\tprotected void eSetVirtualValues(Object[] newValues)" + NL + "\t{" + NL + "\t\t";
>+ protected final String TEXT_1610 = " = newValues;" + NL + "\t}" + NL;
>+ protected final String TEXT_1611 = NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */";
>+ protected final String TEXT_1612 = NL + "\t@Override";
>+ protected final String TEXT_1613 = NL + "\tprotected int eVirtualIndexBits(int offset)" + NL + "\t{" + NL + "\t\tswitch (offset)" + NL + "\t\t{";
>+ protected final String TEXT_1614 = NL + "\t\t\tcase ";
>+ protected final String TEXT_1615 = " :" + NL + "\t\t\t\treturn ";
>+ protected final String TEXT_1616 = ";";
>+ protected final String TEXT_1617 = NL + "\t\t\tdefault :" + NL + "\t\t\t\tthrow new IndexOutOfBoundsException();" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */";
>+ protected final String TEXT_1618 = NL + "\t@Override";
>+ protected final String TEXT_1619 = NL + "\tprotected void eSetVirtualIndexBits(int offset, int newIndexBits)" + NL + "\t{" + NL + "\t\tswitch (offset)" + NL + "\t\t{";
>+ protected final String TEXT_1620 = NL + "\t\t\tcase ";
>+ protected final String TEXT_1621 = " :" + NL + "\t\t\t\t";
>+ protected final String TEXT_1622 = " = newIndexBits;" + NL + "\t\t\t\tbreak;";
>+ protected final String TEXT_1623 = NL + "\t\t\tdefault :" + NL + "\t\t\t\tthrow new IndexOutOfBoundsException();" + NL + "\t\t}" + NL + "\t}" + NL;
>+ protected final String TEXT_1624 = NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */";
>+ protected final String TEXT_1625 = NL + "\t@Override";
>+ protected final String TEXT_1626 = NL + "\t@SuppressWarnings(\"unchecked\")";
>+ protected final String TEXT_1627 = NL + "\tpublic Object eInvoke(int operationID, ";
>+ protected final String TEXT_1628 = " arguments) throws ";
>+ protected final String TEXT_1629 = NL + "\t{" + NL + "\t\tswitch (operationID";
>+ protected final String TEXT_1630 = ")" + NL + "\t\t{";
>+ protected final String TEXT_1631 = NL + "\t\t\tcase ";
>+ protected final String TEXT_1632 = ":";
>+ protected final String TEXT_1633 = NL + "\t\t\t\t";
> protected final String TEXT_1634 = "(";
> protected final String TEXT_1635 = "(";
>- protected final String TEXT_1636 = ")";
>- protected final String TEXT_1637 = "arguments.get(";
>- protected final String TEXT_1638 = ")";
>- protected final String TEXT_1639 = ").";
>- protected final String TEXT_1640 = "()";
>- protected final String TEXT_1641 = ", ";
>- protected final String TEXT_1642 = ");" + NL + "\t\t\t\treturn null;";
>- protected final String TEXT_1643 = NL + "\t\t\t\treturn ";
>- protected final String TEXT_1644 = "new ";
>- protected final String TEXT_1645 = "(";
>+ protected final String TEXT_1636 = "(";
>+ protected final String TEXT_1637 = ")";
>+ protected final String TEXT_1638 = "arguments.get(";
>+ protected final String TEXT_1639 = ")";
>+ protected final String TEXT_1640 = ").";
>+ protected final String TEXT_1641 = "()";
>+ protected final String TEXT_1642 = ", ";
>+ protected final String TEXT_1643 = ");" + NL + "\t\t\t\treturn null;";
>+ protected final String TEXT_1644 = NL + "\t\t\t\treturn ";
>+ protected final String TEXT_1645 = "new ";
> protected final String TEXT_1646 = "(";
> protected final String TEXT_1647 = "(";
> protected final String TEXT_1648 = "(";
>- protected final String TEXT_1649 = ")";
>- protected final String TEXT_1650 = "arguments.get(";
>- protected final String TEXT_1651 = ")";
>- protected final String TEXT_1652 = ").";
>- protected final String TEXT_1653 = "()";
>- protected final String TEXT_1654 = ", ";
>- protected final String TEXT_1655 = ")";
>+ protected final String TEXT_1649 = "(";
>+ protected final String TEXT_1650 = ")";
>+ protected final String TEXT_1651 = "arguments.get(";
>+ protected final String TEXT_1652 = ")";
>+ protected final String TEXT_1653 = ").";
>+ protected final String TEXT_1654 = "()";
>+ protected final String TEXT_1655 = ", ";
> protected final String TEXT_1656 = ")";
>- protected final String TEXT_1657 = ";";
>- protected final String TEXT_1658 = NL + "\t\t}";
>- protected final String TEXT_1659 = NL + "\t\treturn super.eInvoke(operationID, arguments);";
>- protected final String TEXT_1660 = NL + "\t\treturn eDynamicInvoke(operationID, arguments);";
>- protected final String TEXT_1661 = NL + "\t}" + NL;
>- protected final String TEXT_1662 = NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */";
>- protected final String TEXT_1663 = NL + "\t@Override";
>- protected final String TEXT_1664 = NL + "\tpublic String toString()" + NL + "\t{" + NL + "\t\tif (eIsProxy()) return super.toString();" + NL + "" + NL + "\t\tStringBuffer result = new StringBuffer(super.toString());";
>- protected final String TEXT_1665 = NL + "\t\tresult.append(\" (";
>- protected final String TEXT_1666 = ": \");";
>- protected final String TEXT_1667 = NL + "\t\tresult.append(\", ";
>- protected final String TEXT_1668 = ": \");";
>- protected final String TEXT_1669 = NL + "\t\tif (eVirtualIsSet(";
>- protected final String TEXT_1670 = ")) result.append(eVirtualGet(";
>- protected final String TEXT_1671 = ")); else result.append(\"<unset>\");";
>- protected final String TEXT_1672 = NL + "\t\tif (";
>- protected final String TEXT_1673 = "(";
>- protected final String TEXT_1674 = " & ";
>- protected final String TEXT_1675 = "_ESETFLAG) != 0";
>- protected final String TEXT_1676 = "ESet";
>- protected final String TEXT_1677 = ") result.append((";
>- protected final String TEXT_1678 = " & ";
>- protected final String TEXT_1679 = "_EFLAG) != 0); else result.append(\"<unset>\");";
>- protected final String TEXT_1680 = NL + "\t\tif (";
>- protected final String TEXT_1681 = "(";
>- protected final String TEXT_1682 = " & ";
>- protected final String TEXT_1683 = "_ESETFLAG) != 0";
>- protected final String TEXT_1684 = "ESet";
>- protected final String TEXT_1685 = ") result.append(";
>- protected final String TEXT_1686 = "_EFLAG_VALUES[(";
>- protected final String TEXT_1687 = " & ";
>- protected final String TEXT_1688 = "_EFLAG) >>> ";
>- protected final String TEXT_1689 = "_EFLAG_OFFSET]); else result.append(\"<unset>\");";
>- protected final String TEXT_1690 = NL + "\t\tif (";
>- protected final String TEXT_1691 = "(";
>- protected final String TEXT_1692 = " & ";
>- protected final String TEXT_1693 = "_ESETFLAG) != 0";
>- protected final String TEXT_1694 = "ESet";
>- protected final String TEXT_1695 = ") result.append(";
>- protected final String TEXT_1696 = "); else result.append(\"<unset>\");";
>- protected final String TEXT_1697 = NL + "\t\tresult.append(eVirtualGet(";
>- protected final String TEXT_1698 = ", ";
>- protected final String TEXT_1699 = "));";
>- protected final String TEXT_1700 = NL + "\t\tresult.append((";
>- protected final String TEXT_1701 = " & ";
>- protected final String TEXT_1702 = "_EFLAG) != 0);";
>- protected final String TEXT_1703 = NL + "\t\tresult.append(";
>- protected final String TEXT_1704 = "_EFLAG_VALUES[(";
>- protected final String TEXT_1705 = " & ";
>- protected final String TEXT_1706 = "_EFLAG) >>> ";
>- protected final String TEXT_1707 = "_EFLAG_OFFSET]);";
>- protected final String TEXT_1708 = NL + "\t\tresult.append(";
>- protected final String TEXT_1709 = ");";
>- protected final String TEXT_1710 = NL + "\t\tresult.append(')');" + NL + "\t\treturn result.toString();" + NL + "\t}" + NL;
>- protected final String TEXT_1711 = NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */";
>- protected final String TEXT_1712 = NL + "\t@";
>- protected final String TEXT_1713 = NL + "\tprotected int hash = -1;" + NL + "" + NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic int getHash()" + NL + "\t{" + NL + "\t\tif (hash == -1)" + NL + "\t\t{" + NL + "\t\t\t";
>- protected final String TEXT_1714 = " theKey = getKey();" + NL + "\t\t\thash = (theKey == null ? 0 : theKey.hashCode());" + NL + "\t\t}" + NL + "\t\treturn hash;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void setHash(int hash)" + NL + "\t{" + NL + "\t\tthis.hash = hash;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic ";
>- protected final String TEXT_1715 = " getKey()" + NL + "\t{";
>- protected final String TEXT_1716 = NL + "\t\treturn new ";
>- protected final String TEXT_1717 = "(getTypedKey());";
>- protected final String TEXT_1718 = NL + "\t\treturn getTypedKey();";
>- protected final String TEXT_1719 = NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void setKey(";
>- protected final String TEXT_1720 = " key)" + NL + "\t{";
>- protected final String TEXT_1721 = NL + "\t\tgetTypedKey().addAll(";
>- protected final String TEXT_1722 = "(";
>- protected final String TEXT_1723 = ")";
>- protected final String TEXT_1724 = "key);";
>- protected final String TEXT_1725 = NL + "\t\tsetTypedKey(key);";
>- protected final String TEXT_1726 = NL + "\t\tsetTypedKey(((";
>- protected final String TEXT_1727 = ")key).";
>- protected final String TEXT_1728 = "());";
>- protected final String TEXT_1729 = NL + "\t\tsetTypedKey((";
>- protected final String TEXT_1730 = ")key);";
>- protected final String TEXT_1731 = NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic ";
>- protected final String TEXT_1732 = " getValue()" + NL + "\t{";
>- protected final String TEXT_1733 = NL + "\t\treturn new ";
>- protected final String TEXT_1734 = "(getTypedValue());";
>- protected final String TEXT_1735 = NL + "\t\treturn getTypedValue();";
>- protected final String TEXT_1736 = NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic ";
>- protected final String TEXT_1737 = " setValue(";
>- protected final String TEXT_1738 = " value)" + NL + "\t{" + NL + "\t\t";
>- protected final String TEXT_1739 = " oldValue = getValue();";
>- protected final String TEXT_1740 = NL + "\t\tgetTypedValue().clear();" + NL + "\t\tgetTypedValue().addAll(";
>- protected final String TEXT_1741 = "(";
>- protected final String TEXT_1742 = ")";
>- protected final String TEXT_1743 = "value);";
>- protected final String TEXT_1744 = NL + "\t\tsetTypedValue(value);";
>- protected final String TEXT_1745 = NL + "\t\tsetTypedValue(((";
>- protected final String TEXT_1746 = ")value).";
>- protected final String TEXT_1747 = "());";
>- protected final String TEXT_1748 = NL + "\t\tsetTypedValue((";
>- protected final String TEXT_1749 = ")value);";
>- protected final String TEXT_1750 = NL + "\t\treturn oldValue;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */";
>- protected final String TEXT_1751 = NL + "\t@SuppressWarnings(\"unchecked\")";
>- protected final String TEXT_1752 = NL + "\tpublic ";
>- protected final String TEXT_1753 = " getEMap()" + NL + "\t{" + NL + "\t\t";
>- protected final String TEXT_1754 = " container = eContainer();" + NL + "\t\treturn container == null ? null : (";
>- protected final String TEXT_1755 = ")container.eGet(eContainmentFeature());" + NL + "\t}" + NL;
>- protected final String TEXT_1756 = NL + "} //";
>- protected final String TEXT_1757 = NL;
>+ protected final String TEXT_1657 = ")";
>+ protected final String TEXT_1658 = ";";
>+ protected final String TEXT_1659 = NL + "\t\t}";
>+ protected final String TEXT_1660 = NL + "\t\treturn super.eInvoke(operationID, arguments);";
>+ protected final String TEXT_1661 = NL + "\t\treturn eDynamicInvoke(operationID, arguments);";
>+ protected final String TEXT_1662 = NL + "\t}" + NL;
>+ protected final String TEXT_1663 = NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */";
>+ protected final String TEXT_1664 = NL + "\t@Override";
>+ protected final String TEXT_1665 = NL + "\tpublic String toString()" + NL + "\t{" + NL + "\t\tif (eIsProxy()) return super.toString();" + NL + "" + NL + "\t\tStringBuffer result = new StringBuffer(super.toString());";
>+ protected final String TEXT_1666 = NL + "\t\tresult.append(\" (";
>+ protected final String TEXT_1667 = ": \");";
>+ protected final String TEXT_1668 = NL + "\t\tresult.append(\", ";
>+ protected final String TEXT_1669 = ": \");";
>+ protected final String TEXT_1670 = NL + "\t\tif (eVirtualIsSet(";
>+ protected final String TEXT_1671 = ")) result.append(eVirtualGet(";
>+ protected final String TEXT_1672 = ")); else result.append(\"<unset>\");";
>+ protected final String TEXT_1673 = NL + "\t\tif (";
>+ protected final String TEXT_1674 = "(";
>+ protected final String TEXT_1675 = " & ";
>+ protected final String TEXT_1676 = "_ESETFLAG) != 0";
>+ protected final String TEXT_1677 = "ESet";
>+ protected final String TEXT_1678 = ") result.append((";
>+ protected final String TEXT_1679 = " & ";
>+ protected final String TEXT_1680 = "_EFLAG) != 0); else result.append(\"<unset>\");";
>+ protected final String TEXT_1681 = NL + "\t\tif (";
>+ protected final String TEXT_1682 = "(";
>+ protected final String TEXT_1683 = " & ";
>+ protected final String TEXT_1684 = "_ESETFLAG) != 0";
>+ protected final String TEXT_1685 = "ESet";
>+ protected final String TEXT_1686 = ") result.append(";
>+ protected final String TEXT_1687 = "_EFLAG_VALUES[(";
>+ protected final String TEXT_1688 = " & ";
>+ protected final String TEXT_1689 = "_EFLAG) >>> ";
>+ protected final String TEXT_1690 = "_EFLAG_OFFSET]); else result.append(\"<unset>\");";
>+ protected final String TEXT_1691 = NL + "\t\tif (";
>+ protected final String TEXT_1692 = "(";
>+ protected final String TEXT_1693 = " & ";
>+ protected final String TEXT_1694 = "_ESETFLAG) != 0";
>+ protected final String TEXT_1695 = "ESet";
>+ protected final String TEXT_1696 = ") result.append(";
>+ protected final String TEXT_1697 = "); else result.append(\"<unset>\");";
>+ protected final String TEXT_1698 = NL + "\t\tresult.append(eVirtualGet(";
>+ protected final String TEXT_1699 = ", ";
>+ protected final String TEXT_1700 = "));";
>+ protected final String TEXT_1701 = NL + "\t\tresult.append((";
>+ protected final String TEXT_1702 = " & ";
>+ protected final String TEXT_1703 = "_EFLAG) != 0);";
>+ protected final String TEXT_1704 = NL + "\t\tresult.append(";
>+ protected final String TEXT_1705 = "_EFLAG_VALUES[(";
>+ protected final String TEXT_1706 = " & ";
>+ protected final String TEXT_1707 = "_EFLAG) >>> ";
>+ protected final String TEXT_1708 = "_EFLAG_OFFSET]);";
>+ protected final String TEXT_1709 = NL + "\t\tresult.append(";
>+ protected final String TEXT_1710 = ");";
>+ protected final String TEXT_1711 = NL + "\t\tresult.append(')');" + NL + "\t\treturn result.toString();" + NL + "\t}" + NL;
>+ protected final String TEXT_1712 = NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */";
>+ protected final String TEXT_1713 = NL + "\t@";
>+ protected final String TEXT_1714 = NL + "\tprotected int hash = -1;" + NL + "" + NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic int getHash()" + NL + "\t{" + NL + "\t\tif (hash == -1)" + NL + "\t\t{" + NL + "\t\t\t";
>+ protected final String TEXT_1715 = " theKey = getKey();" + NL + "\t\t\thash = (theKey == null ? 0 : theKey.hashCode());" + NL + "\t\t}" + NL + "\t\treturn hash;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void setHash(int hash)" + NL + "\t{" + NL + "\t\tthis.hash = hash;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic ";
>+ protected final String TEXT_1716 = " getKey()" + NL + "\t{";
>+ protected final String TEXT_1717 = NL + "\t\treturn new ";
>+ protected final String TEXT_1718 = "(getTypedKey());";
>+ protected final String TEXT_1719 = NL + "\t\treturn getTypedKey();";
>+ protected final String TEXT_1720 = NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void setKey(";
>+ protected final String TEXT_1721 = " key)" + NL + "\t{";
>+ protected final String TEXT_1722 = NL + "\t\tgetTypedKey().addAll(";
>+ protected final String TEXT_1723 = "(";
>+ protected final String TEXT_1724 = ")";
>+ protected final String TEXT_1725 = "key);";
>+ protected final String TEXT_1726 = NL + "\t\tsetTypedKey(key);";
>+ protected final String TEXT_1727 = NL + "\t\tsetTypedKey(((";
>+ protected final String TEXT_1728 = ")key).";
>+ protected final String TEXT_1729 = "());";
>+ protected final String TEXT_1730 = NL + "\t\tsetTypedKey((";
>+ protected final String TEXT_1731 = ")key);";
>+ protected final String TEXT_1732 = NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic ";
>+ protected final String TEXT_1733 = " getValue()" + NL + "\t{";
>+ protected final String TEXT_1734 = NL + "\t\treturn new ";
>+ protected final String TEXT_1735 = "(getTypedValue());";
>+ protected final String TEXT_1736 = NL + "\t\treturn getTypedValue();";
>+ protected final String TEXT_1737 = NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic ";
>+ protected final String TEXT_1738 = " setValue(";
>+ protected final String TEXT_1739 = " value)" + NL + "\t{" + NL + "\t\t";
>+ protected final String TEXT_1740 = " oldValue = getValue();";
>+ protected final String TEXT_1741 = NL + "\t\tgetTypedValue().clear();" + NL + "\t\tgetTypedValue().addAll(";
>+ protected final String TEXT_1742 = "(";
>+ protected final String TEXT_1743 = ")";
>+ protected final String TEXT_1744 = "value);";
>+ protected final String TEXT_1745 = NL + "\t\tsetTypedValue(value);";
>+ protected final String TEXT_1746 = NL + "\t\tsetTypedValue(((";
>+ protected final String TEXT_1747 = ")value).";
>+ protected final String TEXT_1748 = "());";
>+ protected final String TEXT_1749 = NL + "\t\tsetTypedValue((";
>+ protected final String TEXT_1750 = ")value);";
>+ protected final String TEXT_1751 = NL + "\t\treturn oldValue;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */";
>+ protected final String TEXT_1752 = NL + "\t@SuppressWarnings(\"unchecked\")";
>+ protected final String TEXT_1753 = NL + "\tpublic ";
>+ protected final String TEXT_1754 = " getEMap()" + NL + "\t{" + NL + "\t\t";
>+ protected final String TEXT_1755 = " container = eContainer();" + NL + "\t\treturn container == null ? null : (";
>+ protected final String TEXT_1756 = ")container.eGet(eContainmentFeature());" + NL + "\t}" + NL;
>+ protected final String TEXT_1757 = NL + "} //";
>+ protected final String TEXT_1758 = NL;
> 
> public String generate(Object argument)
> {
>@@ -2960,1547 +2961,1550 @@
> } else if (genClass.getGetAccessorOperation(genFeature) != null) {
> stringBuffer.append(TEXT_498);
> stringBuffer.append(genClass.getGetAccessorOperation(genFeature).getBody(genModel.getIndentation(stringBuffer)));
>- } else {
>+ } else if (genFeature.hasGetterBody()) {
> stringBuffer.append(TEXT_499);
>- stringBuffer.append(genFeature.getFormattedName());
>+ stringBuffer.append(genFeature.getGetterBody(genModel.getIndentation(stringBuffer)));
>+ } else {
> stringBuffer.append(TEXT_500);
>- stringBuffer.append(genFeature.getFeatureKind());
>+ stringBuffer.append(genFeature.getFormattedName());
> stringBuffer.append(TEXT_501);
>- if (genFeature.isListType()) {
>+ stringBuffer.append(genFeature.getFeatureKind());
> stringBuffer.append(TEXT_502);
>- if (genFeature.isMapType()) {
>+ if (genFeature.isListType()) {
> stringBuffer.append(TEXT_503);
>- } else if (genFeature.isFeatureMapType()) {
>+ if (genFeature.isMapType()) {
> stringBuffer.append(TEXT_504);
>- } else {
>+ } else if (genFeature.isFeatureMapType()) {
> stringBuffer.append(TEXT_505);
>- }
>+ } else {
> stringBuffer.append(TEXT_506);
> }
> stringBuffer.append(TEXT_507);
>+ }
>+ stringBuffer.append(TEXT_508);
> //Class/getGenFeature.todo.override.javajetinc
> }
> }
>- stringBuffer.append(TEXT_508);
>+ stringBuffer.append(TEXT_509);
> }
> //Class/getGenFeature.override.javajetinc
> }
> if (isImplementation && !genModel.isReflectiveDelegation() && genFeature.isBasicGet()) {
>- stringBuffer.append(TEXT_509);
>+ stringBuffer.append(TEXT_510);
> if (isJDK50) { //Class/basicGetGenFeature.annotations.insert.javajetinc
> }
>- stringBuffer.append(TEXT_510);
>- stringBuffer.append(genFeature.getImportedType(genClass));
> stringBuffer.append(TEXT_511);
>- stringBuffer.append(genFeature.getAccessorName());
>+ stringBuffer.append(genFeature.getImportedType(genClass));
> stringBuffer.append(TEXT_512);
>- if (genModel.isDynamicDelegation()) {
>+ stringBuffer.append(genFeature.getAccessorName());
> stringBuffer.append(TEXT_513);
>- stringBuffer.append(genFeature.getImportedType(genClass));
>+ if (genModel.isDynamicDelegation()) {
> stringBuffer.append(TEXT_514);
>- stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
>+ stringBuffer.append(genFeature.getImportedType(genClass));
> stringBuffer.append(TEXT_515);
>- stringBuffer.append(genFeature.getQualifiedFeatureAccessor());
>+ stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
> stringBuffer.append(TEXT_516);
>- stringBuffer.append(!genFeature.isEffectiveSuppressEMFTypes());
>+ stringBuffer.append(genFeature.getQualifiedFeatureAccessor());
> stringBuffer.append(TEXT_517);
>- } else if (genFeature.hasSettingDelegate()) {
>+ stringBuffer.append(!genFeature.isEffectiveSuppressEMFTypes());
> stringBuffer.append(TEXT_518);
>- if (!isJDK50 && genFeature.isPrimitiveType()) {
>+ } else if (genFeature.hasSettingDelegate()) {
> stringBuffer.append(TEXT_519);
>- }
>+ if (!isJDK50 && genFeature.isPrimitiveType()) {
> stringBuffer.append(TEXT_520);
>- stringBuffer.append(genFeature.getObjectType(genClass));
>+ }
> stringBuffer.append(TEXT_521);
>- stringBuffer.append(genFeature.getUpperName());
>+ stringBuffer.append(genFeature.getObjectType(genClass));
> stringBuffer.append(TEXT_522);
>- if (!isJDK50 && genFeature.isPrimitiveType()) {
>+ stringBuffer.append(genFeature.getUpperName());
> stringBuffer.append(TEXT_523);
>- stringBuffer.append(genFeature.getPrimitiveValueFunction());
>+ if (!isJDK50 && genFeature.isPrimitiveType()) {
> stringBuffer.append(TEXT_524);
>- }
>+ stringBuffer.append(genFeature.getPrimitiveValueFunction());
> stringBuffer.append(TEXT_525);
>- } else if (genFeature.isContainer()) {
>+ }
> stringBuffer.append(TEXT_526);
>+ } else if (genFeature.isContainer()) {
>+ stringBuffer.append(TEXT_527);
> stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
> stringBuffer.append(positiveOffsetCorrection);
>- stringBuffer.append(TEXT_527);
>- stringBuffer.append(genFeature.getImportedType(genClass));
> stringBuffer.append(TEXT_528);
>+ stringBuffer.append(genFeature.getImportedType(genClass));
>+ stringBuffer.append(TEXT_529);
> } else if (!genFeature.isVolatile()) {
> if (genModel.isVirtualDelegation()) {
>- stringBuffer.append(TEXT_529);
>- stringBuffer.append(genFeature.getImportedType(genClass));
> stringBuffer.append(TEXT_530);
>+ stringBuffer.append(genFeature.getImportedType(genClass));
>+ stringBuffer.append(TEXT_531);
> stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
> stringBuffer.append(positiveOffsetCorrection);
>- stringBuffer.append(TEXT_531);
>- } else {
> stringBuffer.append(TEXT_532);
>- stringBuffer.append(genFeature.getSafeName());
>+ } else {
> stringBuffer.append(TEXT_533);
>+ stringBuffer.append(genFeature.getSafeName());
>+ stringBuffer.append(TEXT_534);
> }
> } else if (genFeature.hasDelegateFeature()) { GenFeature delegateFeature = genFeature.getDelegateFeature();
> if (delegateFeature.isWrappedFeatureMapType()) {
>- stringBuffer.append(TEXT_534);
>- stringBuffer.append(genFeature.getImportedType(genClass));
> stringBuffer.append(TEXT_535);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));
>+ stringBuffer.append(genFeature.getImportedType(genClass));
> stringBuffer.append(TEXT_536);
>- stringBuffer.append(delegateFeature.getAccessorName());
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));
> stringBuffer.append(TEXT_537);
>- stringBuffer.append(genFeature.getQualifiedFeatureAccessor());
>+ stringBuffer.append(delegateFeature.getAccessorName());
> stringBuffer.append(TEXT_538);
>- } else {
>+ stringBuffer.append(genFeature.getQualifiedFeatureAccessor());
> stringBuffer.append(TEXT_539);
>- stringBuffer.append(genFeature.getImportedType(genClass));
>+ } else {
> stringBuffer.append(TEXT_540);
>- stringBuffer.append(delegateFeature.getAccessorName());
>+ stringBuffer.append(genFeature.getImportedType(genClass));
> stringBuffer.append(TEXT_541);
>- stringBuffer.append(genFeature.getQualifiedFeatureAccessor());
>+ stringBuffer.append(delegateFeature.getAccessorName());
> stringBuffer.append(TEXT_542);
>+ stringBuffer.append(genFeature.getQualifiedFeatureAccessor());
>+ stringBuffer.append(TEXT_543);
> }
> } else {
>- stringBuffer.append(TEXT_543);
>- stringBuffer.append(genFeature.getFormattedName());
> stringBuffer.append(TEXT_544);
>- stringBuffer.append(genFeature.getFeatureKind());
>+ stringBuffer.append(genFeature.getFormattedName());
> stringBuffer.append(TEXT_545);
>+ stringBuffer.append(genFeature.getFeatureKind());
>+ stringBuffer.append(TEXT_546);
> //Class/basicGetGenFeature.todo.override.javajetinc
> }
>- stringBuffer.append(TEXT_546);
>+ stringBuffer.append(TEXT_547);
> //Class/basicGetGenFeature.override.javajetinc
> }
> if (isImplementation && !genModel.isReflectiveDelegation() && genFeature.isBasicSet()) {
>- stringBuffer.append(TEXT_547);
>+ stringBuffer.append(TEXT_548);
> if (isJDK50) { //Class/basicSetGenFeature.annotations.insert.javajetinc
> }
>- stringBuffer.append(TEXT_548);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain"));
> stringBuffer.append(TEXT_549);
>- stringBuffer.append(genFeature.getAccessorName());
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain"));
> stringBuffer.append(TEXT_550);
>- stringBuffer.append(genFeature.getImportedInternalType(genClass));
>+ stringBuffer.append(genFeature.getAccessorName());
> stringBuffer.append(TEXT_551);
>- stringBuffer.append(genFeature.getCapName());
>+ stringBuffer.append(genFeature.getImportedInternalType(genClass));
> stringBuffer.append(TEXT_552);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain"));
>+ stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_553);
>- if (genFeature.isContainer()) {
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain"));
> stringBuffer.append(TEXT_554);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject"));
>+ if (genFeature.isContainer()) {
> stringBuffer.append(TEXT_555);
>- stringBuffer.append(genFeature.getCapName());
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject"));
> stringBuffer.append(TEXT_556);
>+ stringBuffer.append(genFeature.getCapName());
>+ stringBuffer.append(TEXT_557);
> stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
> stringBuffer.append(positiveOffsetCorrection);
>- stringBuffer.append(TEXT_557);
> stringBuffer.append(TEXT_558);
>- } else if (genModel.isDynamicDelegation()) {
> stringBuffer.append(TEXT_559);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject"));
>+ } else if (genModel.isDynamicDelegation()) {
> stringBuffer.append(TEXT_560);
>- stringBuffer.append(genFeature.getCapName());
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject"));
> stringBuffer.append(TEXT_561);
>+ stringBuffer.append(genFeature.getCapName());
>+ stringBuffer.append(TEXT_562);
> stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
> stringBuffer.append(positiveOffsetCorrection);
>- stringBuffer.append(TEXT_562);
> stringBuffer.append(TEXT_563);
>+ stringBuffer.append(TEXT_564);
> } else if (!genFeature.isVolatile()) {
> if (genModel.isVirtualDelegation()) {
>- stringBuffer.append(TEXT_564);
>- stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_565);
>+ stringBuffer.append(genFeature.getCapName());
>+ stringBuffer.append(TEXT_566);
> stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
> stringBuffer.append(positiveOffsetCorrection);
>- stringBuffer.append(TEXT_566);
>- stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_567);
>- } else {
>+ stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_568);
>- stringBuffer.append(genFeature.getImportedType(genClass));
>+ } else {
> stringBuffer.append(TEXT_569);
>- stringBuffer.append(genFeature.getCapName());
>+ stringBuffer.append(genFeature.getImportedType(genClass));
> stringBuffer.append(TEXT_570);
>- stringBuffer.append(genFeature.getSafeName());
>+ stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_571);
> stringBuffer.append(genFeature.getSafeName());
> stringBuffer.append(TEXT_572);
>- stringBuffer.append(genFeature.getCapName());
>+ stringBuffer.append(genFeature.getSafeName());
> stringBuffer.append(TEXT_573);
>+ stringBuffer.append(genFeature.getCapName());
>+ stringBuffer.append(TEXT_574);
> }
> if (genFeature.isUnsettable()) {
> if (genModel.isVirtualDelegation()) {
> if (!genModel.isSuppressNotification()) {
>- stringBuffer.append(TEXT_574);
>- stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_575);
>+ stringBuffer.append(genFeature.getCapName());
>+ stringBuffer.append(TEXT_576);
> }
> } else if (genClass.isESetFlag(genFeature)) {
>- stringBuffer.append(TEXT_576);
>- stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_577);
>- stringBuffer.append(genClass.getESetFlagsField(genFeature));
>+ stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_578);
>- stringBuffer.append(genFeature.getUpperName());
>+ stringBuffer.append(genClass.getESetFlagsField(genFeature));
> stringBuffer.append(TEXT_579);
>- if (!genModel.isSuppressNotification()) {
>+ stringBuffer.append(genFeature.getUpperName());
> stringBuffer.append(TEXT_580);
>- stringBuffer.append(genClass.getESetFlagsField(genFeature));
>+ if (!genModel.isSuppressNotification()) {
> stringBuffer.append(TEXT_581);
>- stringBuffer.append(genFeature.getUpperName());
>+ stringBuffer.append(genClass.getESetFlagsField(genFeature));
> stringBuffer.append(TEXT_582);
>+ stringBuffer.append(genFeature.getUpperName());
>+ stringBuffer.append(TEXT_583);
> }
> } else {
> if (!genModel.isSuppressNotification()) {
>- stringBuffer.append(TEXT_583);
>- stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_584);
>- stringBuffer.append(genFeature.getUncapName());
>+ stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_585);
>- }
>- stringBuffer.append(TEXT_586);
> stringBuffer.append(genFeature.getUncapName());
>+ stringBuffer.append(TEXT_586);
>+ }
> stringBuffer.append(TEXT_587);
>+ stringBuffer.append(genFeature.getUncapName());
>+ stringBuffer.append(TEXT_588);
> }
> }
> if (!genModel.isSuppressNotification()) {
>- stringBuffer.append(TEXT_588);
>- if (genFeature.isUnsettable()) {
> stringBuffer.append(TEXT_589);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl"));
>+ if (genFeature.isUnsettable()) {
> stringBuffer.append(TEXT_590);
> stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl"));
> stringBuffer.append(TEXT_591);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.Notification"));
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl"));
> stringBuffer.append(TEXT_592);
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.Notification"));
>+ stringBuffer.append(TEXT_593);
> stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
> stringBuffer.append(positiveOffsetCorrection);
>- stringBuffer.append(TEXT_593);
>- if (genModel.isVirtualDelegation()) {
> stringBuffer.append(TEXT_594);
>- stringBuffer.append(genFeature.getCapName());
>- } else {
>+ if (genModel.isVirtualDelegation()) {
> stringBuffer.append(TEXT_595);
> stringBuffer.append(genFeature.getCapName());
>- }
>+ } else {
> stringBuffer.append(TEXT_596);
> stringBuffer.append(genFeature.getCapName());
>+ }
> stringBuffer.append(TEXT_597);
>- if (genModel.isVirtualDelegation()) {
>+ stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_598);
>- } else {
>+ if (genModel.isVirtualDelegation()) {
> stringBuffer.append(TEXT_599);
>- stringBuffer.append(genFeature.getCapName());
>+ } else {
> stringBuffer.append(TEXT_600);
>- }
>+ stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_601);
>- } else {
>+ }
> stringBuffer.append(TEXT_602);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl"));
>+ } else {
> stringBuffer.append(TEXT_603);
> stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl"));
> stringBuffer.append(TEXT_604);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.Notification"));
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl"));
> stringBuffer.append(TEXT_605);
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.Notification"));
>+ stringBuffer.append(TEXT_606);
> stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
> stringBuffer.append(positiveOffsetCorrection);
>- stringBuffer.append(TEXT_606);
>- if (genModel.isVirtualDelegation()) {
> stringBuffer.append(TEXT_607);
>- stringBuffer.append(genFeature.getCapName());
>+ if (genModel.isVirtualDelegation()) {
> stringBuffer.append(TEXT_608);
> stringBuffer.append(genFeature.getCapName());
>- } else {
> stringBuffer.append(TEXT_609);
> stringBuffer.append(genFeature.getCapName());
>- }
>+ } else {
> stringBuffer.append(TEXT_610);
> stringBuffer.append(genFeature.getCapName());
>- stringBuffer.append(TEXT_611);
> }
>+ stringBuffer.append(TEXT_611);
>+ stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_612);
> }
> stringBuffer.append(TEXT_613);
>+ }
>+ stringBuffer.append(TEXT_614);
> } else if (genFeature.hasDelegateFeature()) { GenFeature delegateFeature = genFeature.getDelegateFeature();
> if (delegateFeature.isWrappedFeatureMapType()) {
>- stringBuffer.append(TEXT_614);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));
> stringBuffer.append(TEXT_615);
> stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));
> stringBuffer.append(TEXT_616);
>- stringBuffer.append(delegateFeature.getAccessorName());
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));
> stringBuffer.append(TEXT_617);
>- stringBuffer.append(genFeature.getQualifiedFeatureAccessor());
>+ stringBuffer.append(delegateFeature.getAccessorName());
> stringBuffer.append(TEXT_618);
>- stringBuffer.append(genFeature.getCapName());
>+ stringBuffer.append(genFeature.getQualifiedFeatureAccessor());
> stringBuffer.append(TEXT_619);
>- } else {
>+ stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_620);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));
>+ } else {
> stringBuffer.append(TEXT_621);
>- stringBuffer.append(delegateFeature.getAccessorName());
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));
> stringBuffer.append(TEXT_622);
>- stringBuffer.append(genFeature.getQualifiedFeatureAccessor());
>+ stringBuffer.append(delegateFeature.getAccessorName());
> stringBuffer.append(TEXT_623);
>- stringBuffer.append(genFeature.getCapName());
>+ stringBuffer.append(genFeature.getQualifiedFeatureAccessor());
> stringBuffer.append(TEXT_624);
>+ stringBuffer.append(genFeature.getCapName());
>+ stringBuffer.append(TEXT_625);
> }
> } else {
>- stringBuffer.append(TEXT_625);
>- stringBuffer.append(genFeature.getFormattedName());
> stringBuffer.append(TEXT_626);
>- stringBuffer.append(genFeature.getFeatureKind());
>+ stringBuffer.append(genFeature.getFormattedName());
> stringBuffer.append(TEXT_627);
>+ stringBuffer.append(genFeature.getFeatureKind());
>+ stringBuffer.append(TEXT_628);
> //Class/basicSetGenFeature.todo.override.javajetinc
> }
>- stringBuffer.append(TEXT_628);
>+ stringBuffer.append(TEXT_629);
> //Class/basicSetGenFeature.override.javajetinc
> }
> if (genFeature.isSet() && (isImplementation || !genFeature.isSuppressedSetVisibility())) {
> if (isInterface) { 
>- stringBuffer.append(TEXT_629);
>- stringBuffer.append(genClass.getQualifiedInterfaceName());
> stringBuffer.append(TEXT_630);
>- stringBuffer.append(genFeature.getGetAccessor());
>+ stringBuffer.append(genClass.getQualifiedInterfaceName());
> stringBuffer.append(TEXT_631);
>- stringBuffer.append(genFeature.getFormattedName());
>+ stringBuffer.append(genFeature.getGetAccessor());
> stringBuffer.append(TEXT_632);
>- stringBuffer.append(genFeature.getFeatureKind());
>+ stringBuffer.append(genFeature.getFormattedName());
> stringBuffer.append(TEXT_633);
>+ stringBuffer.append(genFeature.getFeatureKind());
> stringBuffer.append(TEXT_634);
>- stringBuffer.append(genFeature.getFormattedName());
> stringBuffer.append(TEXT_635);
>- stringBuffer.append(genFeature.getFeatureKind());
>+ stringBuffer.append(genFeature.getFormattedName());
> stringBuffer.append(TEXT_636);
>- if (genFeature.isEnumType()) {
>+ stringBuffer.append(genFeature.getFeatureKind());
> stringBuffer.append(TEXT_637);
>+ if (genFeature.isEnumType()) {
>+ stringBuffer.append(TEXT_638);
> stringBuffer.append(genFeature.getTypeGenEnum().getQualifiedName());
> }
> if (genFeature.isUnsettable()) {
> if (!genFeature.isSuppressedIsSetVisibility()) {
>- stringBuffer.append(TEXT_638);
>- stringBuffer.append(genFeature.getAccessorName());
> stringBuffer.append(TEXT_639);
>+ stringBuffer.append(genFeature.getAccessorName());
>+ stringBuffer.append(TEXT_640);
> }
> if (!genFeature.isSuppressedUnsetVisibility()) {
>- stringBuffer.append(TEXT_640);
>- stringBuffer.append(genFeature.getAccessorName());
> stringBuffer.append(TEXT_641);
>+ stringBuffer.append(genFeature.getAccessorName());
>+ stringBuffer.append(TEXT_642);
> }
> }
>- stringBuffer.append(TEXT_642);
>- stringBuffer.append(genFeature.getGetAccessor());
> stringBuffer.append(TEXT_643);
>+ stringBuffer.append(genFeature.getGetAccessor());
>+ stringBuffer.append(TEXT_644);
> //Class/setGenFeature.javadoc.override.javajetinc
> } else {
>- stringBuffer.append(TEXT_644);
>+ stringBuffer.append(TEXT_645);
> if (isJDK50) { //Class/setGenFeature.annotations.insert.javajetinc
> }
> }
> if (!isImplementation) { 
>- stringBuffer.append(TEXT_645);
>- stringBuffer.append(genFeature.getAccessorName());
> stringBuffer.append(TEXT_646);
>- stringBuffer.append(genFeature.getImportedType(genClass));
>+ stringBuffer.append(genFeature.getAccessorName());
> stringBuffer.append(TEXT_647);
>- } else { GenOperation setAccessorOperation = genClass.getSetAccessorOperation(genFeature);
>+ stringBuffer.append(genFeature.getImportedType(genClass));
> stringBuffer.append(TEXT_648);
>+ } else { GenOperation setAccessorOperation = genClass.getSetAccessorOperation(genFeature);
>+ stringBuffer.append(TEXT_649);
> stringBuffer.append(genFeature.getAccessorName());
> if (genClass.hasCollidingSetAccessorOperation(genFeature)) {
>- stringBuffer.append(TEXT_649);
>- }
> stringBuffer.append(TEXT_650);
>- stringBuffer.append(genFeature.getImportedType(genClass));
>+ }
> stringBuffer.append(TEXT_651);
>- stringBuffer.append(setAccessorOperation == null ? "new" + genFeature.getCapName() : setAccessorOperation.getGenParameters().get(0).getName());
>+ stringBuffer.append(genFeature.getImportedType(genClass));
> stringBuffer.append(TEXT_652);
>- if (genModel.isDynamicDelegation()) {
>+ stringBuffer.append(setAccessorOperation == null ? "new" + genFeature.getCapName() : setAccessorOperation.getGenParameters().get(0).getName());
> stringBuffer.append(TEXT_653);
>- stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
>+ if (genModel.isDynamicDelegation()) {
> stringBuffer.append(TEXT_654);
>- stringBuffer.append(genFeature.getQualifiedFeatureAccessor());
>+ stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
> stringBuffer.append(TEXT_655);
>- if (!isJDK50 && genFeature.isPrimitiveType()) {
>+ stringBuffer.append(genFeature.getQualifiedFeatureAccessor());
> stringBuffer.append(TEXT_656);
>- stringBuffer.append(genFeature.getObjectType(genClass));
>+ if (!isJDK50 && genFeature.isPrimitiveType()) {
> stringBuffer.append(TEXT_657);
>- }
>+ stringBuffer.append(genFeature.getObjectType(genClass));
> stringBuffer.append(TEXT_658);
>+ }
>+ stringBuffer.append(TEXT_659);
> stringBuffer.append(genFeature.getCapName());
> if (!isJDK50 && genFeature.isPrimitiveType()) {
>- stringBuffer.append(TEXT_659);
>- }
> stringBuffer.append(TEXT_660);
>- } else if (genModel.isReflectiveDelegation()) {
>+ }
> stringBuffer.append(TEXT_661);
>- stringBuffer.append(genFeature.getQualifiedFeatureAccessor());
>+ } else if (genModel.isReflectiveDelegation()) {
> stringBuffer.append(TEXT_662);
>- if (!isJDK50 && genFeature.isPrimitiveType()) {
>+ stringBuffer.append(genFeature.getQualifiedFeatureAccessor());
> stringBuffer.append(TEXT_663);
>- stringBuffer.append(genFeature.getObjectType(genClass));
>+ if (!isJDK50 && genFeature.isPrimitiveType()) {
> stringBuffer.append(TEXT_664);
>- }
>+ stringBuffer.append(genFeature.getObjectType(genClass));
> stringBuffer.append(TEXT_665);
>+ }
>+ stringBuffer.append(TEXT_666);
> stringBuffer.append(genFeature.getCapName());
> if (!isJDK50 && genFeature.isPrimitiveType()) {
>- stringBuffer.append(TEXT_666);
>- }
> stringBuffer.append(TEXT_667);
>- } else if (genFeature.hasSettingDelegate()) {
>+ }
> stringBuffer.append(TEXT_668);
>- stringBuffer.append(genFeature.getUpperName());
>+ } else if (genFeature.hasSettingDelegate()) {
> stringBuffer.append(TEXT_669);
>- if (!isJDK50 && genFeature.isPrimitiveType()) {
>+ stringBuffer.append(genFeature.getUpperName());
> stringBuffer.append(TEXT_670);
>- stringBuffer.append(genFeature.getObjectType(genClass));
>+ if (!isJDK50 && genFeature.isPrimitiveType()) {
> stringBuffer.append(TEXT_671);
>- }
>+ stringBuffer.append(genFeature.getObjectType(genClass));
> stringBuffer.append(TEXT_672);
>+ }
>+ stringBuffer.append(TEXT_673);
> stringBuffer.append(genFeature.getCapName());
> if (!isJDK50 && genFeature.isPrimitiveType()) {
>- stringBuffer.append(TEXT_673);
>- }
> stringBuffer.append(TEXT_674);
>+ }
>+ stringBuffer.append(TEXT_675);
> } else if (!genFeature.isVolatile()) {
> if (genFeature.isContainer()) { GenFeature reverseFeature = genFeature.getReverse(); GenClass targetClass = reverseFeature.getGenClass(); String reverseOffsetCorrection = targetClass.hasOffsetCorrection() ? " + " + genClass.getOffsetCorrectionField(genFeature) : "";
>- stringBuffer.append(TEXT_675);
>- stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_676);
>+ stringBuffer.append(genFeature.getCapName());
>+ stringBuffer.append(TEXT_677);
> stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
> stringBuffer.append(positiveOffsetCorrection);
>- stringBuffer.append(TEXT_677);
>- stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_678);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.EcoreUtil"));
>+ stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_679);
>- stringBuffer.append(genFeature.getEObjectCast());
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.EcoreUtil"));
> stringBuffer.append(TEXT_680);
>- stringBuffer.append(genFeature.getCapName());
>+ stringBuffer.append(genFeature.getEObjectCast());
> stringBuffer.append(TEXT_681);
>- stringBuffer.append(genModel.getImportedName("java.lang.IllegalArgumentException"));
>+ stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_682);
>- stringBuffer.append(genModel.getNonNLS());
>+ stringBuffer.append(genModel.getImportedName("java.lang.IllegalArgumentException"));
> stringBuffer.append(TEXT_683);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain"));
>+ stringBuffer.append(genModel.getNonNLS());
> stringBuffer.append(TEXT_684);
>- stringBuffer.append(genFeature.getCapName());
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain"));
> stringBuffer.append(TEXT_685);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject"));
>- stringBuffer.append(TEXT_686);
> stringBuffer.append(genFeature.getCapName());
>+ stringBuffer.append(TEXT_686);
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject"));
> stringBuffer.append(TEXT_687);
>+ stringBuffer.append(genFeature.getCapName());
>+ stringBuffer.append(TEXT_688);
> stringBuffer.append(targetClass.getQualifiedFeatureID(reverseFeature));
> stringBuffer.append(reverseOffsetCorrection);
>- stringBuffer.append(TEXT_688);
>- stringBuffer.append(targetClass.getRawImportedInterfaceName());
> stringBuffer.append(TEXT_689);
>- stringBuffer.append(genFeature.getAccessorName());
>+ stringBuffer.append(targetClass.getRawImportedInterfaceName());
> stringBuffer.append(TEXT_690);
>- stringBuffer.append(genFeature.getInternalTypeCast());
>+ stringBuffer.append(genFeature.getAccessorName());
> stringBuffer.append(TEXT_691);
>- stringBuffer.append(genFeature.getCapName());
>+ stringBuffer.append(genFeature.getInternalTypeCast());
> stringBuffer.append(TEXT_692);
>- if (!genModel.isSuppressNotification()) {
>+ stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_693);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl"));
>+ if (!genModel.isSuppressNotification()) {
> stringBuffer.append(TEXT_694);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.Notification"));
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl"));
> stringBuffer.append(TEXT_695);
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.Notification"));
>+ stringBuffer.append(TEXT_696);
> stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
> stringBuffer.append(positiveOffsetCorrection);
>- stringBuffer.append(TEXT_696);
>- stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_697);
> stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_698);
>+ stringBuffer.append(genFeature.getCapName());
>+ stringBuffer.append(TEXT_699);
> }
> } else if (genFeature.isBidirectional() || genFeature.isEffectiveContains()) {
> if (genModel.isVirtualDelegation()) {
>- stringBuffer.append(TEXT_699);
>- stringBuffer.append(genFeature.getImportedType(genClass));
> stringBuffer.append(TEXT_700);
>- stringBuffer.append(genFeature.getSafeName());
>- stringBuffer.append(TEXT_701);
> stringBuffer.append(genFeature.getImportedType(genClass));
>+ stringBuffer.append(TEXT_701);
>+ stringBuffer.append(genFeature.getSafeName());
> stringBuffer.append(TEXT_702);
>+ stringBuffer.append(genFeature.getImportedType(genClass));
>+ stringBuffer.append(TEXT_703);
> stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
> stringBuffer.append(positiveOffsetCorrection);
>- stringBuffer.append(TEXT_703);
>- }
> stringBuffer.append(TEXT_704);
>- stringBuffer.append(genFeature.getCapName());
>+ }
> stringBuffer.append(TEXT_705);
>- stringBuffer.append(genFeature.getSafeName());
>+ stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_706);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain"));
>- stringBuffer.append(TEXT_707);
> stringBuffer.append(genFeature.getSafeName());
>+ stringBuffer.append(TEXT_707);
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain"));
> stringBuffer.append(TEXT_708);
>- if (!genFeature.isBidirectional()) {
>+ stringBuffer.append(genFeature.getSafeName());
> stringBuffer.append(TEXT_709);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject"));
>+ if (!genFeature.isBidirectional()) {
> stringBuffer.append(TEXT_710);
>- stringBuffer.append(genFeature.getSafeName());
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject"));
> stringBuffer.append(TEXT_711);
>+ stringBuffer.append(genFeature.getSafeName());
>+ stringBuffer.append(TEXT_712);
> stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
> stringBuffer.append(negativeOffsetCorrection);
>- stringBuffer.append(TEXT_712);
>- stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_713);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject"));
>- stringBuffer.append(TEXT_714);
> stringBuffer.append(genFeature.getCapName());
>+ stringBuffer.append(TEXT_714);
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject"));
> stringBuffer.append(TEXT_715);
>+ stringBuffer.append(genFeature.getCapName());
>+ stringBuffer.append(TEXT_716);
> stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
> stringBuffer.append(negativeOffsetCorrection);
>- stringBuffer.append(TEXT_716);
>- } else { GenFeature reverseFeature = genFeature.getReverse(); GenClass targetClass = reverseFeature.getGenClass(); String reverseOffsetCorrection = targetClass.hasOffsetCorrection() ? " + " + genClass.getOffsetCorrectionField(genFeature) : "";
> stringBuffer.append(TEXT_717);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject"));
>+ } else { GenFeature reverseFeature = genFeature.getReverse(); GenClass targetClass = reverseFeature.getGenClass(); String reverseOffsetCorrection = targetClass.hasOffsetCorrection() ? " + " + genClass.getOffsetCorrectionField(genFeature) : "";
> stringBuffer.append(TEXT_718);
>- stringBuffer.append(genFeature.getSafeName());
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject"));
> stringBuffer.append(TEXT_719);
>+ stringBuffer.append(genFeature.getSafeName());
>+ stringBuffer.append(TEXT_720);
> stringBuffer.append(targetClass.getQualifiedFeatureID(reverseFeature));
> stringBuffer.append(reverseOffsetCorrection);
>- stringBuffer.append(TEXT_720);
>- stringBuffer.append(targetClass.getRawImportedInterfaceName());
> stringBuffer.append(TEXT_721);
>- stringBuffer.append(genFeature.getCapName());
>+ stringBuffer.append(targetClass.getRawImportedInterfaceName());
> stringBuffer.append(TEXT_722);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject"));
>- stringBuffer.append(TEXT_723);
> stringBuffer.append(genFeature.getCapName());
>+ stringBuffer.append(TEXT_723);
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject"));
> stringBuffer.append(TEXT_724);
>+ stringBuffer.append(genFeature.getCapName());
>+ stringBuffer.append(TEXT_725);
> stringBuffer.append(targetClass.getQualifiedFeatureID(reverseFeature));
> stringBuffer.append(reverseOffsetCorrection);
>- stringBuffer.append(TEXT_725);
>- stringBuffer.append(targetClass.getRawImportedInterfaceName());
> stringBuffer.append(TEXT_726);
>- }
>+ stringBuffer.append(targetClass.getRawImportedInterfaceName());
> stringBuffer.append(TEXT_727);
>- stringBuffer.append(genFeature.getAccessorName());
>+ }
> stringBuffer.append(TEXT_728);
>- stringBuffer.append(genFeature.getInternalTypeCast());
>+ stringBuffer.append(genFeature.getAccessorName());
> stringBuffer.append(TEXT_729);
>- stringBuffer.append(genFeature.getCapName());
>+ stringBuffer.append(genFeature.getInternalTypeCast());
> stringBuffer.append(TEXT_730);
>- if (genFeature.isUnsettable()) {
>+ stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_731);
>- if (genModel.isVirtualDelegation()) {
>+ if (genFeature.isUnsettable()) {
> stringBuffer.append(TEXT_732);
>- stringBuffer.append(genFeature.getCapName());
>+ if (genModel.isVirtualDelegation()) {
> stringBuffer.append(TEXT_733);
>+ stringBuffer.append(genFeature.getCapName());
>+ stringBuffer.append(TEXT_734);
> stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
> stringBuffer.append(positiveOffsetCorrection);
>- stringBuffer.append(TEXT_734);
>+ stringBuffer.append(TEXT_735);
> } else if (genClass.isESetFlag(genFeature)) {
> if (!genModel.isSuppressNotification()) {
>- stringBuffer.append(TEXT_735);
>- stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_736);
>- stringBuffer.append(genClass.getESetFlagsField(genFeature));
>+ stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_737);
>- stringBuffer.append(genFeature.getUpperName());
>+ stringBuffer.append(genClass.getESetFlagsField(genFeature));
> stringBuffer.append(TEXT_738);
>- }
>+ stringBuffer.append(genFeature.getUpperName());
> stringBuffer.append(TEXT_739);
>- stringBuffer.append(genClass.getESetFlagsField(genFeature));
>+ }
> stringBuffer.append(TEXT_740);
>- stringBuffer.append(genFeature.getUpperName());
>+ stringBuffer.append(genClass.getESetFlagsField(genFeature));
> stringBuffer.append(TEXT_741);
>+ stringBuffer.append(genFeature.getUpperName());
>+ stringBuffer.append(TEXT_742);
> } else {
> if (!genModel.isSuppressNotification()) {
>- stringBuffer.append(TEXT_742);
>- stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_743);
>- stringBuffer.append(genFeature.getUncapName());
>+ stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_744);
>- }
>- stringBuffer.append(TEXT_745);
> stringBuffer.append(genFeature.getUncapName());
>+ stringBuffer.append(TEXT_745);
>+ }
> stringBuffer.append(TEXT_746);
>+ stringBuffer.append(genFeature.getUncapName());
>+ stringBuffer.append(TEXT_747);
> }
> if (!genModel.isSuppressNotification()) {
>- stringBuffer.append(TEXT_747);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl"));
> stringBuffer.append(TEXT_748);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.Notification"));
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl"));
> stringBuffer.append(TEXT_749);
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.Notification"));
>+ stringBuffer.append(TEXT_750);
> stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
> stringBuffer.append(positiveOffsetCorrection);
>- stringBuffer.append(TEXT_750);
>- stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_751);
> stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_752);
> stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_753);
>- }
>+ stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_754);
>+ }
>+ stringBuffer.append(TEXT_755);
> } else {
> if (!genModel.isSuppressNotification()) {
>- stringBuffer.append(TEXT_755);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl"));
> stringBuffer.append(TEXT_756);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.Notification"));
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl"));
> stringBuffer.append(TEXT_757);
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.Notification"));
>+ stringBuffer.append(TEXT_758);
> stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
> stringBuffer.append(positiveOffsetCorrection);
>- stringBuffer.append(TEXT_758);
>- stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_759);
> stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_760);
>+ stringBuffer.append(genFeature.getCapName());
>+ stringBuffer.append(TEXT_761);
> }
> }
> } else {
> if (genClass.isFlag(genFeature)) {
> if (!genModel.isSuppressNotification()) {
> if (genFeature.isBooleanType()) {
>- stringBuffer.append(TEXT_761);
>- stringBuffer.append(genFeature.getImportedType(genClass));
> stringBuffer.append(TEXT_762);
>- stringBuffer.append(genFeature.getCapName());
>+ stringBuffer.append(genFeature.getImportedType(genClass));
> stringBuffer.append(TEXT_763);
>- stringBuffer.append(genClass.getFlagsField(genFeature));
>+ stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_764);
>- stringBuffer.append(genFeature.getUpperName());
>+ stringBuffer.append(genClass.getFlagsField(genFeature));
> stringBuffer.append(TEXT_765);
>- } else {
>+ stringBuffer.append(genFeature.getUpperName());
> stringBuffer.append(TEXT_766);
>- stringBuffer.append(genFeature.getImportedType(genClass));
>+ } else {
> stringBuffer.append(TEXT_767);
>- stringBuffer.append(genFeature.getCapName());
>+ stringBuffer.append(genFeature.getImportedType(genClass));
> stringBuffer.append(TEXT_768);
>- stringBuffer.append(genFeature.getUpperName());
>+ stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_769);
>- stringBuffer.append(genClass.getFlagsField(genFeature));
>- stringBuffer.append(TEXT_770);
> stringBuffer.append(genFeature.getUpperName());
>+ stringBuffer.append(TEXT_770);
>+ stringBuffer.append(genClass.getFlagsField(genFeature));
> stringBuffer.append(TEXT_771);
> stringBuffer.append(genFeature.getUpperName());
> stringBuffer.append(TEXT_772);
>+ stringBuffer.append(genFeature.getUpperName());
>+ stringBuffer.append(TEXT_773);
> }
> }
> if (genFeature.isBooleanType()) {
>- stringBuffer.append(TEXT_773);
>- stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_774);
>- stringBuffer.append(genClass.getFlagsField(genFeature));
>+ stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_775);
>- stringBuffer.append(genFeature.getUpperName());
>- stringBuffer.append(TEXT_776);
> stringBuffer.append(genClass.getFlagsField(genFeature));
>- stringBuffer.append(TEXT_777);
>+ stringBuffer.append(TEXT_776);
> stringBuffer.append(genFeature.getUpperName());
>+ stringBuffer.append(TEXT_777);
>+ stringBuffer.append(genClass.getFlagsField(genFeature));
> stringBuffer.append(TEXT_778);
>- } else {
>+ stringBuffer.append(genFeature.getUpperName());
> stringBuffer.append(TEXT_779);
>- stringBuffer.append(genFeature.getCapName());
>+ } else {
> stringBuffer.append(TEXT_780);
> stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_781);
>- stringBuffer.append(genFeature.getUpperName());
>+ stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_782);
>- stringBuffer.append(genClass.getFlagsField(genFeature));
>+ stringBuffer.append(genFeature.getUpperName());
> stringBuffer.append(TEXT_783);
> stringBuffer.append(genClass.getFlagsField(genFeature));
> stringBuffer.append(TEXT_784);
>- stringBuffer.append(genFeature.getUpperName());
>+ stringBuffer.append(genClass.getFlagsField(genFeature));
> stringBuffer.append(TEXT_785);
>- if (isJDK50) {
>+ stringBuffer.append(genFeature.getUpperName());
> stringBuffer.append(TEXT_786);
>- stringBuffer.append(genFeature.getCapName());
>+ if (isJDK50) {
> stringBuffer.append(TEXT_787);
>+ stringBuffer.append(genFeature.getCapName());
>+ stringBuffer.append(TEXT_788);
> } else {
> stringBuffer.append(genFeature.getImportedType(genClass));
>- stringBuffer.append(TEXT_788);
>- stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_789);
>- }
>+ stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_790);
>- stringBuffer.append(genFeature.getUpperName());
>+ }
> stringBuffer.append(TEXT_791);
>+ stringBuffer.append(genFeature.getUpperName());
>+ stringBuffer.append(TEXT_792);
> }
> } else {
> if (!genModel.isVirtualDelegation() || genFeature.isPrimitiveType()) {
> if (!genModel.isSuppressNotification()) {
>- stringBuffer.append(TEXT_792);
>- stringBuffer.append(genFeature.getImportedType(genClass));
> stringBuffer.append(TEXT_793);
>- stringBuffer.append(genFeature.getCapName());
>+ stringBuffer.append(genFeature.getImportedType(genClass));
> stringBuffer.append(TEXT_794);
>- stringBuffer.append(genFeature.getSafeName());
>+ stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_795);
>+ stringBuffer.append(genFeature.getSafeName());
>+ stringBuffer.append(TEXT_796);
> }
> }
> if (genFeature.isEnumType()) {
> if (genModel.isVirtualDelegation()) {
>- stringBuffer.append(TEXT_796);
>- stringBuffer.append(genFeature.getImportedType(genClass));
> stringBuffer.append(TEXT_797);
>- stringBuffer.append(genFeature.getSafeName());
>+ stringBuffer.append(genFeature.getImportedType(genClass));
> stringBuffer.append(TEXT_798);
>- stringBuffer.append(genFeature.getCapName());
>+ stringBuffer.append(genFeature.getSafeName());
> stringBuffer.append(TEXT_799);
>- stringBuffer.append(genFeature.getEDefault());
>- stringBuffer.append(TEXT_800);
> stringBuffer.append(genFeature.getCapName());
>+ stringBuffer.append(TEXT_800);
>+ stringBuffer.append(genFeature.getEDefault());
> stringBuffer.append(TEXT_801);
>- } else {
>+ stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_802);
>- stringBuffer.append(genFeature.getSafeName());
>+ } else {
> stringBuffer.append(TEXT_803);
>- stringBuffer.append(genFeature.getCapName());
>+ stringBuffer.append(genFeature.getSafeName());
> stringBuffer.append(TEXT_804);
>- stringBuffer.append(genFeature.getEDefault());
>- stringBuffer.append(TEXT_805);
> stringBuffer.append(genFeature.getCapName());
>+ stringBuffer.append(TEXT_805);
>+ stringBuffer.append(genFeature.getEDefault());
> stringBuffer.append(TEXT_806);
>+ stringBuffer.append(genFeature.getCapName());
>+ stringBuffer.append(TEXT_807);
> }
> } else {
> if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {
>- stringBuffer.append(TEXT_807);
>- stringBuffer.append(genFeature.getImportedType(genClass));
> stringBuffer.append(TEXT_808);
>- stringBuffer.append(genFeature.getSafeName());
>+ stringBuffer.append(genFeature.getImportedType(genClass));
> stringBuffer.append(TEXT_809);
>- stringBuffer.append(genFeature.getInternalTypeCast());
>+ stringBuffer.append(genFeature.getSafeName());
> stringBuffer.append(TEXT_810);
>- stringBuffer.append(genFeature.getCapName());
>+ stringBuffer.append(genFeature.getInternalTypeCast());
> stringBuffer.append(TEXT_811);
>- } else {
>+ stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_812);
>- stringBuffer.append(genFeature.getSafeName());
>+ } else {
> stringBuffer.append(TEXT_813);
>- stringBuffer.append(genFeature.getInternalTypeCast());
>+ stringBuffer.append(genFeature.getSafeName());
> stringBuffer.append(TEXT_814);
>- stringBuffer.append(genFeature.getCapName());
>+ stringBuffer.append(genFeature.getInternalTypeCast());
> stringBuffer.append(TEXT_815);
>+ stringBuffer.append(genFeature.getCapName());
>+ stringBuffer.append(TEXT_816);
> }
> }
> if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {
>- stringBuffer.append(TEXT_816);
>- stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_817);
>+ stringBuffer.append(genFeature.getCapName());
>+ stringBuffer.append(TEXT_818);
> stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
> stringBuffer.append(positiveOffsetCorrection);
>- stringBuffer.append(TEXT_818);
>- stringBuffer.append(genFeature.getSafeName());
> stringBuffer.append(TEXT_819);
>+ stringBuffer.append(genFeature.getSafeName());
>+ stringBuffer.append(TEXT_820);
> }
> }
> if (genFeature.isUnsettable()) {
> if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {
>- stringBuffer.append(TEXT_820);
>- stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_821);
>+ stringBuffer.append(genFeature.getCapName());
>+ stringBuffer.append(TEXT_822);
> } else if (genClass.isESetFlag(genFeature)) {
> if (!genModel.isSuppressNotification()) {
>- stringBuffer.append(TEXT_822);
>- stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_823);
>- stringBuffer.append(genClass.getESetFlagsField(genFeature));
>+ stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_824);
>- stringBuffer.append(genFeature.getUpperName());
>+ stringBuffer.append(genClass.getESetFlagsField(genFeature));
> stringBuffer.append(TEXT_825);
>- }
>+ stringBuffer.append(genFeature.getUpperName());
> stringBuffer.append(TEXT_826);
>- stringBuffer.append(genClass.getESetFlagsField(genFeature));
>+ }
> stringBuffer.append(TEXT_827);
>- stringBuffer.append(genFeature.getUpperName());
>+ stringBuffer.append(genClass.getESetFlagsField(genFeature));
> stringBuffer.append(TEXT_828);
>+ stringBuffer.append(genFeature.getUpperName());
>+ stringBuffer.append(TEXT_829);
> } else {
> if (!genModel.isSuppressNotification()) {
>- stringBuffer.append(TEXT_829);
>- stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_830);
>- stringBuffer.append(genFeature.getUncapName());
>+ stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_831);
>- }
>- stringBuffer.append(TEXT_832);
> stringBuffer.append(genFeature.getUncapName());
>+ stringBuffer.append(TEXT_832);
>+ }
> stringBuffer.append(TEXT_833);
>+ stringBuffer.append(genFeature.getUncapName());
>+ stringBuffer.append(TEXT_834);
> }
> if (!genModel.isSuppressNotification()) {
>- stringBuffer.append(TEXT_834);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl"));
> stringBuffer.append(TEXT_835);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.Notification"));
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl"));
> stringBuffer.append(TEXT_836);
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.Notification"));
>+ stringBuffer.append(TEXT_837);
> stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
> stringBuffer.append(positiveOffsetCorrection);
>- stringBuffer.append(TEXT_837);
>- if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {
> stringBuffer.append(TEXT_838);
>- stringBuffer.append(genFeature.getEDefault());
>+ if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {
> stringBuffer.append(TEXT_839);
>+ stringBuffer.append(genFeature.getEDefault());
>+ stringBuffer.append(TEXT_840);
> stringBuffer.append(genFeature.getCapName());
> } else {
>- stringBuffer.append(TEXT_840);
>+ stringBuffer.append(TEXT_841);
> stringBuffer.append(genFeature.getCapName());
> }
>- stringBuffer.append(TEXT_841);
>- if (genClass.isFlag(genFeature)) {
> stringBuffer.append(TEXT_842);
>+ if (genClass.isFlag(genFeature)) {
>+ stringBuffer.append(TEXT_843);
> stringBuffer.append(genFeature.getCapName());
> } else {
> stringBuffer.append(genFeature.getSafeName());
> }
>- stringBuffer.append(TEXT_843);
>- if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {
> stringBuffer.append(TEXT_844);
>- } else {
>+ if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {
> stringBuffer.append(TEXT_845);
>- stringBuffer.append(genFeature.getCapName());
>+ } else {
> stringBuffer.append(TEXT_846);
>- }
>+ stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_847);
> }
>+ stringBuffer.append(TEXT_848);
>+ }
> } else {
> if (!genModel.isSuppressNotification()) {
>- stringBuffer.append(TEXT_848);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl"));
> stringBuffer.append(TEXT_849);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.Notification"));
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl"));
> stringBuffer.append(TEXT_850);
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.Notification"));
>+ stringBuffer.append(TEXT_851);
> stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
> stringBuffer.append(positiveOffsetCorrection);
>- stringBuffer.append(TEXT_851);
>- if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {
> stringBuffer.append(TEXT_852);
>- stringBuffer.append(genFeature.getCapName());
>+ if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {
> stringBuffer.append(TEXT_853);
>- stringBuffer.append(genFeature.getEDefault());
>+ stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_854);
>+ stringBuffer.append(genFeature.getEDefault());
>+ stringBuffer.append(TEXT_855);
> stringBuffer.append(genFeature.getCapName());
> } else {
>- stringBuffer.append(TEXT_855);
>+ stringBuffer.append(TEXT_856);
> stringBuffer.append(genFeature.getCapName());
> }
>- stringBuffer.append(TEXT_856);
>- if (genClass.isFlag(genFeature)) {
> stringBuffer.append(TEXT_857);
>+ if (genClass.isFlag(genFeature)) {
>+ stringBuffer.append(TEXT_858);
> stringBuffer.append(genFeature.getCapName());
> } else {
> stringBuffer.append(genFeature.getSafeName());
> }
>- stringBuffer.append(TEXT_858);
>+ stringBuffer.append(TEXT_859);
> }
> }
> }
> } else if (genFeature.hasDelegateFeature()) { GenFeature delegateFeature = genFeature.getDelegateFeature();
> if (delegateFeature.isWrappedFeatureMapType()) {
>- stringBuffer.append(TEXT_859);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));
> stringBuffer.append(TEXT_860);
> stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));
> stringBuffer.append(TEXT_861);
>- stringBuffer.append(delegateFeature.getAccessorName());
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));
> stringBuffer.append(TEXT_862);
>- stringBuffer.append(genFeature.getQualifiedFeatureAccessor());
>+ stringBuffer.append(delegateFeature.getAccessorName());
> stringBuffer.append(TEXT_863);
>- if (!isJDK50 && genFeature.isPrimitiveType()) {
>+ stringBuffer.append(genFeature.getQualifiedFeatureAccessor());
> stringBuffer.append(TEXT_864);
>- stringBuffer.append(genFeature.getObjectType(genClass));
>+ if (!isJDK50 && genFeature.isPrimitiveType()) {
> stringBuffer.append(TEXT_865);
>- }
>+ stringBuffer.append(genFeature.getObjectType(genClass));
> stringBuffer.append(TEXT_866);
>+ }
>+ stringBuffer.append(TEXT_867);
> stringBuffer.append(genFeature.getCapName());
> if (!isJDK50 && genFeature.isPrimitiveType()) {
>- stringBuffer.append(TEXT_867);
>- }
> stringBuffer.append(TEXT_868);
>- } else {
>+ }
> stringBuffer.append(TEXT_869);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));
>+ } else {
> stringBuffer.append(TEXT_870);
>- stringBuffer.append(delegateFeature.getAccessorName());
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));
> stringBuffer.append(TEXT_871);
>- stringBuffer.append(genFeature.getQualifiedFeatureAccessor());
>+ stringBuffer.append(delegateFeature.getAccessorName());
> stringBuffer.append(TEXT_872);
>- if (!isJDK50 && genFeature.isPrimitiveType()) {
>+ stringBuffer.append(genFeature.getQualifiedFeatureAccessor());
> stringBuffer.append(TEXT_873);
>- stringBuffer.append(genFeature.getObjectType(genClass));
>+ if (!isJDK50 && genFeature.isPrimitiveType()) {
> stringBuffer.append(TEXT_874);
>- }
>+ stringBuffer.append(genFeature.getObjectType(genClass));
> stringBuffer.append(TEXT_875);
>+ }
>+ stringBuffer.append(TEXT_876);
> stringBuffer.append(genFeature.getCapName());
> if (!isJDK50 && genFeature.isPrimitiveType()) {
>- stringBuffer.append(TEXT_876);
>- }
> stringBuffer.append(TEXT_877);
> }
>- } else if (setAccessorOperation != null) {
> stringBuffer.append(TEXT_878);
>+ }
>+ } else if (setAccessorOperation != null) {
>+ stringBuffer.append(TEXT_879);
> stringBuffer.append(setAccessorOperation.getBody(genModel.getIndentation(stringBuffer)));
> } else {
>- stringBuffer.append(TEXT_879);
>- stringBuffer.append(genFeature.getFormattedName());
> stringBuffer.append(TEXT_880);
>- stringBuffer.append(genFeature.getFeatureKind());
>+ stringBuffer.append(genFeature.getFormattedName());
> stringBuffer.append(TEXT_881);
>+ stringBuffer.append(genFeature.getFeatureKind());
>+ stringBuffer.append(TEXT_882);
> //Class/setGenFeature.todo.override.javajetinc
> }
>- stringBuffer.append(TEXT_882);
>+ stringBuffer.append(TEXT_883);
> }
> //Class/setGenFeature.override.javajetinc
> }
> if (isImplementation && !genModel.isReflectiveDelegation() && genFeature.isBasicUnset()) {
>- stringBuffer.append(TEXT_883);
>+ stringBuffer.append(TEXT_884);
> if (isJDK50) { //Class/basicUnsetGenFeature.annotations.insert.javajetinc
> }
>- stringBuffer.append(TEXT_884);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain"));
> stringBuffer.append(TEXT_885);
>- stringBuffer.append(genFeature.getAccessorName());
>- stringBuffer.append(TEXT_886);
> stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain"));
>+ stringBuffer.append(TEXT_886);
>+ stringBuffer.append(genFeature.getAccessorName());
> stringBuffer.append(TEXT_887);
>- if (genModel.isDynamicDelegation()) {
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain"));
> stringBuffer.append(TEXT_888);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject"));
>+ if (genModel.isDynamicDelegation()) {
> stringBuffer.append(TEXT_889);
>- if (genFeature.isResolveProxies()) {
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject"));
> stringBuffer.append(TEXT_890);
>+ if (genFeature.isResolveProxies()) {
>+ stringBuffer.append(TEXT_891);
> stringBuffer.append(genFeature.getAccessorName());
> } else {
> stringBuffer.append(genFeature.getGetAccessor());
> }
>- stringBuffer.append(TEXT_891);
>+ stringBuffer.append(TEXT_892);
> stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
> stringBuffer.append(positiveOffsetCorrection);
>- stringBuffer.append(TEXT_892);
>+ stringBuffer.append(TEXT_893);
> } else if (!genFeature.isVolatile()) {
> if (genModel.isVirtualDelegation()) {
> if (!genModel.isSuppressNotification()) {
>- stringBuffer.append(TEXT_893);
>- stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_894);
>- }
>+ stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_895);
>+ }
>+ stringBuffer.append(TEXT_896);
> stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
> stringBuffer.append(positiveOffsetCorrection);
>- stringBuffer.append(TEXT_896);
>+ stringBuffer.append(TEXT_897);
> } else {
> if (!genModel.isSuppressNotification()) {
>- stringBuffer.append(TEXT_897);
>- stringBuffer.append(genFeature.getImportedType(genClass));
> stringBuffer.append(TEXT_898);
>- stringBuffer.append(genFeature.getCapName());
>+ stringBuffer.append(genFeature.getImportedType(genClass));
> stringBuffer.append(TEXT_899);
>- stringBuffer.append(genFeature.getSafeName());
>+ stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_900);
>- }
>- stringBuffer.append(TEXT_901);
> stringBuffer.append(genFeature.getSafeName());
>+ stringBuffer.append(TEXT_901);
>+ }
> stringBuffer.append(TEXT_902);
>+ stringBuffer.append(genFeature.getSafeName());
>+ stringBuffer.append(TEXT_903);
> }
> if (genModel.isVirtualDelegation()) {
> if (!genModel.isSuppressNotification()) {
>- stringBuffer.append(TEXT_903);
>- stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_904);
>+ stringBuffer.append(genFeature.getCapName());
>+ stringBuffer.append(TEXT_905);
> }
> } else if (genClass.isESetFlag(genFeature)) {
> if (!genModel.isSuppressNotification()) {
>- stringBuffer.append(TEXT_905);
>- stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_906);
>- stringBuffer.append(genClass.getESetFlagsField(genFeature));
>+ stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_907);
>- stringBuffer.append(genFeature.getUpperName());
>+ stringBuffer.append(genClass.getESetFlagsField(genFeature));
> stringBuffer.append(TEXT_908);
>- }
>+ stringBuffer.append(genFeature.getUpperName());
> stringBuffer.append(TEXT_909);
>- stringBuffer.append(genClass.getESetFlagsField(genFeature));
>+ }
> stringBuffer.append(TEXT_910);
>- stringBuffer.append(genFeature.getUpperName());
>+ stringBuffer.append(genClass.getESetFlagsField(genFeature));
> stringBuffer.append(TEXT_911);
>+ stringBuffer.append(genFeature.getUpperName());
>+ stringBuffer.append(TEXT_912);
> } else {
> if (!genModel.isSuppressNotification()) {
>- stringBuffer.append(TEXT_912);
>- stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_913);
>- stringBuffer.append(genFeature.getUncapName());
>+ stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_914);
>- }
>- stringBuffer.append(TEXT_915);
> stringBuffer.append(genFeature.getUncapName());
>+ stringBuffer.append(TEXT_915);
>+ }
> stringBuffer.append(TEXT_916);
>+ stringBuffer.append(genFeature.getUncapName());
>+ stringBuffer.append(TEXT_917);
> }
> if (!genModel.isSuppressNotification()) {
>- stringBuffer.append(TEXT_917);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl"));
> stringBuffer.append(TEXT_918);
> stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl"));
> stringBuffer.append(TEXT_919);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.Notification"));
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl"));
> stringBuffer.append(TEXT_920);
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.Notification"));
>+ stringBuffer.append(TEXT_921);
> stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
> stringBuffer.append(positiveOffsetCorrection);
>- stringBuffer.append(TEXT_921);
>- if (genModel.isVirtualDelegation()) {
> stringBuffer.append(TEXT_922);
>- stringBuffer.append(genFeature.getCapName());
>+ if (genModel.isVirtualDelegation()) {
> stringBuffer.append(TEXT_923);
>- } else {
>+ stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_924);
>+ } else {
>+ stringBuffer.append(TEXT_925);
> stringBuffer.append(genFeature.getCapName());
> }
>- stringBuffer.append(TEXT_925);
>- if (genModel.isVirtualDelegation()) {
> stringBuffer.append(TEXT_926);
>- } else {
>+ if (genModel.isVirtualDelegation()) {
> stringBuffer.append(TEXT_927);
>- stringBuffer.append(genFeature.getCapName());
>+ } else {
> stringBuffer.append(TEXT_928);
>- }
>+ stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_929);
> }
>- } else {
> stringBuffer.append(TEXT_930);
>- stringBuffer.append(genFeature.getFormattedName());
>+ }
>+ } else {
> stringBuffer.append(TEXT_931);
>- stringBuffer.append(genFeature.getFeatureKind());
>+ stringBuffer.append(genFeature.getFormattedName());
> stringBuffer.append(TEXT_932);
>+ stringBuffer.append(genFeature.getFeatureKind());
>+ stringBuffer.append(TEXT_933);
> //Class/basicUnsetGenFeature.todo.override.javajetinc
> }
>- stringBuffer.append(TEXT_933);
>+ stringBuffer.append(TEXT_934);
> //Class.basicUnsetGenFeature.override.javajetinc
> }
> if (genFeature.isUnset() && (isImplementation || !genFeature.isSuppressedUnsetVisibility())) {
> if (isInterface) {
>- stringBuffer.append(TEXT_934);
>- stringBuffer.append(genClass.getQualifiedInterfaceName());
> stringBuffer.append(TEXT_935);
>- stringBuffer.append(genFeature.getGetAccessor());
>+ stringBuffer.append(genClass.getQualifiedInterfaceName());
> stringBuffer.append(TEXT_936);
>- stringBuffer.append(genFeature.getFormattedName());
>+ stringBuffer.append(genFeature.getGetAccessor());
> stringBuffer.append(TEXT_937);
>- stringBuffer.append(genFeature.getFeatureKind());
>+ stringBuffer.append(genFeature.getFormattedName());
> stringBuffer.append(TEXT_938);
>+ stringBuffer.append(genFeature.getFeatureKind());
> stringBuffer.append(TEXT_939);
>- if (!genFeature.isSuppressedIsSetVisibility()) {
> stringBuffer.append(TEXT_940);
>- stringBuffer.append(genFeature.getAccessorName());
>+ if (!genFeature.isSuppressedIsSetVisibility()) {
> stringBuffer.append(TEXT_941);
>- }
>+ stringBuffer.append(genFeature.getAccessorName());
> stringBuffer.append(TEXT_942);
>- stringBuffer.append(genFeature.getGetAccessor());
>+ }
> stringBuffer.append(TEXT_943);
>- if (!genFeature.isListType() && !genFeature.isSuppressedSetVisibility()) {
>+ stringBuffer.append(genFeature.getGetAccessor());
> stringBuffer.append(TEXT_944);
>- stringBuffer.append(genFeature.getAccessorName());
>+ if (!genFeature.isListType() && !genFeature.isSuppressedSetVisibility()) {
> stringBuffer.append(TEXT_945);
>- stringBuffer.append(genFeature.getRawImportedBoundType());
>+ stringBuffer.append(genFeature.getAccessorName());
> stringBuffer.append(TEXT_946);
>- }
>+ stringBuffer.append(genFeature.getRawImportedBoundType());
> stringBuffer.append(TEXT_947);
>+ }
>+ stringBuffer.append(TEXT_948);
> //Class/unsetGenFeature.javadoc.override.javajetinc
> } else {
>- stringBuffer.append(TEXT_948);
>+ stringBuffer.append(TEXT_949);
> if (isJDK50) { //Class/unsetGenFeature.annotations.insert.javajetinc
> }
> }
> if (!isImplementation) {
>- stringBuffer.append(TEXT_949);
>- stringBuffer.append(genFeature.getAccessorName());
> stringBuffer.append(TEXT_950);
>- } else {
>+ stringBuffer.append(genFeature.getAccessorName());
> stringBuffer.append(TEXT_951);
>+ } else {
>+ stringBuffer.append(TEXT_952);
> stringBuffer.append(genFeature.getAccessorName());
> if (genClass.hasCollidingUnsetAccessorOperation(genFeature)) {
>- stringBuffer.append(TEXT_952);
>- }
> stringBuffer.append(TEXT_953);
>- if (genModel.isDynamicDelegation()) {
>+ }
> stringBuffer.append(TEXT_954);
>- stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
>+ if (genModel.isDynamicDelegation()) {
> stringBuffer.append(TEXT_955);
>- stringBuffer.append(genFeature.getQualifiedFeatureAccessor());
>+ stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
> stringBuffer.append(TEXT_956);
>- } else if (genModel.isReflectiveDelegation()) {
>- stringBuffer.append(TEXT_957);
> stringBuffer.append(genFeature.getQualifiedFeatureAccessor());
>+ stringBuffer.append(TEXT_957);
>+ } else if (genModel.isReflectiveDelegation()) {
> stringBuffer.append(TEXT_958);
>- } else if (genFeature.hasSettingDelegate()) {
>+ stringBuffer.append(genFeature.getQualifiedFeatureAccessor());
> stringBuffer.append(TEXT_959);
>- stringBuffer.append(genFeature.getUpperName());
>+ } else if (genFeature.hasSettingDelegate()) {
> stringBuffer.append(TEXT_960);
>+ stringBuffer.append(genFeature.getUpperName());
>+ stringBuffer.append(TEXT_961);
> } else if (!genFeature.isVolatile()) {
> if (genFeature.isListType()) {
> if (genModel.isVirtualDelegation()) {
>- stringBuffer.append(TEXT_961);
>- stringBuffer.append(genFeature.getImportedType(genClass));
> stringBuffer.append(TEXT_962);
>- stringBuffer.append(genFeature.getSafeName());
>- stringBuffer.append(TEXT_963);
> stringBuffer.append(genFeature.getImportedType(genClass));
>+ stringBuffer.append(TEXT_963);
>+ stringBuffer.append(genFeature.getSafeName());
> stringBuffer.append(TEXT_964);
>+ stringBuffer.append(genFeature.getImportedType(genClass));
>+ stringBuffer.append(TEXT_965);
> stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
> stringBuffer.append(positiveOffsetCorrection);
>- stringBuffer.append(TEXT_965);
>- }
> stringBuffer.append(TEXT_966);
>- stringBuffer.append(genFeature.getSafeName());
>+ }
> stringBuffer.append(TEXT_967);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.InternalEList"));
>+ stringBuffer.append(genFeature.getSafeName());
> stringBuffer.append(TEXT_968);
>- stringBuffer.append(singleWildcard);
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.InternalEList"));
> stringBuffer.append(TEXT_969);
>- stringBuffer.append(genFeature.getSafeName());
>+ stringBuffer.append(singleWildcard);
> stringBuffer.append(TEXT_970);
>+ stringBuffer.append(genFeature.getSafeName());
>+ stringBuffer.append(TEXT_971);
> } else if (genFeature.isBidirectional() || genFeature.isEffectiveContains()) {
> if (genModel.isVirtualDelegation()) {
>- stringBuffer.append(TEXT_971);
>- stringBuffer.append(genFeature.getImportedType(genClass));
> stringBuffer.append(TEXT_972);
>- stringBuffer.append(genFeature.getSafeName());
>- stringBuffer.append(TEXT_973);
> stringBuffer.append(genFeature.getImportedType(genClass));
>+ stringBuffer.append(TEXT_973);
>+ stringBuffer.append(genFeature.getSafeName());
> stringBuffer.append(TEXT_974);
>+ stringBuffer.append(genFeature.getImportedType(genClass));
>+ stringBuffer.append(TEXT_975);
> stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
> stringBuffer.append(positiveOffsetCorrection);
>- stringBuffer.append(TEXT_975);
>- }
> stringBuffer.append(TEXT_976);
>- stringBuffer.append(genFeature.getSafeName());
>+ }
> stringBuffer.append(TEXT_977);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain"));
>+ stringBuffer.append(genFeature.getSafeName());
> stringBuffer.append(TEXT_978);
>- if (!genFeature.isBidirectional()) {
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain"));
> stringBuffer.append(TEXT_979);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject"));
>+ if (!genFeature.isBidirectional()) {
> stringBuffer.append(TEXT_980);
>- stringBuffer.append(genFeature.getSafeName());
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject"));
> stringBuffer.append(TEXT_981);
>+ stringBuffer.append(genFeature.getSafeName());
>+ stringBuffer.append(TEXT_982);
> stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
> stringBuffer.append(negativeOffsetCorrection);
>- stringBuffer.append(TEXT_982);
>- } else { GenFeature reverseFeature = genFeature.getReverse(); GenClass targetClass = reverseFeature.getGenClass(); String reverseOffsetCorrection = targetClass.hasOffsetCorrection() ? " + " + genClass.getOffsetCorrectionField(genFeature) : "";
> stringBuffer.append(TEXT_983);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject"));
>+ } else { GenFeature reverseFeature = genFeature.getReverse(); GenClass targetClass = reverseFeature.getGenClass(); String reverseOffsetCorrection = targetClass.hasOffsetCorrection() ? " + " + genClass.getOffsetCorrectionField(genFeature) : "";
> stringBuffer.append(TEXT_984);
>- stringBuffer.append(genFeature.getSafeName());
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject"));
> stringBuffer.append(TEXT_985);
>+ stringBuffer.append(genFeature.getSafeName());
>+ stringBuffer.append(TEXT_986);
> stringBuffer.append(targetClass.getQualifiedFeatureID(reverseFeature));
> stringBuffer.append(reverseOffsetCorrection);
>- stringBuffer.append(TEXT_986);
>- stringBuffer.append(targetClass.getRawImportedInterfaceName());
> stringBuffer.append(TEXT_987);
>- }
>+ stringBuffer.append(targetClass.getRawImportedInterfaceName());
> stringBuffer.append(TEXT_988);
>- stringBuffer.append(genFeature.getAccessorName());
>+ }
> stringBuffer.append(TEXT_989);
>- if (genModel.isVirtualDelegation()) {
>+ stringBuffer.append(genFeature.getAccessorName());
> stringBuffer.append(TEXT_990);
>- stringBuffer.append(genFeature.getCapName());
>+ if (genModel.isVirtualDelegation()) {
> stringBuffer.append(TEXT_991);
>+ stringBuffer.append(genFeature.getCapName());
>+ stringBuffer.append(TEXT_992);
> stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
> stringBuffer.append(positiveOffsetCorrection);
>- stringBuffer.append(TEXT_992);
>+ stringBuffer.append(TEXT_993);
> } else if (genClass.isESetFlag(genFeature)) {
> if (!genModel.isSuppressNotification()) {
>- stringBuffer.append(TEXT_993);
>- stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_994);
>- stringBuffer.append(genClass.getESetFlagsField(genFeature));
>+ stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_995);
>- stringBuffer.append(genFeature.getUpperName());
>+ stringBuffer.append(genClass.getESetFlagsField(genFeature));
> stringBuffer.append(TEXT_996);
>- }
>+ stringBuffer.append(genFeature.getUpperName());
> stringBuffer.append(TEXT_997);
>- stringBuffer.append(genClass.getESetFlagsField(genFeature));
>+ }
> stringBuffer.append(TEXT_998);
>- stringBuffer.append(genFeature.getUpperName());
>+ stringBuffer.append(genClass.getESetFlagsField(genFeature));
> stringBuffer.append(TEXT_999);
>+ stringBuffer.append(genFeature.getUpperName());
>+ stringBuffer.append(TEXT_1000);
> } else {
> if (!genModel.isSuppressNotification()) {
>- stringBuffer.append(TEXT_1000);
>- stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_1001);
>- stringBuffer.append(genFeature.getUncapName());
>+ stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_1002);
>- }
>- stringBuffer.append(TEXT_1003);
> stringBuffer.append(genFeature.getUncapName());
>+ stringBuffer.append(TEXT_1003);
>+ }
> stringBuffer.append(TEXT_1004);
>+ stringBuffer.append(genFeature.getUncapName());
>+ stringBuffer.append(TEXT_1005);
> }
> if (!genModel.isSuppressNotification()) {
>- stringBuffer.append(TEXT_1005);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl"));
> stringBuffer.append(TEXT_1006);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.Notification"));
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl"));
> stringBuffer.append(TEXT_1007);
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.Notification"));
>+ stringBuffer.append(TEXT_1008);
> stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
> stringBuffer.append(positiveOffsetCorrection);
>- stringBuffer.append(TEXT_1008);
>- stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_1009);
>- }
>+ stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_1010);
>+ }
>+ stringBuffer.append(TEXT_1011);
> } else {
> if (genClass.isFlag(genFeature)) {
> if (!genModel.isSuppressNotification()) {
> if (genFeature.isBooleanType()) {
>- stringBuffer.append(TEXT_1011);
>- stringBuffer.append(genFeature.getImportedType(genClass));
> stringBuffer.append(TEXT_1012);
>- stringBuffer.append(genFeature.getCapName());
>+ stringBuffer.append(genFeature.getImportedType(genClass));
> stringBuffer.append(TEXT_1013);
>- stringBuffer.append(genClass.getFlagsField(genFeature));
>+ stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_1014);
>- stringBuffer.append(genFeature.getUpperName());
>+ stringBuffer.append(genClass.getFlagsField(genFeature));
> stringBuffer.append(TEXT_1015);
>- } else {
>+ stringBuffer.append(genFeature.getUpperName());
> stringBuffer.append(TEXT_1016);
>- stringBuffer.append(genFeature.getImportedType(genClass));
>+ } else {
> stringBuffer.append(TEXT_1017);
>- stringBuffer.append(genFeature.getCapName());
>+ stringBuffer.append(genFeature.getImportedType(genClass));
> stringBuffer.append(TEXT_1018);
>- stringBuffer.append(genFeature.getUpperName());
>+ stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_1019);
>- stringBuffer.append(genClass.getFlagsField(genFeature));
>- stringBuffer.append(TEXT_1020);
> stringBuffer.append(genFeature.getUpperName());
>+ stringBuffer.append(TEXT_1020);
>+ stringBuffer.append(genClass.getFlagsField(genFeature));
> stringBuffer.append(TEXT_1021);
> stringBuffer.append(genFeature.getUpperName());
> stringBuffer.append(TEXT_1022);
>+ stringBuffer.append(genFeature.getUpperName());
>+ stringBuffer.append(TEXT_1023);
> }
> }
> } else if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {
>- stringBuffer.append(TEXT_1023);
>- stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_1024);
>+ stringBuffer.append(genFeature.getCapName());
>+ stringBuffer.append(TEXT_1025);
> stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
> stringBuffer.append(positiveOffsetCorrection);
>- stringBuffer.append(TEXT_1025);
>+ stringBuffer.append(TEXT_1026);
> } else {
> if (!genModel.isSuppressNotification()) {
>- stringBuffer.append(TEXT_1026);
>- stringBuffer.append(genFeature.getImportedType(genClass));
> stringBuffer.append(TEXT_1027);
>- stringBuffer.append(genFeature.getCapName());
>+ stringBuffer.append(genFeature.getImportedType(genClass));
> stringBuffer.append(TEXT_1028);
>- stringBuffer.append(genFeature.getSafeName());
>+ stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_1029);
>+ stringBuffer.append(genFeature.getSafeName());
>+ stringBuffer.append(TEXT_1030);
> }
> }
> if (!genModel.isSuppressNotification()) {
> if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {
>- stringBuffer.append(TEXT_1030);
>- stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_1031);
>- } else if (genClass.isESetFlag(genFeature)) {
>- stringBuffer.append(TEXT_1032);
> stringBuffer.append(genFeature.getCapName());
>+ stringBuffer.append(TEXT_1032);
>+ } else if (genClass.isESetFlag(genFeature)) {
> stringBuffer.append(TEXT_1033);
>- stringBuffer.append(genClass.getESetFlagsField(genFeature));
>+ stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_1034);
>- stringBuffer.append(genFeature.getUpperName());
>+ stringBuffer.append(genClass.getESetFlagsField(genFeature));
> stringBuffer.append(TEXT_1035);
>- } else {
>+ stringBuffer.append(genFeature.getUpperName());
> stringBuffer.append(TEXT_1036);
>- stringBuffer.append(genFeature.getCapName());
>+ } else {
> stringBuffer.append(TEXT_1037);
>- stringBuffer.append(genFeature.getUncapName());
>+ stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_1038);
>+ stringBuffer.append(genFeature.getUncapName());
>+ stringBuffer.append(TEXT_1039);
> }
> }
> if (genFeature.isReferenceType()) {
>- stringBuffer.append(TEXT_1039);
>- stringBuffer.append(genFeature.getSafeName());
> stringBuffer.append(TEXT_1040);
>+ stringBuffer.append(genFeature.getSafeName());
>+ stringBuffer.append(TEXT_1041);
> if (!genModel.isVirtualDelegation()) {
> if (genClass.isESetFlag(genFeature)) {
>- stringBuffer.append(TEXT_1041);
>- stringBuffer.append(genClass.getESetFlagsField(genFeature));
> stringBuffer.append(TEXT_1042);
>- stringBuffer.append(genFeature.getUpperName());
>+ stringBuffer.append(genClass.getESetFlagsField(genFeature));
> stringBuffer.append(TEXT_1043);
>- } else {
>+ stringBuffer.append(genFeature.getUpperName());
> stringBuffer.append(TEXT_1044);
>- stringBuffer.append(genFeature.getUncapName());
>+ } else {
> stringBuffer.append(TEXT_1045);
>+ stringBuffer.append(genFeature.getUncapName());
>+ stringBuffer.append(TEXT_1046);
> }
> }
> if (!genModel.isSuppressNotification()) {
>- stringBuffer.append(TEXT_1046);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl"));
> stringBuffer.append(TEXT_1047);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.Notification"));
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl"));
> stringBuffer.append(TEXT_1048);
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.Notification"));
>+ stringBuffer.append(TEXT_1049);
> stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
> stringBuffer.append(positiveOffsetCorrection);
>- stringBuffer.append(TEXT_1049);
>- if (genModel.isVirtualDelegation()) {
> stringBuffer.append(TEXT_1050);
>- stringBuffer.append(genFeature.getCapName());
>+ if (genModel.isVirtualDelegation()) {
> stringBuffer.append(TEXT_1051);
>- } else {
>+ stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_1052);
>+ } else {
>+ stringBuffer.append(TEXT_1053);
> stringBuffer.append(genFeature.getCapName());
> }
>- stringBuffer.append(TEXT_1053);
>- if (genModel.isVirtualDelegation()) {
> stringBuffer.append(TEXT_1054);
>- } else {
>+ if (genModel.isVirtualDelegation()) {
> stringBuffer.append(TEXT_1055);
>- stringBuffer.append(genFeature.getCapName());
>+ } else {
> stringBuffer.append(TEXT_1056);
>- }
>+ stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_1057);
> }
>+ stringBuffer.append(TEXT_1058);
>+ }
> } else {
> if (genClass.isFlag(genFeature)) {
> if (genFeature.isBooleanType()) {
>- stringBuffer.append(TEXT_1058);
>- stringBuffer.append(genFeature.getEDefault());
> stringBuffer.append(TEXT_1059);
>- stringBuffer.append(genClass.getFlagsField(genFeature));
>+ stringBuffer.append(genFeature.getEDefault());
> stringBuffer.append(TEXT_1060);
>- stringBuffer.append(genFeature.getUpperName());
>- stringBuffer.append(TEXT_1061);
> stringBuffer.append(genClass.getFlagsField(genFeature));
>- stringBuffer.append(TEXT_1062);
>+ stringBuffer.append(TEXT_1061);
> stringBuffer.append(genFeature.getUpperName());
>+ stringBuffer.append(TEXT_1062);
>+ stringBuffer.append(genClass.getFlagsField(genFeature));
> stringBuffer.append(TEXT_1063);
>- } else {
>+ stringBuffer.append(genFeature.getUpperName());
> stringBuffer.append(TEXT_1064);
>- stringBuffer.append(genClass.getFlagsField(genFeature));
>+ } else {
> stringBuffer.append(TEXT_1065);
> stringBuffer.append(genClass.getFlagsField(genFeature));
> stringBuffer.append(TEXT_1066);
>- stringBuffer.append(genFeature.getUpperName());
>+ stringBuffer.append(genClass.getFlagsField(genFeature));
> stringBuffer.append(TEXT_1067);
> stringBuffer.append(genFeature.getUpperName());
> stringBuffer.append(TEXT_1068);
>+ stringBuffer.append(genFeature.getUpperName());
>+ stringBuffer.append(TEXT_1069);
> }
> } else if (!genModel.isVirtualDelegation() || genFeature.isPrimitiveType()) {
>- stringBuffer.append(TEXT_1069);
>- stringBuffer.append(genFeature.getSafeName());
> stringBuffer.append(TEXT_1070);
>- stringBuffer.append(genFeature.getEDefault());
>+ stringBuffer.append(genFeature.getSafeName());
> stringBuffer.append(TEXT_1071);
>+ stringBuffer.append(genFeature.getEDefault());
>+ stringBuffer.append(TEXT_1072);
> }
> if (!genModel.isVirtualDelegation() || genFeature.isPrimitiveType()) {
> if (genClass.isESetFlag(genFeature)) {
>- stringBuffer.append(TEXT_1072);
>- stringBuffer.append(genClass.getESetFlagsField(genFeature));
> stringBuffer.append(TEXT_1073);
>- stringBuffer.append(genFeature.getUpperName());
>+ stringBuffer.append(genClass.getESetFlagsField(genFeature));
> stringBuffer.append(TEXT_1074);
>- } else {
>+ stringBuffer.append(genFeature.getUpperName());
> stringBuffer.append(TEXT_1075);
>- stringBuffer.append(genFeature.getUncapName());
>+ } else {
> stringBuffer.append(TEXT_1076);
>+ stringBuffer.append(genFeature.getUncapName());
>+ stringBuffer.append(TEXT_1077);
> }
> }
> if (!genModel.isSuppressNotification()) {
>- stringBuffer.append(TEXT_1077);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl"));
> stringBuffer.append(TEXT_1078);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.Notification"));
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl"));
> stringBuffer.append(TEXT_1079);
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.Notification"));
>+ stringBuffer.append(TEXT_1080);
> stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
> stringBuffer.append(positiveOffsetCorrection);
>- stringBuffer.append(TEXT_1080);
>- if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {
> stringBuffer.append(TEXT_1081);
>- stringBuffer.append(genFeature.getCapName());
>+ if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {
> stringBuffer.append(TEXT_1082);
>+ stringBuffer.append(genFeature.getCapName());
>+ stringBuffer.append(TEXT_1083);
> stringBuffer.append(genFeature.getEDefault());
> } else {
>- stringBuffer.append(TEXT_1083);
>+ stringBuffer.append(TEXT_1084);
> stringBuffer.append(genFeature.getCapName());
> }
>- stringBuffer.append(TEXT_1084);
>- stringBuffer.append(genFeature.getEDefault());
> stringBuffer.append(TEXT_1085);
>- if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {
>+ stringBuffer.append(genFeature.getEDefault());
> stringBuffer.append(TEXT_1086);
>- } else {
>+ if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {
> stringBuffer.append(TEXT_1087);
>- stringBuffer.append(genFeature.getCapName());
>+ } else {
> stringBuffer.append(TEXT_1088);
>- }
>+ stringBuffer.append(genFeature.getCapName());
> stringBuffer.append(TEXT_1089);
> }
>+ stringBuffer.append(TEXT_1090);
>+ }
> }
> }
> } else if (genFeature.hasDelegateFeature()) { GenFeature delegateFeature = genFeature.getDelegateFeature();
> if (delegateFeature.isWrappedFeatureMapType()) {
>- stringBuffer.append(TEXT_1090);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));
> stringBuffer.append(TEXT_1091);
> stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));
> stringBuffer.append(TEXT_1092);
>- stringBuffer.append(delegateFeature.getAccessorName());
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));
> stringBuffer.append(TEXT_1093);
>- stringBuffer.append(genFeature.getQualifiedFeatureAccessor());
>+ stringBuffer.append(delegateFeature.getAccessorName());
> stringBuffer.append(TEXT_1094);
>- } else {
>+ stringBuffer.append(genFeature.getQualifiedFeatureAccessor());
> stringBuffer.append(TEXT_1095);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));
>+ } else {
> stringBuffer.append(TEXT_1096);
>- stringBuffer.append(delegateFeature.getAccessorName());
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));
> stringBuffer.append(TEXT_1097);
>- stringBuffer.append(genFeature.getQualifiedFeatureAccessor());
>+ stringBuffer.append(delegateFeature.getAccessorName());
> stringBuffer.append(TEXT_1098);
>+ stringBuffer.append(genFeature.getQualifiedFeatureAccessor());
>+ stringBuffer.append(TEXT_1099);
> }
> } else if (genClass.getUnsetAccessorOperation(genFeature) != null) {
>- stringBuffer.append(TEXT_1099);
>+ stringBuffer.append(TEXT_1100);
> stringBuffer.append(genClass.getUnsetAccessorOperation(genFeature).getBody(genModel.getIndentation(stringBuffer)));
> } else {
>- stringBuffer.append(TEXT_1100);
>- stringBuffer.append(genFeature.getFormattedName());
> stringBuffer.append(TEXT_1101);
>- stringBuffer.append(genFeature.getFeatureKind());
>+ stringBuffer.append(genFeature.getFormattedName());
> stringBuffer.append(TEXT_1102);
>+ stringBuffer.append(genFeature.getFeatureKind());
>+ stringBuffer.append(TEXT_1103);
> //Class/unsetGenFeature.todo.override.javajetinc
> }
>- stringBuffer.append(TEXT_1103);
>+ stringBuffer.append(TEXT_1104);
> }
> //Class/unsetGenFeature.override.javajetinc
> }
> if (genFeature.isIsSet() && (isImplementation || !genFeature.isSuppressedIsSetVisibility())) {
> if (isInterface) {
>- stringBuffer.append(TEXT_1104);
>- stringBuffer.append(genClass.getQualifiedInterfaceName());
> stringBuffer.append(TEXT_1105);
>- stringBuffer.append(genFeature.getGetAccessor());
>+ stringBuffer.append(genClass.getQualifiedInterfaceName());
> stringBuffer.append(TEXT_1106);
>- stringBuffer.append(genFeature.getFormattedName());
>+ stringBuffer.append(genFeature.getGetAccessor());
> stringBuffer.append(TEXT_1107);
>- stringBuffer.append(genFeature.getFeatureKind());
>+ stringBuffer.append(genFeature.getFormattedName());
> stringBuffer.append(TEXT_1108);
>+ stringBuffer.append(genFeature.getFeatureKind());
> stringBuffer.append(TEXT_1109);
>- stringBuffer.append(genFeature.getFormattedName());
> stringBuffer.append(TEXT_1110);
>- stringBuffer.append(genFeature.getFeatureKind());
>+ stringBuffer.append(genFeature.getFormattedName());
> stringBuffer.append(TEXT_1111);
>- if (genFeature.isChangeable() && !genFeature.isSuppressedUnsetVisibility()) {
>+ stringBuffer.append(genFeature.getFeatureKind());
> stringBuffer.append(TEXT_1112);
>- stringBuffer.append(genFeature.getAccessorName());
>+ if (genFeature.isChangeable() && !genFeature.isSuppressedUnsetVisibility()) {
> stringBuffer.append(TEXT_1113);
>- }
>+ stringBuffer.append(genFeature.getAccessorName());
> stringBuffer.append(TEXT_1114);
>- stringBuffer.append(genFeature.getGetAccessor());
>+ }
> stringBuffer.append(TEXT_1115);
>- if (!genFeature.isListType() && genFeature.isChangeable() && !genFeature.isSuppressedSetVisibility()) {
>+ stringBuffer.append(genFeature.getGetAccessor());
> stringBuffer.append(TEXT_1116);
>- stringBuffer.append(genFeature.getAccessorName());
>+ if (!genFeature.isListType() && genFeature.isChangeable() && !genFeature.isSuppressedSetVisibility()) {
> stringBuffer.append(TEXT_1117);
>- stringBuffer.append(genFeature.getRawImportedBoundType());
>+ stringBuffer.append(genFeature.getAccessorName());
> stringBuffer.append(TEXT_1118);
>- }
>+ stringBuffer.append(genFeature.getRawImportedBoundType());
> stringBuffer.append(TEXT_1119);
>+ }
>+ stringBuffer.append(TEXT_1120);
> //Class/isSetGenFeature.javadoc.override.javajetinc
> } else {
>- stringBuffer.append(TEXT_1120);
>+ stringBuffer.append(TEXT_1121);
> if (isJDK50) { //Class/isSetGenFeature.annotations.insert.javajetinc
> }
> }
> if (!isImplementation) {
>- stringBuffer.append(TEXT_1121);
>- stringBuffer.append(genFeature.getAccessorName());
> stringBuffer.append(TEXT_1122);
>- } else {
>+ stringBuffer.append(genFeature.getAccessorName());
> stringBuffer.append(TEXT_1123);
>+ } else {
>+ stringBuffer.append(TEXT_1124);
> stringBuffer.append(genFeature.getAccessorName());
> if (genClass.hasCollidingIsSetAccessorOperation(genFeature)) {
>- stringBuffer.append(TEXT_1124);
>- }
> stringBuffer.append(TEXT_1125);
>- if (genModel.isDynamicDelegation()) {
>+ }
> stringBuffer.append(TEXT_1126);
>- stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
>+ if (genModel.isDynamicDelegation()) {
> stringBuffer.append(TEXT_1127);
>- stringBuffer.append(genFeature.getQualifiedFeatureAccessor());
>+ stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
> stringBuffer.append(TEXT_1128);
>- } else if (genModel.isReflectiveDelegation()) {
>- stringBuffer.append(TEXT_1129);
> stringBuffer.append(genFeature.getQualifiedFeatureAccessor());
>+ stringBuffer.append(TEXT_1129);
>+ } else if (genModel.isReflectiveDelegation()) {
> stringBuffer.append(TEXT_1130);
>- } else if (genFeature.hasSettingDelegate()) {
>+ stringBuffer.append(genFeature.getQualifiedFeatureAccessor());
> stringBuffer.append(TEXT_1131);
>- stringBuffer.append(genFeature.getUpperName());
>+ } else if (genFeature.hasSettingDelegate()) {
> stringBuffer.append(TEXT_1132);
>+ stringBuffer.append(genFeature.getUpperName());
>+ stringBuffer.append(TEXT_1133);
> } else if (!genFeature.isVolatile()) {
> if (genFeature.isListType()) {
> if (genModel.isVirtualDelegation()) {
>- stringBuffer.append(TEXT_1133);
>- stringBuffer.append(genFeature.getImportedType(genClass));
> stringBuffer.append(TEXT_1134);
>- stringBuffer.append(genFeature.getSafeName());
>- stringBuffer.append(TEXT_1135);
> stringBuffer.append(genFeature.getImportedType(genClass));
>+ stringBuffer.append(TEXT_1135);
>+ stringBuffer.append(genFeature.getSafeName());
> stringBuffer.append(TEXT_1136);
>+ stringBuffer.append(genFeature.getImportedType(genClass));
>+ stringBuffer.append(TEXT_1137);
> stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
> stringBuffer.append(positiveOffsetCorrection);
>- stringBuffer.append(TEXT_1137);
>- }
> stringBuffer.append(TEXT_1138);
>- stringBuffer.append(genFeature.getSafeName());
>+ }
> stringBuffer.append(TEXT_1139);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.InternalEList"));
>+ stringBuffer.append(genFeature.getSafeName());
> stringBuffer.append(TEXT_1140);
>- stringBuffer.append(singleWildcard);
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.InternalEList"));
> stringBuffer.append(TEXT_1141);
>- stringBuffer.append(genFeature.getSafeName());
>+ stringBuffer.append(singleWildcard);
> stringBuffer.append(TEXT_1142);
>+ stringBuffer.append(genFeature.getSafeName());
>+ stringBuffer.append(TEXT_1143);
> } else {
> if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {
>- stringBuffer.append(TEXT_1143);
>+ stringBuffer.append(TEXT_1144);
> stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
> stringBuffer.append(positiveOffsetCorrection);
>- stringBuffer.append(TEXT_1144);
>- } else if (genClass.isESetFlag(genFeature)) {
> stringBuffer.append(TEXT_1145);
>- stringBuffer.append(genClass.getESetFlagsField(genFeature));
>+ } else if (genClass.isESetFlag(genFeature)) {
> stringBuffer.append(TEXT_1146);
>- stringBuffer.append(genFeature.getUpperName());
>+ stringBuffer.append(genClass.getESetFlagsField(genFeature));
> stringBuffer.append(TEXT_1147);
>- } else {
>+ stringBuffer.append(genFeature.getUpperName());
> stringBuffer.append(TEXT_1148);
>- stringBuffer.append(genFeature.getUncapName());
>+ } else {
> stringBuffer.append(TEXT_1149);
>+ stringBuffer.append(genFeature.getUncapName());
>+ stringBuffer.append(TEXT_1150);
> }
> }
> } else if (genFeature.hasDelegateFeature()) { GenFeature delegateFeature = genFeature.getDelegateFeature();
> if (delegateFeature.isWrappedFeatureMapType()) {
>- stringBuffer.append(TEXT_1150);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));
> stringBuffer.append(TEXT_1151);
> stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));
> stringBuffer.append(TEXT_1152);
>- stringBuffer.append(delegateFeature.getAccessorName());
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));
> stringBuffer.append(TEXT_1153);
>- stringBuffer.append(genFeature.getQualifiedFeatureAccessor());
>+ stringBuffer.append(delegateFeature.getAccessorName());
> stringBuffer.append(TEXT_1154);
>- } else {
>+ stringBuffer.append(genFeature.getQualifiedFeatureAccessor());
> stringBuffer.append(TEXT_1155);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));
>+ } else {
> stringBuffer.append(TEXT_1156);
>- stringBuffer.append(delegateFeature.getAccessorName());
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));
> stringBuffer.append(TEXT_1157);
>- stringBuffer.append(genFeature.getQualifiedFeatureAccessor());
>+ stringBuffer.append(delegateFeature.getAccessorName());
> stringBuffer.append(TEXT_1158);
>+ stringBuffer.append(genFeature.getQualifiedFeatureAccessor());
>+ stringBuffer.append(TEXT_1159);
> }
> } else if (genClass.getIsSetAccessorOperation(genFeature) != null) {
>- stringBuffer.append(TEXT_1159);
>+ stringBuffer.append(TEXT_1160);
> stringBuffer.append(genClass.getIsSetAccessorOperation(genFeature).getBody(genModel.getIndentation(stringBuffer)));
> } else {
>- stringBuffer.append(TEXT_1160);
>- stringBuffer.append(genFeature.getFormattedName());
> stringBuffer.append(TEXT_1161);
>- stringBuffer.append(genFeature.getFeatureKind());
>+ stringBuffer.append(genFeature.getFormattedName());
> stringBuffer.append(TEXT_1162);
>+ stringBuffer.append(genFeature.getFeatureKind());
>+ stringBuffer.append(TEXT_1163);
> //Class/isSetGenFeature.todo.override.javajetinc
> }
>- stringBuffer.append(TEXT_1163);
>+ stringBuffer.append(TEXT_1164);
> }
> //Class/isSetGenFeature.override.javajetinc
> }
>@@ -4510,1393 +4514,1393 @@
> for (GenOperation genOperation : (isImplementation ? genClass.getImplementedGenOperations() : genClass.getDeclaredGenOperations())) {
> if (isImplementation) {
> if (genOperation.isInvariant() && genOperation.hasInvariantExpression()) {
>- stringBuffer.append(TEXT_1164);
>- stringBuffer.append(genOperation.getName());
> stringBuffer.append(TEXT_1165);
>- stringBuffer.append(genOperation.getParameterTypes(", "));
>+ stringBuffer.append(genOperation.getName());
> stringBuffer.append(TEXT_1166);
>- stringBuffer.append(genOperation.getFormattedName());
>+ stringBuffer.append(genOperation.getParameterTypes(", "));
> stringBuffer.append(TEXT_1167);
>- stringBuffer.append(genOperation.getName());
>+ stringBuffer.append(genOperation.getFormattedName());
> stringBuffer.append(TEXT_1168);
>- stringBuffer.append(genOperation.getParameterTypes(", "));
>+ stringBuffer.append(genOperation.getName());
> stringBuffer.append(TEXT_1169);
>- stringBuffer.append(genModel.getImportedName("java.lang.String"));
>+ stringBuffer.append(genOperation.getParameterTypes(", "));
> stringBuffer.append(TEXT_1170);
>- stringBuffer.append(CodeGenUtil.upperName(genClass.getUniqueName(genOperation), genModel.getLocale()));
>+ stringBuffer.append(genModel.getImportedName("java.lang.String"));
> stringBuffer.append(TEXT_1171);
>- stringBuffer.append(genOperation.getInvariantExpression("\t\t"));
>+ stringBuffer.append(CodeGenUtil.upperName(genClass.getUniqueName(genOperation), genModel.getLocale()));
> stringBuffer.append(TEXT_1172);
>- stringBuffer.append(genModel.getNonNLS());
>+ stringBuffer.append(genOperation.getInvariantExpression("\t\t"));
> stringBuffer.append(TEXT_1173);
>- } else if (genOperation.hasInvocationDelegate()) {
>+ stringBuffer.append(genModel.getNonNLS());
> stringBuffer.append(TEXT_1174);
>- stringBuffer.append(genOperation.getName());
>+ } else if (genOperation.hasInvocationDelegate()) {
> stringBuffer.append(TEXT_1175);
>- stringBuffer.append(genOperation.getParameterTypes(", "));
>+ stringBuffer.append(genOperation.getName());
> stringBuffer.append(TEXT_1176);
>- stringBuffer.append(genOperation.getFormattedName());
>+ stringBuffer.append(genOperation.getParameterTypes(", "));
> stringBuffer.append(TEXT_1177);
>- stringBuffer.append(genOperation.getName());
>+ stringBuffer.append(genOperation.getFormattedName());
> stringBuffer.append(TEXT_1178);
>- stringBuffer.append(genOperation.getParameterTypes(", "));
>+ stringBuffer.append(genOperation.getName());
> stringBuffer.append(TEXT_1179);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EOperation"));
>+ stringBuffer.append(genOperation.getParameterTypes(", "));
> stringBuffer.append(TEXT_1180);
>- stringBuffer.append(CodeGenUtil.upperName(genClass.getUniqueName(genOperation), genModel.getLocale()));
>- stringBuffer.append(TEXT_1181);
> stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EOperation"));
>+ stringBuffer.append(TEXT_1181);
>+ stringBuffer.append(CodeGenUtil.upperName(genClass.getUniqueName(genOperation), genModel.getLocale()));
> stringBuffer.append(TEXT_1182);
>- stringBuffer.append(genOperation.getQualifiedOperationAccessor());
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EOperation"));
> stringBuffer.append(TEXT_1183);
>+ stringBuffer.append(genOperation.getQualifiedOperationAccessor());
>+ stringBuffer.append(TEXT_1184);
> }
> }
> if (isInterface) {
>- stringBuffer.append(TEXT_1184);
> stringBuffer.append(TEXT_1185);
>- if (genOperation.hasDocumentation() || genOperation.hasParameterDocumentation()) {
> stringBuffer.append(TEXT_1186);
>- if (genOperation.hasDocumentation()) {
>+ if (genOperation.hasDocumentation() || genOperation.hasParameterDocumentation()) {
> stringBuffer.append(TEXT_1187);
>+ if (genOperation.hasDocumentation()) {
>+ stringBuffer.append(TEXT_1188);
> stringBuffer.append(genOperation.getDocumentation(genModel.getIndentation(stringBuffer)));
> }
> for (GenParameter genParameter : genOperation.getGenParameters()) {
> if (genParameter.hasDocumentation()) { String documentation = genParameter.getDocumentation("");
> if (documentation.contains("\n") || documentation.contains("\r")) {
>- stringBuffer.append(TEXT_1188);
>- stringBuffer.append(genParameter.getName());
> stringBuffer.append(TEXT_1189);
>+ stringBuffer.append(genParameter.getName());
>+ stringBuffer.append(TEXT_1190);
> stringBuffer.append(genParameter.getDocumentation(genModel.getIndentation(stringBuffer)));
> } else {
>- stringBuffer.append(TEXT_1190);
>- stringBuffer.append(genParameter.getName());
> stringBuffer.append(TEXT_1191);
>+ stringBuffer.append(genParameter.getName());
>+ stringBuffer.append(TEXT_1192);
> stringBuffer.append(genParameter.getDocumentation(genModel.getIndentation(stringBuffer)));
> }
> }
> }
>- stringBuffer.append(TEXT_1192);
>+ stringBuffer.append(TEXT_1193);
> }
> if (!genModel.isSuppressEMFModelTags()) { boolean first = true; for (StringTokenizer stringTokenizer = new StringTokenizer(genOperation.getModelInfo(), "\n\r"); stringTokenizer.hasMoreTokens(); ) { String modelInfo = stringTokenizer.nextToken(); if (first) { first = false;
>- stringBuffer.append(TEXT_1193);
>+ stringBuffer.append(TEXT_1194);
> stringBuffer.append(modelInfo);
> } else {
>- stringBuffer.append(TEXT_1194);
>+ stringBuffer.append(TEXT_1195);
> stringBuffer.append(modelInfo);
> }} if (first) {
>- stringBuffer.append(TEXT_1195);
>- }}
> stringBuffer.append(TEXT_1196);
>+ }}
>+ stringBuffer.append(TEXT_1197);
> //Class/genOperation.javadoc.override.javajetinc
> } else {
>- stringBuffer.append(TEXT_1197);
>+ stringBuffer.append(TEXT_1198);
> if (isJDK50) { //Class/genOperation.annotations.insert.javajetinc
> }
> }
> if (!isImplementation) {
>- stringBuffer.append(TEXT_1198);
>+ stringBuffer.append(TEXT_1199);
> stringBuffer.append(genOperation.getTypeParameters(genClass));
> stringBuffer.append(genOperation.getImportedType(genClass));
>- stringBuffer.append(TEXT_1199);
>- stringBuffer.append(genOperation.getName());
> stringBuffer.append(TEXT_1200);
>- stringBuffer.append(genOperation.getParameters(genClass));
>+ stringBuffer.append(genOperation.getName());
> stringBuffer.append(TEXT_1201);
>- stringBuffer.append(genOperation.getThrows(genClass));
>+ stringBuffer.append(genOperation.getParameters(genClass));
> stringBuffer.append(TEXT_1202);
>+ stringBuffer.append(genOperation.getThrows(genClass));
>+ stringBuffer.append(TEXT_1203);
> } else {
> if (genModel.useGenerics() && !genOperation.hasBody() && !genOperation.isInvariant() && genOperation.hasInvocationDelegate() && genOperation.isUncheckedCast(genClass)) {
>- stringBuffer.append(TEXT_1203);
>- }
> stringBuffer.append(TEXT_1204);
>+ }
>+ stringBuffer.append(TEXT_1205);
> stringBuffer.append(genOperation.getTypeParameters(genClass));
> stringBuffer.append(genOperation.getImportedType(genClass));
>- stringBuffer.append(TEXT_1205);
>- stringBuffer.append(genOperation.getName());
> stringBuffer.append(TEXT_1206);
>- stringBuffer.append(genOperation.getParameters(genClass));
>+ stringBuffer.append(genOperation.getName());
> stringBuffer.append(TEXT_1207);
>- stringBuffer.append(genOperation.getThrows(genClass));
>+ stringBuffer.append(genOperation.getParameters(genClass));
> stringBuffer.append(TEXT_1208);
>- if (genOperation.hasBody()) {
>+ stringBuffer.append(genOperation.getThrows(genClass));
> stringBuffer.append(TEXT_1209);
>+ if (genOperation.hasBody()) {
>+ stringBuffer.append(TEXT_1210);
> stringBuffer.append(genOperation.getBody(genModel.getIndentation(stringBuffer)));
> } else if (genOperation.isInvariant()) {GenClass opClass = genOperation.getGenClass(); String diagnostics = genOperation.getGenParameters().get(0).getName(); String context = genOperation.getGenParameters().get(1).getName();
> if (genOperation.hasInvariantExpression()) {
>- stringBuffer.append(TEXT_1210);
>- stringBuffer.append(opClass.getGenPackage().getImportedValidatorClassName());
> stringBuffer.append(TEXT_1211);
>- stringBuffer.append(genClass.getQualifiedClassifierAccessor());
>+ stringBuffer.append(opClass.getGenPackage().getImportedValidatorClassName());
> stringBuffer.append(TEXT_1212);
>- stringBuffer.append(diagnostics);
>+ stringBuffer.append(genClass.getQualifiedClassifierAccessor());
> stringBuffer.append(TEXT_1213);
>- stringBuffer.append(context);
>+ stringBuffer.append(diagnostics);
> stringBuffer.append(TEXT_1214);
>- stringBuffer.append(genOperation.getValidationDelegate());
>+ stringBuffer.append(context);
> stringBuffer.append(TEXT_1215);
>- stringBuffer.append(genModel.getNonNLS());
>+ stringBuffer.append(genOperation.getValidationDelegate());
> stringBuffer.append(TEXT_1216);
>- stringBuffer.append(genOperation.getQualifiedOperationAccessor());
>+ stringBuffer.append(genModel.getNonNLS());
> stringBuffer.append(TEXT_1217);
>- stringBuffer.append(CodeGenUtil.upperName(genClass.getUniqueName(genOperation), genModel.getLocale()));
>+ stringBuffer.append(genOperation.getQualifiedOperationAccessor());
> stringBuffer.append(TEXT_1218);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.Diagnostic"));
>+ stringBuffer.append(CodeGenUtil.upperName(genClass.getUniqueName(genOperation), genModel.getLocale()));
> stringBuffer.append(TEXT_1219);
>- stringBuffer.append(opClass.getGenPackage().getImportedValidatorClassName());
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.Diagnostic"));
> stringBuffer.append(TEXT_1220);
> stringBuffer.append(opClass.getGenPackage().getImportedValidatorClassName());
> stringBuffer.append(TEXT_1221);
>- stringBuffer.append(opClass.getOperationID(genOperation));
>+ stringBuffer.append(opClass.getGenPackage().getImportedValidatorClassName());
> stringBuffer.append(TEXT_1222);
>- } else {
>+ stringBuffer.append(opClass.getOperationID(genOperation));
> stringBuffer.append(TEXT_1223);
>- stringBuffer.append(diagnostics);
>+ } else {
> stringBuffer.append(TEXT_1224);
> stringBuffer.append(diagnostics);
> stringBuffer.append(TEXT_1225);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.BasicDiagnostic"));
>+ stringBuffer.append(diagnostics);
> stringBuffer.append(TEXT_1226);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.Diagnostic"));
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.BasicDiagnostic"));
> stringBuffer.append(TEXT_1227);
>- stringBuffer.append(opClass.getGenPackage().getImportedValidatorClassName());
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.Diagnostic"));
> stringBuffer.append(TEXT_1228);
> stringBuffer.append(opClass.getGenPackage().getImportedValidatorClassName());
> stringBuffer.append(TEXT_1229);
>- stringBuffer.append(opClass.getOperationID(genOperation));
>+ stringBuffer.append(opClass.getGenPackage().getImportedValidatorClassName());
> stringBuffer.append(TEXT_1230);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.plugin.EcorePlugin"));
>+ stringBuffer.append(opClass.getOperationID(genOperation));
> stringBuffer.append(TEXT_1231);
>- stringBuffer.append(genOperation.getName());
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.plugin.EcorePlugin"));
> stringBuffer.append(TEXT_1232);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.EObjectValidator"));
>+ stringBuffer.append(genOperation.getName());
> stringBuffer.append(TEXT_1233);
>- stringBuffer.append(context);
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.EObjectValidator"));
> stringBuffer.append(TEXT_1234);
>+ stringBuffer.append(context);
>+ stringBuffer.append(TEXT_1235);
> stringBuffer.append(genModel.getNonNLS());
> stringBuffer.append(genModel.getNonNLS(2));
>- stringBuffer.append(TEXT_1235);
>+ stringBuffer.append(TEXT_1236);
> }
> } else if (genOperation.hasInvocationDelegate()) { int size = genOperation.getGenParameters().size();
>- stringBuffer.append(TEXT_1236);
>- if (genOperation.isVoid()) {
> stringBuffer.append(TEXT_1237);
>- stringBuffer.append(CodeGenUtil.upperName(genClass.getUniqueName(genOperation), genModel.getLocale()));
>+ if (genOperation.isVoid()) {
> stringBuffer.append(TEXT_1238);
>- if (size > 0) {
>+ stringBuffer.append(CodeGenUtil.upperName(genClass.getUniqueName(genOperation), genModel.getLocale()));
> stringBuffer.append(TEXT_1239);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.BasicEList"));
>+ if (size > 0) {
> stringBuffer.append(TEXT_1240);
>- stringBuffer.append(size);
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.BasicEList"));
> stringBuffer.append(TEXT_1241);
>- stringBuffer.append(genOperation.getParametersArray(genClass));
>+ stringBuffer.append(size);
> stringBuffer.append(TEXT_1242);
>- } else {
>+ stringBuffer.append(genOperation.getParametersArray(genClass));
> stringBuffer.append(TEXT_1243);
>- }
>- stringBuffer.append(TEXT_1244);
> } else {
>+ stringBuffer.append(TEXT_1244);
>+ }
> stringBuffer.append(TEXT_1245);
>- if (!isJDK50 && genOperation.isPrimitiveType()) {
>+ } else {
> stringBuffer.append(TEXT_1246);
>- }
>+ if (!isJDK50 && genOperation.isPrimitiveType()) {
> stringBuffer.append(TEXT_1247);
>- stringBuffer.append(genOperation.getObjectType(genClass));
>+ }
> stringBuffer.append(TEXT_1248);
>- stringBuffer.append(CodeGenUtil.upperName(genClass.getUniqueName(genOperation), genModel.getLocale()));
>+ stringBuffer.append(genOperation.getObjectType(genClass));
> stringBuffer.append(TEXT_1249);
>- if (size > 0) {
>+ stringBuffer.append(CodeGenUtil.upperName(genClass.getUniqueName(genOperation), genModel.getLocale()));
> stringBuffer.append(TEXT_1250);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.BasicEList"));
>+ if (size > 0) {
> stringBuffer.append(TEXT_1251);
>- stringBuffer.append(size);
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.BasicEList"));
> stringBuffer.append(TEXT_1252);
>- stringBuffer.append(genOperation.getParametersArray(genClass));
>+ stringBuffer.append(size);
> stringBuffer.append(TEXT_1253);
>- } else {
>+ stringBuffer.append(genOperation.getParametersArray(genClass));
> stringBuffer.append(TEXT_1254);
>- }
>+ } else {
> stringBuffer.append(TEXT_1255);
>- if (!isJDK50 && genOperation.isPrimitiveType()) {
>+ }
> stringBuffer.append(TEXT_1256);
>- stringBuffer.append(genOperation.getPrimitiveValueFunction());
>+ if (!isJDK50 && genOperation.isPrimitiveType()) {
> stringBuffer.append(TEXT_1257);
>- }
>+ stringBuffer.append(genOperation.getPrimitiveValueFunction());
> stringBuffer.append(TEXT_1258);
> }
> stringBuffer.append(TEXT_1259);
>- stringBuffer.append(genModel.getImportedName(isGWT ? "org.eclipse.emf.common.util.InvocationTargetException" : "java.lang.reflect.InvocationTargetException"));
>+ }
> stringBuffer.append(TEXT_1260);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.WrappedException"));
>+ stringBuffer.append(genModel.getImportedName(isGWT ? "org.eclipse.emf.common.util.InvocationTargetException" : "java.lang.reflect.InvocationTargetException"));
> stringBuffer.append(TEXT_1261);
>- } else {
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.WrappedException"));
> stringBuffer.append(TEXT_1262);
>+ } else {
>+ stringBuffer.append(TEXT_1263);
> //Class/implementedGenOperation.todo.override.javajetinc
> }
>- stringBuffer.append(TEXT_1263);
>+ stringBuffer.append(TEXT_1264);
> }
> //Class/implementedGenOperation.override.javajetinc
> }//for
> if (isImplementation && !genModel.isReflectiveDelegation() && genClass.implementsAny(genClass.getEInverseAddGenFeatures())) {
>- stringBuffer.append(TEXT_1264);
>+ stringBuffer.append(TEXT_1265);
> if (genModel.useGenerics()) {
> for (GenFeature genFeature : genClass.getEInverseAddGenFeatures()) {
> if (genFeature.isUncheckedCast(genClass)) {
>- stringBuffer.append(TEXT_1265);
>+ stringBuffer.append(TEXT_1266);
> break; }
> }
> }
> if (genModel.useClassOverrideAnnotation()) {
>- stringBuffer.append(TEXT_1266);
>- }
> stringBuffer.append(TEXT_1267);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain"));
>+ }
> stringBuffer.append(TEXT_1268);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject"));
>- stringBuffer.append(TEXT_1269);
> stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain"));
>+ stringBuffer.append(TEXT_1269);
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject"));
> stringBuffer.append(TEXT_1270);
>- stringBuffer.append(negativeOffsetCorrection);
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain"));
> stringBuffer.append(TEXT_1271);
>- for (GenFeature genFeature : genClass.getEInverseAddGenFeatures()) {
>+ stringBuffer.append(negativeOffsetCorrection);
> stringBuffer.append(TEXT_1272);
>- stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
>+ for (GenFeature genFeature : genClass.getEInverseAddGenFeatures()) {
> stringBuffer.append(TEXT_1273);
>+ stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
>+ stringBuffer.append(TEXT_1274);
> if (genFeature.isListType()) { String cast = "(" + genModel.getImportedName("org.eclipse.emf.ecore.util.InternalEList") + (!genModel.useGenerics() ? ")" : "<" + genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject") + ">)(" + genModel.getImportedName("org.eclipse.emf.ecore.util.InternalEList") + "<?>)");
> if (genFeature.isMapType() && genFeature.isEffectiveSuppressEMFTypes()) {
>- stringBuffer.append(TEXT_1274);
>- stringBuffer.append(cast);
> stringBuffer.append(TEXT_1275);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.EMap"));
>+ stringBuffer.append(cast);
> stringBuffer.append(TEXT_1276);
>- stringBuffer.append(genFeature.getImportedMapTemplateArguments(genClass));
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.EMap"));
> stringBuffer.append(TEXT_1277);
>- stringBuffer.append(genFeature.getGetAccessor());
>+ stringBuffer.append(genFeature.getImportedMapTemplateArguments(genClass));
> stringBuffer.append(TEXT_1278);
>- } else {
>+ stringBuffer.append(genFeature.getGetAccessor());
> stringBuffer.append(TEXT_1279);
>+ } else {
>+ stringBuffer.append(TEXT_1280);
> stringBuffer.append(cast);
> stringBuffer.append(genFeature.getGetAccessor());
>- stringBuffer.append(TEXT_1280);
>+ stringBuffer.append(TEXT_1281);
> }
> } else if (genFeature.isContainer()) {
>- stringBuffer.append(TEXT_1281);
>- if (genFeature.isBasicSet()) {
> stringBuffer.append(TEXT_1282);
>- stringBuffer.append(genFeature.getAccessorName());
>+ if (genFeature.isBasicSet()) {
> stringBuffer.append(TEXT_1283);
>- stringBuffer.append(genFeature.getImportedType(genClass));
>+ stringBuffer.append(genFeature.getAccessorName());
> stringBuffer.append(TEXT_1284);
>- } else {
>+ stringBuffer.append(genFeature.getImportedType(genClass));
> stringBuffer.append(TEXT_1285);
>+ } else {
>+ stringBuffer.append(TEXT_1286);
> stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
> stringBuffer.append(positiveOffsetCorrection);
>- stringBuffer.append(TEXT_1286);
>+ stringBuffer.append(TEXT_1287);
> }
> } else {
> if (genClass.getImplementingGenModel(genFeature).isVirtualDelegation()) {
>- stringBuffer.append(TEXT_1287);
>- stringBuffer.append(genFeature.getImportedType(genClass));
> stringBuffer.append(TEXT_1288);
>- stringBuffer.append(genFeature.getSafeName());
>- stringBuffer.append(TEXT_1289);
> stringBuffer.append(genFeature.getImportedType(genClass));
>+ stringBuffer.append(TEXT_1289);
>+ stringBuffer.append(genFeature.getSafeName());
> stringBuffer.append(TEXT_1290);
>+ stringBuffer.append(genFeature.getImportedType(genClass));
>+ stringBuffer.append(TEXT_1291);
> stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
> stringBuffer.append(positiveOffsetCorrection);
>- stringBuffer.append(TEXT_1291);
>- } else if (genFeature.isVolatile() || genClass.getImplementingGenModel(genFeature).isDynamicDelegation()) {
> stringBuffer.append(TEXT_1292);
>- stringBuffer.append(genFeature.getImportedType(genClass));
>+ } else if (genFeature.isVolatile() || genClass.getImplementingGenModel(genFeature).isDynamicDelegation()) {
> stringBuffer.append(TEXT_1293);
>- stringBuffer.append(genFeature.getSafeName());
>+ stringBuffer.append(genFeature.getImportedType(genClass));
> stringBuffer.append(TEXT_1294);
>- if (genFeature.isResolveProxies()) {
>+ stringBuffer.append(genFeature.getSafeName());
> stringBuffer.append(TEXT_1295);
>+ if (genFeature.isResolveProxies()) {
>+ stringBuffer.append(TEXT_1296);
> stringBuffer.append(genFeature.getAccessorName());
> } else {
> stringBuffer.append(genFeature.getGetAccessor());
> }
>- stringBuffer.append(TEXT_1296);
>- }
> stringBuffer.append(TEXT_1297);
>- stringBuffer.append(genFeature.getSafeName());
>+ }
> stringBuffer.append(TEXT_1298);
>- if (genFeature.isEffectiveContains()) {
>+ stringBuffer.append(genFeature.getSafeName());
> stringBuffer.append(TEXT_1299);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject"));
>+ if (genFeature.isEffectiveContains()) {
> stringBuffer.append(TEXT_1300);
>- stringBuffer.append(genFeature.getSafeName());
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject"));
> stringBuffer.append(TEXT_1301);
>+ stringBuffer.append(genFeature.getSafeName());
>+ stringBuffer.append(TEXT_1302);
> stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
> stringBuffer.append(negativeOffsetCorrection);
>- stringBuffer.append(TEXT_1302);
>- } else { GenFeature reverseFeature = genFeature.getReverse(); GenClass targetClass = reverseFeature.getGenClass(); String reverseOffsetCorrection = targetClass.hasOffsetCorrection() ? " + " + genClass.getOffsetCorrectionField(genFeature) : "";
> stringBuffer.append(TEXT_1303);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject"));
>+ } else { GenFeature reverseFeature = genFeature.getReverse(); GenClass targetClass = reverseFeature.getGenClass(); String reverseOffsetCorrection = targetClass.hasOffsetCorrection() ? " + " + genClass.getOffsetCorrectionField(genFeature) : "";
> stringBuffer.append(TEXT_1304);
>- stringBuffer.append(genFeature.getSafeName());
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject"));
> stringBuffer.append(TEXT_1305);
>+ stringBuffer.append(genFeature.getSafeName());
>+ stringBuffer.append(TEXT_1306);
> stringBuffer.append(targetClass.getQualifiedFeatureID(reverseFeature));
> stringBuffer.append(reverseOffsetCorrection);
>- stringBuffer.append(TEXT_1306);
>- stringBuffer.append(targetClass.getRawImportedInterfaceName());
> stringBuffer.append(TEXT_1307);
>- }
>+ stringBuffer.append(targetClass.getRawImportedInterfaceName());
> stringBuffer.append(TEXT_1308);
>- stringBuffer.append(genFeature.getAccessorName());
>+ }
> stringBuffer.append(TEXT_1309);
>- stringBuffer.append(genFeature.getImportedType(genClass));
>+ stringBuffer.append(genFeature.getAccessorName());
> stringBuffer.append(TEXT_1310);
>+ stringBuffer.append(genFeature.getImportedType(genClass));
>+ stringBuffer.append(TEXT_1311);
> }
> }
>- stringBuffer.append(TEXT_1311);
>- if (genModel.isMinimalReflectiveMethods()) {
> stringBuffer.append(TEXT_1312);
>- } else {
>+ if (genModel.isMinimalReflectiveMethods()) {
> stringBuffer.append(TEXT_1313);
>- }
>+ } else {
> stringBuffer.append(TEXT_1314);
> }
>- if (isImplementation && !genModel.isReflectiveDelegation() && genClass.implementsAny(genClass.getEInverseRemoveGenFeatures())) {
> stringBuffer.append(TEXT_1315);
>- if (genModel.useClassOverrideAnnotation()) {
>- stringBuffer.append(TEXT_1316);
> }
>+ if (isImplementation && !genModel.isReflectiveDelegation() && genClass.implementsAny(genClass.getEInverseRemoveGenFeatures())) {
>+ stringBuffer.append(TEXT_1316);
>+ if (genModel.useClassOverrideAnnotation()) {
> stringBuffer.append(TEXT_1317);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain"));
>+ }
> stringBuffer.append(TEXT_1318);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject"));
>- stringBuffer.append(TEXT_1319);
> stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain"));
>+ stringBuffer.append(TEXT_1319);
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject"));
> stringBuffer.append(TEXT_1320);
>- stringBuffer.append(negativeOffsetCorrection);
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain"));
> stringBuffer.append(TEXT_1321);
>- for (GenFeature genFeature : genClass.getEInverseRemoveGenFeatures()) {
>+ stringBuffer.append(negativeOffsetCorrection);
> stringBuffer.append(TEXT_1322);
>- stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
>+ for (GenFeature genFeature : genClass.getEInverseRemoveGenFeatures()) {
> stringBuffer.append(TEXT_1323);
>+ stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
>+ stringBuffer.append(TEXT_1324);
> if (genFeature.isListType()) {
> if (genFeature.isMapType() && genFeature.isEffectiveSuppressEMFTypes()) {
>- stringBuffer.append(TEXT_1324);
>+ stringBuffer.append(TEXT_1325);
> stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.InternalEList"));
> stringBuffer.append(singleWildcard);
>- stringBuffer.append(TEXT_1325);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.EMap"));
> stringBuffer.append(TEXT_1326);
>- stringBuffer.append(genFeature.getImportedMapTemplateArguments(genClass));
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.EMap"));
> stringBuffer.append(TEXT_1327);
>- stringBuffer.append(genFeature.getGetAccessor());
>+ stringBuffer.append(genFeature.getImportedMapTemplateArguments(genClass));
> stringBuffer.append(TEXT_1328);
>- } else if (genFeature.isWrappedFeatureMapType()) {
>+ stringBuffer.append(genFeature.getGetAccessor());
> stringBuffer.append(TEXT_1329);
>+ } else if (genFeature.isWrappedFeatureMapType()) {
>+ stringBuffer.append(TEXT_1330);
> stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.InternalEList"));
> stringBuffer.append(singleWildcard);
>- stringBuffer.append(TEXT_1330);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));
> stringBuffer.append(TEXT_1331);
>- stringBuffer.append(genFeature.getGetAccessor());
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));
> stringBuffer.append(TEXT_1332);
>- } else {
>+ stringBuffer.append(genFeature.getGetAccessor());
> stringBuffer.append(TEXT_1333);
>+ } else {
>+ stringBuffer.append(TEXT_1334);
> stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.InternalEList"));
> stringBuffer.append(singleWildcard);
>- stringBuffer.append(TEXT_1334);
>- stringBuffer.append(genFeature.getGetAccessor());
> stringBuffer.append(TEXT_1335);
>+ stringBuffer.append(genFeature.getGetAccessor());
>+ stringBuffer.append(TEXT_1336);
> }
> } else if (genFeature.isContainer() && !genFeature.isBasicSet()) {
>- stringBuffer.append(TEXT_1336);
>+ stringBuffer.append(TEXT_1337);
> stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
> stringBuffer.append(positiveOffsetCorrection);
>- stringBuffer.append(TEXT_1337);
>- } else if (genFeature.isUnsettable()) {
> stringBuffer.append(TEXT_1338);
>- stringBuffer.append(genFeature.getAccessorName());
>+ } else if (genFeature.isUnsettable()) {
> stringBuffer.append(TEXT_1339);
>- } else {
>- stringBuffer.append(TEXT_1340);
> stringBuffer.append(genFeature.getAccessorName());
>+ stringBuffer.append(TEXT_1340);
>+ } else {
> stringBuffer.append(TEXT_1341);
>+ stringBuffer.append(genFeature.getAccessorName());
>+ stringBuffer.append(TEXT_1342);
> }
> }
>- stringBuffer.append(TEXT_1342);
>- if (genModel.isMinimalReflectiveMethods()) {
> stringBuffer.append(TEXT_1343);
>- } else {
>+ if (genModel.isMinimalReflectiveMethods()) {
> stringBuffer.append(TEXT_1344);
>- }
>+ } else {
> stringBuffer.append(TEXT_1345);
> }
>- if (isImplementation && !genModel.isReflectiveDelegation() && genClass.implementsAny(genClass.getEBasicRemoveFromContainerGenFeatures())) {
> stringBuffer.append(TEXT_1346);
>- if (genModel.useClassOverrideAnnotation()) {
>- stringBuffer.append(TEXT_1347);
> }
>+ if (isImplementation && !genModel.isReflectiveDelegation() && genClass.implementsAny(genClass.getEBasicRemoveFromContainerGenFeatures())) {
>+ stringBuffer.append(TEXT_1347);
>+ if (genModel.useClassOverrideAnnotation()) {
> stringBuffer.append(TEXT_1348);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain"));
>+ }
> stringBuffer.append(TEXT_1349);
> stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain"));
> stringBuffer.append(TEXT_1350);
>- stringBuffer.append(negativeOffsetCorrection);
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain"));
> stringBuffer.append(TEXT_1351);
>+ stringBuffer.append(negativeOffsetCorrection);
>+ stringBuffer.append(TEXT_1352);
> for (GenFeature genFeature : genClass.getEBasicRemoveFromContainerGenFeatures()) {
> GenFeature reverseFeature = genFeature.getReverse(); GenClass targetClass = reverseFeature.getGenClass(); String reverseOffsetCorrection = targetClass.hasOffsetCorrection() ? " + " + genClass.getOffsetCorrectionField(genFeature) : "";
>- stringBuffer.append(TEXT_1352);
>- stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
> stringBuffer.append(TEXT_1353);
>+ stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
>+ stringBuffer.append(TEXT_1354);
> stringBuffer.append(targetClass.getQualifiedFeatureID(reverseFeature));
> stringBuffer.append(reverseOffsetCorrection);
>- stringBuffer.append(TEXT_1354);
>- stringBuffer.append(targetClass.getRawImportedInterfaceName());
> stringBuffer.append(TEXT_1355);
>- }
>+ stringBuffer.append(targetClass.getRawImportedInterfaceName());
> stringBuffer.append(TEXT_1356);
>- if (genModel.isMinimalReflectiveMethods()) {
>+ }
> stringBuffer.append(TEXT_1357);
>- } else {
>+ if (genModel.isMinimalReflectiveMethods()) {
> stringBuffer.append(TEXT_1358);
>- }
>+ } else {
> stringBuffer.append(TEXT_1359);
> }
>- if (isImplementation && !genModel.isReflectiveDelegation() && genClass.implementsAny(genClass.getEGetGenFeatures())) {
> stringBuffer.append(TEXT_1360);
>- if (genModel.useClassOverrideAnnotation()) {
>- stringBuffer.append(TEXT_1361);
> }
>+ if (isImplementation && !genModel.isReflectiveDelegation() && genClass.implementsAny(genClass.getEGetGenFeatures())) {
>+ stringBuffer.append(TEXT_1361);
>+ if (genModel.useClassOverrideAnnotation()) {
> stringBuffer.append(TEXT_1362);
>- stringBuffer.append(negativeOffsetCorrection);
>+ }
> stringBuffer.append(TEXT_1363);
>- for (GenFeature genFeature : genClass.getEGetGenFeatures()) {
>+ stringBuffer.append(negativeOffsetCorrection);
> stringBuffer.append(TEXT_1364);
>- stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
>+ for (GenFeature genFeature : genClass.getEGetGenFeatures()) {
> stringBuffer.append(TEXT_1365);
>+ stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
>+ stringBuffer.append(TEXT_1366);
> if (genFeature.isPrimitiveType()) {
> if (isJDK50) {
>- stringBuffer.append(TEXT_1366);
>- stringBuffer.append(genFeature.getGetAccessor());
> stringBuffer.append(TEXT_1367);
>- } else if (genFeature.isBooleanType()) {
>- stringBuffer.append(TEXT_1368);
> stringBuffer.append(genFeature.getGetAccessor());
>+ stringBuffer.append(TEXT_1368);
>+ } else if (genFeature.isBooleanType()) {
> stringBuffer.append(TEXT_1369);
>- } else {
>+ stringBuffer.append(genFeature.getGetAccessor());
> stringBuffer.append(TEXT_1370);
>- stringBuffer.append(genFeature.getObjectType(genClass));
>+ } else {
> stringBuffer.append(TEXT_1371);
>- stringBuffer.append(genFeature.getGetAccessor());
>+ stringBuffer.append(genFeature.getObjectType(genClass));
> stringBuffer.append(TEXT_1372);
>+ stringBuffer.append(genFeature.getGetAccessor());
>+ stringBuffer.append(TEXT_1373);
> }
> } else if (genFeature.isResolveProxies() && !genFeature.isListType()) {
>- stringBuffer.append(TEXT_1373);
>- stringBuffer.append(genFeature.getGetAccessor());
> stringBuffer.append(TEXT_1374);
>- stringBuffer.append(genFeature.getAccessorName());
>+ stringBuffer.append(genFeature.getGetAccessor());
> stringBuffer.append(TEXT_1375);
>+ stringBuffer.append(genFeature.getAccessorName());
>+ stringBuffer.append(TEXT_1376);
> } else if (genFeature.isMapType()) {
> if (genFeature.isEffectiveSuppressEMFTypes()) {
>- stringBuffer.append(TEXT_1376);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.EMap"));
> stringBuffer.append(TEXT_1377);
>- stringBuffer.append(genFeature.getImportedMapTemplateArguments(genClass));
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.EMap"));
> stringBuffer.append(TEXT_1378);
>- stringBuffer.append(genFeature.getGetAccessor());
>+ stringBuffer.append(genFeature.getImportedMapTemplateArguments(genClass));
> stringBuffer.append(TEXT_1379);
> stringBuffer.append(genFeature.getGetAccessor());
> stringBuffer.append(TEXT_1380);
>- } else {
>- stringBuffer.append(TEXT_1381);
> stringBuffer.append(genFeature.getGetAccessor());
>+ stringBuffer.append(TEXT_1381);
>+ } else {
> stringBuffer.append(TEXT_1382);
> stringBuffer.append(genFeature.getGetAccessor());
> stringBuffer.append(TEXT_1383);
>+ stringBuffer.append(genFeature.getGetAccessor());
>+ stringBuffer.append(TEXT_1384);
> }
> } else if (genFeature.isWrappedFeatureMapType()) {
>- stringBuffer.append(TEXT_1384);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));
> stringBuffer.append(TEXT_1385);
>- stringBuffer.append(genFeature.getGetAccessor());
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));
> stringBuffer.append(TEXT_1386);
> stringBuffer.append(genFeature.getGetAccessor());
> stringBuffer.append(TEXT_1387);
>- } else if (genFeature.isFeatureMapType()) {
>- stringBuffer.append(TEXT_1388);
> stringBuffer.append(genFeature.getGetAccessor());
>+ stringBuffer.append(TEXT_1388);
>+ } else if (genFeature.isFeatureMapType()) {
> stringBuffer.append(TEXT_1389);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));
>- stringBuffer.append(TEXT_1390);
> stringBuffer.append(genFeature.getGetAccessor());
>+ stringBuffer.append(TEXT_1390);
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));
> stringBuffer.append(TEXT_1391);
>- } else {
>- stringBuffer.append(TEXT_1392);
> stringBuffer.append(genFeature.getGetAccessor());
>+ stringBuffer.append(TEXT_1392);
>+ } else {
> stringBuffer.append(TEXT_1393);
>+ stringBuffer.append(genFeature.getGetAccessor());
>+ stringBuffer.append(TEXT_1394);
> }
> }
>- stringBuffer.append(TEXT_1394);
>- if (genModel.isMinimalReflectiveMethods()) {
> stringBuffer.append(TEXT_1395);
>- } else {
>+ if (genModel.isMinimalReflectiveMethods()) {
> stringBuffer.append(TEXT_1396);
>- }
>+ } else {
> stringBuffer.append(TEXT_1397);
> }
>- if (isImplementation && !genModel.isReflectiveDelegation() && genClass.implementsAny(genClass.getESetGenFeatures())) {
> stringBuffer.append(TEXT_1398);
>+ }
>+ if (isImplementation && !genModel.isReflectiveDelegation() && genClass.implementsAny(genClass.getESetGenFeatures())) {
>+ stringBuffer.append(TEXT_1399);
> if (genModel.useGenerics()) {
> for (GenFeature genFeature : genClass.getESetGenFeatures()) {
> if (genFeature.isUncheckedCast(genClass) && !genFeature.isFeatureMapType() && !genFeature.isMapType()) {
>- stringBuffer.append(TEXT_1399);
>+ stringBuffer.append(TEXT_1400);
> break; }
> }
> }
> if (genModel.useClassOverrideAnnotation()) {
>- stringBuffer.append(TEXT_1400);
>- }
> stringBuffer.append(TEXT_1401);
>- stringBuffer.append(negativeOffsetCorrection);
>+ }
> stringBuffer.append(TEXT_1402);
>- for (GenFeature genFeature : genClass.getESetGenFeatures()) {
>+ stringBuffer.append(negativeOffsetCorrection);
> stringBuffer.append(TEXT_1403);
>- stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
>+ for (GenFeature genFeature : genClass.getESetGenFeatures()) {
> stringBuffer.append(TEXT_1404);
>+ stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
>+ stringBuffer.append(TEXT_1405);
> if (genFeature.isListType()) {
> if (genFeature.isWrappedFeatureMapType()) {
>- stringBuffer.append(TEXT_1405);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));
> stringBuffer.append(TEXT_1406);
> stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));
> stringBuffer.append(TEXT_1407);
>- stringBuffer.append(genFeature.getGetAccessor());
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));
> stringBuffer.append(TEXT_1408);
>- } else if (genFeature.isFeatureMapType()) {
>+ stringBuffer.append(genFeature.getGetAccessor());
> stringBuffer.append(TEXT_1409);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));
>+ } else if (genFeature.isFeatureMapType()) {
> stringBuffer.append(TEXT_1410);
>- stringBuffer.append(genFeature.getGetAccessor());
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));
> stringBuffer.append(TEXT_1411);
>+ stringBuffer.append(genFeature.getGetAccessor());
>+ stringBuffer.append(TEXT_1412);
> } else if (genFeature.isMapType()) {
> if (genFeature.isEffectiveSuppressEMFTypes()) {
>- stringBuffer.append(TEXT_1412);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EStructuralFeature"));
> stringBuffer.append(TEXT_1413);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.EMap"));
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EStructuralFeature"));
> stringBuffer.append(TEXT_1414);
>- stringBuffer.append(genFeature.getImportedMapTemplateArguments(genClass));
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.EMap"));
> stringBuffer.append(TEXT_1415);
>- stringBuffer.append(genFeature.getGetAccessor());
>+ stringBuffer.append(genFeature.getImportedMapTemplateArguments(genClass));
> stringBuffer.append(TEXT_1416);
>- } else {
>+ stringBuffer.append(genFeature.getGetAccessor());
> stringBuffer.append(TEXT_1417);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EStructuralFeature"));
>+ } else {
> stringBuffer.append(TEXT_1418);
>- stringBuffer.append(genFeature.getGetAccessor());
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EStructuralFeature"));
> stringBuffer.append(TEXT_1419);
>+ stringBuffer.append(genFeature.getGetAccessor());
>+ stringBuffer.append(TEXT_1420);
> }
> } else {
>- stringBuffer.append(TEXT_1420);
>- stringBuffer.append(genFeature.getGetAccessor());
> stringBuffer.append(TEXT_1421);
> stringBuffer.append(genFeature.getGetAccessor());
> stringBuffer.append(TEXT_1422);
>+ stringBuffer.append(genFeature.getGetAccessor());
>+ stringBuffer.append(TEXT_1423);
> stringBuffer.append(genModel.getImportedName("java.util.Collection"));
> if (isJDK50) {
>- stringBuffer.append(TEXT_1423);
>- stringBuffer.append(genFeature.getListItemType(genClass));
> stringBuffer.append(TEXT_1424);
>- }
>+ stringBuffer.append(genFeature.getListItemType(genClass));
> stringBuffer.append(TEXT_1425);
> }
>- } else if (!isJDK50 && genFeature.isPrimitiveType()) {
> stringBuffer.append(TEXT_1426);
>- stringBuffer.append(genFeature.getAccessorName());
>+ }
>+ } else if (!isJDK50 && genFeature.isPrimitiveType()) {
> stringBuffer.append(TEXT_1427);
>- stringBuffer.append(genFeature.getObjectType(genClass));
>+ stringBuffer.append(genFeature.getAccessorName());
> stringBuffer.append(TEXT_1428);
>- stringBuffer.append(genFeature.getPrimitiveValueFunction());
>+ stringBuffer.append(genFeature.getObjectType(genClass));
> stringBuffer.append(TEXT_1429);
>- } else {
>+ stringBuffer.append(genFeature.getPrimitiveValueFunction());
> stringBuffer.append(TEXT_1430);
>- stringBuffer.append(genFeature.getAccessorName());
>+ } else {
> stringBuffer.append(TEXT_1431);
>- if (genFeature.getTypeGenDataType() == null || !genFeature.getTypeGenDataType().isObjectType() || !genFeature.getRawType().equals(genFeature.getType(genClass))) {
>+ stringBuffer.append(genFeature.getAccessorName());
> stringBuffer.append(TEXT_1432);
>- stringBuffer.append(genFeature.getObjectType(genClass));
>+ if (genFeature.getTypeGenDataType() == null || !genFeature.getTypeGenDataType().isObjectType() || !genFeature.getRawType().equals(genFeature.getType(genClass))) {
> stringBuffer.append(TEXT_1433);
>- }
>+ stringBuffer.append(genFeature.getObjectType(genClass));
> stringBuffer.append(TEXT_1434);
> }
> stringBuffer.append(TEXT_1435);
> }
> stringBuffer.append(TEXT_1436);
>- if (genModel.isMinimalReflectiveMethods()) {
>+ }
> stringBuffer.append(TEXT_1437);
>- } else {
>+ if (genModel.isMinimalReflectiveMethods()) {
> stringBuffer.append(TEXT_1438);
>- }
>+ } else {
> stringBuffer.append(TEXT_1439);
> }
>- if (isImplementation && !genModel.isReflectiveDelegation() && genClass.implementsAny(genClass.getEUnsetGenFeatures())) {
> stringBuffer.append(TEXT_1440);
>- if (genModel.useClassOverrideAnnotation()) {
>- stringBuffer.append(TEXT_1441);
> }
>+ if (isImplementation && !genModel.isReflectiveDelegation() && genClass.implementsAny(genClass.getEUnsetGenFeatures())) {
>+ stringBuffer.append(TEXT_1441);
>+ if (genModel.useClassOverrideAnnotation()) {
> stringBuffer.append(TEXT_1442);
>- stringBuffer.append(negativeOffsetCorrection);
>+ }
> stringBuffer.append(TEXT_1443);
>- for (GenFeature genFeature : genClass.getEUnsetGenFeatures()) {
>+ stringBuffer.append(negativeOffsetCorrection);
> stringBuffer.append(TEXT_1444);
>- stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
>+ for (GenFeature genFeature : genClass.getEUnsetGenFeatures()) {
> stringBuffer.append(TEXT_1445);
>+ stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
>+ stringBuffer.append(TEXT_1446);
> if (genFeature.isListType() && !genFeature.isUnsettable()) {
> if (genFeature.isWrappedFeatureMapType()) {
>- stringBuffer.append(TEXT_1446);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));
> stringBuffer.append(TEXT_1447);
>- stringBuffer.append(genFeature.getGetAccessor());
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));
> stringBuffer.append(TEXT_1448);
>- } else {
>- stringBuffer.append(TEXT_1449);
> stringBuffer.append(genFeature.getGetAccessor());
>+ stringBuffer.append(TEXT_1449);
>+ } else {
> stringBuffer.append(TEXT_1450);
>+ stringBuffer.append(genFeature.getGetAccessor());
>+ stringBuffer.append(TEXT_1451);
> }
> } else if (genFeature.isUnsettable()) {
>- stringBuffer.append(TEXT_1451);
>- stringBuffer.append(genFeature.getAccessorName());
> stringBuffer.append(TEXT_1452);
>- } else if (!genFeature.hasEDefault()) {
>- stringBuffer.append(TEXT_1453);
> stringBuffer.append(genFeature.getAccessorName());
>+ stringBuffer.append(TEXT_1453);
>+ } else if (!genFeature.hasEDefault()) {
> stringBuffer.append(TEXT_1454);
>- stringBuffer.append(genFeature.getImportedType(genClass));
>+ stringBuffer.append(genFeature.getAccessorName());
> stringBuffer.append(TEXT_1455);
>- } else {
>+ stringBuffer.append(genFeature.getImportedType(genClass));
> stringBuffer.append(TEXT_1456);
>- stringBuffer.append(genFeature.getAccessorName());
>+ } else {
> stringBuffer.append(TEXT_1457);
>- stringBuffer.append(genFeature.getEDefault());
>+ stringBuffer.append(genFeature.getAccessorName());
> stringBuffer.append(TEXT_1458);
>- }
>+ stringBuffer.append(genFeature.getEDefault());
> stringBuffer.append(TEXT_1459);
> }
> stringBuffer.append(TEXT_1460);
>- if (genModel.isMinimalReflectiveMethods()) {
>+ }
> stringBuffer.append(TEXT_1461);
>- } else {
>+ if (genModel.isMinimalReflectiveMethods()) {
> stringBuffer.append(TEXT_1462);
>- }
>+ } else {
> stringBuffer.append(TEXT_1463);
>+ }
>+ stringBuffer.append(TEXT_1464);
> //Class/eUnset.override.javajetinc
> }
> if (isImplementation && !genModel.isReflectiveDelegation() && genClass.implementsAny(genClass.getEIsSetGenFeatures())) {
>- stringBuffer.append(TEXT_1464);
>+ stringBuffer.append(TEXT_1465);
> if (genModel.useGenerics()) {
> for (GenFeature genFeature : genClass.getEIsSetGenFeatures()) {
> if (genFeature.isListType() && !genFeature.isUnsettable() && !genFeature.isWrappedFeatureMapType() && !genClass.isField(genFeature) && genFeature.isField() && genClass.getImplementingGenModel(genFeature).isVirtualDelegation()) {
>- stringBuffer.append(TEXT_1465);
>+ stringBuffer.append(TEXT_1466);
> break; }
> }
> }
> if (genModel.useClassOverrideAnnotation()) {
>- stringBuffer.append(TEXT_1466);
>- }
> stringBuffer.append(TEXT_1467);
>- stringBuffer.append(negativeOffsetCorrection);
>+ }
> stringBuffer.append(TEXT_1468);
>- for (GenFeature genFeature : genClass.getEIsSetGenFeatures()) { String safeNameAccessor = genFeature.getSafeName(); if ("featureID".equals(safeNameAccessor)) { safeNameAccessor = "this." + safeNameAccessor; }
>+ stringBuffer.append(negativeOffsetCorrection);
> stringBuffer.append(TEXT_1469);
>- stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
>+ for (GenFeature genFeature : genClass.getEIsSetGenFeatures()) { String safeNameAccessor = genFeature.getSafeName(); if ("featureID".equals(safeNameAccessor)) { safeNameAccessor = "this." + safeNameAccessor; }
> stringBuffer.append(TEXT_1470);
>+ stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
>+ stringBuffer.append(TEXT_1471);
> if (genFeature.hasSettingDelegate()) {
> if (genFeature.isUnsettable()) {
>- stringBuffer.append(TEXT_1471);
>- stringBuffer.append(genFeature.getAccessorName());
> stringBuffer.append(TEXT_1472);
>- } else {
>+ stringBuffer.append(genFeature.getAccessorName());
> stringBuffer.append(TEXT_1473);
>- stringBuffer.append(genFeature.getUpperName());
>+ } else {
> stringBuffer.append(TEXT_1474);
>+ stringBuffer.append(genFeature.getUpperName());
>+ stringBuffer.append(TEXT_1475);
> }
> } else if (genFeature.isListType() && !genFeature.isUnsettable()) {
> if (genFeature.isWrappedFeatureMapType()) {
> if (genFeature.isVolatile()) {
>- stringBuffer.append(TEXT_1475);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));
> stringBuffer.append(TEXT_1476);
>- stringBuffer.append(genFeature.getGetAccessor());
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));
> stringBuffer.append(TEXT_1477);
>- } else {
>+ stringBuffer.append(genFeature.getGetAccessor());
> stringBuffer.append(TEXT_1478);
>- stringBuffer.append(safeNameAccessor);
>+ } else {
> stringBuffer.append(TEXT_1479);
> stringBuffer.append(safeNameAccessor);
> stringBuffer.append(TEXT_1480);
>+ stringBuffer.append(safeNameAccessor);
>+ stringBuffer.append(TEXT_1481);
> }
> } else {
> if (genClass.isField(genFeature)) {
>- stringBuffer.append(TEXT_1481);
>- stringBuffer.append(safeNameAccessor);
> stringBuffer.append(TEXT_1482);
> stringBuffer.append(safeNameAccessor);
> stringBuffer.append(TEXT_1483);
>+ stringBuffer.append(safeNameAccessor);
>+ stringBuffer.append(TEXT_1484);
> } else {
> if (genFeature.isField() && genClass.getImplementingGenModel(genFeature).isVirtualDelegation()) {
>- stringBuffer.append(TEXT_1484);
>- stringBuffer.append(genFeature.getImportedType(genClass));
> stringBuffer.append(TEXT_1485);
>- stringBuffer.append(safeNameAccessor);
>- stringBuffer.append(TEXT_1486);
> stringBuffer.append(genFeature.getImportedType(genClass));
>+ stringBuffer.append(TEXT_1486);
>+ stringBuffer.append(safeNameAccessor);
> stringBuffer.append(TEXT_1487);
>+ stringBuffer.append(genFeature.getImportedType(genClass));
>+ stringBuffer.append(TEXT_1488);
> stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
> stringBuffer.append(positiveOffsetCorrection);
>- stringBuffer.append(TEXT_1488);
>- stringBuffer.append(safeNameAccessor);
> stringBuffer.append(TEXT_1489);
> stringBuffer.append(safeNameAccessor);
> stringBuffer.append(TEXT_1490);
>- } else {
>+ stringBuffer.append(safeNameAccessor);
> stringBuffer.append(TEXT_1491);
>- stringBuffer.append(genFeature.getGetAccessor());
>+ } else {
> stringBuffer.append(TEXT_1492);
>+ stringBuffer.append(genFeature.getGetAccessor());
>+ stringBuffer.append(TEXT_1493);
> }
> }
> }
> } else if (genFeature.isUnsettable()) {
>- stringBuffer.append(TEXT_1493);
>- stringBuffer.append(genFeature.getAccessorName());
> stringBuffer.append(TEXT_1494);
>+ stringBuffer.append(genFeature.getAccessorName());
>+ stringBuffer.append(TEXT_1495);
> } else if (genFeature.isResolveProxies()) {
> if (genClass.isField(genFeature)) {
>- stringBuffer.append(TEXT_1495);
>- stringBuffer.append(safeNameAccessor);
> stringBuffer.append(TEXT_1496);
>+ stringBuffer.append(safeNameAccessor);
>+ stringBuffer.append(TEXT_1497);
> } else {
> if (genFeature.isField() && genClass.getImplementingGenModel(genFeature).isVirtualDelegation()) {
>- stringBuffer.append(TEXT_1497);
>+ stringBuffer.append(TEXT_1498);
> stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
> stringBuffer.append(positiveOffsetCorrection);
>- stringBuffer.append(TEXT_1498);
>- } else {
> stringBuffer.append(TEXT_1499);
>- stringBuffer.append(genFeature.getAccessorName());
>+ } else {
> stringBuffer.append(TEXT_1500);
>+ stringBuffer.append(genFeature.getAccessorName());
>+ stringBuffer.append(TEXT_1501);
> }
> }
> } else if (!genFeature.hasEDefault()) {
> if (genClass.isField(genFeature)) {
>- stringBuffer.append(TEXT_1501);
>- stringBuffer.append(safeNameAccessor);
> stringBuffer.append(TEXT_1502);
>+ stringBuffer.append(safeNameAccessor);
>+ stringBuffer.append(TEXT_1503);
> } else {
> if (genFeature.isField() && genClass.getImplementingGenModel(genFeature).isVirtualDelegation()) {
>- stringBuffer.append(TEXT_1503);
>+ stringBuffer.append(TEXT_1504);
> stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
> stringBuffer.append(positiveOffsetCorrection);
>- stringBuffer.append(TEXT_1504);
>- } else {
> stringBuffer.append(TEXT_1505);
>- stringBuffer.append(genFeature.getGetAccessor());
>+ } else {
> stringBuffer.append(TEXT_1506);
>+ stringBuffer.append(genFeature.getGetAccessor());
>+ stringBuffer.append(TEXT_1507);
> }
> }
> } else if (genFeature.isPrimitiveType() || genFeature.isEnumType()) {
> if (genClass.isField(genFeature)) {
> if (genClass.isFlag(genFeature)) {
> if (genFeature.isBooleanType()) {
>- stringBuffer.append(TEXT_1507);
>- stringBuffer.append(genClass.getFlagsField(genFeature));
> stringBuffer.append(TEXT_1508);
>- stringBuffer.append(genFeature.getUpperName());
>+ stringBuffer.append(genClass.getFlagsField(genFeature));
> stringBuffer.append(TEXT_1509);
>- stringBuffer.append(genFeature.getEDefault());
>+ stringBuffer.append(genFeature.getUpperName());
> stringBuffer.append(TEXT_1510);
>- } else {
>+ stringBuffer.append(genFeature.getEDefault());
> stringBuffer.append(TEXT_1511);
>- stringBuffer.append(genClass.getFlagsField(genFeature));
>+ } else {
> stringBuffer.append(TEXT_1512);
>- stringBuffer.append(genFeature.getUpperName());
>+ stringBuffer.append(genClass.getFlagsField(genFeature));
> stringBuffer.append(TEXT_1513);
> stringBuffer.append(genFeature.getUpperName());
> stringBuffer.append(TEXT_1514);
>+ stringBuffer.append(genFeature.getUpperName());
>+ stringBuffer.append(TEXT_1515);
> }
> } else {
>- stringBuffer.append(TEXT_1515);
>- stringBuffer.append(safeNameAccessor);
> stringBuffer.append(TEXT_1516);
>- stringBuffer.append(genFeature.getEDefault());
>+ stringBuffer.append(safeNameAccessor);
> stringBuffer.append(TEXT_1517);
>+ stringBuffer.append(genFeature.getEDefault());
>+ stringBuffer.append(TEXT_1518);
> }
> } else {
> if (genFeature.isEnumType() && genFeature.isField() && genClass.getImplementingGenModel(genFeature).isVirtualDelegation()) {
>- stringBuffer.append(TEXT_1518);
>+ stringBuffer.append(TEXT_1519);
> stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
> stringBuffer.append(positiveOffsetCorrection);
>- stringBuffer.append(TEXT_1519);
>- stringBuffer.append(genFeature.getEDefault());
> stringBuffer.append(TEXT_1520);
> stringBuffer.append(genFeature.getEDefault());
> stringBuffer.append(TEXT_1521);
>- } else {
>+ stringBuffer.append(genFeature.getEDefault());
> stringBuffer.append(TEXT_1522);
>- stringBuffer.append(genFeature.getGetAccessor());
>+ } else {
> stringBuffer.append(TEXT_1523);
>- stringBuffer.append(genFeature.getEDefault());
>+ stringBuffer.append(genFeature.getGetAccessor());
> stringBuffer.append(TEXT_1524);
>+ stringBuffer.append(genFeature.getEDefault());
>+ stringBuffer.append(TEXT_1525);
> }
> }
> } else {//datatype
> if (genClass.isField(genFeature)) {
>- stringBuffer.append(TEXT_1525);
>- stringBuffer.append(genFeature.getEDefault());
> stringBuffer.append(TEXT_1526);
>- stringBuffer.append(safeNameAccessor);
>- stringBuffer.append(TEXT_1527);
> stringBuffer.append(genFeature.getEDefault());
>- stringBuffer.append(TEXT_1528);
>+ stringBuffer.append(TEXT_1527);
> stringBuffer.append(safeNameAccessor);
>+ stringBuffer.append(TEXT_1528);
>+ stringBuffer.append(genFeature.getEDefault());
> stringBuffer.append(TEXT_1529);
>+ stringBuffer.append(safeNameAccessor);
>+ stringBuffer.append(TEXT_1530);
> } else {
> if (genFeature.isField() && genClass.getImplementingGenModel(genFeature).isVirtualDelegation()) {
>- stringBuffer.append(TEXT_1530);
>- stringBuffer.append(genFeature.getImportedType(genClass));
> stringBuffer.append(TEXT_1531);
>- stringBuffer.append(safeNameAccessor);
>- stringBuffer.append(TEXT_1532);
> stringBuffer.append(genFeature.getImportedType(genClass));
>+ stringBuffer.append(TEXT_1532);
>+ stringBuffer.append(safeNameAccessor);
> stringBuffer.append(TEXT_1533);
>+ stringBuffer.append(genFeature.getImportedType(genClass));
>+ stringBuffer.append(TEXT_1534);
> stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
> stringBuffer.append(positiveOffsetCorrection);
>- stringBuffer.append(TEXT_1534);
>- stringBuffer.append(genFeature.getEDefault());
> stringBuffer.append(TEXT_1535);
> stringBuffer.append(genFeature.getEDefault());
> stringBuffer.append(TEXT_1536);
>- stringBuffer.append(safeNameAccessor);
>- stringBuffer.append(TEXT_1537);
> stringBuffer.append(genFeature.getEDefault());
>- stringBuffer.append(TEXT_1538);
>+ stringBuffer.append(TEXT_1537);
> stringBuffer.append(safeNameAccessor);
>+ stringBuffer.append(TEXT_1538);
>+ stringBuffer.append(genFeature.getEDefault());
> stringBuffer.append(TEXT_1539);
>- } else {
>+ stringBuffer.append(safeNameAccessor);
> stringBuffer.append(TEXT_1540);
>- stringBuffer.append(genFeature.getEDefault());
>+ } else {
> stringBuffer.append(TEXT_1541);
>- stringBuffer.append(genFeature.getGetAccessor());
>- stringBuffer.append(TEXT_1542);
> stringBuffer.append(genFeature.getEDefault());
>- stringBuffer.append(TEXT_1543);
>+ stringBuffer.append(TEXT_1542);
> stringBuffer.append(genFeature.getGetAccessor());
>+ stringBuffer.append(TEXT_1543);
>+ stringBuffer.append(genFeature.getEDefault());
> stringBuffer.append(TEXT_1544);
>+ stringBuffer.append(genFeature.getGetAccessor());
>+ stringBuffer.append(TEXT_1545);
> }
> }
> }
> }
>- stringBuffer.append(TEXT_1545);
>- if (genModel.isMinimalReflectiveMethods()) {
> stringBuffer.append(TEXT_1546);
>- } else {
>+ if (genModel.isMinimalReflectiveMethods()) {
> stringBuffer.append(TEXT_1547);
>- }
>+ } else {
> stringBuffer.append(TEXT_1548);
>+ }
>+ stringBuffer.append(TEXT_1549);
> //Class/eIsSet.override.javajetinc
> }
> if (isImplementation && (!genClass.getMixinGenFeatures().isEmpty() || genClass.hasOffsetCorrection() && !genClass.getGenFeatures().isEmpty())) {
> if (!genClass.getMixinGenFeatures().isEmpty()) {
>- stringBuffer.append(TEXT_1549);
>- if (genModel.useClassOverrideAnnotation()) {
> stringBuffer.append(TEXT_1550);
>- }
>+ if (genModel.useClassOverrideAnnotation()) {
> stringBuffer.append(TEXT_1551);
>- stringBuffer.append(singleWildcard);
>+ }
> stringBuffer.append(TEXT_1552);
>- for (GenClass mixinGenClass : genClass.getMixinGenClasses()) {
>+ stringBuffer.append(singleWildcard);
> stringBuffer.append(TEXT_1553);
>- stringBuffer.append(mixinGenClass.getRawImportedInterfaceName());
>+ for (GenClass mixinGenClass : genClass.getMixinGenClasses()) {
> stringBuffer.append(TEXT_1554);
>- stringBuffer.append(negativeOffsetCorrection);
>+ stringBuffer.append(mixinGenClass.getRawImportedInterfaceName());
> stringBuffer.append(TEXT_1555);
>- for (GenFeature genFeature : mixinGenClass.getGenFeatures()) {
>+ stringBuffer.append(negativeOffsetCorrection);
> stringBuffer.append(TEXT_1556);
>- stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
>+ for (GenFeature genFeature : mixinGenClass.getGenFeatures()) {
> stringBuffer.append(TEXT_1557);
>- stringBuffer.append(mixinGenClass.getQualifiedFeatureID(genFeature));
>+ stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
> stringBuffer.append(TEXT_1558);
>- }
>+ stringBuffer.append(mixinGenClass.getQualifiedFeatureID(genFeature));
> stringBuffer.append(TEXT_1559);
> }
> stringBuffer.append(TEXT_1560);
> }
> stringBuffer.append(TEXT_1561);
>- if (genModel.useClassOverrideAnnotation()) {
>- stringBuffer.append(TEXT_1562);
> }
>+ stringBuffer.append(TEXT_1562);
>+ if (genModel.useClassOverrideAnnotation()) {
> stringBuffer.append(TEXT_1563);
>- stringBuffer.append(singleWildcard);
>+ }
> stringBuffer.append(TEXT_1564);
>- for (GenClass mixinGenClass : genClass.getMixinGenClasses()) {
>+ stringBuffer.append(singleWildcard);
> stringBuffer.append(TEXT_1565);
>- stringBuffer.append(mixinGenClass.getRawImportedInterfaceName());
>+ for (GenClass mixinGenClass : genClass.getMixinGenClasses()) {
> stringBuffer.append(TEXT_1566);
>- for (GenFeature genFeature : mixinGenClass.getGenFeatures()) {
>+ stringBuffer.append(mixinGenClass.getRawImportedInterfaceName());
> stringBuffer.append(TEXT_1567);
>- stringBuffer.append(mixinGenClass.getQualifiedFeatureID(genFeature));
>+ for (GenFeature genFeature : mixinGenClass.getGenFeatures()) {
> stringBuffer.append(TEXT_1568);
>+ stringBuffer.append(mixinGenClass.getQualifiedFeatureID(genFeature));
>+ stringBuffer.append(TEXT_1569);
> stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
> stringBuffer.append(positiveOffsetCorrection);
>- stringBuffer.append(TEXT_1569);
>- }
> stringBuffer.append(TEXT_1570);
> }
>- if (genClass.hasOffsetCorrection() && !genClass.getGenFeatures().isEmpty()) {
> stringBuffer.append(TEXT_1571);
>- stringBuffer.append(genClass.getRawImportedInterfaceName());
>+ }
>+ if (genClass.hasOffsetCorrection() && !genClass.getGenFeatures().isEmpty()) {
> stringBuffer.append(TEXT_1572);
>- stringBuffer.append(negativeOffsetCorrection);
>+ stringBuffer.append(genClass.getRawImportedInterfaceName());
> stringBuffer.append(TEXT_1573);
>- for (GenFeature genFeature : genClass.getGenFeatures()) {
>+ stringBuffer.append(negativeOffsetCorrection);
> stringBuffer.append(TEXT_1574);
>- stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
>+ for (GenFeature genFeature : genClass.getGenFeatures()) {
> stringBuffer.append(TEXT_1575);
> stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
>- stringBuffer.append(positiveOffsetCorrection);
> stringBuffer.append(TEXT_1576);
>- }
>+ stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
>+ stringBuffer.append(positiveOffsetCorrection);
> stringBuffer.append(TEXT_1577);
> }
> stringBuffer.append(TEXT_1578);
> }
>- if (genModel.isOperationReflection() && isImplementation && (!genClass.getMixinGenOperations().isEmpty() || !genClass.getOverrideGenOperations(genClass.getExtendedGenOperations(), genClass.getImplementedGenOperations()).isEmpty() || genClass.hasOffsetCorrection() && !genClass.getGenOperations().isEmpty())) {
> stringBuffer.append(TEXT_1579);
>- if (genModel.useClassOverrideAnnotation()) {
>- stringBuffer.append(TEXT_1580);
> }
>+ if (genModel.isOperationReflection() && isImplementation && (!genClass.getMixinGenOperations().isEmpty() || !genClass.getOverrideGenOperations(genClass.getExtendedGenOperations(), genClass.getImplementedGenOperations()).isEmpty() || genClass.hasOffsetCorrection() && !genClass.getGenOperations().isEmpty())) {
>+ stringBuffer.append(TEXT_1580);
>+ if (genModel.useClassOverrideAnnotation()) {
> stringBuffer.append(TEXT_1581);
>- stringBuffer.append(singleWildcard);
>+ }
> stringBuffer.append(TEXT_1582);
>+ stringBuffer.append(singleWildcard);
>+ stringBuffer.append(TEXT_1583);
> for (GenClass extendedGenClass : genClass.getExtendedGenClasses()) { List<GenOperation> extendedImplementedGenOperations = extendedGenClass.getImplementedGenOperations(); List<GenOperation> implementedGenOperations = genClass.getImplementedGenOperations();
> if (!genClass.getOverrideGenOperations(extendedImplementedGenOperations, implementedGenOperations).isEmpty()) {
>- stringBuffer.append(TEXT_1583);
>- stringBuffer.append(extendedGenClass.getRawImportedInterfaceName());
> stringBuffer.append(TEXT_1584);
>+ stringBuffer.append(extendedGenClass.getRawImportedInterfaceName());
>+ stringBuffer.append(TEXT_1585);
> for (GenOperation genOperation : extendedImplementedGenOperations) { GenOperation overrideGenOperation = genClass.getOverrideGenOperation(genOperation);
> if (implementedGenOperations.contains(overrideGenOperation)) {
>- stringBuffer.append(TEXT_1585);
>- stringBuffer.append(extendedGenClass.getQualifiedOperationID(genOperation));
> stringBuffer.append(TEXT_1586);
>+ stringBuffer.append(extendedGenClass.getQualifiedOperationID(genOperation));
>+ stringBuffer.append(TEXT_1587);
> stringBuffer.append(genClass.getQualifiedOperationID(overrideGenOperation));
> stringBuffer.append(positiveOperationOffsetCorrection);
>- stringBuffer.append(TEXT_1587);
>+ stringBuffer.append(TEXT_1588);
> }
> }
>- stringBuffer.append(TEXT_1588);
>+ stringBuffer.append(TEXT_1589);
> }
> }
> for (GenClass mixinGenClass : genClass.getMixinGenClasses()) {
>- stringBuffer.append(TEXT_1589);
>- stringBuffer.append(mixinGenClass.getRawImportedInterfaceName());
> stringBuffer.append(TEXT_1590);
>- for (GenOperation genOperation : mixinGenClass.getGenOperations()) { GenOperation overrideGenOperation = genClass.getOverrideGenOperation(genOperation);
>+ stringBuffer.append(mixinGenClass.getRawImportedInterfaceName());
> stringBuffer.append(TEXT_1591);
>- stringBuffer.append(mixinGenClass.getQualifiedOperationID(genOperation));
>+ for (GenOperation genOperation : mixinGenClass.getGenOperations()) { GenOperation overrideGenOperation = genClass.getOverrideGenOperation(genOperation);
> stringBuffer.append(TEXT_1592);
>+ stringBuffer.append(mixinGenClass.getQualifiedOperationID(genOperation));
>+ stringBuffer.append(TEXT_1593);
> stringBuffer.append(genClass.getQualifiedOperationID(overrideGenOperation != null ? overrideGenOperation : genOperation));
> stringBuffer.append(positiveOperationOffsetCorrection);
>- stringBuffer.append(TEXT_1593);
>- }
> stringBuffer.append(TEXT_1594);
> }
>- if (genClass.hasOffsetCorrection() && !genClass.getGenOperations().isEmpty()) {
> stringBuffer.append(TEXT_1595);
>- stringBuffer.append(genClass.getRawImportedInterfaceName());
>+ }
>+ if (genClass.hasOffsetCorrection() && !genClass.getGenOperations().isEmpty()) {
> stringBuffer.append(TEXT_1596);
>- stringBuffer.append(negativeOperationOffsetCorrection);
>+ stringBuffer.append(genClass.getRawImportedInterfaceName());
> stringBuffer.append(TEXT_1597);
>- for (GenOperation genOperation : genClass.getGenOperations()) {
>+ stringBuffer.append(negativeOperationOffsetCorrection);
> stringBuffer.append(TEXT_1598);
>- stringBuffer.append(genClass.getQualifiedOperationID(genOperation));
>+ for (GenOperation genOperation : genClass.getGenOperations()) {
> stringBuffer.append(TEXT_1599);
> stringBuffer.append(genClass.getQualifiedOperationID(genOperation));
>- stringBuffer.append(positiveOperationOffsetCorrection);
> stringBuffer.append(TEXT_1600);
>- }
>+ stringBuffer.append(genClass.getQualifiedOperationID(genOperation));
>+ stringBuffer.append(positiveOperationOffsetCorrection);
> stringBuffer.append(TEXT_1601);
> }
> stringBuffer.append(TEXT_1602);
> }
>+ stringBuffer.append(TEXT_1603);
>+ }
> if (isImplementation && genModel.isVirtualDelegation()) { String eVirtualValuesField = genClass.getEVirtualValuesField();
> if (eVirtualValuesField != null) {
>- stringBuffer.append(TEXT_1603);
>- if (genModel.useClassOverrideAnnotation()) {
> stringBuffer.append(TEXT_1604);
>- }
>+ if (genModel.useClassOverrideAnnotation()) {
> stringBuffer.append(TEXT_1605);
>- stringBuffer.append(eVirtualValuesField);
>+ }
> stringBuffer.append(TEXT_1606);
>- if (genModel.useClassOverrideAnnotation()) {
>+ stringBuffer.append(eVirtualValuesField);
> stringBuffer.append(TEXT_1607);
>- }
>+ if (genModel.useClassOverrideAnnotation()) {
> stringBuffer.append(TEXT_1608);
>- stringBuffer.append(eVirtualValuesField);
>+ }
> stringBuffer.append(TEXT_1609);
>+ stringBuffer.append(eVirtualValuesField);
>+ stringBuffer.append(TEXT_1610);
> }
> { List<String> eVirtualIndexBitFields = genClass.getEVirtualIndexBitFields(new ArrayList<String>());
> if (!eVirtualIndexBitFields.isEmpty()) { List<String> allEVirtualIndexBitFields = genClass.getAllEVirtualIndexBitFields(new ArrayList<String>());
>- stringBuffer.append(TEXT_1610);
>- if (genModel.useClassOverrideAnnotation()) {
> stringBuffer.append(TEXT_1611);
>- }
>+ if (genModel.useClassOverrideAnnotation()) {
> stringBuffer.append(TEXT_1612);
>- for (int i = 0; i < allEVirtualIndexBitFields.size(); i++) {
>+ }
> stringBuffer.append(TEXT_1613);
>- stringBuffer.append(i);
>+ for (int i = 0; i < allEVirtualIndexBitFields.size(); i++) {
> stringBuffer.append(TEXT_1614);
>- stringBuffer.append(allEVirtualIndexBitFields.get(i));
>+ stringBuffer.append(i);
> stringBuffer.append(TEXT_1615);
>- }
>+ stringBuffer.append(allEVirtualIndexBitFields.get(i));
> stringBuffer.append(TEXT_1616);
>- if (genModel.useClassOverrideAnnotation()) {
>- stringBuffer.append(TEXT_1617);
> }
>+ stringBuffer.append(TEXT_1617);
>+ if (genModel.useClassOverrideAnnotation()) {
> stringBuffer.append(TEXT_1618);
>- for (int i = 0; i < allEVirtualIndexBitFields.size(); i++) {
>+ }
> stringBuffer.append(TEXT_1619);
>- stringBuffer.append(i);
>+ for (int i = 0; i < allEVirtualIndexBitFields.size(); i++) {
> stringBuffer.append(TEXT_1620);
>- stringBuffer.append(allEVirtualIndexBitFields.get(i));
>+ stringBuffer.append(i);
> stringBuffer.append(TEXT_1621);
>- }
>+ stringBuffer.append(allEVirtualIndexBitFields.get(i));
> stringBuffer.append(TEXT_1622);
> }
>+ stringBuffer.append(TEXT_1623);
>+ }
> }
> }
> if (genModel.isOperationReflection() && isImplementation && !genClass.getImplementedGenOperations().isEmpty()) {
>- stringBuffer.append(TEXT_1623);
>- if (genModel.useClassOverrideAnnotation()) {
> stringBuffer.append(TEXT_1624);
>+ if (genModel.useClassOverrideAnnotation()) {
>+ stringBuffer.append(TEXT_1625);
> }
> if (genModel.useGenerics()) {
> LOOP: for (GenOperation genOperation : (genModel.isMinimalReflectiveMethods() ? genClass.getImplementedGenOperations() : genClass.getAllGenOperations())) {
> for (GenParameter genParameter : genOperation.getGenParameters()) {
> if (genParameter.isUncheckedCast()) {
>- stringBuffer.append(TEXT_1625);
>+ stringBuffer.append(TEXT_1626);
> break LOOP;}
> }
> }
> }
>- stringBuffer.append(TEXT_1626);
>+ stringBuffer.append(TEXT_1627);
> stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.EList"));
> stringBuffer.append(singleWildcard);
>- stringBuffer.append(TEXT_1627);
>- stringBuffer.append(genModel.getImportedName(isGWT ? "org.eclipse.emf.common.util.InvocationTargetException" : "java.lang.reflect.InvocationTargetException"));
> stringBuffer.append(TEXT_1628);
>- stringBuffer.append(negativeOperationOffsetCorrection);
>+ stringBuffer.append(genModel.getImportedName(isGWT ? "org.eclipse.emf.common.util.InvocationTargetException" : "java.lang.reflect.InvocationTargetException"));
> stringBuffer.append(TEXT_1629);
>- for (GenOperation genOperation : (genModel.isMinimalReflectiveMethods() ? genClass.getImplementedGenOperations() : genClass.getAllGenOperations())) { List<GenParameter> genParameters = genOperation.getGenParameters(); int size = genParameters.size();
>+ stringBuffer.append(negativeOperationOffsetCorrection);
> stringBuffer.append(TEXT_1630);
>- stringBuffer.append(genClass.getQualifiedOperationID(genOperation));
>+ for (GenOperation genOperation : (genModel.isMinimalReflectiveMethods() ? genClass.getImplementedGenOperations() : genClass.getAllGenOperations())) { List<GenParameter> genParameters = genOperation.getGenParameters(); int size = genParameters.size();
> stringBuffer.append(TEXT_1631);
>- if (genOperation.isVoid()) {
>+ stringBuffer.append(genClass.getQualifiedOperationID(genOperation));
> stringBuffer.append(TEXT_1632);
>- stringBuffer.append(genOperation.getName());
>+ if (genOperation.isVoid()) {
> stringBuffer.append(TEXT_1633);
>+ stringBuffer.append(genOperation.getName());
>+ stringBuffer.append(TEXT_1634);
> for (int i = 0; i < size; i++) { GenParameter genParameter = genParameters.get(i);
> if (!isJDK50 && genParameter.isPrimitiveType()) {
>- stringBuffer.append(TEXT_1634);
>+ stringBuffer.append(TEXT_1635);
> }
> if (genParameter.getTypeGenDataType() == null || !genParameter.getTypeGenDataType().isObjectType() || !genParameter.getRawType().equals(genParameter.getType(genClass))) {
>- stringBuffer.append(TEXT_1635);
>- stringBuffer.append(genParameter.getObjectType(genClass));
> stringBuffer.append(TEXT_1636);
>- }
>+ stringBuffer.append(genParameter.getObjectType(genClass));
> stringBuffer.append(TEXT_1637);
>- stringBuffer.append(i);
>+ }
> stringBuffer.append(TEXT_1638);
>- if (!isJDK50 && genParameter.isPrimitiveType()) {
>+ stringBuffer.append(i);
> stringBuffer.append(TEXT_1639);
>- stringBuffer.append(genParameter.getPrimitiveValueFunction());
>+ if (!isJDK50 && genParameter.isPrimitiveType()) {
> stringBuffer.append(TEXT_1640);
>+ stringBuffer.append(genParameter.getPrimitiveValueFunction());
>+ stringBuffer.append(TEXT_1641);
> }
> if (i < (size - 1)) {
>- stringBuffer.append(TEXT_1641);
>+ stringBuffer.append(TEXT_1642);
> }
> }
>- stringBuffer.append(TEXT_1642);
>- } else {
> stringBuffer.append(TEXT_1643);
>- if (!isJDK50 && genOperation.isPrimitiveType()) {
>+ } else {
> stringBuffer.append(TEXT_1644);
>- stringBuffer.append(genOperation.getObjectType(genClass));
>+ if (!isJDK50 && genOperation.isPrimitiveType()) {
> stringBuffer.append(TEXT_1645);
>+ stringBuffer.append(genOperation.getObjectType(genClass));
>+ stringBuffer.append(TEXT_1646);
> }
> stringBuffer.append(genOperation.getName());
>- stringBuffer.append(TEXT_1646);
>+ stringBuffer.append(TEXT_1647);
> for (int i = 0; i < size; i++) { GenParameter genParameter = genParameters.get(i);
> if (!isJDK50 && genParameter.isPrimitiveType()) {
>- stringBuffer.append(TEXT_1647);
>+ stringBuffer.append(TEXT_1648);
> }
> if (genParameter.getTypeGenDataType() == null || !genParameter.getTypeGenDataType().isObjectType() || !genParameter.getRawType().equals(genParameter.getType(genClass))) {
>- stringBuffer.append(TEXT_1648);
>- stringBuffer.append(genParameter.getObjectType(genClass));
> stringBuffer.append(TEXT_1649);
>- }
>+ stringBuffer.append(genParameter.getObjectType(genClass));
> stringBuffer.append(TEXT_1650);
>- stringBuffer.append(i);
>+ }
> stringBuffer.append(TEXT_1651);
>- if (!isJDK50 && genParameter.isPrimitiveType()) {
>+ stringBuffer.append(i);
> stringBuffer.append(TEXT_1652);
>- stringBuffer.append(genParameter.getPrimitiveValueFunction());
>+ if (!isJDK50 && genParameter.isPrimitiveType()) {
> stringBuffer.append(TEXT_1653);
>+ stringBuffer.append(genParameter.getPrimitiveValueFunction());
>+ stringBuffer.append(TEXT_1654);
> }
> if (i < (size - 1)) {
>- stringBuffer.append(TEXT_1654);
>+ stringBuffer.append(TEXT_1655);
> }
> }
>- stringBuffer.append(TEXT_1655);
>- if (!isJDK50 && genOperation.isPrimitiveType()) {
> stringBuffer.append(TEXT_1656);
>- }
>+ if (!isJDK50 && genOperation.isPrimitiveType()) {
> stringBuffer.append(TEXT_1657);
> }
>- }
> stringBuffer.append(TEXT_1658);
>- if (genModel.isMinimalReflectiveMethods()) {
>+ }
>+ }
> stringBuffer.append(TEXT_1659);
>- } else {
>+ if (genModel.isMinimalReflectiveMethods()) {
> stringBuffer.append(TEXT_1660);
>- }
>+ } else {
> stringBuffer.append(TEXT_1661);
> }
>- if (!genClass.hasImplementedToStringGenOperation() && isImplementation && !genModel.isReflectiveDelegation() && !genModel.isDynamicDelegation() && !genClass.getToStringGenFeatures().isEmpty()) {
> stringBuffer.append(TEXT_1662);
>- if (genModel.useClassOverrideAnnotation()) {
>- stringBuffer.append(TEXT_1663);
> }
>+ if (!genClass.hasImplementedToStringGenOperation() && isImplementation && !genModel.isReflectiveDelegation() && !genModel.isDynamicDelegation() && !genClass.getToStringGenFeatures().isEmpty()) {
>+ stringBuffer.append(TEXT_1663);
>+ if (genModel.useClassOverrideAnnotation()) {
> stringBuffer.append(TEXT_1664);
>+ }
>+ stringBuffer.append(TEXT_1665);
> { boolean first = true;
> for (GenFeature genFeature : genClass.getToStringGenFeatures()) {
> if (first) { first = false;
>- stringBuffer.append(TEXT_1665);
>- stringBuffer.append(genFeature.getName());
> stringBuffer.append(TEXT_1666);
>+ stringBuffer.append(genFeature.getName());
>+ stringBuffer.append(TEXT_1667);
> stringBuffer.append(genModel.getNonNLS());
> } else {
>- stringBuffer.append(TEXT_1667);
>- stringBuffer.append(genFeature.getName());
> stringBuffer.append(TEXT_1668);
>+ stringBuffer.append(genFeature.getName());
>+ stringBuffer.append(TEXT_1669);
> stringBuffer.append(genModel.getNonNLS());
> }
> if (genFeature.isUnsettable() && !genFeature.isListType()) {
> if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {
>- stringBuffer.append(TEXT_1669);
>- stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
>- stringBuffer.append(positiveOffsetCorrection);
> stringBuffer.append(TEXT_1670);
> stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
> stringBuffer.append(positiveOffsetCorrection);
> stringBuffer.append(TEXT_1671);
>+ stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
>+ stringBuffer.append(positiveOffsetCorrection);
>+ stringBuffer.append(TEXT_1672);
> stringBuffer.append(genModel.getNonNLS());
> } else {
> if (genClass.isFlag(genFeature)) {
> if (genFeature.isBooleanType()) {
>- stringBuffer.append(TEXT_1672);
>- if (genClass.isESetFlag(genFeature)) {
> stringBuffer.append(TEXT_1673);
>- stringBuffer.append(genClass.getESetFlagsField(genFeature));
>+ if (genClass.isESetFlag(genFeature)) {
> stringBuffer.append(TEXT_1674);
>- stringBuffer.append(genFeature.getUpperName());
>+ stringBuffer.append(genClass.getESetFlagsField(genFeature));
> stringBuffer.append(TEXT_1675);
>+ stringBuffer.append(genFeature.getUpperName());
>+ stringBuffer.append(TEXT_1676);
> } else {
> stringBuffer.append(genFeature.getUncapName());
>- stringBuffer.append(TEXT_1676);
>- }
> stringBuffer.append(TEXT_1677);
>- stringBuffer.append(genClass.getFlagsField(genFeature));
>+ }
> stringBuffer.append(TEXT_1678);
>- stringBuffer.append(genFeature.getUpperName());
>+ stringBuffer.append(genClass.getFlagsField(genFeature));
> stringBuffer.append(TEXT_1679);
>+ stringBuffer.append(genFeature.getUpperName());
>+ stringBuffer.append(TEXT_1680);
> stringBuffer.append(genModel.getNonNLS());
> } else {
>- stringBuffer.append(TEXT_1680);
>- if (genClass.isESetFlag(genFeature)) {
> stringBuffer.append(TEXT_1681);
>- stringBuffer.append(genClass.getESetFlagsField(genFeature));
>+ if (genClass.isESetFlag(genFeature)) {
> stringBuffer.append(TEXT_1682);
>- stringBuffer.append(genFeature.getUpperName());
>+ stringBuffer.append(genClass.getESetFlagsField(genFeature));
> stringBuffer.append(TEXT_1683);
>+ stringBuffer.append(genFeature.getUpperName());
>+ stringBuffer.append(TEXT_1684);
> } else {
> stringBuffer.append(genFeature.getUncapName());
>- stringBuffer.append(TEXT_1684);
>- }
> stringBuffer.append(TEXT_1685);
>- stringBuffer.append(genFeature.getUpperName());
>+ }
> stringBuffer.append(TEXT_1686);
>- stringBuffer.append(genClass.getFlagsField(genFeature));
>- stringBuffer.append(TEXT_1687);
> stringBuffer.append(genFeature.getUpperName());
>+ stringBuffer.append(TEXT_1687);
>+ stringBuffer.append(genClass.getFlagsField(genFeature));
> stringBuffer.append(TEXT_1688);
> stringBuffer.append(genFeature.getUpperName());
> stringBuffer.append(TEXT_1689);
>+ stringBuffer.append(genFeature.getUpperName());
>+ stringBuffer.append(TEXT_1690);
> stringBuffer.append(genModel.getNonNLS());
> }
> } else {
>- stringBuffer.append(TEXT_1690);
>- if (genClass.isESetFlag(genFeature)) {
> stringBuffer.append(TEXT_1691);
>- stringBuffer.append(genClass.getESetFlagsField(genFeature));
>+ if (genClass.isESetFlag(genFeature)) {
> stringBuffer.append(TEXT_1692);
>- stringBuffer.append(genFeature.getUpperName());
>+ stringBuffer.append(genClass.getESetFlagsField(genFeature));
> stringBuffer.append(TEXT_1693);
>+ stringBuffer.append(genFeature.getUpperName());
>+ stringBuffer.append(TEXT_1694);
> } else {
> stringBuffer.append(genFeature.getUncapName());
>- stringBuffer.append(TEXT_1694);
>- }
> stringBuffer.append(TEXT_1695);
>- stringBuffer.append(genFeature.getSafeName());
>+ }
> stringBuffer.append(TEXT_1696);
>+ stringBuffer.append(genFeature.getSafeName());
>+ stringBuffer.append(TEXT_1697);
> stringBuffer.append(genModel.getNonNLS());
> }
> }
> } else {
> if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {
>- stringBuffer.append(TEXT_1697);
>+ stringBuffer.append(TEXT_1698);
> stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));
> stringBuffer.append(positiveOffsetCorrection);
> if (!genFeature.isListType() && !genFeature.isReferenceType()){
>- stringBuffer.append(TEXT_1698);
>+ stringBuffer.append(TEXT_1699);
> stringBuffer.append(genFeature.getEDefault());
> }
>- stringBuffer.append(TEXT_1699);
>+ stringBuffer.append(TEXT_1700);
> } else {
> if (genClass.isFlag(genFeature)) {
> if (genFeature.isBooleanType()) {
>- stringBuffer.append(TEXT_1700);
>- stringBuffer.append(genClass.getFlagsField(genFeature));
> stringBuffer.append(TEXT_1701);
>- stringBuffer.append(genFeature.getUpperName());
>+ stringBuffer.append(genClass.getFlagsField(genFeature));
> stringBuffer.append(TEXT_1702);
>- } else {
>- stringBuffer.append(TEXT_1703);
> stringBuffer.append(genFeature.getUpperName());
>+ stringBuffer.append(TEXT_1703);
>+ } else {
> stringBuffer.append(TEXT_1704);
>- stringBuffer.append(genClass.getFlagsField(genFeature));
>- stringBuffer.append(TEXT_1705);
> stringBuffer.append(genFeature.getUpperName());
>+ stringBuffer.append(TEXT_1705);
>+ stringBuffer.append(genClass.getFlagsField(genFeature));
> stringBuffer.append(TEXT_1706);
> stringBuffer.append(genFeature.getUpperName());
> stringBuffer.append(TEXT_1707);
>+ stringBuffer.append(genFeature.getUpperName());
>+ stringBuffer.append(TEXT_1708);
> }
> } else {
>- stringBuffer.append(TEXT_1708);
>- stringBuffer.append(genFeature.getSafeName());
> stringBuffer.append(TEXT_1709);
>+ stringBuffer.append(genFeature.getSafeName());
>+ stringBuffer.append(TEXT_1710);
> }
> }
> }
> }
> }
>- stringBuffer.append(TEXT_1710);
>+ stringBuffer.append(TEXT_1711);
> }
> if (isImplementation && genClass.isMapEntry()) { GenFeature keyFeature = genClass.getMapEntryKeyFeature(); GenFeature valueFeature = genClass.getMapEntryValueFeature();
> String objectType = genModel.getImportedName("java.lang.Object");
> String keyType = isJDK50 ? keyFeature.getObjectType(genClass) : objectType;
> String valueType = isJDK50 ? valueFeature.getObjectType(genClass) : objectType;
> String eMapType = genModel.getImportedName("org.eclipse.emf.common.util.EMap") + (isJDK50 ? "<" + keyType + ", " + valueType + ">" : "");
>- stringBuffer.append(TEXT_1711);
>- if (isGWT) {
> stringBuffer.append(TEXT_1712);
>+ if (isGWT) {
>+ stringBuffer.append(TEXT_1713);
> stringBuffer.append(genModel.getImportedName("com.google.gwt.user.client.rpc.GwtTransient"));
> }
>- stringBuffer.append(TEXT_1713);
>- stringBuffer.append(objectType);
> stringBuffer.append(TEXT_1714);
>- stringBuffer.append(keyType);
>+ stringBuffer.append(objectType);
> stringBuffer.append(TEXT_1715);
>- if (!isJDK50 && keyFeature.isPrimitiveType()) {
>+ stringBuffer.append(keyType);
> stringBuffer.append(TEXT_1716);
>- stringBuffer.append(keyFeature.getObjectType(genClass));
>+ if (!isJDK50 && keyFeature.isPrimitiveType()) {
> stringBuffer.append(TEXT_1717);
>- } else {
>+ stringBuffer.append(keyFeature.getObjectType(genClass));
> stringBuffer.append(TEXT_1718);
>- }
>+ } else {
> stringBuffer.append(TEXT_1719);
>- stringBuffer.append(keyType);
>+ }
> stringBuffer.append(TEXT_1720);
>- if (keyFeature.isListType()) {
>+ stringBuffer.append(keyType);
> stringBuffer.append(TEXT_1721);
>- if (!genModel.useGenerics()) {
>+ if (keyFeature.isListType()) {
> stringBuffer.append(TEXT_1722);
>- stringBuffer.append(genModel.getImportedName("java.util.Collection"));
>+ if (!genModel.useGenerics()) {
> stringBuffer.append(TEXT_1723);
>- }
>+ stringBuffer.append(genModel.getImportedName("java.util.Collection"));
> stringBuffer.append(TEXT_1724);
>- } else if (isJDK50) {
>+ }
> stringBuffer.append(TEXT_1725);
>- } else if (keyFeature.isPrimitiveType()) {
>+ } else if (isJDK50) {
> stringBuffer.append(TEXT_1726);
>- stringBuffer.append(keyFeature.getObjectType(genClass));
>+ } else if (keyFeature.isPrimitiveType()) {
> stringBuffer.append(TEXT_1727);
>- stringBuffer.append(keyFeature.getPrimitiveValueFunction());
>+ stringBuffer.append(keyFeature.getObjectType(genClass));
> stringBuffer.append(TEXT_1728);
>- } else {
>+ stringBuffer.append(keyFeature.getPrimitiveValueFunction());
> stringBuffer.append(TEXT_1729);
>- stringBuffer.append(keyFeature.getImportedType(genClass));
>+ } else {
> stringBuffer.append(TEXT_1730);
>- }
>+ stringBuffer.append(keyFeature.getImportedType(genClass));
> stringBuffer.append(TEXT_1731);
>- stringBuffer.append(valueType);
>+ }
> stringBuffer.append(TEXT_1732);
>- if (!isJDK50 && valueFeature.isPrimitiveType()) {
>+ stringBuffer.append(valueType);
> stringBuffer.append(TEXT_1733);
>- stringBuffer.append(valueFeature.getObjectType(genClass));
>+ if (!isJDK50 && valueFeature.isPrimitiveType()) {
> stringBuffer.append(TEXT_1734);
>- } else {
>+ stringBuffer.append(valueFeature.getObjectType(genClass));
> stringBuffer.append(TEXT_1735);
>- }
>+ } else {
> stringBuffer.append(TEXT_1736);
>- stringBuffer.append(valueType);
>+ }
> stringBuffer.append(TEXT_1737);
> stringBuffer.append(valueType);
> stringBuffer.append(TEXT_1738);
> stringBuffer.append(valueType);
> stringBuffer.append(TEXT_1739);
>- if (valueFeature.isListType()) {
>+ stringBuffer.append(valueType);
> stringBuffer.append(TEXT_1740);
>- if (!genModel.useGenerics()) {
>+ if (valueFeature.isListType()) {
> stringBuffer.append(TEXT_1741);
>- stringBuffer.append(genModel.getImportedName("java.util.Collection"));
>+ if (!genModel.useGenerics()) {
> stringBuffer.append(TEXT_1742);
>- }
>+ stringBuffer.append(genModel.getImportedName("java.util.Collection"));
> stringBuffer.append(TEXT_1743);
>- } else if (isJDK50) {
>+ }
> stringBuffer.append(TEXT_1744);
>- } else if (valueFeature.isPrimitiveType()) {
>+ } else if (isJDK50) {
> stringBuffer.append(TEXT_1745);
>- stringBuffer.append(valueFeature.getObjectType(genClass));
>+ } else if (valueFeature.isPrimitiveType()) {
> stringBuffer.append(TEXT_1746);
>- stringBuffer.append(valueFeature.getPrimitiveValueFunction());
>+ stringBuffer.append(valueFeature.getObjectType(genClass));
> stringBuffer.append(TEXT_1747);
>- } else {
>+ stringBuffer.append(valueFeature.getPrimitiveValueFunction());
> stringBuffer.append(TEXT_1748);
>- stringBuffer.append(valueFeature.getImportedType(genClass));
>+ } else {
> stringBuffer.append(TEXT_1749);
>- }
>+ stringBuffer.append(valueFeature.getImportedType(genClass));
> stringBuffer.append(TEXT_1750);
>- if (genModel.useGenerics()) {
>- stringBuffer.append(TEXT_1751);
> }
>+ stringBuffer.append(TEXT_1751);
>+ if (genModel.useGenerics()) {
> stringBuffer.append(TEXT_1752);
>- stringBuffer.append(eMapType);
>+ }
> stringBuffer.append(TEXT_1753);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EObject"));
>- stringBuffer.append(TEXT_1754);
> stringBuffer.append(eMapType);
>+ stringBuffer.append(TEXT_1754);
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EObject"));
> stringBuffer.append(TEXT_1755);
>- }
>+ stringBuffer.append(eMapType);
> stringBuffer.append(TEXT_1756);
>+ }
>+ stringBuffer.append(TEXT_1757);
> stringBuffer.append(isInterface ? " " + genClass.getInterfaceName() : genClass.getClassName());
> // TODO fix the space above
> genModel.emitSortedImports();
>- stringBuffer.append(TEXT_1757);
>+ stringBuffer.append(TEXT_1758);
> return stringBuffer.toString();
> }
> }
>Index: src/org/eclipse/emf/codegen/ecore/templates/model/FactoryClass.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/templates/model/FactoryClass.java,v
>retrieving revision 1.42
>diff -u -r1.42 FactoryClass.java
>--- src/org/eclipse/emf/codegen/ecore/templates/model/FactoryClass.java	25 Jan 2011 19:10:42 -0000	1.42
>+++ src/org/eclipse/emf/codegen/ecore/templates/model/FactoryClass.java	19 Oct 2011 13:00:34 -0000
>@@ -111,354 +111,378 @@
> protected final String TEXT_94 = NL + "\t@SuppressWarnings(\"unchecked\")";
> protected final String TEXT_95 = NL + "\tpublic ";
> protected final String TEXT_96 = " create";
>- protected final String TEXT_97 = "(String literal)" + NL + "\t{";
>- protected final String TEXT_98 = NL + "\t\t";
>- protected final String TEXT_99 = " result = ";
>- protected final String TEXT_100 = ".get(literal);" + NL + "\t\tif (result == null) throw new IllegalArgumentException(\"The value '\" + literal + \"' is not a valid enumerator of '\" + ";
>- protected final String TEXT_101 = ".getName() + \"'\");";
>- protected final String TEXT_102 = NL + "\t\treturn result;";
>- protected final String TEXT_103 = NL + "\t\treturn new ";
>- protected final String TEXT_104 = "(create";
>- protected final String TEXT_105 = "(literal));";
>- protected final String TEXT_106 = NL + "\t\treturn create";
>- protected final String TEXT_107 = "(literal);";
>- protected final String TEXT_108 = NL + "\t\treturn new ";
>- protected final String TEXT_109 = "(";
>- protected final String TEXT_110 = ".create";
>- protected final String TEXT_111 = "(literal));";
>- protected final String TEXT_112 = NL + "\t\treturn ";
>- protected final String TEXT_113 = ".create";
>- protected final String TEXT_114 = "(literal);";
>- protected final String TEXT_115 = NL + "\t\treturn ";
>- protected final String TEXT_116 = "(";
>- protected final String TEXT_117 = ")";
>- protected final String TEXT_118 = ".createFromString(";
>- protected final String TEXT_119 = ", literal);";
>- protected final String TEXT_120 = NL + "\t\tif (literal == null) return null;" + NL + "\t\t";
>- protected final String TEXT_121 = " result = new ";
>- protected final String TEXT_122 = "<";
>- protected final String TEXT_123 = ">";
>- protected final String TEXT_124 = "();";
>- protected final String TEXT_125 = NL + "\t\tfor (";
>- protected final String TEXT_126 = " stringTokenizer = new ";
>- protected final String TEXT_127 = "(literal); stringTokenizer.hasMoreTokens(); )";
>- protected final String TEXT_128 = NL + "\t\tfor (String item : split(literal))";
>- protected final String TEXT_129 = NL + "\t\t{";
>- protected final String TEXT_130 = NL + "\t\t\tString item = stringTokenizer.nextToken();";
>- protected final String TEXT_131 = NL + "\t\t\tresult.add(create";
>- protected final String TEXT_132 = "(item));";
>- protected final String TEXT_133 = NL + "\t\t\tresult.add(create";
>- protected final String TEXT_134 = "FromString(";
>- protected final String TEXT_135 = ", item));";
>- protected final String TEXT_136 = NL + "\t\t\tresult.add(";
>- protected final String TEXT_137 = ".create";
>- protected final String TEXT_138 = "(item));";
>- protected final String TEXT_139 = NL + "\t\t\tresult.add(";
>- protected final String TEXT_140 = ".createFromString(";
>- protected final String TEXT_141 = ", item));";
>- protected final String TEXT_142 = NL + "\t\t}" + NL + "\t\treturn result;";
>- protected final String TEXT_143 = NL + "\t\tif (literal == null) return ";
>- protected final String TEXT_144 = ";" + NL + "\t\t";
>- protected final String TEXT_145 = " result = ";
>- protected final String TEXT_146 = ";" + NL + "\t\tRuntimeException exception = null;";
>- protected final String TEXT_147 = NL + "\t\ttry" + NL + "\t\t{";
>- protected final String TEXT_148 = NL + "\t\t\tresult = create";
>- protected final String TEXT_149 = "(literal);";
>- protected final String TEXT_150 = NL + "\t\t\tresult = (";
>- protected final String TEXT_151 = ")create";
>- protected final String TEXT_152 = "FromString(";
>- protected final String TEXT_153 = ", literal);";
>- protected final String TEXT_154 = NL + "\t\t\tresult = ";
>- protected final String TEXT_155 = ".create";
>- protected final String TEXT_156 = "(literal);";
>- protected final String TEXT_157 = NL + "\t\t\tresult = (";
>- protected final String TEXT_158 = ")";
>- protected final String TEXT_159 = ".createFromString(";
>- protected final String TEXT_160 = ", literal);";
>- protected final String TEXT_161 = NL + "\t\t\tif (";
>- protected final String TEXT_162 = "result != null && ";
>- protected final String TEXT_163 = ".INSTANCE.validate(";
>- protected final String TEXT_164 = ", ";
>- protected final String TEXT_165 = "new ";
>- protected final String TEXT_166 = "(result)";
>- protected final String TEXT_167 = "result";
>- protected final String TEXT_168 = ", null, null))" + NL + "\t\t\t{" + NL + "\t\t\t\treturn result;" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t\tcatch (RuntimeException e)" + NL + "\t\t{" + NL + "\t\t\texception = e;" + NL + "\t\t}";
>- protected final String TEXT_169 = NL + "\t\tif (";
>- protected final String TEXT_170 = "result != null || ";
>- protected final String TEXT_171 = "exception == null) return result;" + NL + " " + NL + "\t\tthrow exception;";
>- protected final String TEXT_172 = NL + "\t\treturn (";
>- protected final String TEXT_173 = ")super.createFromString(literal);";
>- protected final String TEXT_174 = NL + "\t\t// TODO: implement this method" + NL + "\t\t// Ensure that you remove @generated or mark it @generated NOT" + NL + "\t\tthrow new ";
>- protected final String TEXT_175 = "();";
>- protected final String TEXT_176 = NL + "\t\treturn ((";
>- protected final String TEXT_177 = ")super.createFromString(";
>- protected final String TEXT_178 = ", literal)).";
>+ protected final String TEXT_97 = "(String ";
>+ protected final String TEXT_98 = "it";
>+ protected final String TEXT_99 = "literal";
>+ protected final String TEXT_100 = ")" + NL + "\t{";
>+ protected final String TEXT_101 = NL + "\t\t";
>+ protected final String TEXT_102 = NL + "\t\t";
>+ protected final String TEXT_103 = " result = ";
>+ protected final String TEXT_104 = ".get(literal);" + NL + "\t\tif (result == null) throw new IllegalArgumentException(\"The value '\" + literal + \"' is not a valid enumerator of '\" + ";
>+ protected final String TEXT_105 = ".getName() + \"'\");";
>+ protected final String TEXT_106 = NL + "\t\treturn result;";
>+ protected final String TEXT_107 = NL + "\t\treturn new ";
>+ protected final String TEXT_108 = "(create";
>+ protected final String TEXT_109 = "(literal));";
>+ protected final String TEXT_110 = NL + "\t\treturn create";
>+ protected final String TEXT_111 = "(literal);";
>+ protected final String TEXT_112 = NL + "\t\treturn new ";
>+ protected final String TEXT_113 = "(";
>+ protected final String TEXT_114 = ".create";
>+ protected final String TEXT_115 = "(literal));";
>+ protected final String TEXT_116 = NL + "\t\treturn ";
>+ protected final String TEXT_117 = ".create";
>+ protected final String TEXT_118 = "(literal);";
>+ protected final String TEXT_119 = NL + "\t\treturn ";
>+ protected final String TEXT_120 = "(";
>+ protected final String TEXT_121 = ")";
>+ protected final String TEXT_122 = ".createFromString(";
>+ protected final String TEXT_123 = ", literal);";
>+ protected final String TEXT_124 = NL + "\t\tif (literal == null) return null;" + NL + "\t\t";
>+ protected final String TEXT_125 = " result = new ";
>+ protected final String TEXT_126 = "<";
>+ protected final String TEXT_127 = ">";
>+ protected final String TEXT_128 = "();";
>+ protected final String TEXT_129 = NL + "\t\tfor (";
>+ protected final String TEXT_130 = " stringTokenizer = new ";
>+ protected final String TEXT_131 = "(literal); stringTokenizer.hasMoreTokens(); )";
>+ protected final String TEXT_132 = NL + "\t\tfor (String item : split(literal))";
>+ protected final String TEXT_133 = NL + "\t\t{";
>+ protected final String TEXT_134 = NL + "\t\t\tString item = stringTokenizer.nextToken();";
>+ protected final String TEXT_135 = NL + "\t\t\tresult.add(create";
>+ protected final String TEXT_136 = "(item));";
>+ protected final String TEXT_137 = NL + "\t\t\tresult.add(create";
>+ protected final String TEXT_138 = "FromString(";
>+ protected final String TEXT_139 = ", item));";
>+ protected final String TEXT_140 = NL + "\t\t\tresult.add(";
>+ protected final String TEXT_141 = ".create";
>+ protected final String TEXT_142 = "(item));";
>+ protected final String TEXT_143 = NL + "\t\t\tresult.add(";
>+ protected final String TEXT_144 = ".createFromString(";
>+ protected final String TEXT_145 = ", item));";
>+ protected final String TEXT_146 = NL + "\t\t}" + NL + "\t\treturn result;";
>+ protected final String TEXT_147 = NL + "\t\tif (literal == null) return ";
>+ protected final String TEXT_148 = ";" + NL + "\t\t";
>+ protected final String TEXT_149 = " result = ";
>+ protected final String TEXT_150 = ";" + NL + "\t\tRuntimeException exception = null;";
>+ protected final String TEXT_151 = NL + "\t\ttry" + NL + "\t\t{";
>+ protected final String TEXT_152 = NL + "\t\t\tresult = create";
>+ protected final String TEXT_153 = "(literal);";
>+ protected final String TEXT_154 = NL + "\t\t\tresult = (";
>+ protected final String TEXT_155 = ")create";
>+ protected final String TEXT_156 = "FromString(";
>+ protected final String TEXT_157 = ", literal);";
>+ protected final String TEXT_158 = NL + "\t\t\tresult = ";
>+ protected final String TEXT_159 = ".create";
>+ protected final String TEXT_160 = "(literal);";
>+ protected final String TEXT_161 = NL + "\t\t\tresult = (";
>+ protected final String TEXT_162 = ")";
>+ protected final String TEXT_163 = ".createFromString(";
>+ protected final String TEXT_164 = ", literal);";
>+ protected final String TEXT_165 = NL + "\t\t\tif (";
>+ protected final String TEXT_166 = "result != null && ";
>+ protected final String TEXT_167 = ".INSTANCE.validate(";
>+ protected final String TEXT_168 = ", ";
>+ protected final String TEXT_169 = "new ";
>+ protected final String TEXT_170 = "(result)";
>+ protected final String TEXT_171 = "result";
>+ protected final String TEXT_172 = ", null, null))" + NL + "\t\t\t{" + NL + "\t\t\t\treturn result;" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t\tcatch (RuntimeException e)" + NL + "\t\t{" + NL + "\t\t\texception = e;" + NL + "\t\t}";
>+ protected final String TEXT_173 = NL + "\t\tif (";
>+ protected final String TEXT_174 = "result != null || ";
>+ protected final String TEXT_175 = "exception == null) return result;" + NL + " " + NL + "\t\tthrow exception;";
>+ protected final String TEXT_176 = NL + "\t\treturn (";
>+ protected final String TEXT_177 = ")super.createFromString(literal);";
>+ protected final String TEXT_178 = NL + "\t\t// TODO: implement this method" + NL + "\t\t// Ensure that you remove @generated or mark it @generated NOT" + NL + "\t\tthrow new ";
> protected final String TEXT_179 = "();";
>- protected final String TEXT_180 = NL + "\t\treturn ";
>- protected final String TEXT_181 = "(";
>- protected final String TEXT_182 = ")";
>- protected final String TEXT_183 = "super.createFromString(";
>- protected final String TEXT_184 = ", literal);";
>- protected final String TEXT_185 = NL + "\t}" + NL;
>- protected final String TEXT_186 = NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */";
>- protected final String TEXT_187 = NL + "\t@SuppressWarnings(\"unchecked\")";
>- protected final String TEXT_188 = NL + "\tpublic ";
>- protected final String TEXT_189 = " create";
>- protected final String TEXT_190 = "FromString(";
>- protected final String TEXT_191 = " eDataType, String initialValue)" + NL + "\t{";
>- protected final String TEXT_192 = NL + "\t\treturn create";
>- protected final String TEXT_193 = "(initialValue);";
>- protected final String TEXT_194 = NL + "\t\t";
>- protected final String TEXT_195 = " result = ";
>- protected final String TEXT_196 = ".get(initialValue);" + NL + "\t\tif (result == null) throw new IllegalArgumentException(\"The value '\" + initialValue + \"' is not a valid enumerator of '\" + eDataType.getName() + \"'\");";
>- protected final String TEXT_197 = NL + "\t\treturn result;";
>- protected final String TEXT_198 = NL + "\t\treturn ";
>- protected final String TEXT_199 = "(";
>- protected final String TEXT_200 = ")";
>- protected final String TEXT_201 = "create";
>- protected final String TEXT_202 = "FromString(";
>- protected final String TEXT_203 = ", initialValue);";
>- protected final String TEXT_204 = NL + "\t\treturn ";
>- protected final String TEXT_205 = "(";
>- protected final String TEXT_206 = ")";
>- protected final String TEXT_207 = ".createFromString(";
>- protected final String TEXT_208 = ", initialValue);";
>- protected final String TEXT_209 = NL + "\t\treturn create";
>- protected final String TEXT_210 = "(initialValue);";
>- protected final String TEXT_211 = NL + "\t\tif (initialValue == null) return null;" + NL + "\t\t";
>- protected final String TEXT_212 = " result = new ";
>- protected final String TEXT_213 = "<";
>- protected final String TEXT_214 = ">";
>- protected final String TEXT_215 = "();";
>- protected final String TEXT_216 = NL + "\t\tfor (";
>- protected final String TEXT_217 = " stringTokenizer = new ";
>- protected final String TEXT_218 = "(initialValue); stringTokenizer.hasMoreTokens(); )";
>- protected final String TEXT_219 = NL + "\t\tfor (String item : split(initialValue))";
>- protected final String TEXT_220 = NL + "\t\t{";
>- protected final String TEXT_221 = NL + "\t\t\tString item = stringTokenizer.nextToken();";
>- protected final String TEXT_222 = NL + "\t\t\tresult.add(create";
>- protected final String TEXT_223 = "FromString(";
>- protected final String TEXT_224 = ", item));";
>- protected final String TEXT_225 = NL + "\t\t\tresult.add(";
>- protected final String TEXT_226 = "(";
>- protected final String TEXT_227 = ")";
>- protected final String TEXT_228 = ".createFromString(";
>- protected final String TEXT_229 = ", item));";
>- protected final String TEXT_230 = NL + "\t\t}" + NL + "\t\treturn result;";
>- protected final String TEXT_231 = NL + "\t\treturn new ";
>- protected final String TEXT_232 = "(create";
>- protected final String TEXT_233 = "(initialValue));";
>- protected final String TEXT_234 = NL + "\t\treturn create";
>- protected final String TEXT_235 = "(initialValue);";
>- protected final String TEXT_236 = NL + "\t\tif (initialValue == null) return null;" + NL + "\t\t";
>- protected final String TEXT_237 = " result = null;" + NL + "\t\tRuntimeException exception = null;";
>- protected final String TEXT_238 = NL + "\t\ttry" + NL + "\t\t{";
>- protected final String TEXT_239 = NL + "\t\t\tresult = ";
>- protected final String TEXT_240 = "(";
>- protected final String TEXT_241 = ")";
>- protected final String TEXT_242 = "create";
>- protected final String TEXT_243 = "FromString(";
>- protected final String TEXT_244 = ", initialValue);";
>- protected final String TEXT_245 = NL + "\t\t\tresult = ";
>- protected final String TEXT_246 = "(";
>- protected final String TEXT_247 = ")";
>- protected final String TEXT_248 = ".createFromString(";
>- protected final String TEXT_249 = ", initialValue);";
>- protected final String TEXT_250 = NL + "\t\t\tif (result != null && ";
>- protected final String TEXT_251 = ".INSTANCE.validate(eDataType, result, null, null))" + NL + "\t\t\t{" + NL + "\t\t\t\treturn result;" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t\tcatch (RuntimeException e)" + NL + "\t\t{" + NL + "\t\t\texception = e;" + NL + "\t\t}";
>- protected final String TEXT_252 = NL + "\t\tif (result != null || exception == null) return result;" + NL + " " + NL + "\t\tthrow exception;";
>- protected final String TEXT_253 = NL + "\t\treturn ";
>- protected final String TEXT_254 = "(";
>- protected final String TEXT_255 = ")";
>- protected final String TEXT_256 = "super.createFromString(initialValue);";
>- protected final String TEXT_257 = NL + "\t\t// TODO: implement this method" + NL + "\t\t// Ensure that you remove @generated or mark it @generated NOT" + NL + "\t\tthrow new ";
>- protected final String TEXT_258 = "();";
>+ protected final String TEXT_180 = NL + "\t\treturn ((";
>+ protected final String TEXT_181 = ")super.createFromString(";
>+ protected final String TEXT_182 = ", literal)).";
>+ protected final String TEXT_183 = "();";
>+ protected final String TEXT_184 = NL + "\t\treturn ";
>+ protected final String TEXT_185 = "(";
>+ protected final String TEXT_186 = ")";
>+ protected final String TEXT_187 = "super.createFromString(";
>+ protected final String TEXT_188 = ", literal);";
>+ protected final String TEXT_189 = NL + "\t}" + NL;
>+ protected final String TEXT_190 = NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */";
>+ protected final String TEXT_191 = NL + "\t@SuppressWarnings(\"unchecked\")";
>+ protected final String TEXT_192 = NL + "\tpublic ";
>+ protected final String TEXT_193 = " create";
>+ protected final String TEXT_194 = "FromString(";
>+ protected final String TEXT_195 = " eDataType, String initialValue)" + NL + "\t{";
>+ protected final String TEXT_196 = NL + "\t\treturn create";
>+ protected final String TEXT_197 = "(initialValue);";
>+ protected final String TEXT_198 = NL + "\t\t";
>+ protected final String TEXT_199 = " result = ";
>+ protected final String TEXT_200 = ".get(initialValue);" + NL + "\t\tif (result == null) throw new IllegalArgumentException(\"The value '\" + initialValue + \"' is not a valid enumerator of '\" + eDataType.getName() + \"'\");";
>+ protected final String TEXT_201 = NL + "\t\treturn result;";
>+ protected final String TEXT_202 = NL + "\t\treturn ";
>+ protected final String TEXT_203 = "(";
>+ protected final String TEXT_204 = ")";
>+ protected final String TEXT_205 = "create";
>+ protected final String TEXT_206 = "FromString(";
>+ protected final String TEXT_207 = ", initialValue);";
>+ protected final String TEXT_208 = NL + "\t\treturn ";
>+ protected final String TEXT_209 = "(";
>+ protected final String TEXT_210 = ")";
>+ protected final String TEXT_211 = ".createFromString(";
>+ protected final String TEXT_212 = ", initialValue);";
>+ protected final String TEXT_213 = NL + "\t\treturn create";
>+ protected final String TEXT_214 = "(initialValue);";
>+ protected final String TEXT_215 = NL + "\t\tif (initialValue == null) return null;" + NL + "\t\t";
>+ protected final String TEXT_216 = " result = new ";
>+ protected final String TEXT_217 = "<";
>+ protected final String TEXT_218 = ">";
>+ protected final String TEXT_219 = "();";
>+ protected final String TEXT_220 = NL + "\t\tfor (";
>+ protected final String TEXT_221 = " stringTokenizer = new ";
>+ protected final String TEXT_222 = "(initialValue); stringTokenizer.hasMoreTokens(); )";
>+ protected final String TEXT_223 = NL + "\t\tfor (String item : split(initialValue))";
>+ protected final String TEXT_224 = NL + "\t\t{";
>+ protected final String TEXT_225 = NL + "\t\t\tString item = stringTokenizer.nextToken();";
>+ protected final String TEXT_226 = NL + "\t\t\tresult.add(create";
>+ protected final String TEXT_227 = "FromString(";
>+ protected final String TEXT_228 = ", item));";
>+ protected final String TEXT_229 = NL + "\t\t\tresult.add(";
>+ protected final String TEXT_230 = "(";
>+ protected final String TEXT_231 = ")";
>+ protected final String TEXT_232 = ".createFromString(";
>+ protected final String TEXT_233 = ", item));";
>+ protected final String TEXT_234 = NL + "\t\t}" + NL + "\t\treturn result;";
>+ protected final String TEXT_235 = NL + "\t\treturn new ";
>+ protected final String TEXT_236 = "(create";
>+ protected final String TEXT_237 = "(initialValue));";
>+ protected final String TEXT_238 = NL + "\t\treturn create";
>+ protected final String TEXT_239 = "(initialValue);";
>+ protected final String TEXT_240 = NL + "\t\tif (initialValue == null) return null;" + NL + "\t\t";
>+ protected final String TEXT_241 = " result = null;" + NL + "\t\tRuntimeException exception = null;";
>+ protected final String TEXT_242 = NL + "\t\ttry" + NL + "\t\t{";
>+ protected final String TEXT_243 = NL + "\t\t\tresult = ";
>+ protected final String TEXT_244 = "(";
>+ protected final String TEXT_245 = ")";
>+ protected final String TEXT_246 = "create";
>+ protected final String TEXT_247 = "FromString(";
>+ protected final String TEXT_248 = ", initialValue);";
>+ protected final String TEXT_249 = NL + "\t\t\tresult = ";
>+ protected final String TEXT_250 = "(";
>+ protected final String TEXT_251 = ")";
>+ protected final String TEXT_252 = ".createFromString(";
>+ protected final String TEXT_253 = ", initialValue);";
>+ protected final String TEXT_254 = NL + "\t\t\tif (result != null && ";
>+ protected final String TEXT_255 = ".INSTANCE.validate(eDataType, result, null, null))" + NL + "\t\t\t{" + NL + "\t\t\t\treturn result;" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t\tcatch (RuntimeException e)" + NL + "\t\t{" + NL + "\t\t\texception = e;" + NL + "\t\t}";
>+ protected final String TEXT_256 = NL + "\t\tif (result != null || exception == null) return result;" + NL + " " + NL + "\t\tthrow exception;";
>+ protected final String TEXT_257 = NL + "\t\treturn create";
>+ protected final String TEXT_258 = "(initialValue);";
> protected final String TEXT_259 = NL + "\t\treturn ";
> protected final String TEXT_260 = "(";
> protected final String TEXT_261 = ")";
>- protected final String TEXT_262 = "super.createFromString(eDataType, initialValue);";
>- protected final String TEXT_263 = NL + "\t}" + NL;
>- protected final String TEXT_264 = NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic String convert";
>- protected final String TEXT_265 = "(";
>- protected final String TEXT_266 = " instanceValue)" + NL + "\t{";
>- protected final String TEXT_267 = NL + "\t\treturn instanceValue == null ? null : instanceValue.toString();";
>- protected final String TEXT_268 = NL + "\t\treturn instanceValue == null ? null : convert";
>- protected final String TEXT_269 = "(instanceValue";
>- protected final String TEXT_270 = ".";
>- protected final String TEXT_271 = "()";
>- protected final String TEXT_272 = ");";
>- protected final String TEXT_273 = NL + "\t\treturn convert";
>- protected final String TEXT_274 = "(instanceValue);";
>- protected final String TEXT_275 = NL + "\t\treturn ";
>- protected final String TEXT_276 = ".convert";
>- protected final String TEXT_277 = "(instanceValue);";
>- protected final String TEXT_278 = NL + "\t\treturn ";
>- protected final String TEXT_279 = ".convertToString(";
>- protected final String TEXT_280 = ", instanceValue);";
>- protected final String TEXT_281 = NL + "\t\tif (instanceValue == null) return null;" + NL + "\t\tif (instanceValue.isEmpty()) return \"\";" + NL + "\t\t";
>- protected final String TEXT_282 = " result = new ";
>- protected final String TEXT_283 = "();";
>- protected final String TEXT_284 = NL + "\t\tfor (";
>- protected final String TEXT_285 = " i = instanceValue.iterator(); i.hasNext(); )";
>- protected final String TEXT_286 = NL + "\t\tfor (";
>- protected final String TEXT_287 = " item : instanceValue)";
>- protected final String TEXT_288 = NL + "\t\t{";
>- protected final String TEXT_289 = NL + "\t\t\tresult.append(convert";
>- protected final String TEXT_290 = "((";
>- protected final String TEXT_291 = ")";
>- protected final String TEXT_292 = "));";
>- protected final String TEXT_293 = NL + "\t\t\tresult.append(convert";
>- protected final String TEXT_294 = "ToString(";
>- protected final String TEXT_295 = ", ";
>- protected final String TEXT_296 = "));";
>- protected final String TEXT_297 = NL + "\t\t\tresult.append(";
>- protected final String TEXT_298 = ".convert";
>- protected final String TEXT_299 = "((";
>- protected final String TEXT_300 = ")";
>- protected final String TEXT_301 = "));";
>- protected final String TEXT_302 = NL + "\t\t\tresult.append(";
>- protected final String TEXT_303 = ".convertToString(";
>- protected final String TEXT_304 = ", ";
>- protected final String TEXT_305 = "));";
>- protected final String TEXT_306 = NL + "\t\t\tresult.append(' ');" + NL + "\t\t}" + NL + "\t\treturn result.substring(0, result.length() - 1);";
>- protected final String TEXT_307 = NL + "\t\tif (instanceValue == null) return null;";
>- protected final String TEXT_308 = NL + "\t\tif (";
>- protected final String TEXT_309 = ".isInstance(instanceValue))" + NL + "\t\t{" + NL + "\t\t\ttry" + NL + "\t\t\t{";
>- protected final String TEXT_310 = NL + "\t\t\t\tString value = convert";
>- protected final String TEXT_311 = "(instanceValue);";
>- protected final String TEXT_312 = NL + "\t\t\t\tString value = convert";
>- protected final String TEXT_313 = "(((";
>- protected final String TEXT_314 = ")instanceValue).";
>- protected final String TEXT_315 = "());";
>- protected final String TEXT_316 = NL + "\t\t\t\tString value = convert";
>- protected final String TEXT_317 = "((";
>- protected final String TEXT_318 = ")instanceValue);";
>- protected final String TEXT_319 = NL + "\t\t\t\tString value = convert";
>- protected final String TEXT_320 = "ToString(";
>- protected final String TEXT_321 = ", instanceValue);";
>- protected final String TEXT_322 = NL + "\t\t\t\tString value = ";
>- protected final String TEXT_323 = ".convert";
>- protected final String TEXT_324 = "((";
>- protected final String TEXT_325 = ")instanceValue);";
>- protected final String TEXT_326 = NL + "\t\t\t\tString value = ";
>- protected final String TEXT_327 = ".convertToString(";
>- protected final String TEXT_328 = ", instanceValue);";
>- protected final String TEXT_329 = NL + "\t\t\t\tif (value != null) return value;" + NL + "\t\t\t}" + NL + "\t\t\tcatch (Exception e)" + NL + "\t\t\t{" + NL + "\t\t\t\t// Keep trying other member types until all have failed." + NL + "\t\t\t}" + NL + "\t\t}";
>- protected final String TEXT_330 = NL + "\t\ttry" + NL + "\t\t{";
>- protected final String TEXT_331 = NL + "\t\t\tString value = convert";
>- protected final String TEXT_332 = "(instanceValue);";
>- protected final String TEXT_333 = NL + "\t\t\tString value = convert";
>- protected final String TEXT_334 = "ToString(";
>- protected final String TEXT_335 = ", ";
>- protected final String TEXT_336 = "new ";
>- protected final String TEXT_337 = "(instanceValue)";
>- protected final String TEXT_338 = "instanceValue";
>- protected final String TEXT_339 = ");";
>- protected final String TEXT_340 = NL + "\t\t\tString value = ";
>- protected final String TEXT_341 = ".convert";
>+ protected final String TEXT_262 = "super.createFromString(initialValue);";
>+ protected final String TEXT_263 = NL + "\t\t// TODO: implement this method" + NL + "\t\t// Ensure that you remove @generated or mark it @generated NOT" + NL + "\t\tthrow new ";
>+ protected final String TEXT_264 = "();";
>+ protected final String TEXT_265 = NL + "\t\treturn ";
>+ protected final String TEXT_266 = "(";
>+ protected final String TEXT_267 = ")";
>+ protected final String TEXT_268 = "super.createFromString(eDataType, initialValue);";
>+ protected final String TEXT_269 = NL + "\t}" + NL;
>+ protected final String TEXT_270 = NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic String convert";
>+ protected final String TEXT_271 = "(";
>+ protected final String TEXT_272 = " ";
>+ protected final String TEXT_273 = "it";
>+ protected final String TEXT_274 = "instanceValue";
>+ protected final String TEXT_275 = ")" + NL + "\t{";
>+ protected final String TEXT_276 = NL + "\t\t";
>+ protected final String TEXT_277 = NL + "\t\treturn instanceValue == null ? null : instanceValue.toString();";
>+ protected final String TEXT_278 = NL + "\t\treturn instanceValue == null ? null : convert";
>+ protected final String TEXT_279 = "(instanceValue";
>+ protected final String TEXT_280 = ".";
>+ protected final String TEXT_281 = "()";
>+ protected final String TEXT_282 = ");";
>+ protected final String TEXT_283 = NL + "\t\treturn convert";
>+ protected final String TEXT_284 = "(instanceValue);";
>+ protected final String TEXT_285 = NL + "\t\treturn ";
>+ protected final String TEXT_286 = ".convert";
>+ protected final String TEXT_287 = "(instanceValue);";
>+ protected final String TEXT_288 = NL + "\t\treturn ";
>+ protected final String TEXT_289 = ".convertToString(";
>+ protected final String TEXT_290 = ", instanceValue);";
>+ protected final String TEXT_291 = NL + "\t\tif (instanceValue == null) return null;" + NL + "\t\tif (instanceValue.isEmpty()) return \"\";" + NL + "\t\t";
>+ protected final String TEXT_292 = " result = new ";
>+ protected final String TEXT_293 = "();";
>+ protected final String TEXT_294 = NL + "\t\tfor (";
>+ protected final String TEXT_295 = " i = instanceValue.iterator(); i.hasNext(); )";
>+ protected final String TEXT_296 = NL + "\t\tfor (";
>+ protected final String TEXT_297 = " item : instanceValue)";
>+ protected final String TEXT_298 = NL + "\t\t{";
>+ protected final String TEXT_299 = NL + "\t\t\tresult.append(convert";
>+ protected final String TEXT_300 = "((";
>+ protected final String TEXT_301 = ")";
>+ protected final String TEXT_302 = "));";
>+ protected final String TEXT_303 = NL + "\t\t\tresult.append(convert";
>+ protected final String TEXT_304 = "ToString(";
>+ protected final String TEXT_305 = ", ";
>+ protected final String TEXT_306 = "));";
>+ protected final String TEXT_307 = NL + "\t\t\tresult.append(";
>+ protected final String TEXT_308 = ".convert";
>+ protected final String TEXT_309 = "((";
>+ protected final String TEXT_310 = ")";
>+ protected final String TEXT_311 = "));";
>+ protected final String TEXT_312 = NL + "\t\t\tresult.append(";
>+ protected final String TEXT_313 = ".convertToString(";
>+ protected final String TEXT_314 = ", ";
>+ protected final String TEXT_315 = "));";
>+ protected final String TEXT_316 = NL + "\t\t\tresult.append(' ');" + NL + "\t\t}" + NL + "\t\treturn result.substring(0, result.length() - 1);";
>+ protected final String TEXT_317 = NL + "\t\tif (instanceValue == null) return null;";
>+ protected final String TEXT_318 = NL + "\t\tif (";
>+ protected final String TEXT_319 = ".isInstance(instanceValue))" + NL + "\t\t{" + NL + "\t\t\ttry" + NL + "\t\t\t{";
>+ protected final String TEXT_320 = NL + "\t\t\t\tString value = convert";
>+ protected final String TEXT_321 = "(instanceValue);";
>+ protected final String TEXT_322 = NL + "\t\t\t\tString value = convert";
>+ protected final String TEXT_323 = "(((";
>+ protected final String TEXT_324 = ")instanceValue).";
>+ protected final String TEXT_325 = "());";
>+ protected final String TEXT_326 = NL + "\t\t\t\tString value = convert";
>+ protected final String TEXT_327 = "((";
>+ protected final String TEXT_328 = ")instanceValue);";
>+ protected final String TEXT_329 = NL + "\t\t\t\tString value = convert";
>+ protected final String TEXT_330 = "ToString(";
>+ protected final String TEXT_331 = ", instanceValue);";
>+ protected final String TEXT_332 = NL + "\t\t\t\tString value = ";
>+ protected final String TEXT_333 = ".convert";
>+ protected final String TEXT_334 = "((";
>+ protected final String TEXT_335 = ")instanceValue);";
>+ protected final String TEXT_336 = NL + "\t\t\t\tString value = ";
>+ protected final String TEXT_337 = ".convertToString(";
>+ protected final String TEXT_338 = ", instanceValue);";
>+ protected final String TEXT_339 = NL + "\t\t\t\tif (value != null) return value;" + NL + "\t\t\t}" + NL + "\t\t\tcatch (Exception e)" + NL + "\t\t\t{" + NL + "\t\t\t\t// Keep trying other member types until all have failed." + NL + "\t\t\t}" + NL + "\t\t}";
>+ protected final String TEXT_340 = NL + "\t\ttry" + NL + "\t\t{";
>+ protected final String TEXT_341 = NL + "\t\t\tString value = convert";
> protected final String TEXT_342 = "(instanceValue);";
>- protected final String TEXT_343 = NL + "\t\t\tString value = ";
>- protected final String TEXT_344 = ".convertToString(";
>+ protected final String TEXT_343 = NL + "\t\t\tString value = convert";
>+ protected final String TEXT_344 = "ToString(";
> protected final String TEXT_345 = ", ";
> protected final String TEXT_346 = "new ";
> protected final String TEXT_347 = "(instanceValue)";
> protected final String TEXT_348 = "instanceValue";
> protected final String TEXT_349 = ");";
>- protected final String TEXT_350 = NL + "\t\t\tif (value != null) return value;" + NL + "\t\t}" + NL + "\t\tcatch (Exception e)" + NL + "\t\t{" + NL + "\t\t\t// Keep trying other member types until all have failed." + NL + "\t\t}";
>- protected final String TEXT_351 = NL + "\t\tthrow new IllegalArgumentException(\"Invalid value: '\"+instanceValue+\"' for datatype :\"+";
>- protected final String TEXT_352 = ".getName());";
>- protected final String TEXT_353 = NL + "\t\treturn super.convertToString(instanceValue);";
>- protected final String TEXT_354 = NL + "\t\t// TODO: implement this method" + NL + "\t\t// Ensure that you remove @generated or mark it @generated NOT" + NL + "\t\tthrow new ";
>- protected final String TEXT_355 = "();";
>- protected final String TEXT_356 = NL + "\t\treturn super.convertToString(";
>- protected final String TEXT_357 = ", new ";
>- protected final String TEXT_358 = "(instanceValue));";
>- protected final String TEXT_359 = NL + "\t\treturn super.convertToString(";
>- protected final String TEXT_360 = ", instanceValue);";
>- protected final String TEXT_361 = NL + "\t}" + NL;
>- protected final String TEXT_362 = NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */";
>- protected final String TEXT_363 = NL + "\t@SuppressWarnings(\"unchecked\")";
>- protected final String TEXT_364 = NL + "\tpublic String convert";
>- protected final String TEXT_365 = "ToString(";
>- protected final String TEXT_366 = " eDataType, Object instanceValue)" + NL + "\t{";
>- protected final String TEXT_367 = NL + "\t\treturn instanceValue == null ? null : instanceValue.toString();";
>- protected final String TEXT_368 = NL + "\t\treturn convert";
>- protected final String TEXT_369 = "ToString(";
>+ protected final String TEXT_350 = NL + "\t\t\tString value = ";
>+ protected final String TEXT_351 = ".convert";
>+ protected final String TEXT_352 = "(instanceValue);";
>+ protected final String TEXT_353 = NL + "\t\t\tString value = ";
>+ protected final String TEXT_354 = ".convertToString(";
>+ protected final String TEXT_355 = ", ";
>+ protected final String TEXT_356 = "new ";
>+ protected final String TEXT_357 = "(instanceValue)";
>+ protected final String TEXT_358 = "instanceValue";
>+ protected final String TEXT_359 = ");";
>+ protected final String TEXT_360 = NL + "\t\t\tif (value != null) return value;" + NL + "\t\t}" + NL + "\t\tcatch (Exception e)" + NL + "\t\t{" + NL + "\t\t\t// Keep trying other member types until all have failed." + NL + "\t\t}";
>+ protected final String TEXT_361 = NL + "\t\tthrow new IllegalArgumentException(\"Invalid value: '\"+instanceValue+\"' for datatype :\"+";
>+ protected final String TEXT_362 = ".getName());";
>+ protected final String TEXT_363 = NL + "\t\treturn super.convertToString(instanceValue);";
>+ protected final String TEXT_364 = NL + "\t\t// TODO: implement this method" + NL + "\t\t// Ensure that you remove @generated or mark it @generated NOT" + NL + "\t\tthrow new ";
>+ protected final String TEXT_365 = "();";
>+ protected final String TEXT_366 = NL + "\t\treturn super.convertToString(";
>+ protected final String TEXT_367 = ", new ";
>+ protected final String TEXT_368 = "(instanceValue));";
>+ protected final String TEXT_369 = NL + "\t\treturn super.convertToString(";
> protected final String TEXT_370 = ", instanceValue);";
>- protected final String TEXT_371 = NL + "\t\treturn ";
>- protected final String TEXT_372 = ".convertToString(";
>- protected final String TEXT_373 = ", instanceValue);";
>- protected final String TEXT_374 = NL + "\t\treturn convert";
>- protected final String TEXT_375 = "((";
>- protected final String TEXT_376 = ")instanceValue);";
>- protected final String TEXT_377 = NL + "\t\tif (instanceValue == null) return null;" + NL + "\t\t";
>- protected final String TEXT_378 = " list = (";
>- protected final String TEXT_379 = ")instanceValue;" + NL + "\t\tif (list.isEmpty()) return \"\";" + NL + "\t\t";
>- protected final String TEXT_380 = " result = new ";
>- protected final String TEXT_381 = "();";
>- protected final String TEXT_382 = NL + "\t\tfor (";
>- protected final String TEXT_383 = " i = list.iterator(); i.hasNext(); )";
>- protected final String TEXT_384 = NL + "\t\tfor (";
>- protected final String TEXT_385 = " item : list)";
>- protected final String TEXT_386 = NL + "\t\t{";
>- protected final String TEXT_387 = NL + "\t\t\tresult.append(convert";
>- protected final String TEXT_388 = "ToString(";
>- protected final String TEXT_389 = ", ";
>- protected final String TEXT_390 = "));";
>- protected final String TEXT_391 = NL + "\t\t\tresult.append(";
>- protected final String TEXT_392 = ".convertToString(";
>- protected final String TEXT_393 = ", ";
>- protected final String TEXT_394 = "));";
>- protected final String TEXT_395 = NL + "\t\t\tresult.append(' ');" + NL + "\t\t}" + NL + "\t\treturn result.substring(0, result.length() - 1);";
>- protected final String TEXT_396 = NL + "\t\treturn instanceValue == null ? null : convert";
>- protected final String TEXT_397 = "(((";
>- protected final String TEXT_398 = ")instanceValue)";
>- protected final String TEXT_399 = ".";
>- protected final String TEXT_400 = "()";
>- protected final String TEXT_401 = ");";
>- protected final String TEXT_402 = NL + "\t\treturn convert";
>- protected final String TEXT_403 = "(instanceValue);";
>- protected final String TEXT_404 = NL + "\t\tif (instanceValue == null) return null;";
>- protected final String TEXT_405 = NL + "\t\tif (";
>- protected final String TEXT_406 = ".isInstance(instanceValue))" + NL + "\t\t{" + NL + "\t\t\ttry" + NL + "\t\t\t{";
>- protected final String TEXT_407 = NL + "\t\t\t\tString value = convert";
>- protected final String TEXT_408 = "ToString(";
>- protected final String TEXT_409 = ", instanceValue);";
>- protected final String TEXT_410 = NL + "\t\t\t\tString value = ";
>- protected final String TEXT_411 = ".convertToString(";
>- protected final String TEXT_412 = ", instanceValue);";
>- protected final String TEXT_413 = NL + "\t\t\t\tif (value != null) return value;" + NL + "\t\t\t}" + NL + "\t\t\tcatch (Exception e)" + NL + "\t\t\t{" + NL + "\t\t\t\t// Keep trying other member types until all have failed." + NL + "\t\t\t}" + NL + "\t\t}";
>- protected final String TEXT_414 = NL + "\t\tthrow new IllegalArgumentException(\"Invalid value: '\"+instanceValue+\"' for datatype :\"+eDataType.getName());";
>- protected final String TEXT_415 = NL + "\t\treturn super.convertToString(instanceValue);";
>- protected final String TEXT_416 = NL + "\t\t// TODO: implement this method" + NL + "\t\t// Ensure that you remove @generated or mark it @generated NOT" + NL + "\t\tthrow new ";
>- protected final String TEXT_417 = "();";
>- protected final String TEXT_418 = NL + "\t\treturn super.convertToString(eDataType, instanceValue);";
>- protected final String TEXT_419 = NL + "\t}" + NL;
>- protected final String TEXT_420 = NL + "\t/**" + NL + "\t * Returns a new object of class '";
>- protected final String TEXT_421 = "'." + NL + "\t * " + NL + "\t * " + NL + "\t * @return a new object of class '";
>- protected final String TEXT_422 = "'." + NL + "\t * @generated" + NL + "\t */" + NL + "\t";
>- protected final String TEXT_423 = " create";
>- protected final String TEXT_424 = "();" + NL;
>- protected final String TEXT_425 = NL + "\t/**" + NL + "\t * Returns an instance of data type '";
>- protected final String TEXT_426 = "' corresponding the given literal." + NL + "\t * " + NL + "\t * " + NL + "\t * @param literal a literal of the data type." + NL + "\t * @return a new instance value of the data type." + NL + "\t * @generated" + NL + "\t */" + NL + "\t";
>- protected final String TEXT_427 = " create";
>- protected final String TEXT_428 = "(String literal);" + NL + "" + NL + "\t/**" + NL + "\t * Returns a literal representation of an instance of data type '";
>- protected final String TEXT_429 = "'." + NL + "\t * " + NL + "\t * " + NL + "\t * @param instanceValue an instance value of the data type." + NL + "\t * @return a literal representation of the instance value." + NL + "\t * @generated" + NL + "\t */" + NL + "\tString convert";
>+ protected final String TEXT_371 = NL + "\t}" + NL;
>+ protected final String TEXT_372 = NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */";
>+ protected final String TEXT_373 = NL + "\t@SuppressWarnings(\"unchecked\")";
>+ protected final String TEXT_374 = NL + "\tpublic String convert";
>+ protected final String TEXT_375 = "ToString(";
>+ protected final String TEXT_376 = " eDataType, Object instanceValue)" + NL + "\t{";
>+ protected final String TEXT_377 = NL + "\t\treturn convert";
>+ protected final String TEXT_378 = "((";
>+ protected final String TEXT_379 = ")instanceValue);";
>+ protected final String TEXT_380 = NL + "\t\treturn instanceValue == null ? null : instanceValue.toString();";
>+ protected final String TEXT_381 = NL + "\t\treturn convert";
>+ protected final String TEXT_382 = "ToString(";
>+ protected final String TEXT_383 = ", instanceValue);";
>+ protected final String TEXT_384 = NL + "\t\treturn ";
>+ protected final String TEXT_385 = ".convertToString(";
>+ protected final String TEXT_386 = ", instanceValue);";
>+ protected final String TEXT_387 = NL + "\t\treturn convert";
>+ protected final String TEXT_388 = "((";
>+ protected final String TEXT_389 = ")instanceValue);";
>+ protected final String TEXT_390 = NL + "\t\tif (instanceValue == null) return null;" + NL + "\t\t";
>+ protected final String TEXT_391 = " list = (";
>+ protected final String TEXT_392 = ")instanceValue;" + NL + "\t\tif (list.isEmpty()) return \"\";" + NL + "\t\t";
>+ protected final String TEXT_393 = " result = new ";
>+ protected final String TEXT_394 = "();";
>+ protected final String TEXT_395 = NL + "\t\tfor (";
>+ protected final String TEXT_396 = " i = list.iterator(); i.hasNext(); )";
>+ protected final String TEXT_397 = NL + "\t\tfor (";
>+ protected final String TEXT_398 = " item : list)";
>+ protected final String TEXT_399 = NL + "\t\t{";
>+ protected final String TEXT_400 = NL + "\t\t\tresult.append(convert";
>+ protected final String TEXT_401 = "ToString(";
>+ protected final String TEXT_402 = ", ";
>+ protected final String TEXT_403 = "));";
>+ protected final String TEXT_404 = NL + "\t\t\tresult.append(";
>+ protected final String TEXT_405 = ".convertToString(";
>+ protected final String TEXT_406 = ", ";
>+ protected final String TEXT_407 = "));";
>+ protected final String TEXT_408 = NL + "\t\t\tresult.append(' ');" + NL + "\t\t}" + NL + "\t\treturn result.substring(0, result.length() - 1);";
>+ protected final String TEXT_409 = NL + "\t\treturn instanceValue == null ? null : convert";
>+ protected final String TEXT_410 = "(((";
>+ protected final String TEXT_411 = ")instanceValue)";
>+ protected final String TEXT_412 = ".";
>+ protected final String TEXT_413 = "()";
>+ protected final String TEXT_414 = ");";
>+ protected final String TEXT_415 = NL + "\t\treturn convert";
>+ protected final String TEXT_416 = "(instanceValue);";
>+ protected final String TEXT_417 = NL + "\t\tif (instanceValue == null) return null;";
>+ protected final String TEXT_418 = NL + "\t\tif (";
>+ protected final String TEXT_419 = ".isInstance(instanceValue))" + NL + "\t\t{" + NL + "\t\t\ttry" + NL + "\t\t\t{";
>+ protected final String TEXT_420 = NL + "\t\t\t\tString value = convert";
>+ protected final String TEXT_421 = "ToString(";
>+ protected final String TEXT_422 = ", instanceValue);";
>+ protected final String TEXT_423 = NL + "\t\t\t\tString value = ";
>+ protected final String TEXT_424 = ".convertToString(";
>+ protected final String TEXT_425 = ", instanceValue);";
>+ protected final String TEXT_426 = NL + "\t\t\t\tif (value != null) return value;" + NL + "\t\t\t}" + NL + "\t\t\tcatch (Exception e)" + NL + "\t\t\t{" + NL + "\t\t\t\t// Keep trying other member types until all have failed." + NL + "\t\t\t}" + NL + "\t\t}";
>+ protected final String TEXT_427 = NL + "\t\tthrow new IllegalArgumentException(\"Invalid value: '\"+instanceValue+\"' for datatype :\"+eDataType.getName());";
>+ protected final String TEXT_428 = NL + "\t\treturn instanceValue == null ? null : convert";
>+ protected final String TEXT_429 = "(";
> protected final String TEXT_430 = "(";
>- protected final String TEXT_431 = " instanceValue);" + NL;
>- protected final String TEXT_432 = NL + "\t/**" + NL + "\t * Returns the package supported by this factory." + NL + "\t * " + NL + "\t * " + NL + "\t * @return the package supported by this factory." + NL + "\t * @generated" + NL + "\t */" + NL + "\t";
>- protected final String TEXT_433 = " get";
>- protected final String TEXT_434 = "();" + NL;
>- protected final String TEXT_435 = NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic ";
>- protected final String TEXT_436 = " get";
>- protected final String TEXT_437 = "()" + NL + "\t{" + NL + "\t\treturn (";
>- protected final String TEXT_438 = ")getEPackage();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @deprecated" + NL + "\t * @generated" + NL + "\t */";
>- protected final String TEXT_439 = NL + "\t@Deprecated";
>- protected final String TEXT_440 = NL + "\tpublic static ";
>- protected final String TEXT_441 = " getPackage()" + NL + "\t{" + NL + "\t\treturn ";
>- protected final String TEXT_442 = ".eINSTANCE;" + NL + "\t}" + NL;
>- protected final String TEXT_443 = NL + "} //";
>- protected final String TEXT_444 = NL;
>+ protected final String TEXT_431 = "(";
>+ protected final String TEXT_432 = ")instanceValue";
>+ protected final String TEXT_433 = ").";
>+ protected final String TEXT_434 = "()";
>+ protected final String TEXT_435 = ");";
>+ protected final String TEXT_436 = NL + "\t\treturn convert";
>+ protected final String TEXT_437 = "((";
>+ protected final String TEXT_438 = ")instanceValue);";
>+ protected final String TEXT_439 = NL + "\t\treturn super.convertToString(instanceValue);";
>+ protected final String TEXT_440 = NL + "\t\t// TODO: implement this method" + NL + "\t\t// Ensure that you remove @generated or mark it @generated NOT" + NL + "\t\tthrow new ";
>+ protected final String TEXT_441 = "();";
>+ protected final String TEXT_442 = NL + "\t\treturn super.convertToString(eDataType, instanceValue);";
>+ protected final String TEXT_443 = NL + "\t}" + NL;
>+ protected final String TEXT_444 = NL + "\t/**" + NL + "\t * Returns a new object of class '";
>+ protected final String TEXT_445 = "'." + NL + "\t * " + NL + "\t * " + NL + "\t * @return a new object of class '";
>+ protected final String TEXT_446 = "'." + NL + "\t * @generated" + NL + "\t */" + NL + "\t";
>+ protected final String TEXT_447 = " create";
>+ protected final String TEXT_448 = "();" + NL;
>+ protected final String TEXT_449 = NL + "\t/**" + NL + "\t * Returns an instance of data type '";
>+ protected final String TEXT_450 = "' corresponding the given literal." + NL + "\t * " + NL + "\t * " + NL + "\t * @param literal a literal of the data type." + NL + "\t * @return a new instance value of the data type." + NL + "\t * @generated" + NL + "\t */" + NL + "\t";
>+ protected final String TEXT_451 = " create";
>+ protected final String TEXT_452 = "(String literal);" + NL + "" + NL + "\t/**" + NL + "\t * Returns a literal representation of an instance of data type '";
>+ protected final String TEXT_453 = "'." + NL + "\t * " + NL + "\t * " + NL + "\t * @param instanceValue an instance value of the data type." + NL + "\t * @return a literal representation of the instance value." + NL + "\t * @generated" + NL + "\t */" + NL + "\tString convert";
>+ protected final String TEXT_454 = "(";
>+ protected final String TEXT_455 = " instanceValue);" + NL;
>+ protected final String TEXT_456 = NL + "\t/**" + NL + "\t * Returns the package supported by this factory." + NL + "\t * " + NL + "\t * " + NL + "\t * @return the package supported by this factory." + NL + "\t * @generated" + NL + "\t */" + NL + "\t";
>+ protected final String TEXT_457 = " get";
>+ protected final String TEXT_458 = "();" + NL;
>+ protected final String TEXT_459 = NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic ";
>+ protected final String TEXT_460 = " get";
>+ protected final String TEXT_461 = "()" + NL + "\t{" + NL + "\t\treturn (";
>+ protected final String TEXT_462 = ")getEPackage();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * " + NL + "\t * " + NL + "\t * @deprecated" + NL + "\t * @generated" + NL + "\t */";
>+ protected final String TEXT_463 = NL + "\t@Deprecated";
>+ protected final String TEXT_464 = NL + "\tpublic static ";
>+ protected final String TEXT_465 = " getPackage()" + NL + "\t{" + NL + "\t\treturn ";
>+ protected final String TEXT_466 = ".eINSTANCE;" + NL + "\t}" + NL;
>+ protected final String TEXT_467 = NL + "} //";
>+ protected final String TEXT_468 = NL;
> 
> public String generate(Object argument)
> {
>@@ -709,9 +733,9 @@
> }
> for (GenDataType genDataType : genPackage.getAllGenDataTypes()) {
> if (genDataType.isSerializable()) {
>- if (genPackage.isDataTypeConverters()) { String eDataType = genDataType.getQualifiedClassifierAccessor();
>+ if (genPackage.isDataTypeConverters() || genDataType.hasCreatorBody()) { String eDataType = genDataType.getQualifiedClassifierAccessor();
> stringBuffer.append(TEXT_93);
>- if (genModel.useGenerics() && genDataType.isUncheckedCast()) {
>+ if (genModel.useGenerics() && genDataType.isUncheckedCast() && !genDataType.hasCreatorBody()) {
> stringBuffer.append(TEXT_94);
> }
> stringBuffer.append(TEXT_95);
>@@ -719,556 +743,556 @@
> stringBuffer.append(TEXT_96);
> stringBuffer.append(genDataType.getName());
> stringBuffer.append(TEXT_97);
>- if (genDataType instanceof GenEnum) {
>+ if (genDataType.hasCreatorBody()) {
> stringBuffer.append(TEXT_98);
>- stringBuffer.append(genDataType.getImportedInstanceClassName());
>+ } else {
> stringBuffer.append(TEXT_99);
>- stringBuffer.append(genDataType.getImportedInstanceClassName());
>+ }
> stringBuffer.append(TEXT_100);
>- stringBuffer.append(eDataType);
>+ if (genDataType.hasCreatorBody()) {
> stringBuffer.append(TEXT_101);
>+ stringBuffer.append(genDataType.getCreatorBody(genModel.getIndentation(stringBuffer)));
>+ } else if (genDataType instanceof GenEnum) {
>+ stringBuffer.append(TEXT_102);
>+ stringBuffer.append(genDataType.getImportedInstanceClassName());
>+ stringBuffer.append(TEXT_103);
>+ stringBuffer.append(genDataType.getImportedInstanceClassName());
>+ stringBuffer.append(TEXT_104);
>+ stringBuffer.append(eDataType);
>+ stringBuffer.append(TEXT_105);
> stringBuffer.append(genModel.getNonNLS());
> stringBuffer.append(genModel.getNonNLS(2));
> stringBuffer.append(genModel.getNonNLS(3));
>- stringBuffer.append(TEXT_102);
>+ stringBuffer.append(TEXT_106);
> } else if (genDataType.getBaseType() != null) { GenDataType genBaseType = genDataType.getBaseType(); boolean isPrimitiveConversion = !genDataType.isPrimitiveType() && genBaseType.isPrimitiveType();
> if (genBaseType.getGenPackage() == genPackage) {
> if (isPrimitiveConversion && genModel.getComplianceLevel().getValue() < GenJDKLevel.JDK50) {
>- stringBuffer.append(TEXT_103);
>+ stringBuffer.append(TEXT_107);
> stringBuffer.append(genDataType.getObjectInstanceClassName());
>- stringBuffer.append(TEXT_104);
>+ stringBuffer.append(TEXT_108);
> stringBuffer.append(genBaseType.getName());
>- stringBuffer.append(TEXT_105);
>+ stringBuffer.append(TEXT_109);
> } else {
>- stringBuffer.append(TEXT_106);
>+ stringBuffer.append(TEXT_110);
> stringBuffer.append(genBaseType.getName());
>- stringBuffer.append(TEXT_107);
>+ stringBuffer.append(TEXT_111);
> }
> } else if (genBaseType.getGenPackage().isDataTypeConverters()) {
> if (isPrimitiveConversion && genModel.getComplianceLevel().getValue() < GenJDKLevel.JDK50) {
>- stringBuffer.append(TEXT_108);
>+ stringBuffer.append(TEXT_112);
> stringBuffer.append(genDataType.getObjectInstanceClassName());
>- stringBuffer.append(TEXT_109);
>+ stringBuffer.append(TEXT_113);
> stringBuffer.append(genBaseType.getGenPackage().getQualifiedEFactoryInternalInstanceAccessor());
>- stringBuffer.append(TEXT_110);
>+ stringBuffer.append(TEXT_114);
> stringBuffer.append(genBaseType.getName());
>- stringBuffer.append(TEXT_111);
>+ stringBuffer.append(TEXT_115);
> } else {
>- stringBuffer.append(TEXT_112);
>+ stringBuffer.append(TEXT_116);
> stringBuffer.append(genBaseType.getGenPackage().getQualifiedEFactoryInternalInstanceAccessor());
>- stringBuffer.append(TEXT_113);
>+ stringBuffer.append(TEXT_117);
> stringBuffer.append(genBaseType.getName());
>- stringBuffer.append(TEXT_114);
>+ stringBuffer.append(TEXT_118);
> }
> } else {
>- stringBuffer.append(TEXT_115);
>+ stringBuffer.append(TEXT_119);
> if (!genDataType.isObjectType()) {
>- stringBuffer.append(TEXT_116);
>+ stringBuffer.append(TEXT_120);
> stringBuffer.append(genDataType.getObjectInstanceClassName());
>- stringBuffer.append(TEXT_117);
>+ stringBuffer.append(TEXT_121);
> }
> stringBuffer.append(genBaseType.getGenPackage().getQualifiedEFactoryInternalInstanceAccessor());
>- stringBuffer.append(TEXT_118);
>+ stringBuffer.append(TEXT_122);
> stringBuffer.append(genBaseType.getQualifiedClassifierAccessor());
>- stringBuffer.append(TEXT_119);
>+ stringBuffer.append(TEXT_123);
> }
> } else if (genDataType.getItemType() != null) { GenDataType genItemType = genDataType.getItemType(); 
>- stringBuffer.append(TEXT_120);
>+ stringBuffer.append(TEXT_124);
> stringBuffer.append(genDataType.getImportedParameterizedInstanceClassName());
>- stringBuffer.append(TEXT_121);
>+ stringBuffer.append(TEXT_125);
> stringBuffer.append(genModel.getImportedName("java.util.ArrayList"));
> if (genModel.useGenerics()) {
>- stringBuffer.append(TEXT_122);
>+ stringBuffer.append(TEXT_126);
> stringBuffer.append(genItemType.getObjectType().getImportedParameterizedInstanceClassName());
>- stringBuffer.append(TEXT_123);
>+ stringBuffer.append(TEXT_127);
> }
>- stringBuffer.append(TEXT_124);
>+ stringBuffer.append(TEXT_128);
> if (genModel.getRuntimeVersion().getValue() < GenRuntimeVersion.EMF26_VALUE) {
>- stringBuffer.append(TEXT_125);
>+ stringBuffer.append(TEXT_129);
> stringBuffer.append(genModel.getImportedName("java.util.StringTokenizer"));
>- stringBuffer.append(TEXT_126);
>+ stringBuffer.append(TEXT_130);
> stringBuffer.append(genModel.getImportedName("java.util.StringTokenizer"));
>- stringBuffer.append(TEXT_127);
>+ stringBuffer.append(TEXT_131);
> } else {
>- stringBuffer.append(TEXT_128);
>+ stringBuffer.append(TEXT_132);
> }
>- stringBuffer.append(TEXT_129);
>+ stringBuffer.append(TEXT_133);
> if (genModel.getRuntimeVersion().getValue() < GenRuntimeVersion.EMF26_VALUE) {
>- stringBuffer.append(TEXT_130);
>+ stringBuffer.append(TEXT_134);
> }
> if (genItemType.getGenPackage() == genPackage) {
> if (genPackage.isDataTypeConverters()) { genItemType = genItemType.getObjectType();
>- stringBuffer.append(TEXT_131);
>+ stringBuffer.append(TEXT_135);
> stringBuffer.append(genItemType.getName());
>- stringBuffer.append(TEXT_132);
>+ stringBuffer.append(TEXT_136);
> } else {
>- stringBuffer.append(TEXT_133);
>+ stringBuffer.append(TEXT_137);
> stringBuffer.append(genItemType.getName());
>- stringBuffer.append(TEXT_134);
>+ stringBuffer.append(TEXT_138);
> stringBuffer.append(genItemType.getQualifiedClassifierAccessor());
>- stringBuffer.append(TEXT_135);
>+ stringBuffer.append(TEXT_139);
> }
> } else {
> if (genItemType.getGenPackage().isDataTypeConverters()) { genItemType = genItemType.getObjectType();
>- stringBuffer.append(TEXT_136);
>+ stringBuffer.append(TEXT_140);
> stringBuffer.append(genItemType.getGenPackage().getQualifiedEFactoryInternalInstanceAccessor());
>- stringBuffer.append(TEXT_137);
>+ stringBuffer.append(TEXT_141);
> stringBuffer.append(genItemType.getName());
>- stringBuffer.append(TEXT_138);
>+ stringBuffer.append(TEXT_142);
> } else {
>- stringBuffer.append(TEXT_139);
>+ stringBuffer.append(TEXT_143);
> stringBuffer.append(genItemType.getGenPackage().getQualifiedEFactoryInternalInstanceAccessor());
>- stringBuffer.append(TEXT_140);
>+ stringBuffer.append(TEXT_144);
> stringBuffer.append(genItemType.getQualifiedClassifierAccessor());
>- stringBuffer.append(TEXT_141);
>+ stringBuffer.append(TEXT_145);
> }
> }
>- stringBuffer.append(TEXT_142);
>+ stringBuffer.append(TEXT_146);
> } else if (!genDataType.getMemberTypes().isEmpty()) {
>- stringBuffer.append(TEXT_143);
>+ stringBuffer.append(TEXT_147);
> stringBuffer.append(genDataType.getStaticValue(null));
>- stringBuffer.append(TEXT_144);
>+ stringBuffer.append(TEXT_148);
> stringBuffer.append(genDataType.getImportedInstanceClassName());
>- stringBuffer.append(TEXT_145);
>+ stringBuffer.append(TEXT_149);
> stringBuffer.append(genDataType.getStaticValue(null));
>- stringBuffer.append(TEXT_146);
>+ stringBuffer.append(TEXT_150);
> for (GenDataType genMemberType : genDataType.getMemberTypes()) {
>- stringBuffer.append(TEXT_147);
>+ stringBuffer.append(TEXT_151);
> if (genMemberType.getGenPackage() == genPackage) {
> if (genPackage.isDataTypeConverters()) { if (!genDataType.isPrimitiveType()) genMemberType = genMemberType.getObjectType();
>- stringBuffer.append(TEXT_148);
>+ stringBuffer.append(TEXT_152);
> stringBuffer.append(genMemberType.getName());
>- stringBuffer.append(TEXT_149);
>+ stringBuffer.append(TEXT_153);
> } else {
>- stringBuffer.append(TEXT_150);
>+ stringBuffer.append(TEXT_154);
> stringBuffer.append(genDataType.getObjectInstanceClassName());
>- stringBuffer.append(TEXT_151);
>+ stringBuffer.append(TEXT_155);
> stringBuffer.append(genMemberType.getName());
>- stringBuffer.append(TEXT_152);
>+ stringBuffer.append(TEXT_156);
> stringBuffer.append(genMemberType.getQualifiedClassifierAccessor());
>- stringBuffer.append(TEXT_153);
>+ stringBuffer.append(TEXT_157);
> }
> } else {
> if (genPackage.isDataTypeConverters()) { if (!genDataType.isPrimitiveType()) genMemberType = genMemberType.getObjectType();
>- stringBuffer.append(TEXT_154);
>+ stringBuffer.append(TEXT_158);
> stringBuffer.append(genMemberType.getGenPackage().getQualifiedEFactoryInternalInstanceAccessor());
>- stringBuffer.append(TEXT_155);
>+ stringBuffer.append(TEXT_159);
> stringBuffer.append(genMemberType.getName());
>- stringBuffer.append(TEXT_156);
>+ stringBuffer.append(TEXT_160);
> } else {
>- stringBuffer.append(TEXT_157);
>+ stringBuffer.append(TEXT_161);
> stringBuffer.append(genDataType.getObjectInstanceClassName());
>- stringBuffer.append(TEXT_158);
>+ stringBuffer.append(TEXT_162);
> stringBuffer.append(genMemberType.getGenPackage().getQualifiedEFactoryInternalInstanceAccessor());
>- stringBuffer.append(TEXT_159);
>+ stringBuffer.append(TEXT_163);
> stringBuffer.append(genMemberType.getQualifiedClassifierAccessor());
>- stringBuffer.append(TEXT_160);
>+ stringBuffer.append(TEXT_164);
> }
> }
>- stringBuffer.append(TEXT_161);
>+ stringBuffer.append(TEXT_165);
> if (!genDataType.isPrimitiveType()) {
>- stringBuffer.append(TEXT_162);
>+ stringBuffer.append(TEXT_166);
> }
> stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.Diagnostician"));
>- stringBuffer.append(TEXT_163);
>+ stringBuffer.append(TEXT_167);
> stringBuffer.append(eDataType);
>- stringBuffer.append(TEXT_164);
>+ stringBuffer.append(TEXT_168);
> if (genDataType.isPrimitiveType() && genModel.getComplianceLevel().getValue() < GenJDKLevel.JDK50) {
>- stringBuffer.append(TEXT_165);
>+ stringBuffer.append(TEXT_169);
> stringBuffer.append(genDataType.getObjectInstanceClassName());
>- stringBuffer.append(TEXT_166);
>+ stringBuffer.append(TEXT_170);
> } else {
>- stringBuffer.append(TEXT_167);
>+ stringBuffer.append(TEXT_171);
> }
>- stringBuffer.append(TEXT_168);
>+ stringBuffer.append(TEXT_172);
> }
>- stringBuffer.append(TEXT_169);
>+ stringBuffer.append(TEXT_173);
> if (!genDataType.isPrimitiveType()) {
>- stringBuffer.append(TEXT_170);
>+ stringBuffer.append(TEXT_174);
> }
>- stringBuffer.append(TEXT_171);
>+ stringBuffer.append(TEXT_175);
> } else if (genModel.useGenerics() && (genDataType.isArrayType() || !genDataType.getEcoreDataType().getETypeParameters().isEmpty() || genDataType.getEcoreDataType().getInstanceTypeName().contains("<"))) {
>- stringBuffer.append(TEXT_172);
>+ stringBuffer.append(TEXT_176);
> stringBuffer.append(genDataType.getImportedParameterizedObjectInstanceClassName());
>- stringBuffer.append(TEXT_173);
>+ stringBuffer.append(TEXT_177);
> } else if (genDataType.isArrayType()) {
>- stringBuffer.append(TEXT_174);
>+ stringBuffer.append(TEXT_178);
> stringBuffer.append(genModel.getImportedName("java.lang.UnsupportedOperationException"));
>- stringBuffer.append(TEXT_175);
>+ stringBuffer.append(TEXT_179);
> } else if (genDataType.isPrimitiveType() && genModel.getComplianceLevel().getValue() < GenJDKLevel.JDK50) {
>- stringBuffer.append(TEXT_176);
>+ stringBuffer.append(TEXT_180);
> stringBuffer.append(genDataType.getObjectInstanceClassName());
>- stringBuffer.append(TEXT_177);
>+ stringBuffer.append(TEXT_181);
> stringBuffer.append(eDataType);
>- stringBuffer.append(TEXT_178);
>+ stringBuffer.append(TEXT_182);
> stringBuffer.append(genDataType.getPrimitiveValueFunction());
>- stringBuffer.append(TEXT_179);
>+ stringBuffer.append(TEXT_183);
> } else {
>- stringBuffer.append(TEXT_180);
>+ stringBuffer.append(TEXT_184);
> if (!genDataType.isObjectType()) {
>- stringBuffer.append(TEXT_181);
>+ stringBuffer.append(TEXT_185);
> stringBuffer.append(genDataType.getObjectInstanceClassName());
>- stringBuffer.append(TEXT_182);
>+ stringBuffer.append(TEXT_186);
> }
>- stringBuffer.append(TEXT_183);
>+ stringBuffer.append(TEXT_187);
> stringBuffer.append(eDataType);
>- stringBuffer.append(TEXT_184);
>+ stringBuffer.append(TEXT_188);
> }
>- stringBuffer.append(TEXT_185);
>+ stringBuffer.append(TEXT_189);
> }
>- stringBuffer.append(TEXT_186);
>- if (genModel.useGenerics() && genDataType.isUncheckedCast()) {
>- stringBuffer.append(TEXT_187);
>+ stringBuffer.append(TEXT_190);
>+ if (!genPackage.isDataTypeConverters() && genModel.useGenerics() && genDataType.isUncheckedCast() && !genDataType.hasCreatorBody()) {
>+ stringBuffer.append(TEXT_191);
> }
>- stringBuffer.append(TEXT_188);
>+ stringBuffer.append(TEXT_192);
> stringBuffer.append(genDataType.getImportedParameterizedObjectInstanceClassName());
>- stringBuffer.append(TEXT_189);
>+ stringBuffer.append(TEXT_193);
> stringBuffer.append(genDataType.getName());
>- stringBuffer.append(TEXT_190);
>+ stringBuffer.append(TEXT_194);
> stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EDataType"));
>- stringBuffer.append(TEXT_191);
>+ stringBuffer.append(TEXT_195);
> if (genDataType instanceof GenEnum) {
>- if (genPackage.isDataTypeConverters()) {
>- stringBuffer.append(TEXT_192);
>+ if (genPackage.isDataTypeConverters() || genDataType.hasCreatorBody()) {
>+ stringBuffer.append(TEXT_196);
> stringBuffer.append(genDataType.getName());
>- stringBuffer.append(TEXT_193);
>+ stringBuffer.append(TEXT_197);
> } else {
>- stringBuffer.append(TEXT_194);
>+ stringBuffer.append(TEXT_198);
> stringBuffer.append(((GenEnum)genDataType).getImportedInstanceClassName());
>- stringBuffer.append(TEXT_195);
>+ stringBuffer.append(TEXT_199);
> stringBuffer.append(((GenEnum)genDataType).getImportedInstanceClassName());
>- stringBuffer.append(TEXT_196);
>+ stringBuffer.append(TEXT_200);
> stringBuffer.append(genModel.getNonNLS());
> stringBuffer.append(genModel.getNonNLS(2));
> stringBuffer.append(genModel.getNonNLS(3));
>- stringBuffer.append(TEXT_197);
>+ stringBuffer.append(TEXT_201);
> }
> } else if (genDataType.getBaseType() != null) { GenDataType genBaseType = genDataType.getBaseType(); 
> if (genBaseType.getGenPackage() == genPackage) {
>- stringBuffer.append(TEXT_198);
>+ stringBuffer.append(TEXT_202);
> if (!genDataType.getObjectInstanceClassName().equals(genBaseType.getObjectInstanceClassName())) {
>- stringBuffer.append(TEXT_199);
>+ stringBuffer.append(TEXT_203);
> stringBuffer.append(genDataType.getObjectInstanceClassName());
>- stringBuffer.append(TEXT_200);
>+ stringBuffer.append(TEXT_204);
> }
>- stringBuffer.append(TEXT_201);
>+ stringBuffer.append(TEXT_205);
> stringBuffer.append(genBaseType.getName());
>- stringBuffer.append(TEXT_202);
>+ stringBuffer.append(TEXT_206);
> stringBuffer.append(genBaseType.getQualifiedClassifierAccessor());
>- stringBuffer.append(TEXT_203);
>+ stringBuffer.append(TEXT_207);
> } else {
>- stringBuffer.append(TEXT_204);
>+ stringBuffer.append(TEXT_208);
> if (!genDataType.isObjectType()) {
>- stringBuffer.append(TEXT_205);
>+ stringBuffer.append(TEXT_209);
> stringBuffer.append(genDataType.getObjectInstanceClassName());
>- stringBuffer.append(TEXT_206);
>+ stringBuffer.append(TEXT_210);
> }
> stringBuffer.append(genBaseType.getGenPackage().getQualifiedEFactoryInternalInstanceAccessor());
>- stringBuffer.append(TEXT_207);
>+ stringBuffer.append(TEXT_211);
> stringBuffer.append(genBaseType.getQualifiedClassifierAccessor());
>- stringBuffer.append(TEXT_208);
>+ stringBuffer.append(TEXT_212);
> }
> } else if (genDataType.getItemType() != null) { GenDataType genItemType = genDataType.getItemType(); 
> if (genPackage.isDataTypeConverters()) {
>- stringBuffer.append(TEXT_209);
>+ stringBuffer.append(TEXT_213);
> stringBuffer.append(genDataType.getName());
>- stringBuffer.append(TEXT_210);
>+ stringBuffer.append(TEXT_214);
> } else {
>- stringBuffer.append(TEXT_211);
>+ stringBuffer.append(TEXT_215);
> stringBuffer.append(genDataType.getImportedParameterizedObjectInstanceClassName());
>- stringBuffer.append(TEXT_212);
>+ stringBuffer.append(TEXT_216);
> stringBuffer.append(genModel.getImportedName("java.util.ArrayList"));
> if (genModel.useGenerics()) {
>- stringBuffer.append(TEXT_213);
>+ stringBuffer.append(TEXT_217);
> stringBuffer.append(genItemType.getObjectType().getImportedParameterizedInstanceClassName());
>- stringBuffer.append(TEXT_214);
>+ stringBuffer.append(TEXT_218);
> }
>- stringBuffer.append(TEXT_215);
>+ stringBuffer.append(TEXT_219);
> if (genModel.getRuntimeVersion().getValue() < GenRuntimeVersion.EMF26_VALUE) {
>- stringBuffer.append(TEXT_216);
>+ stringBuffer.append(TEXT_220);
> stringBuffer.append(genModel.getImportedName("java.util.StringTokenizer"));
>- stringBuffer.append(TEXT_217);
>+ stringBuffer.append(TEXT_221);
> stringBuffer.append(genModel.getImportedName("java.util.StringTokenizer"));
>- stringBuffer.append(TEXT_218);
>+ stringBuffer.append(TEXT_222);
> } else {
>- stringBuffer.append(TEXT_219);
>+ stringBuffer.append(TEXT_223);
> }
>- stringBuffer.append(TEXT_220);
>+ stringBuffer.append(TEXT_224);
> if (genModel.getRuntimeVersion().getValue() < GenRuntimeVersion.EMF26_VALUE) {
>- stringBuffer.append(TEXT_221);
>+ stringBuffer.append(TEXT_225);
> }
> if (genItemType.getGenPackage() == genPackage) {
>- stringBuffer.append(TEXT_222);
>+ stringBuffer.append(TEXT_226);
> stringBuffer.append(genItemType.getName());
>- stringBuffer.append(TEXT_223);
>+ stringBuffer.append(TEXT_227);
> stringBuffer.append(genItemType.getQualifiedClassifierAccessor());
>- stringBuffer.append(TEXT_224);
>+ stringBuffer.append(TEXT_228);
> } else {
>- stringBuffer.append(TEXT_225);
>+ stringBuffer.append(TEXT_229);
> if (!genItemType.isObjectType()) {
>- stringBuffer.append(TEXT_226);
>+ stringBuffer.append(TEXT_230);
> stringBuffer.append(genItemType.getObjectInstanceClassName());
>- stringBuffer.append(TEXT_227);
>+ stringBuffer.append(TEXT_231);
> }
> stringBuffer.append(genItemType.getGenPackage().getQualifiedEFactoryInternalInstanceAccessor());
>- stringBuffer.append(TEXT_228);
>+ stringBuffer.append(TEXT_232);
> stringBuffer.append(genItemType.getQualifiedClassifierAccessor());
>- stringBuffer.append(TEXT_229);
>+ stringBuffer.append(TEXT_233);
> }
>- stringBuffer.append(TEXT_230);
>+ stringBuffer.append(TEXT_234);
> }
> } else if (!genDataType.getMemberTypes().isEmpty()) {
> if (genPackage.isDataTypeConverters()) {
> if (genDataType.isPrimitiveType() && genModel.getComplianceLevel().getValue() < GenJDKLevel.JDK50) {
>- stringBuffer.append(TEXT_231);
>+ stringBuffer.append(TEXT_235);
> stringBuffer.append(genDataType.getObjectInstanceClassName());
>- stringBuffer.append(TEXT_232);
>+ stringBuffer.append(TEXT_236);
> stringBuffer.append(genDataType.getName());
>- stringBuffer.append(TEXT_233);
>+ stringBuffer.append(TEXT_237);
> } else {
>- stringBuffer.append(TEXT_234);
>+ stringBuffer.append(TEXT_238);
> stringBuffer.append(genDataType.getName());
>- stringBuffer.append(TEXT_235);
>+ stringBuffer.append(TEXT_239);
> }
> } else {
>- stringBuffer.append(TEXT_236);
>- stringBuffer.append(genDataType.getObjectInstanceClassName());
>- stringBuffer.append(TEXT_237);
>- for (GenDataType genMemberType : genDataType.getMemberTypes()) {
>- stringBuffer.append(TEXT_238);
>- if (genMemberType.getGenPackage() == genPackage) {
>- stringBuffer.append(TEXT_239);
>- if (!genDataType.isObjectType() && !genDataType.getObjectInstanceClassName().equals(genMemberType.getObjectInstanceClassName())) {
> stringBuffer.append(TEXT_240);
> stringBuffer.append(genDataType.getObjectInstanceClassName());
> stringBuffer.append(TEXT_241);
>- }
>+ for (GenDataType genMemberType : genDataType.getMemberTypes()) {
> stringBuffer.append(TEXT_242);
>- stringBuffer.append(genMemberType.getName());
>+ if (genMemberType.getGenPackage() == genPackage) {
> stringBuffer.append(TEXT_243);
>- stringBuffer.append(genMemberType.getQualifiedClassifierAccessor());
>+ if (!genDataType.isObjectType() && !genDataType.getObjectInstanceClassName().equals(genMemberType.getObjectInstanceClassName())) {
> stringBuffer.append(TEXT_244);
>- } else {
>+ stringBuffer.append(genDataType.getObjectInstanceClassName());
> stringBuffer.append(TEXT_245);
>- if (!genDataType.isObjectType()) {
>+ }
> stringBuffer.append(TEXT_246);
>- stringBuffer.append(genDataType.getObjectInstanceClassName());
>+ stringBuffer.append(genMemberType.getName());
> stringBuffer.append(TEXT_247);
>- }
>- stringBuffer.append(genMemberType.getGenPackage().getQualifiedEFactoryInternalInstanceAccessor());
>- stringBuffer.append(TEXT_248);
> stringBuffer.append(genMemberType.getQualifiedClassifierAccessor());
>+ stringBuffer.append(TEXT_248);
>+ } else {
> stringBuffer.append(TEXT_249);
>- }
>+ if (!genDataType.isObjectType()) {
> stringBuffer.append(TEXT_250);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.Diagnostician"));
>+ stringBuffer.append(genDataType.getObjectInstanceClassName());
> stringBuffer.append(TEXT_251);
> }
>+ stringBuffer.append(genMemberType.getGenPackage().getQualifiedEFactoryInternalInstanceAccessor());
> stringBuffer.append(TEXT_252);
>- }
>- } else if (genModel.useGenerics() && (genDataType.isArrayType() || !genDataType.getEcoreDataType().getETypeParameters().isEmpty() || genDataType.getEcoreDataType().getInstanceTypeName().contains("<"))) {
>+ stringBuffer.append(genMemberType.getQualifiedClassifierAccessor());
> stringBuffer.append(TEXT_253);
>- if (!genDataType.isObjectType()) {
>+ }
> stringBuffer.append(TEXT_254);
>- stringBuffer.append(genDataType.getImportedParameterizedObjectInstanceClassName());
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.Diagnostician"));
> stringBuffer.append(TEXT_255);
> }
> stringBuffer.append(TEXT_256);
>- } else if (genDataType.isArrayType()) {
>+ }
>+ } else if (genPackage.isDataTypeConverters() || genDataType.hasCreatorBody()) {
> stringBuffer.append(TEXT_257);
>- stringBuffer.append(genModel.getImportedName("java.lang.UnsupportedOperationException"));
>+ stringBuffer.append(genDataType.getName());
> stringBuffer.append(TEXT_258);
>- } else {
>+ } else if (genModel.useGenerics() && (genDataType.isArrayType() || !genDataType.getEcoreDataType().getETypeParameters().isEmpty() || genDataType.getEcoreDataType().getInstanceTypeName().contains("<"))) {
> stringBuffer.append(TEXT_259);
> if (!genDataType.isObjectType()) {
> stringBuffer.append(TEXT_260);
>- stringBuffer.append(genDataType.getObjectInstanceClassName());
>+ stringBuffer.append(genDataType.getImportedParameterizedObjectInstanceClassName());
> stringBuffer.append(TEXT_261);
> }
> stringBuffer.append(TEXT_262);
>- }
>+ } else if (genDataType.isArrayType()) {
> stringBuffer.append(TEXT_263);
>- if (genPackage.isDataTypeConverters()) { String eDataType = genDataType.getQualifiedClassifierAccessor();
>+ stringBuffer.append(genModel.getImportedName("java.lang.UnsupportedOperationException"));
> stringBuffer.append(TEXT_264);
>- stringBuffer.append(genDataType.getName());
>+ } else {
> stringBuffer.append(TEXT_265);
>- stringBuffer.append(genDataType.getImportedBoundedWildcardInstanceClassName());
>+ if (!genDataType.isObjectType()) {
> stringBuffer.append(TEXT_266);
>- if (genDataType instanceof GenEnum) {
>+ stringBuffer.append(genDataType.getObjectInstanceClassName());
> stringBuffer.append(TEXT_267);
>+ }
>+ stringBuffer.append(TEXT_268);
>+ }
>+ stringBuffer.append(TEXT_269);
>+ if (genPackage.isDataTypeConverters() || genDataType.hasConverterBody()) { String eDataType = genDataType.getQualifiedClassifierAccessor();
>+ stringBuffer.append(TEXT_270);
>+ stringBuffer.append(genDataType.getName());
>+ stringBuffer.append(TEXT_271);
>+ stringBuffer.append(genDataType.getImportedBoundedWildcardInstanceClassName());
>+ stringBuffer.append(TEXT_272);
>+ if (genDataType.hasConverterBody()) {
>+ stringBuffer.append(TEXT_273);
>+ } else {
>+ stringBuffer.append(TEXT_274);
>+ }
>+ stringBuffer.append(TEXT_275);
>+ if (genDataType.hasConverterBody()) {
>+ stringBuffer.append(TEXT_276);
>+ stringBuffer.append(genDataType.getConverterBody(genModel.getIndentation(stringBuffer)));
>+ } else if (genDataType instanceof GenEnum) {
>+ stringBuffer.append(TEXT_277);
> } else if (genDataType.getBaseType() != null) { GenDataType genBaseType = genDataType.getBaseType(); boolean isPrimitiveConversion = !genDataType.isPrimitiveType() && genBaseType.isPrimitiveType();
> if (genBaseType.getGenPackage() == genPackage) {
> if (isPrimitiveConversion) {
>- stringBuffer.append(TEXT_268);
>+ stringBuffer.append(TEXT_278);
> stringBuffer.append(genBaseType.getName());
>- stringBuffer.append(TEXT_269);
>+ stringBuffer.append(TEXT_279);
> if (genModel.getComplianceLevel().getValue() < GenJDKLevel.JDK50) {
>- stringBuffer.append(TEXT_270);
>+ stringBuffer.append(TEXT_280);
> stringBuffer.append(genBaseType.getPrimitiveValueFunction());
>- stringBuffer.append(TEXT_271);
>+ stringBuffer.append(TEXT_281);
> }
>- stringBuffer.append(TEXT_272);
>+ stringBuffer.append(TEXT_282);
> } else {
>- stringBuffer.append(TEXT_273);
>+ stringBuffer.append(TEXT_283);
> stringBuffer.append(genBaseType.getName());
>- stringBuffer.append(TEXT_274);
>+ stringBuffer.append(TEXT_284);
> }
> } else if (genBaseType.getGenPackage().isDataTypeConverters()) {
>- stringBuffer.append(TEXT_275);
>+ stringBuffer.append(TEXT_285);
> stringBuffer.append(genBaseType.getGenPackage().getQualifiedFactoryInstanceAccessor());
>- stringBuffer.append(TEXT_276);
>+ stringBuffer.append(TEXT_286);
> stringBuffer.append(genBaseType.getName());
>- stringBuffer.append(TEXT_277);
>+ stringBuffer.append(TEXT_287);
> } else {
>- stringBuffer.append(TEXT_278);
>+ stringBuffer.append(TEXT_288);
> stringBuffer.append(genBaseType.getGenPackage().getQualifiedEFactoryInternalInstanceAccessor());
>- stringBuffer.append(TEXT_279);
>+ stringBuffer.append(TEXT_289);
> stringBuffer.append(genBaseType.getQualifiedClassifierAccessor());
>- stringBuffer.append(TEXT_280);
>+ stringBuffer.append(TEXT_290);
> }
> } else if (genDataType.getItemType() != null) { GenDataType genItemType = genDataType.getItemType(); 
>- stringBuffer.append(TEXT_281);
>+ stringBuffer.append(TEXT_291);
> stringBuffer.append(genModel.getImportedName("java.lang.StringBuffer"));
>- stringBuffer.append(TEXT_282);
>+ stringBuffer.append(TEXT_292);
> stringBuffer.append(genModel.getImportedName("java.lang.StringBuffer"));
>- stringBuffer.append(TEXT_283);
>+ stringBuffer.append(TEXT_293);
> String item; if (!genModel.useGenerics()) { item = "i.next()"; 
>- stringBuffer.append(TEXT_284);
>+ stringBuffer.append(TEXT_294);
> stringBuffer.append(genModel.getImportedName("java.util.Iterator"));
>- stringBuffer.append(TEXT_285);
>+ stringBuffer.append(TEXT_295);
> } else { item = "item";
>- stringBuffer.append(TEXT_286);
>+ stringBuffer.append(TEXT_296);
> stringBuffer.append(genModel.getImportedName("java.lang.Object"));
>- stringBuffer.append(TEXT_287);
>+ stringBuffer.append(TEXT_297);
> }
>- stringBuffer.append(TEXT_288);
>+ stringBuffer.append(TEXT_298);
> if (genItemType.getGenPackage() == genPackage) {
> if (genPackage.isDataTypeConverters()) { genItemType = genItemType.getObjectType();
>- stringBuffer.append(TEXT_289);
>+ stringBuffer.append(TEXT_299);
> stringBuffer.append(genItemType.getName());
>- stringBuffer.append(TEXT_290);
>+ stringBuffer.append(TEXT_300);
> stringBuffer.append(genItemType.getObjectInstanceClassName());
>- stringBuffer.append(TEXT_291);
>+ stringBuffer.append(TEXT_301);
> stringBuffer.append(item);
>- stringBuffer.append(TEXT_292);
>+ stringBuffer.append(TEXT_302);
> } else {
>- stringBuffer.append(TEXT_293);
>+ stringBuffer.append(TEXT_303);
> stringBuffer.append(genItemType.getName());
>- stringBuffer.append(TEXT_294);
>+ stringBuffer.append(TEXT_304);
> stringBuffer.append(genItemType.getQualifiedClassifierAccessor());
>- stringBuffer.append(TEXT_295);
>+ stringBuffer.append(TEXT_305);
> stringBuffer.append(item);
>- stringBuffer.append(TEXT_296);
>+ stringBuffer.append(TEXT_306);
> }
> } else {
> if (genItemType.getGenPackage().isDataTypeConverters()) { genItemType = genItemType.getObjectType();
>- stringBuffer.append(TEXT_297);
>+ stringBuffer.append(TEXT_307);
> stringBuffer.append(genItemType.getGenPackage().getQualifiedEFactoryInternalInstanceAccessor());
>- stringBuffer.append(TEXT_298);
>+ stringBuffer.append(TEXT_308);
> stringBuffer.append(genItemType.getName());
>- stringBuffer.append(TEXT_299);
>+ stringBuffer.append(TEXT_309);
> stringBuffer.append(genItemType.getObjectInstanceClassName());
>- stringBuffer.append(TEXT_300);
>+ stringBuffer.append(TEXT_310);
> stringBuffer.append(item);
>- stringBuffer.append(TEXT_301);
>+ stringBuffer.append(TEXT_311);
> } else {
>- stringBuffer.append(TEXT_302);
>+ stringBuffer.append(TEXT_312);
> stringBuffer.append(genItemType.getGenPackage().getQualifiedEFactoryInternalInstanceAccessor());
>- stringBuffer.append(TEXT_303);
>+ stringBuffer.append(TEXT_313);
> stringBuffer.append(genItemType.getQualifiedClassifierAccessor());
>- stringBuffer.append(TEXT_304);
>+ stringBuffer.append(TEXT_314);
> stringBuffer.append(item);
>- stringBuffer.append(TEXT_305);
>+ stringBuffer.append(TEXT_315);
> }
> }
>- stringBuffer.append(TEXT_306);
>+ stringBuffer.append(TEXT_316);
> } else if (!genDataType.getMemberTypes().isEmpty()) {
> if (!genDataType.isPrimitiveType()) {
>- stringBuffer.append(TEXT_307);
>+ stringBuffer.append(TEXT_317);
> for (GenDataType genMemberType : genDataType.getMemberTypes()) {
>- stringBuffer.append(TEXT_308);
>+ stringBuffer.append(TEXT_318);
> stringBuffer.append(genMemberType.getQualifiedClassifierAccessor());
>- stringBuffer.append(TEXT_309);
>+ stringBuffer.append(TEXT_319);
> if (genMemberType.getGenPackage() == genPackage) {
> if (genPackage.isDataTypeConverters()) {
> if (genMemberType.getQualifiedInstanceClassName().equals(genDataType.getQualifiedInstanceClassName())) {
>- stringBuffer.append(TEXT_310);
>- stringBuffer.append(genMemberType.getName());
>- stringBuffer.append(TEXT_311);
>- } else if (genMemberType.isPrimitiveType() && genModel.getComplianceLevel().getValue() < GenJDKLevel.JDK50) {
>- stringBuffer.append(TEXT_312);
>- stringBuffer.append(genMemberType.getName());
>- stringBuffer.append(TEXT_313);
>- stringBuffer.append(genMemberType.getObjectType().getImportedInstanceClassName());
>- stringBuffer.append(TEXT_314);
>- stringBuffer.append(genMemberType.getPrimitiveValueFunction());
>- stringBuffer.append(TEXT_315);
>- } else {
>- stringBuffer.append(TEXT_316);
>- stringBuffer.append(genMemberType.getName());
>- stringBuffer.append(TEXT_317);
>- stringBuffer.append(genMemberType.getObjectType().getImportedBoundedWildcardInstanceClassName());
>- stringBuffer.append(TEXT_318);
>- }
>- } else {
>- stringBuffer.append(TEXT_319);
>- stringBuffer.append(genMemberType.getName());
> stringBuffer.append(TEXT_320);
>- stringBuffer.append(genMemberType.getQualifiedClassifierAccessor());
>+ stringBuffer.append(genMemberType.getName());
> stringBuffer.append(TEXT_321);
>- }
>- } else {
>- if (genMemberType.getGenPackage().isDataTypeConverters()) { genMemberType = genMemberType.getObjectType();
>+ } else if (genMemberType.isPrimitiveType() && genModel.getComplianceLevel().getValue() < GenJDKLevel.JDK50) {
> stringBuffer.append(TEXT_322);
>- stringBuffer.append(genMemberType.getGenPackage().getQualifiedEFactoryInternalInstanceAccessor());
>- stringBuffer.append(TEXT_323);
> stringBuffer.append(genMemberType.getName());
>+ stringBuffer.append(TEXT_323);
>+ stringBuffer.append(genMemberType.getObjectType().getImportedInstanceClassName());
> stringBuffer.append(TEXT_324);
>- stringBuffer.append(genMemberType.getObjectInstanceClassName());
>+ stringBuffer.append(genMemberType.getPrimitiveValueFunction());
> stringBuffer.append(TEXT_325);
> } else {
> stringBuffer.append(TEXT_326);
>- stringBuffer.append(genMemberType.getGenPackage().getQualifiedEFactoryInternalInstanceAccessor());
>+ stringBuffer.append(genMemberType.getName());
> stringBuffer.append(TEXT_327);
>- stringBuffer.append(genMemberType.getQualifiedClassifierAccessor());
>+ stringBuffer.append(genMemberType.getObjectType().getImportedBoundedWildcardInstanceClassName());
> stringBuffer.append(TEXT_328);
> }
>- }
>- stringBuffer.append(TEXT_329);
>- }
> } else {
>- for (GenDataType genMemberType : genDataType.getMemberTypes()) {
>+ stringBuffer.append(TEXT_329);
>+ stringBuffer.append(genMemberType.getName());
> stringBuffer.append(TEXT_330);
>- if (genMemberType.getGenPackage() == genPackage) {
>- if (genPackage.isDataTypeConverters()) {
>+ stringBuffer.append(genMemberType.getQualifiedClassifierAccessor());
> stringBuffer.append(TEXT_331);
>- stringBuffer.append(genMemberType.getName());
>- stringBuffer.append(TEXT_332);
>+ }
> } else {
>+ if (genMemberType.getGenPackage().isDataTypeConverters()) { genMemberType = genMemberType.getObjectType();
>+ stringBuffer.append(TEXT_332);
>+ stringBuffer.append(genMemberType.getGenPackage().getQualifiedEFactoryInternalInstanceAccessor());
> stringBuffer.append(TEXT_333);
> stringBuffer.append(genMemberType.getName());
> stringBuffer.append(TEXT_334);
>- stringBuffer.append(genMemberType.getQualifiedClassifierAccessor());
>+ stringBuffer.append(genMemberType.getObjectInstanceClassName());
> stringBuffer.append(TEXT_335);
>- if (genModel.getComplianceLevel().getValue() < GenJDKLevel.JDK50) {
>+ } else {
> stringBuffer.append(TEXT_336);
>- stringBuffer.append(genMemberType.getObjectInstanceClassName());
>+ stringBuffer.append(genMemberType.getGenPackage().getQualifiedEFactoryInternalInstanceAccessor());
> stringBuffer.append(TEXT_337);
>- } else {
>+ stringBuffer.append(genMemberType.getQualifiedClassifierAccessor());
> stringBuffer.append(TEXT_338);
> }
>+ }
> stringBuffer.append(TEXT_339);
> }
> } else {
>- if (genMemberType.getGenPackage().isDataTypeConverters()) {
>+ for (GenDataType genMemberType : genDataType.getMemberTypes()) {
> stringBuffer.append(TEXT_340);
>- stringBuffer.append(genMemberType.getGenPackage().getQualifiedEFactoryInternalInstanceAccessor());
>+ if (genMemberType.getGenPackage() == genPackage) {
>+ if (genPackage.isDataTypeConverters()) {
> stringBuffer.append(TEXT_341);
> stringBuffer.append(genMemberType.getName());
> stringBuffer.append(TEXT_342);
> } else {
> stringBuffer.append(TEXT_343);
>- stringBuffer.append(genMemberType.getGenPackage().getQualifiedEFactoryInternalInstanceAccessor());
>+ stringBuffer.append(genMemberType.getName());
> stringBuffer.append(TEXT_344);
> stringBuffer.append(genMemberType.getQualifiedClassifierAccessor());
> stringBuffer.append(TEXT_345);
>@@ -1281,222 +1305,276 @@
> }
> stringBuffer.append(TEXT_349);
> }
>- }
>+ } else {
>+ if (genMemberType.getGenPackage().isDataTypeConverters()) {
> stringBuffer.append(TEXT_350);
>- }
>- }
>+ stringBuffer.append(genMemberType.getGenPackage().getQualifiedEFactoryInternalInstanceAccessor());
> stringBuffer.append(TEXT_351);
>- stringBuffer.append(eDataType);
>+ stringBuffer.append(genMemberType.getName());
> stringBuffer.append(TEXT_352);
>- } else if (genModel.useGenerics() && (genDataType.isArrayType() || !genDataType.getEcoreDataType().getETypeParameters().isEmpty() || genDataType.getEcoreDataType().getInstanceTypeName().contains("<"))) {
>+ } else {
> stringBuffer.append(TEXT_353);
>- } else if (genDataType.isArrayType()) {
>+ stringBuffer.append(genMemberType.getGenPackage().getQualifiedEFactoryInternalInstanceAccessor());
> stringBuffer.append(TEXT_354);
>- stringBuffer.append(genModel.getImportedName("java.lang.UnsupportedOperationException"));
>+ stringBuffer.append(genMemberType.getQualifiedClassifierAccessor());
> stringBuffer.append(TEXT_355);
>- } else if (genDataType.isPrimitiveType() && genModel.getComplianceLevel().getValue() < GenJDKLevel.JDK50) {
>+ if (genModel.getComplianceLevel().getValue() < GenJDKLevel.JDK50) {
> stringBuffer.append(TEXT_356);
>- stringBuffer.append(eDataType);
>+ stringBuffer.append(genMemberType.getObjectInstanceClassName());
> stringBuffer.append(TEXT_357);
>- stringBuffer.append(genDataType.getObjectInstanceClassName());
>- stringBuffer.append(TEXT_358);
> } else {
>+ stringBuffer.append(TEXT_358);
>+ }
> stringBuffer.append(TEXT_359);
>- stringBuffer.append(eDataType);
>+ }
>+ }
> stringBuffer.append(TEXT_360);
> }
>- stringBuffer.append(TEXT_361);
> }
>+ stringBuffer.append(TEXT_361);
>+ stringBuffer.append(eDataType);
> stringBuffer.append(TEXT_362);
>- if (genModel.useGenerics() && genDataType.getItemType() != null && genPackage.isDataTypeConverters()) {
>+ } else if (genModel.useGenerics() && (genDataType.isArrayType() || !genDataType.getEcoreDataType().getETypeParameters().isEmpty() || genDataType.getEcoreDataType().getInstanceTypeName().contains("<"))) {
> stringBuffer.append(TEXT_363);
>- }
>+ } else if (genDataType.isArrayType()) {
> stringBuffer.append(TEXT_364);
>- stringBuffer.append(genDataType.getName());
>+ stringBuffer.append(genModel.getImportedName("java.lang.UnsupportedOperationException"));
> stringBuffer.append(TEXT_365);
>- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EDataType"));
>+ } else if (genDataType.isPrimitiveType() && genModel.getComplianceLevel().getValue() < GenJDKLevel.JDK50) {
> stringBuffer.append(TEXT_366);
>- if (genDataType instanceof GenEnum) {
>+ stringBuffer.append(eDataType);
> stringBuffer.append(TEXT_367);
>- } else if (genDataType.getBaseType() != null) { GenDataType genBaseType = genDataType.getBaseType(); 
>- if (genBaseType.getGenPackage() == genPackage) {
>+ stringBuffer.append(genDataType.getObjectInstanceClassName());
> stringBuffer.append(TEXT_368);
>- stringBuffer.append(genBaseType.getName());
>+ } else {
> stringBuffer.append(TEXT_369);
>- stringBuffer.append(genBaseType.getQualifiedClassifierAccessor());
>+ stringBuffer.append(eDataType);
> stringBuffer.append(TEXT_370);
>- } else {
>+ }
> stringBuffer.append(TEXT_371);
>- stringBuffer.append(genBaseType.getGenPackage().getQualifiedEFactoryInternalInstanceAccessor());
>+ }
> stringBuffer.append(TEXT_372);
>- stringBuffer.append(genBaseType.getQualifiedClassifierAccessor());
>+ if (genModel.useGenerics() && (genDataType.getItemType() != null || genDataType.isUncheckedCast()) && (genPackage.isDataTypeConverters() || genDataType.hasCreatorBody())) {
> stringBuffer.append(TEXT_373);
> }
>- } else if (genDataType.getItemType() != null) { GenDataType genItemType = genDataType.getItemType(); 
>- if (genPackage.isDataTypeConverters()) {
> stringBuffer.append(TEXT_374);
> stringBuffer.append(genDataType.getName());
> stringBuffer.append(TEXT_375);
>- stringBuffer.append(genDataType.getImportedBoundedWildcardInstanceClassName());
>+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EDataType"));
> stringBuffer.append(TEXT_376);
>- } else { final String singleWildcard = genModel.useGenerics() ? "<?>" : "";
>+ if (genDataType instanceof GenEnum) {
>+ if (genPackage.isDataTypeConverters() || genDataType.hasConverterBody()) {
> stringBuffer.append(TEXT_377);
>+ stringBuffer.append(genDataType.getName());
>+ stringBuffer.append(TEXT_378);
>+ stringBuffer.append(genDataType.getImportedInstanceClassName());
>+ stringBuffer.append(TEXT_379);
>+ } else {
>+ stringBuffer.append(TEXT_380);
>+ }
>+ } else if (genDataType.getBaseType() != null) { GenDataType genBaseType = genDataType.getBaseType(); 
>+ if (genBaseType.getGenPackage() == genPackage) {
>+ stringBuffer.append(TEXT_381);
>+ stringBuffer.append(genBaseType.getName());
>+ stringBuffer.append(TEXT_382);
>+ stringBuffer.append(genBaseType.getQualifiedClassifierAccessor());
>+ stringBuffer.append(TEXT_383);
>+ } else {
>+ stringBuffer.append(TEXT_384);
>+ stringBuffer.append(genBaseType.getGenPackage().getQualifiedEFactoryInternalInstanceAccessor());
>+ stringBuffer.append(TEXT_385);
>+ stringBuffer.append(genBaseType.getQualifiedClassifierAccessor());
>+ stringBuffer.append(TEXT_386);
>+ }
>+ } else if (genDataType.getItemType() != null) { GenDataType genItemType = genDataType.getItemType(); 
>+ if (genPackage.isDataTypeConverters() || genDataType.hasCreatorBody()) {
>+ stringBuffer.append(TEXT_387);
>+ stringBuffer.append(genDataType.getName());
>+ stringBuffer.append(TEXT_388);
>+ stringBuffer.append(genDataType.getImportedBoundedWildcardInstanceClassName());
>+ stringBuffer.append(TEXT_389);
>+ } else { final String singleWildcard = genModel.useGenerics() ? "<?>" : "";
>+ stringBuffer.append(TEXT_390);
> stringBuffer.append(genModel.getImportedName("java.util.List"));
> stringBuffer.append(singleWildcard);
>- stringBuffer.append(TEXT_378);
>+ stringBuffer.append(TEXT_391);
> stringBuffer.append(genModel.getImportedName("java.util.List"));
> stringBuffer.append(singleWildcard);
>- stringBuffer.append(TEXT_379);
>+ stringBuffer.append(TEXT_392);
> stringBuffer.append(genModel.getImportedName("java.lang.StringBuffer"));
>- stringBuffer.append(TEXT_380);
>+ stringBuffer.append(TEXT_393);
> stringBuffer.append(genModel.getImportedName("java.lang.StringBuffer"));
>- stringBuffer.append(TEXT_381);
>+ stringBuffer.append(TEXT_394);
> String item; if (!genModel.useGenerics()) { item = "i.next()"; 
>- stringBuffer.append(TEXT_382);
>+ stringBuffer.append(TEXT_395);
> stringBuffer.append(genModel.getImportedName("java.util.Iterator"));
>- stringBuffer.append(TEXT_383);
>+ stringBuffer.append(TEXT_396);
> } else { item = "item";
>- stringBuffer.append(TEXT_384);
>+ stringBuffer.append(TEXT_397);
> stringBuffer.append(genModel.getImportedName("java.lang.Object"));
>- stringBuffer.append(TEXT_385);
>+ stringBuffer.append(TEXT_398);
> }
>- stringBuffer.append(TEXT_386);
>+ stringBuffer.append(TEXT_399);
> if (genItemType.getGenPackage() == genPackage) {
>- stringBuffer.append(TEXT_387);
>+ stringBuffer.append(TEXT_400);
> stringBuffer.append(genItemType.getName());
>- stringBuffer.append(TEXT_388);
>+ stringBuffer.append(TEXT_401);
> stringBuffer.append(genItemType.getQualifiedClassifierAccessor());
>- stringBuffer.append(TEXT_389);
>+ stringBuffer.append(TEXT_402);
> stringBuffer.append(item);
>- stringBuffer.append(TEXT_390);
>+ stringBuffer.append(TEXT_403);
> } else {
>- stringBuffer.append(TEXT_391);
>+ stringBuffer.append(TEXT_404);
> stringBuffer.append(genItemType.getGenPackage().getQualifiedEFactoryInternalInstanceAccessor());
>- stringBuffer.append(TEXT_392);
>+ stringBuffer.append(TEXT_405);
> stringBuffer.append(genItemType.getQualifiedClassifierAccessor());
>- stringBuffer.append(TEXT_393);
>+ stringBuffer.append(TEXT_406);
> stringBuffer.append(item);
>- stringBuffer.append(TEXT_394);
>+ stringBuffer.append(TEXT_407);
> }
>- stringBuffer.append(TEXT_395);
>+ stringBuffer.append(TEXT_408);
> }
> } else if (!genDataType.getMemberTypes().isEmpty()) {
>- if (genPackage.isDataTypeConverters()) {
>+ if (genPackage.isDataTypeConverters() || genDataType.hasConverterBody()) {
> if (genDataType.isPrimitiveType()) {
>- stringBuffer.append(TEXT_396);
>+ stringBuffer.append(TEXT_409);
> stringBuffer.append(genDataType.getName());
>- stringBuffer.append(TEXT_397);
>+ stringBuffer.append(TEXT_410);
> stringBuffer.append(genDataType.getObjectInstanceClassName());
>- stringBuffer.append(TEXT_398);
>+ stringBuffer.append(TEXT_411);
> if (genModel.getComplianceLevel().getValue() < GenJDKLevel.JDK50) {
>- stringBuffer.append(TEXT_399);
>+ stringBuffer.append(TEXT_412);
> stringBuffer.append(genDataType.getPrimitiveValueFunction());
>- stringBuffer.append(TEXT_400);
>+ stringBuffer.append(TEXT_413);
> }
>- stringBuffer.append(TEXT_401);
>+ stringBuffer.append(TEXT_414);
> } else {
>- stringBuffer.append(TEXT_402);
>+ stringBuffer.append(TEXT_415);
> stringBuffer.append(genDataType.getName());
>- stringBuffer.append(TEXT_403);
>+ stringBuffer.append(TEXT_416);
> }
> } else {
>- stringBuffer.append(TEXT_404);
>+ stringBuffer.append(TEXT_417);
> for (GenDataType genMemberType : genDataType.getMemberTypes()) {
>- stringBuffer.append(TEXT_405);
>+ stringBuffer.append(TEXT_418);
> stringBuffer.append(genMemberType.getQualifiedClassifierAccessor());
>- stringBuffer.append(TEXT_406);
>+ stringBuffer.append(TEXT_419);
> if (genMemberType.getGenPackage() == genPackage) {
>- stringBuffer.append(TEXT_407);
>+ stringBuffer.append(TEXT_420);
> stringBuffer.append(genMemberType.getName());
>- stringBuffer.append(TEXT_408);
>+ stringBuffer.append(TEXT_421);
> stringBuffer.append(genMemberType.getQualifiedClassifierAccessor());
>- stringBuffer.append(TEXT_409);
>+ stringBuffer.append(TEXT_422);
> } else {
>- stringBuffer.append(TEXT_410);
>+ stringBuffer.append(TEXT_423);
> stringBuffer.append(genMemberType.getGenPackage().getQualifiedEFactoryInternalInstanceAccessor());
>- stringBuffer.append(TEXT_411);
>+ stringBuffer.append(TEXT_424);
> stringBuffer.append(genMemberType.getQualifiedClassifierAccessor());
>- stringBuffer.append(TEXT_412);
>+ stringBuffer.append(TEXT_425);
> }
>- stringBuffer.append(TEXT_413);
>+ stringBuffer.append(TEXT_426);
> }
>- stringBuffer.append(TEXT_414);
>+ stringBuffer.append(TEXT_427);
>+ }
>+ } else if (genPackage.isDataTypeConverters() || genDataType.hasConverterBody()) {
>+ if (genDataType.isPrimitiveType()) {
>+ stringBuffer.append(TEXT_428);
>+ stringBuffer.append(genDataType.getName());
>+ stringBuffer.append(TEXT_429);
>+ if (genModel.getComplianceLevel().getValue() < GenJDKLevel.JDK50) {
>+ stringBuffer.append(TEXT_430);
>+ }
>+ stringBuffer.append(TEXT_431);
>+ stringBuffer.append(genDataType.getObjectInstanceClassName());
>+ stringBuffer.append(TEXT_432);
>+ if (genModel.getComplianceLevel().getValue() < GenJDKLevel.JDK50) {
>+ stringBuffer.append(TEXT_433);
>+ stringBuffer.append(genDataType.getPrimitiveValueFunction());
>+ stringBuffer.append(TEXT_434);
>+ }
>+ stringBuffer.append(TEXT_435);
>+ } else {
>+ stringBuffer.append(TEXT_436);
>+ stringBuffer.append(genDataType.getName());
>+ stringBuffer.append(TEXT_437);
>+ stringBuffer.append(genDataType.getImportedBoundedWildcardInstanceClassName());
>+ stringBuffer.append(TEXT_438);
> }
> } else if (genModel.useGenerics() && (genDataType.isArrayType() || !genDataType.getEcoreDataType().getETypeParameters().isEmpty() || genDataType.getEcoreDataType().getInstanceTypeName().contains("<"))) {
>- stringBuffer.append(TEXT_415);
>+ stringBuffer.append(TEXT_439);
> } else if (genDataType.isArrayType()) {
>- stringBuffer.append(TEXT_416);
>+ stringBuffer.append(TEXT_440);
> stringBuffer.append(genModel.getImportedName("java.lang.UnsupportedOperationException"));
>- stringBuffer.append(TEXT_417);
>+ stringBuffer.append(TEXT_441);
> } else {
>- stringBuffer.append(TEXT_418);
>+ stringBuffer.append(TEXT_442);
> }
>- stringBuffer.append(TEXT_419);
>+ stringBuffer.append(TEXT_443);
> }
> }
> } else {
> for (GenClass genClass : genPackage.getGenClasses()) {
> if (genClass.hasFactoryInterfaceCreateMethod()) {
>- stringBuffer.append(TEXT_420);
>+ stringBuffer.append(TEXT_444);
> stringBuffer.append(genClass.getFormattedName());
>- stringBuffer.append(TEXT_421);
>+ stringBuffer.append(TEXT_445);
> stringBuffer.append(genClass.getFormattedName());
>- stringBuffer.append(TEXT_422);
>+ stringBuffer.append(TEXT_446);
> stringBuffer.append(genClass.getTypeParameters());
> stringBuffer.append(genClass.getImportedInterfaceName());
> stringBuffer.append(genClass.getInterfaceTypeArguments());
>- stringBuffer.append(TEXT_423);
>+ stringBuffer.append(TEXT_447);
> stringBuffer.append(genClass.getName());
>- stringBuffer.append(TEXT_424);
>+ stringBuffer.append(TEXT_448);
> }
> }
> if (genPackage.isDataTypeConverters()) {
> for (GenDataType genDataType : genPackage.getAllGenDataTypes()) {
> if (genDataType.isSerializable()) {
>- stringBuffer.append(TEXT_425);
>+ stringBuffer.append(TEXT_449);
> stringBuffer.append(genDataType.getFormattedName());
>- stringBuffer.append(TEXT_426);
>+ stringBuffer.append(TEXT_450);
> stringBuffer.append(genDataType.getImportedParameterizedInstanceClassName());
>- stringBuffer.append(TEXT_427);
>+ stringBuffer.append(TEXT_451);
> stringBuffer.append(genDataType.getName());
>- stringBuffer.append(TEXT_428);
>+ stringBuffer.append(TEXT_452);
> stringBuffer.append(genDataType.getFormattedName());
>- stringBuffer.append(TEXT_429);
>+ stringBuffer.append(TEXT_453);
> stringBuffer.append(genDataType.getName());
>- stringBuffer.append(TEXT_430);
>+ stringBuffer.append(TEXT_454);
> stringBuffer.append(genDataType.getImportedBoundedWildcardInstanceClassName());
>- stringBuffer.append(TEXT_431);
>+ stringBuffer.append(TEXT_455);
> }
> }
> }
> }
> if (!isImplementation && !genModel.isSuppressEMFMetaData()) {
>- stringBuffer.append(TEXT_432);
>+ stringBuffer.append(TEXT_456);
> stringBuffer.append(genPackage.getPackageInterfaceName());
>- stringBuffer.append(TEXT_433);
>+ stringBuffer.append(TEXT_457);
> stringBuffer.append(genPackage.getBasicPackageName());
>- stringBuffer.append(TEXT_434);
>+ stringBuffer.append(TEXT_458);
> } else if (isImplementation) {
>- stringBuffer.append(TEXT_435);
>+ stringBuffer.append(TEXT_459);
> stringBuffer.append(genPackage.getImportedPackageInterfaceName());
>- stringBuffer.append(TEXT_436);
>+ stringBuffer.append(TEXT_460);
> stringBuffer.append(genPackage.getBasicPackageName());
>- stringBuffer.append(TEXT_437);
>+ stringBuffer.append(TEXT_461);
> stringBuffer.append(genPackage.getImportedPackageInterfaceName());
>- stringBuffer.append(TEXT_438);
>+ stringBuffer.append(TEXT_462);
> if (genModel.useClassOverrideAnnotation()) {
>- stringBuffer.append(TEXT_439);
>+ stringBuffer.append(TEXT_463);
> }
>- stringBuffer.append(TEXT_440);
>+ stringBuffer.append(TEXT_464);
> stringBuffer.append(genPackage.getImportedPackageInterfaceName());
>- stringBuffer.append(TEXT_441);
>+ stringBuffer.append(TEXT_465);
> stringBuffer.append(genPackage.getImportedPackageInterfaceName());
>- stringBuffer.append(TEXT_442);
>+ stringBuffer.append(TEXT_466);
> }
>- stringBuffer.append(TEXT_443);
>+ stringBuffer.append(TEXT_467);
> stringBuffer.append(isInterface ? genPackage.getFactoryInterfaceName() : genPackage.getFactoryClassName());
> genModel.emitSortedImports();
>- stringBuffer.append(TEXT_444);
>+ stringBuffer.append(TEXT_468);
> return stringBuffer.toString();
> }
> }
>Index: templates/model/Class.javajet
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/plugins/org.eclipse.emf.codegen.ecore/templates/model/Class.javajet,v
>retrieving revision 1.93
>diff -u -r1.93 Class.javajet
>--- templates/model/Class.javajet	29 Aug 2011 20:16:46 -0000	1.93
>+++ templates/model/Class.javajet	19 Oct 2011 13:00:34 -0000
>@@ -722,6 +722,8 @@
> <%}%>
> <%} else if (genClass.getGetAccessorOperation(genFeature) != null) {%>
> 		<%=genClass.getGetAccessorOperation(genFeature).getBody(genModel.getIndentation(stringBuffer))%>
>+ <%} else if (genFeature.hasGetterBody()) {%>
>+		<%=genFeature.getGetterBody(genModel.getIndentation(stringBuffer))%>
> <%} else {%>
> <%@ include file="Class/getGenFeature.TODO.override.javajetinc" fail="alternative" %>
> <%@ start %>
>Index: templates/model/FactoryClass.javajet
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/plugins/org.eclipse.emf.codegen.ecore/templates/model/FactoryClass.javajet,v
>retrieving revision 1.38
>diff -u -r1.38 FactoryClass.javajet
>--- templates/model/FactoryClass.javajet	25 Jan 2011 19:10:42 -0000	1.38
>+++ templates/model/FactoryClass.javajet	19 Oct 2011 13:00:34 -0000
>@@ -224,18 +224,20 @@
> <%}%>
> <%for (GenDataType genDataType : genPackage.getAllGenDataTypes()) {%>
> <%if (genDataType.isSerializable()) {%>
>-<%if (genPackage.isDataTypeConverters()) { String eDataType = genDataType.getQualifiedClassifierAccessor();%>
>+<%if (genPackage.isDataTypeConverters() || genDataType.hasCreatorBody()) { String eDataType = genDataType.getQualifiedClassifierAccessor();%>
> 	/**
> 	 * 
> 	 * 
> 	 * @generated
> 	 */
>- <%if (genModel.useGenerics() && genDataType.isUncheckedCast()) {%>
>+ <%if (genModel.useGenerics() && genDataType.isUncheckedCast() && !genDataType.hasCreatorBody()) {%>
> 	@SuppressWarnings("unchecked")
> <%}%>
>-	public <%=genDataType.getImportedParameterizedInstanceClassName()%> create<%=genDataType.getName()%>(String literal)
>+	public <%=genDataType.getImportedParameterizedInstanceClassName()%> create<%=genDataType.getName()%>(String <%if (genDataType.hasCreatorBody()) {%>it<%} else {%>literal<%}%>)
> 	{
>- <%if (genDataType instanceof GenEnum) {%>
>+ <%if (genDataType.hasCreatorBody()) {%>
>+		<%=genDataType.getCreatorBody(genModel.getIndentation(stringBuffer))%>
>+ <%} else if (genDataType instanceof GenEnum) {%>
> 		<%=genDataType.getImportedInstanceClassName()%> result = <%=genDataType.getImportedInstanceClassName()%>.get(literal);
> 		if (result == null) throw new IllegalArgumentException("The value '" + literal + "' is not a valid enumerator of '" + <%=eDataType%>.getName() + "'");<%=genModel.getNonNLS()%><%=genModel.getNonNLS(2)%><%=genModel.getNonNLS(3)%>
> 		return result;
>@@ -334,13 +336,13 @@
> 	 * 
> 	 * @generated
> 	 */
>- <%if (genModel.useGenerics() && genDataType.isUncheckedCast()) {%>
>+ <%if (!genPackage.isDataTypeConverters() && genModel.useGenerics() && genDataType.isUncheckedCast() && !genDataType.hasCreatorBody()) {%>
> 	@SuppressWarnings("unchecked")
> <%}%>
> 	public <%=genDataType.getImportedParameterizedObjectInstanceClassName()%> create<%=genDataType.getName()%>FromString(<%=genModel.getImportedName("org.eclipse.emf.ecore.EDataType")%> eDataType, String initialValue)
> 	{
> <%if (genDataType instanceof GenEnum) {%>
>- <%if (genPackage.isDataTypeConverters()) {%>
>+ <%if (genPackage.isDataTypeConverters() || genDataType.hasCreatorBody()) {%>
> 		return create<%=genDataType.getName()%>(initialValue);
> <%} else {%>
> 		<%=((GenEnum)genDataType).getImportedInstanceClassName()%> result = <%=((GenEnum)genDataType).getImportedInstanceClassName()%>.get(initialValue);
>@@ -409,6 +411,8 @@
> 
> 		throw exception;
> <%}%>
>+ <%} else if (genPackage.isDataTypeConverters() || genDataType.hasCreatorBody()) {%>
>+		return create<%=genDataType.getName()%>(initialValue);
> <%} else if (genModel.useGenerics() && (genDataType.isArrayType() || !genDataType.getEcoreDataType().getETypeParameters().isEmpty() || genDataType.getEcoreDataType().getInstanceTypeName().contains("<"))) {%>
> 		return <%if (!genDataType.isObjectType()) {%>(<%=genDataType.getImportedParameterizedObjectInstanceClassName()%>)<%}%>super.createFromString(initialValue);
> <%} else if (genDataType.isArrayType()) {%>
>@@ -420,15 +424,17 @@
> <%}%>
> 	}
> 
>-<%if (genPackage.isDataTypeConverters()) { String eDataType = genDataType.getQualifiedClassifierAccessor();%>
>+<%if (genPackage.isDataTypeConverters() || genDataType.hasConverterBody()) { String eDataType = genDataType.getQualifiedClassifierAccessor();%>
> 	/**
> 	 * 
> 	 * 
> 	 * @generated
> 	 */
>-	public String convert<%=genDataType.getName()%>(<%=genDataType.getImportedBoundedWildcardInstanceClassName()%> instanceValue)
>+	public String convert<%=genDataType.getName()%>(<%=genDataType.getImportedBoundedWildcardInstanceClassName()%> <%if (genDataType.hasConverterBody()) {%>it<%} else {%>instanceValue<%}%>)
> 	{
>- <%if (genDataType instanceof GenEnum) {%>
>+ <%if (genDataType.hasConverterBody()) {%>
>+		<%=genDataType.getConverterBody(genModel.getIndentation(stringBuffer))%>
>+ <%} else if (genDataType instanceof GenEnum) {%>
> 		return instanceValue == null ? null : instanceValue.toString();
> <%} else if (genDataType.getBaseType() != null) { GenDataType genBaseType = genDataType.getBaseType(); boolean isPrimitiveConversion = !genDataType.isPrimitiveType() && genBaseType.isPrimitiveType();%>
> <%if (genBaseType.getGenPackage() == genPackage) {%>
>@@ -548,13 +554,17 @@
> 	 * 
> 	 * @generated
> 	 */
>- <%if (genModel.useGenerics() && genDataType.getItemType() != null && genPackage.isDataTypeConverters()) {%>
>+ <%if (genModel.useGenerics() && (genDataType.getItemType() != null || genDataType.isUncheckedCast()) && (genPackage.isDataTypeConverters() || genDataType.hasCreatorBody())) {%>
> 	@SuppressWarnings("unchecked")
> <%}%>
> 	public String convert<%=genDataType.getName()%>ToString(<%=genModel.getImportedName("org.eclipse.emf.ecore.EDataType")%> eDataType, Object instanceValue)
> 	{
> <%if (genDataType instanceof GenEnum) {%>
>+ <%if (genPackage.isDataTypeConverters() || genDataType.hasConverterBody()) {%>
>+		return convert<%=genDataType.getName()%>((<%=genDataType.getImportedInstanceClassName()%>)instanceValue);
>+ <%} else {%>
> 		return instanceValue == null ? null : instanceValue.toString();
>+ <%}%>
> <%} else if (genDataType.getBaseType() != null) { GenDataType genBaseType = genDataType.getBaseType(); %>
> <%if (genBaseType.getGenPackage() == genPackage) {%>
> 		return convert<%=genBaseType.getName()%>ToString(<%=genBaseType.getQualifiedClassifierAccessor()%>, instanceValue);
>@@ -562,7 +572,7 @@
> 		return <%=genBaseType.getGenPackage().getQualifiedEFactoryInternalInstanceAccessor()%>.convertToString(<%=genBaseType.getQualifiedClassifierAccessor()%>, instanceValue);
> <%}%>
> <%} else if (genDataType.getItemType() != null) { GenDataType genItemType = genDataType.getItemType(); %>
>- <%if (genPackage.isDataTypeConverters()) {%>
>+ <%if (genPackage.isDataTypeConverters() || genDataType.hasCreatorBody()) {%>
> 		return convert<%=genDataType.getName()%>((<%=genDataType.getImportedBoundedWildcardInstanceClassName()%>)instanceValue);
> <%} else { final String singleWildcard = genModel.useGenerics() ? "<?>" : "";%>
> 		if (instanceValue == null) return null;
>@@ -585,7 +595,7 @@
> 		return result.substring(0, result.length() - 1);
> <%}%>
> <%} else if (!genDataType.getMemberTypes().isEmpty()) {%>
>- <%if (genPackage.isDataTypeConverters()) {%>
>+ <%if (genPackage.isDataTypeConverters() || genDataType.hasConverterBody()) {%>
> <%if (genDataType.isPrimitiveType()) {%>
> 		return instanceValue == null ? null : convert<%=genDataType.getName()%>(((<%=genDataType.getObjectInstanceClassName()%>)instanceValue)<%if (genModel.getComplianceLevel().getValue() < GenJDKLevel.JDK50) {%>.<%=genDataType.getPrimitiveValueFunction()%>()<%}%>);
> <%} else {%>
>@@ -613,6 +623,12 @@
> <%}%>
> 		throw new IllegalArgumentException("Invalid value: '"+instanceValue+"' for datatype :"+eDataType.getName());
> <%}%>
>+ <%} else if (genPackage.isDataTypeConverters() || genDataType.hasConverterBody()) {%>
>+ <%if (genDataType.isPrimitiveType()) {%>
>+		return instanceValue == null ? null : convert<%=genDataType.getName()%>(<%if (genModel.getComplianceLevel().getValue() < GenJDKLevel.JDK50) {%>(<%}%>(<%=genDataType.getObjectInstanceClassName()%>)instanceValue<%if (genModel.getComplianceLevel().getValue() < GenJDKLevel.JDK50) {%>).<%=genDataType.getPrimitiveValueFunction()%>()<%}%>);
>+ <%} else {%>
>+		return convert<%=genDataType.getName()%>((<%=genDataType.getImportedBoundedWildcardInstanceClassName()%>)instanceValue);
>+ <%}%>
> <%} else if (genModel.useGenerics() && (genDataType.isArrayType() || !genDataType.getEcoreDataType().getETypeParameters().isEmpty() || genDataType.getEcoreDataType().getInstanceTypeName().contains("<"))) {%>
> 		return super.convertToString(instanceValue);
> <%} else if (genDataType.isArrayType()) {%>
>#P org.eclipse.emf.codegen.ecore.ui
>Index: src/org/eclipse/emf/codegen/ecore/ui/EmptyProjectWizard.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/ui/EmptyProjectWizard.java,v
>retrieving revision 1.9
>diff -u -r1.9 EmptyProjectWizard.java
>--- src/org/eclipse/emf/codegen/ecore/ui/EmptyProjectWizard.java	30 Apr 2009 16:03:13 -0000	1.9
>+++ src/org/eclipse/emf/codegen/ecore/ui/EmptyProjectWizard.java	19 Oct 2011 13:00:38 -0000
>@@ -16,10 +16,13 @@
> */
> package org.eclipse.emf.codegen.ecore.ui;
> 
>+import java.io.IOException;
> import java.io.PrintStream;
>+import java.io.UnsupportedEncodingException;
> import java.util.Collections;
> 
> import org.eclipse.core.resources.IProject;
>+import org.eclipse.core.runtime.CoreException;
> import org.eclipse.core.runtime.IPath;
> import org.eclipse.core.runtime.IProgressMonitor;
> import org.eclipse.core.runtime.Path;
>@@ -28,10 +31,12 @@
> import org.eclipse.jface.viewers.IStructuredSelection;
> import org.eclipse.jface.viewers.StructuredSelection;
> import org.eclipse.jface.wizard.Wizard;
>+import org.eclipse.swt.widgets.Composite;
> import org.eclipse.ui.INewWizard;
> import org.eclipse.ui.IWorkbench;
> import org.eclipse.ui.IWorkbenchPage;
> import org.eclipse.ui.IWorkbenchPart;
>+import org.eclipse.ui.IWorkingSet;
> import org.eclipse.ui.actions.WorkspaceModifyOperation;
> import org.eclipse.ui.dialogs.WizardNewProjectCreationPage;
> import org.eclipse.ui.part.ISetSelectionTarget;
>@@ -54,10 +59,13 @@
> protected IPath genModelContainerPath;
> protected IProject project;
> protected String initialProjectName;
>+ protected IStructuredSelection selection;
>+ protected WizardNewProjectCreationPage newProjectCreationPage;
> 
> public void init(IWorkbench workbench, IStructuredSelection selection)
> {
> this.workbench = workbench;
>+ this.selection = selection;
> setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(GenModelEditPlugin.INSTANCE.getImage("full/wizban/NewEmptyEMFProject")));
> setWindowTitle(GenModelEditPlugin.INSTANCE.getString("_UI_NewEmptyProject_title"));
> }
>@@ -65,7 +73,7 @@
> @Override
> public void addPages()
> {
>- WizardNewProjectCreationPage newProjectCreationPage = new WizardNewProjectCreationPage("NewProjectCreationPage")
>+ newProjectCreationPage = new WizardNewProjectCreationPage("NewProjectCreationPage")
> {
> @Override
> protected boolean validatePage()
>@@ -83,6 +91,16 @@
> return false;
> }
> }
>+ 
>+ @Override
>+ public void createControl(Composite parent)
>+ {
>+ super.createControl(parent);
>+ createWorkingSetGroup
>+ ((Composite) getControl(), 
>+ selection, 
>+ new String[] { "org.eclipse.jdt.ui.JavaWorkingSetPage", "org.eclipse.pde.ui.pluginWorkingSet", "org.eclipse.ui.resourceWorkingSetPage"});
>+ }
> };
> 
> newProjectCreationPage.setInitialProjectName(initialProjectName);
>@@ -90,8 +108,6 @@
> newProjectCreationPage.setDescription(GenModelEditPlugin.INSTANCE.getString("_UI_EmptyProject_description"));
> addPage(newProjectCreationPage);
> }
>- 
>- 
> 
> @Override
> public boolean performFinish()
>@@ -103,30 +119,7 @@
> {
> try
> {
>- project = Generator.createEMFProject(
>- new Path(genModelContainerPath.toString()),
>- genModelProjectLocation,
>- Collections.<IProject>emptyList(),
>- progressMonitor,
>- Generator.EMF_MODEL_PROJECT_STYLE | Generator.EMF_PLUGIN_PROJECT_STYLE);
>-
>- CodeGenUtil.EclipseUtil.findOrCreateContainer
>- (new Path("/" + genModelContainerPath.segment(0) + "/model"), true, genModelProjectLocation, progressMonitor);
>-
>- PrintStream manifest = 
>- new PrintStream
>- (URIConverter.INSTANCE.createOutputStream
>- (URI.createPlatformResourceURI("/" + genModelContainerPath.segment(0) + "/META-INF/MANIFEST.MF", true), null),
>- false, "UTF-8");
>- manifest.println("Manifest-Version: 1.0");
>- manifest.println("Bundle-ManifestVersion: 2");
>- manifest.print("Bundle-Name: ");
>- manifest.println(genModelContainerPath.segment(0));
>- manifest.print("Bundle-SymbolicName: ");
>- manifest.println(CodeGenUtil.validPluginID(genModelContainerPath.segment(0)));
>- manifest.println("Bundle-Version: 0.1.0");
>- manifest.println("Require-Bundle: org.eclipse.emf.ecore");
>- manifest.close();
>+ modifyWorkspace(progressMonitor);
> }
> catch (Exception exception)
> {
>@@ -169,8 +162,62 @@
> return true;
> }
> 
>+ public void modifyWorkspace(IProgressMonitor progressMonitor) throws CoreException, UnsupportedEncodingException, IOException
>+ {
>+ project = Generator.createEMFProject(
>+ new Path(genModelContainerPath.toString()),
>+ genModelProjectLocation,
>+ Collections.<IProject>emptyList(),
>+ progressMonitor,
>+ Generator.EMF_MODEL_PROJECT_STYLE | Generator.EMF_PLUGIN_PROJECT_STYLE);
>+ 
>+ IWorkingSet[] workingSets = newProjectCreationPage.getSelectedWorkingSets();
>+ if (workingSets != null)
>+ {
>+ workbench.getWorkingSetManager().addToWorkingSets(project, workingSets);
>+ }
>+ 
>+ CodeGenUtil.EclipseUtil.findOrCreateContainer
>+ (new Path("/" + genModelContainerPath.segment(0) + "/model"), true, genModelProjectLocation, progressMonitor);
>+ 
>+ PrintStream manifest = 
>+ new PrintStream
>+ (URIConverter.INSTANCE.createOutputStream
>+ (URI.createPlatformResourceURI("/" + genModelContainerPath.segment(0) + "/META-INF/MANIFEST.MF", true), null),
>+ false, "UTF-8");
>+ manifest.println("Manifest-Version: 1.0");
>+ manifest.println("Bundle-ManifestVersion: 2");
>+ manifest.print("Bundle-Name: ");
>+ manifest.println(genModelContainerPath.segment(0));
>+ manifest.print("Bundle-SymbolicName: ");
>+ manifest.println(CodeGenUtil.validPluginID(genModelContainerPath.segment(0)));
>+ manifest.println("Bundle-Version: 0.1.0");
>+ manifest.print("Require-Bundle: ");
>+ String[] requiredBundles = getRequiredBundles();
>+ for (int i = 0, size = requiredBundles.length; i < size; )
>+ {
>+ manifest.print(requiredBundles[i]);
>+ if (++i == size)
>+ {
>+ manifest.println();
>+ break;
>+ }
>+ else
>+ {
>+ manifest.println(",");
>+ manifest.print(" ");
>+ }
>+ }
>+ manifest.close();
>+ }
>+
> public void setInitialProjectName(String value)
> {
> initialProjectName = value;
> }
>+ 
>+ protected String[] getRequiredBundles()
>+ {
>+ return new String [] { "org.eclipse.emf.ecore" };
>+ }
> }
>#P org.eclipse.emf.common
>Index: src/org/eclipse/emf/common/util/BasicEMap.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/plugins/org.eclipse.emf.common/src/org/eclipse/emf/common/util/BasicEMap.java,v
>retrieving revision 1.11
>diff -u -r1.11 BasicEMap.java
>--- src/org/eclipse/emf/common/util/BasicEMap.java	5 Nov 2010 12:17:13 -0000	1.11
>+++ src/org/eclipse/emf/common/util/BasicEMap.java	19 Oct 2011 13:00:39 -0000
>@@ -1294,6 +1294,10 @@
> 
> expectedModCount = BasicEMap.this.modCount;
> lastEntryCursor = -1;
>+ if (cursor == lastCursor && entryCursor != -1)
>+ {
>+ --entryCursor;
>+ }
> }
> }
> 
>#P org.eclipse.emf.ecore
>Index: .project
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/plugins/org.eclipse.emf.ecore/.project,v
>retrieving revision 1.3
>diff -u -r1.3 .project
>--- .project	24 Oct 2005 17:47:10 -0000	1.3
>+++ .project	19 Oct 2011 13:00:40 -0000
>@@ -20,9 +20,15 @@
> 			<arguments>
> 			</arguments>
> 		</buildCommand>
>+		<buildCommand>
>+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
>+			<arguments>
>+			</arguments>
>+		</buildCommand>
> 	</buildSpec>
> 	<natures>
> 		<nature>org.eclipse.jdt.core.javanature</nature>
> 		<nature>org.eclipse.pde.PluginNature</nature>
>+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
> 	</natures>
> </projectDescription>
>Index: plugin.properties
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/plugins/org.eclipse.emf.ecore/plugin.properties,v
>retrieving revision 1.41
>diff -u -r1.41 plugin.properties
>--- plugin.properties	3 Dec 2010 01:23:45 -0000	1.41
>+++ plugin.properties	19 Oct 2011 13:00:40 -0000
>@@ -122,6 +122,7 @@
> _UI_SettingDelegateRegistry_extensionpoint = Feature Setting Delegate Factory Registry
> _UI_InvocationDelegateRegistry_extensionpoint = Operation Invocation Delegate Factory Registry
> _UI_QueryDelegateRegistry_extensionpoint = Query Delegate Factory Registry
>+_UI_ConversionDelegateRegistry_extensionpoint = Conversion Delegate Factory Registry
> 
> _UI_GenericInvariant_diagnostic = The ''{0}'' invariant is violated on ''{1}''
> _UI_GenericConstraint_diagnostic = The ''{0}'' constraint is violated on ''{1}''
>Index: plugin.xml
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/plugins/org.eclipse.emf.ecore/plugin.xml,v
>retrieving revision 1.26
>diff -u -r1.26 plugin.xml
>--- plugin.xml	3 Dec 2010 01:23:45 -0000	1.26
>+++ plugin.xml	19 Oct 2011 13:00:40 -0000
>@@ -14,6 +14,7 @@
> <extension-point id="setting_delegate" name="%_UI_SettingDelegateRegistry_extensionpoint" schema="schema/setting_delegate.exsd"/>
> <extension-point id="invocation_delegate" name="%_UI_InvocationDelegateRegistry_extensionpoint" schema="schema/invocation_delegate.exsd"/>
> <extension-point id="query_delegate" name="%_UI_QueryDelegateRegistry_extensionpoint" schema="schema/query_delegate.exsd"/>
>+ <extension-point id="conversion_delegate" name="%_UI_ConversionDelegateRegistry_extensionpoint" schema="schema/conversion_delegate.exsd"/>
> 
> <extension point="org.eclipse.emf.ecore.generated_package">
> <package
>Index: schema/conversion_delegate.exsd
>===================================================================
>RCS file: schema/conversion_delegate.exsd
>diff -N schema/conversion_delegate.exsd
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ schema/conversion_delegate.exsd	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,124 @@
>+<?xml version='1.0' encoding='UTF-8'?>
>+
>+<schema targetNamespace="org.eclipse.emf.ecore" xmlns="http://www.w3.org/2001/XMLSchema">
>+<annotation>
>+ <appInfo>
>+ <meta.schema plugin="org.eclipse.emf.ecore" id="conversion_delegate" name="Conversion Delegate Factory Registry"/>
>+ </appInfo>
>+ <documentation>
>+ This extension point is used to define a factory for conversion delegates whose type is identified by a URI. The global EMF conversion delegate factory registry, &lt;samp&gt;EDataType.Internal.ConversionDelegate.Factory.Registry.INSTANCE&lt;/samp&gt;, is used to record the registration.
>+ </documentation>
>+ </annotation>
>+
>+ <element name="extension">
>+ <annotation>
>+ <appInfo>
>+ <meta.element />
>+ </appInfo>
>+ </annotation>
>+ <complexType>
>+ <sequence>
>+ <element ref="factory" minOccurs="1" maxOccurs="unbounded"/>
>+ </sequence>
>+ <attribute name="point" type="string" use="required">
>+ <annotation>
>+ <documentation>
>+ A fully qualified identifier of the target extension point.
>+ </documentation>
>+ </annotation>
>+ </attribute>
>+ <attribute name="id" type="string">
>+ <annotation>
>+ <documentation>
>+ An optional identifier of the extension instance.
>+ </documentation>
>+ </annotation>
>+ </attribute>
>+ <attribute name="name" type="string">
>+ <annotation>
>+ <documentation>
>+ An optional name of the extension instance.
>+ </documentation>
>+ </annotation>
>+ </attribute>
>+ </complexType>
>+ </element>
>+
>+ <element name="factory">
>+ <annotation>
>+ <appInfo>
>+ <meta.element labelAttribute="id"/>
>+ </appInfo>
>+ </annotation>
>+ <complexType>
>+ <attribute name="uri" type="string" use="required">
>+ <annotation>
>+ <documentation>
>+ A URI identifying the type of conversion delegates that can be created by the factory.
>+ </documentation>
>+ </annotation>
>+ </attribute>
>+ <attribute name="class" type="string" use="required">
>+ <annotation>
>+ <documentation>
>+ The fully qualified name of a Java class implementing &lt;samp&gt;org.eclipse.emf.ecore.EDataType.Internal.Delegate.Factory&lt;/samp&gt;.
>+ </documentation>
>+ <appInfo>
>+ <meta.attribute kind="java" basedOn="org.eclipse.emf.ecore.EDataType.Internal.ConversionDelegate.Factory"/>
>+ </appInfo>
>+ </annotation>
>+ </attribute>
>+ </complexType>
>+ </element>
>+
>+ <annotation>
>+ <appInfo>
>+ <meta.section type="since"/>
>+ </appInfo>
>+ <documentation>
>+ 2.8.0
>+ </documentation>
>+ </annotation>
>+
>+ <annotation>
>+ <appInfo>
>+ <meta.section type="examples"/>
>+ </appInfo>
>+ <documentation>
>+ Following is an example of how an conversion delegate factory can be registered: 
>+&lt;pre&gt;
>+ &lt;extension point=&quot;org.eclipse.emf.ecore.conversion_delegate&quot; &gt;
>+ &lt;factory uri=&quot;http://www.eclipse.org/emf/2002/Ecore/Javascript&quot; class=&quot;org.eclipse.emf.js4emf.ecore.internal.delegates.JavascriptDelegateFactory&quot;/&gt; 
>+ &lt;/extension&gt;
>+&lt;/pre&gt;
>+ </documentation>
>+ </annotation>
>+
>+ <annotation>
>+ <appInfo>
>+ <meta.section type="apiInfo"/>
>+ </appInfo>
>+ <documentation>
>+ The value of the class attribute must represent a class that implements &lt;samp&gt;org.eclipse.emf.ecore.EDataType.Internal.ConversionDelegate.Factory&lt;/samp&gt; and has a no argument contructor.
>+&lt;p&gt;
>+A conversion delegate factory can be also registered from the source code with the &lt;samp&gt;EDataType.Internal.ConversionDelegate.Factory.Registry.INSTANCE&lt;/samp&gt; as follows:
>+&lt;/p&gt;
>+&lt;pre&gt;
>+ EDataType.Internal.ConversionDelegate.Factory.Registry.INSTANCE.put(&quot;http://www.eclipse.org/emf/2002/Ecore/Javascript&quot;, new JavascriptDelegateFactory());
>+&lt;/pre&gt;
>+ </documentation>
>+ </annotation>
>+
>+
>+ <annotation>
>+ <appInfo>
>+ <meta.section type="copyright"/>
>+ </appInfo>
>+ <documentation>
>+ Copyright (c) 2011 Hallvard Traetteberg and others.&lt;br&gt;
>+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 &lt;a 
>+href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
>+ </documentation>
>+ </annotation>
>+
>+</schema>
>Index: src/org/eclipse/emf/ecore/EDataType.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EDataType.java,v
>retrieving revision 1.4
>diff -u -r1.4 EDataType.java
>--- src/org/eclipse/emf/ecore/EDataType.java	14 Jun 2007 18:32:46 -0000	1.4
>+++ src/org/eclipse/emf/ecore/EDataType.java	19 Oct 2011 13:00:41 -0000
>@@ -16,6 +16,8 @@
> */
> package org.eclipse.emf.ecore;
> 
>+import java.util.HashMap;
>+import java.util.Map;
> 
> 
> /**
>@@ -70,4 +72,103 @@
> */
> void setSerializable(boolean value);
> 
>+ /**
>+ * Internal API implemented by all data types.
>+ * @since 2.8
>+ */
>+ interface Internal extends EDataType, InternalEObject
>+ {
>+ /**
>+ * An API for converting values of the data type to and from a string representation.
>+ */
>+ interface ConversionDelegate
>+ {
>+ /**
>+ * A factory for creating conversion delegates.
>+ */
>+ interface Factory
>+ {
>+ /**
>+ * Creates a conversion delegate for the given EDataType.
>+ * @param eDataType the EDataType for which a conversion delegate is to be created.
>+ * @return a new conversion delegate for the given EDataType.
>+ */
>+ ConversionDelegate createConversionDelegate(EDataType eDataType);
>+
>+ /**
>+ * A <code>Factory</code> wrapper that is used by the {@link Factory.Registry}.
>+ */
>+ interface Descriptor
>+ {
>+ Factory getFactory();
>+ }
>+
>+ /**
>+ * A registry of factories for creating conversion delegates.
>+ */
>+ interface Registry extends Map<String, Object>
>+ {
>+ Registry INSTANCE = new Impl();
>+
>+ Factory getFactory(String uri);
>+
>+ class Impl extends HashMap<String, Object> implements Registry
>+ {
>+ private static final long serialVersionUID = 1L;
>+
>+ @Override
>+ public Object get(Object key)
>+ {
>+ Object factory = super.get(key);
>+ if (factory instanceof Descriptor)
>+ {
>+ Descriptor factoryDescriptor = (Descriptor)factory;
>+ factory = factoryDescriptor.getFactory();
>+ put((String)key, factory);
>+ return factory;
>+ }
>+ else
>+ {
>+ return factory;
>+ }
>+ }
>+
>+ public Factory getFactory(String uri)
>+ {
>+ return (Factory)get(uri);
>+ }
>+ }
>+ }
>+ }
>+
>+ /**
>+ * Converts a value of the data type to a string literal.
>+ * @param value the value to be converted.
>+ * @return the literal representation of the value.
>+ */
>+ String convertToString(Object value);
>+
>+ /**
>+ * Creates a value of the data type from a string literal.
>+ * @param literal the string literal to be converted.
>+ * @return the value of the literal representation.
>+ */
>+ Object createFromString(String literal);
>+ }
>+
>+ /**
>+ * Returns the delegate for this data type.
>+ * A default delegate implementation need not be available,
>+ * so this might <code>null</code>.
>+ * @return the delegate for this feature.
>+ */
>+ ConversionDelegate getConversionDelegate();
>+
>+ /**
>+ * Sets the specialized delegate for this data type.
>+ * @param settingDelegate the specialized delegate.
>+ */
>+ void setConversionDelegate(ConversionDelegate conversionDelegate);
>+ }
>+
> } //EDataType
>Index: src/org/eclipse/emf/ecore/impl/EDataTypeImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EDataTypeImpl.java,v
>retrieving revision 1.12
>diff -u -r1.12 EDataTypeImpl.java
>--- src/org/eclipse/emf/ecore/impl/EDataTypeImpl.java	22 Dec 2008 14:24:54 -0000	1.12
>+++ src/org/eclipse/emf/ecore/impl/EDataTypeImpl.java	19 Oct 2011 13:00:41 -0000
>@@ -18,6 +18,7 @@
> 
> 
> import java.util.Collection;
>+import java.util.List;
> 
> import org.eclipse.emf.common.notify.Notification;
> import org.eclipse.emf.ecore.EAnnotation;
>@@ -25,6 +26,7 @@
> import org.eclipse.emf.ecore.EDataType;
> import org.eclipse.emf.ecore.ETypeParameter;
> import org.eclipse.emf.ecore.EcorePackage;
>+import org.eclipse.emf.ecore.util.EcoreUtil;
> 
> 
> /**
>@@ -40,7 +42,7 @@
> *
> * @generated
> */
>-public class EDataTypeImpl extends EClassifierImpl implements EDataType
>+public class EDataTypeImpl extends EClassifierImpl implements EDataType, EDataType.Internal
> {
> /**
> * The default value of the '{@link #isSerializable() Serializable}' attribute.
>@@ -326,4 +328,34 @@
> return result.toString();
> }
> 
>+ protected ConversionDelegate conversionDelegate;
>+ protected boolean conversionDelegateIsSet;
>+
>+ public ConversionDelegate getConversionDelegate()
>+ {
>+ if (conversionDelegate == null)
>+ {
>+ List<String> conversionDelegates = EcoreUtil.getConversionDelegates(getEPackage());
>+ if (!conversionDelegates.isEmpty())
>+ {
>+ for (String eDataTypeDelegateUri : conversionDelegates)
>+ {
>+ String body = EcoreUtil.getAnnotation(this, eDataTypeDelegateUri, "createFromString");
>+ if (body != null)
>+ {
>+ EDataType.Internal.ConversionDelegate.Factory eDataTypeDelegateFactory = EcoreUtil.getConversionDelegateFactory(this);
>+ conversionDelegate = eDataTypeDelegateFactory.createConversionDelegate(this);
>+ conversionDelegateIsSet = true;
>+ }
>+ }
>+ }
>+ }
>+ return conversionDelegate;
>+ }
>+
>+ public void setConversionDelegate(ConversionDelegate conversionDelegate)
>+ {
>+ this.conversionDelegate = conversionDelegate;
>+ }
>+
> }
>Index: src/org/eclipse/emf/ecore/impl/EFactoryImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EFactoryImpl.java,v
>retrieving revision 1.30
>diff -u -r1.30 EFactoryImpl.java
>--- src/org/eclipse/emf/ecore/impl/EFactoryImpl.java	20 Jul 2010 22:12:48 -0000	1.30
>+++ src/org/eclipse/emf/ecore/impl/EFactoryImpl.java	19 Oct 2011 13:00:41 -0000
>@@ -359,6 +359,12 @@
> throw new IllegalArgumentException("The value '" + stringValue + "' does not match any member types of the union datatype '" + eDataType.getName() + "'");
> }
> 
>+ EDataType.Internal.ConversionDelegate conversionDelegate = ((EDataType.Internal)eDataType).getConversionDelegate();
>+ if (conversionDelegate != null)
>+ {
>+ return conversionDelegate.createFromString(stringValue);
>+ }
>+
> Class<?> c = EcoreUtil.wrapperClassFor(eDataType.getInstanceClass());
> if (c == null) return null;
> 
>@@ -523,6 +529,12 @@
> throw new IllegalArgumentException("Invalid value: '" + objectValue + "' for datatype :"+eDataType.getName());
> }
> 
>+ EDataType.Internal.ConversionDelegate conversionDelegate = ((EDataType.Internal)eDataType).getConversionDelegate();
>+ if (conversionDelegate != null)
>+ {
>+ return conversionDelegate.convertToString(objectValue);
>+ }
>+
> if (objectValue == null)
> {
> return null;
>Index: src/org/eclipse/emf/ecore/plugin/ConversionDelegateFactoryRegistryReader.java
>===================================================================
>RCS file: src/org/eclipse/emf/ecore/plugin/ConversionDelegateFactoryRegistryReader.java
>diff -N src/org/eclipse/emf/ecore/plugin/ConversionDelegateFactoryRegistryReader.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/emf/ecore/plugin/ConversionDelegateFactoryRegistryReader.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,92 @@
>+/**
>+ * <copyright>
>+ *
>+ * Copyright (c) 2011 Hallvard Traetteberg and others.
>+ * 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
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ * 
>+ * Contributors: 
>+ * Hallvard Traetteberg - Initial API and implementation
>+ *
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.emf.ecore.plugin;
>+
>+import org.eclipse.core.runtime.IConfigurationElement;
>+import org.eclipse.core.runtime.Platform;
>+import org.eclipse.emf.ecore.EDataType;
>+
>+
>+/**
>+ * A plugin extension reader that populates the
>+ * {@link org.eclipse.emf.ecore.util.EDataType.ConversionDelegate.Factory.Registry#INSTANCE global} EDataType delegate factory registry.
>+ * Clients are not expected to use this class directly.
>+ */
>+class ConversionDelegateFactoryRegistryReader extends RegistryReader
>+{
>+ static class ConversionDelegateFactoryDescriptor extends PluginClassDescriptor implements EDataType.Internal.ConversionDelegate.Factory.Descriptor
>+ {
>+ protected EDataType.Internal.ConversionDelegate.Factory factory;
>+
>+ public ConversionDelegateFactoryDescriptor(IConfigurationElement e, String attrName)
>+ {
>+ super(e, attrName);
>+ }
>+
>+ public EDataType.Internal.ConversionDelegate.Factory getFactory()
>+ {
>+ if (factory == null)
>+ {
>+ factory = (EDataType.Internal.ConversionDelegate.Factory)createInstance();
>+ }
>+ return factory;
>+ }
>+ }
>+
>+ static final String TAG_FACTORY = "factory";
>+ static final String ATT_URI = "uri";
>+ static final String ATT_CLASS = "class";
>+
>+ public ConversionDelegateFactoryRegistryReader()
>+ {
>+ super(Platform.getExtensionRegistry(), EcorePlugin.getPlugin().getBundle().getSymbolicName(), EcorePlugin.CONVERSION_DELEGATE_PPID);
>+ }
>+
>+ @Override
>+ protected boolean readElement(IConfigurationElement element, boolean add)
>+ {
>+ if (element.getName().equals(TAG_FACTORY))
>+ {
>+ String uri = element.getAttribute(ATT_URI);
>+ if (uri == null)
>+ {
>+ logMissingAttribute(element, ATT_URI);
>+ }
>+ else if (element.getAttribute(ATT_CLASS) == null)
>+ {
>+ logMissingAttribute(element, ATT_CLASS);
>+ }
>+ else if (add)
>+ {
>+ Object previous = EDataType.Internal.ConversionDelegate.Factory.Registry.INSTANCE.put(uri, new ConversionDelegateFactoryDescriptor(element, ATT_CLASS));
>+ if (previous instanceof ConversionDelegateFactoryDescriptor)
>+ {
>+ ConversionDelegateFactoryDescriptor descriptor = (ConversionDelegateFactoryDescriptor)previous;
>+ EcorePlugin.INSTANCE.log("Both '" + descriptor.element.getContributor().getName() + "' and '" + element.getContributor().getName() + "' register a conversion delegate factory for '" + uri + "'");
>+ }
>+ return true;
>+ }
>+ else
>+ {
>+ EDataType.Internal.ConversionDelegate.Factory.Registry.INSTANCE.remove(uri);
>+ return true;
>+ }
>+ }
>+
>+ return false;
>+ }
>+}
>Index: src/org/eclipse/emf/ecore/plugin/EcorePlugin.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/plugin/EcorePlugin.java,v
>retrieving revision 1.26
>diff -u -r1.26 EcorePlugin.java
>--- src/org/eclipse/emf/ecore/plugin/EcorePlugin.java	3 Dec 2010 01:23:45 -0000	1.26
>+++ src/org/eclipse/emf/ecore/plugin/EcorePlugin.java	19 Oct 2011 13:00:41 -0000
>@@ -639,4 +639,5 @@
> public static final String SETTING_DELEGATE_PPID = "setting_delegate";
> public static final String INVOCATION_DELEGATE_PPID = "invocation_delegate";
> public static final String QUERY_DELEGATE_PPID = "query_delegate";
>+ public static final String CONVERSION_DELEGATE_PPID = "conversion_delegate";
> }
>\ No newline at end of file
>Index: src/org/eclipse/emf/ecore/util/EObjectValidator.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/util/EObjectValidator.java,v
>retrieving revision 1.37
>diff -u -r1.37 EObjectValidator.java
>--- src/org/eclipse/emf/ecore/util/EObjectValidator.java	12 Jan 2011 16:24:26 -0000	1.37
>+++ src/org/eclipse/emf/ecore/util/EObjectValidator.java	19 Oct 2011 13:00:42 -0000
>@@ -1649,7 +1649,7 @@
> {
> getValueLabel(eDataType, value, context),
> value == null ? "<null>" : value.getClass().getName(),
>- eDataType.getInstanceClass().getName()
>+ eDataType.getInstanceClassName()
> },
> new Object [] { value, eDataType },
> context));
>Index: src/org/eclipse/emf/ecore/util/EcoreUtil.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/util/EcoreUtil.java,v
>retrieving revision 1.75
>diff -u -r1.75 EcoreUtil.java
>--- src/org/eclipse/emf/ecore/util/EcoreUtil.java	12 May 2011 15:08:56 -0000	1.75
>+++ src/org/eclipse/emf/ecore/util/EcoreUtil.java	19 Oct 2011 13:00:42 -0000
>@@ -4318,6 +4318,75 @@
> return null;
> }
> 
>+ /**
>+ * @since 2.8
>+ */
>+ public static List<String> getConversionDelegates(EPackage ePackage)
>+ {
>+ EAnnotation eAnnotation = ePackage.getEAnnotation(EcorePackage.eNS_URI);
>+ if (eAnnotation != null)
>+ {
>+ String eDataTypeDelegates = eAnnotation.getDetails().get("conversionDelegates");
>+ if (eDataTypeDelegates != null)
>+ {
>+ List<String> result = new ArrayList<String>();
>+ for (StringTokenizer stringTokenizer = new StringTokenizer(eDataTypeDelegates); stringTokenizer.hasMoreTokens();)
>+ {
>+ String eDataTypeDelegate = stringTokenizer.nextToken();
>+ result.add(eDataTypeDelegate);
>+ }
>+ return result;
>+ }
>+ }
>+ return Collections.emptyList();
>+ }
>+
>+ public static void setConversionDelegates(EPackage ePackage, List<String> eDataTypeDelegates)
>+ {
>+ EAnnotation eAnnotation = ePackage.getEAnnotation(EcorePackage.eNS_URI);
>+ if (eDataTypeDelegates == null || eDataTypeDelegates.isEmpty())
>+ {
>+ if (eAnnotation != null)
>+ {
>+ eAnnotation.getDetails().remove("conversionDelegates");
>+ }
>+ }
>+ else
>+ {
>+ if (eAnnotation == null)
>+ {
>+ eAnnotation = EcoreFactory.eINSTANCE.createEAnnotation();
>+ eAnnotation.setSource(EcorePackage.eNS_URI);
>+ ePackage.getEAnnotations().add(eAnnotation);
>+ }
>+ StringBuffer value = new StringBuffer();
>+ for (Iterator<String> i = eDataTypeDelegates.iterator(); i.hasNext();)
>+ {
>+ value.append(i.next());
>+ if (i.hasNext())
>+ {
>+ value.append(' ');
>+ }
>+ }
>+ eAnnotation.getDetails().put("conversionDelegates", value.toString());
>+ }
>+ }
>+
>+ /**
>+ * @since 2.8
>+ */
>+ public static EDataType.Internal.ConversionDelegate.Factory getConversionDelegateFactory(EDataType eDataType)
>+ {
>+ for (String eDataTypeDelegate : getConversionDelegates(eDataType.getEPackage()))
>+ {
>+ if (eDataType.getEAnnotation(eDataTypeDelegate) != null)
>+ {
>+ return EDataType.Internal.ConversionDelegate.Factory.Registry.INSTANCE.getFactory(eDataTypeDelegate);
>+ }
>+ }
>+ return null;
>+ }
>+
> /*
> static 
> {
>Index: src/org/eclipse/emf/ecore/util/EcoreValidator.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/util/EcoreValidator.java,v
>retrieving revision 1.45
>diff -u -r1.45 EcoreValidator.java
>--- src/org/eclipse/emf/ecore/util/EcoreValidator.java	13 May 2011 15:08:08 -0000	1.45
>+++ src/org/eclipse/emf/ecore/util/EcoreValidator.java	19 Oct 2011 13:00:42 -0000
>@@ -2580,7 +2580,7 @@
> createDiagnostic
> (Diagnostic.ERROR,
> DIAGNOSTIC_SOURCE,
>- VALID_LOWER_BOUND,
>+ VALID_DEFAULT_VALUE_LITERAL,
> "_UI_EStructuralFeatureValidDefaultValueLiteral_diagnostic",
> new Object[] { defaultValueLiteral },
> new Object[] { eStructuralFeature },
>#P org.eclipse.emf.ecore.editor
>Index: src/org/eclipse/emf/ecore/presentation/EcoreEditor.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/plugins/org.eclipse.emf.ecore.editor/src/org/eclipse/emf/ecore/presentation/EcoreEditor.java,v
>retrieving revision 1.62
>diff -u -r1.62 EcoreEditor.java
>--- src/org/eclipse/emf/ecore/presentation/EcoreEditor.java	12 May 2011 20:21:12 -0000	1.62
>+++ src/org/eclipse/emf/ecore/presentation/EcoreEditor.java	19 Oct 2011 13:00:43 -0000
>@@ -19,6 +19,7 @@
> 
> import java.io.IOException;
> import java.io.InputStream;
>+import java.lang.reflect.Method;
> 
> import java.util.ArrayList;
> import java.util.Collection;
>@@ -32,6 +33,7 @@
> 
> import org.eclipse.core.resources.IFile;
> import org.eclipse.core.resources.IMarker;
>+import org.eclipse.core.resources.IProject;
> import org.eclipse.core.resources.IResource;
> import org.eclipse.core.resources.IResourceChangeEvent;
> import org.eclipse.core.resources.IResourceChangeListener;
>@@ -113,6 +115,7 @@
> 
> import org.eclipse.emf.common.notify.AdapterFactory;
> import org.eclipse.emf.common.notify.Notification;
>+import org.eclipse.emf.common.notify.impl.AdapterImpl;
> 
> import org.eclipse.emf.common.ui.MarkerHelper;
> 
>@@ -762,7 +765,7 @@
> * This sets up the editing domain for the model editor.
> * 
> * 
>- * @generated
>+ * @generated NOT
> */
> protected void initializeEditingDomain()
> {
>@@ -808,9 +811,49 @@
> }
> });
> 
>+ ResourceSet resourceSet = null;
>+ try
>+ {
>+ Class<?> xtextResourceSetClass = CommonPlugin.loadClass("org.eclipse.xtext", "org.eclipse.xtext.resource.XtextResourceSet");
>+ 
>+ resourceSet = (ResourceSet)xtextResourceSetClass.newInstance();
>+ class EditingDomainProvider extends AdapterImpl implements IEditingDomainProvider
>+ {
>+ public EditingDomain getEditingDomain()
>+ {
>+ return editingDomain;
>+ }
>+ @Override
>+ public boolean isAdapterForType(Object type)
>+ {
>+ return IEditingDomainProvider.class.equals(type);
>+ }
>+ }
>+ resourceSet.eAdapters().add(new EditingDomainProvider());
>+ }
>+ catch (Exception e)
>+ {
>+ e.printStackTrace();
>+ // ignore missing Xtext
>+ }
>+ 
> // Create the editing domain with a special command stack.
> //
>- editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>());
>+ editingDomain = 
>+ new AdapterFactoryEditingDomain(adapterFactory, commandStack, resourceSet)
>+ {
>+ {
>+ resourceToReadOnlyMap = new HashMap<Resource, Boolean>();
>+ }
>+ @Override
>+ public boolean isReadOnly(Resource resource)
>+ {
>+ return 
>+ "java".equals(resource.getURI().scheme()) || 
>+ "xcore".equals(resource.getURI().fileExtension()) ||
>+ super.isReadOnly(resource);
>+ }
>+ };
> }
> 
> /**
>@@ -1637,7 +1680,7 @@
> * This is called during startup.
> * 
> * 
>- * @generated
>+ * @generated NOT
> */
> @Override
> public void init(IEditorSite site, IEditorInput editorInput)
>@@ -1648,6 +1691,22 @@
> site.setSelectionProvider(this);
> site.getPage().addPartListener(partListener);
> ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE);
>+ 
>+ try
>+ {
>+ ResourceSet resourceSet = editingDomain.getResourceSet();
>+ Method setClasspathURIContextMethod = resourceSet.getClass().getMethod("setClasspathURIContext", Object.class);
>+ Class<?> javaCoreClass = CommonPlugin.loadClass("org.eclipse.jdt.core", "org.eclipse.jdt.core.JavaCore");
>+ IProject project = ((IFileEditorInput)editorInput).getFile().getProject();
>+ Method createMethod = javaCoreClass.getMethod("create", IProject.class);
>+ Object javaProject = createMethod.invoke(null, project);
>+ setClasspathURIContextMethod.invoke(resourceSet, javaProject);
>+ }
>+ catch (Exception e)
>+ {
>+ e.printStackTrace();
>+ // ignore missing Xtext
>+ }
> }
> 
> /**
>#P org.eclipse.emf.edit.ui
>Index: src/org/eclipse/emf/edit/ui/util/EditUIUtil.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/plugins/org.eclipse.emf.edit.ui/src/org/eclipse/emf/edit/ui/util/EditUIUtil.java,v
>retrieving revision 1.8
>diff -u -r1.8 EditUIUtil.java
>--- src/org/eclipse/emf/edit/ui/util/EditUIUtil.java	23 May 2008 21:49:17 -0000	1.8
>+++ src/org/eclipse/emf/edit/ui/util/EditUIUtil.java	19 Oct 2011 13:00:44 -0000
>@@ -88,6 +88,8 @@
> {
> IWorkbench workbench = PlatformUI.getWorkbench();
> IWorkbenchPage page = workbench.getActiveWorkbenchWindow().getActivePage();
>+ IEditorDescriptor[] result =
>+ workbench.getEditorRegistry().getEditors(uri.lastSegment());
> IEditorPart editorPart = page.openEditor(editorInput, workbench.getEditorRegistry().getDefaultEditor(uri.lastSegment()).getId());
> return editorPart != null;
> }
>#P org.eclipse.emf.importer
>Index: src/org/eclipse/emf/importer/ui/EMFProjectWizard.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/plugins/org.eclipse.emf.importer/src/org/eclipse/emf/importer/ui/EMFProjectWizard.java,v
>retrieving revision 1.9
>diff -u -r1.9 EMFProjectWizard.java
>--- src/org/eclipse/emf/importer/ui/EMFProjectWizard.java	28 Dec 2006 06:53:13 -0000	1.9
>+++ src/org/eclipse/emf/importer/ui/EMFProjectWizard.java	19 Oct 2011 13:00:44 -0000
>@@ -21,6 +21,7 @@
> import org.eclipse.core.runtime.IPath;
> import org.eclipse.core.runtime.Platform;
> import org.eclipse.jface.resource.ImageDescriptor;
>+import org.eclipse.swt.widgets.Composite;
> import org.eclipse.ui.dialogs.WizardNewProjectCreationPage;
> 
> import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
>@@ -37,6 +38,7 @@
> {
> protected IPath projectLocation;
> protected IPath projectPath;
>+ protected WizardNewProjectCreationPage newProjectCreationPage;
> 
> public EMFProjectWizard()
> {
>@@ -53,7 +55,7 @@
> @Override
> public void addPages()
> {
>- WizardNewProjectCreationPage page = new WizardNewProjectCreationPage("NewProjectCreationPage")
>+ newProjectCreationPage = new WizardNewProjectCreationPage("NewProjectCreationPage")
> {
> @Override
> protected boolean validatePage()
>@@ -70,16 +72,26 @@
> return false;
> }
> }
>+ 
>+ @Override
>+ public void createControl(Composite parent)
>+ {
>+ super.createControl(parent);
>+ createWorkingSetGroup
>+ ((Composite) getControl(), 
>+ selection, 
>+ new String[] { "org.eclipse.jdt.ui.JavaWorkingSetPage", "org.eclipse.pde.ui.pluginWorkingSet", "org.eclipse.ui.resourceWorkingSetPage"});
>+ }
> };
>- page.setTitle(ImporterPlugin.INSTANCE.getString("_UI_EMFProjectWizard_name"));
>- page.setDescription(ImporterPlugin.INSTANCE.getString("_UI_CreateEMFProject_label"));
>- addPage(page);
>+ newProjectCreationPage.setTitle(ImporterPlugin.INSTANCE.getString("_UI_EMFProjectWizard_name"));
>+ newProjectCreationPage.setDescription(ImporterPlugin.INSTANCE.getString("_UI_CreateEMFProject_label"));
>+ addPage(newProjectCreationPage);
> 
> if (defaultPath != null)
> {
> String path = defaultPath.removeLastSegments(defaultPath.segmentCount()-1).toString();
>- page.setInitialProjectName(path.charAt(0) == '/' ? path.substring(1) : path);
>- page.setPageComplete(page.isPageComplete()); 
>+ newProjectCreationPage.setInitialProjectName(path.charAt(0) == '/' ? path.substring(1) : path);
>+ newProjectCreationPage.setPageComplete(newProjectCreationPage.isPageComplete()); 
> }
> 
> addSelectionPage();
>@@ -104,5 +116,9 @@
> {
> modelImporterWizard.setGenModelProjectPath(projectPath);
> }
>+ if (isValidNewValue(newProjectCreationPage.getSelectedWorkingSets(), modelImporterWizard.getWorkingSets()))
>+ {
>+ modelImporterWizard.setWorkingSets(newProjectCreationPage.getSelectedWorkingSets());
>+ }
> }
> }
>Index: src/org/eclipse/emf/importer/ui/contribution/IModelImporterWizard.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/plugins/org.eclipse.emf.importer/src/org/eclipse/emf/importer/ui/contribution/IModelImporterWizard.java,v
>retrieving revision 1.8
>diff -u -r1.8 IModelImporterWizard.java
>--- src/org/eclipse/emf/importer/ui/contribution/IModelImporterWizard.java	18 Apr 2009 11:40:04 -0000	1.8
>+++ src/org/eclipse/emf/importer/ui/contribution/IModelImporterWizard.java	19 Oct 2011 13:00:44 -0000
>@@ -21,6 +21,7 @@
> import org.eclipse.core.resources.IFile;
> import org.eclipse.core.runtime.IPath;
> import org.eclipse.ui.INewWizard;
>+import org.eclipse.ui.IWorkingSet;
> 
> 
> /**
>@@ -47,4 +48,14 @@
> String getGenModelFileName();
> 
> List<String> getFileExtensions();
>+ 
>+ /**
>+ * @since 3.3
>+ */
>+ void setWorkingSets(IWorkingSet[] workingSets);
>+
>+ /**
>+ * @since 3.3
>+ */
>+ IWorkingSet[] getWorkingSets();
> }
>\ No newline at end of file
>Index: src/org/eclipse/emf/importer/ui/contribution/base/ModelImporterWizard.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/plugins/org.eclipse.emf.importer/src/org/eclipse/emf/importer/ui/contribution/base/ModelImporterWizard.java,v
>retrieving revision 1.15
>diff -u -r1.15 ModelImporterWizard.java
>--- src/org/eclipse/emf/importer/ui/contribution/base/ModelImporterWizard.java	18 Apr 2009 11:40:04 -0000	1.15
>+++ src/org/eclipse/emf/importer/ui/contribution/base/ModelImporterWizard.java	19 Oct 2011 13:00:44 -0000
>@@ -19,8 +19,10 @@
> import java.util.List;
> 
> import org.eclipse.core.resources.IFile;
>+import org.eclipse.core.resources.ResourcesPlugin;
> import org.eclipse.core.runtime.IPath;
> import org.eclipse.jface.dialogs.MessageDialog;
>+import org.eclipse.ui.IWorkingSet;
> import org.eclipse.ui.PartInitException;
> 
> import org.eclipse.emf.codegen.ecore.genmodel.provider.GenModelEditPlugin;
>@@ -45,6 +47,17 @@
> protected IPath genModelContainerPath;
> protected IPath projectLocation;
> protected IPath projectPath;
>+ protected IWorkingSet[] workingSets;
>+
>+ public IWorkingSet[] getWorkingSets()
>+ {
>+ return workingSets;
>+ }
>+
>+ public void setWorkingSets(IWorkingSet[] workingSets)
>+ {
>+ this.workingSets = workingSets;
>+ }
> 
> public ModelImporter getModelImporter()
> {
>@@ -148,6 +161,12 @@
> {
> getModelImporter().prepareGenModelAndEPackages(monitor);
> getModelImporter().saveGenModelAndEPackages(monitor);
>+ 
>+ IWorkingSet[] workingSets = getWorkingSets();
>+ if (workingSets != null)
>+ {
>+ workbench.getWorkingSetManager().addToWorkingSets(ResourcesPlugin.getWorkspace().getRoot().getProject(getModelImporter().getModelProjectName()), workingSets);
>+ }
> return Diagnostic.OK_INSTANCE;
> }
> 
>#P org.eclipse.emf.test.core
>Index: src/org/eclipse/emf/test/core/change/ChangeDescriptionReverseTest.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.core/src/org/eclipse/emf/test/core/change/ChangeDescriptionReverseTest.java,v
>retrieving revision 1.1
>diff -u -r1.1 ChangeDescriptionReverseTest.java
>--- src/org/eclipse/emf/test/core/change/ChangeDescriptionReverseTest.java	7 Apr 2011 23:41:08 -0000	1.1
>+++ src/org/eclipse/emf/test/core/change/ChangeDescriptionReverseTest.java	19 Oct 2011 13:00:47 -0000
>@@ -36,6 +36,7 @@
> import org.eclipse.emf.ecore.EObject;
> import org.eclipse.emf.ecore.EPackage;
> import org.eclipse.emf.ecore.EcoreFactory;
>+import org.eclipse.emf.ecore.InternalEObject;
> import org.eclipse.emf.ecore.change.ChangeDescription;
> import org.eclipse.emf.ecore.change.util.ChangeRecorder;
> import org.eclipse.emf.ecore.resource.Resource;
>@@ -54,6 +55,7 @@
> public static Test suite()
> {
> TestSuite ts = new TestSuite("ChangeDescription copyAndReverse Test");
>+ /*
> ts.addTest(new ChangeDescriptionReverseTest("testOne"));
> ts.addTest(new ChangeDescriptionReverseTest("testTwo"));
> ts.addTest(new ChangeDescriptionReverseTest("testThree"));
>@@ -61,6 +63,8 @@
> ts.addTest(new ChangeDescriptionReverseTest("testFive"));
> ts.addTest(new ChangeDescriptionReverseTest("testSix"));
> ts.addTest(new ChangeDescriptionReverseTest("testSeven"));
>+ */
>+ ts.addTest(new ChangeDescriptionReverseTest("testEight"));
> return ts;
> }
> 
>@@ -81,6 +85,13 @@
> makeChanges();
> 
> ChangeDescription changeDescription = changeRecorder.endRecording();
>+ {
>+ ResourceSet finalResourceSet = new ResourceSetImpl();
>+ Resource changeDescriptionResource = finalResourceSet.createResource(URI.createURI("changes.change"));
>+ changeDescriptionResource.getContents().add(changeDescription);
>+ changeDescriptionResource.save(System.err, null);
>+ 
>+ }
> changeDescription.copyAndReverse(eObjectToProxyURIMap);
> 
> ResourceSet finalResourceSet = new ResourceSetImpl();
>@@ -288,6 +299,67 @@
> }.doit();
> }
> 
>+ public void testEight() throws Exception
>+ {
>+ new TestHelper()
>+ {
>+ Resource ecoreResource;
>+ EPackage ecorePackage;
>+
>+ @Override
>+ void loadResources(ResourceSet resourceSet)
>+ {
>+ ecoreResource = resourceSet.getResource(URI.createURI("platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore"), true);
>+ ecorePackage = (EPackage)ecoreResource.getContents().get(0);
>+
>+ EAnnotation eAnnotation = EcoreFactory.eINSTANCE.createEAnnotation();
>+ ecorePackage.getEAnnotations().add(eAnnotation);
>+
>+ eAnnotation.setSource(getName());
>+
>+ EList<EObject> references = eAnnotation.getReferences();
>+
>+ EObject eClassProxy = EcoreFactory.eINSTANCE.createEObject();
>+ ((InternalEObject)eClassProxy).eSetProxyURI(URI.createURI("platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EClass"));
>+ references.add(eClassProxy);
>+
>+ EObject ePackageProxy = EcoreFactory.eINSTANCE.createEObject();
>+ ((InternalEObject)ePackageProxy).eSetProxyURI(URI.createURI("platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EPackage"));
>+ references.add(ePackageProxy);
>+ }
>+
>+ @Override
>+ void makeChanges()
>+ {
>+ EList<EObject> references = ecorePackage.getEAnnotation(getName()).getReferences();
>+ references.clear();
>+
>+ references.add(ecorePackage.getEClassifier("EClass"));
>+ references.add(ecorePackage.getEClassifier("EPackage"));
>+
>+ EClass eClass = EcoreFactory.eINSTANCE.createEClass();
>+ eClass.setName("NewClass");
>+
>+ EAnnotation eAnnotation = EcoreFactory.eINSTANCE.createEAnnotation();
>+ eAnnotation.getReferences().add(eClass);
>+
>+ EPackage ePackage = EcoreFactory.eINSTANCE.createEPackage();
>+ ePackage.setName("NewPackage");
>+
>+ ePackage.getEClassifiers().add(eClass);
>+
>+ ecorePackage.getESubpackages().add(ePackage);
>+ ecorePackage.getEAnnotations().add(eAnnotation);
>+
>+ ResourceSet resourceSet = ecoreResource.getResourceSet();
>+ resourceSet.createResource(URI.createURI("platform:/plugin/org.eclipse.emf.ecore/model/EPackage/NewPackage.ecore")).getContents().add(
>+ ePackage);
>+ resourceSet.createResource(URI.createURI("platform:/plugin/org.eclipse.emf.ecore/model/EClass/NewClass.ecore")).getContents().add(
>+ eClass);
>+ }
>+ }.doit();
>+ }
>+ 
> void assertEquals(ResourceSet resourceSet1, ResourceSet resourceSet2)
> {
> EcoreUtil.resolveAll(resourceSet1);
>Index: src/org/eclipse/emf/test/core/ecore/BadEcoreDiagnosticTest.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.core/src/org/eclipse/emf/test/core/ecore/BadEcoreDiagnosticTest.java,v
>retrieving revision 1.15
>diff -u -r1.15 BadEcoreDiagnosticTest.java
>--- src/org/eclipse/emf/test/core/ecore/BadEcoreDiagnosticTest.java	3 Dec 2010 20:42:55 -0000	1.15
>+++ src/org/eclipse/emf/test/core/ecore/BadEcoreDiagnosticTest.java	19 Oct 2011 13:00:47 -0000
>@@ -1192,7 +1192,7 @@
> assertEquals(Diagnostic.ERROR, diagnostic126.getSeverity());
> assertEquals("org.eclipse.emf.ecore.model", diagnostic126.getSource());
> assertEquals("The default value literal '256' must be a valid literal of the attribute's type", removeObjectHashCode(diagnostic126.getMessage()));
>- assertEquals(39, diagnostic126.getCode());
>+ assertEquals(38, diagnostic126.getCode());
> assertEquals(1, diagnostic126.getChildren().size());
> assertEquals(1, diagnostic126.getData().size());
> assertNull(diagnostic126.getException());
>@@ -1210,7 +1210,7 @@
> assertEquals(Diagnostic.ERROR, diagnostic128.getSeverity());
> assertEquals("org.eclipse.emf.ecore.model", diagnostic128.getSource());
> assertEquals("The default value literal '' must be a valid literal of the attribute's type", removeObjectHashCode(diagnostic128.getMessage()));
>- assertEquals(39, diagnostic128.getCode());
>+ assertEquals(38, diagnostic128.getCode());
> assertEquals(0, diagnostic128.getChildren().size());
> assertEquals(1, diagnostic128.getData().size());
> assertNull(diagnostic128.getException());

Actions: View | Diff

Attachments on bug 354245: 201141 | 201408 | 201453 | 201873 | 201883 | 202635 | 202849 | 202955 | 203077 | 205521 | 205526