Changeset 35139 in osm for applications/editors

Timestamp:

2019-09-26T20:51:07+02:00 (5 years ago)

Author:

donvip

Message:

fix #josm13679 - add session support

Location:

applications/editors/josm/plugins/opendata

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/opendata/OdPlugin.java (modified) (4 diffs)
• src/org/openstreetmap/josm/plugins/opendata/core/io/AbstractImporter.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/opendata/core/io/session (added)
• src/org/openstreetmap/josm/plugins/opendata/core/io/session/OpenDataSessionExporter.java (added)
• src/org/openstreetmap/josm/plugins/opendata/core/io/session/OpenDataSessionImporter.java (added)

applications/editors/josm/plugins/opendata/build.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
 <project name="opendata" default="dist" basedir=".">
-    <property name="plugin.main.version" value="14977"/>
+    <property name="plugin.main.version" value="15377"/>
     <property name="plugin.author" value="Don-vip"/>
     <property name="plugin.class" value="org.openstreetmap.josm.plugins.opendata.OdPlugin"/>

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/OdPlugin.java

@@ -22 +22 @@
 import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
 import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.io.session.SessionReader;
+import org.openstreetmap.josm.io.session.SessionWriter;
 import org.openstreetmap.josm.plugins.Plugin;
 import org.openstreetmap.josm.plugins.PluginInformation;
@@ -39 +41 @@
 import org.openstreetmap.josm.plugins.opendata.core.io.geographic.MifTabImporter;
 import org.openstreetmap.josm.plugins.opendata.core.io.geographic.ShpImporter;
+import org.openstreetmap.josm.plugins.opendata.core.io.session.OpenDataSessionExporter;
+import org.openstreetmap.josm.plugins.opendata.core.io.session.OpenDataSessionImporter;
 import org.openstreetmap.josm.plugins.opendata.core.io.tabular.CsvImporter;
 import org.openstreetmap.josm.plugins.opendata.core.io.tabular.OdsImporter;
 import org.openstreetmap.josm.plugins.opendata.core.io.tabular.XlsImporter;
+import org.openstreetmap.josm.plugins.opendata.core.layers.OdDataLayer;
 import org.openstreetmap.josm.plugins.opendata.core.modules.Module;
 import org.openstreetmap.josm.plugins.opendata.core.modules.ModuleHandler;
@@ -58 +63 @@
 
     private OdDialog dialog;
+
+    public final List<AbstractImporter> importers =  Arrays.asList(new AbstractImporter[]{
+            new CsvImporter(), new OdsImporter(), new XlsImporter(), // Tabular file formats
+            new KmlKmzImporter(), new ShpImporter(), new MifTabImporter(), new GmlImporter(), // Geographic file formats
+            new ZipImporter(), // Zip archive containing any of the others
+            new SevenZipImporter(), // 7Zip archive containing any of the others
+            xmlImporter // Generic importer for XML files (currently used for Neptune files)
+    });
 
     public OdPlugin(PluginInformation info) {
@@ -68 +81 @@
         }
         // Allow JOSM to import more files
-        for (AbstractImporter importer : Arrays.asList(new AbstractImporter[]{
-                new CsvImporter(), new OdsImporter(), new XlsImporter(), // Tabular file formats
-                new KmlKmzImporter(), new ShpImporter(), new MifTabImporter(), new GmlImporter(), // Geographic file formats
-                new ZipImporter(), // Zip archive containing any of the others
-                new SevenZipImporter(), // 7Zip archive containing any of the others
-                xmlImporter // Generic importer for XML files (currently used for Neptune files)
-        })) {
-            ExtensionFileFilter.addImporterFirst(importer);
-        }
+        importers.forEach(ExtensionFileFilter::addImporterFirst);
+        // Session support
+        SessionReader.registerSessionLayerImporter("open-data", OpenDataSessionImporter.class);
+        SessionWriter.registerSessionLayerExporter(OdDataLayer.class, OpenDataSessionExporter.class);
 
         menu = MainApplication.getMenu().dataMenu;

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/AbstractImporter.java

@@ -44 +44 @@
     }
 
+    public final void setFile(File file) {
+        this.file = file;
+    }
+
     @Override
     public void importData(File file, ProgressMonitor progressMonitor)