Greg Holmes 9 лет назад
Родитель
Сommit
7c64b53468

+ 6
- 4
lagdisplay/src/com/dmdirc/addons/lagdisplay/ServerInfoDialog.java Просмотреть файл

@@ -26,6 +26,7 @@ import com.dmdirc.ServerState;
26 26
 import com.dmdirc.addons.ui_swing.MainFrame;
27 27
 import com.dmdirc.addons.ui_swing.components.statusbar.StatusbarPanel;
28 28
 import com.dmdirc.addons.ui_swing.components.statusbar.StatusbarPopupWindow;
29
+import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
29 30
 import com.dmdirc.interfaces.Connection;
30 31
 import com.dmdirc.interfaces.ConnectionManager;
31 32
 
@@ -45,10 +46,10 @@ public class ServerInfoDialog extends StatusbarPopupWindow {
45 46
     private static final long serialVersionUID = 3;
46 47
     /** The lag display manager. */
47 48
     protected final LagDisplayManager manager;
48
-    /** Swing main frame. */
49
-    private final MainFrame mainFrame;
50 49
     /** Server manager to retrieve servers from. */
51 50
     private final ConnectionManager connectionManager;
51
+    /** The active window manager. */
52
+    private final ActiveFrameManager activeFrameManager;
52 53
 
53 54
     /**
54 55
      * Creates a new ServerInfoDialog.
@@ -62,12 +63,13 @@ public class ServerInfoDialog extends StatusbarPopupWindow {
62 63
             final LagDisplayManager manager,
63 64
             final StatusbarPanel<JLabel> parent,
64 65
             final MainFrame mainFrame,
66
+            final ActiveFrameManager activeFrameManager,
65 67
             final ConnectionManager connectionManager) {
66 68
         super(parent, mainFrame);
67 69
 
68 70
         this.manager = manager;
69
-        this.mainFrame = mainFrame;
70 71
         this.connectionManager = connectionManager;
72
+        this.activeFrameManager = activeFrameManager;
71 73
     }
72 74
 
73 75
     @Override
@@ -78,7 +80,7 @@ public class ServerInfoDialog extends StatusbarPopupWindow {
78 80
             panel.add(new JLabel("No open servers."));
79 81
         } else {
80 82
             if (manager.shouldShowGraph()) {
81
-                panel.add(new PingHistoryPanel(manager, mainFrame), "span, grow, wrap");
83
+                panel.add(new PingHistoryPanel(manager, activeFrameManager), "span, grow, wrap");
82 84
                 panel.add(new JSeparator(), "span, grow, wrap");
83 85
             }
84 86
 

+ 5
- 2
lagdisplay/src/com/dmdirc/addons/lagdisplay/ServerInfoDialogFactory.java Просмотреть файл

@@ -24,6 +24,7 @@ package com.dmdirc.addons.lagdisplay;
24 24
 
25 25
 import com.dmdirc.addons.ui_swing.MainFrame;
26 26
 import com.dmdirc.addons.ui_swing.components.statusbar.StatusbarPanel;
27
+import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
27 28
 import com.dmdirc.interfaces.ConnectionManager;
28 29
 
29 30
 import javax.inject.Inject;
@@ -39,18 +40,20 @@ public class ServerInfoDialogFactory {
39 40
     private final LagDisplayManager manager;
40 41
     private final MainFrame mainFrame;
41 42
     private final ConnectionManager connectionManager;
43
+    private final ActiveFrameManager activeFrameManager;
42 44
 
43 45
     @Inject
44 46
     public ServerInfoDialogFactory(final LagDisplayManager manager, final MainFrame mainFrame,
45
-            final ConnectionManager connectionManager) {
47
+            final ActiveFrameManager activeFrameManager, final ConnectionManager connectionManager) {
46 48
         this.manager = manager;
47 49
         this.mainFrame = mainFrame;
48 50
         this.connectionManager = connectionManager;
51
+        this.activeFrameManager = activeFrameManager;
49 52
     }
50 53
 
51 54
     public ServerInfoDialog getServerInfoDialog(
52 55
             final StatusbarPanel<JLabel> parent) {
53
-        return new ServerInfoDialog(manager, parent, mainFrame, connectionManager);
56
+        return new ServerInfoDialog(manager, parent, mainFrame, activeFrameManager, connectionManager);
54 57
     }
55 58
 
56 59
 }

Загрузка…
Отмена
Сохранить