Browse Source

Weaken some things to WindowModel.

pull/366/head
Chris Smith 9 years ago
parent
commit
4855c232c2

+ 2
- 2
dcc/src/com/dmdirc/addons/dcc/ChatContainer.java View File

23
 package com.dmdirc.addons.dcc;
23
 package com.dmdirc.addons.dcc;
24
 
24
 
25
 import com.dmdirc.DMDircMBassador;
25
 import com.dmdirc.DMDircMBassador;
26
-import com.dmdirc.FrameContainer;
27
 import com.dmdirc.addons.dcc.events.DccChatMessageEvent;
26
 import com.dmdirc.addons.dcc.events.DccChatMessageEvent;
28
 import com.dmdirc.addons.dcc.events.DccChatSelfmessageEvent;
27
 import com.dmdirc.addons.dcc.events.DccChatSelfmessageEvent;
29
 import com.dmdirc.addons.dcc.events.DccChatSocketclosedEvent;
28
 import com.dmdirc.addons.dcc.events.DccChatSocketclosedEvent;
30
 import com.dmdirc.addons.dcc.events.DccChatSocketopenedEvent;
29
 import com.dmdirc.addons.dcc.events.DccChatSocketopenedEvent;
31
 import com.dmdirc.addons.dcc.io.DCCChat;
30
 import com.dmdirc.addons.dcc.io.DCCChat;
32
 import com.dmdirc.interfaces.CommandController;
31
 import com.dmdirc.interfaces.CommandController;
32
+import com.dmdirc.interfaces.WindowModel;
33
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
33
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
34
 import com.dmdirc.ui.core.components.WindowComponent;
34
 import com.dmdirc.ui.core.components.WindowComponent;
35
 import com.dmdirc.ui.input.TabCompleterFactory;
35
 import com.dmdirc.ui.input.TabCompleterFactory;
70
      * @param eventBus            The bus to dispatch events on.
70
      * @param eventBus            The bus to dispatch events on.
71
      */
71
      */
