From 9fb4c3a42429c102e4cb9235b7e70163b2d5ed86 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Tue, 1 Dec 2009 00:24:33 +0100 Subject: Added compiling of src/netbeansAgent, and temporarily set Agent-Class to netbeans agent. Will need to find a solution for a generic be-everything agent. --- buildScripts/compile.ant.xml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'buildScripts/compile.ant.xml') diff --git a/buildScripts/compile.ant.xml b/buildScripts/compile.ant.xml index 52dff701..a1181f87 100644 --- a/buildScripts/compile.ant.xml +++ b/buildScripts/compile.ant.xml @@ -83,6 +83,7 @@ lombok code including the various agents. + @@ -119,8 +120,10 @@ lombok code including the various agents. + + @@ -135,6 +138,9 @@ lombok code including the various agents. + + + @@ -153,7 +159,8 @@ lombok code including the various agents. - + + -- cgit From 199f7f74fd35462dced087280af066cf2cad7596 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Tue, 1 Dec 2009 13:53:07 +0100 Subject: Generalized the agent mechanism; now 1 lombok.jar can serve as the agent for BOTH netbeans AND eclipse, and is future-ready for an IntelliJ agent. --- buildScripts/compile.ant.xml | 3 +- src/core/lombok/core/Agent.java | 62 ++++++++++++++++++++++ .../lombok/eclipse/agent/EclipsePatcher.java | 14 ++--- .../lombok/netbeans/agent/NetbeansPatcher.java | 24 ++++----- .../lombok/netbeans/agent/PatchFixes.java | 20 +++---- 5 files changed, 90 insertions(+), 33 deletions(-) create mode 100644 src/core/lombok/core/Agent.java (limited to 'buildScripts/compile.ant.xml') diff --git a/buildScripts/compile.ant.xml b/buildScripts/compile.ant.xml index a1181f87..1cc6933c 100644 --- a/buildScripts/compile.ant.xml +++ b/buildScripts/compile.ant.xml @@ -159,8 +159,7 @@ lombok code including the various agents. - - + diff --git a/src/core/lombok/core/Agent.java b/src/core/lombok/core/Agent.java new file mode 100644 index 00000000..2ba6bb20 --- /dev/null +++ b/src/core/lombok/core/Agent.java @@ -0,0 +1,62 @@ +/* + * Copyright © 2009 Reinier Zwitserloot and Roel Spilker. + * + * 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.core; + +import java.lang.instrument.Instrumentation; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +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 Exception { + runAgents(agentArgs, instrumentation, true); + } + + public static void premain(String agentArgs, Instrumentation instrumentation) throws Exception { + runAgents(agentArgs, instrumentation, false); + } + + private static final List AGENT_NAMES = Collections.unmodifiableList(Arrays.asList( + "lombok.netbeans.agent.NetbeansPatcher", + "lombok.eclipse.agent.EclipsePatcher" + )); + + private static void runAgents(String agentArgs, Instrumentation instrumentation, boolean injected) throws Exception { + for (String agentName : AGENT_NAMES) { + try { + Class agentClass = Class.forName(agentName); + Agent agent = (Agent) agentClass.newInstance(); + agent.runAgent(agentArgs, instrumentation, injected); + } catch (ClassNotFoundException e) { + //That's okay - this lombok evidently is a version with support for something stripped out. + } catch (ClassCastException e) { + throw new InternalError("Lombok bug. Class: " + agentName + " is not an implementation of lombok.core.Agent"); + } catch (IllegalAccessException e) { + throw new InternalError("Lombok bug. Class: " + agentName + " is not public"); + } catch (InstantiationException e) { + throw new InternalError("Lombok bug. Class: " + agentName + " is not concrete or has no public no-args constructor"); + } + } + } +} diff --git a/src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java b/src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java index 7d2a28bc..741328f1 100644 --- a/src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java +++ b/src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java @@ -26,6 +26,7 @@ import java.util.Collection; import java.util.Collections; import java.util.List; +import lombok.core.Agent; import lombok.patcher.Hook; import lombok.patcher.MethodTarget; import lombok.patcher.ScriptManager; @@ -41,15 +42,10 @@ import lombok.patcher.scripts.ScriptBuilder; * classes in this package for more information about which classes are transformed and how they are * transformed. */ -public class EclipsePatcher { - private EclipsePatcher() {} - - public static void agentmain(@SuppressWarnings("unused") String agentArgs, Instrumentation instrumentation) throws Exception { - registerPatchScripts(instrumentation, true); - } - - public static void premain(@SuppressWarnings("unused") String agentArgs, Instrumentation instrumentation) throws Exception { - registerPatchScripts(instrumentation, false); +public class EclipsePatcher extends Agent { + @Override + public void runAgent(String agentArgs, Instrumentation instrumentation, boolean injected) throws Exception { + registerPatchScripts(instrumentation, injected); } private static void registerPatchScripts(Instrumentation instrumentation, boolean reloadExistingClasses) { diff --git a/src/netbeansAgent/lombok/netbeans/agent/NetbeansPatcher.java b/src/netbeansAgent/lombok/netbeans/agent/NetbeansPatcher.java index 2a87ad6c..bffedfc2 100644 --- a/src/netbeansAgent/lombok/netbeans/agent/NetbeansPatcher.java +++ b/src/netbeansAgent/lombok/netbeans/agent/NetbeansPatcher.java @@ -23,29 +23,29 @@ package lombok.netbeans.agent; import java.lang.instrument.Instrumentation; +import lombok.core.Agent; import lombok.patcher.Hook; import lombok.patcher.MethodTarget; import lombok.patcher.ScriptManager; import lombok.patcher.StackRequest; -import lombok.patcher.equinox.EquinoxClassLoader; import lombok.patcher.scripts.ScriptBuilder; -public class NetbeansPatcher { - private NetbeansPatcher() {} - - public static void agentmain(@SuppressWarnings("unused") String agentArgs, Instrumentation instrumentation) throws Exception { - registerPatchScripts(instrumentation, true); - } - - public static void premain(@SuppressWarnings("unused") String agentArgs, Instrumentation instrumentation) throws Exception { - registerPatchScripts(instrumentation, false); +/** + * This is a java-agent that patches some of netbeans's classes so that lombok is initialized as Javac TaskListener, + * allowing us to change AST nodes anytime netbeans parses source code. It also fixes some of the places in netbeans that + * can't deal with generated code. + * + * The hard work on figuring out where to patch has been done by Jan Lahoda (jlahoda@netbeans.org) + */ +public class NetbeansPatcher extends Agent { + @Override + public void runAgent(String agentArgs, Instrumentation instrumentation, boolean injected) throws Exception { + registerPatchScripts(instrumentation, injected); } private static void registerPatchScripts(Instrumentation instrumentation, boolean reloadExistingClasses) { ScriptManager sm = new ScriptManager(); sm.registerTransformer(instrumentation); - EquinoxClassLoader.addPrefix("lombok."); - EquinoxClassLoader.registerScripts(sm); patchNetbeansJavac(sm); patchNetbeansMissingPositionAwareness(sm); diff --git a/src/netbeansAgent/lombok/netbeans/agent/PatchFixes.java b/src/netbeansAgent/lombok/netbeans/agent/PatchFixes.java index 4aa7f77c..3a58d381 100644 --- a/src/netbeansAgent/lombok/netbeans/agent/PatchFixes.java +++ b/src/netbeansAgent/lombok/netbeans/agent/PatchFixes.java @@ -48,16 +48,16 @@ public class PatchFixes { if (context.get(TaskListener.class) != null) context.put(TaskListener.class, (TaskListener)null); if (taskListener != null) { -// try { -// Method m = JavacTaskImpl.class.getDeclaredMethod("wrap", TaskListener.class); -// try { -// m.setAccessible(true); -// } catch (SecurityException ignore) {} -// TaskListener w = (TaskListener)m.invoke(that, taskListener); - context.put(TaskListener.class, taskListener); -// } catch (InvocationTargetException e) { -// throw e.getCause(); -// } + try { + Method m = JavacTaskImpl.class.getDeclaredMethod("wrap", TaskListener.class); + try { + m.setAccessible(true); + } catch (SecurityException ignore) {} + TaskListener w = (TaskListener)m.invoke(that, taskListener); + context.put(TaskListener.class, w); + } catch (InvocationTargetException e) { + throw e.getCause(); + } } } -- cgit