Changeset 30563 in osm for applications/editors/josm/plugins/opendata/modules

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

Files:

• be.bruxelles/src/org/openstreetmap/josm/plugins/opendata/modules/be/bruxelles/BruxellesConstants.java (modified) (1 diff)
• be.datagovbe/src/org/openstreetmap/josm/plugins/opendata/modules/be/datagovbe/DataGovBeConstants.java (modified) (1 diff)
• fr.datagouvfr/src/org/openstreetmap/josm/plugins/opendata/modules/fr/datagouvfr/datasets/culture/BibliothequesHandler.java (modified) (2 diffs)
• fr.datagouvfr/src/org/openstreetmap/josm/plugins/opendata/modules/fr/datagouvfr/datasets/education/Etab1er2ndDegreHandler.java (modified) (2 diffs)
• fr.datagouvfr/src/org/openstreetmap/josm/plugins/opendata/modules/fr/datagouvfr/datasets/transport/PassageNiveauHandler.java (modified) (2 diffs)
• fr.paris/src/org/openstreetmap/josm/plugins/opendata/modules/fr/paris/ParisConstants.java (modified) (1 diff)
• fr.paris/src/org/openstreetmap/josm/plugins/opendata/modules/fr/paris/datasets/ParisShpHandler.java (modified) (3 diffs)
• fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/transport/ChantiersPonctuelsHandler.java (modified) (2 diffs)
• fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/transport/ReseauTisseoHandler.java (modified) (2 diffs)
• fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/transport/StationsAutoPartageHandler.java (modified) (2 diffs)

applications/editors/josm/plugins/opendata/modules/be.bruxelles/src/org/openstreetmap/josm/plugins/opendata/modules/be/bruxelles/BruxellesConstants.java

@@ -2 +2 @@
 package org.openstreetmap.josm.plugins.opendata.modules.be.bruxelles;
 
-import org.openstreetmap.josm.plugins.opendata.core.OdConstants;
 
-public interface BruxellesConstants extends OdConstants {
+public interface BruxellesConstants {
         
         /**

applications/editors/josm/plugins/opendata/modules/be.datagovbe/src/org/openstreetmap/josm/plugins/opendata/modules/be/datagovbe/DataGovBeConstants.java

@@ -2 +2 @@
 package org.openstreetmap.josm.plugins.opendata.modules.be.datagovbe;
 
-import org.openstreetmap.josm.plugins.opendata.core.OdConstants;
 
-public interface DataGovBeConstants extends OdConstants {
+public interface DataGovBeConstants {
         
         /**

applications/editors/josm/plugins/opendata/modules/fr.datagouvfr/src/org/openstreetmap/josm/plugins/opendata/modules/fr/datagouvfr/datasets/culture/BibliothequesHandler.java

@@ -4 +4 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.plugins.opendata.core.OdConstants;
 import org.openstreetmap.josm.plugins.opendata.modules.fr.datagouvfr.datasets.DataGouvDataSetHandler;
 
@@ -12 +13 @@
                 setName("Bibliothèques municipales");
                 setDownloadFileName("lieux de lecture_geoloc.txt");
-                getCsvHandler().setCharset(ISO8859_15);
+                getCsvHandler().setCharset(OdConstants.ISO8859_15);
         }
 

applications/editors/josm/plugins/opendata/modules/fr.datagouvfr/src/org/openstreetmap/josm/plugins/opendata/modules/fr/datagouvfr/datasets/education/Etab1er2ndDegreHandler.java

@@ -6 +6 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.plugins.opendata.core.OdConstants;
 import org.openstreetmap.josm.plugins.opendata.core.io.tabular.DefaultCsvHandler;
 import org.openstreetmap.josm.plugins.opendata.modules.fr.datagouvfr.datasets.DataGouvDataSetHandler;
@@ -14 +15 @@
                 
                 public EtabCsvHandler() {
-                        setCharset(ISO8859_15);
+                        setCharset(OdConstants.ISO8859_15);
                         setHandlesProjection(true);
                 }

applications/editors/josm/plugins/opendata/modules/fr.datagouvfr/src/org/openstreetmap/josm/plugins/opendata/modules/fr/datagouvfr/datasets/transport/PassageNiveauHandler.java

@@ -4 +4 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.plugins.opendata.core.OdConstants;
 import org.openstreetmap.josm.plugins.opendata.modules.fr.datagouvfr.datasets.DataGouvDataSetHandler;
 
@@ -12 +13 @@
                 setName("Passages à niveau");
                 setDownloadFileName("passage_a_niveau.csv");
-                getCsvHandler().setCharset(ISO8859_15);
+                getCsvHandler().setCharset(OdConstants.ISO8859_15);
         }
 

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

applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/transport/ChantiersPonctuelsHandler.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.opendata.modules.fr.toulouse.datasets.transport;
+
+import org.openstreetmap.josm.plugins.opendata.core.OdConstants;
 
 public class ChantiersPonctuelsHandler extends ChantiersHandler {
@@ -6 +8 @@
     public ChantiersPonctuelsHandler() {
         super(14071, "Chantiers en cours (ponctuel)");
-        getCsvHandler().setCharset(ISO8859_15);
+        getCsvHandler().setCharset(OdConstants.ISO8859_15);
     }
 

applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/transport/ReseauTisseoHandler.java

@@ -8 +8 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.plugins.opendata.core.OdConstants;
 import org.openstreetmap.josm.plugins.opendata.core.io.NeptuneReader;
 import org.openstreetmap.josm.plugins.opendata.modules.fr.toulouse.datasets.ToulouseDataSetHandler;
@@ -25 +26 @@
     @Override
     public boolean acceptsFilename(String filename) {
-        return acceptsZipFilename(filename, "14022-reseau-tisseo-metro-bus-tram-") || filename.toLowerCase().endsWith(XML_EXT);
+        return acceptsZipFilename(filename, "14022-reseau-tisseo-metro-bus-tram-") || filename.toLowerCase().endsWith(OdConstants.XML_EXT);
     }
     
     @Override
     public boolean acceptsFile(File file) {
-        return acceptsFilename(file.getName()) && (file.getName().toLowerCase().endsWith(ZIP_EXT) || NeptuneReader.acceptsXmlNeptuneFile(file, neptuneSchemaUrl));
+        return acceptsFilename(file.getName()) 
+                && (file.getName().toLowerCase().endsWith(OdConstants.ZIP_EXT) || NeptuneReader.acceptsXmlNeptuneFile(file, neptuneSchemaUrl));
     }
 

applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/transport/StationsAutoPartageHandler.java

@@ -4 +4 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.plugins.opendata.core.OdConstants;
 import org.openstreetmap.josm.plugins.opendata.modules.fr.toulouse.datasets.ToulouseDataSetHandler;
 
@@ -12 +13 @@
         setName("Stations d'auto partage");
         setCategory(CAT_TRANSPORT);
-        getCsvHandler().setCharset(ISO8859_15);
+        getCsvHandler().setCharset(OdConstants.ISO8859_15);
     }