Merge branch 'bytecodeGenerics' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into bytecodeGenerics

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

@@ -151,7 +151,7 @@ public class GeneratedGenericsFinder implements ASTVisitor {
 			
 			if(ggResult != null)
 				generatedGenericsForSF.addGenericGeneratorResultClass(ggResult);
-
+				System.out.println("ddd");
 
 		}
 

src/main/java/de/dhbwstuttgart/bytecode/insertGenerics/FamilyOfGeneratedGenerics.java

@@ -3,6 +3,7 @@ package de.dhbwstuttgart.bytecode.insertGenerics;
 import de.dhbwstuttgart.bytecode.TPHExtractor;
 import de.dhbwstuttgart.bytecode.constraint.TPHConstraint;
 import de.dhbwstuttgart.bytecode.constraint.TPHConstraint.Relation;
+import de.dhbwstuttgart.bytecode.genericsGeneratorTypes.GenericsGeneratorResult;
 import de.dhbwstuttgart.bytecode.utilities.MethodAndTPH;
 
 import java.util.ArrayList;
@@ -11,13 +12,16 @@ import java.util.List;
 
 public class FamilyOfGeneratedGenerics {
     public List<TPHConstraint> allConstraints = new ArrayList<>();
+    // HashMap speichert ob TPH in einer Methode oder in der Klasse ist; und wenn es in der Methode ist, in welcher Methode
     public HashMap<String, PairTphMethod<PositionFinder.Position, String>> posOfTPHs = new HashMap<>();
     public List<ClassConstraint> classConstraints = new ArrayList<>();
+    public List<MethodConstraint> methodConstraints = new ArrayList<>();
 
     public FamilyOfGeneratedGenerics(TPHExtractor tphExtractor) {
         this.allConstraints = tphExtractor.allCons;
         this.posOfTPHs = positionConverter(tphExtractor.allTPHS, tphExtractor.ListOfMethodsAndTph);
         this.classConstraints = getClassConstraints(allConstraints,posOfTPHs);
+//        this.methodConstraints =
     }
 
     public static List<ClassConstraint> getClassConstraints(List<TPHConstraint> cs, HashMap<String, PairTphMethod<PositionFinder.Position, String>> posOfTphs) { //Inputparameter List<TPHConstraint> constraintsSet weg
@@ -43,6 +47,11 @@ public class FamilyOfGeneratedGenerics {
         return cs_cl;
     }
 
+    public static List<MethodConstraint> getMethodConstraintsAlternative() {
+        List<GenericsGeneratorResult> ggRes = GenericsGeneratorResult.
+        return null;
+    }
+
     public static List<MethodConstraint> getMethodConstraints(List<TPHConstraint> cs, HashMap<String, PairTphMethod<PositionFinder.Position, String>> posOfTphs) {
         //TODO: Regeln
         List<MethodConstraint> cs_m = new ArrayList<>();
@@ -165,9 +174,22 @@ public class FamilyOfGeneratedGenerics {
      * {R' <. S | (R <. R'), (S <. S') \in cs_m and (R',S) is in the transitive closure of cs}
      */
 
-    public static List<MethodConstraint> firstTransitiveSubtypeForMethodTypes() { //transitive closure of cs
+    public static List<MethodConstraint> firstTransitiveSubtypeForMethodTypes(List<TPHConstraint> allConstraints, List<MethodConstraint> cs_m, HashMap<String, PairTphMethod<PositionFinder.Position, String>> posOfTphs) { //transitive closure of cs
         //TODO:
-        return null;
+        List<MethodConstraint> tempCC= new ArrayList<>();
+        List<TPHConstraint> tcOfCs =  buildTransitiveClosure(allConstraints);
+        for(MethodConstraint mC1 : cs_m) {
+            for(MethodConstraint mC2 : cs_m) {
+                String rightSide = mC1.getRight();
+                String leftSide = mC2.getLeft();
+                for(TPHConstraint tphC : tcOfCs) {
+                    if(tphC.getLeft().equals(leftSide)&&tphC.getRight().equals(rightSide)) {
+                        tempCC.add((MethodConstraint) tphC);
+                    }
+                }
+            }
+        }
+        return tempCC;
     }
 
 /**
@@ -175,9 +197,22 @@ public class FamilyOfGeneratedGenerics {
      * {R' <. S | (R <. R') \in cs_m, (S <. S') \in cs_cl and (R',S) is in the transitive closure of cs}
      */
 
-    public static List<MethodConstraint> secondTransitiveSubtypeForMethodTypes() {
+    public static List<MethodConstraint> secondTransitiveSubtypeForMethodTypes(List<TPHConstraint> allConstraints, List<ClassConstraint> cs_cl, List<MethodConstraint> cs_m, HashMap<String, PairTphMethod<PositionFinder.Position, String>> posOfTphs) {
         //TODO:
-        return null;
+        List<MethodConstraint> tempCC= new ArrayList<>();
+        List<TPHConstraint> tcOfCs =  buildTransitiveClosure(allConstraints);
+        for(ClassConstraint cC : cs_cl) {
+            for(MethodConstraint mC : cs_m) {
+                String rightSide = mC.getRight();
+                String leftSide = cC.getLeft();
+                for(TPHConstraint tphC : tcOfCs) {
+                    if(tphC.getLeft().equals(leftSide)&&tphC.getRight().equals(rightSide)) {
+                        tempCC.add((MethodConstraint) tphC);
+                    }
+                }
+            }
+        }
+        return tempCC;
     }
 
 /**

src/test/java/insertGenerics/FamilyOfGeneratedGenericsTest.java

@@ -199,4 +199,8 @@ public class FamilyOfGeneratedGenericsTest extends TestCase {
     }
 
 
+    public void testFirstTransitiveSubtypeForMethodTypes(){
+
+    }
+
 }