PluginManager shouldn't keep a reference to Main.

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

src/com/dmdirc/Main.java

@@ -125,7 +125,7 @@ public class Main implements LifecycleController {
 
         MessageSinkManager.getManager().loadDefaultSinks();
 
-        pluginManager = new PluginManager(IdentityManager.getIdentityManager(), this);
+        pluginManager = new PluginManager(IdentityManager.getIdentityManager());
         checkBundledPlugins(pluginManager, IdentityManager.getIdentityManager().getGlobalConfiguration());
 
         ThemeManager.loadThemes();

src/com/dmdirc/plugins/PluginInfo.java

@@ -79,20 +79,20 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
     /** Is this plugin only loaded temporarily? */
     private boolean tempLoaded;
     /** List of classes this plugin has. */
-    private final List<String> myClasses = new ArrayList<String>();
+    private final List<String> myClasses = new ArrayList<>();
     /** Last Error Message. */
     @Getter
     private String lastError = "No Error";
     /** Are we trying to load? */
     private boolean isLoading;
     /** List of services we provide. */
-    private final List<Service> provides = new ArrayList<Service>();
+    private final List<Service> provides = new ArrayList<>();
     /** List of children of this plugin. */
-    private final List<PluginInfo> children = new ArrayList<PluginInfo>();
+    private final List<PluginInfo> children = new ArrayList<>();
     /** Map of exports. */
-    private final Map<String, ExportInfo> exports = new HashMap<String, ExportInfo>();
+    private final Map<String, ExportInfo> exports = new HashMap<>();
     /** List of identities. */
-    private final List<Identity> identities = new ArrayList<Identity>();
+    private final List<Identity> identities = new ArrayList<>();
 
     /**
      * Create a new PluginInfo.
@@ -164,13 +164,14 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
             injector.addParameter(parentPlugin);
         }
 
+        // TODO: This should be switched to using a full DI framework.
         injector.addParameter(PluginManager.class, metaData.getManager());
         injector.addParameter(ActionManager.getActionManager());
         injector.addParameter(PluginInfo.class, this);
-        injector.addParameter(Main.class, metaData.getManager().getMain());
+        injector.addParameter(Main.class, Main.mainInstance);
         injector.addParameter(PluginMetaData.class, metaData);
         injector.addParameter(IdentityManager.getIdentityManager());
-        injector.addParameter(ServerManager.class, metaData.getManager().getMain().getServerManager());
+        injector.addParameter(ServerManager.class, Main.mainInstance.getServerManager());
         injector.addParameter(CommandManager.getCommandManager());
         injector.addParameter(MessageSinkManager.class, MessageSinkManager.getManager());
         injector.addParameter(WindowManager.class, WindowManager.getWindowManager());
@@ -188,8 +189,7 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
      * @throws IOException if there is an error with the ResourceManager.
      */
     public Map<String, InputStream> getLicenceStreams() throws IOException {
-        final TreeMap<String, InputStream> licences =
-                new TreeMap<String, InputStream>(String.CASE_INSENSITIVE_ORDER);
+        final TreeMap<String, InputStream> licences = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
         licences.putAll(getResourceManager().getResourcesStartingWithAsInputStreams(
                 "META-INF/licences/"));
         return licences;
@@ -400,7 +400,7 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
     @Override
     public List<Service> getServices() {
         synchronized (provides) {
-            return new ArrayList<Service>(provides);
+            return new ArrayList<>(provides);
         }
     }
 
@@ -560,12 +560,7 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
 
             try {
                 plugin.onLoad();
-            } catch (LinkageError e) {
-                lastError = "Error in onLoad for " + metaData.getName() + ":"
-                        + e.getMessage();
-                Logger.userError(ErrorLevel.MEDIUM, lastError, e);
-                unloadPlugin();
-            } catch (Exception e) {
+            } catch (LinkageError | Exception e) {
                 lastError = "Error in onLoad for " + metaData.getName() + ":"
                         + e.getMessage();
                 Logger.userError(ErrorLevel.MEDIUM, lastError, e);
@@ -706,12 +701,7 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
                         if (!tempLoaded) {
                             try {
                                 plugin.onLoad();
-                            } catch (LinkageError e) {
-                                lastError = "Error in onLoad for "
-                                        + metaData.getName() + ":" + e.getMessage();
-                                Logger.userError(ErrorLevel.MEDIUM, lastError, e);
-                                unloadPlugin();
-                            } catch (Exception e) {
+                            } catch (LinkageError | Exception e) {
                                 lastError = "Error in onLoad for "
                                         + metaData.getName() + ":" + e.getMessage();
                                 Logger.userError(ErrorLevel.MEDIUM, lastError, e);
@@ -794,11 +784,7 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
                 // Now unload ourself
                 try {
                     plugin.onUnload();
-                } catch (Exception e) {
-                    lastError = "Error in onUnload for " + metaData.getName()
-                            + ":" + e + " - " + e.getMessage();
-                    Logger.userError(ErrorLevel.MEDIUM, lastError, e);
-                } catch (LinkageError e) {
+                } catch (Exception | LinkageError e) {
                     lastError = "Error in onUnload for " + metaData.getName()
                             + ":" + e + " - " + e.getMessage();
                     Logger.userError(ErrorLevel.MEDIUM, lastError, e);

src/com/dmdirc/plugins/PluginManager.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.plugins;
 
-import com.dmdirc.Main;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.config.IdentityManager;
@@ -54,30 +53,28 @@ import java.util.Map;
 public class PluginManager implements ActionListener, ServiceManager {
 
     /** List of known plugins' file names to their corresponding {@link PluginInfo} objects. */
-    private final Map<String, PluginInfo> knownPlugins = new HashMap<String, PluginInfo>();
+    private final Map<String, PluginInfo> knownPlugins = new HashMap<>();
 
     /** Set of known plugins' metadata. */
-    private final Collection<PluginMetaData> plugins = new HashSet<PluginMetaData>();
+    private final Collection<PluginMetaData> plugins = new HashSet<>();
 
     /** Directory where plugins are stored. */
     private final String myDir;
 
     /** Map of services. */
-    private final Map<String, Map<String, Service>> services = new HashMap<String, Map<String, Service>>();
-
-    /** Parent. */
-    private final Main main;
+    private final Map<String, Map<String, Service>> services = new HashMap<>();
 
     /** Global ClassLoader used by plugins from this manager. */
     private final GlobalClassLoader globalClassLoader;
 
     /**
      * Creates a new instance of PluginManager.
+     *
+     * @param identityManager The identity manager to use for configuration options.
      */
-    public PluginManager(final IdentityManager identityManager, final Main main) {
+    public PluginManager(final IdentityManager identityManager) {
         final String fs = System.getProperty("file.separator");
         myDir = identityManager.getConfigDir() + "plugins" + fs;
-        this.main = main;
         this.globalClassLoader = new GlobalClassLoader(this);
         ActionManager.getActionManager().registerListener(this,
                 CoreActionType.CLIENT_PREFS_OPENED,
@@ -94,17 +91,6 @@ public class PluginManager implements ActionListener, ServiceManager {
         return globalClassLoader;
     }
 
-    /**
-     * Get the instance of Main that owns this.
-     *
-     * @return main that owns this.
-     * @Deprecated Global state is bad.
-     */
-    @Deprecated
-    public Main getMain() {
-        return main;
-    }
-
     /** {@inheritDoc} */
     @Override
     public Service getService(final String type, final String name) {
@@ -126,7 +112,7 @@ public class PluginManager implements ActionListener, ServiceManager {
                 return service;
             }
         } else if (create) {
-            final Map<String, Service> map = new HashMap<String, Service>();
+            final Map<String, Service> map = new HashMap<>();
             final Service service = new Service(type, name);
             map.put(name, service);
             services.put(type, map);
@@ -190,17 +176,17 @@ public class PluginManager implements ActionListener, ServiceManager {
         // Find the type first
         if (services.containsKey(type)) {
             final Map<String, Service> map = services.get(type);
-            return new ArrayList<Service>(map.values());
+            return new ArrayList<>(map.values());
         }
 
-        return new ArrayList<Service>();
+        return new ArrayList<>();
     }
 
     /** {@inheritDoc} */
     @Override
     public List<Service> getAllServices() {
         // Find the type first
-        final List<Service> allServices = new ArrayList<Service>();
+        final List<Service> allServices = new ArrayList<>();
         for (Map<String, Service> map : services.values()) {
             allServices.addAll(map.values());
         }
@@ -411,7 +397,7 @@ public class PluginManager implements ActionListener, ServiceManager {
         synchronized (plugins) {
             plugins.removeAll(newPlugins);
 
-            for (PluginMetaData oldPlugin : new HashSet<PluginMetaData>(plugins)) {
+            for (PluginMetaData oldPlugin : new HashSet<>(plugins)) {
                 delPlugin(oldPlugin.getRelativeFilename());
             }
 
@@ -428,7 +414,7 @@ public class PluginManager implements ActionListener, ServiceManager {
      * available updates.
      */
     public void applyUpdates() {
-        final Deque<File> dirs = new LinkedList<File>();
+        final Deque<File> dirs = new LinkedList<>();
 
         dirs.add(new File(myDir));
 
@@ -454,11 +440,10 @@ public class PluginManager implements ActionListener, ServiceManager {
      * @return A list of all installed or known plugins
      */
     public Collection<PluginMetaData> getAllPlugins() {
-        final Collection<PluginMetaData> res
-                = new HashSet<PluginMetaData>(plugins.size());
+        final Collection<PluginMetaData> res = new HashSet<>(plugins.size());
 
-        final Deque<File> dirs = new LinkedList<File>();
-        final Collection<String> pluginPaths = new LinkedList<String>();
+        final Deque<File> dirs = new LinkedList<>();
+        final Collection<String> pluginPaths = new LinkedList<>();
 
         dirs.add(new File(myDir));
 
@@ -471,9 +456,9 @@ public class PluginManager implements ActionListener, ServiceManager {
             }
         }
 
-        final MapList<String, String> newServices = new MapList<String, String>();
-        final Map<String, PluginMetaData> newPluginsByName = new HashMap<String, PluginMetaData>();
-        final Map<String, PluginMetaData> newPluginsByPath = new HashMap<String, PluginMetaData>();
+        final MapList<String, String> newServices = new MapList<>();
+        final Map<String, PluginMetaData> newPluginsByName = new HashMap<>();
+        final Map<String, PluginMetaData> newPluginsByPath = new HashMap<>();
 
         // Initialise all of our metadata objects
         for (String target : pluginPaths) {
@@ -554,7 +539,7 @@ public class PluginManager implements ActionListener, ServiceManager {
      * @return Collection<PluginInfo> of known plugins.
      */
     public Collection<PluginInfo> getPluginInfos() {
-        return new ArrayList<PluginInfo>(knownPlugins.values());
+        return new ArrayList<>(knownPlugins.values());
     }
 
     /** {@inheritDoc} */
@@ -568,10 +553,10 @@ public class PluginManager implements ActionListener, ServiceManager {
                 if (pi.isLoaded() || pi.isTempLoaded()) {
                     try {
                         pi.getPlugin().showConfig((PreferencesDialogModel) arguments[0]);
-                    } catch (LinkageError le) {
-                        Logger.userError(ErrorLevel.MEDIUM, "Error with plugin (" + pi.getMetaData().getFriendlyName() + "), unable to show config (" + le + ")", le);
-                    } catch (Exception ex) {
-                        Logger.userError(ErrorLevel.MEDIUM, "Error with plugin (" + pi.getMetaData().getFriendlyName() + "), unable to show config (" + ex + ")", ex);
+                    } catch (LinkageError | Exception le) {
+                        Logger.userError(ErrorLevel.MEDIUM,
+                                "Error with plugin (" + pi.getMetaData().getFriendlyName()
+                                + "), unable to show config (" + le + ")", le);
                     }
                 }
             }

test/com/dmdirc/TestMain.java

@@ -40,7 +40,7 @@ public class TestMain extends Main {
                 parserFactoryProvider,
                 IdentityManager.getIdentityManager());
         ActionManager.initActionManager(serverManager, IdentityManager.getIdentityManager());
-        pluginManager = new PluginManager(IdentityManager.getIdentityManager(), this);
+        pluginManager = new PluginManager(IdentityManager.getIdentityManager());
         pluginManager.refreshPlugins();
         CommandManager.initCommandManager(IdentityManager.getIdentityManager(), serverManager);