Changeset 29222 in osm


Ignore:
Timestamp:
2013-01-31T14:39:51+01:00 (12 years ago)
Author:
bastik
Message:

adapt to changes in JOSM core ([josm5679] and [josm5681])

Location:
applications/editors/josm/plugins
Files:
14 edited

Legend:

Unmodified
Added
Removed

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

    r27352 r29222  
    3232    <property name="commit.message" value="Commit message"/>
    3333    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    34     <property name="plugin.main.version" value="4549"/>
     34    <property name="plugin.main.version" value="5679"/>
    3535    <!--
    3636      ************************************************

  • applications/editors/josm/plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DirectDownload.java

    r26509 r29222  
    6565                    GpxReader r = new GpxReader(is);
    6666                    boolean parsedProperly = r.parse(true);
    67                     GpxLayer gpxLayer = new GpxLayer(r.data, track.filename, true);
     67                    GpxLayer gpxLayer = new GpxLayer(r.getGpxData(), track.filename, true);
    6868
    69                     if (r.data.hasRoutePoints() || r.data.hasTrackPoints()) {
     69                    if (r.getGpxData().hasRoutePoints() || r.getGpxData().hasTrackPoints()) {
    7070                        Main.main.addLayer(gpxLayer);
    7171                    }
    7272
    73                     if (Main.pref.getBoolean("marker.makeautomarkers", true) && !r.data.waypoints.isEmpty()) {
    74                         MarkerLayer ml = new MarkerLayer(r.data, tr("Markers from {0}", track.filename), null, gpxLayer);
     73                    if (Main.pref.getBoolean("marker.makeautomarkers", true) && !r.getGpxData().waypoints.isEmpty()) {
     74                        MarkerLayer ml = new MarkerLayer(r.getGpxData(), tr("Markers from {0}", track.filename), null, gpxLayer);
    7575                        if (ml.data.size() > 0) {
    7676                            Main.main.addLayer(ml);

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

    r26605 r29222  
    3131    <property name="commit.message" value="Changed constructor signature, updated build.xml"/>
    3232    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    33     <property name="plugin.main.version" value="4394"/>
     33    <property name="plugin.main.version" value="5681"/>
    3434    <!--
    3535      ************************************************

  • applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/SingleSegmentGpxTrack.java

    r23191 r29222  
    88import org.openstreetmap.josm.data.gpx.GpxTrack;
    99import org.openstreetmap.josm.data.gpx.GpxTrackSegment;
     10import org.openstreetmap.josm.data.gpx.WithAttributes;
    1011
    11 public class SingleSegmentGpxTrack implements GpxTrack {
     12public class SingleSegmentGpxTrack extends WithAttributes implements GpxTrack {
    1213
    13     private final Map<String, Object> attributes;
    1414    private final GpxTrackSegment trackSegment;
    1515
    1616    public SingleSegmentGpxTrack(GpxTrackSegment trackSegment, Map<String, Object> attributes) {
    17         this.attributes = Collections.unmodifiableMap(attributes);
     17        this.attr = Collections.unmodifiableMap(attributes);
    1818        this.trackSegment = trackSegment;
    1919    }
    … …  
    2121
    2222    public Map<String, Object> getAttributes() {
    23         return attributes;
     23        return attr;
    2424    }
    2525

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

    r27852 r29222  
    3232    <property name="commit.message" value="Changed constructor signature of plugin main class"/>
    3333    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    34     <property name="plugin.main.version" value="4980"/>
     34    <property name="plugin.main.version" value="5681"/>
     35    <!--
     36      ************************************************
     37      ** should not be necessary to change the following properties
     38     -->
    3539    <property name="josm" location="../../core/dist/josm-custom.jar"/>
    3640    <property name="plugin.dist.dir" value="../../dist"/>

  • applications/editors/josm/plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/SingleSegmentGpxTrack.java

    r23191 r29222  
    88import org.openstreetmap.josm.data.gpx.GpxTrack;
    99import org.openstreetmap.josm.data.gpx.GpxTrackSegment;
     10import org.openstreetmap.josm.data.gpx.WithAttributes;
    1011
    11 public class SingleSegmentGpxTrack implements GpxTrack {
     12public class SingleSegmentGpxTrack extends WithAttributes implements GpxTrack {
    1213
    13     private final Map<String, Object> attributes;
    1414    private final GpxTrackSegment trackSegment;
    1515
    1616    public SingleSegmentGpxTrack(GpxTrackSegment trackSegment, Map<String, Object> attributes) {
    17         this.attributes = Collections.unmodifiableMap(attributes);
     17        this.attr = Collections.unmodifiableMap(attributes);
    1818        this.trackSegment = trackSegment;
    1919    }
    2020
    21 
    2221    public Map<String, Object> getAttributes() {
    23         return attributes;
     22        return attr;
    2423    }
    2524

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

    r27852 r29222  
    3232    <property name="commit.message" value="GPXFilter: moved to Alt-Shift-X"/>
    3333    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    34     <property name="plugin.main.version" value="4980"/>
     34    <property name="plugin.main.version" value="5679"/>
    3535    <!--
    3636      ************************************************

  • applications/editors/josm/plugins/gpxfilter/src/gpxfilter/GpxGrabber.java

    r23541 r29222  
    4848            GpxReader reader = new GpxReader(in);
    4949            reader.parse(false);
    50             GpxData result = reader.data;
     50            GpxData result = reader.getGpxData();
    5151            in.close();
    5252            result.fromServer = true;

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

    r27852 r29222  
    2727<project name="livegps" default="dist" basedir=".">
    2828    <property name="commit.message" value="Changed the constructor signature of the plugin main class"/>
    29     <property name="plugin.main.version" value="4980"/>
     29    <property name="plugin.main.version" value="5681"/>
     30    <!--
     31      ************************************************
     32      ** should not be necessary to change the following properties
     33     -->
    3034    <property name="josm" location="../../core/dist/josm-custom.jar"/>
    3135    <property name="plugin.dist.dir" value="../../dist"/>

  • applications/editors/josm/plugins/livegps/src/livegps/SingleSegmentGpxTrack.java

    r23191 r29222  
    88import org.openstreetmap.josm.data.gpx.GpxTrack;
    99import org.openstreetmap.josm.data.gpx.GpxTrackSegment;
     10import org.openstreetmap.josm.data.gpx.WithAttributes;
    1011
    11 public class SingleSegmentGpxTrack implements GpxTrack {
     12public class SingleSegmentGpxTrack extends WithAttributes implements GpxTrack {
    1213
    13     private final Map<String, Object> attributes;
    1414    private final GpxTrackSegment trackSegment;
    1515
    1616    public SingleSegmentGpxTrack(GpxTrackSegment trackSegment, Map<String, Object> attributes) {
    17         this.attributes = Collections.unmodifiableMap(attributes);
     17        this.attr = Collections.unmodifiableMap(attributes);
    1818        this.trackSegment = trackSegment;
    1919    }
    … …  
    2121
    2222    public Map<String, Object> getAttributes() {
    23         return attributes;
     23        return attr;
    2424    }
    2525

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

    r27852 r29222  
    3232    <property name="commit.message" value="Changed the constructor signature of the plugin main class; updated build.xml"/>
    3333    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    34     <property name="plugin.main.version" value="4980"/>
     34    <property name="plugin.main.version" value="5679"/>
     35    <!--
     36      ************************************************
     37      ** should not be necessary to change the following properties
     38     -->
    3539    <property name="josm" location="../../core/dist/josm-custom.jar"/>
    3640    <property name="plugin.dist.dir" value="../../dist"/>

  • applications/editors/josm/plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java

    r27852 r29222  
    129129                throw new IllegalStateException();
    130130            }
    131             r.data.storageFile = file;
    132             GpxLayer gpxLayer = new GpxLayer(r.data, fn);
     131            r.getGpxData().storageFile = file;
     132            GpxLayer gpxLayer = new GpxLayer(r.getGpxData(), fn);
    133133            Main.main.addLayer(gpxLayer);
    134             Main.main.addLayer(new MarkerLayer(r.data, tr("Markers from {0}", fn), file, gpxLayer));
     134            Main.main.addLayer(new MarkerLayer(r.getGpxData(), tr("Markers from {0}", fn), file, gpxLayer));
    135135
    136136        } else {

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

    r28318 r29222  
    1717<project name="public_transport" default="dist" basedir=".">
    1818    <property name="josm.basedir" location="../.."/>
     19    <property name="plugin.main.version" value="5679"/>
    1920    <!--
    2021      ************************************************
    2122      ** should not be necessary to change the following properties
    2223     -->
    23     <property name="plugin.main.version" value="5053"/>
    2424    <property name="josm" location="${josm.basedir}/core/dist/josm-custom.jar"/>
    2525    <property name="plugin.build.dir" value="build"/>

  • applications/editors/josm/plugins/public_transport/src/public_transport/StopImporterAction.java

    r26509 r29222  
    209209      final GpxReader r = new GpxReader(is);
    210210      final boolean parsedProperly = r.parse(true);
    211       data = r.data;
     211      data = r.getGpxData();
    212212
    213213      if (!parsedProperly)
Note: See TracChangeset for help on using the changeset viewer.