Attachment #52023 for bug #161027




  protected final String TEXT_30 = NL + "\t\t}" + NL + "\t\treturn KNOWN_ELEMENT_TYPES.contains(elementType);" + NL + "\t}";
  protected final String TEXT_31 = NL + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic static class Initializers {";
  protected final String TEXT_32 = "\t\t";
  protected final String TEXT_33 = NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic static final IObjectInitializer ";
  protected final String TEXT_34 = " = new ObjectInitializer(";
  protected final String TEXT_35 = ") {";
  protected final String TEXT_36 = NL + "\t\tObjectInitializer ";

  protected final String TEXT_76 = " ObjectInitializer" + NL + "\t\t\t}";
  protected final String TEXT_77 = NL + "\t\t}; // ";
  protected final String TEXT_78 = " ObjectInitializer";
  protected final String TEXT_79 = NL + "\t" + NL + "\t\t/** " + NL + "\t\t * @generated" + NL + "\t\t */\t" + NL + "\t\tprivate Initializers() {" + NL + "\t\t}" + NL + "\t\t" + NL + "\t\t/** " + NL + "\t\t * @generated" + NL + "\t\t */\t\t" + NL + "\t\tpublic static interface IObjectInitializer {" + NL + "\t\t\t/** " + NL + "\t\t\t * @generated" + NL + "\t\t\t */\t\t" + NL + "\t\t\tpublic void init(";
  protected final String TEXT_80 = " instance);" + NL + "\t\t}" + NL + "\t\t" + NL + "\t\t/** " + NL + "\t\t * @generated" + NL + "\t\t */\t" + NL + "\t\tpublic static abstract class ObjectInitializer implements IObjectInitializer {" + NL + "\t\t\t/** " + NL + "\t\t\t * @generated" + NL + "\t\t\t */\t\t" + NL + "\t\t\tfinal EClass element;\t\t" + NL + "\t\t\t/** " + NL + "\t\t\t * @generated" + NL + "\t\t\t */\t\t" + NL + "\t\t\tprivate ";
  protected final String TEXT_81 = " featureInitializers = new ";
  protected final String TEXT_82 = "();" + NL + "\t\t\t/** " + NL + "\t\t\t * @generated" + NL + "\t\t\t */" + NL + "\t\t\tObjectInitializer(EClass element) {" + NL + "\t\t\t\tthis.element = element;" + NL + "\t\t\t\tinit();" + NL + "\t\t\t}" + NL + "\t\t\t/**" + NL + "\t\t \t * @generated" + NL + "\t\t \t */" + NL + "\t\t \tprotected abstract void init();\t\t\t\t\t\t\t" + NL + "\t\t\t/** " + NL + "\t\t\t * @generated" + NL + "\t\t\t */" + NL + "\t\t\tprotected final FeatureInitializer add(FeatureInitializer initializer) {" + NL + "\t\t\t\tfeatureInitializers.add(initializer);" + NL + "\t\t\t\treturn initializer;" + NL + "\t\t\t}" + NL + "\t\t\t/** " + NL + "\t\t\t * @generated" + NL + "\t\t\t */\t\t" + NL + "\t\t\tpublic void init(";
  protected final String TEXT_83 = " instance) {" + NL + "\t\t\t\tfor (java.util.Iterator it = featureInitializers.iterator(); it.hasNext();) {" + NL + "\t\t\t\t\tFeatureInitializer nextExpr = (FeatureInitializer)it.next();" + NL + "\t\t\t\t\ttry {" + NL + "\t\t\t\t\t\tnextExpr.init(instance);" + NL + "\t\t\t\t\t} catch(RuntimeException e) {" + NL + "\t\t\t\t\t\t";
  protected final String TEXT_84 = ".getInstance().logError(\"Feature initialization failed\", e); //$NON-NLS-1$\t\t\t\t\t\t" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t}" + NL + "\t\t\t}" + NL + "\t\t} // end of ObjectInitializer" + NL + "\t\t" + NL + "\t\t/** " + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tinterface FeatureInitializer {" + NL + "\t\t\t/**" + NL + "\t\t\t * @generated" + NL + "\t\t\t */" + NL + "\t\t\tvoid init(EObject contextInstance);" + NL + "\t\t}" + NL + "\t\t" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */\t\t" + NL + "\t\tstatic FeatureInitializer createNewElementFeatureInitializer(EStructuralFeature initFeature, ObjectInitializer[] newObjectInitializers) {" + NL + "\t\t\tfinal EStructuralFeature feature = initFeature;" + NL + "\t\t\tfinal ObjectInitializer[] initializers = newObjectInitializers;" + NL + "\t\t\treturn new FeatureInitializer() {" + NL + "\t\t\t\tpublic void init(EObject contextInstance) {" + NL + "\t\t\t\t\tfor (int i = 0; i < initializers.length; i++) {" + NL + "\t\t\t\t\t\tEObject newInstance = initializers[i].element.getEPackage().getEFactoryInstance().create(initializers[i].element);" + NL + "\t\t\t\t\t\tif(feature.isMany()) {" + NL + "\t\t\t\t\t\t\t((";
  protected final String TEXT_85 = ")contextInstance.eGet(feature)).add(newInstance);" + NL + "\t\t\t\t\t\t} else {" + NL + "\t\t\t\t\t\t\tcontextInstance.eSet(feature, newInstance);" + NL + "\t\t\t\t\t\t}\t\t\t\t\t\t" + NL + "\t\t\t\t\t\tinitializers[i].init(newInstance);" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t}" + NL + "\t\t\t};" + NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */\t\t" + NL + "\t\tstatic FeatureInitializer createExpressionFeatureInitializer(EStructuralFeature initFeature, ";
  protected final String TEXT_86 = " valueExpression) {" + NL + "\t\t\tfinal EStructuralFeature feature = initFeature;" + NL + "\t\t\tfinal ";
  protected final String TEXT_87 = " expression = valueExpression;" + NL + "\t\t\treturn new FeatureInitializer() {\t\t\t\t" + NL + "\t\t\t\tpublic void init(EObject contextInstance) {" + NL + "\t\t\t\t\texpression.assignTo(feature, contextInstance);" + NL + "\t\t\t\t}" + NL + "\t\t\t};\t\t\t" + NL + "\t\t}\t\t";
  protected final String TEXT_88 = NL + "\t\t/** " + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tstatic class ";
  protected final String TEXT_89 = " {";
  protected final String TEXT_90 = NL;
  protected final String TEXT_91 = NL + "/**" + NL + " * @generated" + NL + " */" + NL + "private static ";
  protected final String TEXT_92 = " ";
  protected final String TEXT_93 = "(";
  protected final String TEXT_94 = " self";
  protected final String TEXT_95 = ", ";
  protected final String TEXT_96 = " ";
  protected final String TEXT_97 = ") {" + NL + "\t// TODO: implement this method" + NL + "\t// Ensure that you remove @generated or mark it @generated NOT" + NL + "\t" + NL + "\tthrow new ";
  protected final String TEXT_98 = ".NoImplException(\"No user java implementation provided in '";
  protected final String TEXT_99 = "' operation\"); //$NON-NLS-1$" + NL + "}";
  protected final String TEXT_100 = NL + "\t\t} //";
  protected final String TEXT_101 = NL + "\t} // end of Initializers";
  protected final String TEXT_102 = NL + "}";
  protected final String TEXT_103 = NL;

  public String generate(Object argument)
  {

    stringBuffer.append(TEXT_4);
    
importManager.registerInnerClass("Initializers");
importManager.registerInnerClass("IObjectInitializer");
importManager.registerInnerClass("ObjectInitializer");
importManager.registerInnerClass("FeatureInitializer");
final String javaExprContainer = "Java";

}

    stringBuffer.append(TEXT_79);
    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
    stringBuffer.append(TEXT_80);
    stringBuffer.append(importManager.getImportedName("java.util.List"));
    stringBuffer.append(TEXT_81);
    stringBuffer.append(importManager.getImportedName("java.util.ArrayList"));
    stringBuffer.append(TEXT_82);
    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
    stringBuffer.append(TEXT_83);
    stringBuffer.append(pluginClassName);
    stringBuffer.append(TEXT_84);
    stringBuffer.append(importManager.getImportedName("java.util.Collection"));
    stringBuffer.append(TEXT_85);
    stringBuffer.append(importManager.getImportedName(expressionProviders.getAbstractExpressionQualifiedClassName()));
    stringBuffer.append(TEXT_86);
    stringBuffer.append(importManager.getImportedName(expressionProviders.getAbstractExpressionQualifiedClassName()));
    stringBuffer.append(TEXT_87);
    
	if(!javaInitializers.isEmpty()) {

    stringBuffer.append(TEXT_87);
    stringBuffer.append(javaExprContainer);
    stringBuffer.append(TEXT_88);
    stringBuffer.append(javaExprContainer);
    stringBuffer.append(TEXT_89);
    
		for(GenFeatureValueSpec __genValueExpression : javaInitializers) {
			GenClassifier __genExprContext = __genValueExpression.getFeatureSeqInitializer().getElementClass();

			if(!(provider instanceof GenJavaExpressionProvider)) continue;
			String __genExprResultType = provider.getQualifiedInstanceClassName(__genValueExpression.getFeature());

    stringBuffer.append(TEXT_90);
    
/* 
ValueExpression __genValueExpression

		__exprResultTypeQualifiedName = __genExprProvider.getQualifiedInstanceClassName((org.eclipse.emf.codegen.ecore.genmodel.GenClassifier)__genExprResultTypeObj);
	String __exprJavaOperName = ((org.eclipse.gmf.codegen.gmfgen.GenJavaExpressionProvider)__genExprProvider).getOperationName(__genValueExpression);

    stringBuffer.append(TEXT_90);
    stringBuffer.append(importManager.getImportedName(__exprResultTypeQualifiedName));
    stringBuffer.append(TEXT_91);
    stringBuffer.append(importManager.getImportedName(__exprResultTypeQualifiedName));
    stringBuffer.append(TEXT_92);
    stringBuffer.append(__exprJavaOperName);
    stringBuffer.append(TEXT_93);
    stringBuffer.append(importManager.getImportedName(evalCtxQualifiedName));
    stringBuffer.append(TEXT_94);
    
	for(java.util.Iterator envVarIt = __exprEnvVariables.keySet().iterator(); envVarIt.hasNext();) {
		String __nextVarName = (String)envVarIt.next();

		String qualifiedTypeName = __genExprProvider.getQualifiedInstanceClassName(nextVariableType);

	
    stringBuffer.append(TEXT_94);
    stringBuffer.append(importManager.getImportedName(qualifiedTypeName));
    stringBuffer.append(TEXT_95);
    stringBuffer.append(importManager.getImportedName(qualifiedTypeName));
    stringBuffer.append(TEXT_96);
    stringBuffer.append(__nextVarName);
    	} 

    stringBuffer.append(TEXT_96);
    stringBuffer.append(__importedAbstractExpr);
    stringBuffer.append(TEXT_97);
    stringBuffer.append(__importedAbstractExpr);
    stringBuffer.append(TEXT_98);
    stringBuffer.append(__exprJavaOperName);
    stringBuffer.append(TEXT_99);
    
} /* end of GenJavaExpressionProvider */

    
		}

    stringBuffer.append(TEXT_100);
    stringBuffer.append(javaExprContainer);
    	} /* end of javaInitializers */ 
    stringBuffer.append(TEXT_100);
    }
    stringBuffer.append(TEXT_101);
    }
    stringBuffer.append(TEXT_102);
    importManager.emitSortedImports();
    stringBuffer.append(TEXT_103);
    return stringBuffer.toString();
  }
}





