Browse Source

Remove deprecated methods

Change-Id: I1f04df7e9dd8dc0e7e2feac701d614a8a888b13c
Reviewed-on: http://gerrit.dmdirc.com/3013
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Build Manager
tags/0.8rc1
Chris Smith 10 years ago
parent
commit
168b2c8af6

+ 0
- 37
src/com/dmdirc/FrameContainer.java View File

@@ -328,8 +328,6 @@ public abstract class FrameContainer {
328 328
         for (FrameCloseListener listener : listeners.get(FrameCloseListener.class)) {
329 329
             listener.windowClosing(this);
330 330
         }
331
-
332
-        windowClosing();
333 331
     }
334 332
 
335 333
     /**
@@ -397,41 +395,6 @@ public abstract class FrameContainer {
397 395
         }
398 396
     }
399 397
 
400
-    /**
401
-     * Invoked when our window is closing.
402
-     * <p>
403
-     * Frame containers must perform the following actions in this order:
404
-     * <ol>
405
-     *  <li>Remove any callbacks or listeners (events should not be processed
406
-     *      once a window has been requested to close)</li>
407
-     *  <li>Trigger any actions necessary (terminating any TCP connections,
408
-     *      disconnecting parsers, closing children, etc)</li>
409
-     *  <li>Trigger action for the window closing (raise a DMDirc action for
410
-     *      the closure of the window, if required)</li>
411
-     *  <li>Inform any parents that the window is closing (this includes
412
-     *      unregistering the window with any specific managers, or from the
413
-     *      parent windows if they track children)</li>
414
-     * </ol>
415
-     *
416
-     * @deprecated Clearing up should be performed in the {@link #close()} method.
417
-     */
418
-    @Deprecated
419
-    protected void windowClosing() {
420
-    }
421
-
422
-    /**
423
-     * Invoked when our window has been closed.
424
-     * <p>
425
-     * At this point, all interested parties have been told that the window
426
-     * has been closed, and therefore any references to frames or other
427
-     * resources may be completely freed.
428
-     *
429
-     * @deprecated Clearing up should be performed in the {@link #close()} method.
430
-     */
431
-    @Deprecated
432
-    public void windowClosed() {
433
-    }
434
-
435 398
     /**
436 399
      * Adds a line to this container's window. If the window is null for some
437 400
      * reason, the line is silently discarded.

+ 0
- 2
src/com/dmdirc/ui/WindowManager.java View File

@@ -241,8 +241,6 @@ public class WindowManager {
241 241
             fireDeleteWindow(parent, window);
242 242
             parent.removeChild(window);
243 243
         }
244
-
245
-        window.windowClosed();
246 244
     }
247 245
 
248 246
     /**

+ 0
- 4
test/com/dmdirc/ui/WindowManagerTest.java View File

@@ -142,7 +142,6 @@ public class WindowManagerTest {
142 142
         manager.removeWindow(container);
143 143
 
144 144
         verify(frameListener).delWindow(container);
145
-        verify(container).windowClosed();
146 145
     }
147 146
 
148 147
     @Test
@@ -157,7 +156,6 @@ public class WindowManagerTest {
157 156
 
158 157
         verify(frameListener).delWindow(container);
159 158
         verify(child).close();
160
-        verify(container).windowClosed();
161 159
     }
162 160
 
163 161
     @Test
@@ -171,7 +169,6 @@ public class WindowManagerTest {
171 169
         manager.removeWindow(child);
172 170
 
173 171
         verify(frameListener).delWindow(container, child);
174
-        verify(child).windowClosed();
175 172
         verify(container).removeChild(child);
176 173
     }
177 174
 
@@ -189,7 +186,6 @@ public class WindowManagerTest {
189 186
 
190 187
         verify(frameListener).delWindow(container, child);
191 188
         verify(grandchild).close();
192
-        verify(child).windowClosed();
193 189
         verify(container).removeChild(child);
194 190
     }
195 191
 

Loading…
Cancel
Save