From d63c27579c75f3e37cd81289c42c68d39669cc46 Mon Sep 17 00:00:00 2001
From: "pl@gohorb.ba-horb.de" <pl@gohorb.ba-horb.de>
Date: Mon, 9 Mar 2020 18:30:36 +0100
Subject: [PATCH] 	modified:  
 ../../../../main/java/de/dhbwstuttgart/bytecode/BytecodeGenMethod.java Typen
 der Methoden der Oder-Constraiunts benutzen wieder rueckgaenig gemacht

	modified:   ../../../../main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
wieder alle grArg im a <. theta' benutzen
	modified:   ../../bytecode/javFiles/MatrixOP.jav
---
 .../de/dhbwstuttgart/bytecode/BytecodeGenMethod.java | 12 +++++-------
 .../typeinference/unify/TypeUnifyTask.java           |  2 --
 src/test/resources/bytecode/javFiles/MatrixOP.jav    |  2 +-
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/main/java/de/dhbwstuttgart/bytecode/BytecodeGenMethod.java b/src/main/java/de/dhbwstuttgart/bytecode/BytecodeGenMethod.java
index 3bdf21ea3..0565d9335 100644
--- a/src/main/java/de/dhbwstuttgart/bytecode/BytecodeGenMethod.java
+++ b/src/main/java/de/dhbwstuttgart/bytecode/BytecodeGenMethod.java
@@ -754,8 +754,7 @@ public class BytecodeGenMethod implements StatementVisitor {
 	public void visit(MethodCall methodCall) {
 		boolean parentBinary = isParentBinary;
 		System.out.println("In MethodCall = " + methodCall.name);
-		//String receiverName = resolver.getResolvedType(methodCall.receiver.getType());
-		String receiverName = resolver.getResolvedType(methodCall.receiverType);
+		String receiverName = resolver.getResolvedType(methodCall.receiver.getType());
 		System.out.println("Methods of " + receiverName + " ");
 		java.lang.reflect.Method methodRefl = null;
 		String clazz = receiverName.replace("/", ".");
@@ -769,8 +768,7 @@ public class BytecodeGenMethod implements StatementVisitor {
 		ClassLoader cLoader2;
 
 		String methCallType = resultSet.resolveType(methodCall.getType()).resolvedType.acceptTV(new TypeToDescriptor());
-		//String[] typesOfParams = getTypes(methodCall.arglist.getArguments());
-		String[] typesOfParams = getTypes(methodCall.argTypes);
+		String[] typesOfParams = getTypes(methodCall.arglist.getArguments());
 		try {
 			clazz = getRawClassName(receiverName, clazz);
 
@@ -919,11 +917,11 @@ public class BytecodeGenMethod implements StatementVisitor {
 		}
 		return clazz;
 	}
-
-	private String[] getTypes(List<RefTypeOrTPHOrWildcardOrGeneric> arguments) {
+	
+	private String[] getTypes(List<Expression> arguments) {
 		String[] types = new String[arguments.size()];
 		for(int i = 0; i<arguments.size(); ++i) {
-			String t = resolver.getResolvedType(arguments.get(i));
+			String t = resolver.getResolvedType(arguments.get(i).getType());
 			types[i] = t;
 		}
 		return types;
diff --git a/src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java b/src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
index 0362a5a0d..3c89ea383 100644
--- a/src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
+++ b/src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
@@ -2178,8 +2178,6 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 						//writeLog("MAX: " + oup.max(resultPrime.iterator()).toString());
 					}
 				}
-				break;//Wenn ein unifier gefunden ist reicht es aus PL 2020-03-07
-
 			}
 		}
 		
diff --git a/src/test/resources/bytecode/javFiles/MatrixOP.jav b/src/test/resources/bytecode/javFiles/MatrixOP.jav
index 52c3fe964..21d373478 100644
--- a/src/test/resources/bytecode/javFiles/MatrixOP.jav
+++ b/src/test/resources/bytecode/javFiles/MatrixOP.jav
@@ -1,6 +1,6 @@
 import java.util.Vector;
 import java.lang.Integer;
-import java.lang.Byte;
+//import java.lang.Byte;
 import java.lang.Boolean;
 
 public class MatrixOP    extends Vector<Vector<Integer>> {