pom.xml

@@ -69,7 +69,6 @@ http://maven.apache.org/maven-v4_0_0.xsd">
 					<trimStackTrace>true</trimStackTrace>
 					<excludes>
 						<exclude>**/JavaTXCompilerTest.java</exclude>
-						<exclude>**/AllgemeinTest.java</exclude>
 						<exclude>**/syntaxtreegenerator/*.java</exclude>
 					</excludes>
 				</configuration>

resources/bytecode/javFiles/AA.jav

@@ -2,7 +2,7 @@ import java.lang.Integer;
 import java.lang.String;
 
 public class AA {
-	public m(Integer i) { return "AA"; }
+	m(Integer i) { return "AA"; }
 	
-	public m2(AA x) { return "AA"; }
+	m2(AA x) { return "AA"; }
 }

resources/bytecode/javFiles/BB.jav

@@ -1,4 +1,3 @@
 import java.lang.Integer;
-import AA;
 
 public class BB extends AA { }

resources/bytecode/javFiles/BinaryInMeth.jav

@@ -3,15 +3,15 @@ import java.lang.Double;
 
 public class BinaryInMeth {
 	
-	public m(a){
+	m(a){
 		return ++a;
 	}
 	
-	public m2(a,b){
+	m2(a,b){
 		return m(a+b);
 	}
 	
-	public m3(a) {
+	m3(a) {
 		return m(++a);
 	}
 }

resources/bytecode/javFiles/Bug112.jav

@@ -1,5 +1,5 @@
 public class Bug112 {
-    public m(x) {
+    m(x) {
         var y;
         x = y;
         return y;

resources/bytecode/javFiles/Bug122.jav

@@ -1,8 +1,8 @@
 import java.lang.Integer;
 import java.lang.Boolean;
 
-public class Bug122 {
+class Bug122 {
-    public void main() {
+    void main() {
         if (true) {
             for (Integer i = 0; i < 10; i++) {
 

resources/bytecode/javFiles/Bug123.jav

@@ -1,12 +1,12 @@
 import java.lang.Boolean;
 import java.lang.Integer;
 
-public class Bug123 {
+class Bug123 {
-    public Boolean works(){
+    Boolean works(){
         if(true) return true;
         else return false;
     }
-    public void fails(){
+    void fails(){
         Boolean a = true;
         if(true) a = false;
     }

resources/bytecode/javFiles/Bug125.jav

@@ -5,11 +5,11 @@ import java.util.List;
 import java.util.LinkedList;
 import java.util.ArrayList;
 
-public class Bug125 {
+class Bug125 {
     static ArrayList<String> works = new ArrayList<>();
     static List<String> fails = new ArrayList<>();
 
-    public void main() {
+    void main() {
         works.toString();
         fails.toString();
     }

resources/bytecode/javFiles/Bug285.jav

@@ -1,14 +1,14 @@
 import java.util.Optional;
 import java.lang.Integer;
 
-public class StaticClass {
+class StaticClass {
-    public static StaticClass barbar() {
+    static StaticClass barbar() {
         return new StaticClass();
     }
 }
 
 public class Bug285 {
-    public void foo() {
+    void foo() {
         Optional<Integer> opt = Optional.empty();
         StaticClass b = StaticClass.barbar();
     }

resources/bytecode/javFiles/Bug290A.jav

@@ -1,7 +0,0 @@
-import Bug290B;
-
-public class Bug290A {
-    public void m() {
-        new Bug290B();
-    }
-}

resources/bytecode/javFiles/Bug290B.jav

@@ -1,11 +0,0 @@
-import java.lang.String;
-import java.lang.Integer;
-
-public class Bug290B {
-    String name;
-
-    public Bug290B() {
-        Integer i = 0;
-        name = i.toString() + "$$";
-    }
-}

resources/bytecode/javFiles/Bug98.jav

@@ -4,7 +4,7 @@ import java.lang.String;
 
 public class Bug98 {
 
-	public m(x, y ,z) {
+	m(x, y ,z) {
 		x = new Vector<Integer>();
 		y = new Vector<String>();
 		x.add(1);

resources/bytecode/javFiles/CC.jav

@@ -1,11 +1,11 @@
 import java.lang.Integer;
 import java.lang.String;
-import BB;
+
 
 public class CC extends BB {
-	public m(Integer i) {
+	m(Integer i) { 
 	   return "CC"; 
 	}
 	
-	public m2(CC x) { return "CC"; }
+	m2(CC x) { return "CC"; }
 }	

resources/bytecode/javFiles/Chain.jav

@@ -7,7 +7,7 @@ public class Chain {
         return this;
     }
 
-    public m() {
+    m() {
         return this.chain().chain().chain().x;
     }
 }

resources/bytecode/javFiles/Cycle.jav

@@ -1,5 +1,5 @@
-public class Cycle {
+class Cycle {
-    public m(x, y) {
+    m(x, y) {
         y = x;
         x = y;
     }

resources/bytecode/javFiles/DD.jav

@@ -1,5 +1,4 @@
 import java.lang.Integer;
-import CC;
 
 public class DD extends CC { }
 

resources/bytecode/javFiles/Exceptions.jav

@@ -2,7 +2,7 @@ import java.lang.String;
 import java.lang.RuntimeException;
 
 public class Exceptions {
-    public m() {
+    m() {
         throw new RuntimeException("Some Exception");
     }
 }

resources/bytecode/javFiles/FieldTph2.jav

@@ -1,14 +1,14 @@
 import java.lang.String;
 
 public class FieldTph2 {
-	public a;
+	a;
 	
-	public m(b){
+	m(b){
 		b = a;
 		return b;
 	}
 	
-	public m2(c){
+	m2(c){
 		a = c;
 	}
 }

resources/bytecode/javFiles/FieldTphConsMeth.jav

@@ -1,20 +1,20 @@
 public class FieldTphConsMeth {
 	
-	public a;
+	a;
 	public FieldTphConsMeth(c) {
 		a = id(c);
 	}
 	
-	public id(b) {
+	id(b) {
 		return b;
 	}
 
-	public setA(x) {
+	setA(x) {
 	    a = x;
 	    return a;
 	}
 
-	public m(x,y) {
+	m(x,y) {
 	    x = id(y);
 	}
 

resources/bytecode/javFiles/FieldTphMMeth.jav

@@ -1,13 +1,13 @@
 import java.lang.Boolean;
 
 public class FieldTphMMeth {
-	public a;
+	a;
 	
 	public FieldTphMMeth(c,d,e) {
 		a = m(c,d,e);
 	}
 	
-	public m(b,d,e) {
+	m(b,d,e) {
 		if(e) {
 			return m3(b);
 		} else{
@@ -16,11 +16,11 @@ public class FieldTphMMeth {
 		
 	}
 	
-	public m2(b) {
+	m2(b) {
 		a = m3(b);
 	}
 	
-	public m3(b){
+	m3(b){
 		return b;
 	}
 	

resources/bytecode/javFiles/For.jav

@@ -1,8 +1,8 @@
 import java.lang.Integer;
 import java.lang.Boolean;
 
-public class For{
+class For{
-	public Integer m(Integer x){
+	Integer m(Integer x){
 		var c = x + 2;
 		Boolean b = true;
 		c = 5;

resources/bytecode/javFiles/FunctionalInterface.jav

@@ -6,7 +6,7 @@ public class FunctionalInterface {
         return f.apply(20);
     }
 
-    public Integer m() {
+    Integer m() {
         var v = accept(i -> {
             return i * 10;
         });

resources/bytecode/javFiles/Generics2.jav

@@ -1,8 +1,8 @@
 import java.lang.String;
 import java.lang.Integer;
 
-public class Generics2<B extends String>{
+class Generics2<B extends String>{
-	public <X extends Integer> X m1(X b){
+	<B extends Integer> B m1(B b){
 		return b;
 	}
 

resources/bytecode/javFiles/HelloWorld.jav

@@ -3,7 +3,7 @@ import java.lang.String;
 import java.io.PrintStream;
 
 public class HelloWorld {
-    public static hello() {
+    static hello() {
         System.out.println("Hello World!");
     }
 }

resources/bytecode/javFiles/Inherit.jav

@@ -2,18 +2,15 @@ import java.util.Vector;
 
 import java.lang.Integer;
 import java.lang.String;
-import AA;
+
-import BB;
-import CC;
-import DD;
 
 public class Inherit {
 	
-	public main(d, i) {
+	main(d, i) {
 	  return d.m(i);
 	}
 
-	public main(v, i) {
+	main(v, i) {
 		var aa = v.elementAt(0);
 		return aa.m(i);
 	}

resources/bytecode/javFiles/Inherit2.jav

@@ -2,18 +2,15 @@ import java.util.Vector;
 
 import java.lang.Integer;
 import java.lang.String;
-import AA;
+
-import BB;
-import CC;
-import DD;
 
 public class Inherit2 {
 	
-	public main(d) {
+	main(d) {
 	  return d.m2(d);
 	}
 	
-	public main(v) {
+	main(v) {
 		var aa = v.elementAt(0);
 		return aa.m2(aa);
 	}

resources/bytecode/javFiles/InstanceOf.jav

@@ -12,7 +12,7 @@ class Test2 {
 public class InstanceOf {
     a = new Test();
 
-    public test1() { return this.a instanceof Test; }
+    test1() { return this.a instanceof Test; }
-    public test2() { return this.a instanceof Interface; }
+    test2() { return this.a instanceof Interface; }
-    public test3() { return this.a instanceof Integer; }
+    test3() { return this.a instanceof Integer; }
 }

resources/bytecode/javFiles/Lambda.jav

@@ -2,7 +2,7 @@ import java.lang.Integer;
 
 public class Lambda {
 
-  public m() {
+  m () {
    var lam1 = (x) -> {
         return x;
    };

resources/bytecode/javFiles/LessEqual.jav

@@ -4,52 +4,52 @@ import java.lang.Float;
 import java.lang.Double;
 
 public class LessEqual {
-	public lessEqual(Integer a, Integer b){
+	lessEqual(Integer a, Integer b){
 		var c = a<=b;
 		return c;
 	}
 	
-	public lessEqual(Long a, Long b){
+	lessEqual(Long a, Long b){
 		var c = a<=b;
 		return c;
 	}
 	
-	public lessEqual(Float a, Float b){
+	lessEqual(Float a, Float b){
 		var c = a<=b;
 		return c;
 	}
 	
-	public lessEqual(Double a, Double b){
+	lessEqual(Double a, Double b){
 		var c = a<=b;
 		return c;
 	}
 	
-	public lessEqual(Long a, Integer b){
+	lessEqual(Long a, Integer b){
 		var c = a<=b;
 		return c;
 	}
 	
-	public lessEqual(Float a, Integer b){
+	lessEqual(Float a, Integer b){
 		var c = a<=b;
 		return c;
 	}
 	
-	public lessEqual(Double a, Integer b){
+	lessEqual(Double a, Integer b){
 		var c = a<=b;
 		return c;
 	}
 	
-	public lessEqual(Float a, Long b){
+	lessEqual(Float a, Long b){
 		var c = a<=b;
 		return c;
 	}
 	
-	public lessEqual(Double a, Long b){
+	lessEqual(Double a, Long b){
 		var c = a<=b;
 		return c;
 	}
 	
-	public lessEqual(Double a, Float b){
+	lessEqual(Double a, Float b){
 		var c = a<=b;
 		return c;
 	}

resources/bytecode/javFiles/LessThan.jav

@@ -5,52 +5,52 @@ import java.lang.Double;
 
 public class LessThan {
 	
-	public lessThan(Integer a, Integer b){
+	lessThan(Integer a, Integer b){
 		var c = a<b;
 		return c;
 	}
 	
-	public lessThan(Long a, Long b){
+	lessThan(Long a, Long b){
 		var c = a<b;
 		return c;
 	}
 	
-	public lessThan(Float a, Float b){
+	lessThan(Float a, Float b){
 		var c = a<b;
 		return c;
 	}
 	
-	public lessThan(Double a, Double b){
+	lessThan(Double a, Double b){
 		var c = a<b;
 		return c;
 	}
 	
-	public lessThan(Long a, Integer b){
+	lessThan(Long a, Integer b){
 		var c = a<b;
 		return c;
 	}
 	
-	public lessThan(Float a, Integer b){
+	lessThan(Float a, Integer b){
 		var c = a<b;
 		return c;
 	}
 	
-	public lessThan(Double a, Integer b){
+	lessThan(Double a, Integer b){
 		var c = a<b;
 		return c;
 	}
 	
-	public lessThan(Float a, Long b){
+	lessThan(Float a, Long b){
 		var c = a<b;
 		return c;
 	}
 	
-	public lessThan(Double a, Long b){
+	lessThan(Double a, Long b){
 		var c = a<b;
 		return c;
 	}
 	
-	public lessThan(Double a, Float b){
+	lessThan(Double a, Float b){
 		var c = a<b;
 		return c;
 	}

resources/bytecode/javFiles/Literal.jav

@@ -1,6 +1,6 @@
 import java.lang.Character;
 
 public class Literal {
-    public m() { return null; }
+    m() { return null; }
-    public m2() { return 'C'; }
+    m2() { return 'C'; }
 }

resources/bytecode/javFiles/Matrix.jav

@@ -9,7 +9,7 @@ public class Matrix    extends Vector<Vector<Integer>> {
 	Matrix () {
     }
 
-	public Matrix(vv) {
+	Matrix(vv) {
     	Integer i;
     	i = 0;
 	  while(i < vv.size()) {
@@ -19,7 +19,7 @@ public class Matrix    extends Vector<Vector<Integer>> {
 	  } 
     }
 
-    public mul(m) {
+    mul(m) {
         var ret = new Matrix();
         var i = 0;
         while(i < size()) {

resources/bytecode/javFiles/MatrixOP.jav

@@ -8,7 +8,7 @@ public class MatrixOP    extends Vector<Vector<Integer>> {
 	MatrixOP () {
     }
 
-    public MatrixOP(vv) {
+	MatrixOP(vv) {
     	Integer i;
     	i = 0;
 	  while(i < vv.size()) {

resources/bytecode/javFiles/Merge.jav

@@ -2,16 +2,16 @@ import java.util.List;
 import java.lang.Integer;
 //import java.util.Collection;
 
-public class Merge  {
+class Merge  {
 
-	public merge(a, b) {
+	merge(a, b) {
      	a.addAll(b);
 		return a;
 	}
 
 
 
-  	public sort(in){
+  	sort(in){
 		var firstHalf = in.subList(1,2);
     	var secondHalf = in.subList(1,2);
     	return merge(sort(firstHalf), sort(secondHalf));

resources/bytecode/javFiles/OL.jav

@@ -1,14 +1,13 @@
 import java.lang.Double;
 import java.lang.String;
 import java.lang.Long;
-import java.lang.Integer;
 
-public class OL {
+class OL {
-    public m (x) { return x + x; }
+    m (x) { return x + x; }
 }
 
-public class OLMain {
+class OLMain {
-	public main(x) {
+	main(x) {
 		var ol;
 		ol = new OL();
 		return ol.m(x);

resources/bytecode/javFiles/OLConstructor.jav

@@ -10,8 +10,8 @@ public class Parent {
     public Parent() {}
 }
 
-public class Child extends Parent {
+class Child extends Parent {
-    public Child() {
+    Child() {
         super(3);
     }
 }

resources/bytecode/javFiles/Op2.jav

@@ -3,9 +3,9 @@ import java.lang.Double;
 import java.lang.String;
 
 public class Op2 {
-	public m(){
+	m(){
-		var x = "";
+		//var x = "";
-		var a = 5+x;
+		//var a = 5+x;
 
 		Integer x = 10;
 		Double y = 10.5;

resources/bytecode/javFiles/OverloadPattern.jav

@@ -5,15 +5,15 @@ import java.lang.Float;
 record Point(Number x, Number y) {}
 
 public class OverloadPattern {
-    public m(Point(Integer x, Integer y)) {
+    m(Point(Integer x, Integer y)) {
         return x + y;
     }
 
-    public m(Point(Float x, Float y)) {
+    m(Point(Float x, Float y)) {
         return x * y;
     }
 
-    public m(Integer x) {
+    m(Integer x) {
         return x;
     }
 }

resources/bytecode/javFiles/Overloading.jav

@@ -2,17 +2,17 @@ import java.lang.String;
 
 public class Overloading{
 
-	public test(x){
+	test(x){
 		return x.methode();
 	}
 
-	public methode(){
+	methode(){
 		return "Overloading";
 	}
 }
 
 public class Overloading2{
-	public methode(){
+	methode(){
 		return "Overloading2";
 	}
 }

resources/bytecode/javFiles/Pair.jav

@@ -3,15 +3,15 @@ import java.lang.Boolean;
 import java.lang.Object;
 
 
-public class Pair<T, U> {
+class Pair<T, U> {
 	T x;
 	U y;
 
-	public fst() {
+	fst () {
 		return x;
 	}
 
-	public snd() {
+	snd () {
 		return y;
     }
 }

resources/bytecode/javFiles/Plus.jav

@@ -3,7 +3,7 @@ import java.lang.String;
 
 public class Plus {
 	
-	public m(a,b) {
+	m(a,b) {
 		return a+b;
 	}
 }

resources/bytecode/javFiles/PostIncDec.jav

@@ -1,25 +1,25 @@
 import java.lang.Integer;
 
 public class PostIncDec {
-	public m() {
+	m() {
 		var i = 0;
 		i++;
 		return i;
 	}
 	
-	public m2() {
+	m2() { 
 		var i = 0;
 		var j = i++;
 		return j;
 	}
 	
-	public d() {
+	d() {
 		var i = 0;
 		i--;
 		return i;
 	}
 	
-	public d2() {
+	d2() { 
 		var i = 0;
 		var j = i--;
 		return j;

resources/bytecode/javFiles/PreInc.jav

@@ -1,25 +1,25 @@
 import java.lang.Integer;
 
 public class PreInc {
-	public m() {
+	m() {
 		var i = 0;
 		++i;
 		return i;
 	}
 	
-	public m2() {
+	m2() { 
 		var i = 0;
 		var j = ++i;
 		return j;
 	}
 	
-	public d() {
+	d() {
 		var i = 0;
 		--i;
 		return i;
 	}
 	
-	public d2() {
+	d2() { 
 		var i = 0;
 		var j = --i;
 		return j;

resources/bytecode/javFiles/Put.jav

@@ -3,16 +3,16 @@ import java.util.Stack;
 
 public class Put {
 
-    public putElement(ele, v) {
+    putElement(ele, v) {
 	    v.addElement(ele);
     }
 
-    public putElement(ele, s) {
+    putElement(ele, s) {
 	    s.push(ele);
     }
 
 
-    public main(ele, x) {
+    main(ele, x) { 
         putElement(ele, x);
     }
 

resources/bytecode/javFiles/RecordTest.jav

@@ -15,8 +15,8 @@ public class RecordTest {
     b = new Rec(10, 20);
     c = new Rec(20, 40);
 
-    public doesEqual() { return a.equals(b); }
+    doesEqual() { return a.equals(b); }
-    public doesNotEqual() { return b.equals(c); }
+    doesNotEqual() { return b.equals(c); }
-    public hashCode() { return a.hashCode(); }
+    hashCode() { return a.hashCode(); }
-    public toString() { return a.toString(); }
+    toString() { return a.toString(); }
 }

resources/bytecode/javFiles/RelOps.jav

@@ -2,7 +2,7 @@ import java.lang.Integer;
 import java.lang.Boolean;
 
 public class RelOps {
-	public m(a,b){
+	m(a,b){
 		return a<b;
 	}
 }

resources/bytecode/javFiles/Scalar.jav

@@ -6,7 +6,7 @@ import java.lang.Float;
 
 public class Scalar extends Vector<Integer> {
 
-    public Scalar(v) {
+    Scalar(v) {
     	Integer i;
     	i = 0;
 	while(i < v.size()) {
@@ -15,7 +15,7 @@ public class Scalar extends Vector<Integer> {
 	} 
     }
    
-    public mul(v) {
+    mul(v) {
         var ret = 0;
         var i = 0;
         while(i < size()) {

resources/bytecode/javFiles/Static.jav

@@ -12,7 +12,7 @@ public class Static {
         i = x;
     }
 
-    public static m() {
+    static m() {
         return i + Other.field;
     }
 }

resources/bytecode/javFiles/Switch.jav

@@ -2,10 +2,10 @@ import java.lang.Integer;
 import java.lang.Object;
 import java.lang.Float;
 
-public record Rec(Integer a, Object b) {}
+record Rec(Integer a, Object b) {}
 
 public class Switch {
-    public main(o) {
+    main(o) {
         return switch (o) {
         case Rec(Integer a, Integer b) -> a + b;
         case Rec(Integer a, Float b) -> a + 10;

resources/bytecode/javFiles/SwitchString.jav

@@ -3,7 +3,7 @@ import java.lang.String;
 import java.lang.Object;
 
 public class SwitchString {
-    public main(o) {
+    main(o) {
         return switch (o) {
         case "AaAaAa" -> 1; // These two have the same hash code!
         case "AaAaBB" -> 2;

resources/bytecode/javFiles/TXGenerics.jav

@@ -1,10 +1,10 @@
 import java.lang.String;
 
-public class TXGenerics {
+class TXGenerics {
     a;
     b;
 
-    public test() {
+    test() {
         var c = new Cycle();
         c.m(a, b);
     }

resources/bytecode/javFiles/Tph.jav

@@ -1,11 +1,11 @@
 public class Tph {
 	
-	public m(a,b){
+	m(a,b){
 		var c = m2(b);
 		return a;
 	}
 	
-	public m2(b){
+	m2(b){
 		return b;
 	}
 }

resources/bytecode/javFiles/While.jav

@@ -3,7 +3,7 @@ import java.lang.Long;
 import java.lang.Double;
 
 public class While {
-	 public m(x) {
+	 m(x) {
 		while(x < 2) {
 			x = x+1;
 		}

resources/bytecode/javFiles/Y.jav

@@ -1,10 +1,10 @@
 import java.lang.Integer;
 
-public class Y {
+class Y {
     y;
     //factorial;
 
-    public Y() {
+    Y() {
 		y =  f -> t -> f.apply(y.apply(f)).apply(t);
 		//factorial = y.apply(f -> n -> { if (n == 0) return 1; else return n * f.apply(n - 1); });
     }

resources/bytecode/javFiles/applyLambda.jav

@@ -3,7 +3,7 @@ class Apply { }
 
 public class applyLambda {
 
-  public m () {
+  m () {
    var lam1 = (x) -> {
         return x;
    };

src/main/java/de/dhbwstuttgart/bytecode/Codegen.java

@@ -1435,8 +1435,6 @@ public class Codegen {
         var access = method.access();
         if (method.block() == null)
             access |= ACC_ABSTRACT;
-        if (clazz instanceof TargetInterface)
-            access |= ACC_PUBLIC;
 
         // TODO The older codegen has set ACC_PUBLIC for all methods, good for testing but bad for everything else
         MethodVisitor mv = cw.visitMethod(access, method.name(), method.getDescriptor(), method.getSignature(), null);

src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.java

@@ -57,7 +57,6 @@ import java.io.FileWriter;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.Writer;
-import java.sql.Array;
 import java.util.*;
 import java.util.Map.Entry;
 import java.util.function.Function;
@@ -129,11 +128,11 @@ public class JavaTXCompiler {
 	}
 
 	public ConstraintSet<Pair> getConstraints() throws ClassNotFoundException, IOException {
-		Set<ClassOrInterface> allClasses = new HashSet<>();// environment.getAllAvailableClasses();
+		List<ClassOrInterface> allClasses = new ArrayList<>();// environment.getAllAvailableClasses();
+		List<ClassOrInterface> importedClasses = new ArrayList<>();
 		ClassOrInterface objectClass = ASTFactory.createClass(classLoader.loadClass(new JavaClassName("java.lang.Object").toString()));
 		// Alle Importierten Klassen in allen geparsten Sourcefiles kommen ins FC
 		for (Entry<File, SourceFile> source : sourceFiles.entrySet()) {
-			var importedClasses = new ArrayList<ClassOrInterface>();
 			for (JavaClassName name : source.getValue().getImports()) {
 				importedClasses.addAll(getAvailableClasses(name));
 			}
@@ -141,17 +140,18 @@ public class JavaTXCompiler {
 				ClassOrInterface importedClass = ASTFactory.createClass(c);
 				importedClasses.add(importedClass);
 			}
-			source.getValue().availableClasses.addAll(importedClasses);
 		}
 		for (File f : this.sourceFiles.keySet()) {
 			SourceFile sf = sourceFiles.get(f);
-			SourceFile sf_new = new SourceFile(sf.getPkgName(), sf.KlassenVektor.stream().map(cl -> new ClassOrInterface(cl)).collect(Collectors.toCollection(ArrayList::new)), sf.imports);
+			sf = new SourceFile(sf.getPkgName(), sf.KlassenVektor.stream().map(cl -> new ClassOrInterface(cl)).collect(Collectors.toCollection(ArrayList::new)), sf.imports);
 			// sf enthaelt neues Source-File, neue Klassen-Objekte und neue
 			// ArrayListen-Objekte fuer Fields, Construktoren und Methoden
 			// Alle anderen Objekte werden nur kopiert.
-			sf_new.KlassenVektor.forEach(cl -> addMethods(sf_new, cl, sf.availableClasses, objectClass));
+			SourceFile sf_new = sf;
-			allClasses.addAll(sf_new.getClasses());
+			sf.KlassenVektor.forEach(cl -> addMethods(sf_new, cl, importedClasses, objectClass));
+			allClasses.addAll(sf.getClasses());
 		}
+		allClasses.addAll(importedClasses);
 		TYPE ty = new TYPE(sourceFiles.values(), allClasses);
 		return ty.getConstraints();
 	}

src/main/java/de/dhbwstuttgart/parser/SyntaxTreeGenerator/SyntaxTreeGenerator.java

@@ -143,8 +143,7 @@ public class SyntaxTreeGenerator {
     if (srcfile.packageDeclaration() != null)
       this.pkgName = convert(srcfile.packageDeclaration());
     Map<String, Integer> imports = GatherNames.getImports(srcfile, packageCrawler, compiler);
-    this.imports.addAll(imports.keySet().stream().map(name -> reg.getName(name)).collect(Collectors.toSet()));
+    this.imports = imports.keySet().stream().map(name -> reg.getName(name)).collect(Collectors.toSet());
-
     for (Java17Parser.ClassOrInterfaceContext type : srcfile.classOrInterface()) {
       ClassorinterfacedeclContext clsoif;
       if (type instanceof NoclassorinterfaceContext) {

src/main/java/de/dhbwstuttgart/syntaxtree/SourceFile.java

@@ -15,8 +15,6 @@ public class SourceFile extends SyntaxTreeNode {
   public final List<ClassOrInterface> KlassenVektor;
   public final Set<JavaClassName> imports;
 
-  public List<ClassOrInterface> availableClasses = new ArrayList<>();
-
   /**
    * Die SourceFile repräsntiert eine zu einem Syntaxbaum eingelesene Java-Datei.
    * SourceFile stellt dabei den Wurzelknoten des Syntaxbaumes dar.

src/main/java/de/dhbwstuttgart/target/generate/ASTToTargetAST.java

@@ -293,8 +293,7 @@ public class ASTToTargetAST {
         for (var method : overloadedMethods) {
             var newMethod = new Method(
                     method.modifier,
-                    method.name,
+                    encodeName(method.name, method.getParameterList()),
-                    //encodeName(method.name, method.getParameterList()),
                     method.getReturnType(),
                     method.getParameterList(),
                     method.block,
@@ -304,8 +303,7 @@ public class ASTToTargetAST {
             res.add(newMethod);
         }
 
-        // TODO Record overloading
+        var template = overloadedMethods.get(0);
-        /*var template = overloadedMethods.get(0);
 
         var pParams = new ArrayList<Pattern>();
         var i = 0;
@@ -323,7 +321,7 @@ public class ASTToTargetAST {
         var block = new Block(statements, new NullToken());
         var entryPoint = new Method(template.modifier, template.name, template.getReturnType(), params, block, template.getGenerics(), new NullToken());
 
-        res.add(entryPoint); // TODO*/
+        res.add(entryPoint); // TODO
         return res.stream().map(this::convert).flatMap(List::stream).toList();
     }
 

