[Jmri-commits] jmri/jmrit/display MultiSensorIcon.java,1.16,1.17

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

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

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

Index: MultiSensorIcon.java
===================================================================
RCS file: /cvsroot/jmri/jmri/jmrit/display/MultiSensorIcon.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** MultiSensorIcon.java	29 Jun 2009 08:09:23 -0000	1.16
--- MultiSensorIcon.java	30 Jun 2009 07:12:39 -0000	1.17
***************
*** 249,257 ****
          }
      }
-     JFrame editorFrame;
      MultiSensorIconAdder editor;
      void edit() {
!         if (editorFrame != null) {
!             editorFrame.toFront();
              return;
          }
--- 249,256 ----
          }
      }
      MultiSensorIconAdder editor;
      void edit() {
!         if (_editorFrame != null) {
!             _editorFrame.toFront();
              return;
          }
***************
*** 266,270 ****
  //        editor.setMultiIcon(entries);
          editor.setMultiIcon(entries);
!         editorFrame = makeAddIconFrame("EditMultiSensor", "addIconsToPanel", 
                                             "SelectSensor", editor);
          editor.makeIconPanel();
--- 265,269 ----
  //        editor.setMultiIcon(entries);
          editor.setMultiIcon(entries);
!         makeAddIconFrame("EditMultiSensor", "addIconsToPanel", 
                                             "SelectSensor", editor);
          editor.makeIconPanel();
***************
*** 279,283 ****
                  public void actionPerformed(ActionEvent a) {
                      editor.addCatalog();
!                     editorFrame.pack();
                  }
          };
--- 278,282 ----
                  public void actionPerformed(ActionEvent a) {
                      editor.addCatalog();
!                     _editorFrame.pack();
                  }
          };
***************
*** 301,306 ****
          }
          setUpDown(editor.getUpDown());
!         editorFrame.dispose();
!         editorFrame = null;
          editor = null;
          invalidate();
--- 300,305 ----
          }
          setUpDown(editor.getUpDown());
!         _editorFrame.dispose();
!         _editorFrame = null;
          editor = null;
          invalidate();