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

Timestamp:

2009-07-25T18:37:45+02:00 (15 years ago)

Author:

jttt

Message:

Use OsmPrimitive methods instead of direct access to keys field when possible

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java

@@ -3 +3 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
-
-import java.util.HashMap;
 
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -56 +54 @@
         if (their == null) throw new IllegalArgumentException(tr("parameter '{0}' must not be null", "their"));
         this.key = key;
-        myTagValue = null;
-        if (my.keys != null && my.keys.containsKey(key)) {
-            myTagValue = my.keys.get(key);
-        }
-        theirTagValue = null;
-        if (their.keys != null && their.keys.containsKey(key)) {
-            theirTagValue = their.keys.get(key);
-        }
+        myTagValue = my.get(key);
+        theirTagValue = their.get(key);
     }
 
@@ -108 +100 @@
             throw new IllegalStateException(tr("cannot apply undecided tag merge item"));
         } else if (mergeDecision == MergeDecisionType.KEEP_THEIR) {
-            if (theirTagValue == null && primitive.keys != null) {
-                primitive.keys.remove(key);
+            if (theirTagValue == null) {
+                primitive.remove(key);
             } else if (theirTagValue != null) {
-                if (primitive.keys == null) {
-                    primitive.keys = new HashMap<String, String>();
-                }
-                primitive.keys.put(key, theirTagValue);
+                primitive.put(key, theirTagValue);
             }
         } else if (mergeDecision == MergeDecisionType.KEEP_MINE) {
-            if (myTagValue == null && primitive.keys != null) {
-                primitive.keys.remove(key);
+            if (myTagValue == null) {
+                primitive.remove(key);
             } else if (myTagValue != null) {
-                if (primitive.keys == null) {
-                    primitive.keys = new HashMap<String, String>();
-                }
-                primitive.keys.put(key, myTagValue);
+                primitive.put(key, myTagValue);
             }
         } else {