Changeset 2099 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2009-09-12T16:39:20+02:00 (15 years ago)

Author:

Gubaer

Message:

added auto completion to combine way dialog
fixed #3461: Value selection in new "combine ways" gets hidden when not selected (now using a JComboBox as renderer)

File:

• trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java

@@ -104 +104 @@
     }
 
-    protected void completeTagCollectionWithMissingTags(TagCollection tc, Collection<Way> combinedWays) {
+    protected static void completeTagCollectionWithMissingTags(TagCollection tc, Collection<? extends OsmPrimitive> merged) {
+        for (String key: tc.getKeys()) {
+            // make sure the empty value is in the tag set if a tag is not present
+            // on all merged nodes
+            //
+            for (OsmPrimitive p: merged) {
+                if (p.get(key) == null) {
+                    tc.add(new Tag(key)); // add a tag with key and empty value
+                }
+            }
+        }
+        // remove irrelevant tags
+        //
+        tc.removeByKey("created_by");
+    }
+
+    protected static void completeTagCollectionForEditing(TagCollection tc) {
         for (String key: tc.getKeys()) {
             // make sure the empty value is in the tag set such that we can delete the tag
@@ -110 +126 @@
             //
             tc.add(new Tag(key,""));
-            for (Way w: combinedWays) {
-                if (w.get(key) == null) {
-                    tc.add(new Tag(key)); // add a tag with key and empty value
-                }
-            }
-        }
-        // remove irrelevant tags
-        //
-        tc.removeByKey("created_by");
+        }
     }
 
@@ -165 +173 @@
         TagCollection completeWayTags = new TagCollection(wayTags);
         completeTagCollectionWithMissingTags(completeWayTags, ways);
+        TagCollection tagsToEdit = new TagCollection(completeWayTags);
+        completeTagCollectionForEditing(tagsToEdit);
 
         CombinePrimitiveResolverDialog dialog = CombinePrimitiveResolverDialog.getInstance();
-        dialog.getTagConflictResolverModel().populate(completeWayTags);
+        dialog.getTagConflictResolverModel().populate(tagsToEdit);
         dialog.setTargetPrimitive(targetWay);
         dialog.getRelationMemberConflictResolverModel().populate(
@@ -177 +187 @@
         // resolve tag conflicts if necessary
         //
-        if (!wayTags.isApplicableToPrimitive() || !referringRelations.getRelations().isEmpty()) {
+        if (!completeWayTags.isApplicableToPrimitive() || !referringRelations.getRelations().isEmpty()) {
             dialog.setVisible(true);
             if (dialog.isCancelled())
                 return;
         }
-
-
 
         LinkedList<Command> cmds = new LinkedList<Command>();