From 81416b8bf447b9a7ef22667a71208f2d11165057 Mon Sep 17 00:00:00 2001
From: JanUlrich <andi@michlaustderaffe.de>
Date: Tue, 7 Oct 2014 15:36:18 +0200
Subject: [PATCH] Richtiger Import von Generischen Typen aus der JRE

---
 src/de/dhbwstuttgart/syntaxtree/Class.java    | 21 ++++++++++
 .../dhbwstuttgart/syntaxtree/SourceFile.java  | 39 ++++++++++++-------
 .../syntaxtree/statement/Binary.java          |  1 -
 .../syntaxtree/statement/Block.java           |  2 +-
 .../syntaxtree/statement/DoubleLiteral.java   |  2 -
 .../syntaxtree/statement/EmptyStmt.java       |  4 +-
 .../syntaxtree/statement/Expr.java            |  2 +-
 .../syntaxtree/statement/ForStmt.java         |  3 +-
 .../syntaxtree/statement/IfStmt.java          |  2 +-
 .../syntaxtree/statement/IntLiteral.java      |  1 -
 .../syntaxtree/statement/LocalOrFieldVar.java |  1 -
 .../syntaxtree/statement/LongLiteral.java     |  2 -
 .../syntaxtree/statement/Return.java          |  1 -
 .../syntaxtree/statement/Statement.java       |  1 -
 .../syntaxtree/statement/WhileStmt.java       |  2 +-
 .../exceptions/NotImplementedException.java   |  5 +++
 16 files changed, 58 insertions(+), 31 deletions(-)
 create mode 100644 src/de/dhbwstuttgart/typeinference/exceptions/NotImplementedException.java

diff --git a/src/de/dhbwstuttgart/syntaxtree/Class.java b/src/de/dhbwstuttgart/syntaxtree/Class.java
index 6bc3878f5..c2a9dc2f1 100755
--- a/src/de/dhbwstuttgart/syntaxtree/Class.java
+++ b/src/de/dhbwstuttgart/syntaxtree/Class.java
@@ -162,6 +162,26 @@ public class Class extends SyntaxTreeNode implements AClassOrInterface, IItemWit
     }
     // ino.end
     
+    /**
+     * Erstellt eine Klasse, welche nur für die Assumptions verwendet wird.
+     * Sie enthält keine unnötigen Informationen, wie Offset oder ClassBody.
+     * @param name
+     * @param superClass
+     * @param modifiers
+     * @param supertypeGenPara - Eine Liste von Namen, welche die Generischen Parameter der Klasse darstellen.
+     */
+    public Class(String name, RefType superClass, Modifiers modifiers,
+    		Vector<String> supertypeGenPara) {
+		this(name,superClass,modifiers,0);
+		if(supertypeGenPara == null)return;
+		Vector<GenericTypeVar> gtvs = new Vector<>();
+		for(String gname : supertypeGenPara){
+			GenericTypeVar newGTV=new GenericTypeVar(gname,this,0);
+			gtvs.add(newGTV);
+		}
+		this.genericClassParameters = new GenericDeclarationList(gtvs,0);
+	}
+    
     public Class(String name, RefType superClass, Modifiers mod, int offset){
     	this(name,mod,offset);
     	this.superClass = superClass;
@@ -244,6 +264,7 @@ public class Class extends SyntaxTreeNode implements AClassOrInterface, IItemWit
     }
 // ino.end
 	
+	
 	public Vector<Field> getFields()
     {
         return fielddecl;
diff --git a/src/de/dhbwstuttgart/syntaxtree/SourceFile.java b/src/de/dhbwstuttgart/syntaxtree/SourceFile.java
index 50f7bdc2e..623a4ca4e 100755
--- a/src/de/dhbwstuttgart/syntaxtree/SourceFile.java
+++ b/src/de/dhbwstuttgart/syntaxtree/SourceFile.java
@@ -1179,7 +1179,7 @@ public class SourceFile
                         GenericTypeVar newGTV=new GenericTypeVar(superclassTVS[tvi].getName(),parentClass,-1);
                         supertypeGenPara.addElement(newGTV);
                     }
-                                        
+                    
                     if(supertypeGenPara.size()==0){
                         supertypeGenPara=null;
                     }
@@ -1267,9 +1267,17 @@ public class SourceFile
     	if(s == null){
     		return new Class("java.lang.Object",new Modifiers(), 0);
     	}
