Changeset 3380 in josm for trunk/src/org

Timestamp:

2010-07-21T21:17:09+02:00 (14 years ago)

Author:

stoecker

Message:

readded plugin checking

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/Preferences.java (modified) (1 diff)
• plugins/ReadRemotePluginInformationTask.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -752 +752 @@
      * The default plugin site
      */
-    private final static String[] DEFAULT_PLUGIN_SITE = {"http://josm.openstreetmap.de/plugin"};
+    private final static String[] DEFAULT_PLUGIN_SITE = {"http://josm.openstreetmap.de/plugin%<?plugins=>"};
 
     /**

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

@@ -104 +104 @@
         String name;
         try {
+            site = site.replaceAll("%<(.*)>", "");
             URL url = new URL(site);
             StringBuilder sb = new StringBuilder();
@@ -146 +147 @@
         StringBuilder sb = new StringBuilder();
         try {
+            /* replace %<x> with empty string or x=plugins (separated with comma) */
+            String pl = Main.pref.getCollectionAsString("plugins");
+            String printsite = site.replaceAll("%<(.*)>", "");
+            if(pl != null && pl.length() != 0)
+                site = site.replaceAll("%<(.*)>", "$1"+pl);
+            else
+                site = printsite;
+
             monitor.beginTask("");
-            monitor.indeterminateSubTask(tr("Downloading plugin list from ''{0}''", site));
+            monitor.indeterminateSubTask(tr("Downloading plugin list from ''{0}''", printsite));
 
             URL url = new URL(site);
@@ -196 +205 @@
         InputStream in = null;
         OutputStream out = null;
-        System.err.println("icons site: "+site);
-        try {
+        try {
+            site = site.replaceAll("%<(.*)>", "");
+
             monitor.beginTask("");
             monitor.indeterminateSubTask(tr("Downloading plugin list from ''{0}''", site));
@@ -337 +347 @@
 
         for (String site: sites) {
-            getProgressMonitor().subTask(tr("Processing plugin list from site ''{0}''", site));
+            String printsite = site.replaceAll("%<(.*)>", "");
+            getProgressMonitor().subTask(tr("Processing plugin list from site ''{0}''", printsite));
             String list = downloadPluginList(site, getProgressMonitor().createSubTaskMonitor(0, false));
             if (canceled) return;