Changeset 4387 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2011-08-31T17:15:24+02:00 (13 years ago)

Author:

bastiK

Message:

fixed #6746 - paste properties in new layer results in nullpointer exception

File:

• trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java (modified) (3 diffs)

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.data.osm;
+
 import static org.openstreetmap.josm.tools.I18n.marktr;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.text.MessageFormat;
+import java.util.Arrays;
+import java.util.Collection;
 
 public enum OsmPrimitiveType {
@@ -15 +18 @@
     CLOSEDWAY  (marktr(/* ICON(data/) */"closedway"), null, WayData.class),
     MULTIPOLYGON (marktr(/* ICON(data/) */"multipolygon"), null, RelationData.class);
+
+    private final static Collection<OsmPrimitiveType> DATA_VALUES = Arrays.asList(NODE, WAY, RELATION);
 
     private final String apiTypeName;
@@ -61 +66 @@
     }
 
+    public static Collection<OsmPrimitiveType> dataValues() {
+        return DATA_VALUES;
+    }
+
     public OsmPrimitive newInstance(long uniqueId, boolean allowNegative) {
         switch (this) {