Änderungen an Testfiles und Logger

src/de/dhbwstuttgart/logger/Logger.java

@@ -25,6 +25,10 @@ public class Logger {
 		});
 	}
 
+	public static LoggerConfiguration getConfiguration(){
+		return Logger.standardConfiguration;
+	}
+	
 	/**
 	 * Logt eine Debug Message, welche zusätzlich einer bestimmten Section zugewiesen wird.
 	 * Dadurch lässt sich die DEBUG ausgabe übersichtlicher gestalten.

src/de/dhbwstuttgart/syntaxtree/type/GenericTypeVar.java

@@ -218,6 +218,15 @@ public class GenericTypeVar extends Type
 	public int getEndOffset() {
 		return this.getOffset() + this.name.toString().length();
 	}
+
+	@Override
+	public void parserPostProcessing(SyntaxTreeNode parent) {
+		//SyntaxTreeNode parentTemp = this.parent;
+		super.parserPostProcessing(parent);
+		//if(parentTemp != null)this.parent = parentTemp; //Der Parenttype einer GenericVar soll sich nicht ändern können, falls einmal gesetzt.
+	}
+	
+	
 }
 // ino.end
 

src/de/dhbwstuttgart/typeinference/FunNMethod.java

@@ -36,6 +36,7 @@ public class FunNMethod extends Method{
 		this.parserPostProcessing(new Class("Fun"+paralist.size(), 0));
 	}
 	
+	/*
 	public FunNMethod(int N){
 		super(0); //Hat keinen Offset, da nur theoretisch gedachte Methode
 		this.setType(TypePlaceholder.fresh(this));
@@ -53,7 +54,7 @@ public class FunNMethod extends Method{
 		this.parameterlist = pl;
 		this.parserPostProcessing(new Class("Fun"+N, 0));
 	}
-	
+	*/
 	@Override
 	public TypeInsertPoint createTypeInsertPoint(TypePlaceholder tph,
 			ResultSet resultSet) {

test/plugindevelopment/TypeInsertTester.java

@@ -27,7 +27,7 @@ public class TypeInsertTester{
 	private static Logger inferencelog = Logger.getLogger(TypeInsertTester.class.getName());
 	static{
 		{
-			Logger.setStandardConfiguration(new LoggerConfiguration().setOutput(Section.TYPEINFERENCE, System.out));
+			Logger.getConfiguration().setOutput(Section.TYPEINFERENCE, System.out);
 			/*
 	        // Ausgabeoptionen fuer die Logger
 	        ConsoleAppender logAppender = new ConsoleAppender(new SimpleLayout());

test/plugindevelopment/TypeInsertTests/BoundedGenericTest.jav

@@ -1,5 +1,5 @@
 class BoundedGenericTest<A extends String>{
-	var;
+	var = "test";
 	<B extends A> B methode(){
 		return var;
 	}

test/plugindevelopment/TypeInsertTests/ImportTest2.jav

@@ -1,9 +1,9 @@
 import java.util.Vector;
 
 class ImportTest{
-var;
 
 void methode(a){
+	var;
 	var.add(a);
 }
 

test/plugindevelopment/TypeInsertTests/IntTest.jav

@@ -1,6 +1,6 @@
 class IntTest{
-	var;
 	int methode(){
+		var;
 		return var;
 	}
 }

test/plugindevelopment/TypeInsertTests/LambdaTest10.jav

@@ -1,8 +1,6 @@
 class Test{
 
-m;
+<CT extends String> CT methode(m){
-
-<CT, CT extends String> CT methode(){
 return m;
 }
 

test/plugindevelopment/TypeInsertTests/LambdaTest11.jav

@@ -1,8 +1,6 @@
 class Test{
 
-m;
+<CT> CT methode(m){
-
-<CT> CT methode(){
 return m;
 }
 

test/plugindevelopment/TypeInsertTests/LambdaTest2.jav

@@ -1,5 +1,5 @@
-class LambdaTest<R,S>{
+class LambdaTest<A,B>{
 
-Fun1<Fun1<R, Fun2<R, LambdaTest<R,S>, S>>, S> op = (m) -> (f) -> f.apply(this,m);
+Fun1<Fun1<A, Fun2<A, LambdaTest<A,B>, B>>, B> op = (m) -> (f) -> f.apply(this,m);
 
 }

test/plugindevelopment/TypeInsertTests/LambdaTest2.java

@@ -4,12 +4,17 @@ import java.util.Vector;
 
 import org.junit.Test;
 
+import de.dhbwstuttgart.logger.Logger;
+import de.dhbwstuttgart.logger.LoggerConfiguration;
+import de.dhbwstuttgart.logger.Section;
+
 public class LambdaTest2 {
 
 	private static final String TEST_FILE = "LambdaTest2.jav";
 	
 	@Test
 	public void run(){
+		Logger.getConfiguration().setOutput(Section.ASSUMPTIONS, System.out);
 		Vector<String> mustContain = new Vector<String>();
 		//mustContain.add("S m");
 		MultipleTypesInsertTester.test(this.TEST_FILE, mustContain);

test/plugindevelopment/TypeInsertTests/LargeSourceCodeTests/LambdaTest22.java

@@ -1,9 +1,11 @@
-package plugindevelopment.TypeInsertTests;
+package plugindevelopment.TypeInsertTests.LargeSourceCodeTests;
 
 import java.util.Vector;
 
 import org.junit.Test;
 
+import plugindevelopment.TypeInsertTests.MultipleTypesInsertTester;
+
 public class LambdaTest22 {
 	private static final String TEST_FILE = "LambdaTest22.jav";
 	

test/plugindevelopment/TypeInsertTests/LargeSourceCodeTests/Matrix.java

@@ -1,9 +1,10 @@
-package plugindevelopment.TypeInsertTests;
+package plugindevelopment.TypeInsertTests.LargeSourceCodeTests;
 
 import java.util.Vector;
 
 import org.junit.Test;
 
+import plugindevelopment.TypeInsertTests.MultipleTypesInsertTester;
 import de.dhbwstuttgart.logger.Logger;
 import de.dhbwstuttgart.logger.LoggerConfiguration;
 import de.dhbwstuttgart.logger.Section;

test/plugindevelopment/TypeInsertTests/LargeSourceCodeTests/TypedMatrixSimpleTest.java

@@ -1,9 +1,11 @@
-package plugindevelopment.TypeInsertTests;
+package plugindevelopment.TypeInsertTests.LargeSourceCodeTests;
 
 import java.util.Vector;
 
 import org.junit.Test;
 
+import plugindevelopment.TypeInsertTests.MultipleTypesInsertTester;
+
 public class TypedMatrixSimpleTest {
 	private static final String TEST_FILE = "TypedMatrixSimpleTest.jav";
 	

test/plugindevelopment/TypeInsertTests/LargeSourceCodeTests/TypedMatrixTest.java

@@ -1,9 +1,11 @@
-package plugindevelopment.TypeInsertTests;
+package plugindevelopment.TypeInsertTests.LargeSourceCodeTests;
 
 import java.util.Vector;
 
 import org.junit.Test;
 
+import plugindevelopment.TypeInsertTests.MultipleTypesInsertTester;
+
 public class TypedMatrixTest {
 	private static final String TEST_FILE = "TypedMatrixTest.jav";
 	

test/plugindevelopment/TypeInsertTests/MultipleTypesInsertTester.java

@@ -22,7 +22,7 @@ public class MultipleTypesInsertTester extends TypeInsertTester{
 	
 	public MultipleTypesInsertTester(){
 		//Output von TYPEINFERENCE auf die Console setzen:
-		Logger.setStandardConfiguration(new LoggerConfiguration().setOutput(Section.TYPEINFERENCE, System.out));
+		Logger.getConfiguration().setOutput(Section.TYPEINFERENCE, System.out);
 	}
 	
 	public static void test(String sourceFileToInfere, Vector<String> mustContain){

test/plugindevelopment/TypeInsertTests/OverloadingInsertTest.jav

@@ -1,16 +1,13 @@
 class OverloadingInsertTest{
 	
-	var;
-	
 	overload(){
 		return this;
 	}
 }
 
 class Overloading2{
-	var2;
 	
-	methode(){
+	methode(var2){
 		return var2.overload();
 	}