Changeset 14864 in josm for trunk/src/org/openstreetmap

Timestamp:

2019-03-09T19:09:07+01:00 (6 years ago)

Author:

GerdP

Message:

simplify code, no need to duplicate the EnumMap created in ImageProvider in r14331

File:

• trunk/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java

@@ -5 +5 @@
 
 import java.awt.Component;
-import java.util.EnumMap;
-import java.util.Map;
 
-import javax.swing.ImageIcon;
 import javax.swing.JLabel;
 import javax.swing.JTable;
 import javax.swing.table.TableCellRenderer;
 
-import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.RelationMemberData;
 import org.openstreetmap.josm.gui.history.TwoColumnDiff.Item;
@@ -25 +21 @@
 public class RelationMemberListTableCellRenderer extends JLabel implements TableCellRenderer {
 
-    private final transient Map<OsmPrimitiveType, ImageIcon> icons;
-
     /**
      * Constructs a new {@code RelationMemberListTableCellRenderer}.
@@ -32 +26 @@
     public RelationMemberListTableCellRenderer() {
         setOpaque(true);
-        icons = new EnumMap<>(OsmPrimitiveType.class);
-        icons.put(OsmPrimitiveType.NODE, ImageProvider.get("data", "node"));
-        icons.put(OsmPrimitiveType.WAY, ImageProvider.get("data", "way"));
-        icons.put(OsmPrimitiveType.RELATION, ImageProvider.get("data", "relation"));
     }
 
@@ -42 +32 @@
             setIcon(null);
         } else {
-            setIcon(icons.get(member.getMemberType()));
+            setIcon(ImageProvider.get(member.getMemberType()));
         }
     }