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.
This commit is contained in:
Reinier Zwitserloot committed 2009-12-12 14:28:43 +01:00
1 parent a9c1c99d4e
commit 1e6f5fc892
3 files changed
+5 -3

No files matched your search

@@ -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.
@@ -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);
}
@@ -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() {