Ticket #13400: patch-test-13395.patch

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

@@ -54 +54 @@
     @Override
     public String toString() {
         StringBuilder builder = new StringBuilder();
-        builder.append(id).append(Arrays.toString(keys)).append(getFlagsAsString());
+        builder.append(id).append(' ').append(Arrays.toString(keys)).append(' ').append(getFlagsAsString());
         return builder.toString();
     }
 

src/org/openstreetmap/josm/gui/datatransfer/data/PrimitiveTransferData.java

@@ -149 +149 @@
      * @return <code>true</code> if invalid data is contained in this set.
      */
     public boolean hasIncompleteData() {
-        for (PrimitiveData pd : getAll()) {
-            if (pd.isIncomplete()) {
-                return true;
-            }
-        }
-        return false;
+        return getAll().stream().anyMatch(p -> p.isIncomplete() || !p.isVisible());
     }
 }

src/org/openstreetmap/josm/gui/datatransfer/importers/PrimitiveDataPaster.java

@@ -25 +25 @@
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.datatransfer.data.PrimitiveTransferData;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.tools.bugreport.BugReport;
 
 /**
  * This transfer support allows us to transfer primitives. This is the default paste action when primitives were copied.
@@ -66 +67 @@
 
         // Update references in copied buffer
         for (PrimitiveData data : bufferCopy) {
-            if (data instanceof NodeData) {
-                NodeData nodeData = (NodeData) data;
-                nodeData.setEastNorth(nodeData.getEastNorth().add(offset));
-            } else if (data instanceof WayData) {
-                updateNodes(newIds.get(OsmPrimitiveType.NODE), data);
-            } else if (data instanceof RelationData) {
-                updateMembers(newIds, data);
+            try {
+                if (data instanceof NodeData) {
+                    NodeData nodeData = (NodeData) data;
+                    nodeData.setEastNorth(nodeData.getEastNorth().add(offset));
+                } else if (data instanceof WayData) {
+                    updateNodes(newIds.get(OsmPrimitiveType.NODE), data);
+                } else if (data instanceof RelationData) {
+                    updateMembers(newIds, data);
+                }
+            } catch (RuntimeException e) {
+                throw BugReport.intercept(e).put("data", data);
             }
         }
         return new AddPrimitivesCommand(bufferCopy, toSelect, layer);
@@ -86 +91 @@
         newIds.put(OsmPrimitiveType.RELATION, new HashMap<Long, Long>());
 
         for (PrimitiveData data : pasteBuffer.getAll()) {
-            if (data.isIncomplete()) {
+            if (data.isIncomplete() || !data.isVisible()) {
                 continue;
             }
             PrimitiveData copy = data.makeCopy();