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

[noreply at berlios.de]

Author: jponge
Date: 2008-01-12 12:13:15 +0100 (Sat, 12 Jan 2008)
New Revision: 1978

Modified:
   izpack-src/trunk/src/build.xml
   izpack-src/trunk/src/lib/com/izforge/izpack/panels/PacksPanelAutomationHelper.java
   izpack-src/trunk/src/lib/com/izforge/izpack/util/FileExecutor.java
Log:
- build.xml: include the new L&F jars (Jeff Gordon via Julien Ponge)
- FileExecutor: fix a blank dialog prompting the user to continue if there's a failure (Jeff Gordon via Julien Ponge)
- Italian translation update (Roberto Boriotti, Sylvain Gaudard via Julien Ponge)
- PacksPanelAutomationHelper fix (Jeff Gordon via Julien Ponge)


Modified: izpack-src/trunk/src/build.xml
===================================================================
--- izpack-src/trunk/src/build.xml	2008-01-09 17:18:48 UTC (rev 1977)
+++ izpack-src/trunk/src/build.xml	2008-01-12 11:13:15 UTC (rev 1978)
@@ -362,6 +362,8 @@
                 <include name="lib/metouia.jar" />
                 <include name="lib/looks.jar" />
                 <include name="lib/ant.jar" />
+                <include name="lib/nimbus.jar" />
+                <include name="lib/substance.jar" />
                 <exclude name="**/CVS" />
             </fileset>
         </jar>

Modified: izpack-src/trunk/src/lib/com/izforge/izpack/panels/PacksPanelAutomationHelper.java
===================================================================
--- izpack-src/trunk/src/lib/com/izforge/izpack/panels/PacksPanelAutomationHelper.java	2008-01-09 17:18:48 UTC (rev 1977)
+++ izpack-src/trunk/src/lib/com/izforge/izpack/panels/PacksPanelAutomationHelper.java	2008-01-12 11:13:15 UTC (rev 1978)
@@ -98,7 +98,10 @@
                         int index = Integer.parseInt(index_str);
                         if ((index >= 0) && (index < idata.availablePacks.size()))
                         {
+                          if (el.getAttribute("selected").equalsIgnoreCase("true") ||
+                              el.getAttribute("selected").equalsIgnoreCase("on")) {
                             idata.selectedPacks.add(idata.availablePacks.get(index));
+                          }
                         }
                         else
                         {

Modified: izpack-src/trunk/src/lib/com/izforge/izpack/util/FileExecutor.java
===================================================================
--- izpack-src/trunk/src/lib/com/izforge/izpack/util/FileExecutor.java	2008-01-09 17:18:48 UTC (rev 1977)
+++ izpack-src/trunk/src/lib/com/izforge/izpack/util/FileExecutor.java	2008-01-12 11:13:15 UTC (rev 1978)
@@ -337,7 +337,7 @@
                     else
                     {
                         if (handler
-                                .askQuestion(null, "Continue?", AbstractUIHandler.CHOICES_YES_NO) == AbstractUIHandler.ANSWER_YES)
+                                .askQuestion("Execution Failed", message+"\nContinue Installation?", AbstractUIHandler.CHOICES_YES_NO) == AbstractUIHandler.ANSWER_YES)
                             exitStatus = 0;
                     }