Projekt umstrukturierung

src/de/dhbwstuttgart/core/SourceFile.java

@@ -24,8 +24,6 @@ import mycompiler.mytypereconstruction.typeassumption.CInstVarTypeAssumption;
 import mycompiler.mytypereconstruction.typeassumption.CMethodTypeAssumption;
 import mycompiler.mytypereconstruction.typeassumption.CParaTypeAssumption;
 import mycompiler.mytypereconstruction.typeassumption.CTypeAssumption;
-import mycompiler.mytypereconstruction.unify.FC_TTO;
-import mycompiler.mytypereconstruction.unify.Unify;
 
 import org.apache.log4j.Logger;
 
@@ -60,6 +58,8 @@ import de.dhbwstuttgart.typeinference.assumptions.ParameterAssumption;
 import de.dhbwstuttgart.typeinference.assumptions.TypeAssumptions;
 import de.dhbwstuttgart.typeinference.exceptions.DebugException;
 import de.dhbwstuttgart.typeinference.exceptions.TypeinferenceException;
+import de.dhbwstuttgart.typeinference.unify.FC_TTO;
+import de.dhbwstuttgart.typeinference.unify.Unify;
 import mycompiler.myclass.*;
 import mycompiler.*;
 import sun.reflect.generics.reflectiveObjects.NotImplementedException;

src/de/dhbwstuttgart/syntaxtree/Class.java

@@ -33,8 +33,6 @@ import mycompiler.mytypereconstruction.typeassumption.CMethodTypeAssumption;
 import mycompiler.mytypereconstruction.typeassumption.CParaTypeAssumption;
 import mycompiler.mytypereconstruction.typeassumption.CTypeAssumption;
 import mycompiler.mytypereconstruction.typeassumptionkey.CMethodKey;
-import mycompiler.mytypereconstruction.unify.FC_TTO;
-import mycompiler.mytypereconstruction.unify.Unify;
 
 import org.apache.log4j.Logger;
 // ino.end
@@ -67,6 +65,7 @@ import org.apache.log4j.Logger;
 
 
 
+
 
 
 import de.dhbwstuttgart.core.AClassOrInterface;
@@ -90,6 +89,8 @@ import de.dhbwstuttgart.typeinference.assumptions.TypeAssumptions;
 import de.dhbwstuttgart.typeinference.exceptions.DebugException;
 import de.dhbwstuttgart.typeinference.exceptions.TypeinferenceException;
 import de.dhbwstuttgart.typeinference.typedeployment.TypeInsertPoint;
+import de.dhbwstuttgart.typeinference.unify.FC_TTO;
+import de.dhbwstuttgart.typeinference.unify.Unify;
 import sun.reflect.generics.reflectiveObjects.NotImplementedException;
 
 

src/de/dhbwstuttgart/syntaxtree/operator/AddOp.java

@@ -17,6 +17,7 @@ import de.dhbwstuttgart.typeinference.ConstraintsSet;
 import de.dhbwstuttgart.typeinference.SingleConstraint;
 import de.dhbwstuttgart.typeinference.assumptions.TypeAssumptions;
 import de.dhbwstuttgart.typeinference.exceptions.DebugException;
+import de.dhbwstuttgart.typeinference.unify.Unify;
 import mycompiler.mybytecode.ClassFile;
 import mycompiler.mybytecode.CodeAttribute;
 import mycompiler.myexception.CTypeReconstructionException;
@@ -26,8 +27,6 @@ import mycompiler.mytypereconstruction.CTriple;
 import mycompiler.mytypereconstruction.set.CSubstitutionSet;
 import mycompiler.mytypereconstruction.set.CTripleSet;
 import mycompiler.mytypereconstruction.set.CTypeAssumptionSet;
-import mycompiler.mytypereconstruction.unify.Unify;
-// ino.end
 
 
 

src/de/dhbwstuttgart/syntaxtree/operator/EqualOp.java

