Related to issue [368505] - Do not default SequenceStyleGenerator optimizer to NONE

6 files changed, 45 insertions, 17 deletions

diff --git a/core/org.eclipse.emf.teneo.annotations/model/pannotation.ecore b/core/org.eclipse.emf.teneo.annotations/model/pannotation.ecore
index f737ea3df..410ca66df 100755
--- a/core/org.eclipse.emf.teneo.annotations/model/pannotation.ecore
+++ b/core/org.eclipse.emf.teneo.annotations/model/pannotation.ecore
@@ -457,14 +457,15 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="incrementSize" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
         defaultValueLiteral="50"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="optimizer" eType="#//OptimizerType"
-        defaultValueLiteral="NONE"/>
+        defaultValueLiteral="DEFAULT"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="optimizerClass" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EEnum" name="OptimizerType">
-    <eLiterals name="NONE" literal="NONE"/>
-    <eLiterals name="HILO" value="1" literal="HILO"/>
-    <eLiterals name="POOLED" value="2" literal="POOLED"/>
-    <eLiterals name="POOLED_LO" value="3" literal="POOLED-LO"/>
+    <eLiterals name="NONE" value="1" literal="NONE"/>
+    <eLiterals name="HILO" value="2" literal="HILO"/>
+    <eLiterals name="POOLED" value="3" literal="POOLED"/>
+    <eLiterals name="POOLED_LO" value="4" literal="POOLED-LO"/>
+    <eLiterals name="DEFAULT" literal="DEFAULT"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="External" eSuperTypes="#//PAnnotation">
     <eAnnotations source="teneo/internal/Target">
diff --git a/core/org.eclipse.emf.teneo.annotations/model/pannotation.genmodel b/core/org.eclipse.emf.teneo.annotations/model/pannotation.genmodel
index 8fd230b78..358cb6d52 100755
--- a/core/org.eclipse.emf.teneo.annotations/model/pannotation.genmodel
+++ b/core/org.eclipse.emf.teneo.annotations/model/pannotation.genmodel
@@ -144,6 +144,7 @@
       <genEnumLiterals ecoreEnumLiteral="pannotation.ecore#//OptimizerType/HILO"/>
       <genEnumLiterals ecoreEnumLiteral="pannotation.ecore#//OptimizerType/POOLED"/>
       <genEnumLiterals ecoreEnumLiteral="pannotation.ecore#//OptimizerType/POOLED_LO"/>
