Changeset 9774 in josm for trunk/src/org/openstreetmap

Timestamp:

2016-02-10T00:41:16+01:00 (9 years ago)

Author:

Don-vip

Message:

fix coverity (1350239, 1350240, 1350241) defects corresponding to Findbugs serialization warnings

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/MultipolygonBuilder.java (modified) (3 diffs)
• gui/dialogs/RelationListDialog.java (modified) (1 diff)

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

@@ -6 +6 @@
 import java.awt.Rectangle;
 import java.awt.geom.Area;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -308 +311 @@
     private static class Worker extends RecursiveTask<List<PolygonLevel>> {
 
+        // Needed for Findbugs / Coverity because parent class is serializable
+        private static final long serialVersionUID = 1L;
+
         private final transient List<JoinedPolygon> input;
         private final int from;
@@ -403 +409 @@
             return output;
         }
+
+        private void readObject(ObjectInputStream ois) throws ClassNotFoundException, IOException {
+            // Needed for Findbugs / Coverity because parent class is serializable
+            ois.defaultReadObject();
+        }
+
+        private void writeObject(ObjectOutputStream oos) throws IOException {
+            // Needed for Findbugs / Coverity because parent class is serializable
+            oos.defaultWriteObject();
+        }
     }
 }

trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java

@@ -124 +124 @@
     private final transient HighlightHelper highlightHelper = new HighlightHelper();
     private final boolean highlightEnabled = Main.pref.getBoolean("draw.target-highlight", true);
-    private RecentRelationsAction recentRelationsAction;
+    private transient RecentRelationsAction recentRelationsAction;
 
     /**