rails-commits

[Stefan F. <ste...@us...>]

Update of /cvsroot/rails/18xx/rails/ui/swing
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv14134/rails/ui/swing

Modified Files:
	StatusWindow.java StartRoundWindow.java 
Log Message:
Fixed bug 1889 won't save in ISR - ID: 3008749

Index: StatusWindow.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/StatusWindow.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** StatusWindow.java	30 May 2010 11:31:47 -0000	1.44
--- StatusWindow.java	10 Jun 2010 20:54:31 -0000	1.45
***************
*** 282,286 ****
              @Override
              public void windowClosing(WindowEvent e) {
!                 if (JOptionPane.showConfirmDialog(frame, "Do you really want to exit the game?", "Select", JOptionPane.OK_CANCEL_OPTION)
                          == JOptionPane.OK_OPTION) {
                      frame.dispose();
--- 282,286 ----
              @Override
              public void windowClosing(WindowEvent e) {
!                 if (JOptionPane.showConfirmDialog(frame, LocalText.getText("CLOSE_WINDOW"), LocalText.getText("Select"), JOptionPane.OK_CANCEL_OPTION)
                          == JOptionPane.OK_OPTION) {
                      frame.dispose();

Index: StartRoundWindow.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/StartRoundWindow.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** StartRoundWindow.java	3 Feb 2010 05:37:55 -0000	1.37
--- StartRoundWindow.java	10 Jun 2010 20:54:31 -0000	1.38
***************
*** 183,190 ****
          setSize(275, 325);
          setVisible(true);
-         setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
          requestFocus();
  
          addKeyListener(this);
  
          pack();
--- 183,190 ----
          setSize(275, 325);
          setVisible(true);
          requestFocus();
  
          addKeyListener(this);
+         
  
          pack();
***************
*** 322,325 ****
--- 322,338 ----
          dummyButton = new ClickField("", "", "", this, itemGroup);
  
+         // set closing behavior and listener
+         setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE );
+         final JFrame thisFrame = this;
+         addWindowListener(new WindowAdapter () {
+             @Override
+             public void windowClosing(WindowEvent e) {
+                 if (JOptionPane.showConfirmDialog(thisFrame, LocalText.getText("CLOSE_WINDOW"), LocalText.getText("Select"), JOptionPane.OK_CANCEL_OPTION)
+                         == JOptionPane.OK_OPTION) {
+                     thisFrame.dispose();
+                     System.exit(0);
+                 }
+             }
+         });
      }