瀏覽代碼

Don't access PerformWrapper statically.

Change-Id: I7b6495817f29eeca5f37a011e57db317d645f9e0
Reviewed-on: http://gerrit.dmdirc.com/2726
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Build Manager
tags/0.8
Chris Smith 10 年之前
父節點
當前提交
81317792d8

+ 7
- 1
src/com/dmdirc/addons/ui_swing/SwingController.java 查看文件

@@ -28,6 +28,7 @@ import com.dmdirc.FrameContainer;
28 28
 import com.dmdirc.Server;
29 29
 import com.dmdirc.ServerManager;
30 30
 import com.dmdirc.actions.ActionManager;
31
+import com.dmdirc.actions.wrappers.PerformWrapper;
31 32
 import com.dmdirc.addons.ui_swing.commands.ChannelSettings;
32 33
 import com.dmdirc.addons.ui_swing.commands.Input;
33 34
 import com.dmdirc.addons.ui_swing.commands.PopInCommand;
@@ -156,6 +157,9 @@ public class SwingController extends BaseCommandPlugin implements UIController {
156 157
     /** Plugin manager. */
157 158
     @Getter
158 159
     private final PluginManager pluginManager;
160
+    /** Perform wrapper. */
161
+    @Getter
162
+    private final PerformWrapper performWrapper;
159 163
     /** Controller to use to close the application. */
160 164
     private final LifecycleController lifecycleController;
161 165
     /** Extractor to use for core plugins. */
@@ -184,7 +188,8 @@ public class SwingController extends BaseCommandPlugin implements UIController {
184 188
             final CommandController commandController,
185 189
             final ServerManager serverManager,
186 190
             final LifecycleController lifecycleController,
187
-            final CorePluginExtractor corePluginExtractor) {
191
+            final CorePluginExtractor corePluginExtractor,
192
+            final PerformWrapper performWrapper) {
188 193
         super(commandController);
189 194
         this.pluginInfo = pluginInfo;
190 195
         this.identityManager = identityManager;
@@ -193,6 +198,7 @@ public class SwingController extends BaseCommandPlugin implements UIController {
193 198
         this.serverManager = serverManager;
194 199
         this.lifecycleController = lifecycleController;
195 200
         this.corePluginExtractor = corePluginExtractor;
201
+        this.performWrapper = performWrapper;
196 202
 
197 203
         globalConfig = identityManager.getGlobalConfiguration();
198 204
         globalIdentity = identityManager.getGlobalConfigIdentity();

+ 1
- 1
src/com/dmdirc/addons/ui_swing/dialogs/DialogManager.java 查看文件

@@ -168,7 +168,7 @@ public class DialogManager {
168 168
         injector.addParameter(SwingWindowFactory.class, controller.getWindowFactory());
169 169
         injector.addParameter(URLHandler.class, controller.getUrlHandler());
170 170
         injector.addParameter(DialogManager.class, this);
171
-        injector.addParameter(PerformWrapper.class, PerformWrapper.getPerformWrapper());
171
+        injector.addParameter(PerformWrapper.class, controller.getPerformWrapper());
172 172
 
173 173
         for (final Object param : params) {
174 174
             injector.addParameter(param);

Loading…
取消
儲存