diff --git a/src/main/java/de/dhbwstuttgart/bytecode/genericsGenerator/GeneratedGenericsFinder.java b/src/main/java/de/dhbwstuttgart/bytecode/genericsGenerator/GeneratedGenericsFinder.java index cba02170..493bf1ed 100644 --- a/src/main/java/de/dhbwstuttgart/bytecode/genericsGenerator/GeneratedGenericsFinder.java +++ b/src/main/java/de/dhbwstuttgart/bytecode/genericsGenerator/GeneratedGenericsFinder.java @@ -155,7 +155,6 @@ public class GeneratedGenericsFinder implements ASTVisitor { addMethodConstraints(simplifiedConstraints, ggResult, m); } - */ if(ggResult != null) { //Hinzufuegen von Fayez ggResult diff --git a/src/main/java/de/dhbwstuttgart/bytecode/insertGenerics/FamilyOfGeneratedGenerics.java b/src/main/java/de/dhbwstuttgart/bytecode/insertGenerics/FamilyOfGeneratedGenerics.java index 92f13760..3628ed1d 100644 --- a/src/main/java/de/dhbwstuttgart/bytecode/insertGenerics/FamilyOfGeneratedGenerics.java +++ b/src/main/java/de/dhbwstuttgart/bytecode/insertGenerics/FamilyOfGeneratedGenerics.java @@ -8,6 +8,7 @@ import de.dhbwstuttgart.bytecode.utilities.MethodAndTPH; import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import org.objectweb.asm.Type; public class FamilyOfGeneratedGenerics { public List allConstraints = new ArrayList<>(); @@ -17,6 +18,7 @@ public class FamilyOfGeneratedGenerics { public List methodConstraints = new ArrayList<>(); public HashMap> methodConstraintsWithPosition = new HashMap<>(); + private static final String objectType = Type.getInternalName(Object.class); public FamilyOfGeneratedGenerics(TPHExtractor tphExtractor) { this.allConstraints = tphExtractor.allCons; @@ -128,8 +130,8 @@ public class FamilyOfGeneratedGenerics { for(String curMeth: tempMethodConstraintsWithPosition.keySet()){ for(int i=0; i