Get rid of Main reference from Twitter Plugin.

Change-Id: I81128804d899e524eb18d221b202e9fef80a194a
Reviewed-on: http://gerrit.dmdirc.com/2713
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Build Manager

src/com/dmdirc/addons/parser_twitter/TwitterPlugin.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.parser_twitter;
 
+import com.dmdirc.ServerManager;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.addons.parser_twitter.actions.TwitterActionComponents;
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
@@ -29,6 +30,7 @@ import com.dmdirc.config.prefs.PreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
+import com.dmdirc.interfaces.actions.ActionComponent;
 import com.dmdirc.parser.common.MyInfo;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.ProtocolDescription;
@@ -47,29 +49,39 @@ public class TwitterPlugin extends BasePlugin {
     private volatile boolean unloading = false;
     /** This plugin's plugin info. */
     private final PluginInfo pluginInfo;
+    /** The server manager to use. */
+    private final ServerManager serverManager;
 
     /**
      * Creates a new instance of this plugin.
      *
      * @param pluginInfo This plugin's plugin info
+     * @param serverManager The server manager to use.
      */
-    public TwitterPlugin(final PluginInfo pluginInfo) {
+    public TwitterPlugin(
+            final PluginInfo pluginInfo,
+            final ServerManager serverManager) {
         super();
         this.pluginInfo = pluginInfo;
+        this.serverManager = serverManager;
     }
 
     /** {@inheritDoc} */
     @Override
     public void onLoad() {
         ActionManager.getActionManager().registerComponents(
-                TwitterActionComponents.values());
+                new ActionComponent[] {
+                    new TwitterActionComponents.ChannelNameStatus(serverManager),
+                    new TwitterActionComponents.StatusUser(),
+                    new TwitterActionComponents.UserScreenName(),
+                });
     }
 
     /** {@inheritDoc} */
     @Override
     public void onUnload() {
         unloading = true;
-        for (final Twitter parser : new ArrayList<Twitter>(Twitter.PARSERS)) {
+        for (final Twitter parser : new ArrayList<>(Twitter.PARSERS)) {
             parser.disconnect("");
         }
     }

src/com/dmdirc/addons/parser_twitter/actions/TwitterActionComponents.java

@@ -22,8 +22,8 @@
 
 package com.dmdirc.addons.parser_twitter.actions;
 
-import com.dmdirc.Main;
 import com.dmdirc.Server;
+import com.dmdirc.ServerManager;
 import com.dmdirc.interfaces.actions.ActionComponent;
 import com.dmdirc.addons.parser_twitter.Twitter;
 import com.dmdirc.addons.parser_twitter.api.TwitterStatus;
@@ -34,19 +34,30 @@ import com.dmdirc.parser.interfaces.Parser;
  * Action components which expose Twitter functionality.
  *
  * @since 0.6.4
- * @author chris
  */
-public enum TwitterActionComponents implements ActionComponent {
+public class TwitterActionComponents {
 
     /** Takes a twitter channel name (&12345) and returns the status. */
-    TWITTER_CHANNEL_NAME_STATUS {
+    public static class ChannelNameStatus implements ActionComponent {
+
+        /** Server manager to use to get servers. */
+        private final ServerManager serverManager;
+
+        /**
+         * Creates a new instance of {@link ChannelNameStatus}.
+         *
+         * @param serverManager The server manager to use to get servers.
+         */
+        public ChannelNameStatus(final ServerManager serverManager) {
+            this.serverManager = serverManager;
+        }
 
         /** {@inheritDoc} */
         @Override
         public Object get(final Object arg) {
             final long id = Long.parseLong(((String) arg).substring(1));
 
-            for (Server server : Main.mainInstance.getServerManager().getServers()) {
+            for (Server server : serverManager.getServers()) {
                 final Parser parser = server.getParser();
 
                 if (parser instanceof Twitter) {
@@ -79,10 +90,16 @@ public enum TwitterActionComponents implements ActionComponent {
             return "twitter status (if a Twitter channel link)";
         }
 
-    },
+        /** {@inheritDoc} */
+        @Override
+        public String name() {
+            return "TWITTER_CHANNEL_NAME_STATUS";
+        }
+
+    };
 
     /** Returns the user who created a tweet. */
-    TWITTER_STATUS_USER {
+    public static class StatusUser implements ActionComponent {
 
         /** {@inheritDoc} */
         @Override
@@ -108,10 +125,16 @@ public enum TwitterActionComponents implements ActionComponent {
             return "user";
         }
 
-    },
+        /** {@inheritDoc} */
+        @Override
+        public String name() {
+            return "TWITTER_STATUS_USER";
+        }
+
+    };
 
     /** Returns the screen name of a twitter user. */
-    TWITTER_USER_SCREENNAME {
+    public static class UserScreenName implements ActionComponent {
 
         /** {@inheritDoc} */
         @Override
@@ -137,6 +160,12 @@ public enum TwitterActionComponents implements ActionComponent {
             return "screen name";
         }
 
+        /** {@inheritDoc} */
+        @Override
+        public String name() {
+            return "TWITTER_USER_SCREENNAME";
+        }
+
     };
 
 }