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

[noreply at berlios.de]

Author: jponge
Date: 2006-12-21 22:06:14 +0100 (Thu, 21 Dec 2006)
New Revision: 1669

Modified:
   izpack-src/trunk/Versions.txt
   izpack-src/trunk/src/lib/com/izforge/izpack/panels/PathInputPanel.java
Log:
TargetPanel.dir setting bug fix (Markus Schlegel via Julien Ponge).

Modified: izpack-src/trunk/Versions.txt
===================================================================
--- izpack-src/trunk/Versions.txt	2006-12-21 21:03:18 UTC (rev 1668)
+++ izpack-src/trunk/Versions.txt	2006-12-21 21:06:14 UTC (rev 1669)
@@ -25,6 +25,7 @@
 - Fix for default button changes when a text field receives focus in UserInputPanel (Vladimir Ralev, JBoss/RedHat, via Dennis Reil)
 - Use the 'ProgramFiles' environment variable to detect the Windows program files folder path.
   (Markus Schlegel via Julien Ponge).
+- TargetPanel.dir setting bug fix (Markus Schlegel via Julien Ponge).
 
   > 3.9.0 (build 2006.09.25)
 - Fix NullPointerException in CompilerConfig, if you specify a 

Modified: izpack-src/trunk/src/lib/com/izforge/izpack/panels/PathInputPanel.java
===================================================================
--- izpack-src/trunk/src/lib/com/izforge/izpack/panels/PathInputPanel.java	2006-12-21 21:03:18 UTC (rev 1668)
+++ izpack-src/trunk/src/lib/com/izforge/izpack/panels/PathInputPanel.java	2006-12-21 21:06:14 UTC (rev 1669)
@@ -278,10 +278,23 @@
             InputStream in = null;
 
             if (OsVersion.IS_WINDOWS)
+            {
+                try
+                {
                 in = parentFrame.getResource("TargetPanel.dir.windows");
-
+                }
+                catch (ResourceNotFoundException rnfe)
+                {}//it's usual, that the resource does not exist
+            }
             else if (OsVersion.IS_OSX)
+            { 
+                try
+                {
                 in = parentFrame.getResource("TargetPanel.dir.macosx");
+                }
+                catch (ResourceNotFoundException rnfe)
+                {}//it's usual, that the resource does not exist
+            }
             else
             {
                 String os = System.getProperty("os.name");
@@ -339,6 +352,8 @@
         }
         catch (Exception e)
         {
+            //mar: what's the common way to log an exception ?
+            e.printStackTrace();
             defaultInstallDir = null;
             // leave unset to take the system default set by Installer class
         }