Changeset 8308 in josm for trunk/src/org/openstreetmap/josm/actions/relation

Timestamp:

2015-05-02T00:55:19+02:00 (9 years ago)

Author:

Don-vip

Message:

fix potential NPEs and Sonar issues related to serialization

Location:

trunk/src/org/openstreetmap/josm/actions/relation

Files:

• AbstractRelationAction.java (modified) (3 diffs)
• DownloadSelectedIncompleteMembersAction.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/relation/AbstractRelationAction.java

@@ -13 +13 @@
 
 /**
- * Ancestor for all actions that want to work with relation collection and 
+ * Ancestor for all actions that want to work with relation collection and
  * to be disabled if the collection is empty
  * @since 5793
  */
 public abstract class AbstractRelationAction extends AbstractAction implements OsmPrimitiveAction {
-    protected Collection<Relation> relations = Collections.<Relation>emptySet();
+    protected transient Collection<Relation> relations = Collections.<Relation>emptySet();
 
     protected static final Collection<Relation> getRelations(Collection<? extends OsmPrimitive> primitives) {
@@ -28 +28 @@
         }
     }
-    
+
     @Override
     public void setPrimitives(Collection<? extends OsmPrimitive> primitives) {
@@ -34 +34 @@
         updateEnabledState();
     }
-    
+
     protected void updateEnabledState() {
         setEnabled(!relations.isEmpty());

trunk/src/org/openstreetmap/josm/actions/relation/DownloadSelectedIncompleteMembersAction.java

@@ -24 +24 @@
 public class DownloadSelectedIncompleteMembersAction extends AbstractRelationAction {
 
-    private Collection<OsmPrimitive> incompleteMembers;
+    private transient Collection<OsmPrimitive> incompleteMembers;
 
     /**