Browse Source

Switch to using WindowManager

Change-Id: I3e7b1b2f5d73079978be876fe51d45c9005ef22b
Reviewed-on: http://gerrit.dmdirc.com/374
Reviewed-by: Gregory Holmes <greboid@dmdirc.com>
Tested-by: Gregory Holmes <greboid@dmdirc.com>
tags/0.6.3
Chris Smith 14 years ago
parent
commit
25f80df760

+ 5
- 4
src/com/dmdirc/addons/lagdisplay/LagDisplayPlugin.java View File

38
 import com.dmdirc.interfaces.ActionListener;
38
 import com.dmdirc.interfaces.ActionListener;
39
 import com.dmdirc.interfaces.ConfigChangeListener;
39
 import com.dmdirc.interfaces.ConfigChangeListener;
40
 import com.dmdirc.plugins.Plugin;
40
 import com.dmdirc.plugins.Plugin;
41
+import com.dmdirc.ui.WindowManager;
41
 import com.dmdirc.ui.interfaces.Window;
42
 import com.dmdirc.ui.interfaces.Window;
42
 import com.dmdirc.util.RollingList;
43
 import com.dmdirc.util.RollingList;
43
 
44
 
160
         }
161
         }
161
 
162
 
162
         if (!useAlternate && type.equals(CoreActionType.SERVER_GOTPING)) {
163
         if (!useAlternate && type.equals(CoreActionType.SERVER_GOTPING)) {
163
-            final Window active = Main.getUI().getActiveWindow();
164
+            final Window active = WindowManager.getActiveWindow();
164
             final String value = formatTime(arguments[1]);
165
             final String value = formatTime(arguments[1]);
165
 
166
 
166
             getHistory(((Server) arguments[0])).add((Long) arguments[1]);
167
             getHistory(((Server) arguments[0])).add((Long) arguments[1]);
172
 
173
 
173
             panel.refreshDialog();
174
             panel.refreshDialog();
174
         } else if (!useAlternate && type.equals(CoreActionType.SERVER_NOPING)) {
175
         } else if (!useAlternate && type.equals(CoreActionType.SERVER_NOPING)) {
175
-            final Window active = Main.getUI().getActiveWindow();
176
+            final Window active = WindowManager.getActiveWindow();
176
             final String value = formatTime(arguments[1]) + "+";
177
             final String value = formatTime(arguments[1]) + "+";
177
 
178
 
178
             pings.put(((Server) arguments[0]), value);
179
             pings.put(((Server) arguments[0]), value);
183
 
184
 
184
             panel.refreshDialog();
185
             panel.refreshDialog();
185
         } else if (type.equals(CoreActionType.SERVER_DISCONNECTED)) {
186
         } else if (type.equals(CoreActionType.SERVER_DISCONNECTED)) {
186
-            final Window active = Main.getUI().getActiveWindow();
187
+            final Window active = WindowManager.getActiveWindow();
187
 
188
 
188
             if (((Server) arguments[0]).ownsFrame(active)) {
189
             if (((Server) arguments[0]).ownsFrame(active)) {
189
                 panel.setText("Not connected");
190
                 panel.setText("Not connected");
211
                 final long sent = Long.parseLong(((String[]) arguments[2])[3].substring(9));
212
                 final long sent = Long.parseLong(((String[]) arguments[2])[3].substring(9));
212
                 final Long duration = Long.valueOf(new Date().getTime() - sent);
213
                 final Long duration = Long.valueOf(new Date().getTime() - sent);
213
                 final String value = formatTime(duration);
214
                 final String value = formatTime(duration);
214
-                final Window active = Main.getUI().getActiveWindow();
215
+                final Window active = WindowManager.getActiveWindow();
215
 
216
 
216
                 pings.put((Server) arguments[0], value);
217
                 pings.put((Server) arguments[0], value);
217
                 getHistory(((Server) arguments[0])).add(duration);
218
                 getHistory(((Server) arguments[0])).add(duration);

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

24
 
24
 
25
 import com.dmdirc.Main;
25
 import com.dmdirc.Main;
26
 import com.dmdirc.ServerManager;
26
 import com.dmdirc.ServerManager;
27
+import com.dmdirc.ui.WindowManager;
27
 import com.dmdirc.util.RollingList;
28
 import com.dmdirc.util.RollingList;
28
 import java.awt.Color;
29
 import java.awt.Color;
29
 import java.awt.Dimension;
30
 import java.awt.Dimension;
72
         
73
         
73
         this.plugin = plugin;
74
         this.plugin = plugin;
74
         this.history = plugin.getHistory(ServerManager.getServerManager()
75
         this.history = plugin.getHistory(ServerManager.getServerManager()
75
-                .getServerFromFrame(Main.getUI().getActiveWindow()));
76
+                .getServerFromFrame(WindowManager.getActiveWindow()));
76
 
77
 
77
         for (Long value : history.getList()) {
78
         for (Long value : history.getList()) {
78
             maximum = Math.max(value, maximum);
79
             maximum = Math.max(value, maximum);

+ 2
- 1
src/com/dmdirc/addons/windowstatus/WindowStatusPlugin.java View File

41
 import com.dmdirc.parser.interfaces.ChannelInfo;
41
 import com.dmdirc.parser.interfaces.ChannelInfo;
42
 import com.dmdirc.parser.interfaces.ClientInfo;
42
 import com.dmdirc.parser.interfaces.ClientInfo;
43
 import com.dmdirc.plugins.Plugin;
43
 import com.dmdirc.plugins.Plugin;
44
+import com.dmdirc.ui.WindowManager;
44
 import com.dmdirc.ui.interfaces.InputWindow;
45
 import com.dmdirc.ui.interfaces.InputWindow;
45
 import com.dmdirc.ui.interfaces.Window;
46
 import com.dmdirc.ui.interfaces.Window;
46
 
47
 
111
      * Update the window status using the current active window.
112
      * Update the window status using the current active window.
112
      */
113
      */
113
     public void updateStatus() {
114
     public void updateStatus() {
114
-        final Window active = Main.getUI().getActiveWindow();
115
+        final Window active = WindowManager.getActiveWindow();
115
 
116
 
116
         if (active != null) {
117
         if (active != null) {
117
             updateStatus(((InputWindow) active).getContainer());
118
             updateStatus(((InputWindow) active).getContainer());

Loading…
Cancel
Save