Changeset 3518 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java

Timestamp:

10.09.2010 07:45:16 (21 months ago)

Author:

jttt

Message:

• add New relation button to Preset dialog
• add required attribute to tagging preset (allows to specify what tags has to filled for osm primitive to qualify as having preset)
• show list of preset also in relation dialog

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java

@@ -24 +24 @@
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.logging.Logger;
@@ -61 +63 @@
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
+import org.openstreetmap.josm.data.osm.Tag;
 import org.openstreetmap.josm.gui.ConditionalOptionPaneUtil;
 import org.openstreetmap.josm.gui.DefaultNameFormatter;
@@ -66 +69 @@
 import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec;
+import org.openstreetmap.josm.gui.dialogs.properties.PresetListPanel.PresetHandler;
 import org.openstreetmap.josm.gui.help.ContextSensitiveHelpAction;
 import org.openstreetmap.josm.gui.help.HelpUtil;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.tagging.TagEditorPanel;
+import org.openstreetmap.josm.gui.tagging.TagModel;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
@@ -123 +128 @@
         referrerModel = new ReferringRelationsBrowserModel(relation);
 
-        tagEditorPanel = new TagEditorPanel();
+        tagEditorPanel = new TagEditorPanel(new PresetHandler() {
+
+            @Override
+            public void updateTags(List<Tag> tags) {
+                Map<String, TagModel> modelTags = new HashMap<String, TagModel>();
+                for (int i=0; i<tagEditorPanel.getModel().getRowCount(); i++) {
+                    TagModel tagModel = tagEditorPanel.getModel().get(i);
+                    modelTags.put(tagModel.getName(), tagModel);
+                }
+                for (Tag tag: tags) {
+                    TagModel existing = modelTags.get(tag.getKey());
+
+                    if (tag.getValue().isEmpty()) {
+                        if (existing != null) {
+                            tagEditorPanel.getModel().delete(tag.getKey());
+                        }
+                    } else {
+                        if (existing != null) {
+                            tagEditorPanel.getModel().updateTagValue(existing, tag.getValue());
+                        } else {
+                            tagEditorPanel.getModel().add(tag.getKey(), tag.getValue());
+                        }
+                    }
+
+                }
+            }
+
+            @Override
+            public Collection<OsmPrimitive> getSelection() {
+                Relation relation = new Relation();
+                tagEditorPanel.getModel().applyToPrimitive(relation);
+                return Collections.<OsmPrimitive>singletonList(relation);
+            }
+        });
+
         // populate the models
         //