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

This commit is contained in:
AluAli 2021-01-16 16:34:31 +01:00
parent 3ef15d814d
commit 3d8275c676

View File

@ -136,17 +136,12 @@ public class GeneratedGenericsFinder implements ASTVisitor {
//PL 2020-10-16: Ab hier GGenerics implementieren durch Ali //PL 2020-10-16: Ab hier GGenerics implementieren durch Ali
//Rueckgabe an generatedGenericsForSF //Rueckgabe an generatedGenericsForSF
fogg = new FamilyOfGeneratedGenerics(tphExtractor); fogg = new FamilyOfGeneratedGenerics(tphExtractor);
<<<<<<< HEAD
System.out.println("fogg: "+ fogg.methodConstraintsWithPosition);
/*
=======
System.out.println("fogg.allConstraints: "+ fogg.allConstraints); System.out.println("fogg.allConstraints: "+ fogg.allConstraints);
System.out.println("fogg.posOfTPHs: "+ fogg.posOfTPHs); System.out.println("fogg.posOfTPHs: "+ fogg.posOfTPHs);
System.out.println("fogg.classConstraints: "+ fogg.classConstraints); System.out.println("fogg.classConstraints: "+ fogg.classConstraints);
System.out.println("fogg.methodConstraintsWithPosition: "+ fogg.methodConstraintsWithPosition); System.out.println("fogg.methodConstraintsWithPosition: "+ fogg.methodConstraintsWithPosition);
>>>>>>> fc8f11ebb1d4d900b2611616b89a1f24f054e9b4 /*
tphsClass = tphExtractor.tphsClass; tphsClass = tphExtractor.tphsClass;
//PL 2020-01-15 //PL 2020-01-15
//Es muss ggResult aus fogg gebildet werden //Es muss ggResult aus fogg gebildet werden
@ -158,10 +153,10 @@ public class GeneratedGenericsFinder implements ASTVisitor {
for(Method m : classOrInterface.getMethods()) { for(Method m : classOrInterface.getMethods()) {
addMethodConstraints(simplifiedConstraints, ggResult, m); addMethodConstraints(simplifiedConstraints, ggResult, m);
} }
*/ */
if(ggResult != null) if(ggResult != null)
generatedGenericsForSF.addGenericGeneratorResultClass(ggResult); generatedGenericsForSF.addGenericGeneratorResultClass(ggResult);
System.out.println("ddd"); System.out.println("ddd");