Changeset 8388 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/tags
- Timestamp:
- 2015-05-17T17:52:15+02:00 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java
r8332 r8388 17 17 import java.beans.PropertyChangeListener; 18 18 import java.util.ArrayList; 19 import java.util.EnumMap; 19 20 import java.util.HashMap; 20 21 import java.util.List; … … 46 47 private static final Map<OsmPrimitiveType, String> PANE_TITLES; 47 48 static { 48 PANE_TITLES = new HashMap<>();49 PANE_TITLES = new EnumMap<>(OsmPrimitiveType.class); 49 50 PANE_TITLES.put(OsmPrimitiveType.NODE, tr("Tags from nodes")); 50 51 PANE_TITLES.put(OsmPrimitiveType.WAY, tr("Tags from ways")); … … 82 83 setTitle(tr("Conflicts in pasted tags")); 83 84 allPrimitivesResolver = new TagConflictResolver(); 84 resolvers = new HashMap<>();85 resolvers = new EnumMap<>(OsmPrimitiveType.class); 85 86 for (OsmPrimitiveType type: OsmPrimitiveType.dataValues()) { 86 87 resolvers.put(type, new TagConflictResolver());
Note:
See TracChangeset
for help on using the changeset viewer.