3 files changed, 7 insertions, 13 deletions
diff --git a/src/installer/lombok/installer/IdeLocation.java b/src/installer/lombok/installer/IdeLocation.java
index 4d28fb90..4e3a7e41 100644
--- a/src/installer/lombok/installer/IdeLocation.java
+++ b/src/installer/lombok/installer/IdeLocation.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
@@ -26,7 +26,7 @@ import java.io.IOException;
 import java.net.URL;
 
 import lombok.installer.eclipse.EclipseFinder;
-import lombok.patcher.inject.LiveInjector;
+import lombok.patcher.ClassRootFinder;
 
 /**
  * Represents a location that contains an IDE.
@@ -46,7 +46,7 @@ public abstract class IdeLocation {
 	 * a jar that wasn't accessed via the file-system, or if its started via e.g. unpacking the jar.
 	 */
 	public static File findOurJar() {
-		return new File(LiveInjector.findPathJar(IdeFinder.class));
+		return new File(ClassRootFinder.findClassRootOfClass(IdeFinder.class));
 	}
 	
 	@Override public String toString() {
diff --git a/src/installer/lombok/installer/Installer.java b/src/installer/lombok/installer/Installer.java
index 29ffde89..b9faeebd 100644
--- a/src/installer/lombok/installer/Installer.java
+++ b/src/installer/lombok/installer/Installer.java
@@ -39,7 +39,7 @@ import lombok.core.LombokApp;
 import lombok.core.SpiLoadUtil;
 import lombok.core.Version;
 import lombok.installer.IdeFinder.OS;
-import lombok.patcher.inject.LiveInjector;
+import lombok.patcher.ClassRootFinder;
 
 import org.mangosdk.spi.ProviderFor;
 
@@ -101,7 +101,7 @@ public class Installer {
 	}
 	
 	public static boolean isSelf(String jar) {
-		String self = LiveInjector.findPathJar(Installer.class);
+		String self = ClassRootFinder.findClassRootOfClass(Installer.class);
 		if (self == null) return false;
 		File a = new File(jar).getAbsoluteFile();
 		File b = new File(self).getAbsoluteFile();
diff --git a/src/installer/lombok/installer/InstallerGUI.java b/src/installer/lombok/installer/InstallerGUI.java
index 69630793..5717948a 100644
--- a/src/installer/lombok/installer/InstallerGUI.java
+++ b/src/installer/lombok/installer/InstallerGUI.java
@@ -793,7 +793,7 @@ public class InstallerGUI {
 		"<html><font size=\"+1\"><b><i>IDEs</i></b></font></html>";
 	
 	private static final String IDE_EXPLANATION =
-		"<html>Lombok can update your Eclipse and Netbeans to fully support all Lombok features.<br>" +
+		"<html>Lombok can update your Eclipse or eclipse-based IDE to fully support all Lombok features.<br>" +
 		"Select IDE installations below and hit 'Install/Update'.</html>";
 	
 	private static final String IDE_LOADING_EXPLANATION =
@@ -824,13 +824,7 @@ public class InstallerGUI {
 		"<pre>-Xbootclasspath/a:lombok.jar<br>" +
 		"-javaagent:lombok.jar</pre></li></ol>" +
 		"On Mac OS X, eclipse.ini is hidden in<br>" +
-		"<code>Eclipse.app/Contents/MacOS</code> so that's where I place the jar files.<p>" +
-		"<h2>Netbeans</h2><ol>" +
-		"<li>First, I copy myself (lombok.jar) to your Netbeans install directory.</li>" +
-		"<lI>Then, I edit <i>etc%1$snetbeans.conf</i> to add the following argument to<br><b>netbeans_default_options</b>:<br>" +
-		"<pre>-J-javaagent:lombok.jar</pre></li></ol>" +
-		"On Mac OS X, your netbeans directory is hidden in<br>" +
-		"<code>NetBeans.app/Contents/Resources/NetBeans</code></html>";
+		"<code>Eclipse.app/Contents/MacOS</code> so that's where I place the jar files.</html>";
 	
 	private static class JHyperLink extends JButton {
 		private static final long serialVersionUID = 1L;