[Jmri-commits] jmri/jmrit/display SignalHeadIcon.java,1.38,1.39

[Pete C. <pet...@us...>]

Update of /cvsroot/jmri/jmri/jmrit/display
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19607

Modified Files:
	SignalHeadIcon.java 
Log Message:
Window close bug fix

Index: SignalHeadIcon.java
===================================================================
RCS file: /cvsroot/jmri/jmri/jmrit/display/SignalHeadIcon.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** SignalHeadIcon.java	29 Jun 2009 08:07:53 -0000	1.38
--- SignalHeadIcon.java	30 Jun 2009 07:11:06 -0000	1.39
***************
*** 387,411 ****
          }
      }
-     JFrame editorFrame;
-     IconAdder editor;
      void edit() {
!         if (editorFrame != null) {
!             editorFrame.setLocationRelativeTo(null);
!             editorFrame.toFront();
              return;
          }
!         editor = new IconAdder();
!         editor.setIcon(0, "SignalHeadStateFlashingYellow", flashYellow);
!         editor.setIcon(2, "SignalHeadStateFlashingRed", flashRed);
!         editor.setIcon(5, "SignalHeadStateYellow", yellow);
!         editor.setIcon(6, "SignalHeadStateGreen", green);
!         editor.setIcon(1, "SignalHeadStateFlashingGreen", flashGreen);
!         editor.setIcon(4, "SignalHeadStateDark", dark);
!         editor.setIcon(3, "SIgnalHeadStateHeld", held);
!         editor.setIcon(7, "SignalHeadStateRed", red);
!         editorFrame = makeAddIconFrame("EditSignal", "addIconsToPanel", 
!                                            "SelectSignal", editor);
!         editor.makeIconPanel();
!         editor.setPickList(new pickModel(InstanceManager.signalHeadManagerInstance()));
  
          ActionListener addIconAction = new ActionListener() {
--- 387,409 ----
          }
      }
      void edit() {
!         if (_editorFrame != null) {
!             _editorFrame.setLocationRelativeTo(null);
!             _editorFrame.toFront();
              return;
          }
!         _editor = new IconAdder();
!         _editor.setIcon(0, "SignalHeadStateFlashingYellow", flashYellow);
!         _editor.setIcon(2, "SignalHeadStateFlashingRed", flashRed);
!         _editor.setIcon(5, "SignalHeadStateYellow", yellow);
!         _editor.setIcon(6, "SignalHeadStateGreen", green);
!         _editor.setIcon(1, "SignalHeadStateFlashingGreen", flashGreen);
!         _editor.setIcon(4, "SignalHeadStateDark", dark);
!         _editor.setIcon(3, "SIgnalHeadStateHeld", held);
!         _editor.setIcon(7, "SignalHeadStateRed", red);
!         makeAddIconFrame("EditSignal", "addIconsToPanel", 
!                                            "SelectSignal", _editor);
!         _editor.makeIconPanel();
!         _editor.setPickList(new pickModel(InstanceManager.signalHeadManagerInstance()));
  
          ActionListener addIconAction = new ActionListener() {
***************
*** 416,439 ****
          ActionListener changeIconAction = new ActionListener() {
                  public void actionPerformed(ActionEvent a) {
!                     editor.addCatalog();
!                     editorFrame.pack();
                  }
          };
!         editor.complete(addIconAction, changeIconAction, false);
!         editor.setSelection(mHead);
      }
      void updateSignal() {
!         setRedIcon(editor.getIcon("SignalHeadStateRed"));
!         setFlashRedIcon(editor.getIcon("SignalHeadStateFlashingRed"));
!         setYellowIcon(editor.getIcon("SignalHeadStateYellow"));
!         setFlashYellowIcon(editor.getIcon("SignalHeadStateFlashingYellow"));
!         setGreenIcon(editor.getIcon("SignalHeadStateGreen"));
!         setFlashGreenIcon(editor.getIcon("SignalHeadStateFlashingGreen"));
!         setDarkIcon(editor.getIcon("SignalHeadStateDark"));
!         setHeldIcon(editor.getIcon("SIgnalHeadStateHeld"));
!         setSignalHead((SignalHead)editor.getTableSelection());
!         editorFrame.dispose();
!         editorFrame = null;
!         editor = null;
          invalidate();
      }
--- 414,437 ----
          ActionListener changeIconAction = new ActionListener() {
                  public void actionPerformed(ActionEvent a) {
!                     _editor.addCatalog();
!                     _editorFrame.pack();
                  }
          };
!         _editor.complete(addIconAction, changeIconAction, false);
!         _editor.setSelection(mHead);
      }
      void updateSignal() {
!         setRedIcon(_editor.getIcon("SignalHeadStateRed"));
!         setFlashRedIcon(_editor.getIcon("SignalHeadStateFlashingRed"));
!         setYellowIcon(_editor.getIcon("SignalHeadStateYellow"));
!         setFlashYellowIcon(_editor.getIcon("SignalHeadStateFlashingYellow"));
!         setGreenIcon(_editor.getIcon("SignalHeadStateGreen"));
!         setFlashGreenIcon(_editor.getIcon("SignalHeadStateFlashingGreen"));
!         setDarkIcon(_editor.getIcon("SignalHeadStateDark"));
!         setHeldIcon(_editor.getIcon("SIgnalHeadStateHeld"));
!         setSignalHead((SignalHead)_editor.getTableSelection());
!         _editorFrame.dispose();
!         _editorFrame = null;
!         _editor = null;
          invalidate();
      }