aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReinier Zwitserloot <reinier@tipit.to>2009-12-12 14:25:57 +0100
committerReinier Zwitserloot <reinier@tipit.to>2009-12-12 14:28:43 +0100
commit1e6f5fc892b0ece639dfe1c2d640ee84ce6202d1 (patch)
tree6576d467d2637fdc14087ead76ac3f9673ed7a28
parenta9c1c99d4ed504c5447f8e6b6f17d69254880967 (diff)
downloadlombok-1e6f5fc892b0ece639dfe1c2d640ee84ce6202d1.tar.gz
lombok-1e6f5fc892b0ece639dfe1c2d640ee84ce6202d1.tar.bz2
lombok-1e6f5fc892b0ece639dfe1c2d640ee84ce6202d1.zip
installer fixes:
- when manually specifying paths via the command line installer, each location would get installed/uninstalled twice, and errors would occur if you provided paths with no known IDEs - fixed a problematic earlier checkin regarding STSFinder; now STSFinder looks in all the appropriate spots.
-rw-r--r--src/installer/lombok/installer/IdeLocation.java4
-rw-r--r--src/installer/lombok/installer/Installer.java1
-rw-r--r--src/installer/lombok/installer/eclipse/STSFinder.java3
3 files changed, 5 insertions, 3 deletions
diff --git a/src/installer/lombok/installer/IdeLocation.java b/src/installer/lombok/installer/IdeLocation.java
index e23a0033..f23eef01 100644
--- a/src/installer/lombok/installer/IdeLocation.java
+++ b/src/installer/lombok/installer/IdeLocation.java
@@ -48,6 +48,10 @@ public abstract class IdeLocation {
return new File(LiveInjector.findPathJar(IdeFinder.class));
}
+ @Override public String toString() {
+ return getName();
+ }
+
/**
* Returns a full path to the provided file.
* Returns the canonical path, unless that is not available, in which cae it returns the absolute path.
diff --git a/src/installer/lombok/installer/Installer.java b/src/installer/lombok/installer/Installer.java
index 9ed9e93a..7700cd90 100644
--- a/src/installer/lombok/installer/Installer.java
+++ b/src/installer/lombok/installer/Installer.java
@@ -240,7 +240,6 @@ public class Installer {
IdeLocation loc = tryAllProviders(rawPath);
if (loc != null) locations.add(loc);
else problems.add(new CorruptedIdeLocationException("Can't find any IDE at: " + rawPath, null, null));
- locations.add(tryAllProviders(rawPath));
} catch (CorruptedIdeLocationException e) {
problems.add(e);
}
diff --git a/src/installer/lombok/installer/eclipse/STSFinder.java b/src/installer/lombok/installer/eclipse/STSFinder.java
index 47abb186..15e0404d 100644
--- a/src/installer/lombok/installer/eclipse/STSFinder.java
+++ b/src/installer/lombok/installer/eclipse/STSFinder.java
@@ -57,8 +57,7 @@ public class STSFinder extends EclipseFinder {
}
@Override protected List<String> getSourceDirsOnWindows() {
-// return Arrays.asList("\\", "\\springsource", "\\Program Files", "\\Program Files\\springsource", System.getProperty("user.home", "."), System.getProperty("user.home", ".") + "\\springsource");
- return Arrays.asList();
+ return Arrays.asList("\\", "\\springsource", "\\Program Files", "\\Program Files\\springsource", System.getProperty("user.home", "."), System.getProperty("user.home", ".") + "\\springsource");
}
@Override protected List<String> getSourceDirsOnMac() {