modified: src/main/java/de/dhbwstuttgart/bytecode/genericsGenerator/GeneratedGenericsFinder.java

This commit is contained in:
AluAli 2021-01-29 18:22:04 +01:00
parent 0bc0e4c722
commit cd135c3962

View File

@ -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<GenericsGeneratorResult> 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);
}