Browse Source

Remove some deprecated UI calls

Change-Id: I45e2c50834f4a5de7309ce19f4da5d04918e44c7
Reviewed-on: http://gerrit.dmdirc.com/1467
Automatic-Compile: Gregory Holmes <greg@dmdirc.com>
Reviewed-by: Gregory Holmes <greg@dmdirc.com>
tags/0.6.5
Chris Smith 14 years ago
parent
commit
b334ee2ff2

+ 6
- 3
src/com/dmdirc/addons/lagdisplay/LagDisplayPlugin.java View File

@@ -23,12 +23,12 @@
23 23
 package com.dmdirc.addons.lagdisplay;
24 24
 
25 25
 import com.dmdirc.FrameContainer;
26
-import com.dmdirc.Main;
27 26
 import com.dmdirc.Server;
28 27
 import com.dmdirc.ServerState;
29 28
 import com.dmdirc.actions.ActionManager;
30 29
 import com.dmdirc.actions.CoreActionType;
31 30
 import com.dmdirc.actions.interfaces.ActionType;
31
+import com.dmdirc.addons.ui_swing.SwingController;
32 32
 import com.dmdirc.config.ConfigManager;
33 33
 import com.dmdirc.config.IdentityManager;
34 34
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
@@ -39,6 +39,7 @@ import com.dmdirc.config.prefs.PreferencesType;
39 39
 import com.dmdirc.interfaces.ActionListener;
40 40
 import com.dmdirc.interfaces.ConfigChangeListener;
41 41
 import com.dmdirc.plugins.Plugin;
42
+import com.dmdirc.plugins.PluginManager;
42 43
 import com.dmdirc.ui.WindowManager;
43 44
 import com.dmdirc.util.RollingList;
44 45
 
@@ -80,7 +81,8 @@ public final class LagDisplayPlugin extends Plugin implements ActionListener, Co
80 81
     /** {@inheritDoc} */
81 82
     @Override
82 83
     public void onLoad() {
83
-        Main.getUI().getStatusBar().addComponent(panel);
84
+        ((SwingController) PluginManager.getPluginManager()
85
+                .getPluginInfoByName("ui_swing").getPlugin()).getStatusBar().addComponent(panel);
84 86
         IdentityManager.getGlobalConfig().addChangeListener(getDomain(), this);
85 87
 
86 88
         readConfig();
@@ -139,7 +141,8 @@ public final class LagDisplayPlugin extends Plugin implements ActionListener, Co
139 141
     /** {@inheritDoc} */
140 142
     @Override
141 143
     public void onUnload() {
142
-        Main.getUI().getStatusBar().removeComponent(panel);
144
+        ((SwingController) PluginManager.getPluginManager()
145
+                .getPluginInfoByName("ui_swing").getPlugin()).getStatusBar().removeComponent(panel);
143 146
         IdentityManager.getConfigIdentity().removeListener(this);
144 147
         
145 148
         ActionManager.removeListener(this);

+ 6
- 3
src/com/dmdirc/addons/windowstatus/WindowStatusPlugin.java View File

@@ -24,12 +24,12 @@ package com.dmdirc.addons.windowstatus;
24 24
 
25 25
 import com.dmdirc.Channel;
26 26
 import com.dmdirc.FrameContainer;
27
-import com.dmdirc.Main;
28 27
 import com.dmdirc.Query;
29 28
 import com.dmdirc.Server;
30 29
 import com.dmdirc.actions.ActionManager;
31 30
 import com.dmdirc.actions.CoreActionType;
32 31
 import com.dmdirc.actions.interfaces.ActionType;
32
+import com.dmdirc.addons.ui_swing.SwingController;
33 33
 import com.dmdirc.addons.ui_swing.UIUtilities;
34 34
 import com.dmdirc.config.IdentityManager;
35 35
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
@@ -43,6 +43,7 @@ import com.dmdirc.parser.interfaces.ChannelClientInfo;
43 43
 import com.dmdirc.parser.interfaces.ChannelInfo;
44 44
 import com.dmdirc.parser.interfaces.ClientInfo;
45 45
 import com.dmdirc.plugins.Plugin;
46
+import com.dmdirc.plugins.PluginManager;
46 47
 import com.dmdirc.ui.WindowManager;
47 48
 import com.dmdirc.util.ReturnableThread;
48 49
 
@@ -82,7 +83,8 @@ public final class WindowStatusPlugin extends Plugin implements ActionListener,
82 83
      */
83 84
     @Override
84 85
     public void onLoad() {
85
-        Main.getUI().getStatusBar().addComponent(panel);
86
+        ((SwingController) PluginManager.getPluginManager()
87
+                .getPluginInfoByName("ui_swing").getPlugin()).getStatusBar().addComponent(panel);
86 88
         IdentityManager.getGlobalConfig().addChangeListener(getDomain(), this);
87 89
         updateCache();
88 90
 
@@ -94,7 +96,8 @@ public final class WindowStatusPlugin extends Plugin implements ActionListener,
94 96
      */
95 97
     @Override
96 98
     public void onUnload() {
97
-        Main.getUI().getStatusBar().removeComponent(panel);
99
+        ((SwingController) PluginManager.getPluginManager()
100
+                .getPluginInfoByName("ui_swing").getPlugin()).getStatusBar().removeComponent(panel);
98 101
         ActionManager.removeListener(this);
99 102
     }
100 103
 

Loading…
Cancel
Save