Changeset 34098 in osm for applications/editors

Timestamp:

2018-03-25T03:40:41+02:00 (7 years ago)

Author:

donvip

Message:

update to JOSM 13558/13559

Location:

applications/editors/josm/plugins

Files:

• cadastre-fr/build.xml (modified) (1 diff)
• cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/edigeo/pci/EdigeoPciReader.java (modified) (1 diff)
• canvec_helper/build.xml (modified) (1 diff)
• canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/CanVecTile.java (modified) (1 diff)
• o5m/build.xml (modified) (1 diff)
• o5m/src/org/openstreetmap/josm/plugins/o5m/io/O5mReader.java (modified) (1 diff)
• pbf/build.xml (modified) (1 diff)
• pbf/src/org/openstreetmap/josm/plugins/pbf/io/PbfReader.java (modified) (1 diff)
• pbf/src/org/openstreetmap/josm/plugins/pbf/io/PbfWriter.java (modified) (1 diff)
• poly/build.xml (modified) (1 diff)
• poly/src/poly/PolyExporter.java (modified) (1 diff)
• poly/src/poly/PolyImporter.java (modified) (1 diff)
• seachart/build.xml (modified) (1 diff)
• seachart/src/seachart/SeachartAction.java (modified) (3 diffs)
• seachartedit/build.xml (modified) (1 diff)
• seachartedit/src/panels/PanelS57.java (modified) (1 diff)
• seachartedit/src/scedit/SCeditAction.java (modified) (1 diff)

applications/editors/josm/plugins/cadastre-fr/build.xml

@@ -4 +4 @@
     <property name="commit.message" value="Changed constructor for Plugin"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="12900"/>
+    <property name="plugin.main.version" value="13559"/>
     
     <!-- Configure these properties (replace "..." accordingly).

applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/edigeo/pci/EdigeoPciReader.java

@@ -23 +23 @@
 import org.apache.commons.text.WordUtils;
 import org.openstreetmap.josm.data.osm.DataSet;
-import org.openstreetmap.josm.data.osm.DataSet.UploadPolicy;
+import org.openstreetmap.josm.data.osm.UploadPolicy;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Way;

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

@@ -4 +4 @@
     <property name="commit.message" value="JOSM/Canvec_helper: fixed a crash caused by osm directory being renamed to OSM"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="13007"/>
+    <property name="plugin.main.version" value="13559"/>
     
     <!-- Configure these properties (replace "..." accordingly).

applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/CanVecTile.java

@@ -18 +18 @@
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.LatLon;
-import org.openstreetmap.josm.data.osm.DataSet.UploadPolicy;
+import org.openstreetmap.josm.data.osm.UploadPolicy;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapView;

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

@@ -5 +5 @@
     <property name="commit.message" value="Commit message"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="12671"/>
+    <property name="plugin.main.version" value="13559"/>
 
     <!-- Configure these properties (replace "..." accordingly).

applications/editors/josm/plugins/o5m/src/org/openstreetmap/josm/plugins/o5m/io/O5mReader.java

@@ -25 +25 @@
 import org.openstreetmap.josm.data.osm.User;
 import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.data.osm.DataSet.UploadPolicy;
+import org.openstreetmap.josm.data.osm.UploadPolicy;
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;

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

@@ -3 +3 @@
 
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="12671"/>
+    <property name="plugin.main.version" value="13559"/>
 
     <property name="plugin.author" value="Don-vip"/>

applications/editors/josm/plugins/pbf/src/org/openstreetmap/josm/plugins/pbf/io/PbfReader.java

@@ -17 +17 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
-import org.openstreetmap.josm.data.osm.DataSet.UploadPolicy;
+import org.openstreetmap.josm.data.osm.UploadPolicy;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;

applications/editors/josm/plugins/pbf/src/org/openstreetmap/josm/plugins/pbf/io/PbfWriter.java

@@ -507 +507 @@
      */
     public void writeLayer(OsmDataLayer layer) {
-        writeData(layer.data);
+        writeData(layer.getDataSet());
     }
 

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

