From 21cf019ac45490f87aefc9e21dd06a589d7595e3 Mon Sep 17 00:00:00 2001
From: JanUlrich <andi@michlaustderaffe.de>
Date: Wed, 10 Jun 2015 11:36:40 +0200
Subject: [PATCH] =?UTF-8?q?Unn=C3=B6tige=20Typen=20gel=C3=B6scht.=20char,?=
 =?UTF-8?q?=20int,=20bool,=20etc.=20K=C3=B6nnen=20vom=20Unify-Algorithmus?=
 =?UTF-8?q?=20nicht=20verwertet=20werden?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../syntaxtree/ParameterList.java             |  1 -
 .../dhbwstuttgart/syntaxtree/SourceFile.java  |  1 -
 .../syntaxtree/modifier/Modifiers.java        |  1 -
 .../syntaxtree/operator/AddOp.java            |  1 -
 .../syntaxtree/operator/AndOp.java            |  2 -
 .../syntaxtree/operator/LogOp.java            |  1 -
 .../syntaxtree/statement/BoolLiteral.java     |  3 +-
 .../syntaxtree/statement/CharLiteral.java     |  3 +-
 .../syntaxtree/statement/DoubleLiteral.java   |  5 +-
 .../syntaxtree/statement/FloatLiteral.java    |  3 +-
 .../syntaxtree/statement/IfStmt.java          |  1 -
 .../syntaxtree/statement/InstanceOf.java      |  3 +-
 .../syntaxtree/statement/IntLiteral.java      |  3 +-
 .../statement/LambdaExpression.java           |  1 -
 .../syntaxtree/statement/LongLiteral.java     |  4 +-
 .../syntaxtree/statement/NotExpr.java         |  1 -
 .../syntaxtree/statement/WhileStmt.java       |  1 -
 .../syntaxtree/type/BaseType.java             | 93 -------------------
 .../syntaxtree/type/BooleanType.java          | 64 -------------
 .../syntaxtree/type/CharacterType.java        | 64 -------------
 .../syntaxtree/type/DoubleType.java           | 64 -------------
 .../syntaxtree/type/FloatType.java            | 64 -------------
 .../type/FreshExtendsWildcardType.java        | 36 +++----
 .../syntaxtree/type/IntegerType.java          | 64 -------------
 .../syntaxtree/type/LongType.java             | 65 -------------
 .../syntaxtree/type/ReturnType.java           | 64 -------------
 26 files changed, 25 insertions(+), 588 deletions(-)
 delete mode 100755 src/de/dhbwstuttgart/syntaxtree/type/BaseType.java
 delete mode 100755 src/de/dhbwstuttgart/syntaxtree/type/BooleanType.java
 delete mode 100755 src/de/dhbwstuttgart/syntaxtree/type/CharacterType.java
 delete mode 100755 src/de/dhbwstuttgart/syntaxtree/type/DoubleType.java
 delete mode 100755 src/de/dhbwstuttgart/syntaxtree/type/FloatType.java
 delete mode 100755 src/de/dhbwstuttgart/syntaxtree/type/IntegerType.java
 delete mode 100755 src/de/dhbwstuttgart/syntaxtree/type/LongType.java
 delete mode 100755 src/de/dhbwstuttgart/syntaxtree/type/ReturnType.java

diff --git a/src/de/dhbwstuttgart/syntaxtree/ParameterList.java b/src/de/dhbwstuttgart/syntaxtree/ParameterList.java
index a19889d05..cdf632e18 100755
--- a/src/de/dhbwstuttgart/syntaxtree/ParameterList.java
+++ b/src/de/dhbwstuttgart/syntaxtree/ParameterList.java
@@ -7,7 +7,6 @@ import de.dhbwstuttgart.typeinference.Menge;
 
 import java.util.Iterator;
 
-import de.dhbwstuttgart.syntaxtree.type.BaseType;
 import de.dhbwstuttgart.syntaxtree.type.RefType;
 import de.dhbwstuttgart.typeinference.JavaCodeResult;
 import de.dhbwstuttgart.typeinference.ResultSet;
diff --git a/src/de/dhbwstuttgart/syntaxtree/SourceFile.java b/src/de/dhbwstuttgart/syntaxtree/SourceFile.java
index 25599b4c8..8d9a0d4d3 100755
--- a/src/de/dhbwstuttgart/syntaxtree/SourceFile.java
+++ b/src/de/dhbwstuttgart/syntaxtree/SourceFile.java
@@ -24,7 +24,6 @@ import de.dhbwstuttgart.syntaxtree.misc.DeclId;
 import de.dhbwstuttgart.syntaxtree.misc.UsedId;
 import de.dhbwstuttgart.syntaxtree.modifier.Modifiers;
 import de.dhbwstuttgart.syntaxtree.modifier.Public;
-import de.dhbwstuttgart.syntaxtree.type.BooleanType;
 import de.dhbwstuttgart.syntaxtree.type.GenericTypeVar;
 import de.dhbwstuttgart.syntaxtree.type.RefType;
 import de.dhbwstuttgart.syntaxtree.type.Type;
diff --git a/src/de/dhbwstuttgart/syntaxtree/modifier/Modifiers.java b/src/de/dhbwstuttgart/syntaxtree/modifier/Modifiers.java
index ff77d8a66..c61fd97bd 100755
--- a/src/de/dhbwstuttgart/syntaxtree/modifier/Modifiers.java
+++ b/src/de/dhbwstuttgart/syntaxtree/modifier/Modifiers.java
@@ -5,7 +5,6 @@ package de.dhbwstuttgart.syntaxtree.modifier;
 // ino.module.Modifiers.8588.import 
 import de.dhbwstuttgart.typeinference.Menge;
 
