Browse Source

JavaNativeLoader: removed unneccessary Field

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

+ 2
- 7
JavaIntegration/src/main/java/org/openzen/zencode/java/JavaNativeLoader.java View File

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

Loading…
Cancel
Save