Parcourir la 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 il y a 14 ans
Parent
révision
25f80df760

+ 5
- 4
src/com/dmdirc/addons/lagdisplay/LagDisplayPlugin.java Voir le fichier

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

+ 2
- 1
src/com/dmdirc/addons/lagdisplay/PingHistoryPanel.java Voir le fichier

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

+ 2
- 1
src/com/dmdirc/addons/windowstatus/WindowStatusPlugin.java Voir le fichier

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

Chargement…
Annuler
Enregistrer