-import de.dhbwstuttgart.syntaxtree.type.BaseType;
 import de.dhbwstuttgart.typeinference.JavaCodeResult;
 import de.dhbwstuttgart.typeinference.ResultSet;
 // ino.end
diff --git a/src/de/dhbwstuttgart/syntaxtree/operator/AddOp.java b/src/de/dhbwstuttgart/syntaxtree/operator/AddOp.java
index 52bc2d385..f7bf8281c 100755
--- a/src/de/dhbwstuttgart/syntaxtree/operator/AddOp.java
+++ b/src/de/dhbwstuttgart/syntaxtree/operator/AddOp.java
@@ -11,7 +11,6 @@ import de.dhbwstuttgart.myexception.CTypeReconstructionException;
 import de.dhbwstuttgart.myexception.JVMCodeException;
 import de.dhbwstuttgart.syntaxtree.statement.Binary;
 import de.dhbwstuttgart.syntaxtree.statement.Expr;
-import de.dhbwstuttgart.syntaxtree.type.IntegerType;
 import de.dhbwstuttgart.syntaxtree.type.RefType;
 import de.dhbwstuttgart.syntaxtree.type.Type;
 import de.dhbwstuttgart.typeinference.ConstraintType;
diff --git a/src/de/dhbwstuttgart/syntaxtree/operator/AndOp.java b/src/de/dhbwstuttgart/syntaxtree/operator/AndOp.java
index 6884d20bd..fdb01d2cb 100755
--- a/src/de/dhbwstuttgart/syntaxtree/operator/AndOp.java
+++ b/src/de/dhbwstuttgart/syntaxtree/operator/AndOp.java
@@ -5,8 +5,6 @@ import de.dhbwstuttgart.typeinference.Menge;
 
 import de.dhbwstuttgart.syntaxtree.SyntaxTreeNode;
 import de.dhbwstuttgart.syntaxtree.statement.Expr;
-import de.dhbwstuttgart.syntaxtree.type.BooleanType;
-import de.dhbwstuttgart.syntaxtree.type.IntegerType;
 import de.dhbwstuttgart.syntaxtree.type.Type;
 import de.dhbwstuttgart.typeinference.ConstraintsSet;
 import de.dhbwstuttgart.typeinference.SingleConstraint;
diff --git a/src/de/dhbwstuttgart/syntaxtree/operator/LogOp.java b/src/de/dhbwstuttgart/syntaxtree/operator/LogOp.java
index 7f1c421f7..a497feb4e 100755
--- a/src/de/dhbwstuttgart/syntaxtree/operator/LogOp.java
+++ b/src/de/dhbwstuttgart/syntaxtree/operator/LogOp.java
@@ -14,7 +14,6 @@ import de.dhbwstuttgart.syntaxtree.statement.Expr;
 import de.dhbwstuttgart.syntaxtree.statement.NotExpr;
 import de.dhbwstuttgart.syntaxtree.statement.Null;
 import de.dhbwstuttgart.syntaxtree.statement.Statement;
-import de.dhbwstuttgart.syntaxtree.type.BooleanType;
 import de.dhbwstuttgart.syntaxtree.type.RefType;
 import de.dhbwstuttgart.syntaxtree.type.Type;
 import de.dhbwstuttgart.typeinference.ConstraintType;
diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/BoolLiteral.java b/src/de/dhbwstuttgart/syntaxtree/statement/BoolLiteral.java
index c2a7eb925..e0f08783e 100755
--- a/src/de/dhbwstuttgart/syntaxtree/statement/BoolLiteral.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/BoolLiteral.java
@@ -10,7 +10,6 @@ import de.dhbwstuttgart.myexception.CTypeReconstructionException;
 import de.dhbwstuttgart.myexception.JVMCodeException;
 import de.dhbwstuttgart.syntaxtree.Class;
 import de.dhbwstuttgart.syntaxtree.SyntaxTreeNode;
-import de.dhbwstuttgart.syntaxtree.type.BooleanType;
 import de.dhbwstuttgart.syntaxtree.type.GenericTypeVar;
 import de.dhbwstuttgart.syntaxtree.type.RefType;
 import de.dhbwstuttgart.syntaxtree.type.Type;
@@ -44,7 +43,7 @@ public class BoolLiteral extends Literal
         super(-1,-1);
         // #JB# 20.04.2005
         // ###########################################################
-        this.setType(new BooleanType(this));
+        this.setType(new RefType("Boolean",this,this.getOffset()));
         //this.setType(new Type("boolean"));
         // ###########################################################
     }
diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/CharLiteral.java b/src/de/dhbwstuttgart/syntaxtree/statement/CharLiteral.java
index b0aa0568b..a5a296a2c 100755
--- a/src/de/dhbwstuttgart/syntaxtree/statement/CharLiteral.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/CharLiteral.java
@@ -9,7 +9,6 @@ import de.dhbwstuttgart.myexception.CTypeReconstructionException;
 import de.dhbwstuttgart.myexception.JVMCodeException;
 import de.dhbwstuttgart.syntaxtree.Class;
 import de.dhbwstuttgart.syntaxtree.SyntaxTreeNode;
-import de.dhbwstuttgart.syntaxtree.type.CharacterType;
 import de.dhbwstuttgart.syntaxtree.type.GenericTypeVar;
 import de.dhbwstuttgart.syntaxtree.type.RefType;
 import de.dhbwstuttgart.syntaxtree.type.Type;
