Add test cases from the case study regarding transitive change propagation

bundles/tools.vitruv.applications.umljava/META-INF/MANIFEST.MF

@@ -7,11 +7,7 @@ Bundle-Version: 0.2.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: com.google.guava,
  org.apache.log4j,
- org.eclipse.emf.ecore,
- org.eclipse.core.resources,
- org.eclipse.xtext.xbase.lib,
  org.eclipse.xtend.lib,
- org.eclipse.xtend.lib.macro,
  edu.kit.ipd.sdq.activextendannotations,
  tools.vitruv.domains.uml,
  tools.vitruv.domains.java,
@@ -24,5 +20,6 @@ Require-Bundle: com.google.guava,
  tools.vitruv.extensions.dslsruntime.reactions,
  tools.vitruv.extensions.dslsruntime.mappings,
  tools.vitruv.applications.util.temporary;visibility:=reexport
-Export-Package: tools.vitruv.applications.umljava
+Export-Package: tools.vitruv.applications.umljava,
+ tools.vitruv.applications.umljava.util
 Bundle-Vendor: vitruv.tools

bundles/tools.vitruv.applications.util.temporary/META-INF/MANIFEST.MF

@@ -5,15 +5,11 @@ Comment: This project is only temporary, as the utils will be moved to their res
 Bundle-SymbolicName: tools.vitruv.applications.util.temporary
 Automatic-Module-Name: tools.vitruv.applications.util.temporary
 Bundle-Version: 0.2.0.qualifier
-Require-Bundle: com.google.guava,
- org.eclipse.xtext.xbase.lib,
- org.eclipse.xtend.lib,
- org.eclipse.xtend.lib.macro,
+Require-Bundle: org.eclipse.xtend.lib,
  tools.vitruv.domains.uml,
  tools.vitruv.domains.java,
  tools.vitruv.domains.pcm,
  org.apache.log4j,
- org.eclipse.core.resources,
  edu.kit.ipd.sdq.activextendannotations,
  tools.vitruv.extensions.dslsruntime.reactions,
  tools.vitruv.framework.userinteraction

bundles/tools.vitruv.applications.util.temporary/src/tools/vitruv/applications/util/temporary/java/JavaContainerAndClassifierUtil.xtend

