From 7d10aad6a6431680da557e6b5045595139abd636 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Thu, 27 Feb 2014 02:57:16 +0100 Subject: Updating some of the wording in the installer, notably any hint that this thing still does anything for netbeans. --- src/installer/lombok/installer/InstallerGUI.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'src/installer') 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 { "IDEs"; private static final String IDE_EXPLANATION = - "Lombok can update your Eclipse and Netbeans to fully support all Lombok features.
" + + "Lombok can update your Eclipse or eclipse-based IDE to fully support all Lombok features.
" + "Select IDE installations below and hit 'Install/Update'."; private static final String IDE_LOADING_EXPLANATION = @@ -824,13 +824,7 @@ public class InstallerGUI { "
-Xbootclasspath/a:lombok.jar
" +
 		"-javaagent:lombok.jar
" + "On Mac OS X, eclipse.ini is hidden in
" + - "Eclipse.app/Contents/MacOS so that's where I place the jar files.

" + - "

Netbeans

    " + - "
  1. First, I copy myself (lombok.jar) to your Netbeans install directory.
    2. " + - "
  2. Then, I edit etc%1$snetbeans.conf to add the following argument to
    netbeans_default_options:
    " + - "
    -J-javaagent:lombok.jar
" + - "On Mac OS X, your netbeans directory is hidden in
" + - "NetBeans.app/Contents/Resources/NetBeans"; + "Eclipse.app/Contents/MacOS so that's where I place the jar files."; private static class JHyperLink extends JButton { private static final long serialVersionUID = 1L; -- cgit From ed57bc84b051debe8f8904a5fe90a36c300aa64a Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Sat, 1 Mar 2014 02:14:24 +0100 Subject: Updating to new lombok.patcher 'HomeFinder'. --- src/installer/lombok/installer/IdeLocation.java | 6 +++--- src/installer/lombok/installer/Installer.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/installer') diff --git a/src/installer/lombok/installer/IdeLocation.java b/src/installer/lombok/installer/IdeLocation.java index 4d28fb90..ea1f470f 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.HomeFinder; /** * 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(HomeFinder.findHomeOfClass(IdeFinder.class)); } @Override public String toString() { diff --git a/src/installer/lombok/installer/Installer.java b/src/installer/lombok/installer/Installer.java index 29ffde89..4050ad95 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.HomeFinder; 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 = HomeFinder.findHomeOfClass(Installer.class); if (self == null) return false; File a = new File(jar).getAbsoluteFile(); File b = new File(self).getAbsoluteFile(); -- cgit From fbab1ca77cb8306843e26c5bad91186b34563282 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Sat, 1 Mar 2014 02:55:46 +0100 Subject: yet another patcher-sourced fix, heh. Version-a-day! --- src/installer/lombok/installer/IdeLocation.java | 4 ++-- src/installer/lombok/installer/Installer.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/installer') diff --git a/src/installer/lombok/installer/IdeLocation.java b/src/installer/lombok/installer/IdeLocation.java index ea1f470f..4e3a7e41 100644 --- a/src/installer/lombok/installer/IdeLocation.java +++ b/src/installer/lombok/installer/IdeLocation.java @@ -26,7 +26,7 @@ import java.io.IOException; import java.net.URL; import lombok.installer.eclipse.EclipseFinder; -import lombok.patcher.HomeFinder; +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(HomeFinder.findHomeOfClass(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 4050ad95..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.HomeFinder; +import lombok.patcher.ClassRootFinder; import org.mangosdk.spi.ProviderFor; @@ -101,7 +101,7 @@ public class Installer { } public static boolean isSelf(String jar) { - String self = HomeFinder.findHomeOfClass(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(); -- cgit