Changeset 3844 in josm for trunk/src/org/openstreetmap/josm/gui/conflict

Timestamp:

2011-02-02T16:56:07+01:00 (13 years ago)

Author:

stoecker

Message:

see #5899 - support different display of closed ways and areas

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellRenderer.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellRenderer.java

@@ -38 +38 @@
     public final static Color BGCOLOR_FROZEN = new Color(234,234,234);
 
-    private ImageIcon nodeIcon;
-    private ImageIcon wayIcon;
-    private ImageIcon relationIcon;
     private  Border rowNumberBorder = null;
-
-    /**
-     * Load the image icon for an OSM primitive of type node
-     *
-     * @return the icon; null, if not found
-     */
-    protected void loadIcons() {
-        nodeIcon = ImageProvider.get("data", "node");
-        wayIcon = ImageProvider.get("data", "way");
-        relationIcon = ImageProvider.get("data", "relation");
-    }
 
     /**
@@ -60 +46 @@
         setIcon(null);
         setOpaque(true);
-        loadIcons();
         rowNumberBorder = BorderFactory.createEmptyBorder(0,4,0,0);
     }
@@ -156 +141 @@
         setText(displayName);
         setToolTipText(buildToolTipText(member.getMember()));
-        if (member.isNode()) {
-            setIcon(nodeIcon);
-        } else if (member.isWay()) {
-            setIcon(wayIcon);
-        } else if (member.isRelation()) {
-            setIcon(relationIcon);
-        } else {
-            // should not happen
-            setIcon(null);
-        }
+        setIcon(ImageProvider.get(member.getDisplayType()));
     }