Bläddra i källkod

Remove silly prerequisites check from mediasource_dcop

Make some nice assumptions about exported dcop service to simplify method further
tags/0.6.3m1rc1
Chris Smith 15 år sedan
förälder
incheckning
27ffcfe559
1 ändrade filer med 2 tillägg och 34 borttagningar
  1. 2
    34
      src/com/dmdirc/addons/mediasource_dcop/DcopMediaSourcePlugin.java

+ 2
- 34
src/com/dmdirc/addons/mediasource_dcop/DcopMediaSourcePlugin.java Visa fil

@@ -24,14 +24,8 @@ package com.dmdirc.addons.mediasource_dcop;
24 24
 
25 25
 import com.dmdirc.addons.nowplaying.MediaSource;
26 26
 import com.dmdirc.addons.nowplaying.MediaSourceManager;
27
-import com.dmdirc.config.prefs.validator.ValidationResponse;
28 27
 import com.dmdirc.plugins.Plugin;
29
-import com.dmdirc.plugins.PluginInfo;
30 28
 import com.dmdirc.plugins.PluginManager;
31
-import com.dmdirc.plugins.Service;
32
-import com.dmdirc.plugins.NoSuchProviderException;
33
-import com.dmdirc.plugins.ServiceProvider;
34
-import com.dmdirc.plugins.ExportedService;
35 29
 
36 30
 import java.util.ArrayList;
37 31
 import java.util.List;
@@ -64,17 +58,8 @@ public class DcopMediaSourcePlugin extends Plugin
64 58
      */
65 59
     @SuppressWarnings("unchecked")
66 60
     protected static List<String> getDcopResult(final String query) {
67
-        List<String> result = new ArrayList<String>();
68
-        try {
69
-            final ExportedService exportedService = PluginManager.getPluginManager().getExportedService("dcop");
70
-
71
-            final Object obj = exportedService.execute(query);
72
-            if (obj instanceof List) {
73
-                result = (List<String>) obj;
74
-            }
75
-        } catch (NoSuchProviderException nspe) { }
76
-        
77
-        return result;
61
+        return (List<String>) PluginManager.getPluginManager()
62
+                .getExportedService("dcop").execute(query);
78 63
     }
79 64
     
80 65
     /** {@inheritDoc} */
@@ -94,22 +79,5 @@ public class DcopMediaSourcePlugin extends Plugin
94 79
     public void onUnload() {
95 80
         // Nothing to do
96 81
     }
97
-    
98
-    /** {@inheritDoc} */
99
-    @Override
100
-    public ValidationResponse checkPrerequisites() {
101
-        PluginManager.getPluginManager().addPlugin("dcop.jar");
102
-        
103
-        final PluginInfo pi = PluginManager.getPluginManager().getPluginInfoByName("dcop");
104
-        
105
-        if (pi == null) {
106
-            return new ValidationResponse("DCOP Plugin not found");
107
-        }
108
-        
109
-        if (!pi.isLoaded()) {
110
-            pi.loadPlugin();
111
-        }
112 82
 
113
-        return new ValidationResponse();
114
-    }
115 83
 }

Laddar…
Avbryt
Spara