+
+    	Vector<String> supertypeGenPara = new Vector<>();//Die Generischen Parameter für die Superklasse berechnen:
+    	java.lang.reflect.TypeVariable[] superclassTVS=s.getTypeParameters();
+    	for(int tvi=0;tvi<superclassTVS.length;tvi++){
+            supertypeGenPara.addElement(superclassTVS[tvi].getName());
+        }
+        
     	Class ss = this.getSuperClassOfJREClass(s, ass);
-    	ret = new Class(s.getName(),ss.getType(),new Modifiers(),0);
+    	ret = new Class(s.getName(),ss.getType(),new Modifiers(),supertypeGenPara);
     	
+        
     	ass.addClassAssumption(new ClassAssumption(ss)); //Die beiden SuperKlassen den Assumptions anfügen...
     	ass.addClassAssumption(new ClassAssumption(ret));
     	
@@ -1311,18 +1319,21 @@ public class SourceFile
             return(new GenericTypeVar(jreSpiderRegistry.get(tvi.getName()).getName().toString(),parentClass,-1));
         }else{
         */
-            //String jccNameForClass=baseTypeTranslationTable.get(cl.getSimpleName());
-            String jccNameForClass=baseTypeTranslationTable.get(cl.getName());          
-            if(cl.getSimpleName().equalsIgnoreCase("void")){
-                return(new Void(parentClass,-1));
-            }else if(jccNameForClass!=null){
-                RefType rt=new RefType(jccNameForClass,parentClass,-1);
-                rt.setPrimitiveFlag(true);
-                return(rt);
-            }else{              
-                //return(new RefType(cl.getSimpleName()));              
-                return(new RefType(cl.getName(),parentClass,-1));               
-            }
+    	GenericTypeVar gtv = jreSpiderRegistry.get(type.getTypeName());
+    	if(gtv != null)return gtv;
+    	//new GenericTypeVar(jreSpiderRegistry.get(type.getTypeName()).getName().toString(),parentClass,-1));
+        //String jccNameForClass=baseTypeTranslationTable.get(cl.getSimpleName());
+        String jccNameForClass=baseTypeTranslationTable.get(cl.getName());          
+        if(cl.getSimpleName().equalsIgnoreCase("void")){
+            return(new Void(parentClass,-1));
+        }else if(jccNameForClass!=null){
+            RefType rt=new RefType(jccNameForClass,parentClass,-1);
+            rt.setPrimitiveFlag(true);
+            return(rt);
+        }else{              
+            //return(new RefType(cl.getSimpleName()));              
+            return(new RefType(cl.getName(),parentClass,-1));               
+        }
         //}
     }
     // ino.end
diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/Binary.java b/src/de/dhbwstuttgart/syntaxtree/statement/Binary.java
index 3e4785efd..b062ff294 100755
--- a/src/de/dhbwstuttgart/syntaxtree/statement/Binary.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/Binary.java
@@ -37,7 +37,6 @@ import de.dhbwstuttgart.typeinference.SingleConstraint;
 import de.dhbwstuttgart.typeinference.UndConstraint;
 import de.dhbwstuttgart.typeinference.assumptions.TypeAssumptions;
 import de.dhbwstuttgart.typeinference.unify.CSubstitutionSet;
-import sun.reflect.generics.reflectiveObjects.NotImplementedException;
 
 
 
diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/Block.java b/src/de/dhbwstuttgart/syntaxtree/statement/Block.java
index 87a16aa66..c6780c41f 100755
--- a/src/de/dhbwstuttgart/syntaxtree/statement/Block.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/Block.java
@@ -27,9 +27,9 @@ 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.exceptions.NotImplementedException;
 import de.dhbwstuttgart.typeinference.exceptions.TypeinferenceException;
 import de.dhbwstuttgart.typeinference.unify.CSubstitutionSet;
-import sun.reflect.generics.reflectiveObjects.NotImplementedException;
 
 
 
diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/DoubleLiteral.java b/src/de/dhbwstuttgart/syntaxtree/statement/DoubleLiteral.java
index aedce5931..b8fec59f7 100755
--- a/src/de/dhbwstuttgart/syntaxtree/statement/DoubleLiteral.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/DoubleLiteral.java
@@ -26,8 +26,6 @@ import de.dhbwstuttgart.typeinference.JavaCodeResult;
 import de.dhbwstuttgart.typeinference.ResultSet;
 import de.dhbwstuttgart.typeinference.assumptions.TypeAssumptions;
 import de.dhbwstuttgart.typeinference.unify.CSubstitutionSet;
