Ver código fonte

Make Chat return a WindowModel.

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

For now, just cast back when needed.
pull/529/head
Chris Smith 9 anos atrás
pai
commit
3063823cd2

+ 2
- 1
src/com/dmdirc/MessageEncoder.java Ver arquivo

@@ -25,6 +25,7 @@ package com.dmdirc;
25 25
 import com.dmdirc.events.UserErrorEvent;
26 26
 import com.dmdirc.interfaces.Connection;
27 27
 import com.dmdirc.interfaces.GroupChat;
28
+import com.dmdirc.interfaces.WindowModel;
28 29
 import com.dmdirc.logger.ErrorLevel;
29 30
 import com.dmdirc.parser.interfaces.Encoder;
30 31
 import com.dmdirc.parser.interfaces.Parser;
@@ -67,7 +68,7 @@ public class MessageEncoder implements Encoder {
67 68
         if (target != null && parser.isValidChannelName(target)) {
68 69
             encoding = connection.getGroupChatManager().getChannel(target)
69 70
                     .map(GroupChat::getWindowModel)
70
-                    .map(FrameContainer::getConfigManager)
71
+                    .map(WindowModel::getConfigManager)
71 72
                     .map(cm -> cm.getOption("general", "encoding"))
72 73
                     .orElse(encoding);
73 74
         }

+ 2
- 1
src/com/dmdirc/commandparser/commands/server/AllChannels.java Ver arquivo

@@ -71,7 +71,8 @@ public class AllChannels extends Command implements IntelligentCommand {
71 71
         final String command = args.getArgumentsAsString();
72 72
 
73 73
         for (GroupChat channel : server.getGroupChatManager().getChannels()) {
74
-            channel.getWindowModel().getCommandParser().parseCommand(channel.getWindowModel(),
74
+            channel.getWindowModel().getCommandParser().parseCommand(
75
+                    (FrameContainer) channel.getWindowModel(),
75 76
                     command);
76 77
         }
77 78
     }

+ 1
- 1
src/com/dmdirc/events/ChannelDisplayableEvent.java Ver arquivo

@@ -73,7 +73,7 @@ public abstract class ChannelDisplayableEvent extends ChannelEvent implements Di
73 73
 
74 74
     @Override
75 75
     public FrameContainer getSource() {
76
-        return getChannel().getWindowModel();
76
+        return (FrameContainer) getChannel().getWindowModel();
77 77
     }
78 78
 
79 79
 }

+ 1
- 2
src/com/dmdirc/interfaces/Chat.java Ver arquivo

@@ -22,7 +22,6 @@
22 22
 
23 23
 package com.dmdirc.interfaces;
24 24
 
25
-import com.dmdirc.FrameContainer;
26 25
 import com.dmdirc.parser.common.CompositionState;
27 26
 
28 27
 import java.util.Optional;
@@ -73,6 +72,6 @@ public interface Chat {
73 72
      *
74 73
      * @return A model for windows based on this connection.
75 74
      */
76
-    FrameContainer getWindowModel();
75
+    WindowModel getWindowModel();
77 76
 
78 77
 }

Carregando…
Cancelar
Salvar