Merge pull request Konloch#47 from TheBiblMan/master

Konloch · Konloch · commit 2bc68fb1086f · 2015-06-02T17:21:32.000-06:00
Compiled Java Plugin Loading
diff --git a/src/the/bytecode/club/bytecodeviewer/plugin/strategies/CompiledJavaPluginLaunchStrategy.java b/src/the/bytecode/club/bytecodeviewer/plugin/strategies/CompiledJavaPluginLaunchStrategy.java
@@ -63,7 +63,7 @@ private static Set<LoadedNodeData> loadData(File jarFile) throws Throwable {
 		while ((entry = jis.getNextEntry()) != null) {
 			try {
 				String name = entry.getName();
-				if(!name.endsWith(".class")){
+				if(name.endsWith(".class")){
 					byte[] bytes = JarUtils.getBytes(jis);
 					String magic = String.format("%02X", bytes[0]) + String.format("%02X", bytes[1]) + String.format("%02X", bytes[2]) + String.format("%02X", bytes[3]);
 					if(magic.toLowerCase().equals("cafebabe")) {
@@ -136,9 +136,7 @@ public LoadingClassLoader(LoadedNodeData data, Set<LoadedNodeData> set) throws T
 			ccache = new HashMap<String, Class<?>>();
 
 			for(LoadedNodeData d: set) {
-				if(d != data) {
-					cache.put(d.node.name, d);
-				}
+				cache.put(d.node.name, d);
 			}
 
 			@SuppressWarnings("unchecked")
@@ -152,15 +150,17 @@ public LoadingClassLoader(LoadedNodeData data, Set<LoadedNodeData> set) throws T
 
 		@Override
 		public Class<?> findClass(String name) throws ClassNotFoundException {
-			name = name.replace("/", ".");
+			name = name.replace(".", "/");
+			
+			System.out.println("finding " + name);
 
 			if(ccache.containsKey(name))
 				return ccache.get(name);
 
 			LoadedNodeData data = cache.get(name);
 			if(data != null) {
 				byte[] bytes = data.bytes;
-				Class<?> klass = defineClass(data.node.name, bytes, 0, bytes.length);
+				Class<?> klass = defineClass(data.node.name.replace("/", "."), bytes, 0, bytes.length);
 				ccache.put(name, klass);
 				return klass;
 			}
