Changeset 3558 in josm

Timestamp:

2010-09-23T18:36:36+02:00 (14 years ago)

Author:

stoecker

Message:

fix #4744 - call relation editor instead of creating relation directly

File:

• trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java

@@ -25 +25 @@
 import java.util.EnumSet;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.LinkedList;
@@ -51 +52 @@
 import org.openstreetmap.josm.data.osm.OsmUtils;
 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.data.osm.Way;
@@ -56 +58 @@
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.QuadStateCheckBox;
+import org.openstreetmap.josm.gui.dialogs.relation.RelationEditor;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
@@ -947 +950 @@
             List<Command> cmds = new ArrayList<Command>(2);
             final Relation r = new Relation();
-            cmds.add(new AddCommand(r));
-            Command cmd = createCommand(Collections.<OsmPrimitive>singletonList(r), getChangedTags());
-            if (cmd != null) {
-                cmds.add(cmd);
-            }
-            Main.main.undoRedo.add(new SequenceCommand(tr("Add relation"), cmds));
+            final Collection<RelationMember> members = new HashSet<RelationMember>();
+            for(Tag t : getChangedTags()) {
+              r.put(t.getKey(), t.getValue());
+            }
+            for(OsmPrimitive osm : sel) {
+              RelationMember rm = new RelationMember("", osm);
+              r.addMember(rm);
+              members.add(rm);
+            }
             SwingUtilities.invokeLater(new Runnable() {
                 @Override
                 public void run() {
-                    // Relation list dialog has to be updated first for selectRelation to work
-                    Main.map.relationListDialog.selectRelation(r);
+                    RelationEditor.getEditor(Main.main.getEditLayer(), r, members).setVisible(true);
                 }
             });