|
@@ -181,10 +181,7 @@ public class LagDisplayManager implements ConfigChangeListener {
|
181
|
181
|
}
|
182
|
182
|
final boolean useAlternate = ((FrameContainer) event.getConnection()).getConfigManager()
|
183
|
183
|
.getOptionBool(domain, "usealternate");
|
184
|
|
- final boolean isActive = activeFrameManager.getActiveFrame().isPresent()
|
185
|
|
- && activeFrameManager.getActiveFrame().get().getContainer().getOptionalConnection()
|
186
|
|
- .isPresent() && activeFrameManager.getActiveFrame().get().getContainer()
|
187
|
|
- .getOptionalConnection().get().equals(event.getConnection());
|
|
184
|
+ final boolean isActive = isActiveWindow(event.getConnection());
|
188
|
185
|
final String[] args = event.getArgs();
|
189
|
186
|
if (useAlternate && args[3].startsWith("LAGCHECK_")) {
|
190
|
187
|
try {
|
|
@@ -207,10 +204,7 @@ public class LagDisplayManager implements ConfigChangeListener {
|
207
|
204
|
|
208
|
205
|
@Handler
|
209
|
206
|
public void handleServerDisconnected(final ServerDisconnectedEvent event) {
|
210
|
|
- final boolean isActive = activeFrameManager.getActiveFrame().isPresent()
|
211
|
|
- && activeFrameManager.getActiveFrame().get().getContainer().getOptionalConnection()
|
212
|
|
- .isPresent() && activeFrameManager.getActiveFrame().get().getContainer()
|
213
|
|
- .getOptionalConnection().get().equals(event.getConnection());
|
|
207
|
+ final boolean isActive = isActiveWindow(event.getConnection());
|
214
|
208
|
if (isActive) {
|
215
|
209
|
panel.getComponent().setText("Not connected");
|
216
|
210
|
pings.remove(event.getConnection());
|
|
@@ -225,10 +219,7 @@ public class LagDisplayManager implements ConfigChangeListener {
|
225
|
219
|
getOptionBool(domain, "usealternate")) {
|
226
|
220
|
return;
|
227
|
221
|
}
|
228
|
|
- final boolean isActive = activeFrameManager.getActiveFrame().isPresent()
|
229
|
|
- && activeFrameManager.getActiveFrame().get().getContainer().getOptionalConnection()
|
230
|
|
- .isPresent() && activeFrameManager.getActiveFrame().get().getContainer()
|
231
|
|
- .getOptionalConnection().get().equals(event.getConnection());
|
|
222
|
+ final boolean isActive = isActiveWindow(event.getConnection());
|
232
|
223
|
final String value = formatTime(event.getPing());
|
233
|
224
|
|
234
|
225
|
getHistory(event.getConnection()).add(event.getPing());
|
|
@@ -247,10 +238,7 @@ public class LagDisplayManager implements ConfigChangeListener {
|
247
|
238
|
getOptionBool(domain, "usealternate")) {
|
248
|
239
|
return;
|
249
|
240
|
}
|
250
|
|
- final boolean isActive = activeFrameManager.getActiveFrame().isPresent()
|
251
|
|
- && activeFrameManager.getActiveFrame().get().getContainer().getOptionalConnection()
|
252
|
|
- .isPresent() && activeFrameManager.getActiveFrame().get().getContainer()
|
253
|
|
- .getOptionalConnection().get().equals(event.getConnection());
|
|
241
|
+ final boolean isActive = isActiveWindow(event.getConnection());
|
254
|
242
|
final String value = formatTime(event.getPing()) + '+';
|
255
|
243
|
|
256
|
244
|
pings.put(event.getConnection(), value);
|
|
@@ -304,4 +292,11 @@ public class LagDisplayManager implements ConfigChangeListener {
|
304
|
292
|
readConfig();
|
305
|
293
|
}
|
306
|
294
|
|
|
295
|
+ private boolean isActiveWindow(final Connection connection) {
|
|
296
|
+ return activeFrameManager.getActiveFrame().isPresent()
|
|
297
|
+ && activeFrameManager.getActiveFrame().get().getContainer().getOptionalConnection()
|
|
298
|
+ .isPresent() && activeFrameManager.getActiveFrame().get().getContainer()
|
|
299
|
+ .getOptionalConnection().get().equals(connection);
|
|
300
|
+ }
|
|
301
|
+
|
307
|
302
|
}
|