Changeset 30563 in osm for applications/editors/josm/plugins/opendata/modules/fr.paris/src

Timestamp:

2014-08-05T13:53:46+02:00 (11 years ago)

Author:

donvip

Message:

[josm_opendata] improve unit tests, fix java 7 warnings, replace interface by abstract class, move some constants out of OdConstants due to strange bug with Junit

Location:

applications/editors/josm/plugins/opendata/modules/fr.paris/src/org/openstreetmap/josm/plugins/opendata/modules/fr/paris

Files:

• ParisConstants.java (modified) (1 diff)
• datasets/ParisShpHandler.java (modified) (3 diffs)

applications/editors/josm/plugins/opendata/modules/fr.paris/src/org/openstreetmap/josm/plugins/opendata/modules/fr/paris/ParisConstants.java

@@ -2 +2 @@
 package org.openstreetmap.josm.plugins.opendata.modules.fr.paris;
 
-import org.openstreetmap.josm.plugins.opendata.core.OdConstants;
 
-public interface ParisConstants extends OdConstants {
+public interface ParisConstants {
                 
         /**

applications/editors/josm/plugins/opendata/modules/fr.paris/src/org/openstreetmap/josm/plugins/opendata/modules/fr/paris/datasets/ParisShpHandler.java

@@ -14 +14 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.plugins.opendata.core.OdConstants;
 import org.openstreetmap.josm.plugins.opendata.core.datasets.fr.FrenchShpHandler;
 
 public class ParisShpHandler extends FrenchShpHandler {
         
-        public final Map<String, Node> nodeMap = new HashMap<String, Node>();
+        public final Map<String, Node> nodeMap = new HashMap<>();
         
         protected OsmPrimitive dataPrimitive;
@@ -26 +27 @@
         
         public ParisShpHandler() {
-                setDbfCharset(Charset.forName(CP850));
+                setDbfCharset(Charset.forName(OdConstants.CP850));
         }
         
@@ -55 +56 @@
                 dataPrimitive = null;
                 closedWay = null;
-                ways = new ArrayList<Way>();
-                nodes = new ArrayList<Node>();
+                ways = new ArrayList<>();
+                nodes = new ArrayList<>();
                 for (OsmPrimitive p : featurePrimitives) {
                         if (p.hasKeys()) {