-import sun.reflect.generics.reflectiveObjects.NotImplementedException;
-// ino.end
 
 
 
diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/EmptyStmt.java b/src/de/dhbwstuttgart/syntaxtree/statement/EmptyStmt.java
index 68d04cd75..24fe0cb0e 100755
--- a/src/de/dhbwstuttgart/syntaxtree/statement/EmptyStmt.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/EmptyStmt.java
@@ -5,8 +5,8 @@ package de.dhbwstuttgart.syntaxtree.statement;
 import java.util.Hashtable;
 import java.util.Vector;
 
-
 import org.apache.log4j.Logger;
+
 import de.dhbwstuttgart.bytecode.ClassFile;
 import de.dhbwstuttgart.bytecode.CodeAttribute;
 import de.dhbwstuttgart.myexception.CTypeReconstructionException;
@@ -19,8 +19,8 @@ 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.exceptions.NotImplementedException;
 import de.dhbwstuttgart.typeinference.unify.CSubstitutionSet;
-import sun.reflect.generics.reflectiveObjects.NotImplementedException;
 
 
 
diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/Expr.java b/src/de/dhbwstuttgart/syntaxtree/statement/Expr.java
index ba3d9563a..4d35b695a 100755
--- a/src/de/dhbwstuttgart/syntaxtree/statement/Expr.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/Expr.java
@@ -14,7 +14,7 @@ import de.dhbwstuttgart.syntaxtree.type.Type;
 import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
 import de.dhbwstuttgart.typeinference.ConstraintsSet;
 import de.dhbwstuttgart.typeinference.assumptions.TypeAssumptions;
-import sun.reflect.generics.reflectiveObjects.NotImplementedException;
+import de.dhbwstuttgart.typeinference.exceptions.NotImplementedException;
 
 
 
diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/ForStmt.java b/src/de/dhbwstuttgart/syntaxtree/statement/ForStmt.java
index 3f02f4012..d103c6e86 100755
--- a/src/de/dhbwstuttgart/syntaxtree/statement/ForStmt.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/ForStmt.java
@@ -27,9 +27,8 @@ import de.dhbwstuttgart.typeinference.JavaCodeResult;
 import de.dhbwstuttgart.typeinference.Pair;
 import de.dhbwstuttgart.typeinference.ResultSet;
 import de.dhbwstuttgart.typeinference.assumptions.TypeAssumptions;
+import de.dhbwstuttgart.typeinference.exceptions.NotImplementedException;
 import de.dhbwstuttgart.typeinference.unify.Unify;
-import sun.reflect.generics.reflectiveObjects.NotImplementedException;
-
 
 
 
diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/IfStmt.java b/src/de/dhbwstuttgart/syntaxtree/statement/IfStmt.java
index e57cd48f5..59b315051 100755
--- a/src/de/dhbwstuttgart/syntaxtree/statement/IfStmt.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/IfStmt.java
@@ -33,9 +33,9 @@ import de.dhbwstuttgart.typeinference.Pair;
 import de.dhbwstuttgart.typeinference.ResultSet;
 import de.dhbwstuttgart.typeinference.SingleConstraint;
 import de.dhbwstuttgart.typeinference.assumptions.TypeAssumptions;
+import de.dhbwstuttgart.typeinference.exceptions.NotImplementedException;
 import de.dhbwstuttgart.typeinference.unify.MUB;
 import de.dhbwstuttgart.typeinference.unify.Unify;
-import sun.reflect.generics.reflectiveObjects.NotImplementedException;
 
 
 
diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/IntLiteral.java b/src/de/dhbwstuttgart/syntaxtree/statement/IntLiteral.java
index 212cc0eb7..7d9f5c85f 100755
--- a/src/de/dhbwstuttgart/syntaxtree/statement/IntLiteral.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/IntLiteral.java
@@ -22,7 +22,6 @@ import de.dhbwstuttgart.typeinference.JavaCodeResult;
 import de.dhbwstuttgart.typeinference.ResultSet;
 import de.dhbwstuttgart.typeinference.assumptions.TypeAssumptions;
 import de.dhbwstuttgart.typeinference.unify.CSubstitutionSet;
