Changeset 5789 in josm for trunk/src/org

Timestamp:

2013-03-21T00:50:36+01:00 (12 years ago)

Author:

Don-vip

Message:

fix #8529 - NPE at PropertiesDialog$PasteValueAction.actionPerform

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

@@ -1145 +1145 @@
             String key = propertyData.getValueAt(propertyTable.getSelectedRow(), 0).toString();
             Collection<OsmPrimitive> sel = Main.main.getCurrentDataSet().getSelected();
-            String value = Utils.getClipboardContent().trim();
-            if (sel.isEmpty())
+            String clipboard = Utils.getClipboardContent();
+            if (sel.isEmpty() || clipboard == null)
                 return;
-            Main.main.undoRedo.add(new ChangePropertyCommand(sel, key, value));
+            Main.main.undoRedo.add(new ChangePropertyCommand(sel, key, Utils.strip(clipboard)));
         }
     }