@@ -5 +5 @@
     <property name="commit.message" value="Commit message"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="12671"/>
+    <property name="plugin.main.version" value="13559"/>
 
     <!-- Configure these properties (replace "..." accordingly).

applications/editors/josm/plugins/poly/src/poly/PolyExporter.java

@@ -39 +39 @@
         if (layer instanceof OsmDataLayer) {
             try (BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file), "UTF8"))) {
-                DataSet ds = ((OsmDataLayer) layer).data;
+                DataSet ds = ((OsmDataLayer) layer).getDataSet();
                 Map<Way, Boolean> ways = new TreeMap<>();
                 String polygonName = file.getName();

applications/editors/josm/plugins/poly/src/poly/PolyImporter.java

@@ -20 +20 @@
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.data.osm.DataSet.UploadPolicy;
+import org.openstreetmap.josm.data.osm.UploadPolicy;
 import org.openstreetmap.josm.gui.io.importexport.OsmImporter;
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;

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

@@ -4 +4 @@
     <property name="commit.message" value="[Seachart] Publish new release"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="13243"/>
+    <property name="plugin.main.version" value="13558"/>
 
     <property name="plugin.author" value="Malcolm Herring"/>

applications/editors/josm/plugins/seachart/src/seachart/SeachartAction.java

@@ -7 +7 @@
 import javax.swing.SwingUtilities;
 
-import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.data.Bounds;
@@ -27 +26 @@
 import org.openstreetmap.josm.data.osm.event.TagsChangedEvent;
 import org.openstreetmap.josm.data.osm.event.WayNodesChangedEvent;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.LayerManager.LayerAddEvent;
 import org.openstreetmap.josm.gui.layer.LayerManager.LayerChangeListener;
@@ -145 +145 @@
     @Override
     public void activeOrEditLayerChanged(ActiveLayerChangeEvent e) {
-        OsmDataLayer oldLayer = e.getPreviousEditLayer();
+        OsmDataLayer oldLayer = e.getPreviousDataLayer();
         if (oldLayer != null) {
-            oldLayer.data.removeDataSetListener(dataSetListener);
+            oldLayer.getDataSet().removeDataSetListener(dataSetListener);
         }
         OsmDataLayer newLayer = MainApplication.getLayerManager().getEditLayer();
         if (newLayer != null) {
-            newLayer.data.addDataSetListener(dataSetListener);
-            data = newLayer.data;
+            newLayer.getDataSet().addDataSetListener(dataSetListener);
+            data = newLayer.getDataSet();
             makeChart();
         } else {

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

@@ -4 +4 @@
     <property name="commit.message" value="New release"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="12643"/>
+    <property name="plugin.main.version" value="13559"/>
 
     <!-- Configure these properties (replace "..." accordingly).

applications/editors/josm/plugins/seachartedit/src/panels/PanelS57.java

@@ -27 +27 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
-import org.openstreetmap.josm.data.osm.DataSet.UploadPolicy;
+import org.openstreetmap.josm.data.osm.UploadPolicy;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;

applications/editors/josm/plugins/seachartedit/src/scedit/SCeditAction.java

@@ -168 +168 @@
     @Override
     public void activeOrEditLayerChanged(ActiveLayerChangeEvent e) {
-        if (e.getPreviousEditLayer() != null) {
-            e.getPreviousEditLayer().data.removeDataSetListener(dataSetListener);
+        if (e.getPreviousDataLayer() != null) {
+            e.getPreviousDataLayer().getDataSet().removeDataSetListener(dataSetListener);
         }
         OsmDataLayer newLayer = getLayerManager().getEditLayer();
         if (newLayer != null) {
-            newLayer.data.addDataSetListener(dataSetListener);
-            data = newLayer.data;
+            newLayer.getDataSet().addDataSetListener(dataSetListener);
+            data = newLayer.getDataSet();
             makeMap();
         } else {