-import sun.reflect.generics.reflectiveObjects.NotImplementedException;
 
 
 
diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/LocalOrFieldVar.java b/src/de/dhbwstuttgart/syntaxtree/statement/LocalOrFieldVar.java
index 1fb623b3c..729071495 100755
--- a/src/de/dhbwstuttgart/syntaxtree/statement/LocalOrFieldVar.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/LocalOrFieldVar.java
@@ -28,7 +28,6 @@ import de.dhbwstuttgart.typeinference.SingleConstraint;
 import de.dhbwstuttgart.typeinference.assumptions.TypeAssumptions;
 import de.dhbwstuttgart.typeinference.exceptions.TypeinferenceException;
 import de.dhbwstuttgart.typeinference.unify.CSubstitutionSet;
-import sun.reflect.generics.reflectiveObjects.NotImplementedException;
 
 
 
diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/LongLiteral.java b/src/de/dhbwstuttgart/syntaxtree/statement/LongLiteral.java
index b4e0da4ec..7317255ff 100755
--- a/src/de/dhbwstuttgart/syntaxtree/statement/LongLiteral.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/LongLiteral.java
@@ -25,8 +25,6 @@ import de.dhbwstuttgart.typeinference.JavaCodeResult;
 import de.dhbwstuttgart.typeinference.ResultSet;
 import de.dhbwstuttgart.typeinference.assumptions.TypeAssumptions;
 import de.dhbwstuttgart.typeinference.unify.CSubstitutionSet;
-import sun.reflect.generics.reflectiveObjects.NotImplementedException;
-// ino.end
 
 
 
diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/Return.java b/src/de/dhbwstuttgart/syntaxtree/statement/Return.java
index 407133fd8..865bf1da9 100755
--- a/src/de/dhbwstuttgart/syntaxtree/statement/Return.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/Return.java
@@ -24,7 +24,6 @@ import de.dhbwstuttgart.typeinference.ResultSet;
 import de.dhbwstuttgart.typeinference.SingleConstraint;
 import de.dhbwstuttgart.typeinference.assumptions.TypeAssumptions;
 import de.dhbwstuttgart.typeinference.unify.CSubstitutionSet;
-import sun.reflect.generics.reflectiveObjects.NotImplementedException;
 
 
 
diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/Statement.java b/src/de/dhbwstuttgart/syntaxtree/statement/Statement.java
index b4b9b8ae0..120a015c6 100755
--- a/src/de/dhbwstuttgart/syntaxtree/statement/Statement.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/Statement.java
@@ -23,7 +23,6 @@ import de.dhbwstuttgart.typeinference.Pair;
 import de.dhbwstuttgart.typeinference.ResultSet;
 import de.dhbwstuttgart.typeinference.Typeable;
 import de.dhbwstuttgart.typeinference.assumptions.TypeAssumptions;
-import sun.reflect.generics.reflectiveObjects.NotImplementedException;
 
 
 
diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/WhileStmt.java b/src/de/dhbwstuttgart/syntaxtree/statement/WhileStmt.java
index 9cef41940..7649743cc 100755
--- a/src/de/dhbwstuttgart/syntaxtree/statement/WhileStmt.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/WhileStmt.java
@@ -31,9 +31,9 @@ import de.dhbwstuttgart.typeinference.Pair;
 import de.dhbwstuttgart.typeinference.ResultSet;
 import de.dhbwstuttgart.typeinference.SingleConstraint;
 import de.dhbwstuttgart.typeinference.assumptions.TypeAssumptions;
+import de.dhbwstuttgart.typeinference.exceptions.NotImplementedException;
 import de.dhbwstuttgart.typeinference.unify.CSubstitutionSet;
 import de.dhbwstuttgart.typeinference.unify.Unify;
-import sun.reflect.generics.reflectiveObjects.NotImplementedException;
 
 
 
diff --git a/src/de/dhbwstuttgart/typeinference/exceptions/NotImplementedException.java b/src/de/dhbwstuttgart/typeinference/exceptions/NotImplementedException.java
new file mode 100644
index 000000000..5daaef67c
--- /dev/null
+++ b/src/de/dhbwstuttgart/typeinference/exceptions/NotImplementedException.java
@@ -0,0 +1,5 @@
+package de.dhbwstuttgart.typeinference.exceptions;
+
+public class NotImplementedException extends RuntimeException {
+
+}