chore: attempt to ensure editor is disposed of

JMRI · Mar 10, 2019 · 12d44e9 · 12d44e9
1 parent ef29dd7
commit 12d44e9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/java/test/jmri/jmrit/display/PositionableTestBase.java b/java/test/jmri/jmrit/display/PositionableTestBase.java
@@ -23,20 +23,25 @@ abstract public class PositionableTestBase {
 
     // Should do JUnitUtil.setUp() in subclass to make sure it's before anything
     @Before
-    abstract public void setUp(); 
+    abstract public void setUp();
 
     // Should do JUnitUtil.tearDown() in subclass to make sure it's after everything
     @After
     @javax.annotation.OverridingMethodsMustInvokeSuper 
     public void tearDown() {
         // now close panel window, if it exists
         if (editor != null) {
-            java.awt.event.WindowListener[] listeners = editor.getTargetFrame().getWindowListeners();
-            for (WindowListener listener : listeners) {
-                editor.getTargetFrame().removeWindowListener(listener);
+            JFrame target = editor.getTargetFrame();
+            if (target != null) {
+                java.awt.event.WindowListener[] listeners = target.getWindowListeners();
+                for (WindowListener listener : listeners) {
+                    target.removeWindowListener(listener);
+                }
+                if (!editor.equals(target)) {
+                    JUnitUtil.dispose(target);
+                }
             }
-            EditorFrameOperator jfo = new EditorFrameOperator(editor);
-            jfo.requestClose();
+            JUnitUtil.dispose(editor);
         }
         JUnitUtil.resetWindows(false, false);  // don't log here.  should be from this class.
         editor = null;

diff --git a/java/test/jmri/server/json/util/JsonUtilSocketServiceTest.java b/java/test/jmri/server/json/util/JsonUtilSocketServiceTest.java
@@ -27,7 +27,6 @@
 import jmri.server.json.JsonMockConnection;
 import jmri.util.FileUtil;
 import jmri.util.JUnitUtil;
-import jmri.util.ThreadingUtil;
 import jmri.web.server.WebServerPreferences;
 
 /**