[Jmri-commits] jmri/jmrit/display ReporterIcon.java,1.13,1.14

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

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

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

Index: ReporterIcon.java
===================================================================
RCS file: /cvsroot/jmri/jmri/jmrit/display/ReporterIcon.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** ReporterIcon.java	29 Jun 2009 08:08:17 -0000	1.13
--- ReporterIcon.java	30 Jun 2009 07:11:29 -0000	1.14
***************
*** 148,160 ****
          }
      }
-     JFrame editorFrame;
-     IconAdder editor;
      void edit() {
!         if (editorFrame != null) {
!             editorFrame.setLocationRelativeTo(null);
!             editorFrame.toFront();
              return;
          }
!         editor = new IconAdder();
          ActionListener addIconAction = new ActionListener() {
              public void actionPerformed(ActionEvent a) {
--- 148,158 ----
          }
      }
      void edit() {
!         if (_editorFrame != null) {
!             _editorFrame.setLocationRelativeTo(null);
!             _editorFrame.toFront();
              return;
          }
!         _editor = new IconAdder();
          ActionListener addIconAction = new ActionListener() {
              public void actionPerformed(ActionEvent a) {
***************
*** 162,178 ****
              }
          };
!         editorFrame = makeAddIconFrame("EditReporter", "addReportValueToPanel", 
!                                      "SelectReporter", editor);
!         editor.setPickList(new pickModel(InstanceManager.reporterManagerInstance()));
!         editor.complete(addIconAction, null, true);
!         editor.setSelection(reporter);
  
      }
      void editReporter() {
!         setReporter((Reporter)editor.getTableSelection());
          setSize(getPreferredSize().width, getPreferredSize().height);
!         editorFrame.dispose();
!         editorFrame = null;
!         editor = null;
          invalidate();
      }
--- 160,176 ----
              }
          };
!         makeAddIconFrame("EditReporter", "addReportValueToPanel", 
!                                      "SelectReporter", _editor);
!         _editor.setPickList(new pickModel(InstanceManager.reporterManagerInstance()));
!         _editor.complete(addIconAction, null, true);
!         _editor.setSelection(reporter);
  
      }
      void editReporter() {
!         setReporter((Reporter)_editor.getTableSelection());
          setSize(getPreferredSize().width, getPreferredSize().height);
!         _editorFrame.dispose();
!         _editorFrame = null;
!         _editor = null;
          invalidate();
      }