@@ -43,7 +42,7 @@ public class CharLiteral extends Literal
         super(-1,-1);
         // #JB# 20.04.2005
         // ###########################################################
-        this.setType(new CharacterType(this));
+        this.setType(new RefType("Char",this,this.getOffset()));
         //this.setType(new Type("char"));
         // ###########################################################
     }
diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/DoubleLiteral.java b/src/de/dhbwstuttgart/syntaxtree/statement/DoubleLiteral.java
index ca888b976..60961af45 100755
--- a/src/de/dhbwstuttgart/syntaxtree/statement/DoubleLiteral.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/DoubleLiteral.java
@@ -12,10 +12,7 @@ import de.dhbwstuttgart.myexception.CTypeReconstructionException;
 import de.dhbwstuttgart.myexception.JVMCodeException;
 import de.dhbwstuttgart.syntaxtree.Class;
 import de.dhbwstuttgart.syntaxtree.SyntaxTreeNode;
-import de.dhbwstuttgart.syntaxtree.type.DoubleType;
 import de.dhbwstuttgart.syntaxtree.type.GenericTypeVar;
-import de.dhbwstuttgart.syntaxtree.type.IntegerType;
-import de.dhbwstuttgart.syntaxtree.type.LongType;
 import de.dhbwstuttgart.syntaxtree.type.RefType;
 import de.dhbwstuttgart.syntaxtree.type.Type;
 import de.dhbwstuttgart.typeinference.ConstraintsSet;
@@ -47,7 +44,7 @@ public class DoubleLiteral extends Literal
     {
         super(-1,-1);
        
-        this.setType(new DoubleType(this));
+        this.setType(new RefType("Double",this,this.getOffset()));
         
     }
     // ino.end
diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/FloatLiteral.java b/src/de/dhbwstuttgart/syntaxtree/statement/FloatLiteral.java
index ed809fab5..88c3ee664 100755
--- a/src/de/dhbwstuttgart/syntaxtree/statement/FloatLiteral.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/FloatLiteral.java
@@ -11,7 +11,6 @@ import de.dhbwstuttgart.myexception.CTypeReconstructionException;
 import de.dhbwstuttgart.myexception.JVMCodeException;
 import de.dhbwstuttgart.syntaxtree.Class;
 import de.dhbwstuttgart.syntaxtree.SyntaxTreeNode;
-import de.dhbwstuttgart.syntaxtree.type.FloatType;
 import de.dhbwstuttgart.syntaxtree.type.GenericTypeVar;
 import de.dhbwstuttgart.syntaxtree.type.RefType;
 import de.dhbwstuttgart.syntaxtree.type.Type;
@@ -43,7 +42,7 @@ public class FloatLiteral extends Literal
     {
         super(-1,-1);
        
-        this.setType(new FloatType(this));
+        this.setType(new RefType("Float",this,this.getOffset()));
         
     }
     // ino.end
diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/IfStmt.java b/src/de/dhbwstuttgart/syntaxtree/statement/IfStmt.java
index 5e23f141a..f65f09b47 100755
--- a/src/de/dhbwstuttgart/syntaxtree/statement/IfStmt.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/IfStmt.java
@@ -18,7 +18,6 @@ import de.dhbwstuttgart.syntaxtree.SyntaxTreeNode;
 import de.dhbwstuttgart.syntaxtree.operator.LogOp;
 import de.dhbwstuttgart.syntaxtree.operator.Operator;
 import de.dhbwstuttgart.syntaxtree.operator.RelOp;
-import de.dhbwstuttgart.syntaxtree.type.BooleanType;
 import de.dhbwstuttgart.syntaxtree.type.GenericTypeVar;
 import de.dhbwstuttgart.syntaxtree.type.RefType;
 import de.dhbwstuttgart.syntaxtree.type.Type;
diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/InstanceOf.java b/src/de/dhbwstuttgart/syntaxtree/statement/InstanceOf.java
index e000fe247..ff32848bb 100755
--- a/src/de/dhbwstuttgart/syntaxtree/statement/InstanceOf.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/InstanceOf.java
@@ -13,7 +13,6 @@ import de.dhbwstuttgart.myexception.JVMCodeException;
 import de.dhbwstuttgart.myexception.SCStatementException;
 import de.dhbwstuttgart.syntaxtree.Class;
 import de.dhbwstuttgart.syntaxtree.SyntaxTreeNode;
-import de.dhbwstuttgart.syntaxtree.type.BooleanType;
 import de.dhbwstuttgart.syntaxtree.type.GenericTypeVar;
 import de.dhbwstuttgart.syntaxtree.type.RefType;
 import de.dhbwstuttgart.syntaxtree.type.Type;
@@ -52,7 +51,7 @@ public class InstanceOf extends BinaryExpr
         super(offset,variableLength);
         // #JB# 20.04.2005
         // ###########################################################
-        this.setType(new BooleanType(this));
+        this.setType(new RefType("Boolean",this,this.getOffset()));
         //this.setType(new Type("boolean"));
         // ###########################################################
     }
diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/IntLiteral.java b/src/de/dhbwstuttgart/syntaxtree/statement/IntLiteral.java
index e9632e9bd..dea4cf9b3 100755
--- a/src/de/dhbwstuttgart/syntaxtree/statement/IntLiteral.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/IntLiteral.java
@@ -11,7 +11,6 @@ import de.dhbwstuttgart.myexception.JVMCodeException;
 import de.dhbwstuttgart.syntaxtree.Class;
 import de.dhbwstuttgart.syntaxtree.SyntaxTreeNode;
 import de.dhbwstuttgart.syntaxtree.type.GenericTypeVar;
