Browse Source

Fix lag display plugin using deprecated methods

Change-Id: I5f8a128dd57f79aee696d21ee55da796824470f0
Reviewed-on: http://gerrit.dmdirc.com/1153
Automatic-Compile: Gregory Holmes <greg@dmdirc.com>
Reviewed-by: Gregory Holmes <greg@dmdirc.com>
tags/0.6.4
Chris Smith 14 years ago
parent
commit
d21f487e3c
1 changed files with 8 additions and 9 deletions
  1. 8
    9
      src/com/dmdirc/addons/lagdisplay/LagDisplayPlugin.java

+ 8
- 9
src/com/dmdirc/addons/lagdisplay/LagDisplayPlugin.java View File

40
 import com.dmdirc.interfaces.ConfigChangeListener;
40
 import com.dmdirc.interfaces.ConfigChangeListener;
41
 import com.dmdirc.plugins.Plugin;
41
 import com.dmdirc.plugins.Plugin;
42
 import com.dmdirc.ui.WindowManager;
42
 import com.dmdirc.ui.WindowManager;
43
-import com.dmdirc.ui.interfaces.Window;
44
 import com.dmdirc.util.RollingList;
43
 import com.dmdirc.util.RollingList;
45
 
44
 
46
 import java.util.Date;
45
 import java.util.Date;
162
         }
161
         }
163
 
162
 
164
         if (!useAlternate && type.equals(CoreActionType.SERVER_GOTPING)) {
163
         if (!useAlternate && type.equals(CoreActionType.SERVER_GOTPING)) {
165
-            final Window active = WindowManager.getActiveWindow().getFrame();
164
+            final FrameContainer<?> active = WindowManager.getActiveWindow();
166
             final String value = formatTime(arguments[1]);
165
             final String value = formatTime(arguments[1]);
167
 
166
 
168
             getHistory(((Server) arguments[0])).add((Long) arguments[1]);
167
             getHistory(((Server) arguments[0])).add((Long) arguments[1]);
169
             pings.put(((Server) arguments[0]), value);
168
             pings.put(((Server) arguments[0]), value);
170
 
169
 
171
-            if (((Server) arguments[0]).ownsFrame(active)) {
170
+            if (((Server) arguments[0]).isChild(active) || arguments[0] == active) {
172
                 panel.setText(value);
171
                 panel.setText(value);
173
             }
172
             }
174
 
173
 
175
             panel.refreshDialog();
174
             panel.refreshDialog();
176
         } else if (!useAlternate && type.equals(CoreActionType.SERVER_NOPING)) {
175
         } else if (!useAlternate && type.equals(CoreActionType.SERVER_NOPING)) {
177
-            final Window active = WindowManager.getActiveWindow().getFrame();
176
+            final FrameContainer<?> active = WindowManager.getActiveWindow();
178
             final String value = formatTime(arguments[1]) + "+";
177
             final String value = formatTime(arguments[1]) + "+";
179
 
178
 
180
             pings.put(((Server) arguments[0]), value);
179
             pings.put(((Server) arguments[0]), value);
181
 
180
 
182
-            if (((Server) arguments[0]).ownsFrame(active)) {
181
+            if (((Server) arguments[0]).isChild(active) || arguments[0] == active) {
183
                 panel.setText(value);
182
                 panel.setText(value);
184
             }
183
             }
185
 
184
 
186
             panel.refreshDialog();
185
             panel.refreshDialog();
187
         } else if (type.equals(CoreActionType.SERVER_DISCONNECTED)) {
186
         } else if (type.equals(CoreActionType.SERVER_DISCONNECTED)) {
188
-            final Window active = WindowManager.getActiveWindow().getFrame();
187
+            final FrameContainer<?> active = WindowManager.getActiveWindow();
189
 
188
 
190
-            if (((Server) arguments[0]).ownsFrame(active)) {
189
+            if (((Server) arguments[0]).isChild(active) || arguments[0] == active) {
191
                 panel.setText("Not connected");
190
                 panel.setText("Not connected");
192
                 pings.remove((Server) arguments[0]);
191
                 pings.remove((Server) arguments[0]);
193
             }
192
             }
213
                 final long sent = Long.parseLong(((String[]) arguments[2])[3].substring(9));
212
                 final long sent = Long.parseLong(((String[]) arguments[2])[3].substring(9));
214
                 final Long duration = Long.valueOf(new Date().getTime() - sent);
213
                 final Long duration = Long.valueOf(new Date().getTime() - sent);
215
                 final String value = formatTime(duration);
214
                 final String value = formatTime(duration);
216
-                final Window active = WindowManager.getActiveWindow().getFrame();
215
+                final FrameContainer<?> active = WindowManager.getActiveWindow();
217
 
216
 
218
                 pings.put((Server) arguments[0], value);
217
                 pings.put((Server) arguments[0], value);
219
                 getHistory(((Server) arguments[0])).add(duration);
218
                 getHistory(((Server) arguments[0])).add(duration);
220
 
219
 
221
-                if (((Server) arguments[0]).ownsFrame(active)) {
220
+                if (((Server) arguments[0]).isChild(active) || arguments[0] == active) {
222
                     panel.setText(value);
221
                     panel.setText(value);
223
                 }
222
                 }
224
             } catch (NumberFormatException ex) {
223
             } catch (NumberFormatException ex) {

Loading…
Cancel
Save