From abdff6c8d28da736bdecc6f1e1e835f2170754f5 Mon Sep 17 00:00:00 2001
From: JanUlrich <andi@michlaustderaffe.de>
Date: Fri, 3 Jan 2020 01:12:58 +0100
Subject: [PATCH] Fixed bug #184

---
 .../de/dhbwstuttgart/core/JavaTXCompiler.java    | 16 ++++++++++------
 .../environment/CompilationEnvironment.java      |  4 ++--
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.java b/src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.java
index 498ea41b..13d752cb 100644
--- a/src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.java
+++ b/src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.java
@@ -88,22 +88,26 @@ public class JavaTXCompiler {
         INSTANCE = this;
     }
 
-    public ConstraintSet<Pair> getConstraints() throws ClassNotFoundException {
+    public ConstraintSet<Pair> getConstraints() throws ClassNotFoundException, IOException {
         List<ClassOrInterface> allClasses = new ArrayList<>();//environment.getAllAvailableClasses();
         for (SourceFile sf : sourceFiles.values()) {
             allClasses.addAll(sf.getClasses());
         }
         List<ClassOrInterface> importedClasses = new ArrayList<>();
         //Alle Importierten Klassen in allen geparsten Sourcefiles kommen ins FC
-        for (File forSourceFile : sourceFiles.keySet())
+        for (File forSourceFile : sourceFiles.keySet()){
             for (JavaClassName name : sourceFiles.get(forSourceFile).getImports()) {
                 //TODO: Hier werden imports von eigenen (.jav) Klassen nicht beachtet
                 ClassOrInterface importedClass = ASTFactory.createClass(
                         classLoader.loadClass(name.toString()));
                 importedClasses.add(importedClass);
             }
+			for(Class c : CompilationEnvironment.loadDefaultPackageClasses(forSourceFile, classLoader)){
+				ClassOrInterface importedClass = ASTFactory.createClass(c);
+				importedClasses.add(importedClass);
+			}
+        }
         allClasses.addAll(importedClasses);
-
         return new TYPE(sourceFiles.values(), allClasses).getConstraints();
     }
 
@@ -289,7 +293,7 @@ public class JavaTXCompiler {
 	 */
 
 	public UnifyResultModel typeInferenceAsync(UnifyResultListener resultListener, Writer logFile)
-			throws ClassNotFoundException {
+			throws ClassNotFoundException, IOException {
 		List<ClassOrInterface> allClasses = new ArrayList<>();// environment.getAllAvailableClasses();
 		// Alle Importierten Klassen in allen geparsten Sourcefiles kommen ins FC
 		for (SourceFile sf : this.sourceFiles.values()) {
@@ -457,7 +461,7 @@ public class JavaTXCompiler {
 		return urm;
 	}
 
-	public List<ResultSet> typeInference() throws ClassNotFoundException {
+	public List<ResultSet> typeInference() throws ClassNotFoundException, IOException {
 		List<ClassOrInterface> allClasses = new ArrayList<>();// environment.getAllAvailableClasses();
 		// Alle Importierten Klassen in allen geparsten Sourcefiles kommen ins FC
 		for (SourceFile sf : this.sourceFiles.values()) {
@@ -743,7 +747,7 @@ public class JavaTXCompiler {
 
 
 	public List<GenericGenratorResultForSourceFile> getGeneratedGenericResultsForAllSourceFiles()
-			throws ClassNotFoundException {
+			throws ClassNotFoundException, IOException {
 		List<GenericGenratorResultForSourceFile> result = new ArrayList<>();
 		for (File f : sourceFiles.keySet()) {
 			SourceFile sf = sourceFiles.get(f);
diff --git a/src/main/java/de/dhbwstuttgart/environment/CompilationEnvironment.java b/src/main/java/de/dhbwstuttgart/environment/CompilationEnvironment.java
index 05a8055c..7433d661 100644
--- a/src/main/java/de/dhbwstuttgart/environment/CompilationEnvironment.java
+++ b/src/main/java/de/dhbwstuttgart/environment/CompilationEnvironment.java
@@ -79,7 +79,7 @@ public class CompilationEnvironment {
 		return new JavaClassRegistry(allNames);
 	}
 
-	public List<Class> loadDefaultPackageClasses(File forSourceFile, ClassLoader classLoader) throws IOException, ClassNotFoundException {
+	public static List<Class> loadDefaultPackageClasses(File forSourceFile, ClassLoader classLoader) throws IOException, ClassNotFoundException {
 		List<Class> ret = new ArrayList<>();
 		String packageName = getPackageName(JavaTXParser.parse(forSourceFile));
 		//Set classLoader to include default package for this specific source file
@@ -96,7 +96,7 @@ public class CompilationEnvironment {
 		return ret;
 	}
 
-	private String getPackageName(CompilationUnitContext forTree){
+	private static String getPackageName(CompilationUnitContext forTree){
 		String packageName = "";
 		for(TerminalNode subPackage : forTree.packageDeclaration().Identifier()){
 			packageName += subPackage.toString() + ".";