<%
importManager.registerInnerClass("Initializers");
importManager.registerInnerClass("IObjectInitializer");
importManager.registerInnerClass("ObjectInitializer");
importManager.registerInnerClass("FeatureInitializer");
final String javaExprContainer = "Java";

		/**
		 * @generated
		 */
		public static final IObjectInitializer <%=nextFtSeqInitializer.getInitializerFieldName(id)%> = new ObjectInitializer(<%=nextFtSeqInitializer.getElementClassAccessor(importManager)%>) {
<%			} else {%>
		ObjectInitializer <%=nextFtSeqInitializer.getInitializerFieldName(id)%>() {
			return new ObjectInitializer(<%=nextFtSeqInitializer.getElementClassAccessor(importManager)%>) {

		
		/** 
		 * @generated
		 */		
		public static interface IObjectInitializer {
			/** 
			 * @generated
			 */		
			public void init(<%=importManager.getImportedName("org.eclipse.emf.ecore.EObject")%> instance);
		}
		
		/** 
		 * @generated
		 */	
		public static abstract class ObjectInitializer implements IObjectInitializer {
			/** 
			 * @generated
			 */		

Return to bug 161027

Lines 49-55 Link Here

(-)src-templates/org/eclipse/gmf/codegen/templates/providers/ElementTypesGenerator.java (-47 / +51 lines)
49	protected final String TEXT_30 = NL + "\t\t}" + NL + "\t\treturn KNOWN_ELEMENT_TYPES.contains(elementType);" + NL + "\t}";	49	protected final String TEXT_30 = NL + "\t\t}" + NL + "\t\treturn KNOWN_ELEMENT_TYPES.contains(elementType);" + NL + "\t}";
50	protected final String TEXT_31 = NL + NL + "\t/*" + NL + "\t @generated" + NL + "\t */" + NL + "\tpublic static class Initializers {";	50	protected final String TEXT_31 = NL + NL + "\t/*" + NL + "\t @generated" + NL + "\t */" + NL + "\tpublic static class Initializers {";
51	protected final String TEXT_32 = "\t\t";	51	protected final String TEXT_32 = "\t\t";
52	protected final String TEXT_33 = NL + "\t\t/*" + NL + "\t\t @generated" + NL + "\t\t */" + NL + "\t\tpublic static final ObjectInitializer ";	52	protected final String TEXT_33 = NL + "\t\t/*" + NL + "\t\t @generated" + NL + "\t\t */" + NL + "\t\tpublic static final IObjectInitializer ";
53	protected final String TEXT_34 = " = new ObjectInitializer(";	53	protected final String TEXT_34 = " = new ObjectInitializer(";
54	protected final String TEXT_35 = ") {";	54	protected final String TEXT_35 = ") {";
55	protected final String TEXT_36 = NL + "\t\tObjectInitializer ";	55	protected final String TEXT_36 = NL + "\t\tObjectInitializer ";
Lines 95-124 Link Here
95	protected final String TEXT_76 = " ObjectInitializer" + NL + "\t\t\t}";	95	protected final String TEXT_76 = " ObjectInitializer" + NL + "\t\t\t}";
96	protected final String TEXT_77 = NL + "\t\t}; // ";	96	protected final String TEXT_77 = NL + "\t\t}; // ";
97	protected final String TEXT_78 = " ObjectInitializer";	97	protected final String TEXT_78 = " ObjectInitializer";
98	protected final String TEXT_79 = NL + "\t" + NL + "\t\t/** " + NL + "\t\t * @generated" + NL + "\t\t /\t" + NL + "\t\tprivate Initializers() {" + NL + "\t\t}" + NL + "\t\t" + NL + "\t\t/* " + NL + "\t\t * @generated" + NL + "\t\t /\t" + NL + "\t\tpublic static abstract class ObjectInitializer {" + NL + "\t\t\t/* " + NL + "\t\t\t * @generated" + NL + "\t\t\t /\t\t" + NL + "\t\t\tfinal EClass element;\t\t" + NL + "\t\t\t/* " + NL + "\t\t\t * @generated" + NL + "\t\t\t */\t\t" + NL + "\t\t\tprivate ";	98	protected final String TEXT_79 = NL + "\t" + NL + "\t\t/** " + NL + "\t\t * @generated" + NL + "\t\t /\t" + NL + "\t\tprivate Initializers() {" + NL + "\t\t}" + NL + "\t\t" + NL + "\t\t/* " + NL + "\t\t * @generated" + NL + "\t\t /\t\t" + NL + "\t\tpublic static interface IObjectInitializer {" + NL + "\t\t\t/* " + NL + "\t\t\t * @generated" + NL + "\t\t\t */\t\t" + NL + "\t\t\tpublic void init(";
99	protected final String TEXT_80 = " featureInitializers = new ";	99	protected final String TEXT_80 = " instance);" + NL + "\t\t}" + NL + "\t\t" + NL + "\t\t/** " + NL + "\t\t * @generated" + NL + "\t\t /\t" + NL + "\t\tpublic static abstract class ObjectInitializer implements IObjectInitializer {" + NL + "\t\t\t/* " + NL + "\t\t\t * @generated" + NL + "\t\t\t /\t\t" + NL + "\t\t\tfinal EClass element;\t\t" + NL + "\t\t\t/* " + NL + "\t\t\t * @generated" + NL + "\t\t\t */\t\t" + NL + "\t\t\tprivate ";
100	protected final String TEXT_81 = "();" + NL + "\t\t\t/** " + NL + "\t\t\t * @generated" + NL + "\t\t\t /" + NL + "\t\t\tObjectInitializer(EClass element) {" + NL + "\t\t\t\tthis.element = element;" + NL + "\t\t\t\tinit();" + NL + "\t\t\t}" + NL + "\t\t\t/" + NL + "\t\t \t @generated" + NL + "\t\t \t /" + NL + "\t\t \tprotected abstract void init();\t\t\t\t\t\t\t" + NL + "\t\t\t/* " + NL + "\t\t\t * @generated" + NL + "\t\t\t /" + NL + "\t\t\tprotected final FeatureInitializer add(FeatureInitializer initializer) {" + NL + "\t\t\t\tfeatureInitializers.add(initializer);" + NL + "\t\t\t\treturn initializer;" + NL + "\t\t\t}" + NL + "\t\t\t/* " + NL + "\t\t\t * @generated" + NL + "\t\t\t */\t\t" + NL + "\t\t\tpublic void init(";	100	protected final String TEXT_81 = " featureInitializers = new ";
101	protected final String TEXT_82 = " instance) {" + NL + "\t\t\t\tfor (java.util.Iterator it = featureInitializers.iterator(); it.hasNext();) {" + NL + "\t\t\t\t\tFeatureInitializer nextExpr = (FeatureInitializer)it.next();" + NL + "\t\t\t\t\ttry {" + NL + "\t\t\t\t\t\tnextExpr.init(instance);" + NL + "\t\t\t\t\t} catch(RuntimeException e) {" + NL + "\t\t\t\t\t\t";	101	protected final String TEXT_82 = "();" + NL + "\t\t\t/** " + NL + "\t\t\t * @generated" + NL + "\t\t\t /" + NL + "\t\t\tObjectInitializer(EClass element) {" + NL + "\t\t\t\tthis.element = element;" + NL + "\t\t\t\tinit();" + NL + "\t\t\t}" + NL + "\t\t\t/" + NL + "\t\t \t @generated" + NL + "\t\t \t /" + NL + "\t\t \tprotected abstract void init();\t\t\t\t\t\t\t" + NL + "\t\t\t/* " + NL + "\t\t\t * @generated" + NL + "\t\t\t /" + NL + "\t\t\tprotected final FeatureInitializer add(FeatureInitializer initializer) {" + NL + "\t\t\t\tfeatureInitializers.add(initializer);" + NL + "\t\t\t\treturn initializer;" + NL + "\t\t\t}" + NL + "\t\t\t/* " + NL + "\t\t\t * @generated" + NL + "\t\t\t */\t\t" + NL + "\t\t\tpublic void init(";
102	protected final String TEXT_83 = ".getInstance().logError(\"Feature initialization failed\", e); //$NON-NLS-1$\t\t\t\t\t\t" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t}" + NL + "\t\t\t}" + NL + "\t\t} // end of ObjectInitializer" + NL + "\t\t" + NL + "\t\t/** " + NL + "\t\t * @generated" + NL + "\t\t /" + NL + "\t\tinterface FeatureInitializer {" + NL + "\t\t\t/" + NL + "\t\t\t @generated" + NL + "\t\t\t /" + NL + "\t\t\tvoid init(EObject contextInstance);" + NL + "\t\t}" + NL + "\t\t" + NL + "\t\t/" + NL + "\t\t @generated" + NL + "\t\t */\t\t" + NL + "\t\tstatic FeatureInitializer createNewElementFeatureInitializer(EStructuralFeature initFeature, ObjectInitializer[] newObjectInitializers) {" + NL + "\t\t\tfinal EStructuralFeature feature = initFeature;" + NL + "\t\t\tfinal ObjectInitializer[] initializers = newObjectInitializers;" + NL + "\t\t\treturn new FeatureInitializer() {" + NL + "\t\t\t\tpublic void init(EObject contextInstance) {" + NL + "\t\t\t\t\tfor (int i = 0; i < initializers.length; i++) {" + NL + "\t\t\t\t\t\tEObject newInstance = initializers[i].element.getEPackage().getEFactoryInstance().create(initializers[i].element);" + NL + "\t\t\t\t\t\tif(feature.isMany()) {" + NL + "\t\t\t\t\t\t\t((";	102	protected final String TEXT_83 = " instance) {" + NL + "\t\t\t\tfor (java.util.Iterator it = featureInitializers.iterator(); it.hasNext();) {" + NL + "\t\t\t\t\tFeatureInitializer nextExpr = (FeatureInitializer)it.next();" + NL + "\t\t\t\t\ttry {" + NL + "\t\t\t\t\t\tnextExpr.init(instance);" + NL + "\t\t\t\t\t} catch(RuntimeException e) {" + NL + "\t\t\t\t\t\t";
103	protected final String TEXT_84 = ")contextInstance.eGet(feature)).add(newInstance);" + NL + "\t\t\t\t\t\t} else {" + NL + "\t\t\t\t\t\t\tcontextInstance.eSet(feature, newInstance);" + NL + "\t\t\t\t\t\t}\t\t\t\t\t\t" + NL + "\t\t\t\t\t\tinitializers[i].init(newInstance);" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t}" + NL + "\t\t\t};" + NL + "\t\t}" + NL + "" + NL + "\t\t/*" + NL + "\t\t @generated" + NL + "\t\t */\t\t" + NL + "\t\tstatic FeatureInitializer createExpressionFeatureInitializer(EStructuralFeature initFeature, ";	103	protected final String TEXT_84 = ".getInstance().logError(\"Feature initialization failed\", e); //$NON-NLS-1$\t\t\t\t\t\t" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t}" + NL + "\t\t\t}" + NL + "\t\t} // end of ObjectInitializer" + NL + "\t\t" + NL + "\t\t/** " + NL + "\t\t * @generated" + NL + "\t\t /" + NL + "\t\tinterface FeatureInitializer {" + NL + "\t\t\t/" + NL + "\t\t\t @generated" + NL + "\t\t\t /" + NL + "\t\t\tvoid init(EObject contextInstance);" + NL + "\t\t}" + NL + "\t\t" + NL + "\t\t/" + NL + "\t\t @generated" + NL + "\t\t */\t\t" + NL + "\t\tstatic FeatureInitializer createNewElementFeatureInitializer(EStructuralFeature initFeature, ObjectInitializer[] newObjectInitializers) {" + NL + "\t\t\tfinal EStructuralFeature feature = initFeature;" + NL + "\t\t\tfinal ObjectInitializer[] initializers = newObjectInitializers;" + NL + "\t\t\treturn new FeatureInitializer() {" + NL + "\t\t\t\tpublic void init(EObject contextInstance) {" + NL + "\t\t\t\t\tfor (int i = 0; i < initializers.length; i++) {" + NL + "\t\t\t\t\t\tEObject newInstance = initializers[i].element.getEPackage().getEFactoryInstance().create(initializers[i].element);" + NL + "\t\t\t\t\t\tif(feature.isMany()) {" + NL + "\t\t\t\t\t\t\t((";
104	protected final String TEXT_85 = " valueExpression) {" + NL + "\t\t\tfinal EStructuralFeature feature = initFeature;" + NL + "\t\t\tfinal ";	104	protected final String TEXT_85 = ")contextInstance.eGet(feature)).add(newInstance);" + NL + "\t\t\t\t\t\t} else {" + NL + "\t\t\t\t\t\t\tcontextInstance.eSet(feature, newInstance);" + NL + "\t\t\t\t\t\t}\t\t\t\t\t\t" + NL + "\t\t\t\t\t\tinitializers[i].init(newInstance);" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t}" + NL + "\t\t\t};" + NL + "\t\t}" + NL + "" + NL + "\t\t/*" + NL + "\t\t @generated" + NL + "\t\t */\t\t" + NL + "\t\tstatic FeatureInitializer createExpressionFeatureInitializer(EStructuralFeature initFeature, ";
105	protected final String TEXT_86 = " expression = valueExpression;" + NL + "\t\t\treturn new FeatureInitializer() {\t\t\t\t" + NL + "\t\t\t\tpublic void init(EObject contextInstance) {" + NL + "\t\t\t\t\texpression.assignTo(feature, contextInstance);" + NL + "\t\t\t\t}" + NL + "\t\t\t};\t\t\t" + NL + "\t\t}\t\t";	105	protected final String TEXT_86 = " valueExpression) {" + NL + "\t\t\tfinal EStructuralFeature feature = initFeature;" + NL + "\t\t\tfinal ";
106	protected final String TEXT_87 = NL + "\t\t/** " + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tstatic class ";	106	protected final String TEXT_87 = " expression = valueExpression;" + NL + "\t\t\treturn new FeatureInitializer() {\t\t\t\t" + NL + "\t\t\t\tpublic void init(EObject contextInstance) {" + NL + "\t\t\t\t\texpression.assignTo(feature, contextInstance);" + NL + "\t\t\t\t}" + NL + "\t\t\t};\t\t\t" + NL + "\t\t}\t\t";
107	protected final String TEXT_88 = " {";	107	protected final String TEXT_88 = NL + "\t\t/** " + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tstatic class ";
108	protected final String TEXT_89 = NL;	108	protected final String TEXT_89 = " {";
109	protected final String TEXT_90 = NL + "/*" + NL + " @generated" + NL + " */" + NL + "private static ";	109	protected final String TEXT_90 = NL;
110	protected final String TEXT_91 = " ";	110	protected final String TEXT_91 = NL + "/*" + NL + " @generated" + NL + " */" + NL + "private static ";
111	protected final String TEXT_92 = "(";	111	protected final String TEXT_92 = " ";
112	protected final String TEXT_93 = " self";	112	protected final String TEXT_93 = "(";
113	protected final String TEXT_94 = ", ";	113	protected final String TEXT_94 = " self";
114	protected final String TEXT_95 = " ";	114	protected final String TEXT_95 = ", ";
115	protected final String TEXT_96 = ") {" + NL + "\t// TODO: implement this method" + NL + "\t// Ensure that you remove @generated or mark it @generated NOT" + NL + "\t" + NL + "\tthrow new ";	115	protected final String TEXT_96 = " ";
116	protected final String TEXT_97 = ".NoImplException(\"No user java implementation provided in '";	116	protected final String TEXT_97 = ") {" + NL + "\t// TODO: implement this method" + NL + "\t// Ensure that you remove @generated or mark it @generated NOT" + NL + "\t" + NL + "\tthrow new ";
117	protected final String TEXT_98 = "' operation\"); //$NON-NLS-1$" + NL + "}";	117	protected final String TEXT_98 = ".NoImplException(\"No user java implementation provided in '";
118	protected final String TEXT_99 = NL + "\t\t} //";	118	protected final String TEXT_99 = "' operation\"); //$NON-NLS-1$" + NL + "}";
119	protected final String TEXT_100 = NL + "\t} // end of Initializers";	119	protected final String TEXT_100 = NL + "\t\t} //";
120	protected final String TEXT_101 = NL + "}";	120	protected final String TEXT_101 = NL + "\t} // end of Initializers";
121	protected final String TEXT_102 = NL;	121	protected final String TEXT_102 = NL + "}";
		122	protected final String TEXT_103 = NL;
