Changeset 30093 in osm for applications/editors/josm/plugins/opendata/src/org

Timestamp:

2013-11-25T01:06:13+01:00 (11 years ago)

Author:

donvip

Message:

[josm_opendata] cleanup

Location:

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core

Files:

• OdConstants.java (modified) (1 diff)
• gui/ModulePreference.java (modified) (2 diffs)
• modules/ModuleInformation.java (modified) (1 diff)
• modules/ReadRemoteModuleInformationTask.java (modified) (4 diffs)

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/OdConstants.java

@@ -66 +66 @@
     public static final String PREF_MODULES = "opendata.modules";
     public static final String PREF_MODULES_SITES = "opendata.modules.sites";
-    public final static String GOOGLE_SITE = "http://josm-toulouse-data.googlecode.com/svn/trunk/";
     public final static String OSM_SITE = "http://svn.openstreetmap.org/applications/editors/josm/plugins/opendata/";
     public final static String[] DEFAULT_MODULE_SITES = {OSM_SITE + "modules.txt%<?modules=>"};

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/gui/ModulePreference.java

@@ -268 +268 @@
                     SwingUtilities.invokeLater(new Runnable() {
                         public void run() {
-                            model.updateAvailableModules(task.getAvailabeModules());
+                            model.updateAvailableModules(task.getAvailableModules());
                             pnlModulePreferences.refreshView();
                         }
@@ -354 +354 @@
                     if (moduleInfoDownloadTask.isCanceled())
                         return;
-                    model.updateAvailableModules(moduleInfoDownloadTask.getAvailabeModules());
+                    model.updateAvailableModules(moduleInfoDownloadTask.getAvailableModules());
                     // select modules which actually have to be updated
                     //

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ModuleInformation.java

@@ -232 +232 @@
             sb.append(" <a href=\"").append(link).append("\">").append(tr("More info...")).append("</a>");
         }
-        if (downloadlink != null && !downloadlink.startsWith(OSM_SITE+"dist/") && !downloadlink.startsWith(GOOGLE_SITE+"dist/")) {
+        if (downloadlink != null && !downloadlink.startsWith(OSM_SITE+"dist/")) {
             sb.append("<p>&nbsp;</p><p>"+tr("<b>Module provided by an external source:</b> {0}", downloadlink)+"</p>");
         }

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ReadRemoteModuleInformationTask.java

@@ -39 +39 @@
 import java.util.List;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Version;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
@@ -94 +93 @@
     }
 
-
     @Override
     protected void cancel() {
@@ -162 +160 @@
         StringBuilder sb = new StringBuilder();
         try {
-            /* replace %<x> with empty string or x=modules (separated with comma) */
-            String pl = Utils.join(",", Main.pref.getCollection(PREF_MODULES));
+            // replace %<x> with empty string */
             String printsite = site.replaceAll("%<(.*)>", "");
-            if(pl != null && pl.length() != 0) {
-                site = site.replaceAll("%<(.*)>", "$1"+pl);
-            } else {
-                site = printsite;
-            }
 
             monitor.beginTask("");
             monitor.indeterminateSubTask(tr("Downloading module list from ''{0}''", printsite));
 
-            URL url = new URL(site);
+            URL url = new URL(printsite);
             synchronized(this) {
                 connection = (HttpURLConnection)url.openConnection();
@@ -378 +370 @@
      * @return  the list of modules
      */
-    public List<ModuleInformation> getAvailabeModules() {
+    public List<ModuleInformation> getAvailableModules() {
         return availableModules;
     }