@@ -10,6 +10,7 @@ import de.dhbwstuttgart.syntaxtree.statement.Expr;
 import de.dhbwstuttgart.syntaxtree.statement.Null;
 import de.dhbwstuttgart.syntaxtree.type.Pair;
 import de.dhbwstuttgart.syntaxtree.type.RefType;
+import de.dhbwstuttgart.typeinference.unify.Unify;
 import mycompiler.mybytecode.ClassFile;
 import mycompiler.mybytecode.CodeAttribute;
 import mycompiler.mybytecode.JVMCode;
@@ -20,8 +21,6 @@ import mycompiler.mytypereconstruction.CTriple;
 import mycompiler.mytypereconstruction.set.CSubstitutionSet;
 import mycompiler.mytypereconstruction.set.CTripleSet;
 import mycompiler.mytypereconstruction.set.CTypeAssumptionSet;
-import mycompiler.mytypereconstruction.unify.Unify;
-// ino.end
 
 
 

src/de/dhbwstuttgart/syntaxtree/operator/LogOp.java

@@ -20,6 +20,7 @@ import de.dhbwstuttgart.typeinference.ConstraintsSet;
 import de.dhbwstuttgart.typeinference.SingleConstraint;
 import de.dhbwstuttgart.typeinference.assumptions.TypeAssumptions;
 import de.dhbwstuttgart.typeinference.exceptions.DebugException;
+import de.dhbwstuttgart.typeinference.unify.Unify;
 import mycompiler.mybytecode.ClassFile;
 import mycompiler.mybytecode.CodeAttribute;
 import mycompiler.mybytecode.JVMCode;
@@ -30,8 +31,6 @@ import mycompiler.mytypereconstruction.CTriple;
 import mycompiler.mytypereconstruction.set.CSubstitutionSet;
 import mycompiler.mytypereconstruction.set.CTripleSet;
 import mycompiler.mytypereconstruction.set.CTypeAssumptionSet;
-import mycompiler.mytypereconstruction.unify.Unify;
-// ino.end
 
 
 

src/de/dhbwstuttgart/syntaxtree/operator/MulOp.java

@@ -14,14 +14,13 @@ import de.dhbwstuttgart.syntaxtree.type.RefType;
 import de.dhbwstuttgart.syntaxtree.type.Type;
 import de.dhbwstuttgart.typeinference.assumptions.TypeAssumptions;
 import de.dhbwstuttgart.typeinference.exceptions.DebugException;
+import de.dhbwstuttgart.typeinference.unify.Unify;
 import mycompiler.myexception.CTypeReconstructionException;
 import mycompiler.mytypereconstruction.CSupportData;
 import mycompiler.mytypereconstruction.CTriple;
 import mycompiler.mytypereconstruction.set.CSubstitutionSet;
 import mycompiler.mytypereconstruction.set.CTripleSet;
 import mycompiler.mytypereconstruction.set.CTypeAssumptionSet;
-import mycompiler.mytypereconstruction.unify.Unify;
-// ino.end
 
 // ino.class.MulOp.24231.declaration 
 public abstract class MulOp extends Operator

src/de/dhbwstuttgart/syntaxtree/operator/NotEqualOp.java

@@ -10,6 +10,7 @@ import de.dhbwstuttgart.syntaxtree.statement.Expr;
 import de.dhbwstuttgart.syntaxtree.statement.Null;
 import de.dhbwstuttgart.syntaxtree.type.Pair;
 import de.dhbwstuttgart.syntaxtree.type.RefType;
+import de.dhbwstuttgart.typeinference.unify.Unify;
 import mycompiler.mybytecode.ClassFile;
 import mycompiler.mybytecode.CodeAttribute;
 import mycompiler.mybytecode.JVMCode;
@@ -20,8 +21,6 @@ import mycompiler.mytypereconstruction.CTriple;
 import mycompiler.mytypereconstruction.set.CSubstitutionSet;
 import mycompiler.mytypereconstruction.set.CTripleSet;
 import mycompiler.mytypereconstruction.set.CTypeAssumptionSet;
