Ver código fonte

Remove getVersion, aboutDialog can query directly.

pull/303/head
Greg Holmes 9 anos atrás
pai
commit
d626a4e34a

+ 0
- 14
ui_swing/src/com/dmdirc/addons/ui_swing/SwingController.java Ver arquivo

@@ -33,7 +33,6 @@ import com.dmdirc.interfaces.ui.UIController;
33 33
 import com.dmdirc.plugins.Exported;
34 34
 import com.dmdirc.plugins.PluginInfo;
35 35
 import com.dmdirc.plugins.implementations.BaseCommandPlugin;
36
-import com.dmdirc.updater.Version;
37 36
 
38 37
 import java.awt.GraphicsEnvironment;
39 38
 
@@ -46,8 +45,6 @@ import dagger.ObjectGraph;
46 45
  */
47 46
 public class SwingController extends BaseCommandPlugin implements UIController {
48 47
 
49
-    /** This plugin's plugin info object. */
50
-    private PluginInfo pluginInfo;
51 48
     /** The manager we're using for dependencies. */
52 49
     private SwingManager swingManager;
53 50
 
@@ -55,8 +52,6 @@ public class SwingController extends BaseCommandPlugin implements UIController {
55 52
     public void load(final PluginInfo pluginInfo, final ObjectGraph graph) {
56 53
         super.load(pluginInfo, graph);
57 54
 
58
-        this.pluginInfo = pluginInfo;
59
-
60 55
         setObjectGraph(graph.plus(new SwingModule(this, pluginInfo, pluginInfo.getDomain())));
61 56
         getObjectGraph().validate();
62 57
         swingManager = getObjectGraph().get(SwingManager.class);
@@ -91,15 +86,6 @@ public class SwingController extends BaseCommandPlugin implements UIController {
91 86
         super.onUnload();
92 87
     }
93 88
 
94
-    /**
95
-     * Returns the version of this swing UI.
96
-     *
97
-     * @return Swing version
98
-     */
99
-    public Version getVersion() {
100
-        return pluginInfo.getMetaData().getVersion();
101
-    }
102
-
103 89
     /**
104 90
      * Returns the current look and feel.
105 91
      *

+ 8
- 2
ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/about/AboutDialog.java Ver arquivo

@@ -30,6 +30,8 @@ import com.dmdirc.addons.ui_swing.injection.MainWindow;
30 30
 import com.dmdirc.events.ClientInfoRequestEvent;
31 31
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
32 32
 import com.dmdirc.interfaces.ui.AboutDialogModel;
33
+import com.dmdirc.plugins.PluginDomain;
34
+import com.dmdirc.plugins.PluginInfo;
33 35
 import com.dmdirc.ui.core.about.InfoItem;
34 36
 import com.dmdirc.ui.core.util.URLHandler;
35 37
 
@@ -56,6 +58,7 @@ public class AboutDialog extends StandardDialog {
56 58
     private final SwingController controller;
57 59
     private final DMDircMBassador eventBus;
58 60
     private final AggregateConfigProvider config;
61
+    private final PluginInfo pluginInfo;
59 62
 
60 63
     @Inject
61 64
     public AboutDialog(
@@ -64,13 +67,15 @@ public class AboutDialog extends StandardDialog {
64 67
             final AboutDialogModel model,
65 68
             final URLHandler urlHandler,
66 69
             final DMDircMBassador eventBus,
67
-            final SwingController controller) {
70
+            final SwingController controller,
71
+            @PluginDomain(SwingController.class) final PluginInfo pluginInfo) {
68 72
         super(parentWindow, ModalityType.MODELESS);
69 73
         this.urlHandler = urlHandler;
70 74
         this.model = model;
71 75
         this.controller = controller;
72 76
         this.eventBus = eventBus;
73 77
         this.config = config;
78
+        this.pluginInfo = pluginInfo;
74 79
 
75 80
         eventBus.subscribe(this);
76 81
         model.load();
@@ -103,7 +108,8 @@ public class AboutDialog extends StandardDialog {
103 108
 
104 109
     @Handler
105 110
     public void handleInfoRequest(final ClientInfoRequestEvent event) {
106
-        event.addInfoItem(InfoItem.create("Swing UI Version", controller.getVersion().toString()),
111
+        event.addInfoItem(InfoItem.create("Swing UI Version",
112
+                        pluginInfo.getMetaData().getVersion().toString()),
107 113
                 InfoItem.create("Look and Feel", SwingController.getLookAndFeel()),
108 114
                 InfoItem.create("MiG Layout Version", LayoutUtil.getVersion())
109 115
         );

Carregando…
Cancelar
Salvar