From 2f37bb7313c7cd47c035dcca8628c415daa5375a Mon Sep 17 00:00:00 2001
From: AluAli <memtoo@gmx.de>
Date: Tue, 29 Dec 2020 01:03:55 +0100
Subject: [PATCH] 	modified:  
 src/main/java/de/dhbwstuttgart/bytecode/insertGenerics/FamilyOfGeneratedGenerics.java
 	modified:  
 src/test/java/insertGenerics/FamilyOfGeneratedGenericsTest.java

---
 .../FamilyOfGeneratedGenerics.java            | 43 +++++++++----------
 .../FamilyOfGeneratedGenericsTest.java        |  2 +-
 2 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/src/main/java/de/dhbwstuttgart/bytecode/insertGenerics/FamilyOfGeneratedGenerics.java b/src/main/java/de/dhbwstuttgart/bytecode/insertGenerics/FamilyOfGeneratedGenerics.java
index 94ff8b98..d8df6cc1 100644
--- a/src/main/java/de/dhbwstuttgart/bytecode/insertGenerics/FamilyOfGeneratedGenerics.java
+++ b/src/main/java/de/dhbwstuttgart/bytecode/insertGenerics/FamilyOfGeneratedGenerics.java
@@ -76,7 +76,7 @@ public class FamilyOfGeneratedGenerics {
             }
         }
         List<MethodConstraint> methodConstraints5 = methodTypesWithoutClassTypes(cs_cl, cs_m);
-//        cs_m = methodConstraints5;
+        cs_m = methodConstraints5;
         return cs_m;
     }
 
@@ -253,33 +253,32 @@ public class FamilyOfGeneratedGenerics {
      */
     public static List<MethodConstraint> methodTypesWithoutClassTypes(List<ClassConstraint> cs_cl, List<MethodConstraint> cs_m) {
         //TODO:
-        /*List<MethodConstraint> tempMCToReturn = new ArrayList<>();
-        List<TPHConstraint> tempMC = new ArrayList<TPHConstraint>();
-        for (int i=0; i < cs_m.size(); i++) {
-            TPHConstraint tphC = (TPHConstraint) cs_m.get(i);
-            tempMC.add((TPHConstraint) tphC);
-        }
-        List<TPHConstraint> tempCC = new ArrayList<TPHConstraint>(cs_cl);
-        for (TPHConstraint cc: cs_cl) {
-            TPHConstraint tphC = TPHConstraint.class.cast(cc);
+        List<TPHConstraint> tempCC = new ArrayList<>();
+        for(ClassConstraint cc: cs_cl) {
+            TPHConstraint tphC = new TPHConstraint(cc.getLeft(), cc.getRight(), cc.getRel());
             tempCC.add(tphC);
         }
+        List<TPHConstraint> tempMC = new ArrayList<>();
+        for(MethodConstraint mc: cs_m) {
+            TPHConstraint tphC = new TPHConstraint(mc.getLeft(), mc.getRight(), mc.getRel());
+            tempMC.add(tphC);
+        }
+        List<TPHConstraint> tempMC2 = new ArrayList<>();
+        tempMC2.addAll(tempMC);
+        List<MethodConstraint> tempMCToReturn = new ArrayList<>();
 
-        for (TPHConstraint cc: tempCC) {
-            if(tempMC.contains(cc)) {
-                tempMC.remove(cc);
+        for(TPHConstraint cc: tempCC) {
+            for(TPHConstraint mc: tempMC) {
+                if(cc.getLeft().equals(mc.getLeft()) && cc.getRight().equals(mc.getRight())) {
+                    tempMC2.remove(mc);
+                }
             }
         }
-        tempMCToReturn = List.class.cast(tempMC);
-        return tempMCToReturn;*/
-
-        List<MethodConstraint> tempMC = new ArrayList<>();
-        List<TPHConstraint> tempTphC = new ArrayList<>();
-        for(int i=0; i<cs_cl.size(); i++) {
-            TPHConstraint tphC = (TPHConstraint) cs_cl.get(i);
-            tempTphC.add(tphC);
+        for(TPHConstraint tphC: tempMC2) {
+            MethodConstraint mCons = new MethodConstraint(tphC.getLeft(), tphC.getRight(), tphC.getRel());
+            tempMCToReturn.add(mCons);
         }
-        return null;
+        return tempMCToReturn;
     }
 
     public static boolean checkForDuplicates(TPHConstraint constraint, List list) {
diff --git a/src/test/java/insertGenerics/FamilyOfGeneratedGenericsTest.java b/src/test/java/insertGenerics/FamilyOfGeneratedGenericsTest.java
index 42a530e1..77a7d997 100644
--- a/src/test/java/insertGenerics/FamilyOfGeneratedGenericsTest.java
+++ b/src/test/java/insertGenerics/FamilyOfGeneratedGenericsTest.java
@@ -175,7 +175,7 @@ public class FamilyOfGeneratedGenericsTest extends TestCase {
         assertFalse(classConstraints.isEmpty());
         assertTrue(classConstraints.size() == 3);
         assertFalse(methodConstraints.isEmpty());
-        assertTrue(methodConstraints.size()==11);
+        assertTrue(methodConstraints.size()==9);
     }