Changeset 10868 in josm

Timestamp:

2016-08-21T15:41:19+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #13400 - More debug info for pasting data (patch by michael2402) - gsoc-core

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/PrimitiveData.java (modified) (1 diff)
• gui/datatransfer/data/PrimitiveTransferData.java (modified) (1 diff)
• gui/datatransfer/importers/PrimitiveDataPaster.java (modified) (3 diffs)

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

@@ -55 +55 @@
     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();
     }

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

@@ -150 +150 @@
      */
     public boolean hasIncompleteData() {
-        for (PrimitiveData pd : getAll()) {
-            if (pd.isIncomplete()) {
-                return true;
-            }
-        }
-        return false;
+        return getAll().stream().anyMatch(p -> p.isIncomplete() || !p.isVisible());
     }
 }

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

@@ -26 +26 @@
 import org.openstreetmap.josm.gui.datatransfer.data.PrimitiveTransferData;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.tools.bugreport.BugReport;
 
 /**
@@ -67 +68 @@
         // 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);
             }
         }
@@ -87 +92 @@
 
         for (PrimitiveData data : pasteBuffer.getAll()) {
-            if (data.isIncomplete()) {
+            if (data.isIncomplete() || !data.isVisible()) {
                 continue;
             }