Changeset 22686 in osm for applications/editors/josm

Timestamp:

2010-08-19T00:44:22+02:00 (14 years ago)

Author:

bomm

Message:

bug #5348: use reflection to call RemoteControlPlugin

File:

• applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSPlugin.java (modified) (6 diffs)

applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSPlugin.java

@@ -15 +15 @@
 import java.io.InputStreamReader;
 import java.io.UnsupportedEncodingException;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -39 +41 @@
 import org.openstreetmap.josm.plugins.PluginInformation;
 import org.openstreetmap.josm.plugins.PluginProxy;
-import org.openstreetmap.josm.plugins.remotecontrol.RemoteControlPlugin;
 
 import wmsplugin.io.WMSLayerExporter;
@@ -61 +62 @@
 
         static boolean remoteControlAvailable = false;
+        static String remoteControlVersion = null;
 
         protected void initExporterAndImporter() {
@@ -86 +88 @@
         private void initRemoteControl() {
                 final String remotecontrolName = "remotecontrol";
-                final String remotecontrolVersion = "22675";
+                final String remotecontrolMinVersion = "22675";
                 for(PluginProxy pp: PluginHandler.pluginList)
                 {
@@ -92 +94 @@
                         if(remotecontrolName.equals(info.name))
                         {
-                                if(remotecontrolVersion.compareTo(info.version) <= 0)
+                                if(remotecontrolMinVersion.compareTo(info.version) <= 0)
                                 {
                                         remoteControlAvailable = true;
+                                        remoteControlVersion = info.version;
                                 }
                                 else
                                 {
                                         System.out.println("wmsplugin: remote control plugin version is " +
-                                                        info.version + ", need " + remotecontrolVersion + " or newer");
+                                                        info.version + ", need " + remotecontrolMinVersion + " or newer");
                                 }
                                 break;
@@ -107 +110 @@
                 if(remoteControlAvailable)
                 {
+                        remoteControlAvailable = false;
                         System.out.println("wmsplugin: initializing remote control");
-                        RemoteControlPlugin plugin =
-                                (RemoteControlPlugin) PluginHandler.getPlugin(remotecontrolName);
-                        plugin.addRequestHandler(WMSRemoteHandler.command, WMSRemoteHandler.class);
-                }
-                else
+                        Plugin plugin =
+                                (Plugin) PluginHandler.getPlugin(remotecontrolName);
+                        try {
+                                Method method = plugin.getClass().getMethod("addRequestHandler", String.class, Class.class);
+                                method.invoke(plugin, WMSRemoteHandler.command, WMSRemoteHandler.class);
+                                remoteControlAvailable = true;
+                        } catch (SecurityException e) {
+                                e.printStackTrace();
+                        } catch (NoSuchMethodException e) {
+                                e.printStackTrace();
+                        } catch (IllegalArgumentException e) {
+                                e.printStackTrace();
+                        } catch (IllegalAccessException e) {
+                                e.printStackTrace();
+                        } catch (InvocationTargetException e) {
+                                e.printStackTrace();
+                        }
+                }
+                if(!remoteControlAvailable)
                 {
                         System.out.println("wmsplugin: cannot use remote control");