[vassalengine-svn-trunk] [vassalengine-svn] SF.net SVN: vassalengine:[4963] VASSAL-src/trunk/src/VASSAL/build/module/ WizardSupport.java

[<uck...@us...>]

Revision: 4963
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=4963&view=rev
Author:   uckelman
Date:     2009-01-23 10:03:32 +0000 (Fri, 23 Jan 2009)

Log Message:
-----------
Merged 3.1@4961.
Fixed Bug 2286742: Exception loading tutorial while constructing Welcome Wizard

Modified Paths:
--------------
    VASSAL-src/trunk/src/VASSAL/build/module/WizardSupport.java

Modified: VASSAL-src/trunk/src/VASSAL/build/module/WizardSupport.java
===================================================================
--- VASSAL-src/trunk/src/VASSAL/build/module/WizardSupport.java	2009-01-23 09:55:52 UTC (rev 4962)
+++ VASSAL-src/trunk/src/VASSAL/build/module/WizardSupport.java	2009-01-23 10:03:32 UTC (rev 4963)
@@ -60,10 +60,10 @@
 import javax.swing.JLabel;
 import javax.swing.JList;
 import javax.swing.JRadioButton;
+import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
 
 import org.jdesktop.swingworker.SwingWorker;
-
 import org.netbeans.api.wizard.WizardDisplayer;
 import org.netbeans.spi.wizard.Wizard;
 import org.netbeans.spi.wizard.WizardBranchController;
@@ -297,7 +297,13 @@
         addButton(createPlayOnlineButton(controller, settings), group, box);
         addButton(createLoadSavedGameButton(controller, settings), group, box);
         if (tutorialButton != null) {
-          tutorialButton.doClick();
+          // Select tutorial button by default, but not until wizard is built.  Bug #2286742
+          final JRadioButton clickOnMe = tutorialButton;
+          SwingUtilities.invokeLater(new Runnable() {
+            public void run() {
+              clickOnMe.doClick();
+            }
+          });
           tutorialButton.addItemListener(new ItemListener() {
             public void itemStateChanged(ItemEvent e) {
               if (e.getStateChange() == ItemEvent.DESELECTED) {
@@ -307,8 +313,7 @@
           });
         }
         else if (tutorial != null) {
-          tutorialButton = createTutorialButton(controller, settings);
-          addButton(tutorialButton, group, box);
+          addButton(createTutorialButton(controller, settings), group, box);
         }
         actionControls = box;
         box.add(Box.createVerticalGlue());


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
This SF.net email is sponsored by:
SourcForge Community
SourceForge wants to tell your story.
http://p.sf.net/sfu/sf-spreadtheword
_______________________________________________
vassalengine-svn mailing list
vas...@li...
https://lists.sourceforge.net/lists/listinfo/vassalengine-svn