diff --git a/src/main/java/de/dhbwstuttgart/bytecode/genericsGenerator/GeneratedGenericsFinder.java b/src/main/java/de/dhbwstuttgart/bytecode/genericsGenerator/GeneratedGenericsFinder.java index 8e4d2a5d..32ea27bc 100644 --- a/src/main/java/de/dhbwstuttgart/bytecode/genericsGenerator/GeneratedGenericsFinder.java +++ b/src/main/java/de/dhbwstuttgart/bytecode/genericsGenerator/GeneratedGenericsFinder.java @@ -124,6 +124,7 @@ public class GeneratedGenericsFinder implements ASTVisitor { ConstraintsSimplierResult simplifiedConstraints = null; GenericsGeneratorResultForClass ggResult = null; + GenericsGeneratorResultForClass ggResultAlternative = null; for (int i = 0; i < listOfResultSetsList.size(); i++) { resultSet = listOfResultSetsList.get(i); @@ -139,7 +140,7 @@ public class GeneratedGenericsFinder implements ASTVisitor { System.out.println("fogg.classConstraints: "+ fogg.classConstraints); System.out.println("fogg.methodConstraintsWithPosition: "+ fogg.methodConstraintsWithPosition); - /* + /**/ tphsClass = tphExtractor.tphsClass; //PL 2020-01-15 //Es muss ggResult aus fogg gebildet werden @@ -153,11 +154,11 @@ public class GeneratedGenericsFinder implements ASTVisitor { addMethodConstraints(simplifiedConstraints, ggResult, m); } - + /**/ if(ggResult != null) generatedGenericsForSF.addGenericGeneratorResultClass(ggResult); - */ + List listOfClassCons = new ArrayList<>(); for(TPHConstraint clCons: fogg.classConstraints) { @@ -177,11 +178,13 @@ public class GeneratedGenericsFinder implements ASTVisitor { listOfMethAndCons.add(mac); ggRfaM = new GenericGeneratorResultsForAllMethods(listOfMethAndCons); } - ggResult = new GenericsGeneratorResultForClass(className, listOfClassCons, ggRfaM); + ggResultAlternative = new GenericsGeneratorResultForClass(className, listOfClassCons, ggRfaM); - if(ggResult != null) { - generatedGenericsForSF.addGenericGeneratorResultClass(ggResult); + if(ggResultAlternative != null) { + generatedGenericsForSF.addGenericGeneratorResultClass(ggResultAlternative); + System.out.println(generatedGenericsForSF); } + System.out.println(ggResultAlternative); }