Browse Source

Added modules getter to the ScriptingEngine and allow empty base base package names in JavaNativeModule

kindlich 5 years ago
parent
commit
608baebce8
No known key found for this signature in database

+ 3
- 0
JavaIntegration/src/main/java/org/openzen/zencode/java/JavaNativeModule.java View File

217
 	}
217
 	}
218
 	
218
 	
219
 	private ZSPackage getPackage(String className) {
219
 	private ZSPackage getPackage(String className) {
220
+		//TODO validate
221
+		if(this.basePackage == null || this.basePackage.isEmpty())
222
+			return pkg;
220
 		//TODO make a lang package?
223
 		//TODO make a lang package?
221
 		if (!className.contains(".") || className.startsWith("java.lang"))
224
 		if (!className.contains(".") || className.startsWith("java.lang"))
222
 			return pkg;
225
 			return pkg;

+ 4
- 0
JavaIntegration/src/main/java/org/openzen/zencode/java/ScriptingEngine.java View File

147
 			runUnit.dump(new File("classes"));
147
 			runUnit.dump(new File("classes"));
148
 		runUnit.run(arguments, parentClassLoader);
148
 		runUnit.run(arguments, parentClassLoader);
149
 	}
149
 	}
150
+	
151
+	public List<JavaNativeModule> getNativeModules() {
152
+		return Collections.unmodifiableList(this.nativeModules);
153
+	}
150
 }
154
 }

Loading…
Cancel
Save