DcopMediaSourcePlugin now tries to load the dcop plugin if it's not loaded, rather than just blindly failing

git-svn-id: http://svn.dmdirc.com/trunk@2622 00569f92-eb28-0410-84fd-f71c24880f

src/com/dmdirc/addons/mediasources/dcop/DcopMediaSourcePlugin.java

@@ -25,10 +25,10 @@ package com.dmdirc.addons.mediasources.dcop;
 import com.dmdirc.addons.nowplaying.MediaSource;
 import com.dmdirc.addons.nowplaying.MediaSourceManager;
 import com.dmdirc.plugins.Plugin;
+import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -52,24 +52,36 @@ public class DcopMediaSourcePlugin extends Plugin
     }
     
     /** {@inheritDoc} */
+    @Override
     public List<MediaSource> getSources() {
         return sources;
     }
     
     /** {@inheritDoc} */
+    @Override
     public void onLoad() {
     }
     
     /** {@inheritDoc} */
+    @Override
     public void onUnload() {
     }
     
     /** {@inheritDoc} */
+    @Override
     public boolean checkPrerequisites() {
-        if (Arrays.asList(PluginManager.getPluginManager().getMainClassNames()).
-                contains("com.dmdirc.addons.dcop.DcopPlugin")) {
-            return true;
+        PluginManager.getPluginManager().addPlugin("dcop.jar");
+        
+        final PluginInfo pi = PluginManager.getPluginManager().getPluginInfoByName("dcop");
+        
+        if (pi == null) {
+            return false;
         }
-        return false;
+        
+        if (!pi.isLoaded()) {
+            pi.loadPlugin();
+        }
+
+        return true;
     }
 }

src/com/dmdirc/plugins/PluginManager.java

@@ -213,22 +213,6 @@ public class PluginManager {
         return result;
     }
 
-    /**
-     * Get string[] of known plugin mainclass names.
-     *
-     * @return string[] of known plugin mainclass names.
-     * @deprecated Pointless method. Iterate getPluginInfos instead.
-     */
-    @Deprecated
-    public String[] getMainClassNames() {
-        final String[] result = new String[knownPlugins.size()];
-        int i = 0;
-        for (String name : knownPlugins.keySet()) {
-            result[i++] = knownPlugins.get(name).getMainClass();
-        }
-        return result;
-    }
-
     /**
      * Retrieves a list of all installed plugins.
      * Any file under the main plugin directory (~/.DMDirc/plugins or similar)