src/main/java/de/dhbwstuttgart/typeinference/typeAlgo/TYPE.java

@@ -16,23 +16,19 @@ import java.util.*;
 public class TYPE {
 
     private final Collection<SourceFile> sfs;
-    private final Set<ClassOrInterface> allAvailableClasses;
+    private final TypeInferenceInformation typeInferenceInformation;
     
-    public TYPE(Collection<SourceFile> sourceFiles, Set<ClassOrInterface> allAvailableClasses){
+    public TYPE(Collection<SourceFile> sourceFiles, Collection<ClassOrInterface> allAvailableClasses){
         sfs = sourceFiles;
-        this.allAvailableClasses = allAvailableClasses;
+        this.typeInferenceInformation = new TypeInferenceInformation(allAvailableClasses);
     }
 
     public ConstraintSet getConstraints() {
         ConstraintSet ret = new ConstraintSet();
         for(SourceFile sf : sfs)
-            for (ClassOrInterface cl : sf.KlassenVektor) {
+        for (ClassOrInterface cl : sf.KlassenVektor) {
-                System.out.println(sf.availableClasses);
+            ret.addAll(getConstraintsClass(cl ,typeInferenceInformation));
-                var allClasses = new HashSet<ClassOrInterface>();
+        }
-                allClasses.addAll(allAvailableClasses);
-                allClasses.addAll(sf.availableClasses);
-                ret.addAll(getConstraintsClass(cl, new TypeInferenceInformation(allClasses)));
-            }
         return ret;
     }
 

src/test/java/TestComplete.java

@@ -670,7 +670,6 @@ public class TestComplete {
         assertEquals(swtch.invoke(instance, "Some string"), 0);
     }
 
-    @Ignore("Not implemented")
     @Test
     public void testSwitch2() throws Exception {
         var classFiles = generateClassFiles(new ByteArrayClassLoader(), "Switch2.jav");
@@ -699,7 +698,6 @@ public class TestComplete {
         var instance = clazz.getDeclaredConstructor().newInstance();
     }
 
-    @Ignore("Not implemented")
     @Test
     public void testOverloadPattern() throws Exception {
         var classFiles = generateClassFiles(new ByteArrayClassLoader(), "OverloadPattern.jav");
@@ -835,7 +833,6 @@ public class TestComplete {
         assertEquals(clazz.getSuperclass().getDeclaredField("x").get(instance), 3);
     }
 
-    @Ignore("Not implemented")
     @Test
     public void testStringConcat() throws Exception {
         var classFiles = generateClassFiles(new ByteArrayClassLoader(), "Op2.jav");
@@ -926,11 +923,4 @@ public class TestComplete {
         var clazz = classFiles.get("Bug285");
         var instance = clazz.getDeclaredConstructor().newInstance();
     }
-
-    @Test
-    public void testBug290() throws Exception {
-        var classFiles = generateClassFiles(new ByteArrayClassLoader(), "Bug290A.jav");
-        var clazz = classFiles.get("Bug290A");
-        var instance = clazz.getDeclaredConstructor().newInstance();
-    }
 }

src/test/java/TestPackages.java

@@ -1,5 +1,4 @@
 import de.dhbwstuttgart.core.JavaTXCompiler;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import java.io.File;
@@ -22,7 +21,6 @@ public class TestPackages {
         cmp.generateBytecode(bytecodeDirectory);
     }
 
-    @Ignore("FIXME")
     @Test
     public void testPackagesCircular() throws Exception {
         var cmp = new JavaTXCompiler(

src/test/java/targetast/ASTToTypedTargetAST.java

@@ -35,7 +35,7 @@ public class ASTToTypedTargetAST {
         var file = Path.of(System.getProperty("user.dir"), "/resources/bytecode/javFiles/Overloading.jav").toFile();
         var compiler = new JavaTXCompiler(file);
         var resultSet = compiler.typeInference();
-        var converter = new ASTToTargetAST(compiler, resultSet);
+        var converter = new ASTToTargetAST(resultSet);
         var classes = compiler.sourceFiles.get(file).getClasses();
 
         var classLoader = new ByteArrayClassLoader();
@@ -106,7 +106,7 @@ public class ASTToTypedTargetAST {
         var file = Path.of(System.getProperty("user.dir"), "/resources/bytecode/javFiles/Generics.jav").toFile();
         var compiler = new JavaTXCompiler(file);
         var resultSet = compiler.typeInference();
-        var converter = new ASTToTargetAST(compiler, resultSet);
+        var converter = new ASTToTargetAST(resultSet);
         var classes = compiler.sourceFiles.get(file).getClasses();
 
         var generics = TestCodegen.generateClass(converter.convert(classes.get(0)), new ByteArrayClassLoader());
@@ -151,7 +151,7 @@ public class ASTToTypedTargetAST {
         var file = Path.of(System.getProperty("user.dir"), "/resources/bytecode/javFiles/Generics4.jav").toFile();
         var compiler = new JavaTXCompiler(file);
         var resultSet = compiler.typeInference();
-        var converter = new ASTToTargetAST(compiler, resultSet);
+        var converter = new ASTToTargetAST(resultSet);
         var classes = compiler.sourceFiles.get(file).getClasses();
 
         var generics4 = TestCodegen.generateClass(converter.convert(classes.get(0)), new ByteArrayClassLoader());

src/test/java/targetast/InheritTest2.java

@@ -2,7 +2,6 @@ package targetast;
 
 import de.dhbwstuttgart.environment.ByteArrayClassLoader;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import java.lang.reflect.Method;
@@ -10,7 +9,6 @@ import java.util.Vector;
 
 import static org.junit.Assert.assertEquals;
 
-@Ignore("FIXME")
 public class InheritTest2 {
     private static Class<?> classToTest, classToTestAA, classToTestBB, classToTestCC, classToTestDD;
     private static Object instanceOfClass, instanceOfClassAA, instanceOfClassBB, instanceOfClassCC, instanceOfClassDD;

src/test/java/targetast/TestGenerics.java

@@ -12,7 +12,6 @@ import de.dhbwstuttgart.target.generate.Bound;
 import static de.dhbwstuttgart.target.generate.Bound.*;
 import de.dhbwstuttgart.target.generate.BoundsList;
 import de.dhbwstuttgart.target.generate.GenericsResult;
-import org.junit.Ignore;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
@@ -22,7 +21,6 @@ import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
 
-@Ignore("TODO: Rewrite with the new algorithm")
 public class TestGenerics {
     private static final String rootDirectory = System.getProperty("user.dir") + "/resources/insertGenerics/javFiles/";
     private static final String bytecodeDirectory = System.getProperty("user.dir") + "targetTest";