72
     public ChatContainer(
72
     public ChatContainer(
73
-            @Nullable final FrameContainer parent,
73
+            @Nullable final WindowModel parent,
74
             final DCCChat dcc,
74
             final DCCChat dcc,
75
             final AggregateConfigProvider configManager,
75
             final AggregateConfigProvider configManager,
76
             final BackBufferFactory backBufferFactory,
76
             final BackBufferFactory backBufferFactory,

+ 2
- 1
dcc/src/com/dmdirc/addons/dcc/DCCFrameContainer.java View File

26
 import com.dmdirc.FrameContainer;
26
 import com.dmdirc.FrameContainer;
27
 import com.dmdirc.commandparser.parsers.CommandParser;
27
 import com.dmdirc.commandparser.parsers.CommandParser;
28
 import com.dmdirc.interfaces.Connection;
28
 import com.dmdirc.interfaces.Connection;
29
+import com.dmdirc.interfaces.WindowModel;
29
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
30
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
30
 import com.dmdirc.ui.input.TabCompleterFactory;
31
 import com.dmdirc.ui.input.TabCompleterFactory;
31
 import com.dmdirc.ui.messages.BackBufferFactory;
32
 import com.dmdirc.ui.messages.BackBufferFactory;
58
      * @param components          The UI components that this frame requires
59
      * @param components          The UI components that this frame requires
59
      */
60
      */
60
     public DCCFrameContainer(
61
     public DCCFrameContainer(
61
-            @Nullable final FrameContainer parent,
62
+            @Nullable final WindowModel parent,
62
             final String title,
63
             final String title,
63
             final String icon,
64
             final String icon,
64
             final AggregateConfigProvider configManager,
65
             final AggregateConfigProvider configManager,

+ 1
- 2
lagdisplay/src/com/dmdirc/addons/lagdisplay/LagDisplayManager.java View File

24
 
24
 
25
 import com.dmdirc.ClientModule.GlobalConfig;
25
 import com.dmdirc.ClientModule.GlobalConfig;
26
 import com.dmdirc.DMDircMBassador;
26
 import com.dmdirc.DMDircMBassador;
27
-import com.dmdirc.FrameContainer;
28
 import com.dmdirc.ServerState;
27
 import com.dmdirc.ServerState;
29
 import com.dmdirc.addons.ui_swing.EdtHandlerInvocation;
28
 import com.dmdirc.addons.ui_swing.EdtHandlerInvocation;
30
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
29
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
191
         if (event.getNumeric() != 421) {
190
         if (event.getNumeric() != 421) {
192
             return;
191
             return;
193
         }
192
         }
194
-        final boolean useAlternate = ((FrameContainer) event.getConnection()).getConfigManager()
193
+        final boolean useAlternate = event.getConnection().getWindowModel().getConfigManager()
195
                 .getOptionBool(domain, "usealternate");
194
                 .getOptionBool(domain, "usealternate");
196
         final boolean isActive = isActiveWindow(event.getConnection());
195
         final boolean isActive = isActiveWindow(event.getConnection());
197
         final String[] args = event.getArgs();
196
         final String[] args = event.getArgs();

+ 1
- 1
logging/src/com/dmdirc/addons/logging/HistoryWindow.java View File

58
     public HistoryWindow(
58
     public HistoryWindow(
59
             final String title,
59
             final String title,
60
             final Path logFile,
60
             final Path logFile,
61
-            final FrameContainer parent,
61
+            final WindowModel parent,
62
             final DMDircMBassador eventBus,
62
             final DMDircMBassador eventBus,
63
             final BackBufferFactory backBufferFactory,
63
             final BackBufferFactory backBufferFactory,
64
             final int numLines) {
64
             final int numLines) {

+ 1
- 2
logging/src/com/dmdirc/addons/logging/LoggingCommand.java View File

22
 
22
 
23
 package com.dmdirc.addons.logging;
23
 package com.dmdirc.addons.logging;
24
 
24
 
25
-import com.dmdirc.FrameContainer;
26
 import com.dmdirc.commandparser.BaseCommandInfo;
25
 import com.dmdirc.commandparser.BaseCommandInfo;
27
 import com.dmdirc.commandparser.CommandArguments;
26
 import com.dmdirc.commandparser.CommandArguments;
28
 import com.dmdirc.commandparser.CommandType;
27
 import com.dmdirc.commandparser.CommandType;
67
             final CommandArguments args, final CommandContext context) {
66
             final CommandArguments args, final CommandContext context) {
68
         if (args.getArguments().length > 0) {
67
         if (args.getArguments().length > 0) {
69
             if ("history".equalsIgnoreCase(args.getArguments()[0])) {
68
             if ("history".equalsIgnoreCase(args.getArguments()[0])) {
70
-                if (!manager.showHistory((FrameContainer) origin)) {
69
+                if (!manager.showHistory(origin)) {
71
                     sendLine(origin, args.isSilent(), FORMAT_ERROR,
70
                     sendLine(origin, args.isSilent(), FORMAT_ERROR,
72
                             "Unable to open history for this window.");
71
                             "Unable to open history for this window.");
73
                 }
72
                 }

+ 4
- 4
logging/src/com/dmdirc/addons/logging/LoggingManager.java View File

24
 
24
 
25
 import com.dmdirc.ClientModule.GlobalConfig;
25
 import com.dmdirc.ClientModule.GlobalConfig;
26
 import com.dmdirc.DMDircMBassador;
26
 import com.dmdirc.DMDircMBassador;
27
-import com.dmdirc.FrameContainer;
28
 import com.dmdirc.Query;
27
 import com.dmdirc.Query;
29
 import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
28
 import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
30
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
29
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
54
 import com.dmdirc.interfaces.GroupChatUser;
53
 import com.dmdirc.interfaces.GroupChatUser;
55
 import com.dmdirc.interfaces.PrivateChat;
54
 import com.dmdirc.interfaces.PrivateChat;
56
 import com.dmdirc.interfaces.User;
55
 import com.dmdirc.interfaces.User;
56
+import com.dmdirc.interfaces.WindowModel;
57
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
57
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
58
 import com.dmdirc.interfaces.config.ConfigChangeListener;
58
 import com.dmdirc.interfaces.config.ConfigChangeListener;
59
 import com.dmdirc.logger.ErrorLevel;
59
 import com.dmdirc.logger.ErrorLevel;
371
         final String filename = locator.getLogFile(event.getChannel().getName());
371
         final String filename = locator.getLogFile(event.getChannel().getName());
372
 
372
 
373
         if (autobackbuffer) {
373
         if (autobackbuffer) {
374
-            showBackBuffer((FrameContainer) event.getChannel().getWindowModel(), filename);
374
+            showBackBuffer(event.getChannel().getWindowModel(), filename);
375
         }
375
         }
376
 
376
 
377
         synchronized (FORMAT_LOCK) {
377
         synchronized (FORMAT_LOCK) {
400
      * @param frame    The frame to add the backbuffer lines to
400
      * @param frame    The frame to add the backbuffer lines to
401
      * @param filename File to get backbuffer from
401
      * @param filename File to get backbuffer from
402
      */
402
      */
403
-    protected void showBackBuffer(final FrameContainer frame, final String filename) {
403
+    protected void showBackBuffer(final WindowModel frame, final String filename) {
404
         if (frame == null) {
404
         if (frame == null) {
405
             eventBus.publishAsync(new UserErrorEvent(ErrorLevel.LOW, null, "Given a null frame", ""));
405
             eventBus.publishAsync(new UserErrorEvent(ErrorLevel.LOW, null, "Given a null frame", ""));
406
             return;
406
             return;
562
      *
562
      *
563
      * @return True if the history is available, false otherwise
563
      * @return True if the history is available, false otherwise
564
      */
564
      */
565
-    protected boolean showHistory(final FrameContainer target) {
565
+    protected boolean showHistory(final WindowModel target) {
566
         final String descriptor;
566
         final String descriptor;
567
 
567
 
568
         if (target instanceof GroupChat) {
568
         if (target instanceof GroupChat) {

Loading…
Cancel
Save