From 46f1134bade8cd3179a67038be6aad1c039a09fa Mon Sep 17 00:00:00 2001
From: JanUlrich <andi@michlaustderaffe.de>
Date: Fri, 29 Apr 2016 16:03:38 +0200
Subject: [PATCH] =?UTF-8?q?Aufr=C3=A4umen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/de/dhbwstuttgart/bytecode/ClassGenerator.java   |  4 ++--
 src/de/dhbwstuttgart/syntaxtree/Class.java          |  2 +-
 .../dhbwstuttgart/typeinference/ConstraintsSet.java | 13 -------------
 .../typeinference/TypeinferenceResults.java         | 10 ++++++----
 4 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/src/de/dhbwstuttgart/bytecode/ClassGenerator.java b/src/de/dhbwstuttgart/bytecode/ClassGenerator.java
index 393d2e6ef..decb0f8bf 100644
--- a/src/de/dhbwstuttgart/bytecode/ClassGenerator.java
+++ b/src/de/dhbwstuttgart/bytecode/ClassGenerator.java
@@ -68,7 +68,7 @@ public class ClassGenerator extends ClassGen{
 			//return getNearestType((TypePlaceholder) t);
 			return new TypePlaceholderType((TypePlaceholder) t);
 		}else{
-			return t.getBytecodeType(this, getTypeinferenceResults().getTypeReconstructions().firstElement());
+			return t.getBytecodeType(this, getTypeinferenceResults().getTypeReconstructions().get(0));
 		}
 	}
 	public org.apache.commons.bcel6.generic.Type getNearestUsedType(TypePlaceholder toTPH){
@@ -150,7 +150,7 @@ public class ClassGenerator extends ClassGen{
 				TypePlaceholder tph = it.next();
 				//ret += tph.getBytecodeMethodSignature(this);
 				//ret += ":";
-				ret += tph.getClassSignature(this, getTypeinferenceResults().getTypeReconstructions().firstElement());
+				ret += tph.getClassSignature(this, getTypeinferenceResults().getTypeReconstructions().get(0));
 			}
 			ret += ">";
 		}
diff --git a/src/de/dhbwstuttgart/syntaxtree/Class.java b/src/de/dhbwstuttgart/syntaxtree/Class.java
index 5c46d4501..7e6ce4611 100755
--- a/src/de/dhbwstuttgart/syntaxtree/Class.java
+++ b/src/de/dhbwstuttgart/syntaxtree/Class.java
@@ -111,7 +111,7 @@ public class Class extends GTVDeclarationContext implements AClassOrInterface, I
     	}
     	InstructionList fieldInitializations = new InstructionList();
     	for(FieldDeclaration f : fieldDeclarations){
-    		fieldInitializations.append(f.genByteCode(_cg, typeinferenceResults.getTypeReconstructions().firstElement()));
+    		fieldInitializations.append(f.genByteCode(_cg, typeinferenceResults.getTypeReconstructions().get(0)));
     	}
     	//Die Konstruktoren müssen die Feld initialisierungswerte beinhalten:
     	for(Constructor c : constructors){
diff --git a/src/de/dhbwstuttgart/typeinference/ConstraintsSet.java b/src/de/dhbwstuttgart/typeinference/ConstraintsSet.java
index e9f9918db..dd4a2ff1b 100755
--- a/src/de/dhbwstuttgart/typeinference/ConstraintsSet.java
+++ b/src/de/dhbwstuttgart/typeinference/ConstraintsSet.java
@@ -71,19 +71,6 @@ public class ConstraintsSet extends UndMenge<Pair> implements Iterable<OderConst
 				});
 	}
  */
-	/**
-	 * Aus dem ConstraintsSet [ u1, u2, ... (OderConstraint), ... uN ] werden alle
-	 * UndConstraints, welche sich nicht innerhalb eines OderConstraints befinden, herausgefiltert
-	 * @return [u1, ... , uN]
-	 */
-	private Vector<UndConstraint> filterUndConstraints() {
-		Vector<UndConstraint> ret = new Vector<>();
-		for(OderConstraint con : constraintsSet){
-			UndConstraint filtered = con.filterUndConstraints();
-			if(filtered != null)ret.add(filtered);
-		}
-		return ret;
-	}
 
 	public void add(UndConstraint singleConstraint) {
 		OderConstraint toAdd = new OderConstraint();
diff --git a/src/de/dhbwstuttgart/typeinference/TypeinferenceResults.java b/src/de/dhbwstuttgart/typeinference/TypeinferenceResults.java
index 5ce7a4456..d4f01d534 100644
--- a/src/de/dhbwstuttgart/typeinference/TypeinferenceResults.java
+++ b/src/de/dhbwstuttgart/typeinference/TypeinferenceResults.java
@@ -1,5 +1,7 @@
 package de.dhbwstuttgart.typeinference;
 
+import java.util.List;
+
 import de.dhbwstuttgart.bytecode.ClassGenerator;
 import de.dhbwstuttgart.logger.Logger;
 import de.dhbwstuttgart.logger.Section;
@@ -9,21 +11,21 @@ import de.dhbwstuttgart.syntaxtree.type.SuperWildcardType;
 
 public class TypeinferenceResults {
 	
-	private Menge<TypeinferenceResultSet> typeReconstructions;
+	private List<TypeinferenceResultSet> typeReconstructions;
 
 	public TypeinferenceResults() {
 		typeReconstructions = new Menge<>();
 	}
 
-	public TypeinferenceResults(Menge<TypeinferenceResultSet> typeReconstructions) {
+	public TypeinferenceResults(List<TypeinferenceResultSet> typeReconstructions) {
 		this.typeReconstructions = typeReconstructions;
 	}
 
-	public Menge<TypeinferenceResultSet> getTypeReconstructions() {
+	public List<TypeinferenceResultSet> getTypeReconstructions() {
 		return typeReconstructions;
 	}
 
-	public Menge<TypeinferenceResultSet> getTypeReconstructions(Method method, ClassGenerator cg) {
+	public List<TypeinferenceResultSet> getTypeReconstructions(Method method, ClassGenerator cg) {
 		return typeReconstructions;
 	}
 }
\ No newline at end of file