-import mycompiler.mytypereconstruction.unify.Unify;
-// ino.end
 
 
 

src/de/dhbwstuttgart/syntaxtree/operator/Operator.java

@@ -20,6 +20,7 @@ import de.dhbwstuttgart.typeinference.SingleConstraint;
 import de.dhbwstuttgart.typeinference.UndConstraint;
 import de.dhbwstuttgart.typeinference.assumptions.TypeAssumptions;
 import de.dhbwstuttgart.typeinference.exceptions.TypeinferenceException;
+import de.dhbwstuttgart.typeinference.unify.Unify;
 import mycompiler.mybytecode.ClassFile;
 import mycompiler.mybytecode.CodeAttribute;
 import mycompiler.mybytecode.JVMCode;
@@ -30,8 +31,6 @@ import mycompiler.mytypereconstruction.CTriple;
 import mycompiler.mytypereconstruction.set.CSubstitutionSet;
 import mycompiler.mytypereconstruction.set.CTripleSet;
 import mycompiler.mytypereconstruction.set.CTypeAssumptionSet;
-import mycompiler.mytypereconstruction.unify.Unify;
-// ino.end
 
 
 

src/de/dhbwstuttgart/syntaxtree/operator/RelOp.java

@@ -14,6 +14,7 @@ import de.dhbwstuttgart.syntaxtree.type.RefType;
 import de.dhbwstuttgart.syntaxtree.type.Type;
 import de.dhbwstuttgart.typeinference.assumptions.TypeAssumptions;
 import de.dhbwstuttgart.typeinference.exceptions.DebugException;
+import de.dhbwstuttgart.typeinference.unify.Unify;
 import mycompiler.mybytecode.ClassFile;
 import mycompiler.mybytecode.CodeAttribute;
 import mycompiler.myexception.CTypeReconstructionException;
@@ -23,8 +24,6 @@ import mycompiler.mytypereconstruction.CTriple;
 import mycompiler.mytypereconstruction.set.CSubstitutionSet;
 import mycompiler.mytypereconstruction.set.CTripleSet;
 import mycompiler.mytypereconstruction.set.CTypeAssumptionSet;
-import mycompiler.mytypereconstruction.unify.Unify;
-// ino.end
 
 // ino.class.RelOp.24299.declaration 
 public abstract class RelOp extends Operator

src/de/dhbwstuttgart/syntaxtree/statement/Assign.java

@@ -22,7 +22,6 @@ import mycompiler.mytypereconstruction.set.CSubstitutionSet;
 import mycompiler.mytypereconstruction.set.CTripleSet;
 import mycompiler.mytypereconstruction.set.CTypeAssumptionSet;
 import mycompiler.mytypereconstruction.typeassumption.CTypeAssumption;
-import mycompiler.mytypereconstruction.unify.Unify;
 
 import org.apache.log4j.Logger;
 
@@ -35,6 +34,7 @@ import org.apache.log4j.Logger;
 
 
 
+
 import de.dhbwstuttgart.core.SyntaxTreeNode;
 import de.dhbwstuttgart.syntaxtree.Class;
 import de.dhbwstuttgart.syntaxtree.type.GenericTypeVar;
@@ -48,6 +48,7 @@ import de.dhbwstuttgart.typeinference.JavaCodeResult;
 import de.dhbwstuttgart.typeinference.ResultSet;
 import de.dhbwstuttgart.typeinference.SingleConstraint;
 import de.dhbwstuttgart.typeinference.assumptions.TypeAssumptions;
+import de.dhbwstuttgart.typeinference.unify.Unify;
 
 
 

src/de/dhbwstuttgart/syntaxtree/statement/ExprStmt.java

@@ -12,16 +12,17 @@ import mycompiler.mytypereconstruction.replacementlistener.CReplaceTypeEvent;
 import mycompiler.mytypereconstruction.replacementlistener.ITypeReplacementListener;
 import mycompiler.mytypereconstruction.set.CSubstitutionSet;
 import mycompiler.mytypereconstruction.set.CTripleSet;