122		123
123	public String generate(Object argument)	124	public String generate(Object argument)
124	{	125	{
Lines 140-145 Link Here
140	stringBuffer.append(TEXT_4);	141	stringBuffer.append(TEXT_4);
141		142
142	importManager.registerInnerClass("Initializers");	143	importManager.registerInnerClass("Initializers");
		144	importManager.registerInnerClass("IObjectInitializer");
143	importManager.registerInnerClass("ObjectInitializer");	145	importManager.registerInnerClass("ObjectInitializer");
144	importManager.registerInnerClass("FeatureInitializer");	146	importManager.registerInnerClass("FeatureInitializer");
145	final String javaExprContainer = "Java";	147	final String javaExprContainer = "Java";
Lines 430-455 Link Here
430	}	432	}
431		433
432	stringBuffer.append(TEXT_79);	434	stringBuffer.append(TEXT_79);
433	stringBuffer.append(importManager.getImportedName("java.util.List"));	435	stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
434	stringBuffer.append(TEXT_80);	436	stringBuffer.append(TEXT_80);
435	stringBuffer.append(importManager.getImportedName("java.util.ArrayList"));	437	stringBuffer.append(importManager.getImportedName("java.util.List"));
436	stringBuffer.append(TEXT_81);	438	stringBuffer.append(TEXT_81);
437	stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));	439	stringBuffer.append(importManager.getImportedName("java.util.ArrayList"));
438	stringBuffer.append(TEXT_82);	440	stringBuffer.append(TEXT_82);
439	stringBuffer.append(pluginClassName);	441	stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
440	stringBuffer.append(TEXT_83);	442	stringBuffer.append(TEXT_83);
441	stringBuffer.append(importManager.getImportedName("java.util.Collection"));	443	stringBuffer.append(pluginClassName);
442	stringBuffer.append(TEXT_84);	444	stringBuffer.append(TEXT_84);
443	stringBuffer.append(importManager.getImportedName(expressionProviders.getAbstractExpressionQualifiedClassName()));	445	stringBuffer.append(importManager.getImportedName("java.util.Collection"));
444	stringBuffer.append(TEXT_85);	446	stringBuffer.append(TEXT_85);
445	stringBuffer.append(importManager.getImportedName(expressionProviders.getAbstractExpressionQualifiedClassName()));	447	stringBuffer.append(importManager.getImportedName(expressionProviders.getAbstractExpressionQualifiedClassName()));
446	stringBuffer.append(TEXT_86);	448	stringBuffer.append(TEXT_86);
		449	stringBuffer.append(importManager.getImportedName(expressionProviders.getAbstractExpressionQualifiedClassName()));
		450	stringBuffer.append(TEXT_87);
