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

Timestamp:

2014-08-05T13:53:46+02:00 (10 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.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/transport

Files:

• ChantiersPonctuelsHandler.java (modified) (2 diffs)
• ReseauTisseoHandler.java (modified) (2 diffs)
• StationsAutoPartageHandler.java (modified) (2 diffs)

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);
     }