-import mycompiler.mytypereconstruction.unify.Unify;
 
 import org.apache.log4j.Logger;
 // ino.end
 
 
+
 import de.dhbwstuttgart.core.MyCompiler;
 import de.dhbwstuttgart.syntaxtree.type.Pair;
 import de.dhbwstuttgart.syntaxtree.type.Type;
 import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
+import de.dhbwstuttgart.typeinference.unify.Unify;
 
 // ino.class.ExprStmt.25265.declaration 
 public abstract class ExprStmt extends Statement implements ITypeReplacementListener

src/de/dhbwstuttgart/syntaxtree/statement/ForStmt.java

@@ -19,7 +19,6 @@ import mycompiler.mytypereconstruction.set.CSubstitutionSet;
 import mycompiler.mytypereconstruction.set.CTripleSet;
 import mycompiler.mytypereconstruction.set.CTypeAssumptionSet;
 import mycompiler.mytypereconstruction.typeassumption.CTypeAssumption;
-import mycompiler.mytypereconstruction.unify.Unify;
 
 import org.apache.log4j.Logger;
 
@@ -36,6 +35,7 @@ import de.dhbwstuttgart.typeinference.ConstraintsSet;
 import de.dhbwstuttgart.typeinference.JavaCodeResult;
 import de.dhbwstuttgart.typeinference.ResultSet;
 import de.dhbwstuttgart.typeinference.assumptions.TypeAssumptions;
+import de.dhbwstuttgart.typeinference.unify.Unify;
 import sun.reflect.generics.reflectiveObjects.NotImplementedException;
 
 

src/de/dhbwstuttgart/syntaxtree/statement/IfStmt.java

@@ -22,8 +22,6 @@ import mycompiler.mytypereconstruction.set.CSubstitutionSet;
 import mycompiler.mytypereconstruction.set.CTripleSet;
 import mycompiler.mytypereconstruction.set.CTypeAssumptionSet;
 import mycompiler.mytypereconstruction.typeassumption.CTypeAssumption;
-import mycompiler.mytypereconstruction.unify.MUB;
-import mycompiler.mytypereconstruction.unify.Unify;
 
 import org.apache.log4j.Logger;
 // ino.end
@@ -38,6 +36,7 @@ import org.apache.log4j.Logger;
 
 
 
+
 import de.dhbwstuttgart.core.SyntaxTreeNode;
 import de.dhbwstuttgart.syntaxtree.Class;
 import de.dhbwstuttgart.syntaxtree.operator.LogOp;
@@ -56,6 +55,8 @@ import de.dhbwstuttgart.typeinference.JavaCodeResult;
 import de.dhbwstuttgart.typeinference.ResultSet;
 import de.dhbwstuttgart.typeinference.SingleConstraint;
 import de.dhbwstuttgart.typeinference.assumptions.TypeAssumptions;
+import de.dhbwstuttgart.typeinference.unify.MUB;
+import de.dhbwstuttgart.typeinference.unify.Unify;
 import sun.reflect.generics.reflectiveObjects.NotImplementedException;
 
 

src/de/dhbwstuttgart/syntaxtree/statement/InstVar.java

@@ -20,7 +20,6 @@ import mycompiler.mytypereconstruction.set.CTypeAssumptionSet;
 import mycompiler.mytypereconstruction.typeassumption.CInstVarTypeAssumption;
 import mycompiler.mytypereconstruction.typeassumption.CTypeAssumption;
 import mycompiler.mytypereconstruction.typeassumptionkey.CInstVarKey;
-import mycompiler.mytypereconstruction.unify.Unify;
 
 import org.apache.log4j.Logger;
 // ino.end
@@ -39,6 +38,7 @@ import org.apache.log4j.Logger;
 
 
 
+
 import de.dhbwstuttgart.core.SyntaxTreeNode;
 import de.dhbwstuttgart.syntaxtree.Class;
 import de.dhbwstuttgart.syntaxtree.misc.UsedId;
