Changeset 2563 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableMemberCellRenderer.java

Timestamp:

03.12.2009 19:02:25 (2 years ago)

Author:

Gubaer

Message:

fixed #3400: relation editor: improvement to highlight an element
fixed #3873: Feature request: download selected elements in relation editor
New: Dbl-Click in member table to set the map selection to this member
New: Ctrl-Dbl-Clik in member table to add the member to the the map selection
New: Download selected incomplete members only

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableMemberCellRenderer.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableMemberCellRenderer.java

@@ -3 +3 @@
 
 import java.awt.Component;
-import java.util.HashMap;
 
-import javax.swing.ImageIcon;
 import javax.swing.JTable;
 
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.gui.DefaultNameFormatter;
 import org.openstreetmap.josm.tools.ImageProvider;
 
 public class MemberTableMemberCellRenderer extends MemberTableCellRenderer {
-    private HashMap<OsmPrimitiveType, ImageIcon> icons;
 
     public MemberTableMemberCellRenderer() {
         super();
-        loadIcons();
-    }
-
-    /**
-     * Load the image icon for an OSM primitive of type node
-     *
-     * @return the icon; null, if not found
-     */
-    protected void loadIcons() {
-        icons = new HashMap<OsmPrimitiveType, ImageIcon>();
-        icons.put(OsmPrimitiveType.NODE, ImageProvider.get("data", "node"));
-        icons.put(OsmPrimitiveType.WAY, ImageProvider.get("data", "way"));
-        icons.put(OsmPrimitiveType.RELATION, ImageProvider.get("data", "relation"));
     }
 
     protected void renderPrimitive(OsmPrimitive primitive) {
-        setIcon(icons.get(OsmPrimitiveType.from(primitive)));
+        setIcon(ImageProvider.get(primitive.getPrimitiveId().getType()));
         setText(primitive.getDisplayName(DefaultNameFormatter.getInstance()));
-        setToolTipText(buildToolTipText(primitive));
+        setToolTipText(DefaultNameFormatter.getInstance().buildDefaultToolTip(primitive));
     }