EDIT: Implemented generator patter for more adaptive list setters.

Author: tsaglam

src/main/java/jce/generators/WrapperGenerator.xtend

@@ -20,6 +20,7 @@ import static jce.properties.TextProperty.WRAPPER_PACKAGE
  */
 final class WrapperGenerator extends ClassGenerator {
 	IJavaProject javaProject
+	GeneratedEcoreMetamodel metamodel
 
 	/**
 	 * Basic constructor, sets the properties.
@@ -36,6 +37,7 @@ final class WrapperGenerator extends ClassGenerator {
 	def void buildWrappers(GeneratedEcoreMetamodel metamodel, IProject project) {
 		logger.info("Starting the wrapper generation...")
 		this.javaProject = JavaCore.create(project)
+		this.metamodel = metamodel
 		createFolder(wrapperFolder, project) // build wrapper base folder
 		buildWrappers(metamodel.root, "")
 		ResourceRefresher.refresh(project, SOURCE_FOLDER.get) // makes wrappers visible in the Eclipse IDE
@@ -80,7 +82,7 @@ final class WrapperGenerator extends ClassGenerator {
 	 * Creates a Xtend Wrapper in a package path with a specific name. 
 	 */
 	def private void createXtendWrapper(EClass eClass, String path) {
-		val wrapper = new WrapperRepresentation(eClass, javaProject, properties) // build wrapper representation
+		val wrapper = new WrapperRepresentation(eClass, javaProject, metamodel.intermediateModel, properties) // build wrapper representation
 		val wrapperPath = append(WRAPPER_PACKAGE.get, path) // add wrapper prefix
 		createClass(wrapperPath, '''«wrapper.name».xtend''', wrapper.content, javaProject.project) // create wrapper
 	}

src/main/java/jce/generators/WrapperRepresentation.xtend

@@ -19,6 +19,9 @@ import static jce.properties.TextProperty.WRAPPER_SUFFIX
 import org.eclipse.emf.ecore.InternalEObject
 import org.eclipse.emf.ecore.EObject
 import org.eclipse.emf.common.notify.Notifier
+import jce.util.IntermediateModelSearcher
+import eme.model.IntermediateModel
+import org.eclipse.emf.ecore.EStructuralFeature
 
 /**
  * This class models a wrapper class which unifies an origin code type with its Ecore counterparts in the Ecore model
@@ -29,41 +32,28 @@ class WrapperRepresentation {
 	extension PathHelper nameUtil
 	extension EcorificationProperties properties
 
-	final String packageName
-	final String superClass
+	String packageName
+	String superClass
 	final EClass eClass
-	final String wrapperName
-	final String factoryName
-	final List<TypeParameterRepresentation> typeParameters
-	final List<ConstructorRepresentation> wrapperConstructors
-	final Set<String> importDeclarations
-	final String ecoreInterface
-	final String ecoreImplementation
+	String wrapperName
+	String factoryName
+	List<TypeParameterRepresentation> typeParameters
+	List<ConstructorRepresentation> wrapperConstructors
+	Set<String> importDeclarations
+	String ecoreInterface
+	String ecoreImplementation
+	final IntermediateModel model
 
 	/**
 	 * Creates a new wrapper representation from an EClass and the EcorificationProperties. The EClass specifies which
 	 * types are unified. The properties specify the employed naming scheme.
 	 */
-	new(EClass eClass, IJavaProject project, EcorificationProperties properties) {
+	new(EClass eClass, IJavaProject project, IntermediateModel model, EcorificationProperties properties) {
 		this.eClass = eClass
+		this.model = model
 		this.properties = properties
 		nameUtil = new PathHelper('.')
-		packageName = getPackage(eClass)
-		wrapperName = WRAPPER_PREFIX.get + eClass.name + WRAPPER_SUFFIX.get // name of the wrapper class
-		factoryName = '''«PathHelper.capitalize(packageName.getLastSegment)»Factory«FACTORY_SUFFIX.get»'''
-		superClass = getSuperClassName(eClass)
-		wrapperConstructors = ConstructorGenerator.generate(superClass, project, properties)
-		ecoreInterface = append(ECORE_PACKAGE.get, packageName, eClass.name)
-		ecoreImplementation = append(ECORE_PACKAGE.get, packageName, "impl", eClass.name + "Impl")
-		typeParameters = TypeParameterGenerator.generate(eClass.ETypeParameters, ecoreImplementation, project, properties)
-		importDeclarations = new HashSet // add import declarations:
-		if(superClass === null) {
-			importDeclarations += InternalEObject.name
-			importDeclarations += EObject.name
-			importDeclarations += Notifier.name
-		}
-		wrapperConstructors.forEach[constructor|importDeclarations.addAll(constructor.imports)]
-		typeParameters.forEach[parameter|importDeclarations.addAll(parameter.imports)]
+		createContent(project) // creates the important parts
 	}
 
 	/**
@@ -109,6 +99,25 @@ class WrapperRepresentation {
 	def String getPackage() {
 		return packageName
 	}
+	
+	def private createContent(IJavaProject project) {
+		packageName = getPackage(eClass)
+		wrapperName = WRAPPER_PREFIX.get + eClass.name + WRAPPER_SUFFIX.get // name of the wrapper class
+		factoryName = '''«PathHelper.capitalize(packageName.getLastSegment)»Factory«FACTORY_SUFFIX.get»'''
+		superClass = getSuperClassName(eClass)
+		wrapperConstructors = ConstructorGenerator.generate(superClass, project, properties)
+		ecoreInterface = append(ECORE_PACKAGE.get, packageName, eClass.name)
+		ecoreImplementation = append(ECORE_PACKAGE.get, packageName, "impl", eClass.name + "Impl")
+		typeParameters = TypeParameterGenerator.generate(eClass.ETypeParameters, ecoreImplementation, project, properties)
+		importDeclarations = new HashSet // add import declarations:
+		if(superClass === null) {
+			importDeclarations += InternalEObject.name
+			importDeclarations += EObject.name
+			importDeclarations += Notifier.name
+		}
+		wrapperConstructors.forEach[constructor|importDeclarations.addAll(constructor.imports)]
+		typeParameters.forEach[parameter|importDeclarations.addAll(parameter.imports)]
+	}
 
 	/**
 	 * Builds the super type declaration of a wrapper from a String that is either the super type or null.
@@ -196,16 +205,23 @@ class WrapperRepresentation {
 	 * Returns a special setter for every field which was extracted using multiplicities.
 	 */
 	def private String getSpecialSetters() '''
-		«FOR field : eClass.EStructuralFeatures»
+		«FOR field : eClass.EStructuralFeatures SEPARATOR blankLine»
 			«IF field.upperBound == -1»
-				def protected void set«field.name.toFirstUpper» (List «field.name») {
+				def protected void set«field.name.toFirstUpper» (List<«getGenericArguments(field)»> «field.name») {
 					get«field.name.toFirstUpper».clear
 					get«field.name.toFirstUpper».addAll(«field.name»)
 				}
-					
 			«ENDIF»
 		«ENDFOR»
 	''' // TODO (HIGH) replace raw type parameter and add imports
+	
+	def private String getGenericArguments(EStructuralFeature feature) {
+		var String result = ""
+		for (argument : IntermediateModelSearcher.findField(feature, model).genericArguments) {
+			result += argument.typeString
+		}
+		return result
+	}
 
 	/**
 	 * Returns the fully qualified name of the super class of an EClass.

src/main/java/jce/util/EcoreToJavaUtil.xtend

@@ -0,0 +1,59 @@
+package jce.util
+
+import eme.model.IntermediateModel
+import org.eclipse.emf.ecore.EClass
+import org.eclipse.emf.ecore.EStructuralFeature
+import eme.model.ExtractedType
+import eme.model.datatypes.ExtractedField
+import org.eclipse.emf.ecore.ETypeParameter
+import eme.model.datatypes.ExtractedTypeParameter
+import org.eclipse.emf.ecore.EPackage
+
+/**
+ * Utility for finding the counterparts of Ecore elements in an intermediate model.
+ */
+final class IntermediateModelSearcher {
+
+	private new() {
+		throw new AssertionError("Suppress default constructor for noninstantiability")
+	}
+
+	/**
+	 * Finds the correlating ExtractedType of an EClass in an intermediate model.
+	 */
+	def static ExtractedType findType(EClass eClass, IntermediateModel model) {
+		val PathHelper helper = new PathHelper('.')
+		var String fullyQualifiedName = ""
+		var EPackage current = eClass.EPackage
+		while (current !== null) { // iterate through package hierarchy
+			fullyQualifiedName = helper.append(current.name, fullyQualifiedName) // concatenate package with super package name
+			current = current.ESuperPackage
+		}
+		fullyQualifiedName = helper.append(helper.cutFirstSegment(fullyQualifiedName), eClass.name) // cut Ecore package name
+		return model.getType(fullyQualifiedName);
+	}
+
+	/**
+	 * Finds the correlating ExtractedField of an EStructuralFeature in an intermediate model.
+	 */
+	def static ExtractedField findField(EStructuralFeature feature, IntermediateModel model) {
+		for (field : findType(feature.EContainingClass, model)?.fields) { // find correlating extracted class
+			if (field.identifier.equals(feature.name)) { // find correlating extracted field
+				return field
+			}
+		}
+		return null
+	}
+
+	/**
+	 * Finds the correlating ExtractedTypeParameter of an ETypeParameter in an intermediate model.
+	 */
+	def static ExtractedTypeParameter findTypeParameter(ETypeParameter eTypeParameter, EClass eClass, IntermediateModel model) {
+		for (parameter : findType(eClass, model)?.typeParameters) {
+			if (parameter.identifier.equals(eTypeParameter.name)) {
+				return parameter
+			}
+		}
+		return null
+	}
+}