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

Timestamp:

2013-06-13T02:20:32+02:00 (12 years ago)

Author:

donvip

Message:

[josm_opendata] update Toulouse module + menu icons

Location:

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

Files:

• OdPlugin.java (modified) (6 diffs)
• core/datasets/AbstractDataSetHandler.java (modified) (4 diffs)
• core/datasets/SimpleDataSetHandler.java (modified) (3 diffs)

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

@@ -19 +19 @@
 import static org.openstreetmap.josm.tools.I18n.marktr;
 
+import java.awt.Image;
 import java.awt.Toolkit;
 import java.awt.event.KeyEvent;
@@ -28 +29 @@
 import java.util.Map;
 
+import javax.swing.ImageIcon;
 import javax.swing.JMenu;
 import javax.swing.JMenuItem;
@@ -129 +131 @@
                                         if ((endMenu = catMenus.get(cat)) == null) {
                                                 catMenus.put(cat, endMenu = new JMenu(cat.getName()));
+                                                setMenuItemIcon(cat.getIcon(), endMenu);
                                                 moduleMenu.add(endMenu);
                                         }
@@ -139 +142 @@
                                         handlerName = handler.getClass().getName();
                                 }
+                                JMenuItem handlerItem = null;
                                 if (handler.getDataURL() != null) {
-                                        endMenu.add(new DownloadDataAction(handlerName, handler.getDataURL()));
+                                    handlerItem = endMenu.add(new DownloadDataAction(handlerName, handler.getDataURL()));
                                 } else if (handler.getDataURLs() != null) {
                                         JMenu handlerMenu = new JMenu(handlerName);
@@ -151 +155 @@
                                         if (item != null) {
                                                 MenuScroller.setScrollerFor(handlerMenu, (screenHeight / item.getPreferredSize().height)-3);
-                                                endMenu.add(handlerMenu);
+                                                handlerItem = endMenu.add(handlerMenu);
                                         }
+                                }
+                                if (handlerItem != null) {
+                                    setMenuItemIcon(handler.getMenuIcon(), handlerItem);
                                 }
                         }
@@ -164 +171 @@
         /*JMenuItem itemIcon =*/ MainMenu.add(menu, new OpenPreferencesActions());
         //MenuScroller.setScrollerFor(menu, screenHeight / itemIcon.getPreferredSize().height);
+        }
+        
+        private void setMenuItemIcon(ImageIcon icon, JMenuItem menuItem) {
+        if (icon != null) {
+            if (icon.getIconHeight() != 16 || icon.getIconWidth() != 16) { 
+                icon = new ImageIcon(icon.getImage().getScaledInstance(16, 16, Image.SCALE_DEFAULT));
+            }
+            menuItem.setIcon(icon);
+        }
         }
 

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

@@ -23 +23 @@
 import java.util.List;
 import java.util.regex.Pattern;
+
+import javax.swing.ImageIcon;
 
 import org.openstreetmap.josm.actions.JosmAction;
@@ -44 +46 @@
 import org.openstreetmap.josm.plugins.opendata.core.licenses.License;
 import org.openstreetmap.josm.plugins.opendata.core.util.NamesFrUtils;
+import org.openstreetmap.josm.plugins.opendata.core.util.OdUtils;
 import org.openstreetmap.josm.tools.Pair;
 
@@ -85 +88 @@
         private String sourceDate;
         private File associatedFile;
+        private ImageIcon menuIcon;
 
         public AbstractDataSetHandler() {
@@ -397 +401 @@
                                 fileNameWithoutExtension+"."+MAPCSS_EXT);
         }
-                
+        
+    public final ImageIcon getMenuIcon() {
+        return menuIcon;
+    }
+
+    public final void setMenuIcon(ImageIcon icon) {
+        this.menuIcon = icon;
+    }
+
+    public final void setMenuIcon(String iconName) {
+        setMenuIcon(OdUtils.getImageIcon(iconName));
+    }
+
         public final void setAssociatedFile(File associatedFile) {
                 this.associatedFile = associatedFile;

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

@@ -16 +16 @@
 package org.openstreetmap.josm.plugins.opendata.core.datasets;
 
+import static org.openstreetmap.josm.plugins.opendata.core.io.OverpassApi.OaQueryType.NODE;
+import static org.openstreetmap.josm.plugins.opendata.core.io.OverpassApi.OaQueryType.RELATION;
+import static org.openstreetmap.josm.plugins.opendata.core.io.OverpassApi.OaQueryType.WAY;
+import static org.openstreetmap.josm.plugins.opendata.core.io.OverpassApi.OaRecurseType.NODE_RELATION;
+import static org.openstreetmap.josm.plugins.opendata.core.io.OverpassApi.OaRecurseType.RELATION_WAY;
+import static org.openstreetmap.josm.plugins.opendata.core.io.OverpassApi.OaRecurseType.WAY_NODE;
+import static org.openstreetmap.josm.plugins.opendata.core.io.OverpassApi.OaRecurseType.WAY_RELATION;
+
 import java.util.ArrayList;
 import java.util.Collection;
@@ -24 +32 @@
 import org.openstreetmap.josm.data.osm.Tag;
 import org.openstreetmap.josm.data.projection.Projection;
+import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
 import org.openstreetmap.josm.plugins.opendata.core.io.OverpassApi;
-
-import static org.openstreetmap.josm.plugins.opendata.core.io.OverpassApi.OaQueryType.*;
-import static org.openstreetmap.josm.plugins.opendata.core.io.OverpassApi.OaRecurseType.*;
 
 public abstract class SimpleDataSetHandler extends AbstractDataSetHandler {
@@ -45 +51 @@
                 addRelevantTag(relevantTag);
                 this.relevantUnion = false;
+        Tag tag;
+                String[] kv = relevantTag.split("=");
+                if (kv != null && kv.length == 2) {
+                tag = new Tag(kv[0], kv[1]);
+                } else {
+                    tag = new Tag(relevantTag);
+                }
+                setMenuIcon(MapPaintStyles.getNodeIcon(tag));
         }