@@ -56,6 +56,7 @@ import de.dhbwstuttgart.typeinference.TypeinferenceResultSet;
 import de.dhbwstuttgart.typeinference.UndConstraint;
 import de.dhbwstuttgart.typeinference.assumptions.FieldAssumption;
 import de.dhbwstuttgart.typeinference.assumptions.TypeAssumptions;
+import de.dhbwstuttgart.typeinference.unify.Unify;
 
 
 

src/de/dhbwstuttgart/syntaxtree/statement/MethodCall.java

@@ -28,8 +28,6 @@ import mycompiler.mytypereconstruction.typeassumption.CMethodTypeAssumption;
 import mycompiler.mytypereconstruction.typeassumption.CParaTypeAssumption;
 import mycompiler.mytypereconstruction.typeassumption.CTypeAssumption;
 import mycompiler.mytypereconstruction.typeassumptionkey.CMethodKey;
-import mycompiler.mytypereconstruction.unify.FC_TTO;
-import mycompiler.mytypereconstruction.unify.Unify;
 
 import org.apache.log4j.Logger;
 // ino.end
@@ -46,6 +44,7 @@ import org.apache.log4j.Logger;
 
 
 
+
 import de.dhbwstuttgart.core.SyntaxTreeNode;
 import de.dhbwstuttgart.syntaxtree.Class;
 import de.dhbwstuttgart.syntaxtree.ClassBody;
@@ -68,6 +67,8 @@ import de.dhbwstuttgart.typeinference.Overloading;
 import de.dhbwstuttgart.typeinference.ResultSet;
 import de.dhbwstuttgart.typeinference.TypeinferenceResultSet;
 import de.dhbwstuttgart.typeinference.assumptions.TypeAssumptions;
+import de.dhbwstuttgart.typeinference.unify.FC_TTO;
+import de.dhbwstuttgart.typeinference.unify.Unify;
 import sun.reflect.generics.reflectiveObjects.NotImplementedException;
 
 

src/de/dhbwstuttgart/syntaxtree/statement/NegativeExpr.java

@@ -18,7 +18,6 @@ import mycompiler.mytypereconstruction.set.CSubstitutionSet;
 import mycompiler.mytypereconstruction.set.CTripleSet;
 import mycompiler.mytypereconstruction.set.CTypeAssumptionSet;
 import mycompiler.mytypereconstruction.typeassumption.CTypeAssumption;
-import mycompiler.mytypereconstruction.unify.Unify;
 
 import org.apache.log4j.Logger;
 // ino.end
@@ -32,6 +31,7 @@ import org.apache.log4j.Logger;
 
 
 
+
 import de.dhbwstuttgart.core.SyntaxTreeNode;
 import de.dhbwstuttgart.syntaxtree.Class;
 import de.dhbwstuttgart.syntaxtree.type.GenericTypeVar;
@@ -43,6 +43,7 @@ import de.dhbwstuttgart.typeinference.ConstraintsSet;
 import de.dhbwstuttgart.typeinference.JavaCodeResult;
 import de.dhbwstuttgart.typeinference.ResultSet;
 import de.dhbwstuttgart.typeinference.assumptions.TypeAssumptions;
+import de.dhbwstuttgart.typeinference.unify.Unify;
 
 
 

src/de/dhbwstuttgart/syntaxtree/statement/NotExpr.java

@@ -17,7 +17,6 @@ import mycompiler.mytypereconstruction.set.CSubstitutionSet;
 import mycompiler.mytypereconstruction.set.CTripleSet;
 import mycompiler.mytypereconstruction.set.CTypeAssumptionSet;
 import mycompiler.mytypereconstruction.typeassumption.CTypeAssumption;
-import mycompiler.mytypereconstruction.unify.Unify;
 
 import org.apache.log4j.Logger;
 // ino.end
@@ -33,6 +32,7 @@ import org.apache.log4j.Logger;
 
 
 
