Changeset 31655 in osm for applications/editors/josm/plugins/opendata/src/org

Timestamp:

2015-10-20T16:57:35+02:00 (9 years ago)

Author:

donvip

Message:

[josm_plugins] update to JOSM 8919

Location:

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core

Files:

• datasets/WayCombiner.java (modified) (2 diffs)
• io/geographic/GeographicReader.java (modified) (2 diffs)
• io/geographic/GmlReader.java (modified) (2 diffs)
• io/geographic/MifReader.java (modified) (1 diff)
• io/geographic/ShpReader.java (modified) (2 diffs)

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/WayCombiner.java

@@ -17 +17 @@
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.corrector.ReverseWayTagCorrector;
-import org.openstreetmap.josm.corrector.UserCancelException;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -24 +23 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.conflict.tags.CombinePrimitiveResolverDialog;
+import org.openstreetmap.josm.tools.UserCancelException;
 
 // FIXME: Try to refactor CombineWayAction instead of using this class

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

@@ -37 +37 @@
 import org.opengis.referencing.operation.TransformException;
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.corrector.UserCancelException;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.Node;
@@ -51 +50 @@
 import org.openstreetmap.josm.tools.ImageOverlay;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.UserCancelException;
 import org.openstreetmap.josm.tools.ImageProvider.ImageSizes;
 

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

@@ -23 +23 @@
 import org.opengis.referencing.operation.TransformException;
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.corrector.UserCancelException;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
@@ -33 +32 @@
 import org.openstreetmap.josm.plugins.opendata.core.datasets.AbstractDataSetHandler;
 import org.openstreetmap.josm.plugins.opendata.core.datasets.NationalHandlers;
+import org.openstreetmap.josm.tools.UserCancelException;
 
 import com.vividsolutions.jts.geom.Coordinate;

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

@@ -306 +306 @@
         if (index < words.length && "Bounds".equals(words[index])) {
             // Useless parenthesis... "(minx, miny) (maxx, maxy)"
-            minx = Double.parseDouble(words[index+1].substring(1));
-            miny = Double.parseDouble(words[index+2].substring(0, words[index+2].length()-1));
-            maxx = Double.parseDouble(words[index+3].substring(1));
-            maxy = Double.parseDouble(words[index+4].substring(0, words[index+4].length()-1));
+            minx = Double.valueOf(words[index+1].substring(1));
+            miny = Double.valueOf(words[index+2].substring(0, words[index+2].length()-1));
+            maxx = Double.valueOf(words[index+3].substring(1));
+            maxy = Double.valueOf(words[index+4].substring(0, words[index+4].length()-1));
             if (Main.isTraceEnabled()) {
                 Main.trace(Arrays.toString(words) + " -> "+minx+","+miny+","+maxx+","+maxy);

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

@@ -40 +40 @@
 import org.opengis.referencing.operation.TransformException;
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.corrector.UserCancelException;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
@@ -50 +49 @@
 import org.openstreetmap.josm.plugins.opendata.core.datasets.AbstractDataSetHandler;
 import org.openstreetmap.josm.plugins.opendata.core.datasets.NationalHandlers;
+import org.openstreetmap.josm.tools.UserCancelException;
 
 import com.vividsolutions.jts.geom.Geometry;