Changeset 287 in josm

Timestamp:

2007-07-11T23:32:16+02:00 (17 years ago)

Author:

imi

Message:

• added LatestRelease plugin site
• added feature to order the list of plugin sites

Files:

• src/org/openstreetmap/josm/gui/preferences/PluginPreference.java (modified) (4 diffs)
• src/org/openstreetmap/josm/plugins/PluginDownloader.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/plugins/test_manifest.mf (moved) (moved from src/org/openstreetmap/josm/plugins/test_manifest.mf )

src/org/openstreetmap/josm/gui/preferences/PluginPreference.java

@@ -91 +91 @@
             }
                 });
-                plugin.add(update, GBC.std().insets(0,0,10,0));
+                //TODO: plugin.add(update, GBC.std().insets(0,0,10,0));
 
                 JButton configureSites = new JButton(tr("Configure Plugin Sites"));
@@ -99 +99 @@
             }
                 });
-                plugin.add(configureSites, GBC.std());
+                //TODO: plugin.add(configureSites, GBC.std());
 
                 refreshPluginPanel(gui);
@@ -140 +140 @@
                         File[] pluginFiles = new File(location).listFiles();
                         if (pluginFiles != null) {
+                                Arrays.sort(pluginFiles);
                                 for (File f : pluginFiles) {
                                         if (!f.isFile())
@@ -149 +150 @@
                             } catch (PluginException x) {
                             }
-                                        } else if (f.getName().endsWith(".xml")) {
+                                        } else if (f.getName().matches("^[0-9]+-site.*\\.xml$")) {
                                                 try {
                                 Uniform<PluginDescription> parser = new Uniform<PluginDescription>(new FileReader(f), "plugin", PluginDescription.class);
                                 for (PluginDescription pd : parser)
-                                        availablePlugins.put(pd.name, pd);
+                                        if (!availablePlugins.containsKey(pd.name))
+                                                availablePlugins.put(pd.name, pd);
                         } catch (Exception e) {
                                 e.printStackTrace();

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

@@ -28 +28 @@
         public static int downloadDescription() {
                 int count = 0;
-                for (String site : Main.pref.get("pluginmanager.sites", "http://josm.openstreetmap.de/wiki/Plugins").split(" ")) {
+                for (String site : Main.pref.get("pluginmanager.sites", "http://josm.openstreetmap.de/wiki/Plugins/LatestRelease http://josm.openstreetmap.de/wiki/Plugins").split(" ")) {
                         try {
                                 BufferedReader r = new BufferedReader(new InputStreamReader(new URL(site).openStream()));
@@ -38 +38 @@
                                 r.close();
                                 new File(Main.pref.getPreferencesDir()+"plugins").mkdir();
-                                FileWriter out = new FileWriter(Main.pref.getPreferencesDir()+"plugins/site-"+site.replaceAll("[/:\\\\ <>|]", "_")+".xml");
+                                FileWriter out = new FileWriter(Main.pref.getPreferencesDir()+"plugins/"+count+"-site-"+site.replaceAll("[/:\\\\ <>|]", "_")+".xml");
                                 out.append(txt);
                                 out.close();