+
 import de.dhbwstuttgart.core.SyntaxTreeNode;
 import de.dhbwstuttgart.syntaxtree.Class;
 import de.dhbwstuttgart.syntaxtree.type.BooleanType;
@@ -46,6 +46,7 @@ import de.dhbwstuttgart.typeinference.JavaCodeResult;
 import de.dhbwstuttgart.typeinference.OderConstraint;
 import de.dhbwstuttgart.typeinference.ResultSet;
 import de.dhbwstuttgart.typeinference.assumptions.TypeAssumptions;
+import de.dhbwstuttgart.typeinference.unify.Unify;
 
 
 

src/de/dhbwstuttgart/syntaxtree/statement/PostDecExpr.java

@@ -19,7 +19,6 @@ import mycompiler.mytypereconstruction.set.CSubstitutionSet;
 import mycompiler.mytypereconstruction.set.CTripleSet;
 import mycompiler.mytypereconstruction.set.CTypeAssumptionSet;
 import mycompiler.mytypereconstruction.typeassumption.CTypeAssumption;
-import mycompiler.mytypereconstruction.unify.Unify;
 
 import org.apache.log4j.Logger;
 // ino.end
@@ -33,6 +32,7 @@ import org.apache.log4j.Logger;
 
 
 
+
 import de.dhbwstuttgart.core.SyntaxTreeNode;
 import de.dhbwstuttgart.syntaxtree.Class;
 import de.dhbwstuttgart.syntaxtree.type.GenericTypeVar;
@@ -44,6 +44,7 @@ import de.dhbwstuttgart.typeinference.ConstraintsSet;
 import de.dhbwstuttgart.typeinference.JavaCodeResult;
 import de.dhbwstuttgart.typeinference.ResultSet;
 import de.dhbwstuttgart.typeinference.assumptions.TypeAssumptions;
+import de.dhbwstuttgart.typeinference.unify.Unify;
 
 
 

src/de/dhbwstuttgart/syntaxtree/statement/PostIncExpr.java

@@ -19,7 +19,6 @@ import mycompiler.mytypereconstruction.set.CSubstitutionSet;
 import mycompiler.mytypereconstruction.set.CTripleSet;
 import mycompiler.mytypereconstruction.set.CTypeAssumptionSet;
 import mycompiler.mytypereconstruction.typeassumption.CTypeAssumption;
-import mycompiler.mytypereconstruction.unify.Unify;
 
 import org.apache.log4j.Logger;
 // ino.end
@@ -36,6 +35,7 @@ import org.apache.log4j.Logger;
 
 
 
+
 import de.dhbwstuttgart.core.SyntaxTreeNode;
 import de.dhbwstuttgart.syntaxtree.Class;
 import de.dhbwstuttgart.syntaxtree.type.GenericTypeVar;
@@ -50,6 +50,7 @@ import de.dhbwstuttgart.typeinference.OderConstraint;
 import de.dhbwstuttgart.typeinference.ResultSet;
 import de.dhbwstuttgart.typeinference.UndConstraint;
 import de.dhbwstuttgart.typeinference.assumptions.TypeAssumptions;
+import de.dhbwstuttgart.typeinference.unify.Unify;
 
 
 

src/de/dhbwstuttgart/syntaxtree/statement/PreDecExpr.java

@@ -19,7 +19,6 @@ import mycompiler.mytypereconstruction.set.CSubstitutionSet;
 import mycompiler.mytypereconstruction.set.CTripleSet;
 import mycompiler.mytypereconstruction.set.CTypeAssumptionSet;
 import mycompiler.mytypereconstruction.typeassumption.CTypeAssumption;
-import mycompiler.mytypereconstruction.unify.Unify;
 
 import org.apache.log4j.Logger;
 // ino.end
@@ -33,6 +32,7 @@ import org.apache.log4j.Logger;
 
 
 
