Changeset 2818 in josm for trunk/src

Timestamp:

2010-01-11T21:25:29+01:00 (15 years ago)

Author:

mjulius

Message:

don't paste incomplete members
When relations with incomplete members have been copied offer the user the choice between cancel and pasting without the incomplete members.

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/PasteAction.java (modified) (9 diffs)
• data/osm/NodeData.java (modified) (1 diff)
• data/osm/PrimitiveData.java (modified) (1 diff)
• data/osm/RelationData.java (modified) (3 diffs)
• data/osm/WayData.java (modified) (3 diffs)

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

@@ -3 +3 @@
 package org.openstreetmap.josm.actions;
 
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 import static org.openstreetmap.josm.tools.I18n.tr;
-import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 
 import java.awt.event.ActionEvent;
@@ -11 +11 @@
 import java.util.HashMap;
 import java.util.List;
-import java.util.ListIterator;
 import java.util.Map;
 
@@ -18 +17 @@
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.osm.NodeData;
+import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.PrimitiveData;
 import org.openstreetmap.josm.data.osm.PrimitiveDeepCopy;
@@ -23 +23 @@
 import org.openstreetmap.josm.data.osm.RelationMemberData;
 import org.openstreetmap.josm.data.osm.WayData;
+import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -43 +44 @@
         /* Find the middle of the pasteBuffer area */
         double maxEast = -1E100, minEast = 1E100, maxNorth = -1E100, minNorth = 1E100;
+        boolean incomplete = false;
         for (PrimitiveData data : pasteBuffer.getAll()) {
             if (data instanceof NodeData) {
@@ -53 +55 @@
                 if (north < minNorth) { minNorth = north; }
             }
+            if (data.isIncomplete()) {
+                incomplete = true;
+            }
+        }
+
+        // Allow to cancel paste if there are incomplete primitives
+        if (incomplete) {
+            if (!confirmDeleteIncomplete()) return;
         }
 
@@ -72 +82 @@
         // Make a copy of pasteBuffer and map from old id to copied data id
         List<PrimitiveData> bufferCopy = new ArrayList<PrimitiveData>();
-        Map<Long, Long> newIds = new HashMap<Long, Long>();
-        for (PrimitiveData data:pasteBuffer.getAll()) {
+        Map<Long, Long> newNodeIds = new HashMap<Long, Long>();
+        Map<Long, Long> newWayIds = new HashMap<Long, Long>();
+        Map<Long, Long> newRelationIds = new HashMap<Long, Long>();
+        for (PrimitiveData data: pasteBuffer.getAll()) {
+            if (data.isIncomplete()) {
+                continue;
+            }
             PrimitiveData copy = data.makeCopy();
             copy.clearOsmId();
-            newIds.put(data.getId(), copy.getId());
+            if (data instanceof NodeData) {
+                newNodeIds.put(data.getId(), copy.getId());
+            } else if (data instanceof WayData) {
+                newWayIds.put(data.getId(), copy.getId());
+            } else if (data instanceof RelationData) {
+                newRelationIds.put(data.getId(), copy.getId());
+            }
             bufferCopy.add(copy);
         }
@@ -88 +109 @@
                 }
             } else if (data instanceof WayData) {
-                ListIterator<Long> it = ((WayData)data).getNodes().listIterator();
-                while (it.hasNext()) {
-                    it.set(newIds.get(it.next()));
+                List<Long> newNodes = new ArrayList<Long>();
+                for (Long oldNodeId: ((WayData)data).getNodes()) {
+                    Long newNodeId = newNodeIds.get(oldNodeId);
+                    if (newNodeId != null) {
+                        newNodes.add(newNodeId);
+                    }
                 }
+                ((WayData)data).setNodes(newNodes);
             } else if (data instanceof RelationData) {
-                ListIterator<RelationMemberData> it = ((RelationData)data).getMembers().listIterator();
-                while (it.hasNext()) {
-                    RelationMemberData member = it.next();
-                    it.set(new RelationMemberData(member.getRole(), member.getMemberType(), newIds.get(member.getMemberId())));
+                List<RelationMemberData> newMembers = new ArrayList<RelationMemberData>();
+                for (RelationMemberData member: ((RelationData)data).getMembers()) {
+                    OsmPrimitiveType memberType = member.getMemberType();
+                    Long newId = null;
+                    switch (memberType) {
+                    case NODE:
+                        newId = newNodeIds.get(member.getMemberId());
+                        break;
+                    case WAY:
+                        newId = newWayIds.get(member.getMemberId());
+                        break;
+                    case RELATION:
+                        newId = newRelationIds.get(member.getMemberId());
+                        break;
+                    }
+                    if (newId != null) {
+                        newMembers.add(new RelationMemberData(member.getRole(), memberType, newId));
+                    }
                 }
+                ((RelationData)data).setMembers(newMembers);
             }
         }
@@ -105 +145 @@
         Main.main.undoRedo.add(new AddPrimitivesCommand(bufferCopy));
         Main.map.mapView.repaint();
+    }
+
+    protected boolean confirmDeleteIncomplete() {
+        ExtendedDialog ed = new ExtendedDialog(Main.parent,
+                tr("Delete incomplete members?"),
+                new String[] {tr("Paste without incomplete members"), tr("Cancel")});
+        ed.setButtonIcons(new String[] {"dialogs/relation/deletemembers.png", "cancel.png"});
+        ed.setContent(tr("The copied data contains incomplete primitives.  "
+                + "When pasting the incomplete primitives are removed.  "
+                + "Do you want to paste the data without the incomplete primitives?"));
+        ed.showDialog();
+        return ed.getValue() == 1;
     }
 

trunk/src/org/openstreetmap/josm/data/osm/NodeData.java

@@ -54 +54 @@
     }
 
+    @Override
     public OsmPrimitiveType getType() {
         return OsmPrimitiveType.NODE;
     }
-
 }

trunk/src/org/openstreetmap/josm/data/osm/PrimitiveData.java

@@ -197 +197 @@
         return id <= 0;
     }
+
+    public abstract OsmPrimitiveType getType();
 }

trunk/src/org/openstreetmap/josm/data/osm/RelationData.java

@@ -7 +7 @@
 public class RelationData extends PrimitiveData {
 
-    private final List<RelationMemberData> members = new ArrayList<RelationMemberData>();
+    private List<RelationMemberData> members = new ArrayList<RelationMemberData>();
 
     public RelationData() {
@@ -22 +22 @@
     }
 
+    public void setMembers(List<RelationMemberData> memberData) {
+        members = new ArrayList<RelationMemberData>(memberData);
+    }
+
     @Override
     public RelationData makeCopy() {
@@ -32 +36 @@
     }
 
+    @Override
     public OsmPrimitiveType getType() {
         return OsmPrimitiveType.RELATION;
     }
-
 }

trunk/src/org/openstreetmap/josm/data/osm/WayData.java

@@ -7 +7 @@
 public class WayData extends PrimitiveData {
 
-    private final List<Long> nodes = new ArrayList<Long>();
+    private List<Long> nodes = new ArrayList<Long>();
 
     public WayData() {
@@ -22 +22 @@
     }
 
+    public void setNodes(List<Long> nodes) {
+        this.nodes = new ArrayList<Long>(nodes);
+    }
+
     @Override
     public WayData makeCopy() {
@@ -32 +36 @@
     }
 
+    @Override
     public OsmPrimitiveType getType() {
         return OsmPrimitiveType.WAY;
     }
-
 }