Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/OdPlugin.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/OdPlugin.java (revision 28017) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/OdPlugin.java (revision 28018) @@ -30,4 +30,5 @@ import org.openstreetmap.josm.plugins.opendata.core.gui.OdPreferenceSetting; import org.openstreetmap.josm.plugins.opendata.core.io.AbstractImporter; +import org.openstreetmap.josm.plugins.opendata.core.io.XmlImporter; import org.openstreetmap.josm.plugins.opendata.core.io.archive.ZipImporter; import org.openstreetmap.josm.plugins.opendata.core.io.geographic.KmlKmzImporter; @@ -55,7 +56,8 @@ new CsvImporter(), new OdsImporter(), new XlsImporter(), // Tabular file formats new KmlKmzImporter(), new ShpImporter(), new MifTabImporter(), // Geographic file formats - new ZipImporter() // Archive containing any of the others + new ZipImporter(), // Archive containing any of the others + new XmlImporter() // Generic importer for XML files (currently used for Neptune files) })) { - ExtensionFileFilter.importers.add(importer); + ExtensionFileFilter.importers.add(0, importer); } // Load modules Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/OdConstants.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/OdConstants.java (revision 28017) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/OdConstants.java (revision 28018) @@ -98,4 +98,5 @@ public static final String ZIP_EXT = "zip"; public static final String JAR_EXT = "jar"; + public static final String XML_EXT = "xml"; /** @@ -115,4 +116,5 @@ public static final ExtensionFileFilter KML_KMZ_FILE_FILTER = new ExtensionFileFilter(KML_EXT+","+KMZ_EXT, KMZ_EXT, tr("KML/KMZ files") + " (*."+KML_EXT+",*."+KMZ_EXT+")"); public static final ExtensionFileFilter ZIP_FILE_FILTER = new ExtensionFileFilter(ZIP_EXT, ZIP_EXT, tr("Zip Files") + " (*."+ZIP_EXT+")"); + public static final ExtensionFileFilter XML_FILE_FILTER = new ExtensionFileFilter(XML_EXT, XML_EXT, tr("OpenData XML files") + " (*."+XML_EXT+")"); /** Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/AbstractDataSetHandler.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/AbstractDataSetHandler.java (revision 28017) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/AbstractDataSetHandler.java (revision 28018) @@ -58,5 +58,11 @@ public abstract class AbstractDataSetHandler implements OdConstants { + public abstract boolean acceptsFilename(String filename); + + public boolean acceptsFile(File file) { + return acceptsFilename(file.getName()); + } + public abstract void updateDataSet(DataSet ds); Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/fr/FrenchConstants.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/fr/FrenchConstants.java (revision 28017) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/fr/FrenchConstants.java (revision 28018) @@ -29,3 +29,8 @@ */ public static final String ICON_FR_24 = "fr24.png"; + + /** + * NEPTUNE XML Schema + */ + public static final String NEPTUNE_XSD = "/neptune/neptune.xsd"; } Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/fr/FrenchDataSetHandler.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/fr/FrenchDataSetHandler.java (revision 28017) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/fr/FrenchDataSetHandler.java (revision 28018) @@ -18,4 +18,6 @@ import static org.openstreetmap.josm.plugins.opendata.core.io.LambertCC9ZonesProjectionPatterns.lambertCC9Zones; +import java.io.File; +import java.io.IOException; import java.net.MalformedURLException; import java.net.URL; @@ -24,4 +26,11 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; + +import javax.xml.XMLConstants; +import javax.xml.transform.Source; +import javax.xml.transform.stream.StreamSource; +import javax.xml.validation.Schema; +import javax.xml.validation.SchemaFactory; +import javax.xml.validation.Validator; import org.geotools.referencing.CRS; @@ -38,4 +47,5 @@ import org.openstreetmap.josm.data.projection.UTM.Hemisphere; import org.openstreetmap.josm.plugins.opendata.core.datasets.SimpleDataSetHandler; +import org.xml.sax.SAXException; public abstract class FrenchDataSetHandler extends SimpleDataSetHandler implements FrenchConstants { @@ -273,3 +283,29 @@ } } + + protected URL getNeptuneSchema() { + return FrenchDataSetHandler.class.getResource(NEPTUNE_XSD); + } + + protected final boolean acceptsXmlNeptuneFile(File file) { + + Source xmlFile = new StreamSource(file); + + try { + SchemaFactory schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI); + Schema schema = schemaFactory.newSchema(getNeptuneSchema()); + Validator validator = schema.newValidator(); + validator.validate(xmlFile); + System.out.println(xmlFile.getSystemId() + " is valid"); + return true; + } catch (SAXException e) { + System.out.println(xmlFile.getSystemId() + " is NOT valid"); + System.out.println("Reason: " + e.getLocalizedMessage()); + } catch (IOException e) { + System.out.println(xmlFile.getSystemId() + " is NOT valid"); + System.out.println("Reason: " + e.getLocalizedMessage()); + } + + return false; + } } Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/AbstractImporter.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/AbstractImporter.java (revision 28017) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/AbstractImporter.java (revision 28018) @@ -44,8 +44,8 @@ } - protected final AbstractDataSetHandler findDataSetHandler(String fileName) { + protected final AbstractDataSetHandler findDataSetHandler(File file) { for (Module module : ModuleHandler.moduleList) { for (AbstractDataSetHandler dsh : module.getHandlers()) { - if (dsh.acceptsFilename(fileName)) { + if (dsh.acceptsFile(file)) { return dsh; } @@ -63,5 +63,5 @@ if (file != null) { this.file = file; - this.handler = findDataSetHandler(file.getName()); + this.handler = findDataSetHandler(file); } super.importData(file, progressMonitor); Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/XmlImporter.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/XmlImporter.java (revision 28018) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/XmlImporter.java (revision 28018) @@ -0,0 +1,24 @@ +// JOSM opendata plugin. +// Copyright (C) 2011-2012 Don-vip +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +package org.openstreetmap.josm.plugins.opendata.core.io; + +public class XmlImporter extends AbstractImporter { + + public XmlImporter() { + super(XML_FILE_FILTER); + } + +}