Changeset 18768 in josm for trunk/src/org/openstreetmap

Timestamp:

2023-06-22T23:12:56+02:00 (17 months ago)

Author:

taylor.smock

Message:

Fix #22534: Inform users when the clipboard has too much data

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/mapmode/SelectAction.java (modified) (1 diff)
• gui/dialogs/OsmIdSelectionDialog.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

@@ -786 +786 @@
             startEN = currentEN; // drag can continue after scaling/rotation
 
-            if (mode != Mode.ROTATE && mode != Mode.SCALE || SwingUtilities.isRightMouseButton(mouseEvent)) {
+            if ((mode != Mode.ROTATE && mode != Mode.SCALE) || SwingUtilities.isRightMouseButton(mouseEvent)) {
                 return false;
             }

trunk/src/org/openstreetmap/josm/gui/dialogs/OsmIdSelectionDialog.java

@@ -30 +30 @@
 import org.openstreetmap.josm.data.osm.SimplePrimitiveId;
 import org.openstreetmap.josm.gui.ExtendedDialog;
+import org.openstreetmap.josm.gui.Notification;
 import org.openstreetmap.josm.gui.datatransfer.ClipboardUtils;
 import org.openstreetmap.josm.gui.widgets.HistoryComboBox;
@@ -222 +223 @@
         String buf = ClipboardUtils.getClipboardStringContent();
         if (Utils.isEmpty(buf)) return;
-        if (buf.length() > Config.getPref().getInt("downloadprimitive.max-autopaste-length", 2000)) return;
+        final int maxPasteLength = Config.getPref().getInt("downloadprimitive.max-autopaste-length", 2000);
+        if (buf.length() > maxPasteLength) {
+            new Notification(tr("Clipboard has more than {0} characters. Not auto-pasting.\n" +
+                    "You may want to use Overpass instead.", maxPasteLength))
+                    .setIcon(JOptionPane.WARNING_MESSAGE)
+                    .show();
+            return;
+        }
         final List<SimplePrimitiveId> ids = SimplePrimitiveId.fuzzyParse(buf);
         if (!ids.isEmpty()) {