aboutsummaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorReinier Zwitserloot <reinier@zwitserloot.com>2014-03-01 02:14:24 +0100
committerReinier Zwitserloot <reinier@zwitserloot.com>2014-03-01 02:14:59 +0100
commited57bc84b051debe8f8904a5fe90a36c300aa64a (patch)
treee4766c8f2ef4018df598e59e1057019c7c123aa6 /src/core
parent0bd2425b29b3433f8d4b3a9d662119a5430ef183 (diff)
downloadlombok-ed57bc84b051debe8f8904a5fe90a36c300aa64a.tar.gz
lombok-ed57bc84b051debe8f8904a5fe90a36c300aa64a.tar.bz2
lombok-ed57bc84b051debe8f8904a5fe90a36c300aa64a.zip
Updating to new lombok.patcher 'HomeFinder'.
Diffstat (limited to 'src/core')
-rw-r--r--src/core/lombok/core/AnnotationProcessor.java4
-rw-r--r--src/core/lombok/core/PublicApiCreatorApp.java5
2 files changed, 4 insertions, 5 deletions
diff --git a/src/core/lombok/core/AnnotationProcessor.java b/src/core/lombok/core/AnnotationProcessor.java
index e9cf3891..6c61fef2 100644
--- a/src/core/lombok/core/AnnotationProcessor.java
+++ b/src/core/lombok/core/AnnotationProcessor.java
@@ -43,7 +43,7 @@ import javax.lang.model.element.Element;
import javax.lang.model.element.TypeElement;
import javax.tools.Diagnostic.Kind;
-import lombok.patcher.inject.LiveInjector;
+import lombok.patcher.HomeFinder;
@SupportedAnnotationTypes("*")
public class AnnotationProcessor extends AbstractProcessor {
@@ -102,7 +102,7 @@ public class AnnotationProcessor extends AbstractProcessor {
if (environmentClassLoader != null && environmentClassLoader.getClass().getCanonicalName().equals("org.codehaus.plexus.compiler.javac.IsolatedClassLoader")) {
if (lombokAlreadyAddedTo.put(environmentClassLoader, true) == null) {
Method m = environmentClassLoader.getClass().getDeclaredMethod("addURL", URL.class);
- URL selfUrl = new File(LiveInjector.findPathJar(AnnotationProcessor.class)).toURI().toURL();
+ URL selfUrl = new File(HomeFinder.findHomeOfClass(AnnotationProcessor.class)).toURI().toURL();
m.invoke(environmentClassLoader, selfUrl);
}
return environmentClassLoader;
diff --git a/src/core/lombok/core/PublicApiCreatorApp.java b/src/core/lombok/core/PublicApiCreatorApp.java
index 24bcf83d..b776bf8f 100644
--- a/src/core/lombok/core/PublicApiCreatorApp.java
+++ b/src/core/lombok/core/PublicApiCreatorApp.java
@@ -35,8 +35,7 @@ import java.util.jar.JarOutputStream;
import java.util.zip.ZipEntry;
import lombok.Lombok;
-import lombok.installer.IdeFinder;
-import lombok.patcher.inject.LiveInjector;
+import lombok.patcher.HomeFinder;
import org.mangosdk.spi.ProviderFor;
@@ -80,7 +79,7 @@ public class PublicApiCreatorApp extends LombokApp {
* a jar that wasn't accessed via the file-system, or if its started via e.g. unpacking the jar.
*/
private static File findOurJar() {
- return new File(LiveInjector.findPathJar(IdeFinder.class));
+ return new File(HomeFinder.findHomeOfClass(PublicApiCreatorApp.class));
}
private int writeApiJar(File outFile) throws Exception {