+
 import de.dhbwstuttgart.core.SyntaxTreeNode;
 import de.dhbwstuttgart.syntaxtree.Class;
 import de.dhbwstuttgart.syntaxtree.type.GenericTypeVar;
@@ -44,6 +44,7 @@ import de.dhbwstuttgart.typeinference.ConstraintsSet;
 import de.dhbwstuttgart.typeinference.JavaCodeResult;
 import de.dhbwstuttgart.typeinference.ResultSet;
 import de.dhbwstuttgart.typeinference.assumptions.TypeAssumptions;
+import de.dhbwstuttgart.typeinference.unify.Unify;
 
 
 

src/de/dhbwstuttgart/syntaxtree/statement/PreIncExpr.java

@@ -19,7 +19,6 @@ import mycompiler.mytypereconstruction.set.CSubstitutionSet;
 import mycompiler.mytypereconstruction.set.CTripleSet;
 import mycompiler.mytypereconstruction.set.CTypeAssumptionSet;
 import mycompiler.mytypereconstruction.typeassumption.CTypeAssumption;
-import mycompiler.mytypereconstruction.unify.Unify;
 
 import org.apache.log4j.Logger;
 // ino.end
@@ -33,6 +32,7 @@ import org.apache.log4j.Logger;
 
 
 
+
 import de.dhbwstuttgart.core.SyntaxTreeNode;
 import de.dhbwstuttgart.syntaxtree.Class;
 import de.dhbwstuttgart.syntaxtree.type.GenericTypeVar;
@@ -44,6 +44,7 @@ import de.dhbwstuttgart.typeinference.ConstraintsSet;
 import de.dhbwstuttgart.typeinference.JavaCodeResult;
 import de.dhbwstuttgart.typeinference.ResultSet;
 import de.dhbwstuttgart.typeinference.assumptions.TypeAssumptions;
+import de.dhbwstuttgart.typeinference.unify.Unify;
 
 
 

src/de/dhbwstuttgart/syntaxtree/statement/WhileStmt.java

@@ -21,7 +21,6 @@ import mycompiler.mytypereconstruction.set.CSubstitutionSet;
 import mycompiler.mytypereconstruction.set.CTripleSet;
 import mycompiler.mytypereconstruction.set.CTypeAssumptionSet;
 import mycompiler.mytypereconstruction.typeassumption.CTypeAssumption;
-import mycompiler.mytypereconstruction.unify.Unify;
 
 import org.apache.log4j.Logger;
 // ino.end
@@ -36,6 +35,7 @@ import org.apache.log4j.Logger;
 
 
 
+
 import de.dhbwstuttgart.core.SyntaxTreeNode;
 import de.dhbwstuttgart.syntaxtree.Class;
 import de.dhbwstuttgart.syntaxtree.operator.LogOp;
@@ -51,6 +51,7 @@ import de.dhbwstuttgart.typeinference.JavaCodeResult;
 import de.dhbwstuttgart.typeinference.ResultSet;
 import de.dhbwstuttgart.typeinference.SingleConstraint;
 import de.dhbwstuttgart.typeinference.assumptions.TypeAssumptions;
+import de.dhbwstuttgart.typeinference.unify.Unify;
 import sun.reflect.generics.reflectiveObjects.NotImplementedException;
 
 

src/de/dhbwstuttgart/typeinference/unify/FC_TTO.java

@@ -1,5 +1,5 @@
 // ino.module.FC_TTO.8719.package 
-package mycompiler.mytypereconstruction.unify;
+package de.dhbwstuttgart.typeinference.unify;
 // ino.end
 
 // ino.module.FC_TTO.8719.import 

src/de/dhbwstuttgart/typeinference/unify/MUB.java

@@ -1,5 +1,5 @@
 // ino.module.MUB.8720.package 
-package mycompiler.mytypereconstruction.unify;
+package de.dhbwstuttgart.typeinference.unify;
 // ino.end
 
 // ino.module.MUB.8720.import 

src/de/dhbwstuttgart/typeinference/unify/Unify.java

