Changeset 30211 in osm for applications/editors/josm/plugins/opendata/src

Timestamp:

2014-01-19T01:17:29+01:00 (11 years ago)

Author:

donvip

Message:

[josm_opendata] fix module/handlers conflicts in toolbar actions with same name

Location:

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

Files:

• OdPlugin.java (modified) (2 diffs)
• core/datasets/AbstractDataSetHandler.java (modified) (1 diff)

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

@@ -121 +121 @@
                 JMenu moduleMenu = null;
                 for (AbstractDataSetHandler handler: module.getNewlyInstanciatedHandlers()) {
-                        if (handler.getDataURL() != null || (handler.getDataURLs() != null && !handler.getDataURLs().isEmpty())) {
+                    URL dataURL = handler.getDataURL();
+                    List<Pair<String, URL>> dataURLs = handler.getDataURLs();
+                        if (dataURL != null || (dataURLs != null && !dataURLs.isEmpty())) {
                                 if (moduleMenu == null) {
                                         moduleMenu = getModuleMenu(module);
@@ -142 +144 @@
                                 }
                                 JMenuItem handlerItem = null;
-                                if (handler.getDataURL() != null) {
-                                    handlerItem = endMenu.add(new DownloadDataAction(handlerName, handler.getDataURL()));
-                                } else if (handler.getDataURLs() != null) {
+                                if (dataURL != null) {
+                                    handlerItem = endMenu.add(new DownloadDataAction(module.getDisplayedName()+"_"+handlerName, dataURL));
+                                } else if (dataURLs != null) {
                                         JMenu handlerMenu = new JMenu(handlerName);
                                         JMenuItem item = null;
-                                        for (Pair<String, URL> pair : handler.getDataURLs()) {
+                                        for (Pair<String, URL> pair : dataURLs) {
                                                 if (pair != null && pair.a != null && pair.b != null) {
                                                         item = handlerMenu.add(new DownloadDataAction(pair.a, pair.b));

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

@@ -427 +427 @@
         
         public boolean acceptsUrl(String url) {
-                if (getDataURL() != null && url.equals(getDataURL().toString())) {
+            URL dataURL = getDataURL();
+                if (dataURL != null && url.equals(dataURL.toString())) {
                         return true;
                 }
-                if (getDataURLs() != null) {
-                        for (Pair<String, URL> pair : getDataURLs()) {
+                List<Pair<String, URL>> dataURLs = getDataURLs();
+                if (dataURLs != null) {
+                        for (Pair<String, URL> pair : dataURLs) {
                                 if (pair.b != null && url.equals(pair.b.toString())) {
                                         return true;