Context Navigation

data

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/data

Files:

-              r8285
+              r8308
+            }
+            for (File f: deletedLayersDir.listFiles()) {
+                deletedLayers.add(f); // FIXME: sort by mtime
+            File[] files = deletedLayersDir.listFiles();
+            if (files != null) {
+                for (File f: files) {
+                    deletedLayers.add(f); // FIXME: sort by mtime
+                }
+            }

r8285	r8308
303	303	public static void deleteFileOrDirectory(File f) {
304	304	if (f.isDirectory()) {
305		for (File f1: f.listFiles()) {
306		deleteFileOrDirectory(f1);
	305	File[] files = f.listFiles();
	306	if (files != null) {
	307	for (File f1: files) {
	308	deleteFileOrDirectory(f1);
	309	}
307	310	}
308	311	}
…	…
310	313	f.delete();
311	314	} catch (Exception e) {
312		log("Warning: Can not delete file "+f.getPath());
	315	log("Warning: Can not delete file "+f.getPath()+": "+e.getMessage());
313	316	}
314	317	}

-              r8168
+              r8308
 /**
  * Class that contains attirubtes for JCS cache entries. Parameters are used to properly handle HTTP caching
+ *
+ *
  * @author Wiktor Niesiobędzki
+ *
 …
 public class CacheEntryAttributes extends ElementAttributes {
     private static final long serialVersionUID = 1L; //version
     private Map<String, String> attrs = new HashMap<String, String>();
+    private transient Map<String, String> attrs = new HashMap<String, String>();
     private final static String NO_TILE_AT_ZOOM = "noTileAtZoom";
     private final static String ETAG = "Etag";

r6380	r8308
16	16	public class CachedLatLon extends LatLon {
17	17	private EastNorth eastNorth;
18		private Projection proj;
	18	private transient Projection proj;
19	19
20	20	public CachedLatLon(double lat, double lon) {

r7509	r8308
10	10	*/
11	11	public class EastNorth extends Coordinate {
	12
	13	private static final long serialVersionUID = 1L;
12	14
13	15	public EastNorth(double east, double north) {

r7236	r8308
38	38	public class LatLon extends Coordinate {
39	39
	40	private static final long serialVersionUID = 1L;
	41
40	42	/**
41	43	* Minimum difference in location to not be represented as the same position.

r7937	r8308
10	10	public class Extensions extends LinkedHashMap<String, String> {
11	11
	12	private static final long serialVersionUID = 1L;
	13
12	14	public Extensions(Map<? extends String, ? extends String> m) {
13	15	super(m);

r8285	r8308
227	227	}
228	228
229		for (File file: projectionDir.listFiles()) {
230		if (!referencedFiles.contains(file.getName())) {
231		file.delete();
	229	File[] files = projectionDir.listFiles();
	230	if (files != null) {
	231	for (File file: files) {
	232	if (!referencedFiles.contains(file.getName())) {
	233	file.delete();
	234	}
232	235	}
233	236	}
…	…
235	238	}
236	239
237		for (File projectionDir: cacheDir.listFiles()) {
238		if (projectionDir.isDirectory() && !usedProjections.contains(projectionDir.getName())) {
239		Utils.deleteDirectory(projectionDir);
	240	File[] files = cacheDir.listFiles();
	241	if (files != null) {
	242	for (File projectionDir: files) {
	243	if (projectionDir.isDirectory() && !usedProjections.contains(projectionDir.getName())) {
	244	Utils.deleteDirectory(projectionDir);
	245	}
240	246	}
241	247	}

-              r3650
+              r8308
 package org.openstreetmap.josm.data.osm;
+import java.io.Serializable;
 import java.util.Comparator;
 …
  * @author viesturs
  */
+public class NodePositionComparator implements Comparator<Node> {
+public class NodePositionComparator implements Comparator<Node>, Serializable {
+    private static final long serialVersionUID = 1L;
     @Override
     public int compare(Node n1, Node n2) {

-              r7937
+              r8308
 package org.openstreetmap.josm.data.osm;
+import java.io.Serializable;
 import java.util.Comparator;
 import java.util.HashMap;
 …
  * @since 4113
  */
+public class OsmPrimitiveComparator implements Comparator<OsmPrimitive> {
+public class OsmPrimitiveComparator implements Comparator<OsmPrimitive>, Serializable {
+    private static final long serialVersionUID = 1L;
     private final Map<OsmPrimitive, String> cache = new HashMap<>();
     private final boolean relationsFirst;

-              r8194
+              r8308
 public class SimplePrimitiveId implements PrimitiveId, Serializable {
+    private static final long serialVersionUID = 1L;
     private final long id;
     private final OsmPrimitiveType type;

r8285	r8308
37	37	public class NTV2GridShift implements Serializable {
38	38
	39	private static final long serialVersionUID = 1L;
	40
39	41	private static final double METRE_PER_SECOND = 2.0 * Math.PI * 6378137.0 / 3600.0 / 360.0;
40	42	private static final double RADIANS_PER_SECOND = 2.0 * Math.PI / 3600.0 / 360.0;

r7951	r8308
63	63	public class NTV2GridShiftFile implements Serializable {
64	64
	65	private static final long serialVersionUID = 1L;
	66
65	67	private int overviewHeaderCount;
66	68	private int subGridHeaderCount;

r8285	r8308
38	38	*/
39	39	public class NTV2SubGrid implements Cloneable, Serializable {
	40
	41	private static final long serialVersionUID = 1L;
40	42
41	43	private String subGridName;

Note: See TracChangeset for help on using the changeset viewer.