Test-Only: Changed JavaNativeModule dependency management

It now delegates all calls it doesn't know to its dependencies

JavaIntegration/src/main/java/org/openzen/zencode/java/JavaNativeModule.java

@@ -76,6 +76,7 @@ public class JavaNativeModule {
 	private final JavaCompiledModule compiled;
 	
 	private final Map<Class<?>, HighLevelDefinition> definitionByClass = new HashMap<>();
+	private final JavaNativeModule[] dependencies;
 	private final Map<Class<?>, TypeID> typeByClass = new HashMap<>();
 	private final Map<Class<?>, TypeID> unsignedByClass = new HashMap<>();
 	
@@ -91,10 +92,7 @@ public class JavaNativeModule {
 		this.basePackage = basePackage;
 		module = new Module(name);
 		this.registry = registry;
-		
-		for (JavaNativeModule dependency : dependencies) {
-			definitionByClass.putAll(dependency.definitionByClass);
-		}
+		this.dependencies = dependencies;
 		
 		compiled = new JavaCompiledModule(module, FunctionParameter.NONE);
 		
@@ -145,11 +143,25 @@ public class JavaNativeModule {
 		return compiled;
 	}
 	
+	private HighLevelDefinition getDefinitionForClass(Class<?> cls) {
+		HighLevelDefinition definition = definitionByClass.get(cls);
+		
+		if(definition != null)
+			return definition;
+		for (JavaNativeModule dependency : this.dependencies) {
+			definition = dependency.getDefinitionForClass(cls);
+			if(definition != null)
+				return definition;
+		}
+		return null;
+	}
+	
 	public HighLevelDefinition addClass(Class<?> cls) {
-		if (definitionByClass.containsKey(cls))
-			return definitionByClass.get(cls);
+		HighLevelDefinition result = getDefinitionForClass(cls);
+		if(result != null)
+			return result;
 		
-		HighLevelDefinition result = convertClass(cls);
+		result = convertClass(cls);
 		return result;
 	}
 	
@@ -216,6 +228,20 @@ public class JavaNativeModule {
 		return className.startsWith(basePackage + ".");
 	}
 	
+	private ZSPackage getPackageOrNull(String className) {
+		ZSPackage zsPackage;
+		for (JavaNativeModule dependency : this.dependencies) {
+			zsPackage = dependency.getPackageOrNull(className);
+			if(zsPackage != null)
+				return zsPackage;
+		}
+		
+		if(className.startsWith(this.basePackage))
+			return getPackage(className);
+		return null;
+	}
+	
+	
 	private ZSPackage getPackage(String className) {
 		//TODO make a lang package?
 		if (!className.contains(".") || className.startsWith("java.lang"))
@@ -225,8 +251,12 @@ public class JavaNativeModule {
 			className = className.substring(1);
 		else if (className.startsWith(basePackage + "."))
 			className = className.substring(basePackage.length() + 1);
-		else
-			throw new IllegalArgumentException("Invalid class name: not in the given base package");
+		else {
+			ZSPackage zsPackage = getPackageOrNull(className);
+			if(zsPackage != null)
+				return zsPackage;
+			throw new IllegalArgumentException(String.format("Invalid class name: %s not in the given base package[%s]", className, this.basePackage));
+		}
 		
 		String[] classNameParts = Strings.split(className, '.');
 		ZSPackage classPkg = pkg;