Browse Source

Make Connection return a WindowModel.

Start to move FrameContainers behind an iface so they can be
pulled out.

For now, just cast back when needed.
pull/360/head
Chris Smith 9 years ago
parent
commit
a379f544a9

+ 1
- 1
debug/src/com/dmdirc/addons/debug/RawWindow.java View File

@@ -56,7 +56,7 @@ public class RawWindow extends FrameContainer {
56 56
             final MessageSinkManager messageSinkManager,
57 57
             final TabCompleterFactory tabCompleterFactory,
58 58
             final BackBufferFactory backBufferFactory) {
59
-        super(connection.getWindowModel(), "raw", "Raw", "(Raw log)",
59
+        super((FrameContainer) connection.getWindowModel(), "raw", "Raw", "(Raw log)",
60 60
                 connection.getWindowModel().getConfigManager(),
61 61
                 backBufferFactory,
62 62
                 new ServerCommandParser(

+ 2
- 1
debug/src/com/dmdirc/addons/debug/RawWindowFactory.java View File

@@ -22,6 +22,7 @@
22 22
 
23 23
 package com.dmdirc.addons.debug;
24 24
 
25
+import com.dmdirc.FrameContainer;
25 26
 import com.dmdirc.interfaces.CommandController;
26 27
 import com.dmdirc.interfaces.Connection;
27 28
 import com.dmdirc.ui.WindowManager;
@@ -58,7 +59,7 @@ public class RawWindowFactory {
58 59
     public RawWindow getRawWindow(final Connection connection) {
59 60
         final RawWindow rawWindow = new RawWindow(connection, commandController,
60 61
                 messageSinkManager, tabCompleterFactory,  backBufferFactory);
61
-        windowManager.addWindow(connection.getWindowModel(), rawWindow);
62
+        windowManager.addWindow((FrameContainer) connection.getWindowModel(), rawWindow);
62 63
         return rawWindow;
63 64
     }
64 65
 

+ 1
- 1
parserdebug/src/com/dmdirc/addons/parserdebug/DebugWindow.java View File

@@ -56,7 +56,7 @@ public class DebugWindow extends FrameContainer {
56 56
             final Connection connection,
57 57
             final DMDircMBassador eventBus,
58 58
             final BackBufferFactory backBufferFactory) {
59
-        super(connection.getWindowModel(), "raw", "Parser Debug", title,
59
+        super((FrameContainer) connection.getWindowModel(), "raw", "Parser Debug", title,
60 60
                 connection.getWindowModel().getConfigManager(), backBufferFactory,
61 61
                 eventBus, Arrays.asList(WindowComponent.TEXTAREA.getIdentifier()));
62 62
         this.listener = listener;

+ 2
- 1
parserdebug/src/com/dmdirc/addons/parserdebug/ParserDebugManager.java View File

@@ -23,6 +23,7 @@
23 23
 package com.dmdirc.addons.parserdebug;
24 24
 
25 25
 import com.dmdirc.DMDircMBassador;
26
+import com.dmdirc.FrameContainer;
26 27
 import com.dmdirc.events.ServerDisconnectedEvent;
27 28
 import com.dmdirc.interfaces.Connection;
28 29
 import com.dmdirc.parser.common.CallbackNotFoundException;
@@ -100,7 +101,7 @@ public class ParserDebugManager implements DebugInfoListener {
100 101
             parser.getCallbackManager().addCallback(DebugInfoListener.class, this);
101 102
             final DebugWindow window = new DebugWindow(this, "Parser Debug", parser,
102 103
                     connection, eventBus, backBufferFactory);
103
-            windowManager.addWindow(connection.getWindowModel(), window);
104
+            windowManager.addWindow((FrameContainer) connection.getWindowModel(), window);
104 105
             registeredParsers.put(parser, window);
105 106
             window.addLine("======================", new Date());
106 107
             window.addLine("Started Monitoring: " + parser, new Date());

+ 3
- 1
ui_swing/src/com/dmdirc/addons/ui_swing/components/frames/ServerFrame.java View File

@@ -22,6 +22,7 @@
22 22
 
23 23
 package com.dmdirc.addons.ui_swing.components.frames;
24 24
 
25
+import com.dmdirc.FrameContainer;
25 26
 import com.dmdirc.ServerState;
26 27
 import com.dmdirc.addons.ui_swing.EdtHandlerInvocation;
27 28
 import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputField;
@@ -76,7 +77,8 @@ public final class ServerFrame extends InputTextFrame {
76 77
             final KeyedDialogProvider<Connection, ServerSettingsDialog> dialogProvider,
77 78
             final SSLCertificateDialogFactory sslDialogFactory,
78 79
             final Connection owner) {
79
-        super(deps, inputFieldProvider, inputTextFramePasteActionFactory, owner.getWindowModel());
80
+        super(deps, inputFieldProvider, inputTextFramePasteActionFactory,
81
+                (FrameContainer) owner.getWindowModel());
80 82
         this.sslDialogFactory = sslDialogFactory;
81 83
         this.dialogProvider = dialogProvider;
82 84
         this.connection = owner;

Loading…
Cancel
Save