Changeset 3070 in josm for trunk/src/org/openstreetmap/josm/plugins

Timestamp:

2010-03-02T20:55:48+01:00 (15 years ago)

Author:

Gubaer

Message:

Removing @deprecated support for former ugly hacks in the plugin handling. Plugins in OSM SVN are migrated.

Location:

trunk/src/org/openstreetmap/josm/plugins

Files:

• Plugin.java (modified) (1 diff)
• PluginInformation.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/plugins/Plugin.java

@@ -46 +46 @@
     private PluginInformation info = null;
 
-    /**
-     * The no-arg constructor is deprecated.
-     * 
-     * @deprecated use {@see Plugin(PluginInformation)} instead
-     */
-    @Deprecated
-    public Plugin() {
-
-    }
     /**
      * Creates the plugin

trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java

@@ -10 +10 @@
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -193 +192 @@
     public PluginProxy load(Class<?> klass) throws PluginException{
         try {
-            try {
-                Constructor<?> c = klass.getConstructor(PluginInformation.class);
-                Object plugin = c.newInstance(this);
-                return new PluginProxy(plugin, this);
-            } catch(NoSuchMethodException e) {
-                // do nothing - try again with the noarg constructor for legacy support
-            } catch(InstantiationException e) {
-                // do nothing - try again with the noarg constructor for legacy support
-            }
-            // FIXME: This is legacy support. It is necessary because of a former ugly hack in the
-            // plugin bootstrap procedure. Plugins should be migrated to the new required
-            // constructor with PluginInformation as argument, new plugins should only use this
-            // constructor. The following is legacy support and should be removed by Q2/2010.
-            // Note that this is not fool proof because it isn't
-            // completely equivalent with the former hack: plugins derived from the Plugin
-            // class can't access their local "info" object any more from within the noarg-
-            // constructor. It is only set *after* constructor invocation.
-            //
-            Constructor<?> c = klass.getConstructor();
-            Object plugin = c.newInstance();
-            if (plugin instanceof Plugin) {
-                Method m = klass.getMethod("setPluginInformation", PluginInformation.class);
-                m.invoke(plugin, this);
-            }
+            Constructor<?> c = klass.getConstructor(PluginInformation.class);
+            Object plugin = c.newInstance(this);
             return new PluginProxy(plugin, this);
         } catch(NoSuchMethodException e) {