Changeset 566 in josm for trunk/src/org

Timestamp:

2008-02-26T15:16:52+01:00 (17 years ago)

Author:

david

Message:

fix crash on changing selection

File:

• trunk/src/org/openstreetmap/josm/actions/PasteTagsAction.java (modified) (3 diffs)

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

@@ -40 +40 @@
                 /* scan the paste buffer, and add tags to each of the selected objects. 
                  * If a tag already exists, it is overwritten */
-                if (! selectionSubset.isEmpty()) {
+                if (selectionSubset != null && ! selectionSubset.isEmpty()) {
                         for (Iterator<? extends OsmPrimitive> it = pasteBufferSubset.iterator(); it.hasNext();) {
                                 OsmPrimitive osm = it.next();
@@ -65 +65 @@
                 for (Iterator<? extends OsmPrimitive> it = osms.iterator(); it.hasNext();) {
                         OsmPrimitive osm = it.next();
-                        if (osm.keys.isEmpty())
+                        if (osm.keys == null || osm.keys.isEmpty())
                                 continue;
                         for (String key : osm.keys.keySet()) {
@@ -88 +88 @@
                 /* only enable if there is something selected to paste into and 
                         if we don't have conflicting keys in the pastebuffer */
-                setEnabled(! selection.isEmpty() &&
+                setEnabled(selection != null &&
+                                ! selection.isEmpty() &&
                                 ! pasteBuffer.allPrimitives().isEmpty() && 
                                 (Main.ds.getSelectedNodes().isEmpty() ||