+      <genEnumLiterals ecoreEnumLiteral="pannotation.ecore#//OptimizerType/DEFAULT"/>
     </genEnums>
     <genClasses image="false" ecoreClass="pannotation.ecore#//PAnnotation">
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference pannotation.ecore#//PAnnotation/eModelElement"/>
diff --git a/core/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/OptimizerType.java b/core/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/OptimizerType.java
index 857bc92c9..bca2dabde 100755
--- a/core/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/OptimizerType.java
+++ b/core/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/OptimizerType.java
@@ -30,7 +30,7 @@ public enum OptimizerType implements Enumerator {
 	 * @generated
 	 * @ordered
 	 */
-	NONE(0, "NONE", "NONE"),
+	NONE(1, "NONE", "NONE"),
 
 	/**
 	 * The '<em><b>HILO</b></em>' literal object.
@@ -40,7 +40,7 @@ public enum OptimizerType implements Enumerator {
 	 * @generated
 	 * @ordered
 	 */
-	HILO(1, "HILO", "HILO"),
+	HILO(2, "HILO", "HILO"),
 
 	/**
 	 * The '<em><b>POOLED</b></em>' literal object.
@@ -50,7 +50,7 @@ public enum OptimizerType implements Enumerator {
 	 * @generated
 	 * @ordered
 	 */
-	POOLED(2, "POOLED", "POOLED"), /**
+	POOLED(3, "POOLED", "POOLED"), /**
 	 * The '<em><b>POOLED LO</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -58,7 +58,15 @@ public enum OptimizerType implements Enumerator {
 	 * @generated
 	 * @ordered
 	 */
-	POOLED_LO(3, "POOLED_LO", "POOLED-LO");
+	POOLED_LO(4, "POOLED_LO", "POOLED-LO"), /**
+	 * The '<em><b>DEFAULT</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #DEFAULT_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	DEFAULT(0, "DEFAULT", "DEFAULT");
 
 	/**
 	 * The '<em><b>NONE</b></em>' literal value.
@@ -73,7 +81,7 @@ public enum OptimizerType implements Enumerator {
 	 * @generated
 	 * @ordered
 	 */
-	public static final int NONE_VALUE = 0;
+	public static final int NONE_VALUE = 1;
 
 	/**
 	 * The '<em><b>HILO</b></em>' literal value.
@@ -88,7 +96,7 @@ public enum OptimizerType implements Enumerator {
 	 * @generated
 	 * @ordered
 	 */
-	public static final int HILO_VALUE = 1;
+	public static final int HILO_VALUE = 2;
 
 	/**
 	 * The '<em><b>POOLED</b></em>' literal value.
@@ -103,7 +111,7 @@ public enum OptimizerType implements Enumerator {
 	 * @generated
 	 * @ordered
 	 */
-	public static final int POOLED_VALUE = 2;
+	public static final int POOLED_VALUE = 3;
 
 	/**
 	 * The '<em><b>POOLED LO</b></em>' literal value.
@@ -118,7 +126,22 @@ public enum OptimizerType implements Enumerator {
 	 * @generated
 	 * @ordered
 	 */
-	public static final int POOLED_LO_VALUE = 3;
+	public static final int POOLED_LO_VALUE = 4;
+
+	/**
+	 * The '<em><b>DEFAULT</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>DEFAULT</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @see #DEFAULT
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int DEFAULT_VALUE = 0;
 
 	/**
 	 * An array of all the '<em><b>Optimizer Type</b></em>' enumerators.
@@ -132,6 +155,7 @@ public enum OptimizerType implements Enumerator {
 			HILO,
 			POOLED,
 			POOLED_LO,
+			DEFAULT,
 		};
 
 	/**
@@ -186,6 +210,7 @@ public enum OptimizerType implements Enumerator {
 			case HILO_VALUE: return HILO;
 			case POOLED_VALUE: return POOLED;
 			case POOLED_LO_VALUE: return POOLED_LO;
+			case DEFAULT_VALUE: return DEFAULT;
 		}
 		return null;
 	}
diff --git a/core/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/SequenceStyleGenerator.java b/core/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/SequenceStyleGenerator.java
index 9f1616ef3..621c9701f 100755
--- a/core/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/SequenceStyleGenerator.java
+++ b/core/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/SequenceStyleGenerator.java
@@ -137,7 +137,7 @@ public interface SequenceStyleGenerator extends PAnnotation {
 
 	/**
 	 * Returns the value of the '<em><b>Optimizer</b></em>' attribute.
-	 * The default value is <code>"NONE"</code>.
+	 * The default value is <code>"DEFAULT"</code>.
 	 * The literals are from the enumeration {@link org.eclipse.emf.teneo.annotations.pannotation.OptimizerType}.
 	 * <!-- begin-user-doc -->
 	 * <p>
@@ -149,7 +149,7 @@ public interface SequenceStyleGenerator extends PAnnotation {
 	 * @see org.eclipse.emf.teneo.annotations.pannotation.OptimizerType
 	 * @see #setOptimizer(OptimizerType)
 	 * @see org.eclipse.emf.teneo.annotations.pannotation.PannotationPackage#getSequenceStyleGenerator_Optimizer()
-	 * @model default="NONE"
+	 * @model default="DEFAULT"
 	 * @generated
 	 */
 	OptimizerType getOptimizer();
diff --git a/core/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/impl/PannotationPackageImpl.java b/core/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/impl/PannotationPackageImpl.java
index 2661a068b..10975f2c5 100755
--- a/core/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/impl/PannotationPackageImpl.java
+++ b/core/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/impl/PannotationPackageImpl.java
@@ -2187,7 +2187,7 @@ public class PannotationPackageImpl extends EPackageImpl implements
 		initEAttribute(getSequenceStyleGenerator_SequenceName(), ecorePackage.getEString(), "sequenceName", null, 0, 1, SequenceStyleGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getSequenceStyleGenerator_InitialValue(), ecorePackage.getEInt(), "initialValue", "1", 0, 1, SequenceStyleGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getSequenceStyleGenerator_IncrementSize(), ecorePackage.getEInt(), "incrementSize", "50", 0, 1, SequenceStyleGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getSequenceStyleGenerator_Optimizer(), this.getOptimizerType(), "optimizer", "NONE", 0, 1, SequenceStyleGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getSequenceStyleGenerator_Optimizer(), this.getOptimizerType(), "optimizer", "DEFAULT", 0, 1, SequenceStyleGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getSequenceStyleGenerator_OptimizerClass(), ecorePackage.getEString(), "optimizerClass", null, 0, 1, SequenceStyleGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(externalEClass, External.class, "External", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -2246,6 +2246,7 @@ public class PannotationPackageImpl extends EPackageImpl implements
 		addEEnumLiteral(optimizerTypeEEnum, OptimizerType.HILO);
 		addEEnumLiteral(optimizerTypeEEnum, OptimizerType.POOLED);
 		addEEnumLiteral(optimizerTypeEEnum, OptimizerType.POOLED_LO);
+		addEEnumLiteral(optimizerTypeEEnum, OptimizerType.DEFAULT);
 
 		// Create resource
 		createResource(eNS_URI);
diff --git a/core/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/impl/SequenceStyleGeneratorImpl.java b/core/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/impl/SequenceStyleGeneratorImpl.java
index 3ca639c08..46543e612 100755
--- a/core/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/impl/SequenceStyleGeneratorImpl.java
+++ b/core/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/impl/SequenceStyleGeneratorImpl.java
@@ -120,7 +120,7 @@ public class SequenceStyleGeneratorImpl extends PAnnotationImpl implements Seque
 	 * @generated
 	 * @ordered
 	 */
-	protected static final OptimizerType OPTIMIZER_EDEFAULT = OptimizerType.NONE;
+	protected static final OptimizerType OPTIMIZER_EDEFAULT = OptimizerType.DEFAULT;
 
 	/**
 	 * The cached value of the '{@link #getOptimizer() <em>Optimizer</em>}' attribute.