[izpack-changes] r1779 - in izpack-src/branches/3.10: . src/lib/com/izforge/izpack/installer

[noreply at berlios.de]

Author: vralev
Date: 2007-03-12 18:40:19 +0100 (Mon, 12 Mar 2007)
New Revision: 1779

Modified:
   izpack-src/branches/3.10/Versions.txt
   izpack-src/branches/3.10/src/lib/com/izforge/izpack/installer/InstallerFrame.java
Log:
Fix: Variables assigned by UserInputPanel are not available when the next page
  nagivations rules are evaluated. http://jira.jboss.com/jira/browse/JBINSTALL-248

Modified: izpack-src/branches/3.10/Versions.txt
===================================================================
--- izpack-src/branches/3.10/Versions.txt	2007-03-11 16:06:56 UTC (rev 1778)
+++ izpack-src/branches/3.10/Versions.txt	2007-03-12 17:40:19 UTC (rev 1779)
@@ -15,6 +15,9 @@
 - Added localization support for column names in InstallationGroupPanel
   (Markus Schlegel via Vladimir Ralev)
 - Finnish langpack update (Ari Voutilainen via Julien Ponge)
+- Fix: Variables assigned by UserInputPanel are not available when the next page
+  nagivations rules are evaluated. http://jira.jboss.com/jira/browse/JBINSTALL-248
+  (Vladimir Ralev)
 
   > 3.10.0 (build 2007.01.29)
 

Modified: izpack-src/branches/3.10/src/lib/com/izforge/izpack/installer/InstallerFrame.java
===================================================================
--- izpack-src/branches/3.10/src/lib/com/izforge/izpack/installer/InstallerFrame.java	2007-03-11 16:06:56 UTC (rev 1778)
+++ izpack-src/branches/3.10/src/lib/com/izforge/izpack/installer/InstallerFrame.java	2007-03-12 17:40:19 UTC (rev 1779)
@@ -1422,6 +1422,11 @@
     {
         if ((installdata.curPanelNumber < installdata.panels.size() - 1))
         {
+            // We must trasfer all fields into the variables before
+            // panelconditions try to resolve the rules based on unassigned vars.
+            boolean isValid = 
+              ((IzPanel) installdata.panels.get(last)).isValidated();
+          
             installdata.curPanelNumber++;
             if (!canShow(installdata.curPanelNumber))
             {
@@ -1430,7 +1435,7 @@
             }
             else
             {
-                if (((IzPanel) installdata.panels.get(last)).isValidated())
+                if (isValid)
                 {
                     switchPanel(last);
                 }