Changeset 4387 in josm for trunk

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

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/PasteTagsAction.java (modified) (6 diffs)
• data/osm/OsmPrimitiveType.java (modified) (3 diffs)
• gui/conflict/tags/PasteTagsConflictResolverDialog.java (modified) (1 diff)

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

@@ -109 +109 @@
         protected Map<OsmPrimitiveType, Integer> getSourceStatistics() {
             HashMap<OsmPrimitiveType, Integer> ret = new HashMap<OsmPrimitiveType, Integer>();
-            for (OsmPrimitiveType type: OsmPrimitiveType.values()) {
+            for (OsmPrimitiveType type: OsmPrimitiveType.dataValues()) {
                 if (!getSourceTagsByType(type).isEmpty()) {
                     ret.put(type, getSourcePrimitivesByType(type).size());
@@ -119 +119 @@
         protected Map<OsmPrimitiveType, Integer> getTargetStatistics() {
             HashMap<OsmPrimitiveType, Integer> ret = new HashMap<OsmPrimitiveType, Integer>();
-            for (OsmPrimitiveType type: OsmPrimitiveType.values()) {
+            for (OsmPrimitiveType type: OsmPrimitiveType.dataValues()) {
                 int count = OsmPrimitive.getFilteredList(target, type.getOsmClass()).size();
                 if (count > 0) {
@@ -139 +139 @@
         protected void pasteFromHomogeneousSource() {
             TagCollection tc = null;
-            for (OsmPrimitiveType type : OsmPrimitiveType.values()) {
+            for (OsmPrimitiveType type : OsmPrimitiveType.dataValues()) {
                 TagCollection tc1 = getSourceTagsByType(type);
                 if (!tc1.isEmpty()) {
@@ -185 +185 @@
          */
         protected boolean canPasteFromHeterogeneousSourceWithoutConflict(Collection<OsmPrimitive> targets) {
-            for (OsmPrimitiveType type:OsmPrimitiveType.values()) {
+            for (OsmPrimitiveType type : OsmPrimitiveType.dataValues()) {
                 if (hasTargetPrimitives(type.getOsmClass())) {
                     TagCollection tc = TagCollection.unionOfAllPrimitives(getSourcePrimitivesByType(type));
@@ -203 +203 @@
         protected void pasteFromHeterogeneousSource() {
             if (canPasteFromHeterogeneousSourceWithoutConflict(target)) {
-                for (OsmPrimitiveType type:OsmPrimitiveType.values()) {
+                for (OsmPrimitiveType type : OsmPrimitiveType.dataValues()) {
                     if (hasSourceTagsByType(type) && hasTargetPrimitives(type.getOsmClass())) {
                         buildChangeCommand(target, getSourceTagsByType(type));
@@ -220 +220 @@
                 if (dialog.isCanceled())
                     return;
-                for (OsmPrimitiveType type:OsmPrimitiveType.values()) {
+                for (OsmPrimitiveType type : OsmPrimitiveType.dataValues()) {
                     if (hasSourceTagsByType(type) && hasTargetPrimitives(type.getOsmClass())) {
                         buildChangeCommand(OsmPrimitive.getFilteredList(target, type.getOsmClass()), dialog.getResolution(type));

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) {

trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java

@@ -78 +78 @@
         allPrimitivesResolver = new TagConflictResolver();
         resolvers = new HashMap<OsmPrimitiveType, TagConflictResolver>();
-        for (OsmPrimitiveType type: OsmPrimitiveType.values()) {
+        for (OsmPrimitiveType type: OsmPrimitiveType.dataValues()) {
             resolvers.put(type, new TagConflictResolver());
             resolvers.get(type).getModel().addPropertyChangeListener(this);