From 3d8275c676088352bd8d9fb9932422d641171cc9 Mon Sep 17 00:00:00 2001 From: AluAli Date: Sat, 16 Jan 2021 16:34:31 +0100 Subject: [PATCH] modified: src/main/java/de/dhbwstuttgart/bytecode/genericsGenerator/GeneratedGenericsFinder.java --- .../genericsGenerator/GeneratedGenericsFinder.java | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/main/java/de/dhbwstuttgart/bytecode/genericsGenerator/GeneratedGenericsFinder.java b/src/main/java/de/dhbwstuttgart/bytecode/genericsGenerator/GeneratedGenericsFinder.java index 2b03b38a..4b4fa686 100644 --- a/src/main/java/de/dhbwstuttgart/bytecode/genericsGenerator/GeneratedGenericsFinder.java +++ b/src/main/java/de/dhbwstuttgart/bytecode/genericsGenerator/GeneratedGenericsFinder.java @@ -136,17 +136,12 @@ public class GeneratedGenericsFinder implements ASTVisitor { //PL 2020-10-16: Ab hier GGenerics implementieren durch Ali //Rueckgabe an generatedGenericsForSF fogg = new FamilyOfGeneratedGenerics(tphExtractor); -<<<<<<< HEAD - System.out.println("fogg: "+ fogg.methodConstraintsWithPosition); - - /* -======= System.out.println("fogg.allConstraints: "+ fogg.allConstraints); System.out.println("fogg.posOfTPHs: "+ fogg.posOfTPHs); System.out.println("fogg.classConstraints: "+ fogg.classConstraints); System.out.println("fogg.methodConstraintsWithPosition: "+ fogg.methodConstraintsWithPosition); ->>>>>>> fc8f11ebb1d4d900b2611616b89a1f24f054e9b4 + /* tphsClass = tphExtractor.tphsClass; //PL 2020-01-15 //Es muss ggResult aus fogg gebildet werden @@ -158,10 +153,10 @@ public class GeneratedGenericsFinder implements ASTVisitor { for(Method m : classOrInterface.getMethods()) { addMethodConstraints(simplifiedConstraints, ggResult, m); - + } */ - + if(ggResult != null) generatedGenericsForSF.addGenericGeneratorResultClass(ggResult); System.out.println("ddd");