1 files changed, 24 insertions, 66 deletions

diff --git a/src/eclipseAgent/lombok/eclipse/agent/EclipseLoaderPatcher.java b/src/eclipseAgent/lombok/eclipse/agent/EclipseLoaderPatcher.java
index 0d21c212..8616e9bc 100644
--- a/src/eclipseAgent/lombok/eclipse/agent/EclipseLoaderPatcher.java
+++ b/src/eclipseAgent/lombok/eclipse/agent/EclipseLoaderPatcher.java
@@ -1,13 +1,26 @@
+/*
+ * Copyright (C) 2015 The Project Lombok Authors.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
 package lombok.eclipse.agent;
 
-import java.io.InputStream;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.jar.JarFile;
-import java.util.zip.ZipEntry;
-
 import lombok.patcher.ClassRootFinder;
 import lombok.patcher.Hook;
 import lombok.patcher.MethodTarget;
@@ -16,62 +29,7 @@ import lombok.patcher.StackRequest;
 import lombok.patcher.scripts.ScriptBuilder;
 
 public class EclipseLoaderPatcher {
-	public static boolean overrideLoadDecide(ClassLoader original, String name, boolean resolve) {
-		return name.startsWith("lombok.");
-	}
-	
-	public static Class<?> overrideLoadResult(ClassLoader original, String name, boolean resolve) throws ClassNotFoundException {
-		try {
-			Field shadowLoaderField = original.getClass().getField("lombok$shadowLoader");
-			ClassLoader shadowLoader = (ClassLoader) shadowLoaderField.get(original);
-			if (shadowLoader == null) {
-				String jarLoc = (String) original.getClass().getField("lombok$location").get(null);
-				JarFile jf = new JarFile(jarLoc);
-				InputStream in = null;
-				try {
-					ZipEntry entry = jf.getEntry("lombok/launch/ShadowClassLoader.class");
-					in = jf.getInputStream(entry);
-					byte[] bytes = new byte[65536];
-					int len = 0;
-					while (true) {
-						int r = in.read(bytes, len, bytes.length - len);
-						if (r == -1) break;
-						len += r;
-						if (len == bytes.length) throw new IllegalStateException("lombok.launch.ShadowClassLoader too large.");
-					}
-					in.close();
-					Class<?> shadowClassLoaderClass; {
-						Method defineClassMethod = ClassLoader.class.getDeclaredMethod("defineClass", String.class, byte[].class, int.class, int.class);
-						defineClassMethod.setAccessible(true);
-						shadowClassLoaderClass = (Class<?>) defineClassMethod.invoke(original, "lombok.launch.ShadowClassLoader", bytes, 0, len);
-					}
-					Constructor<?> constructor = shadowClassLoaderClass.getDeclaredConstructor(ClassLoader.class, String.class, String.class, String[].class);
-					constructor.setAccessible(true);
-					shadowLoader = (ClassLoader) constructor.newInstance(original, "lombok", jarLoc, new String[] {"lombok."});
-					shadowLoaderField.set(original, shadowLoader);
-				} finally {
-					if (in != null) in.close();
-					jf.close();
-				}
-			}
-			
-			if (resolve) {
-				Method m = shadowLoader.getClass().getDeclaredMethod("loadClass", String.class, boolean.class);
-				m.setAccessible(true);
-				return (Class<?>) m.invoke(shadowLoader, name, true);
-			} else {
-				return shadowLoader.loadClass(name);
-			}
-		} catch (Exception ex) {
-			Throwable t = ex;
-			if (t instanceof InvocationTargetException) t = t.getCause();
-			if (t instanceof RuntimeException) throw (RuntimeException) t;
-			if (t instanceof Error) throw (Error) t;
-			throw new RuntimeException(t);
-		}
-	}
-	
-	private static final String SELF_NAME = "lombok.eclipse.agent.EclipseLoaderPatcher";
+	private static final String TRANSPLANTS_CLASS_NAME = "lombok.eclipse.agent.EclipseLoaderPatcherTransplants";
 	
 	public static void patchEquinoxLoaders(ScriptManager sm, Class<?> launchingContext) {
 		sm.addScript(ScriptBuilder.exitEarly()
@@ -81,8 +39,8 @@ public class EclipseLoaderPatcher {
 						"java.lang.Class", "java.lang.String", "boolean"))
 				.target(new MethodTarget("org.eclipse.osgi.internal.loader.ModuleClassLoader", "loadClass",
 						"java.lang.Class", "java.lang.String", "boolean"))
-				.decisionMethod(new Hook(SELF_NAME, "overrideLoadDecide", "boolean", "java.lang.ClassLoader", "java.lang.String", "boolean"))
-				.valueMethod(new Hook(SELF_NAME, "overrideLoadResult", "java.lang.Class", "java.lang.ClassLoader", "java.lang.String", "boolean"))
+				.decisionMethod(new Hook(TRANSPLANTS_CLASS_NAME, "overrideLoadDecide", "boolean", "java.lang.ClassLoader", "java.lang.String", "boolean"))
+				.valueMethod(new Hook(TRANSPLANTS_CLASS_NAME, "overrideLoadResult", "java.lang.Class", "java.lang.ClassLoader", "java.lang.String", "boolean"))
 				.transplant()
 				.request(StackRequest.THIS, StackRequest.PARAM1, StackRequest.PARAM2).build());