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

[noreply at berlios.de]

Author: jponge
Date: 2008-02-01 17:24:56 +0100 (Fri, 01 Feb 2008)
New Revision: 2030

Modified:
   izpack-src/trunk/Versions.txt
   izpack-src/trunk/src/lib/com/izforge/izpack/installer/ProcessPanelWorker.java
   izpack-src/trunk/src/lib/com/izforge/izpack/panels/ProcessPanel.java
Log:
ProcessPanel: the installation success is set to false in case an error has occurred (Julien Ponge)

Modified: izpack-src/trunk/Versions.txt
===================================================================
--- izpack-src/trunk/Versions.txt	2008-01-31 09:51:35 UTC (rev 2029)
+++ izpack-src/trunk/Versions.txt	2008-02-01 16:24:56 UTC (rev 2030)
@@ -104,6 +104,7 @@
 - PacksPanelBase: the packs would be selected / deselected on any list event (e.g., by navigating using the keys).
   This funky behavior has been fixed (Julien Ponge).
 - Changed File.toURL() to File.toURI().toURL() to get rid of deprecation messages in Java 6. (Jeff Gordon)
+- ProcessPanel: the installation success is set to false in case an error has occurred (Julien Ponge)
 
   > 3.10.2 (build 2007.05.11)
 

Modified: izpack-src/trunk/src/lib/com/izforge/izpack/installer/ProcessPanelWorker.java
===================================================================
--- izpack-src/trunk/src/lib/com/izforge/izpack/installer/ProcessPanelWorker.java	2008-01-31 09:51:35 UTC (rev 2029)
+++ izpack-src/trunk/src/lib/com/izforge/izpack/installer/ProcessPanelWorker.java	2008-02-01 16:24:56 UTC (rev 2030)
@@ -412,9 +412,14 @@
 
                     if (exitStatus != 0)
                     {
-                        if (this.handler.askQuestion("process execution failed",
+                        // New bahavior: make it fail
+                        this.handler.emitError("process execution failed", "");
+                        /*if (this.handler.askQuestion("process execution failed",
                                 "Continue anyway?", AbstractUIHandler.CHOICES_YES_NO,
-                                AbstractUIHandler.ANSWER_YES) == AbstractUIHandler.ANSWER_NO) { return false; }
+                                AbstractUIHandler.ANSWER_YES) == AbstractUIHandler.ANSWER_NO)
+                        {
+                            return false;
+                        }*/
                     }
                 }
                 catch (InterruptedException ie)

Modified: izpack-src/trunk/src/lib/com/izforge/izpack/panels/ProcessPanel.java
===================================================================
--- izpack-src/trunk/src/lib/com/izforge/izpack/panels/ProcessPanel.java	2008-01-31 09:51:35 UTC (rev 2029)
+++ izpack-src/trunk/src/lib/com/izforge/izpack/panels/ProcessPanel.java	2008-02-01 16:24:56 UTC (rev 2030)
@@ -161,7 +161,7 @@
         processLabel.setEnabled(false);
 
         validated = true;
-        idata.installSuccess = true;
+        idata.installSuccess = worker.getResult();
         if (idata.panels.indexOf(this) != (idata.panels.size() - 1)) parent.unlockNextButton();
     }