6 files changed, 21 insertions, 68 deletions
diff --git a/src/core/lombok/core/Agent.java b/src/core/lombok/core/AgentLauncher.java
index 49c03bf3..1d5ab3e6 100644
--- a/src/core/lombok/core/Agent.java
+++ b/src/core/lombok/core/AgentLauncher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 The Project Lombok Authors.
+ * Copyright (C) 2009-2014 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
@@ -21,45 +21,32 @@
  */
 package lombok.core;
 
-import java.lang.instrument.ClassFileTransformer;
-import java.lang.instrument.IllegalClassFormatException;
 import java.lang.instrument.Instrumentation;
-import java.security.ProtectionDomain;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-import javax.swing.JOptionPane;
-import javax.swing.SwingUtilities;
-
-public abstract class Agent {
-	protected abstract void runAgent(String agentArgs, Instrumentation instrumentation, boolean injected) throws Exception;
-	
-	public static void agentmain(String agentArgs, Instrumentation instrumentation) throws Throwable {
-		runAgents(agentArgs, instrumentation, true);
+public class AgentLauncher {
+	public interface AgentLaunchable {
+		void runAgent(String agentArgs, Instrumentation instrumentation, boolean injected, Class<?> launchingContext) throws Exception;
 	}
 	
-	public static void premain(String agentArgs, Instrumentation instrumentation) throws Throwable {
-		runAgents(agentArgs, instrumentation, false);
-	}
-	
-	private static final List<AgentInfo> AGENTS = Collections.unmodifiableList(Arrays.asList(
-			new NetbeansPatcherInfo(),
-			new EclipsePatcherInfo()
-	));
-	
-	private static void runAgents(String agentArgs, Instrumentation instrumentation, boolean injected) throws Throwable {
+	public static void runAgents(String agentArgs, Instrumentation instrumentation, boolean injected, Class<?> launchingContext) throws Throwable {
 		for (AgentInfo info : AGENTS) {
 			try {
 				Class<?> agentClass = Class.forName(info.className());
-				Agent agent = (Agent) agentClass.newInstance();
-				agent.runAgent(agentArgs, instrumentation, injected);
+				AgentLaunchable agent = (AgentLaunchable) agentClass.newInstance();
+				agent.runAgent(agentArgs, instrumentation, injected, launchingContext);
 			} catch (Throwable t) {
 				info.problem(t, instrumentation);
 			}
 		}
 	}
 	
+	private static final List<AgentInfo> AGENTS = Collections.unmodifiableList(Arrays.<AgentInfo>asList(
+			new EclipsePatcherInfo()
+	));
+	
 	private static abstract class AgentInfo {
 		abstract String className();
 		
@@ -91,45 +78,6 @@ public abstract class Agent {
 		}
 	}
 	
-	private static class NetbeansPatcherInfo extends AgentInfo {
-		@Override String className() {
-			return "lombok.netbeans.agent.NetbeansPatcher";
-		}
-		
-		@Override void problem(Throwable in, Instrumentation instrumentation) throws Throwable {
-			try {
-				super.problem(in, instrumentation);
-			} catch (InternalError ie) {
-				throw ie;
-			} catch (Throwable t) {
-				final String error;
-				
-				if (t instanceof UnsupportedClassVersionError) {
-					error = "Lombok only works on netbeans if you start netbeans using a 1.6 or higher JVM.\n" +
-							"Change your platform's default JVM, or edit etc/netbeans.conf\n" +
-							"and explicitly tell netbeans your 1.6 JVM's location.";
-				} else {
-					error = "Lombok disabled due to error: " + t;
-				}
-				
-				instrumentation.addTransformer(new ClassFileTransformer() {
-					@Override public byte[] transform(ClassLoader loader, String className, Class<?> classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws IllegalClassFormatException {
-						if ("org/netbeans/modules/java/source/parsing/JavacParser".equals(className)) {
-							//If that class gets loaded, this is definitely a netbeans(-esque) environment, and thus we SHOULD tell the user that lombok is not in fact loaded.
-							SwingUtilities.invokeLater(new Runnable() {
-								@Override public void run() {
-									JOptionPane.showMessageDialog(null, error, "Lombok Disabled", JOptionPane.ERROR_MESSAGE);
-								}
-							});
-						}
-						
-						return null;
-					}
-				});
-			}
-		}
-	}
-	
 	private static class EclipsePatcherInfo extends AgentInfo {
 		@Override String className() {
 			return "lombok.eclipse.agent.EclipsePatcher";
diff --git a/src/core/lombok/core/Main.java b/src/core/lombok/core/Main.java
index d62fe3e4..0856d3b3 100644
--- a/src/core/lombok/core/Main.java
+++ b/src/core/lombok/core/Main.java
@@ -38,6 +38,7 @@ public class Main {
 	));
 	
 	public static void main(String[] args) throws IOException {
+		Thread.currentThread().setContextClassLoader(Main.class.getClassLoader());
 		int err = new Main(SpiLoadUtil.readAllFromIterator(
 				SpiLoadUtil.findServices(LombokApp.class)), Arrays.asList(args)).go();
 		System.exit(err);
diff --git a/src/core/lombok/core/PostCompiler.java b/src/core/lombok/core/PostCompiler.java
index 11091cb8..237867cb 100644
--- a/src/core/lombok/core/PostCompiler.java
+++ b/src/core/lombok/core/PostCompiler.java
@@ -24,6 +24,8 @@ package lombok.core;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.util.Collections;
 import java.util.List;
 
@@ -55,10 +57,12 @@ public final class PostCompiler {
 			transformations = SpiLoadUtil.readAllFromIterator(SpiLoadUtil.findServices(PostCompilerTransformation.class, PostCompilerTransformation.class.getClassLoader()));
 		} catch (IOException e) {
 			transformations = Collections.emptyList();
-			diagnostics.addWarning("Could not load post-compile transformers: " + e.getMessage());
+			StringWriter sw = new StringWriter();
+			e.printStackTrace(new PrintWriter(sw, true));
+			diagnostics.addWarning("Could not load post-compile transformers: " + e.getMessage() + "\n" + sw.toString());
 		}
 	}
-
+	
 	public static OutputStream wrapOutputStream(final OutputStream originalStream, final String fileName, final DiagnosticsReceiver diagnostics) throws IOException {
 		if (System.getProperty("lombok.disablePostCompiler", null) != null) return originalStream;
 		return new ByteArrayOutputStream() {
diff --git a/src/core/lombok/core/Version.java b/src/core/lombok/core/Version.java
index 9f810525..02bc1af0 100644
--- a/src/core/lombok/core/Version.java
+++ b/src/core/lombok/core/Version.java
@@ -30,7 +30,7 @@ public class Version {
 	// ** CAREFUL ** - this class must always compile with 0 dependencies (it must not refer to any other sources or libraries).
 	// Note: In 'X.Y.Z', if Z is odd, its a snapshot build built from the repository, so many different 0.10.3 versions can exist, for example.
 	// Official builds always end in an even number. (Since 0.10.2).
-	private static final String VERSION = "1.14.9";
+	private static final String VERSION = "1.14.9.shadow";
 	private static final String RELEASE_NAME = "Edgy Guinea Pig";
 //	private static final String RELEASE_NAME = "Branching Cobra";
 	
diff --git a/src/core/lombok/eclipse/handlers/HandlePrintAST.java b/src/core/lombok/eclipse/handlers/HandlePrintAST.java
index 0b61bc4d..234e29b8 100644
--- a/src/core/lombok/eclipse/handlers/HandlePrintAST.java
+++ b/src/core/lombok/eclipse/handlers/HandlePrintAST.java
@@ -59,7 +59,7 @@ public class HandlePrintAST extends EclipseAnnotationHandler<PrintAST> {
 				try {
 					stream.close();
 				} catch (Exception e) {
-					Lombok.sneakyThrow(e);
+					throw Lombok.sneakyThrow(e);
 				}
 			}
 		}
diff --git a/src/core/lombok/javac/handlers/HandlePrintAST.java b/src/core/lombok/javac/handlers/HandlePrintAST.java
index 9a52b9d9..0826d1d1 100644
--- a/src/core/lombok/javac/handlers/HandlePrintAST.java
+++ b/src/core/lombok/javac/handlers/HandlePrintAST.java
@@ -59,7 +59,7 @@ public class HandlePrintAST extends JavacAnnotationHandler<PrintAST> {
 				try {
 					stream.close();
 				} catch (Exception e) {
-					Lombok.sneakyThrow(e);
+					throw Lombok.sneakyThrow(e);
 				}
 			}
 		}