-import de.dhbwstuttgart.syntaxtree.type.IntegerType;
 import de.dhbwstuttgart.syntaxtree.type.RefType;
 import de.dhbwstuttgart.syntaxtree.type.Type;
 import de.dhbwstuttgart.typeinference.ConstraintsSet;
@@ -44,7 +43,7 @@ public class IntLiteral extends Literal
         super(-1,-1);
         // #JB# 20.04.2005
         // ###########################################################
-        this.setType(new IntegerType(this));
+        this.setType(new RefType("Integer",this,this.getOffset()));
         //this.setType(new Type("int"));
         // ###########################################################
     }
diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/LambdaExpression.java b/src/de/dhbwstuttgart/syntaxtree/statement/LambdaExpression.java
index 133fe6d0f..9015e34cb 100755
--- a/src/de/dhbwstuttgart/syntaxtree/statement/LambdaExpression.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/LambdaExpression.java
@@ -12,7 +12,6 @@ import de.dhbwstuttgart.syntaxtree.FormalParameter;
 import de.dhbwstuttgart.syntaxtree.Method;
 import de.dhbwstuttgart.syntaxtree.ParameterList;
 import de.dhbwstuttgart.syntaxtree.SyntaxTreeNode;
-import de.dhbwstuttgart.syntaxtree.type.DoubleType;
 import de.dhbwstuttgart.syntaxtree.type.ExtendsWildcardType;
 import de.dhbwstuttgart.syntaxtree.type.GenericTypeVar;
 import de.dhbwstuttgart.syntaxtree.type.ObjectType;
diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/LongLiteral.java b/src/de/dhbwstuttgart/syntaxtree/statement/LongLiteral.java
index cb9f4272e..ed99418f7 100755
--- a/src/de/dhbwstuttgart/syntaxtree/statement/LongLiteral.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/LongLiteral.java
@@ -13,8 +13,6 @@ import de.dhbwstuttgart.myexception.JVMCodeException;
 import de.dhbwstuttgart.syntaxtree.Class;
 import de.dhbwstuttgart.syntaxtree.SyntaxTreeNode;
 import de.dhbwstuttgart.syntaxtree.type.GenericTypeVar;
-import de.dhbwstuttgart.syntaxtree.type.IntegerType;
-import de.dhbwstuttgart.syntaxtree.type.LongType;
 import de.dhbwstuttgart.syntaxtree.type.RefType;
 import de.dhbwstuttgart.syntaxtree.type.Type;
 import de.dhbwstuttgart.typeinference.ConstraintsSet;
@@ -46,7 +44,7 @@ public class LongLiteral extends Literal
     {
         super(-1,-1);
        
-        this.setType(new LongType(this));
+        this.setType(new RefType("Long",this,this.getOffset()));
         
     }
     // ino.end
diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/NotExpr.java b/src/de/dhbwstuttgart/syntaxtree/statement/NotExpr.java
index a3cfbb679..b57571199 100755
--- a/src/de/dhbwstuttgart/syntaxtree/statement/NotExpr.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/NotExpr.java
@@ -13,7 +13,6 @@ import de.dhbwstuttgart.myexception.JVMCodeException;
 import de.dhbwstuttgart.myexception.SCStatementException;
 import de.dhbwstuttgart.syntaxtree.Class;
 import de.dhbwstuttgart.syntaxtree.SyntaxTreeNode;
-import de.dhbwstuttgart.syntaxtree.type.BooleanType;
 import de.dhbwstuttgart.syntaxtree.type.GenericTypeVar;
 import de.dhbwstuttgart.syntaxtree.type.RefType;
 import de.dhbwstuttgart.syntaxtree.type.Type;
diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/WhileStmt.java b/src/de/dhbwstuttgart/syntaxtree/statement/WhileStmt.java
index 2de82c392..f000dfbdf 100755
--- a/src/de/dhbwstuttgart/syntaxtree/statement/WhileStmt.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/WhileStmt.java
@@ -18,7 +18,6 @@ import de.dhbwstuttgart.syntaxtree.SyntaxTreeNode;
 import de.dhbwstuttgart.syntaxtree.operator.LogOp;
 import de.dhbwstuttgart.syntaxtree.operator.Operator;
 import de.dhbwstuttgart.syntaxtree.operator.RelOp;
-import de.dhbwstuttgart.syntaxtree.type.BooleanType;
 import de.dhbwstuttgart.syntaxtree.type.GenericTypeVar;
 import de.dhbwstuttgart.syntaxtree.type.RefType;
 import de.dhbwstuttgart.syntaxtree.type.Type;
