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

[noreply at berlios.de]

Author: dreil
Date: 2006-12-07 12:04:26 +0100 (Thu, 07 Dec 2006)
New Revision: 1665

Modified:
   izpack-src/trunk/Versions.txt
   izpack-src/trunk/src/lib/com/izforge/izpack/installer/InstallerFrame.java
Log:
Fix for default button changes when a text field receives focus in UserInputPanel (by Vladimir Ralev, JBoss/RedHat)


Modified: izpack-src/trunk/Versions.txt
===================================================================
--- izpack-src/trunk/Versions.txt	2006-12-06 15:31:46 UTC (rev 1664)
+++ izpack-src/trunk/Versions.txt	2006-12-07 11:04:26 UTC (rev 1665)
@@ -20,6 +20,7 @@
 - UserInputPanel multiline label fix (Vladimir Ralev, JBoss/RedHat, via Julien Ponge)
 - Fix for calling the IzPack Ant task from Maven builds (Vladimir Ralev, JBoss/RedHat, via Julien Ponge)
 - Support for uncompressing archives and adding their content at the installer generation time (Nils Meier, via Julien Ponge)
+- Fix for default button changes when a text field receives focus in UserInputPanel (Vladimir Ralev, JBoss/RedHat, via Dennis Reil)
 
   > 3.9.0 (build 2006.09.25)
 - Fix NullPointerException in CompilerConfig, if you specify a 

Modified: izpack-src/trunk/src/lib/com/izforge/izpack/installer/InstallerFrame.java
===================================================================
--- izpack-src/trunk/src/lib/com/izforge/izpack/installer/InstallerFrame.java	2006-12-06 15:31:46 UTC (rev 1664)
+++ izpack-src/trunk/src/lib/com/izforge/izpack/installer/InstallerFrame.java	2006-12-07 11:04:26 UTC (rev 1665)
@@ -724,12 +724,20 @@
 
                 public void run()
                 {
-                    JButton cdb = null;
-                    if (nextButton.isEnabled())
-                        cdb = nextButton;
-                    else if (quitButton.isEnabled()) cdb = quitButton;
-                    getRootPane().setDefaultButton(cdb);
-                }
+                   JButton cdb = null;
+                   if (nextButton.isEnabled()) {
+                     cdb = nextButton;
+                     quitButton.setDefaultCapable(false);
+                     prevButton.setDefaultCapable(false);
+                     nextButton.setDefaultCapable(true);
+                   } else if (quitButton.isEnabled()) {
+                     cdb = quitButton;
+                     quitButton.setDefaultCapable(true);
+                     prevButton.setDefaultCapable(false);
+                     nextButton.setDefaultCapable(false);
+                   }
+                   getRootPane().setDefaultButton(cdb);
+                 }
             });
 
             // Change panels container to the current one.