[izpack-changes] r1952 - in izpack-src/trunk: . src/lib/com/izforge/izpack/panels

[noreply at berlios.de]

Author: jponge
Date: 2007-12-13 13:16:47 +0100 (Thu, 13 Dec 2007)
New Revision: 1952

Modified:
   izpack-src/trunk/Versions.txt
   izpack-src/trunk/src/lib/com/izforge/izpack/panels/JDKPathPanel.java
   izpack-src/trunk/src/lib/com/izforge/izpack/panels/PathInputPanel.java
Log:
- JDKPathPanel: Mac OS X fix (Julien Ponge)
- PathInputPanel: add some space between the text and the input field (Julien Ponge)


Modified: izpack-src/trunk/Versions.txt
===================================================================
--- izpack-src/trunk/Versions.txt	2007-12-12 18:17:00 UTC (rev 1951)
+++ izpack-src/trunk/Versions.txt	2007-12-13 12:16:47 UTC (rev 1952)
@@ -66,6 +66,8 @@
 - Added built-in conditions (Dennis Reil)
 - ProcessPanel: make the progress bar advance after the current process has run, not before
   (Julien Ponge)
+- JDKPathPanel: Mac OS X fix (Julien Ponge)
+- PathInputPanel: add some space between the text and the input field (Julien Ponge)
 
   
   > 3.10.2 (build 2007.05.11)

Modified: izpack-src/trunk/src/lib/com/izforge/izpack/panels/JDKPathPanel.java
===================================================================
--- izpack-src/trunk/src/lib/com/izforge/izpack/panels/JDKPathPanel.java	2007-12-12 18:17:00 UTC (rev 1951)
+++ izpack-src/trunk/src/lib/com/izforge/izpack/panels/JDKPathPanel.java	2007-12-13 12:16:47 UTC (rev 1952)
@@ -55,6 +55,8 @@
     
     private static final String JDK_VALUE_NAME = "JavaHome";
 
+    private static final String OSX_JDK_HOME = "/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home/";
+
     private static final int OK = 0;
     private static final int BAD_VERSION = 1;
     private static final int BAD_REAL_PATH = 2;
@@ -157,8 +159,17 @@
         if (idata.getVariable(getVariableName()) != null)
             chosenPath = idata.getVariable(getVariableName());
         else
-            // Try the JAVA_HOME as child dir of the jdk path
-            chosenPath = (new File(idata.getVariable("JAVA_HOME"))).getParent();
+        {
+            if (OsVersion.IS_OSX)
+            {
+                chosenPath = OSX_JDK_HOME;
+            }
+            else
+            {
+                // Try the JAVA_HOME as child dir of the jdk path
+                chosenPath = (new File(idata.getVariable("JAVA_HOME"))).getParent();
+            }
+        }
         // Set the path for method pathIsValid ...
         pathSelectionPanel.setPath(chosenPath);
 

Modified: izpack-src/trunk/src/lib/com/izforge/izpack/panels/PathInputPanel.java
===================================================================
--- izpack-src/trunk/src/lib/com/izforge/izpack/panels/PathInputPanel.java	2007-12-12 18:17:00 UTC (rev 1951)
+++ izpack-src/trunk/src/lib/com/izforge/izpack/panels/PathInputPanel.java	2007-12-13 12:16:47 UTC (rev 1952)
@@ -96,6 +96,9 @@
         // Intro
         // row 0 column 0
         add(createMultiLineLabel(introText));
+
+        add(IzPanelLayout.createParagraphGap());
+
         // Label for input
         // row 1 column 0.
         add(createLabel("info", "TargetPanel", "open",