diff --git a/src/de/dhbwstuttgart/syntaxtree/type/BaseType.java b/src/de/dhbwstuttgart/syntaxtree/type/BaseType.java
deleted file mode 100755
index 5297dcec0..000000000
--- a/src/de/dhbwstuttgart/syntaxtree/type/BaseType.java
+++ /dev/null
@@ -1,93 +0,0 @@
-// ino.module.BaseType.8667.package 
-package de.dhbwstuttgart.syntaxtree.type;
-
-import de.dhbwstuttgart.core.IItemWithOffset;
-import de.dhbwstuttgart.syntaxtree.SyntaxTreeNode;
-import de.dhbwstuttgart.typeinference.ConstraintType;
-import de.dhbwstuttgart.typeinference.assumptions.TypeAssumptions;
-
-// ino.end
-// ino.class.BaseType.26435.declaration 
-public abstract class BaseType extends Type
-// ino.end
-// ino.class.BaseType.26435.body
-{
-	/**
-     * Ist IsArray auf true, muss beim Codegen ein Zeichen [ gesetzt werden 
-     * Bsp.: 15| tag = CONSTANT_Utf8, length = 22, ([Ljava/lang/String;)V
-     * Ist IsArray auf false, muss beim Codegen ein Zeichen [ gesetzt werden 
-     * Bsp.: 9| tag = CONSTANT_Utf8, length = 21, (Ljava/lang/String;)V
-     */
-	private boolean IsArray = false;
-	
-    // ino.method.BaseType.26439.definition 
-    public BaseType(SyntaxTreeNode parent, int offset)
-    // ino.end
-    // ino.method.BaseType.26439.body 
-    {
-        super(parent, offset);
-    }
-    // ino.end
-    
-    // ino.method.BaseType.26442.definition 
-    public BaseType(String name,SyntaxTreeNode parent,int offset)
-    // ino.end
-    // ino.method.BaseType.26442.body 
-    {
-        super(name,parent, offset);
-    }
-    // ino.end
-    
-    // ino.method.equals.26445.defdescription type=javadoc
-    /**
-     * Author: J�rg B�uerle<br/>
-     * @param Object
-     * @return
-     */
-    // ino.end
-    // ino.method.equals.26445.definition 
-    public boolean equals(Object obj)
-    // ino.end
-    // ino.method.equals.26445.body 
-    {
-        if(obj instanceof BaseType){
-            return super.equals(obj);
-        }
-        else{
-            return false;
-        }
-    }
-    // ino.end
-
-    // ino.method.clone.26448.declaration 
-    public abstract BaseType clone();
-    // ino.end
-
-	/**
-	 * Author: Daniel Feinler<br/>
-	 * Handelt ab, ob der Typ eines Objekts ein Array ist, wenn true dann 
-	 * wird im Bytecode ein flag gesetzt wenn nicht, dann halt nicht.
-	 * @return the IsArray
-	 */
-	public boolean IsArray() {
-		return IsArray;
-	}
-
-	/**
-	 * Author: Daniel Feinler<br/>
-	 * Handelt ab, ob der Typ eines Objekts ein Array ist, wenn true dann 
-	 * wird im Bytecode ein flag gesetzt wenn nicht, dann halt nicht.
-	 * @param IsArray the IsArray to set
-	 */
-	public void setArray(boolean IsArray) {
-		this.IsArray = IsArray;
-	}
-
-	@Override
-	public ConstraintType TYPE(TypeAssumptions ass, SyntaxTreeNode parent) {
-		return super.TYPE(ass, parent); //Die Base-Types müssen nicht nachgeschlagen werden.
-	}
-	
-	
-}
-// ino.end
diff --git a/src/de/dhbwstuttgart/syntaxtree/type/BooleanType.java b/src/de/dhbwstuttgart/syntaxtree/type/BooleanType.java
deleted file mode 100755
index b20385167..000000000
--- a/src/de/dhbwstuttgart/syntaxtree/type/BooleanType.java
+++ /dev/null
@@ -1,64 +0,0 @@
-// ino.module.BooleanType.8668.package 
-package de.dhbwstuttgart.syntaxtree.type;
-
-import de.dhbwstuttgart.syntaxtree.SyntaxTreeNode;
-import de.dhbwstuttgart.typeinference.JavaCodeResult;
-import de.dhbwstuttgart.typeinference.ResultSet;
-
-// ino.end
-// ino.class.BooleanType.26451.declaration 
-public class BooleanType extends BaseType
-// ino.end
-// ino.class.BooleanType.26451.body
-{
-    // ino.method.BooleanType.26455.definition 
-    public BooleanType(SyntaxTreeNode parent)
-    // ino.end
-    // ino.method.BooleanType.26455.body 
-    {
-        super("boolean",parent, -1);
-    }
-    // ino.end
-    
-    // ino.method.equals.26458.defdescription type=javadoc
-    /**
-     * Author: J�rg B�uerle<br/>
-     * @param Object
-     * @return
-     */
-    // ino.end
-    // ino.method.equals.26458.definition 
-    public boolean equals(Object obj)
-    // ino.end
-    // ino.method.equals.26458.body 
-    {
-        if(obj instanceof BooleanType){
-            return super.equals(obj);
-        }
-        else{
-            return false;
-        }
-    }
-    // ino.end
-
-    // ino.method.clone.26461.defdescription type=javadoc
-    /**
-     * <br>Author: J�rg B�uerle
-     * @return
-     */
-    // ino.end
-    // ino.method.clone.26461.definition 
-    public BooleanType clone()
-    // ino.end
-    // ino.method.clone.26461.body 
-    {
-        return new BooleanType(this.getParent());
-    }
-    // ino.end
-
-	@Override
-	public JavaCodeResult printJavaCode(ResultSet resultSet) {
-		return new JavaCodeResult("boolean");
-	}
-}
-// ino.end
diff --git a/src/de/dhbwstuttgart/syntaxtree/type/CharacterType.java b/src/de/dhbwstuttgart/syntaxtree/type/CharacterType.java
deleted file mode 100755
index 025863fb7..000000000
--- a/src/de/dhbwstuttgart/syntaxtree/type/CharacterType.java
+++ /dev/null
@@ -1,64 +0,0 @@
-// ino.module.CharacterType.8670.package 
-package de.dhbwstuttgart.syntaxtree.type;
-
-import de.dhbwstuttgart.syntaxtree.SyntaxTreeNode;
-import de.dhbwstuttgart.typeinference.JavaCodeResult;
-import de.dhbwstuttgart.typeinference.ResultSet;
-
-// ino.end
-// ino.class.CharacterType.26492.declaration 
-public class CharacterType extends BaseType
-// ino.end
-// ino.class.CharacterType.26492.body
-{
-    // ino.method.CharacterType.26496.definition 
-    public CharacterType(SyntaxTreeNode parent)
-    // ino.end
-    // ino.method.CharacterType.26496.body 
-    {
-        super("char",parent,-1);
-    }
-    // ino.end
-    
-    // ino.method.equals.26499.defdescription type=javadoc
-    /**
-     * Author: J�rg B�uerle<br/>
-     * @param Object
-     * @return
-     */
-    // ino.end
-    // ino.method.equals.26499.definition 
-    public boolean equals(Object obj)
-    // ino.end
-    // ino.method.equals.26499.body 
-    {
-        if(obj instanceof CharacterType){
-            return super.equals(obj);
-        }
-        else{
-            return false;
-        }
-    }
-    // ino.end
-
-    // ino.method.clone.26502.defdescription type=javadoc
-    /**
-     * <br>Author: J�rg B�uerle
-     * @return
-     */
-    // ino.end
-    // ino.method.clone.26502.definition 
-    public CharacterType clone()
-    // ino.end
-    // ino.method.clone.26502.body 
-    {
-        return new CharacterType(this.getParent());
-    }
-    // ino.end
-
-	@Override
-	public JavaCodeResult printJavaCode(ResultSet resultSet) {
-		return new JavaCodeResult("char");
-	}
-}
-// ino.end
diff --git a/src/de/dhbwstuttgart/syntaxtree/type/DoubleType.java b/src/de/dhbwstuttgart/syntaxtree/type/DoubleType.java
deleted file mode 100755
index 36e0f047b..000000000
--- a/src/de/dhbwstuttgart/syntaxtree/type/DoubleType.java
+++ /dev/null
@@ -1,64 +0,0 @@
-// ino.module.IntegerType.8672.package 
-package de.dhbwstuttgart.syntaxtree.type;
-
-import de.dhbwstuttgart.syntaxtree.SyntaxTreeNode;
-import de.dhbwstuttgart.typeinference.JavaCodeResult;
-import de.dhbwstuttgart.typeinference.ResultSet;
-
-// ino.end
-// ino.class.IntegerType.26527.declaration 
-public class DoubleType extends BaseType
-// ino.end
-// ino.class.IntegerType.26527.body
-{
-    // ino.method.IntegerType.26531.definition 
-    public DoubleType(SyntaxTreeNode parent)
-    // ino.end
-    // ino.method.IntegerType.26531.body 
-    {
-        super("double",parent,-1);
-    }
-    // ino.end
-    
-    // ino.method.equals.26534.defdescription type=javadoc
-    /**
-     * Author: J�rg B�uerle<br/>
-     * @param Object
-     * @return
-     */
-    // ino.end
-    // ino.method.equals.26534.definition 
-    public boolean equals(Object obj)
-    // ino.end
-    // ino.method.equals.26534.body 
-    {
-        if(obj instanceof DoubleType){
-            return super.equals(obj);
-        }
-        else{
-            return false;
-        }
-    }
-    // ino.end
-
-    // ino.method.clone.26537.defdescription type=javadoc
-    /**
-     * <br>Author: J�rg B�uerle
-     * @return
-     */
-    // ino.end
-    // ino.method.clone.26537.definition 
-    public DoubleType clone()
-    // ino.end
-    // ino.method.clone.26537.body 
-    {
-        return new DoubleType(this.getParent());
-    }
-    // ino.end
-
-	@Override
-	public JavaCodeResult printJavaCode(ResultSet resultSet) {
-		return new JavaCodeResult("double");
-	}
-}
-// ino.end
diff --git a/src/de/dhbwstuttgart/syntaxtree/type/FloatType.java b/src/de/dhbwstuttgart/syntaxtree/type/FloatType.java
deleted file mode 100755
index 299589fde..000000000
--- a/src/de/dhbwstuttgart/syntaxtree/type/FloatType.java
+++ /dev/null
@@ -1,64 +0,0 @@
-// ino.module.IntegerType.8672.package 
-package de.dhbwstuttgart.syntaxtree.type;
-
-import de.dhbwstuttgart.syntaxtree.SyntaxTreeNode;
-import de.dhbwstuttgart.typeinference.JavaCodeResult;
-import de.dhbwstuttgart.typeinference.ResultSet;
-
-// ino.end
-// ino.class.IntegerType.26527.declaration 
-public class FloatType extends BaseType
-// ino.end
-// ino.class.IntegerType.26527.body
-{
-    // ino.method.IntegerType.26531.definition 
-    public FloatType(SyntaxTreeNode parent)
-    // ino.end
-    // ino.method.IntegerType.26531.body 
-    {
-        super("float", parent,-1);
-    }
-    // ino.end
-    
-    // ino.method.equals.26534.defdescription type=javadoc
-    /**
-     * Author: J�rg B�uerle<br/>
-     * @param Object
-     * @return
-     */
-    // ino.end
-    // ino.method.equals.26534.definition 
-    public boolean equals(Object obj)
-    // ino.end
-    // ino.method.equals.26534.body 
-    {
-        if(obj instanceof FloatType){
-            return super.equals(obj);
-        }
-        else{
-            return false;
-        }
-    }
-    // ino.end
-
-    // ino.method.clone.26537.defdescription type=javadoc
-    /**
-     * <br>Author: J�rg B�uerle
-     * @return
-     */
-    // ino.end
-    // ino.method.clone.26537.definition 
-    public FloatType clone()
-    // ino.end
-    // ino.method.clone.26537.body 
-    {
-        return new FloatType(this.getParent());
-    }
-    // ino.end
-
-	@Override
-	public JavaCodeResult printJavaCode(ResultSet resultSet) {
-		return new JavaCodeResult("float");
-	}
-}
-// ino.end
diff --git a/src/de/dhbwstuttgart/syntaxtree/type/FreshExtendsWildcardType.java b/src/de/dhbwstuttgart/syntaxtree/type/FreshExtendsWildcardType.java
index 2a455363b..4c5d8e4fa 100755
--- a/src/de/dhbwstuttgart/syntaxtree/type/FreshExtendsWildcardType.java
+++ b/src/de/dhbwstuttgart/syntaxtree/type/FreshExtendsWildcardType.java
@@ -7,8 +7,8 @@ public class FreshExtendsWildcardType extends FreshWildcardType implements IMatc
 	private ObjectType extendsBoundType;
 	
 	/**
-	* Author: Arne Lüdtke<br/>
-	* Standard Konstruktor für eine FreshExtendsWildcard
+	* Author: Arne Lüdtke<br/>
+	* Standard Konstruktor für eine FreshExtendsWildcard
 	*/
 	public FreshExtendsWildcardType(ObjectType extendsBound,SyntaxTreeNode parent ,int offset)
 	{
@@ -17,8 +17,8 @@ public class FreshExtendsWildcardType extends FreshWildcardType implements IMatc
 	}
 	
 	/**
-	* Author: Arne Lüdtke<br/>
-	* Privater Konstruktor für clone
+	* Author: Arne Lüdtke<br/>
+	* Privater Konstruktor für clone
 	*/
 	private FreshExtendsWildcardType(ObjectType extendsBound ,SyntaxTreeNode parent,int offset, String name)
 	{
@@ -27,8 +27,8 @@ public class FreshExtendsWildcardType extends FreshWildcardType implements IMatc
 	}
 	
 	/**
-	* Author: Arne Lüdtke<br/>
-	* Gibt String Entsprechung zurück.
+	* Author: Arne Lüdtke<br/>
+	* Gibt String Entsprechung zurück.
 	*/
 	public String toString()
 	{
@@ -40,8 +40,8 @@ public class FreshExtendsWildcardType extends FreshWildcardType implements IMatc
 	}
 	
 	/**
-	 * Author: Arne Lüdtke<br/>
-	 * Gibt einen Klon der Wildcard zurück.
+	 * Author: Arne Lüdtke<br/>
+	 * Gibt einen Klon der Wildcard zurück.
 	 * Der Innere Typ wird auch geklont
 	 */
 	public FreshExtendsWildcardType clone()