447		451
448	if(!javaInitializers.isEmpty()) {	452	if(!javaInitializers.isEmpty()) {
449		453
450	stringBuffer.append(TEXT_87);
451	stringBuffer.append(javaExprContainer);
452	stringBuffer.append(TEXT_88);	454	stringBuffer.append(TEXT_88);
		455	stringBuffer.append(javaExprContainer);
		456	stringBuffer.append(TEXT_89);
453		457
454	for(GenFeatureValueSpec __genValueExpression : javaInitializers) {	458	for(GenFeatureValueSpec __genValueExpression : javaInitializers) {
455	GenClassifier __genExprContext = __genValueExpression.getFeatureSeqInitializer().getElementClass();	459	GenClassifier __genExprContext = __genValueExpression.getFeatureSeqInitializer().getElementClass();
Lines 457-463 Link Here
457	if(!(provider instanceof GenJavaExpressionProvider)) continue;	461	if(!(provider instanceof GenJavaExpressionProvider)) continue;
458	String __genExprResultType = provider.getQualifiedInstanceClassName(__genValueExpression.getFeature());	462	String __genExprResultType = provider.getQualifiedInstanceClassName(__genValueExpression.getFeature());
459		463
460	stringBuffer.append(TEXT_89);	464	stringBuffer.append(TEXT_90);
461		465
462	/*	466	/*
463	ValueExpression __genValueExpression	467	ValueExpression __genValueExpression
Lines 478-490 Link Here
478	__exprResultTypeQualifiedName = __genExprProvider.getQualifiedInstanceClassName((org.eclipse.emf.codegen.ecore.genmodel.GenClassifier)__genExprResultTypeObj);	482	__exprResultTypeQualifiedName = __genExprProvider.getQualifiedInstanceClassName((org.eclipse.emf.codegen.ecore.genmodel.GenClassifier)__genExprResultTypeObj);
479	String __exprJavaOperName = ((org.eclipse.gmf.codegen.gmfgen.GenJavaExpressionProvider)__genExprProvider).getOperationName(__genValueExpression);	483	String __exprJavaOperName = ((org.eclipse.gmf.codegen.gmfgen.GenJavaExpressionProvider)__genExprProvider).getOperationName(__genValueExpression);
480		484
481	stringBuffer.append(TEXT_90);
482	stringBuffer.append(importManager.getImportedName(__exprResultTypeQualifiedName));
483	stringBuffer.append(TEXT_91);	485	stringBuffer.append(TEXT_91);
484	stringBuffer.append(__exprJavaOperName);	486	stringBuffer.append(importManager.getImportedName(__exprResultTypeQualifiedName));
485	stringBuffer.append(TEXT_92);	487	stringBuffer.append(TEXT_92);
486	stringBuffer.append(importManager.getImportedName(evalCtxQualifiedName));	488	stringBuffer.append(__exprJavaOperName);
487	stringBuffer.append(TEXT_93);	489	stringBuffer.append(TEXT_93);
		490	stringBuffer.append(importManager.getImportedName(evalCtxQualifiedName));
		491	stringBuffer.append(TEXT_94);
488		492
489	for(java.util.Iterator envVarIt = __exprEnvVariables.keySet().iterator(); envVarIt.hasNext();) {	493	for(java.util.Iterator envVarIt = __exprEnvVariables.keySet().iterator(); envVarIt.hasNext();) {
490	String __nextVarName = (String)envVarIt.next();	494	String __nextVarName = (String)envVarIt.next();
Lines 492-522 Link Here
492	String qualifiedTypeName = __genExprProvider.getQualifiedInstanceClassName(nextVariableType);	496	String qualifiedTypeName = __genExprProvider.getQualifiedInstanceClassName(nextVariableType);
493		497
494		498
495	stringBuffer.append(TEXT_94);
496	stringBuffer.append(importManager.getImportedName(qualifiedTypeName));
497	stringBuffer.append(TEXT_95);	499	stringBuffer.append(TEXT_95);
		500	stringBuffer.append(importManager.getImportedName(qualifiedTypeName));
		501	stringBuffer.append(TEXT_96);
498	stringBuffer.append(__nextVarName);	502	stringBuffer.append(__nextVarName);
499	}	503	}
500		504
501	stringBuffer.append(TEXT_96);
502	stringBuffer.append(__importedAbstractExpr);
503	stringBuffer.append(TEXT_97);	505	stringBuffer.append(TEXT_97);
504	stringBuffer.append(__exprJavaOperName);	506	stringBuffer.append(__importedAbstractExpr);
505	stringBuffer.append(TEXT_98);	507	stringBuffer.append(TEXT_98);
		508	stringBuffer.append(__exprJavaOperName);
		509	stringBuffer.append(TEXT_99);
506		510
507	} /* end of GenJavaExpressionProvider */	511	} /* end of GenJavaExpressionProvider */
508		512
509		513
510	}	514	}
511		515
512	stringBuffer.append(TEXT_99);	516	stringBuffer.append(TEXT_100);
513	stringBuffer.append(javaExprContainer);	517	stringBuffer.append(javaExprContainer);
514	} /* end of javaInitializers */	518	} /* end of javaInitializers */
515	stringBuffer.append(TEXT_100);
516	}
517	stringBuffer.append(TEXT_101);	519	stringBuffer.append(TEXT_101);
518	importManager.emitSortedImports();	520	}
519	stringBuffer.append(TEXT_102);	521	stringBuffer.append(TEXT_102);
		522	importManager.emitSortedImports();
		523	stringBuffer.append(TEXT_103);
