Merge branch 'simplifyRes' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into simplifyRes

pom.xml

@@ -62,6 +62,19 @@ http://maven.apache.org/maven-v4_0_0.xsd">
 				<configuration>
 					<skipTests>true</skipTests>
 				</configuration>
+			</plugin>
+			<plugin>
+		        <groupId>org.apache.maven.plugins</groupId>
+		        <artifactId>maven-compiler-plugin</artifactId>
+		        <version>3.8.1</version>
+		        <configuration>
+		          <verbose>true</verbose>
+		          <fork>true</fork>
+		          <executable>/home/michael/programs/jdk/jdk8u232-b09/bin/javac</executable>
+		          <compilerVersion>1.8</compilerVersion>
+		          <source>1.8</source>
+		          <target>1.8</target>
+		        </configuration>
 		    </plugin>	
 			<plugin>
 				<groupId>org.antlr</groupId>

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

@@ -63,7 +63,7 @@ public class Method extends SyntaxTreeNode implements IItemWithOffset, TypeScope
 
 	@Override
 	public Token getOffset() {
-		return null;
+		return super.getOffset();
 	}
 
 	public String getName() {

src/main/java/de/dhbwstuttgart/typedeployment/TypeInsertFactory.java

@@ -65,7 +65,7 @@ public class TypeInsertFactory {
     	
     	if (m != null) {
         	List<GenericsGeneratorResult> methodConstraints = genericResult.getMethodConstraintsByID(MethodUtility.createID(resolver, m));
-        	result.addAll(createMethodConstraints(methodConstraints, mOffset));
+        	result.addAll(createMethodConstraints(methodConstraints, m.getOffset() != null ? m.getOffset() : mOffset));
     	}
         
         return result;

src/main/java/de/dhbwstuttgart/typedeployment/TypeInsertPoint.java

@@ -73,6 +73,14 @@ public class TypeInsertPoint {
 
     	@Override
     	public int compare(TypeInsertPoint o1, TypeInsertPoint o2) { 
+    		if (o1.point == null && o2.point == null) {
+    			return 0;
+    		} else if (o2.point == null) {
+    			return 1;
+    		} else if (o1.point == null) {
+    			return -1;
+    		}
+    		
     		if (o1.getPositionInCode() > o2.getPositionInCode()) {
     			return 1;
     		} else if (o1.getPositionInCode() < o2.getPositionInCode()) {