Ignore:
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
Files:
7 edited

Legend:

Unmodified
Added
Removed

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

    r31116 r31655  
    11<?xml version="1.0" encoding="utf-8"?>
    22<project name="opendata" default="dist" basedir=".">
    3     <property name="plugin.main.version" value="8323"/>
     3    <property name="plugin.main.version" value="8919"/>
    44    <property name="plugin.author" value="Don-vip"/>
    55    <property name="plugin.class" value="org.openstreetmap.josm.plugins.opendata.OdPlugin"/>

  • applications/editors/josm/plugins/opendata/modules/fr.paris/src/org/openstreetmap/josm/plugins/opendata/modules/fr/paris/datasets/urbanisme/SanisettesHandler.java

    r30731 r31655  
    66import java.util.List;
    77
    8 import org.openstreetmap.josm.corrector.UserCancelException;
    98import org.openstreetmap.josm.data.osm.DataSet;
    109import org.openstreetmap.josm.data.osm.Node;
    … …  
    1211import org.openstreetmap.josm.plugins.opendata.core.datasets.WayCombiner;
    1312import org.openstreetmap.josm.plugins.opendata.modules.fr.paris.datasets.ParisDataSetHandler;
     13import org.openstreetmap.josm.tools.UserCancelException;
    1414
    1515public class SanisettesHandler extends ParisDataSetHandler {

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

    r30723 r31655  
    1717import org.openstreetmap.josm.command.Command;
    1818import org.openstreetmap.josm.corrector.ReverseWayTagCorrector;
    19 import org.openstreetmap.josm.corrector.UserCancelException;
    2019import org.openstreetmap.josm.data.osm.Node;
    2120import org.openstreetmap.josm.data.osm.OsmPrimitive;
    … …  
    2423import org.openstreetmap.josm.data.osm.Way;
    2524import org.openstreetmap.josm.gui.conflict.tags.CombinePrimitiveResolverDialog;
     25import org.openstreetmap.josm.tools.UserCancelException;
    2626
    2727// 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

    r31116 r31655  
    3737import org.opengis.referencing.operation.TransformException;
    3838import org.openstreetmap.josm.Main;
    39 import org.openstreetmap.josm.corrector.UserCancelException;
    4039import org.openstreetmap.josm.data.coor.LatLon;
    4140import org.openstreetmap.josm.data.osm.Node;
    … …  
    5150import org.openstreetmap.josm.tools.ImageOverlay;
    5251import org.openstreetmap.josm.tools.ImageProvider;
     52import org.openstreetmap.josm.tools.UserCancelException;
    5353import org.openstreetmap.josm.tools.ImageProvider.ImageSizes;
    5454

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

    r31364 r31655  
    2323import org.opengis.referencing.operation.TransformException;
    2424import org.openstreetmap.josm.Main;
    25 import org.openstreetmap.josm.corrector.UserCancelException;
    2625import org.openstreetmap.josm.data.osm.DataSet;
    2726import org.openstreetmap.josm.data.osm.Node;
    … …  
    3332import org.openstreetmap.josm.plugins.opendata.core.datasets.AbstractDataSetHandler;
    3433import org.openstreetmap.josm.plugins.opendata.core.datasets.NationalHandlers;
     34import org.openstreetmap.josm.tools.UserCancelException;
    3535
    3636import com.vividsolutions.jts.geom.Coordinate;

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

    r30730 r31655  
    306306        if (index < words.length && "Bounds".equals(words[index])) {
    307307            // Useless parenthesis... "(minx, miny) (maxx, maxy)"
    308             minx = Double.parseDouble(words[index+1].substring(1));
    309             miny = Double.parseDouble(words[index+2].substring(0, words[index+2].length()-1));
    310             maxx = Double.parseDouble(words[index+3].substring(1));
    311             maxy = Double.parseDouble(words[index+4].substring(0, words[index+4].length()-1));
     308            minx = Double.valueOf(words[index+1].substring(1));
     309            miny = Double.valueOf(words[index+2].substring(0, words[index+2].length()-1));
     310            maxx = Double.valueOf(words[index+3].substring(1));
     311            maxy = Double.valueOf(words[index+4].substring(0, words[index+4].length()-1));
    312312            if (Main.isTraceEnabled()) {
    313313                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

    r30982 r31655  
    4040import org.opengis.referencing.operation.TransformException;
    4141import org.openstreetmap.josm.Main;
    42 import org.openstreetmap.josm.corrector.UserCancelException;
    4342import org.openstreetmap.josm.data.osm.DataSet;
    4443import org.openstreetmap.josm.data.osm.Node;
    … …  
    5049import org.openstreetmap.josm.plugins.opendata.core.datasets.AbstractDataSetHandler;
    5150import org.openstreetmap.josm.plugins.opendata.core.datasets.NationalHandlers;
     51import org.openstreetmap.josm.tools.UserCancelException;
    5252
    5353import com.vividsolutions.jts.geom.Geometry;
Note: See TracChangeset for help on using the changeset viewer.