@@ -48,13 +48,12 @@ class JavaContainerAndClassifierUtil {
      * @return the new class with the given attributes
      */
     def static createJavaClass(String name, JavaVisibility visibility, boolean abstr, boolean fin) {
-        val jClass = ClassifiersFactory.eINSTANCE.createClass;
+        val jClass = ClassifiersFactory.eINSTANCE.createClass
         setName(jClass, name)
         setJavaVisibilityModifier(jClass, visibility)
         setAbstract(jClass, abstr)
         setFinal(jClass, fin)
-
-        return jClass;
+        return jClass
     }
 
     /**
@@ -78,13 +77,13 @@ class JavaContainerAndClassifierUtil {
      * @return the new interface
      */
     def static createJavaInterface(String name, List<Interface> superInterfaces) {
-        val jInterface = ClassifiersFactory.eINSTANCE.createInterface;
+        val jInterface = ClassifiersFactory.eINSTANCE.createInterface
         setName(jInterface, name)
-        jInterface.makePublic;
+        jInterface.makePublic
         if (!superInterfaces.nullOrEmpty) {
-            jInterface.extends.addAll(createNamespaceReferenceFromList(superInterfaces));
+            jInterface.extends.addAll(createNamespaceReferenceFromList(superInterfaces))
         }
-        return jInterface;
+        return jInterface
     }
 
     /**
@@ -96,11 +95,11 @@ class JavaContainerAndClassifierUtil {
      * @return the new enum
      */
     def static createJavaEnum(String name, JavaVisibility visibility, List<EnumConstant> constantsList) {
-        val jEnum = ClassifiersFactory.eINSTANCE.createEnumeration;
+        val jEnum = ClassifiersFactory.eINSTANCE.createEnumeration
         setName(jEnum, name)
         setJavaVisibilityModifier(jEnum, visibility)
         addEnumConstantIfNotNull(jEnum, constantsList)
-        return jEnum;
+        return jEnum
     }
 
     /**
@@ -142,7 +141,7 @@ class JavaContainerAndClassifierUtil {
         while (iter.hasNext) {
             val type = (iter.next as NamespaceClassifierReference).classifierReferences.head.target
             if (classif.name.equals(type.name)) {
-                iter.remove;
+                iter.remove
             }
         }
     }
@@ -184,7 +183,7 @@ class JavaContainerAndClassifierUtil {
         val iter = jPackage.compilationUnits.iterator
         while (iter.hasNext) {
             if (iter.next.name.equals(jClassifier.name)) {
-                iter.remove;
+                iter.remove
             }
         }
     }
@@ -193,7 +192,7 @@ class JavaContainerAndClassifierUtil {
         val file = new File(directory + "/package-info.java")
         file.createNewFile
         val writer = new PrintWriter(file)
-        writer.println("package " + packageName + ";")
+        writer.println("package " + packageName + "")
         writer.close
         return file
     }

bundles/tools.vitruv.applications.util.temporary/src/tools/vitruv/applications/util/temporary/java/JavaMemberAndParameterUtil.xtend

@@ -216,7 +216,7 @@ class JavaMemberAndParameterUtil {
         return setterMethod
     }
 
-    static def createSetter(Field field, ClassMethod method) {
+    def static createSetter(Field field, ClassMethod method) {
         method.name = "set" + field.name.toFirstUpper
         method.annotationsAndModifiers.add(ModifiersFactory.eINSTANCE.createPublic)
         method.typeReference = TypesFactory.eINSTANCE.createVoid
@@ -249,7 +249,7 @@ class JavaMemberAndParameterUtil {
         return method
     }
 
-    static def createGetter(Field field, ClassMethod method) {
+    def static createGetter(Field field, ClassMethod method) {
         method.name = "get" + field.name.toFirstUpper
         method.annotationsAndModifiers.add(ModifiersFactory.eINSTANCE.createPublic)
         method.typeReference = EcoreUtil.copy(field.typeReference)
@@ -265,7 +265,7 @@ class JavaMemberAndParameterUtil {
         return method
     }
 
-    def static void addParametersIfNotNull(Parametrizable parametrizable, List<Parameter> params) {
+    def static   addParametersIfNotNull(Parametrizable parametrizable, List<Parameter> params) {
         if (!params.nullOrEmpty) {
             parametrizable.parameters.addAll(params)
         }
@@ -332,7 +332,7 @@ class JavaMemberAndParameterUtil {
         return getJavaClassMethodsWithName(jClass, buildGetterName(jAttributeName))
     }
 
-    def static void removeJavaGettersOfAttribute(Field jAttribute) {
+    def static removeJavaGettersOfAttribute(Field jAttribute) {
         val getters = getJavaGettersOfAttribute(jAttribute)
         if (!getters.nullOrEmpty) {
             for (getter : getters) {
@@ -341,7 +341,7 @@ class JavaMemberAndParameterUtil {
         }
     }
 
-    def static void removeJavaSettersOfAttribute(Field jAttribute) {
+    def static removeJavaSettersOfAttribute(Field jAttribute) {
         val setters = getJavaSettersOfAttribute(jAttribute)
         if (!setters.nullOrEmpty) {
             for (setter : setters) {
@@ -357,7 +357,7 @@ class JavaMemberAndParameterUtil {
      * @param jAttributeWithOldName the Attribute with the new name
      * @param the name of jAttribute before it was renamed
      */
-    def static void renameSettersOfAttribute(Field jAttributeWithnewName, String oldName) {
+    def static renameSettersOfAttribute(Field jAttributeWithnewName, String oldName) {
         val setters = getJavaSettersOfAttribute(jAttributeWithnewName.containingConcreteClassifier, oldName)
         for (setter : setters) {
             renameSetter(setter, jAttributeWithnewName, oldName)
@@ -369,7 +369,7 @@ class JavaMemberAndParameterUtil {
      * Renames the given setter so that it matches the name of the given attribute
      * @param oldNaem new Setter name without set-Prefix
      */
-    def static void renameSetter(ClassMethod setter, Field jAttribute, String oldName) {
+    def static renameSetter(ClassMethod setter, Field jAttribute, String oldName) {
         setter.name = buildSetterName(jAttribute.name)
         for (expStatement : setter.statements.filter(ExpressionStatement)) {
             val selfReference = getAttributeSelfReferenceInExpressionStatement(expStatement, oldName)
@@ -378,7 +378,7 @@ class JavaMemberAndParameterUtil {
 
     }
 
-    def static void updateAttributeTypeInSetters(Field jAttribute) {
+    def static updateAttributeTypeInSetters(Field jAttribute) {
         val setters = getJavaSettersOfAttribute(jAttribute)
         for (setter : setters) {
             updateAttributeTypeInSetter(setter, jAttribute)
@@ -389,7 +389,7 @@ class JavaMemberAndParameterUtil {
      * Assumption: Setter has one parameter and one assignment for the attribute
      * 
      */
-    def static void updateAttributeTypeInSetter(ClassMethod setter, Field jAttribute) {
+    def static updateAttributeTypeInSetter(ClassMethod setter, Field jAttribute) {
         val param = setter.parameters.head
         if (param !== null) {
             param.typeReference = EcoreUtil.copy(jAttribute.typeReference)
@@ -405,7 +405,7 @@ class JavaMemberAndParameterUtil {
      * 
      * @param jAttribute the attribute with the new name
      */
-    def static void renameGettersOfAttribute(Field jAttribute, String oldName) {
+    def static renameGettersOfAttribute(Field jAttribute, String oldName) {
         val getters = getJavaGettersOfAttribute(jAttribute.containingConcreteClassifier, oldName)
         for (getter : getters) {
             renameGetterOfAttribute(getter, jAttribute)
@@ -416,7 +416,7 @@ class JavaMemberAndParameterUtil {
      * Renames the given getter so that it matches the name of the given attribute
      * Assumption: standard getter that only returns the attribute
      */
-    def static void renameGetterOfAttribute(ClassMethod getter, Field jAttribute) {
+    def static renameGetterOfAttribute(ClassMethod getter, Field jAttribute) {
         getter.name = buildGetterName(jAttribute.name)
         val returnStatement = getter.statements.filter(Return).head
         if (returnStatement !== null) {
@@ -429,7 +429,7 @@ class JavaMemberAndParameterUtil {
      * and matches the return type of the getters to the type of the attribute.
      * 
      */
-    def static void updateAttributeTypeInGetters(Field jAttribute) {
+    def static updateAttributeTypeInGetters(Field jAttribute) {
         for (getter : getJavaGettersOfAttribute(jAttribute)) {
             updateAttributeTypeInGetter(getter, jAttribute)
         }
@@ -438,7 +438,7 @@ class JavaMemberAndParameterUtil {
     /**
      * Updates the return type of the given getter to match the return type of the given attribute.
      */
-    def static void updateAttributeTypeInGetter(ClassMethod getter, Field jAttribute) {
+    def static updateAttributeTypeInGetter(ClassMethod getter, Field jAttribute) {
         getter.typeReference = EcoreUtil.copy(jAttribute.typeReference)
     }
 
@@ -477,12 +477,12 @@ class JavaMemberAndParameterUtil {
         return true
     }
 
-    def static void initializeClassMethod(ClassMethod classMethod, Method implementedMethod, boolean ensurePublic) {
+    def static initializeClassMethod(ClassMethod classMethod, Method implementedMethod, boolean ensurePublic) {
         initializeClassMethod(classMethod, implementedMethod.name, implementedMethod.typeReference, implementedMethod.modifiers, implementedMethod.parameters,
             ensurePublic)
     }
 
-    def static void initializeClassMethod(ClassMethod classMethod, String name, TypeReference typeReference, Modifier[] modifiers,
+    def static initializeClassMethod(ClassMethod classMethod, String name, TypeReference typeReference, Modifier[] modifiers,
         Parameter[] parameters, boolean ensurePublic) {
         classMethod.name = name
         if (null !== typeReference) {
@@ -510,7 +510,7 @@ class JavaMemberAndParameterUtil {
                 return currentMethod as ClassMethod
             }
         }
-        null
+        return null
     }
 
     /**

bundles/tools.vitruv.applications.util.temporary/src/tools/vitruv/applications/util/temporary/java/JavaModifierUtil.xtend

@@ -30,7 +30,7 @@ class JavaModifierUtil {
      * @param visibility the java visibility to set
      * 
      */
-    def static void setJavaVisibilityModifier(AnnotableAndModifiable modifiable, JavaVisibility visibility) {
+    def static setJavaVisibilityModifier(AnnotableAndModifiable modifiable, JavaVisibility visibility) {
         if (visibility == JavaVisibility.PACKAGE) {
             removeJavaVisibilityModifiers(modifiable)
         } else {
@@ -120,7 +120,7 @@ class JavaModifierUtil {
      * @param the name to set
      * @throws IllegalArgumentException if name is null
      */
-    def static void setName(NamedElement namedElement, String name) {
+    def static setName(NamedElement namedElement, String name) {
         if (name === null) {
             throw new IllegalArgumentException("Cannot set name of " + namedElement + " to null")
         }
@@ -134,7 +134,7 @@ class JavaModifierUtil {
      * @param modifiable the AnnotableAndModifiable
      * @param toAdd true to add the modifier, otherwise remove
      */
-    def static void setFinal(AnnotableAndModifiable modifiable, boolean toAdd) {
+    def static setFinal(AnnotableAndModifiable modifiable, boolean toAdd) {
         setJavaModifier(modifiable, ModifiersFactory.eINSTANCE.createFinal, toAdd)
     }
 
@@ -145,7 +145,7 @@ class JavaModifierUtil {
      * @param modifiable the AnnotableAndModifiable
      * @param toAdd true to add the modifier, otherwise remove
      */
-    def static void setAbstract(AnnotableAndModifiable modifiable, boolean toAdd) {
+    def static setAbstract(AnnotableAndModifiable modifiable, boolean toAdd) {
         setJavaModifier(modifiable, ModifiersFactory.eINSTANCE.createAbstract, toAdd)
     }
 
@@ -156,7 +156,7 @@ class JavaModifierUtil {
      * @param modifiable the AnnotableAndModifiable
      * @param toAdd true to add the modifier, otherwise remove
      */
-    def static void setStatic(AnnotableAndModifiable modifiable, boolean toAdd) {
+    def static setStatic(AnnotableAndModifiable modifiable, boolean toAdd) {
         setJavaModifier(modifiable, ModifiersFactory.eINSTANCE.createStatic, toAdd)
     }
 
@@ -214,7 +214,7 @@ class JavaModifierUtil {
      * @param jModifiable the AnnotableAndModifiable for which a java visibility modifier should be set
      * @param uVisibility the VisibilityKind
      */
-    def static void setJavaVisibility(AnnotableAndModifiable jModifiable, VisibilityKind uVisibility) {
+    def static setJavaVisibility(AnnotableAndModifiable jModifiable, VisibilityKind uVisibility) {
         setJavaVisibilityModifier(jModifiable, getJavaVisibilityConstantFromUmlVisibilityKind(uVisibility))
     }
 }

bundles/tools.vitruv.applications.util.temporary/src/tools/vitruv/applications/util/temporary/java/JavaStandardType.xtend

@@ -23,14 +23,14 @@ import static tools.vitruv.applications.util.temporary.java.JavaTypeUtil.*
  */
 @Utility
 class JavaStandardType {
-    public static val BOOLEAN = "boolean";
-    public static val BYTE = "byte";
-    public static val CHAR = "char";
-    public static val DOUBLE = "double";
-    public static val FLOAT = "float";
-    public static val INT = "int";
-    public static val LONG = "long";
-    public static val SHORT = "short";
+    public static val BOOLEAN = "boolean"
+    public static val BYTE = "byte"
+    public static val CHAR = "char"
+    public static val DOUBLE = "double"
+    public static val FLOAT = "float"
+    public static val INT = "int"
+    public static val LONG = "long"
+    public static val SHORT = "short"
     public static val STRING = "String"
     public static val VOID = "void"
 

bundles/tools.vitruv.applications.util.temporary/src/tools/vitruv/applications/util/temporary/java/JavaTypeUtil.xtend

@@ -148,7 +148,7 @@ class JavaTypeUtil {
         return namespaceClassifierReference
     }
 
-    def static void setTypeReference(TypedElement typedElement, TypeReference typeRef) {
+    def static setTypeReference(TypedElement typedElement, TypeReference typeRef) {
         if (typeRef !== null) {
             typedElement.typeReference = typeRef
         } else {
@@ -188,7 +188,7 @@ class JavaTypeUtil {
         return null
     }
 
-    static def boolean hasSameTargetReference(TypeReference reference1, TypeReference reference2) {
+    def static boolean hasSameTargetReference(TypeReference reference1, TypeReference reference2) {
         if (reference1 == reference2 || reference1.equals(reference2)) {
             return true
         }
@@ -264,8 +264,6 @@ class JavaTypeUtil {
                     addJavaImport(compUnit, typeArgument.typeReference)
                 }
             }
-        } else {
-            // shouldn't occur
         }
     }
 

bundles/tools.vitruv.applications.util.temporary/src/tools/vitruv/applications/util/temporary/pcm/PcmDataTypeUtil.xtend

@@ -15,7 +15,7 @@ import org.palladiosimulator.pcm.repository.PrimitiveTypeEnum
 @Utility
 class PcmDataTypeUtil {
 
-    static val PCM_PRIMITIVE_TYPES_URI = URI.createURI("pathmap://PCM_MODELS/PrimitiveTypes.repository");
+    static val PCM_PRIMITIVE_TYPES_URI = URI.createURI("pathmap://PCM_MODELS/PrimitiveTypes.repository")
 
     def static getPcmPrimitiveTypes(EObject alreadyPersistedObject) {
         return getPcmPrimitiveTypes(alreadyPersistedObject.eResource.resourceSet)

bundles/tools.vitruv.applications.util.temporary/src/tools/vitruv/applications/util/temporary/pcm/PcmParameterUtil.xtend

@@ -7,11 +7,11 @@ import static extension edu.kit.ipd.sdq.commons.util.java.lang.IterableUtil.*
 
 @Utility
 class PcmParameterUtil {
-    static def void setParameterName(Parameter parameter, String newName) {
+    def static setParameterName(Parameter parameter, String newName) {
         // Set entity name as well if it exists
         if (parameter.eClass.EAllAttributes.exists[name == "entityName"]) {
-            parameter.eSet(parameter.eClass.EAllAttributes.filter[name == "entityName"].claimOne, newName);
+            parameter.eSet(parameter.eClass.EAllAttributes.filter[name == "entityName"].claimOne, newName)
         }
-        parameter.parameterName = newName;
+        parameter.parameterName = newName
     }
 }