Bläddra i källkod

Window closing changes

Depends-On: I21615028be7c8569877686e6a4644e765b8426ee
Change-Id: If107303392a13a2b0fdbb1238f4f95b19b985335
Reviewed-on: http://gerrit.dmdirc.com/893
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>
Reviewed-by: Gregory Holmes <greg@dmdirc.com>
tags/0.6.3
Chris Smith 14 år sedan
förälder
incheckning
101c88319c

+ 4
- 0
src/com/dmdirc/addons/dcc/DCCFrame.java Visa fil

@@ -231,7 +231,11 @@ public abstract class DCCFrame extends WritableFrameContainer {
231 231
 
232 232
         // 6: Remove the window from the window manager
233 233
         WindowManager.removeWindow(myWindow);
234
+    }
234 235
 
236
+    /** {@inheritDoc} */
237
+    @Override
238
+    public void windowClosed() {
235 239
         // 7: Remove any references to the window and parents
236 240
         myWindow = null; // NOPMD
237 241
     }

+ 4
- 0
src/com/dmdirc/addons/logging/HistoryWindow.java Visa fil

@@ -85,7 +85,11 @@ public class HistoryWindow extends FrameContainer {
85 85
 
86 86
         // 6: Remove the window from the window manager
87 87
         WindowManager.removeWindow(window);
88
+    }
88 89
 
90
+    /** {@inheritDoc} */
91
+    @Override
92
+    public void windowClosed() {
89 93
         // 7: Remove any references to the window and parents
90 94
         window = null; // NOPMD
91 95
         parent = null; // NOPMD

+ 2
- 10
src/com/dmdirc/addons/ui_swing/components/frames/TextFrame.java Visa fil

@@ -695,15 +695,7 @@ public abstract class TextFrame extends JInternalFrame implements Window,
695 695
      */
696 696
     @Override
697 697
     public void internalFrameClosed(final InternalFrameEvent event) {
698
-        new LoggingSwingWorker() {
699
-
700
-            /** {@inheritDoc} */
701
-            @Override
702
-            protected Object doInBackground() throws Exception {
703
-                frameParent.windowClosed();
704
-                return null;
705
-            }
706
-        }.execute();
698
+        //Ignore.
707 699
     }
708 700
 
709 701
     /**
@@ -730,7 +722,7 @@ public abstract class TextFrame extends JInternalFrame implements Window,
730 722
     @Override
731 723
     public void internalFrameDeiconified(final InternalFrameEvent event) {
732 724
         //Ignore.
733
-        }
725
+    }
734 726
 
735 727
     /**
736 728
      * Activates the input field on frame focus. {@inheritDoc}

Laddar…
Avbryt
Spara