@@ -50,8 +50,8 @@ public class FreshExtendsWildcardType extends FreshWildcardType implements IMatc
 	}
 	
 	/**
-	* Author: Arne Lüdtke<br/>
-	* Gibt die Grenze der Wildcard zurück
+	* Author: Arne Lüdtke<br/>
+	* Gibt die Grenze der Wildcard zurück
 	*/
 	public ObjectType get_ExtendsBound()
 	{
@@ -59,8 +59,8 @@ public class FreshExtendsWildcardType extends FreshWildcardType implements IMatc
 	}
 	
 	/**
-	 * Author: Arne Lüdtke<br/>
-	 * Prüft, ob zwei Objekte gleich sind. NICHT INSTANZGLEICH
+	 * Author: Arne Lüdtke<br/>
+	 * Prüft, ob zwei Objekte gleich sind. NICHT INSTANZGLEICH
 	 */
 	public boolean equals(Object obj)
 	{
@@ -74,9 +74,9 @@ public class FreshExtendsWildcardType extends FreshWildcardType implements IMatc
 	}
 	
 	/**
-	 * Author: Arne Lüdtke<br/>
-	 * Gibt die passende ExtendsWildcardType Klasse zurück.
-	 * Wird für smaller4 verwendet
+	 * Author: Arne Lüdtke<br/>
+	 * Gibt die passende ExtendsWildcardType Klasse zurück.
+	 * Wird für smaller4 verwendet
 	 */
 	 public ExtendsWildcardType get_WildcardType()
 	 {
@@ -84,9 +84,9 @@ public class FreshExtendsWildcardType extends FreshWildcardType implements IMatc
 	 }
 	 
 	/**
-	 * Author: Arne Lüdtke<br/>
-	 * Gibt den Typen zurück, der bei einem match im Unify verwendet werden soll.
-	 * Wird über IMatchable implementiert.
+	 * Author: Arne Lüdtke<br/>
+	 * Gibt den Typen zurück, der bei einem match im Unify verwendet werden soll.
+	 * Wird über IMatchable implementiert.
 	 */
 	 public Type getMatchType()
 	 {
diff --git a/src/de/dhbwstuttgart/syntaxtree/type/IntegerType.java b/src/de/dhbwstuttgart/syntaxtree/type/IntegerType.java
deleted file mode 100755
index 6fb86103c..000000000
--- a/src/de/dhbwstuttgart/syntaxtree/type/IntegerType.java
+++ /dev/null
@@ -1,64 +0,0 @@
-// ino.module.IntegerType.8672.package 
-package de.dhbwstuttgart.syntaxtree.type;
-
-import de.dhbwstuttgart.syntaxtree.SyntaxTreeNode;
-import de.dhbwstuttgart.typeinference.JavaCodeResult;
-import de.dhbwstuttgart.typeinference.ResultSet;
-
-// ino.end
-// ino.class.IntegerType.26527.declaration 
-public class IntegerType extends BaseType
-// ino.end
-// ino.class.IntegerType.26527.body
-{
-    // ino.method.IntegerType.26531.definition 
-    public IntegerType(SyntaxTreeNode parent)
-    // ino.end
-    // ino.method.IntegerType.26531.body 
-    {
-        super("int",parent,-1);
-    }
-    // ino.end
-    
-    // ino.method.equals.26534.defdescription type=javadoc
-    /**
-     * Author: J�rg B�uerle<br/>
-     * @param Object
-     * @return
-     */
-    // ino.end
-    // ino.method.equals.26534.definition 
-    public boolean equals(Object obj)
-    // ino.end
-    // ino.method.equals.26534.body 
-    {
-        if(obj instanceof IntegerType){
-            return super.equals(obj);
-        }
-        else{
-            return false;
-        }
-    }
-    // ino.end
-
-    // ino.method.clone.26537.defdescription type=javadoc
-    /**
-     * <br>Author: J�rg B�uerle
-     * @return
-     */
-    // ino.end
-    // ino.method.clone.26537.definition 
-    public IntegerType clone()
-    // ino.end
-    // ino.method.clone.26537.body 
-    {
-        return new IntegerType(this.getParent());
-    }
-    // ino.end
-
-	@Override
-	public JavaCodeResult printJavaCode(ResultSet resultSet) {
-		return new JavaCodeResult("int");
-	}
-}
-// ino.end
diff --git a/src/de/dhbwstuttgart/syntaxtree/type/LongType.java b/src/de/dhbwstuttgart/syntaxtree/type/LongType.java
deleted file mode 100755
index 8184ee478..000000000
--- a/src/de/dhbwstuttgart/syntaxtree/type/LongType.java
+++ /dev/null
@@ -1,65 +0,0 @@
-// ino.module.IntegerType.8672.package 
-package de.dhbwstuttgart.syntaxtree.type;
-
-import de.dhbwstuttgart.syntaxtree.SyntaxTreeNode;
-import de.dhbwstuttgart.typeinference.JavaCodeResult;
-import de.dhbwstuttgart.typeinference.ResultSet;
-
-// ino.end
-// ino.class.IntegerType.26527.declaration 
-public class LongType extends BaseType
-// ino.end
-// ino.class.IntegerType.26527.body
-{
-    // ino.method.IntegerType.26531.definition 
-    public LongType(SyntaxTreeNode parent)
-    // ino.end
-    // ino.method.IntegerType.26531.body 
-    {
-        super("long", parent,-1);
-    }
-    // ino.end
-    
-    // ino.method.equals.26534.defdescription type=javadoc
-    /**
-     * Author: J�rg B�uerle<br/>
-     * @param Object
-     * @return
-     */
-    // ino.end
-    // ino.method.equals.26534.definition 
-    public boolean equals(Object obj)
-    // ino.end
-    // ino.method.equals.26534.body 
-    {
-        if(obj instanceof LongType){
-            return super.equals(obj);
-        }
-        else{
-            return false;
-        }
-    }
-    // ino.end
-
-    // ino.method.clone.26537.defdescription type=javadoc
-    /**
-     * <br>Author: J�rg B�uerle
-     * @return
-     */
-    // ino.end
-    // ino.method.clone.26537.definition 
-    public LongType clone()
-    // ino.end
-    // ino.method.clone.26537.body 
-    {
-        return new LongType(this.getParent());
-    }
-    // ino.end
-
-	@Override
-public JavaCodeResult printJavaCode(ResultSet resultSet) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-}
-// ino.end
diff --git a/src/de/dhbwstuttgart/syntaxtree/type/ReturnType.java b/src/de/dhbwstuttgart/syntaxtree/type/ReturnType.java
deleted file mode 100755
index 379b8999e..000000000
--- a/src/de/dhbwstuttgart/syntaxtree/type/ReturnType.java
+++ /dev/null
@@ -1,64 +0,0 @@
-// ino.module.ReturnType.8676.package 
-package de.dhbwstuttgart.syntaxtree.type;
-
-import de.dhbwstuttgart.typeinference.JavaCodeResult;
-import de.dhbwstuttgart.typeinference.ResultSet;
-
-// ino.end
-// ino.class.ReturnType.26703.declaration 
-public class ReturnType extends Type
-// ino.end
-// ino.class.ReturnType.26703.body
-{
-    // ino.method.ReturnType.26707.definition 
-    public ReturnType(int offset)
-    // ino.end
-    // ino.method.ReturnType.26707.body 
-    {
-        super(null,offset);
-    }
-    // ino.end
-
-    // ino.method.equals.26710.defdescription type=javadoc
-    /**
-     * Author: J�rg B�uerle<br/>
-     * @param Object
-     * @return
-     */
-    // ino.end
-    // ino.method.equals.26710.definition 
-    public boolean equals(Object obj)
-    // ino.end
-    // ino.method.equals.26710.body 
-    {
-        if(obj instanceof ReturnType){
-            return super.equals(obj);
-        }
-        else{
-            return false;
-        }
-    }
-    // ino.end
-
-    // ino.method.clone.26713.defdescription type=javadoc
-    /**
-     * <br>Author: J�rg B�uerle
-     * @return
-     */
-    // ino.end
-    // ino.method.clone.26713.definition 
-    public ReturnType clone()
-    // ino.end
-    // ino.method.clone.26713.body 
-    {
-        return new ReturnType(getOffset());
-    }
-    // ino.end
-
-	@Override
-public JavaCodeResult printJavaCode(ResultSet resultSet) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-}
-// ino.end