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

Timestamp:

2014-02-25T00:13:55+01:00 (11 years ago)

Author:

donvip

Message:

[josm_opendata] various stuff

Location:

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

Files:

• OdPlugin.java (modified) (2 diffs)
• core/actions/DownloadDataAction.java (modified) (2 diffs)
• core/io/archive/ZipImporter.java (modified) (2 diffs)

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/OdPlugin.java

@@ -145 +145 @@
                                 JMenuItem handlerItem = null;
                                 if (dataURL != null) {
-                                    handlerItem = endMenu.add(new DownloadDataAction(module.getDisplayedName()+"_"+handlerName, dataURL));
+                                    handlerItem = endMenu.add(new DownloadDataAction(module, handlerName, dataURL));
                                 } else if (dataURLs != null) {
                                         JMenu handlerMenu = new JMenu(handlerName);
@@ -151 +151 @@
                                         for (Pair<String, URL> pair : dataURLs) {
                                                 if (pair != null && pair.a != null && pair.b != null) {
-                                                        item = handlerMenu.add(new DownloadDataAction(pair.a, pair.b));
+                                                        item = handlerMenu.add(new DownloadDataAction(module, pair.a, pair.b));
                                                 }
                                         }

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

@@ -23 +23 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.plugins.opendata.core.modules.Module;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 
@@ -29 +30 @@
         private final URL url;
         
-        public DownloadDataAction(String name, URL url) {
+        public DownloadDataAction(Module module, String name, URL url) {
                 super(false);
                 CheckParameterUtil.ensureParameterNotNull(name, "name");
                 CheckParameterUtil.ensureParameterNotNull(url, "url");
                 putValue(Action.NAME, name);
-                putValue("toolbar", "opendata_download_"+name.toLowerCase().replace(" ", "_"));
+                putValue("toolbar", ("opendata_download_"+module.getDisplayedName()+"_"+name).toLowerCase().replace(" ", "_"));
                 this.url = url;
         }

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/archive/ZipImporter.java

@@ -16 +16 @@
 package org.openstreetmap.josm.plugins.opendata.core.io.archive;
 
+import java.io.File;
 import java.io.InputStream;
 
@@ -38 +39 @@
                 }
         }
+
+    @Override
+    public boolean acceptFile(File pathname) {
+        return super.acceptFile(pathname) && !pathname.getName().endsWith(".osm.zip");
+    }
 }