瀏覽代碼

Fix a couple of FrameContainer refs.

pull/368/head
Chris Smith 9 年之前
父節點
當前提交
3a95fb6f66

+ 2
- 2
dcc/src/com/dmdirc/addons/dcc/events/DccChatMessageEvent.java 查看文件

@@ -22,8 +22,8 @@
22 22
 
23 23
 package com.dmdirc.addons.dcc.events;
24 24
 
25
-import com.dmdirc.FrameContainer;
26 25
 import com.dmdirc.addons.dcc.ChatContainer;
26
+import com.dmdirc.interfaces.WindowModel;
27 27
 
28 28
 /**
29 29
  * Fired when a DCC chat message is received.
@@ -54,7 +54,7 @@ public class DccChatMessageEvent extends DccDisplayableEvent {
54 54
     }
55 55
 
56 56
     @Override
57
-    public FrameContainer getSource() {
57
+    public WindowModel getSource() {
58 58
         return chatWindow;
59 59
     }
60 60
 

+ 2
- 2
dcc/src/com/dmdirc/addons/dcc/events/DccChatSelfmessageEvent.java 查看文件

@@ -22,8 +22,8 @@
22 22
 
23 23
 package com.dmdirc.addons.dcc.events;
24 24
 
25
-import com.dmdirc.FrameContainer;
26 25
 import com.dmdirc.addons.dcc.ChatContainer;
26
+import com.dmdirc.interfaces.WindowModel;
27 27
 
28 28
 /**
29 29
  * Fired on a DCC chat self message.
@@ -47,7 +47,7 @@ public class DccChatSelfmessageEvent extends DccDisplayableEvent {
47 47
     }
48 48
 
49 49
     @Override
50
-    public FrameContainer getSource() {
50
+    public WindowModel getSource() {
51 51
         return chatWindow;
52 52
     }
53 53
 

+ 2
- 2
dcc/src/com/dmdirc/addons/dcc/events/DccChatSocketclosedEvent.java 查看文件

@@ -22,8 +22,8 @@
22 22
 
23 23
 package com.dmdirc.addons.dcc.events;
24 24
 
25
-import com.dmdirc.FrameContainer;
26 25
 import com.dmdirc.addons.dcc.ChatContainer;
26
+import com.dmdirc.interfaces.WindowModel;
27 27
 
28 28
 /**
29 29
  * Fired when a chat socket is closed.
@@ -41,7 +41,7 @@ public class DccChatSocketclosedEvent extends DccDisplayableEvent {
41 41
     }
42 42
 
43 43
     @Override
44
-    public FrameContainer getSource() {
44
+    public WindowModel getSource() {
45 45
         return chatWindow;
46 46
     }
47 47
 }

+ 2
- 2
dcc/src/com/dmdirc/addons/dcc/events/DccChatSocketopenedEvent.java 查看文件

@@ -22,8 +22,8 @@
22 22
 
23 23
 package com.dmdirc.addons.dcc.events;
24 24
 
25
-import com.dmdirc.FrameContainer;
26 25
 import com.dmdirc.addons.dcc.ChatContainer;
26
+import com.dmdirc.interfaces.WindowModel;
27 27
 
28 28
 /**
29 29
  * Fired when a chat socket is opened.
@@ -41,7 +41,7 @@ public class DccChatSocketopenedEvent extends DccDisplayableEvent {
41 41
     }
42 42
 
43 43
     @Override
44
-    public FrameContainer getSource() {
44
+    public WindowModel getSource() {
45 45
         return chatWindow;
46 46
     }
47 47
 

+ 3
- 5
ui_swing/src/com/dmdirc/addons/ui_swing/framemanager/tree/TreeFrameManager.java 查看文件

@@ -24,11 +24,11 @@ package com.dmdirc.addons.ui_swing.framemanager.tree;
24 24
 
25 25
 import com.dmdirc.ClientModule.GlobalConfig;
26 26
 import com.dmdirc.DMDircMBassador;
27
-import com.dmdirc.FrameContainer;
28 27
 import com.dmdirc.addons.ui_swing.EdtHandlerInvocation;
29 28
 import com.dmdirc.addons.ui_swing.SwingController;
30 29
 import com.dmdirc.addons.ui_swing.SwingWindowFactory;
31 30
 import com.dmdirc.addons.ui_swing.UIUtilities;
31
+import com.dmdirc.addons.ui_swing.components.IconManager;
32 32
 import com.dmdirc.addons.ui_swing.components.TreeScroller;
33 33
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
34 34
 import com.dmdirc.addons.ui_swing.events.SwingEventBus;
@@ -46,7 +46,6 @@ import com.dmdirc.interfaces.config.ConfigChangeListener;
46 46
 import com.dmdirc.interfaces.ui.Window;
47 47
 import com.dmdirc.logger.ErrorLevel;
48 48
 import com.dmdirc.plugins.PluginDomain;
49
-import com.dmdirc.addons.ui_swing.components.IconManager;
50 49
 import com.dmdirc.ui.WindowManager;
51 50
 import com.dmdirc.ui.messages.ColourManager;
52 51
 
@@ -237,12 +236,11 @@ public class TreeFrameManager implements FrameManager, Serializable, ConfigChang
237 236
             }
238 237
 
239 238
             node.getLabel().unreadStatusChanged(new UnreadStatusChangedEvent(
240
-                    (FrameContainer) window.getContainer(),
239
+                    window.getContainer(),
241 240
                     window.getContainer().getUnreadStatusManager(),
242 241
                     window.getContainer().getUnreadStatusManager().getNotificationColour(),
243 242
                     window.getContainer().getUnreadStatusManager().getUnreadLines()));
244
-            node.getLabel().iconChanged(new FrameIconChangedEvent(
245
-                    (FrameContainer) window.getContainer(),
243
+            node.getLabel().iconChanged(new FrameIconChangedEvent(window.getContainer(),
246 244
                     window.getContainer().getIcon()));
247 245
         });
248 246
     }

Loading…
取消
儲存