520	return stringBuffer.toString();	524	return stringBuffer.toString();
521	}	525	}
522	}	526	}

Lines 9-14 Link Here

(-)templates/providers/ElementTypes.javajet (-2 / +13 lines)
9		9
10	<%	10	<%
11	importManager.registerInnerClass("Initializers");	11	importManager.registerInnerClass("Initializers");
		12	importManager.registerInnerClass("IObjectInitializer");
12	importManager.registerInnerClass("ObjectInitializer");	13	importManager.registerInnerClass("ObjectInitializer");
13	importManager.registerInnerClass("FeatureInitializer");	14	importManager.registerInnerClass("FeatureInitializer");
14	final String javaExprContainer = "Java";	15	final String javaExprContainer = "Java";
Lines 279-285 Link Here
279	/**	280	/**
280	* @generated	281	* @generated
281	*/	282	*/
282	public static final ObjectInitializer <%=nextFtSeqInitializer.getInitializerFieldName(id)%> = new ObjectInitializer(<%=nextFtSeqInitializer.getElementClassAccessor(importManager)%>) {	283	public static final IObjectInitializer <%=nextFtSeqInitializer.getInitializerFieldName(id)%> = new ObjectInitializer(<%=nextFtSeqInitializer.getElementClassAccessor(importManager)%>) {
283	<% } else {%>	284	<% } else {%>
284	ObjectInitializer <%=nextFtSeqInitializer.getInitializerFieldName(id)%>() {	285	ObjectInitializer <%=nextFtSeqInitializer.getInitializerFieldName(id)%>() {
285	return new ObjectInitializer(<%=nextFtSeqInitializer.getElementClassAccessor(importManager)%>) {	286	return new ObjectInitializer(<%=nextFtSeqInitializer.getElementClassAccessor(importManager)%>) {
Lines 326-333 Link Here
326		327
327	/**	328	/**
328	* @generated	329	* @generated
		330	*/
		331	public static interface IObjectInitializer {
		332	/**
		333	* @generated
		334	*/
		335	public void init(<%=importManager.getImportedName("org.eclipse.emf.ecore.EObject")%> instance);
		336	}
		337
		338	/**
		339	* @generated
329	*/	340	*/
330	public static abstract class ObjectInitializer {	341	public static abstract class ObjectInitializer implements IObjectInitializer {
331	/**	342	/**
332	* @generated	343	* @generated
333	*/	344	*/