From b1d8d1dfc4856ccd7e89f75c47d308dba0c022c5 Mon Sep 17 00:00:00 2001 From: Roel Spilker Date: Fri, 17 Jul 2009 15:26:09 +0200 Subject: Made the detection of drives more robust on Windows --- src/lombok/installer/EclipseFinder.java | 15 ++++++++++----- 1 file changed, 10 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 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 findEclipseOnWindows() { List eclipses = new ArrayList(); List driveLetters = asList("C"); - try { driveLetters = getDrivesOnWindows(); } catch ( IOException ignore ) {} -- cgit From 9925c04782d78daa401e5f657869fdbdc31129c1 Mon Sep 17 00:00:00 2001 From: Roel Spilker Date: Fri, 17 Jul 2009 15:27:18 +0200 Subject: Made background of found Eclipses white --- src/lombok/installer/Installer.java | 1 + 1 file changed, 1 insertion(+) 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() { -- cgit From e81dd1edbf6e23d5e4682f3ce2e04560bbf95e48 Mon Sep 17 00:00:00 2001 From: Roel Spilker Date: Fri, 17 Jul 2009 16:44:05 +0200 Subject: Changed the generated javadoc to use links to the sun documentation for references to java6 se classes --- build.xml | 1 + lib/javadoc/java6/package-list | 203 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 204 insertions(+) create mode 100644 lib/javadoc/java6/package-list diff --git a/build.xml b/build.xml index f88b2766..7998d148 100644 --- a/build.xml +++ b/build.xml @@ -111,6 +111,7 @@ + Copyright © 2009 Reinier Zwitserloot and Roel Spilker. See LICENCE for more information.]]> diff --git a/lib/javadoc/java6/package-list b/lib/javadoc/java6/package-list new file mode 100644 index 00000000..3e918cda --- /dev/null +++ b/lib/javadoc/java6/package-list @@ -0,0 +1,203 @@ +java.applet +java.awt +java.awt.color +java.awt.datatransfer +java.awt.dnd +java.awt.event +java.awt.font +java.awt.geom +java.awt.im +java.awt.im.spi +java.awt.image +java.awt.image.renderable +java.awt.print +java.beans +java.beans.beancontext +java.io +java.lang +java.lang.annotation +java.lang.instrument +java.lang.management +java.lang.ref +java.lang.reflect +java.math +java.net +java.nio +java.nio.channels +java.nio.channels.spi +java.nio.charset +java.nio.charset.spi +java.rmi +java.rmi.activation +java.rmi.dgc +java.rmi.registry +java.rmi.server +java.security +java.security.acl +java.security.cert +java.security.interfaces +java.security.spec +java.sql +java.text +java.text.spi +java.util +java.util.concurrent +java.util.concurrent.atomic +java.util.concurrent.locks +java.util.jar +java.util.logging +java.util.prefs +java.util.regex +java.util.spi +java.util.zip +javax.accessibility +javax.activation +javax.activity +javax.annotation +javax.annotation.processing +javax.crypto +javax.crypto.interfaces +javax.crypto.spec +javax.imageio +javax.imageio.event +javax.imageio.metadata +javax.imageio.plugins.bmp +javax.imageio.plugins.jpeg +javax.imageio.spi +javax.imageio.stream +javax.jws +javax.jws.soap +javax.lang.model +javax.lang.model.element +javax.lang.model.type +javax.lang.model.util +javax.management +javax.management.loading +javax.management.modelmbean +javax.management.monitor +javax.management.openmbean +javax.management.relation +javax.management.remote +javax.management.remote.rmi +javax.management.timer +javax.naming +javax.naming.directory +javax.naming.event +javax.naming.ldap +javax.naming.spi +javax.net +javax.net.ssl +javax.print +javax.print.attribute +javax.print.attribute.standard +javax.print.event +javax.rmi +javax.rmi.CORBA +javax.rmi.ssl +javax.script +javax.security.auth +javax.security.auth.callback +javax.security.auth.kerberos +javax.security.auth.login +javax.security.auth.spi +javax.security.auth.x500 +javax.security.cert +javax.security.sasl +javax.sound.midi +javax.sound.midi.spi +javax.sound.sampled +javax.sound.sampled.spi +javax.sql +javax.sql.rowset +javax.sql.rowset.serial +javax.sql.rowset.spi +javax.swing +javax.swing.border +javax.swing.colorchooser +javax.swing.event +javax.swing.filechooser +javax.swing.plaf +javax.swing.plaf.basic +javax.swing.plaf.metal +javax.swing.plaf.multi +javax.swing.plaf.synth +javax.swing.table +javax.swing.text +javax.swing.text.html +javax.swing.text.html.parser +javax.swing.text.rtf +javax.swing.tree +javax.swing.undo +javax.tools +javax.transaction +javax.transaction.xa +javax.xml +javax.xml.bind +javax.xml.bind.annotation +javax.xml.bind.annotation.adapters +javax.xml.bind.attachment +javax.xml.bind.helpers +javax.xml.bind.util +javax.xml.crypto +javax.xml.crypto.dom +javax.xml.crypto.dsig +javax.xml.crypto.dsig.dom +javax.xml.crypto.dsig.keyinfo +javax.xml.crypto.dsig.spec +javax.xml.datatype +javax.xml.namespace +javax.xml.parsers +javax.xml.soap +javax.xml.stream +javax.xml.stream.events +javax.xml.stream.util +javax.xml.transform +javax.xml.transform.dom +javax.xml.transform.sax +javax.xml.transform.stax +javax.xml.transform.stream +javax.xml.validation +javax.xml.ws +javax.xml.ws.handler +javax.xml.ws.handler.soap +javax.xml.ws.http +javax.xml.ws.soap +javax.xml.ws.spi +javax.xml.ws.wsaddressing +javax.xml.xpath +org.ietf.jgss +org.omg.CORBA +org.omg.CORBA.DynAnyPackage +org.omg.CORBA.ORBPackage +org.omg.CORBA.TypeCodePackage +org.omg.CORBA.portable +org.omg.CORBA_2_3 +org.omg.CORBA_2_3.portable +org.omg.CosNaming +org.omg.CosNaming.NamingContextExtPackage +org.omg.CosNaming.NamingContextPackage +org.omg.Dynamic +org.omg.DynamicAny +org.omg.DynamicAny.DynAnyFactoryPackage +org.omg.DynamicAny.DynAnyPackage +org.omg.IOP +org.omg.IOP.CodecFactoryPackage +org.omg.IOP.CodecPackage +org.omg.Messaging +org.omg.PortableInterceptor +org.omg.PortableInterceptor.ORBInitInfoPackage +org.omg.PortableServer +org.omg.PortableServer.CurrentPackage +org.omg.PortableServer.POAManagerPackage +org.omg.PortableServer.POAPackage +org.omg.PortableServer.ServantLocatorPackage +org.omg.PortableServer.portable +org.omg.SendingContext +org.omg.stub.java.rmi +org.w3c.dom +org.w3c.dom.bootstrap +org.w3c.dom.events +org.w3c.dom.ls +org.xml.sax +org.xml.sax.ext +org.xml.sax.helpers -- cgit