From 7d0b13024de36cf5a7d9222e8d6f9acf8ca9b04d Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Mon, 2 Jan 2012 20:30:48 +0100 Subject: Fixed issue #320: since 0.10.6, lombok didn't work anymore in ecj (ClassNotFoundError). --- src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/eclipseAgent') diff --git a/src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java b/src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java index 1a3828c1..f6565086 100644 --- a/src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java +++ b/src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2011 The Project Lombok Authors. + * Copyright (C) 2009-2012 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 @@ -178,6 +178,7 @@ public class EclipsePatcher extends Agent { .target(new MethodTarget("org.eclipse.jdt.internal.compiler.tool.EclipseCompilerImpl", "outputClassFiles")) .methodToWrap(new Hook("javax.tools.JavaFileObject", "openOutputStream", "java.io.OutputStream")) .wrapMethod(new Hook("lombok.eclipse.agent.PatchFixes", "runPostCompiler", "java.io.OutputStream", "java.io.OutputStream")) + .transplant() .build()); sm.addScript(ScriptBuilder.wrapMethodCall() @@ -185,6 +186,7 @@ public class EclipsePatcher extends Agent { .methodToWrap(new Hook("java.io.BufferedOutputStream", "", "void", "java.io.OutputStream", "int")) .wrapMethod(new Hook("lombok.eclipse.agent.PatchFixes", "runPostCompiler", "java.io.BufferedOutputStream", "java.io.BufferedOutputStream", "java.lang.String", "java.lang.String")) .requestExtra(StackRequest.PARAM2, StackRequest.PARAM3) + .transplant() .build()); } @@ -355,6 +357,7 @@ public class EclipsePatcher extends Agent { "org.eclipse.jdt.internal.compiler.ast.MethodDeclaration", "org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration")) .decisionMethod(new Hook("lombok.eclipse.agent.PatchFixes", "checkBit24", "boolean", "java.lang.Object")) + .transplant() .request(StackRequest.PARAM1).build()); sm.addScript(ScriptBuilder.exitEarly() @@ -362,6 +365,7 @@ public class EclipsePatcher extends Agent { "org.eclipse.jdt.internal.compiler.ast.ConstructorDeclaration", "org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration", "boolean")) .decisionMethod(new Hook("lombok.eclipse.agent.PatchFixes", "checkBit24", "boolean", "java.lang.Object")) + .transplant() .request(StackRequest.PARAM1).build()); sm.addScript(ScriptBuilder.exitEarly() @@ -370,6 +374,7 @@ public class EclipsePatcher extends Agent { "org.eclipse.jdt.internal.compiler.ast.TypeDeclaration", "org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration")) .decisionMethod(new Hook("lombok.eclipse.agent.PatchFixes", "checkBit24", "boolean", "java.lang.Object")) + .transplant() .request(StackRequest.PARAM1).build()); } -- cgit