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

[noreply at berlios.de]

Author: jponge
Date: 2007-01-09 08:14:06 +0100 (Tue, 09 Jan 2007)
New Revision: 1691

Modified:
   izpack-src/trunk/Versions.txt
   izpack-src/trunk/src/lib/com/izforge/izpack/panels/PathInputPanel.java
Log:
PathInputPanel logs a stacktrace on Linux systems when no defaultInstallDir
is specified and no TargetPanel.dir.x resource is present.

Modified: izpack-src/trunk/Versions.txt
===================================================================
--- izpack-src/trunk/Versions.txt	2007-01-07 17:44:24 UTC (rev 1690)
+++ izpack-src/trunk/Versions.txt	2007-01-09 07:14:06 UTC (rev 1691)
@@ -42,6 +42,8 @@
   (Vladimir Ralev, JBoss/RedHat, via Julien Ponge)  
 - PathInputPanel: the close button had incorrect behavior for all path input question/notification messages
   (Vladimir Ralev, JBoss/RedHat, via Julien Ponge)
+- PathInputPanel: logged a stacktrace on Linux systems when no defaultInstallDir was specified and
+  no TargetPanel.dir.x resource was present (Stefan Wachter 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	2007-01-07 17:44:24 UTC (rev 1690)
+++ izpack-src/trunk/src/lib/com/izforge/izpack/panels/PathInputPanel.java	2007-01-09 07:14:06 UTC (rev 1691)
@@ -312,9 +312,6 @@
                 catch (ResourceNotFoundException rnfe)
                 {}
                 // if not specific os, try getting generic 'unix' resource file
-                if (in == null) in = parentFrame.getResource("TargetPanel.dir.unix");
-
-                // if all those failed, try to look up a generic dir file
                 if (in == null)
                 {
                     try
@@ -339,22 +336,22 @@
                 {}
             }
 
-            // now read the file, once we've identified which one to read
             if (in != null)
-			{
-				InputStreamReader isr = new InputStreamReader(in);
-            	br = new BufferedReader(isr);
-            	String line;
-            	while ((line = br.readLine()) != null)
-            	{
-                	line = line.trim();
-                	// use the first non-blank line
-                	if (!"".equals(line)) break;
-            	}
-            	defaultInstallDir = line;
-            	VariableSubstitutor vs = new VariableSubstitutor(idata.getVariables());
-            	defaultInstallDir = vs.substitute(defaultInstallDir, null);
-			}
+            {
+                // now read the file, once we've identified which one to read
+                InputStreamReader isr = new InputStreamReader(in);
+                br = new BufferedReader(isr);
+                String line;
+                while ((line = br.readLine()) != null)
+                {
+                    line = line.trim();
+                    // use the first non-blank line
+                    if (!"".equals(line)) break;
+                }
+                defaultInstallDir = line;
+                VariableSubstitutor vs = new VariableSubstitutor(idata.getVariables());
+                defaultInstallDir = vs.substitute(defaultInstallDir, null);
+            }
         }
         catch (Exception e)
         {