|
@@ -5,10 +5,7 @@
|
5
|
5
|
*/
|
6
|
6
|
package org.openzen.zencode.java;
|
7
|
7
|
|
8
|
|
-import java.util.ArrayList;
|
9
|
|
-import java.util.HashMap;
|
10
|
|
-import java.util.List;
|
11
|
|
-import java.util.Map;
|
|
8
|
+import java.util.*;
|
12
|
9
|
import java.util.function.Consumer;
|
13
|
10
|
import org.openzen.zencode.shared.CompileException;
|
14
|
11
|
import org.openzen.zenscript.codemodel.definition.ZSPackage;
|
|
@@ -20,7 +17,6 @@ import org.openzen.zenscript.codemodel.definition.ZSPackage;
|
20
|
17
|
public class JavaNativeLoader {
|
21
|
18
|
private final Class<?>[] classes;
|
22
|
19
|
private final Class<?>[] globals;
|
23
|
|
- private final Map<String, LoadingModule> modulesByBasePackage = new HashMap<>();
|
24
|
20
|
private final Map<String, LoadingModule> modulesByName = new HashMap<>();
|
25
|
21
|
private boolean loaded = false;
|
26
|
22
|
|
|
@@ -40,7 +36,6 @@ public class JavaNativeLoader {
|
40
|
36
|
throw new IllegalArgumentException("Module already exists: " + name);
|
41
|
37
|
|
42
|
38
|
LoadingModule module = new LoadingModule(pkg, name, basePackage, dependencies);
|
43
|
|
- modulesByBasePackage.put(name, module);
|
44
|
39
|
modulesByName.put(name, module);
|
45
|
40
|
|
46
|
41
|
return module;
|
|
@@ -52,7 +47,7 @@ public class JavaNativeLoader {
|
52
|
47
|
sortClasses();
|
53
|
48
|
|
54
|
49
|
ScriptingEngine engine = new ScriptingEngine();
|
55
|
|
- for (LoadingModule module : modulesByBasePackage.values()) {
|
|
50
|
+ for (LoadingModule module : modulesByName.values()) {
|
56
|
51
|
load(engine, module);
|
57
|
52
|
}
|
58
|
53
|
return engine;
|