geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmcma...@apache.org
Subject svn commit: r562246 - /geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.ui/src/org/apache/geronimo/j2g/ui/Jsrc2gLauncher.java
Date Thu, 02 Aug 2007 20:37:03 GMT
Author: pmcmahan
Date: Thu Aug  2 13:37:02 2007
New Revision: 562246

URL: http://svn.apache.org/viewvc?view=rev&rev=562246
Log:
GERONIMO-3342 Fix an accidental double check for eclipse_home in the jsrc2glauncher.  Patch
provided by Erik Craig.

Modified:
    geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.ui/src/org/apache/geronimo/j2g/ui/Jsrc2gLauncher.java

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.ui/src/org/apache/geronimo/j2g/ui/Jsrc2gLauncher.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.ui/src/org/apache/geronimo/j2g/ui/Jsrc2gLauncher.java?view=diff&rev=562246&r1=562245&r2=562246
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.ui/src/org/apache/geronimo/j2g/ui/Jsrc2gLauncher.java
(original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.ui/src/org/apache/geronimo/j2g/ui/Jsrc2gLauncher.java
Thu Aug  2 13:37:02 2007
@@ -75,28 +75,29 @@
         String cmdOutput = null;
         String[] cmd = new String[3];
 
-        // Check environment for eclipse home
+        // Check environment for Eclipse dir.
         eclipseHomePath = System.getenv("ECLIPSE_HOME");
         if (eclipseHomePath == null) {
             prompt.setMessage("'ECLIPSE_HOME' was not found in your environment.\n"
-                    + "Please select the location of your Eclipse SDK now.");
+                    + "Please set it and relaunch Eclipse.");
             prompt.open();
-            fd.setMessage("Select Eclipse SDK directory");
-            fd.setText("Select Eclipse SDK directory");
-            fd.setFilterPath(System.getProperty("user.home"));
-            fdselected = fd.open();
-            if (fdselected == null)
-                return;
-            eclipseHomePath = fdselected;
+            return;
         }
 
+
         // Check environment for Workspace dir.
-        eclipseHomePath = System.getenv("ECLIPSE_HOME");
-        if (eclipseHomePath == null) {
-            prompt.setMessage("'ECLIPSE_HOME' was not found in your environment.\n"
-                    + "Please set it and relaunch Eclipse.");
+        eclipseWorkspacePath = System.getenv("WORKSPACE");
+        if (eclipseWorkspacePath == null) {
+            prompt.setMessage("'WORKSPACE' was not found in your environment.\n"
+                    + "Please select the location of your temporary Eclipse Workspace now.");
             prompt.open();
-            return;
+            fd.setMessage("Select Eclipse Workspace directory");
+            fd.setText("Select Eclipse Workspace directory");
+            fd.setFilterPath(System.getProperty("user.home"));
+            fdselected = fd.open();
+            if (fdselected == null)
+                return;
+            eclipseWorkspacePath = fdselected;
         }
 
         // Check environment for Geronimo Home



Mime
View raw message