rails-commits

[Erik V. <ev...@us...>]

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

Modified Files:
	CheckBoxDialog.java 
Log Message:
Cancel button made optional (it's probably never used anyway)

Index: CheckBoxDialog.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/elements/CheckBoxDialog.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** CheckBoxDialog.java	28 Mar 2010 20:14:20 -0000	1.8
--- CheckBoxDialog.java	16 Jun 2010 20:59:10 -0000	1.9
***************
*** 31,34 ****
--- 31,35 ----
      boolean selectedOptions[];
      int chosenOption = -1;
+     boolean hasCancelButton = false;
  
      protected static Logger log =
***************
*** 37,45 ****
      public CheckBoxDialog(DialogOwner owner, String title, String message,
              String[] options) {
!         this (owner, title, message, options, null);
      }
  
      public CheckBoxDialog(DialogOwner owner, String title, String message,
!             String[] options, boolean[] selectedOptions) {
          super((Frame) null, title, false); // Non-modal
          this.owner = owner;
--- 38,46 ----
      public CheckBoxDialog(DialogOwner owner, String title, String message,
              String[] options) {
!         this (owner, title, message, options, null, false);
      }
  
      public CheckBoxDialog(DialogOwner owner, String title, String message,
!             String[] options, boolean[] selectedOptions, boolean addCancelButton) {
          super((Frame) null, title, false); // Non-modal
          this.owner = owner;
***************
*** 47,50 ****
--- 48,52 ----
          this.options = options;
          this.numOptions = options.length;
+         this.hasCancelButton = addCancelButton;
          if (selectedOptions != null) {
              this.selectedOptions = selectedOptions;
***************
*** 84,91 ****
          buttonPane.add(okButton);
  
!         cancelButton = new JButton(LocalText.getText("Cancel"));
!         cancelButton.setMnemonic(KeyEvent.VK_C);
!         cancelButton.addActionListener(this);
!         buttonPane.add(cancelButton);
  
          checkBoxes = new JCheckBox[numOptions];
--- 86,95 ----
          buttonPane.add(okButton);
  
!         if (hasCancelButton) {
!             cancelButton = new JButton(LocalText.getText("Cancel"));
!             cancelButton.setMnemonic(KeyEvent.VK_C);
!             cancelButton.addActionListener(this);
!             buttonPane.add(cancelButton);
!         }
  
          checkBoxes = new JCheckBox[numOptions];