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

Timestamp:

2009-01-23T22:22:10+01:00 (16 years ago)

Author:

stoecker

Message:

reworked plugin handling a lot, more to come

Location:

trunk/src/org/openstreetmap/josm/plugins

Files:

• PluginDescription.java (added)
• PluginDownloader.java (modified) (2 diffs)
• PluginHandler.java (added)
• PluginInformation.java (modified) (4 diffs)
• PluginProxy.java (modified) (4 diffs)
• PluginSelection.java (added)

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

@@ -29 +29 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
-import org.openstreetmap.josm.gui.preferences.PluginPreference.PluginDescription;
 import org.xml.sax.SAXException;
 
@@ -76 +75 @@
     public static Collection<String> getSites() {
         return Main.pref.getCollection("pluginmanager.sites", Arrays.asList(pluginSites));
+    }
+    public static void setSites(Collection<String> c) {
+        Main.pref.putCollection("pluginmanager.sites", c);
     }
 

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

@@ -34 +34 @@
     public final String mainversion;
     public final String className;
+    public final String requires;
     public final String description;
     public final boolean early;
@@ -77 +78 @@
                 Attributes attr = manifest.getMainAttributes();
                 className = attr.getValue("Plugin-Class");
+                requires = attr.getValue("Plugin-Requires");
                 description = attr.getValue("Plugin-Description");
                 early = Boolean.parseBoolean(attr.getValue("Plugin-Early"));
@@ -107 +109 @@
                 early = false;
                 stage = 50;
+                requires = null;
                 version = null;
                 author = null;
@@ -215 +218 @@
         return all;
     }
-
-
-    /**
-     * Return information about a loaded plugin.
-     *
-     * Note that if you call this in your plugins bootstrap, you may get <code>null</code> if
-     * the plugin requested is not loaded yet.
-     *
-     * @return The PluginInformation to a specific plugin, but only if the plugin is loaded.
-     * If it is not loaded, <code>null</code> is returned.
-     */
-    public static PluginInformation getLoaded(String pluginName) {
-        for (PluginProxy p : Main.plugins)
-            if (p.info.name.equals(pluginName))
-                return p.info;
-        return null;
-    }
 }
 

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

@@ -7 +7 @@
 import org.openstreetmap.josm.gui.download.DownloadSelection;
 import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
-
+import org.openstreetmap.josm.tools.BugReportExceptionHandler;
 
 /**
@@ -31 +31 @@
         } catch (NoSuchMethodException e) {
         } catch (Exception e) {
-            throw new PluginException(this, info.name, e);
+            BugReportExceptionHandler.handleException(new PluginException(this, info.name, e));
         }
     }
@@ -41 +41 @@
             return null;
         } catch (Exception e) {
-            throw new PluginException(this, info.name, e);
+            BugReportExceptionHandler.handleException(new PluginException(this, info.name, e));
         }
+        return null;
     }
 
@@ -51 +52 @@
             // ignore
         } catch (Exception e) {
-            throw new PluginException(this, info.name, e);
+            BugReportExceptionHandler.handleException(new PluginException(this, info.name, e));
         }
     }