@@ -1,6 +1,6 @@
 //otth/pluemicke2.1.jav funktioniert nicht xxx anschauen
 // ino.module.Unify.8721.package 
-package mycompiler.mytypereconstruction.unify;
+package de.dhbwstuttgart.typeinference.unify;
 // ino.end
 // ino.module.Unify.8721.import 
 import java.util.Enumeration;

src/mycompiler/mytypereconstruction/CSupportData.java

@@ -8,8 +8,7 @@ import java.util.Vector;
 import de.dhbwstuttgart.syntaxtree.type.GenericTypeVar;
 import de.dhbwstuttgart.syntaxtree.type.RefType;
 import de.dhbwstuttgart.typeinference.TypeinferenceResultSet;
-import mycompiler.mytypereconstruction.unify.FC_TTO;
+import de.dhbwstuttgart.typeinference.unify.FC_TTO;
-// ino.end
 
 // ino.class.CSupportData.27076.description type=javadoc
 /**

test/mycompiler/test/unittest/typeReconstructionTest/TrMakeFCTest.java

@@ -5,7 +5,6 @@ import java.util.Vector;
 import junit.framework.TestCase;
 import mycompiler.myinterface.Interface;
 import mycompiler.mymodifier.Modifiers;
-import mycompiler.mytypereconstruction.unify.FC_TTO;
 
 import org.apache.log4j.Logger;
 import org.apache.log4j.xml.DOMConfigurator;
@@ -18,6 +17,7 @@ import de.dhbwstuttgart.syntaxtree.type.GenericTypeVar;
 import de.dhbwstuttgart.syntaxtree.type.Pair;
 import de.dhbwstuttgart.syntaxtree.type.RefType;
 import de.dhbwstuttgart.syntaxtree.type.Type;
+import de.dhbwstuttgart.typeinference.unify.FC_TTO;
 
 public class TrMakeFCTest extends TestCase{
 	

test/mycompiler/test/unittest/typeReconstructionTest/TrSubUnifyTest.java

@@ -6,8 +6,6 @@ import java.util.Vector;
 import junit.framework.TestCase;
 import mycompiler.myinterface.Interface;
 import mycompiler.mymodifier.Modifiers;
-import mycompiler.mytypereconstruction.unify.FC_TTO;
-import mycompiler.mytypereconstruction.unify.Unify;
 
 import org.apache.log4j.Logger;
 import org.apache.log4j.xml.DOMConfigurator;
@@ -27,6 +25,8 @@ import de.dhbwstuttgart.syntaxtree.type.SuperWildcardType;
 import de.dhbwstuttgart.syntaxtree.type.Type;
 import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
 import de.dhbwstuttgart.syntaxtree.type.Pair.PairOperator;
+import de.dhbwstuttgart.typeinference.unify.FC_TTO;
+import de.dhbwstuttgart.typeinference.unify.Unify;
 
 /*TODO: - mock makeFC and needs to be relocated (now called for every test)
  * 		 - erase2 -> FreshWildcardType?? 

test/mycompiler/test/unittest/typeReconstructionTest/TrUnifyTest.java

@@ -5,8 +5,6 @@ import java.util.Vector;
 import junit.framework.TestCase;
 import mycompiler.myinterface.Interface;
 import mycompiler.mymodifier.Modifiers;
-import mycompiler.mytypereconstruction.unify.FC_TTO;
-import mycompiler.mytypereconstruction.unify.Unify;
 
 import org.apache.log4j.xml.DOMConfigurator;
 import org.junit.After;
@@ -24,6 +22,8 @@ import de.dhbwstuttgart.syntaxtree.type.SuperWildcardType;
 import de.dhbwstuttgart.syntaxtree.type.Type;
 import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
 import de.dhbwstuttgart.syntaxtree.type.Pair.PairOperator;
+import de.dhbwstuttgart.typeinference.unify.FC_TTO;
+import de.dhbwstuttgart.typeinference.unify.Unify;
 
 public class TrUnifyTest extends TestCase {