diff options
| author | Reinier Zwitserloot <reinier@tipit.to> | 2009-07-17 18:37:11 +0200 |
|---|---|---|
| committer | Reinier Zwitserloot <reinier@tipit.to> | 2009-07-17 18:37:11 +0200 |
| commit | d13100d6bd29fdbf81a0a4a178033c8a556f17a0 (patch) | |
| tree | 0369326dfb2947fbdeafffdc051f0fa66f93b95c /src/lombok/installer | |
| parent | 63a4938a7da6d49ed4ef182369faffb9e43e5368 (diff) | |
| parent | e81dd1edbf6e23d5e4682f3ce2e04560bbf95e48 (diff) | |
| download | lombok-d13100d6bd29fdbf81a0a4a178033c8a556f17a0.tar.gz lombok-d13100d6bd29fdbf81a0a4a178033c8a556f17a0.tar.bz2 lombok-d13100d6bd29fdbf81a0a4a178033c8a556f17a0.zip | |
Merge branch 'master' of git@github.com:rzwitserloot/lombok
Diffstat (limited to 'src/lombok/installer')
| -rw-r--r-- | src/lombok/installer/EclipseFinder.java | 15 | ||||
| -rw-r--r-- | src/lombok/installer/Installer.java | 1 |
2 files changed, 11 insertions, 5 deletions
diff --git a/src/lombok/installer/EclipseFinder.java b/src/lombok/installer/EclipseFinder.java index 1abebeec..ba3c7e14 100644 --- a/src/lombok/installer/EclipseFinder.java +++ b/src/lombok/installer/EclipseFinder.java @@ -71,7 +71,7 @@ class EclipseFinder { * @return A List of drive letters, such as ["A", "C", "D", "X"]. */ static List<String> getDrivesOnWindows() throws IOException { - ProcessBuilder builder = new ProcessBuilder("c:\\windows\\system32\\fsutil.exe", "fsinfo", "drives"); + ProcessBuilder builder = new ProcessBuilder("fsutil.exe", "fsinfo", "drives"); builder.redirectErrorStream(true); Process process = builder.start(); InputStream in = process.getInputStream(); @@ -81,9 +81,15 @@ class EclipseFinder { String line; while ( (line = br.readLine()) != null ) { - if ( line.startsWith("Drives: ") ) { - line = line.substring(8); - for ( String driveLetter : line.split("\\:\\\\\\s*") ) drives.add(driveLetter.trim()); + if (line.startsWith("Drives:")) { + line = line.substring(7); + } + line = line.trim(); + if (line.isEmpty()) { + continue; + } + for ( String driveLetter : line.split("\\:\\\\\\s*") ) { + drives.add(driveLetter.trim()); } } @@ -135,7 +141,6 @@ class EclipseFinder { static List<String> findEclipseOnWindows() { List<String> eclipses = new ArrayList<String>(); List<String> driveLetters = asList("C"); - try { driveLetters = getDrivesOnWindows(); } catch ( IOException ignore ) {} diff --git a/src/lombok/installer/Installer.java b/src/lombok/installer/Installer.java index 9377f9a5..be746df7 100644 --- a/src/lombok/installer/Installer.java +++ b/src/lombok/installer/Installer.java @@ -300,6 +300,7 @@ public class Installer { JScrollPane eclipsesListScroll = new JScrollPane(eclipsesList); eclipsesListScroll.setBackground(Color.WHITE); + eclipsesListScroll.getViewport().setBackground(Color.WHITE); container.add(eclipsesListScroll, constraints); Thread findEclipsesThread = new Thread() { |