Ticket #16796: 16796.2-plugins.patch

File 16796.2-plugins.patch, 33.1 KB (added by Bjoeni, 6 years ago)

  • plugins/CommandLine/build.xml

     
    33    <!-- enter the SVN commit message -->
    44    <property name="commit.message" value="JOSM/CommandLine: fix exception after JOSM update"/>
    55    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    6     <property name="plugin.main.version" value="15496"/>
     6    <property name="plugin.main.version" value="xxx"/>
    77
    88    <!-- Configure these properties (replace "..." accordingly).
    99         See https://josm.openstreetmap.de/wiki/DevelopersGuide/DevelopingPlugins

  • plugins/CommandLine/src/org/openstreetmap/josm/plugins/commandline/GpxFilter.java

     
    77
    88import org.openstreetmap.josm.data.gpx.GpxData;
    99import org.openstreetmap.josm.data.gpx.GpxTrack;
     10import org.openstreetmap.josm.data.gpx.IGpxTrack;
    1011import org.openstreetmap.josm.data.gpx.IGpxTrackSegment;
    1112import org.openstreetmap.josm.data.gpx.WayPoint;
    1213import org.openstreetmap.josm.data.osm.BBox;
    … …  
    2728    public void addGpxData(GpxData data) {
    2829        Collection<Collection<WayPoint>> currentTrack;
    2930        Collection<WayPoint> currentSegment;
    30         for (GpxTrack track : data.tracks) {
     31        for (IGpxTrack track : data.tracks) {
    3132            currentTrack = new ArrayList<>();
    3233            for (IGpxTrackSegment segment : track.getSegments()) {
    3334                currentSegment = new ArrayList<>();

  • plugins/DirectDownload/build.xml

     
    33    <!-- enter the SVN commit message -->
    44    <property name="commit.message" value="Commit message"/>
    55    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    6     <property name="plugin.main.version" value="14153"/>
     6    <property name="plugin.main.version" value="xxx"/>
    77
    88    <!-- Configure these properties (replace "..." accordingly).
    99         See https://josm.openstreetmap.de/wiki/DevelopersGuide/DevelopingPlugins

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

     
    1111import org.openstreetmap.josm.data.gpx.GpxConstants;
    1212import org.openstreetmap.josm.data.gpx.GpxData;
    1313import org.openstreetmap.josm.data.gpx.GpxTrack;
    14 import org.openstreetmap.josm.data.gpx.ImmutableGpxTrack;
     14import org.openstreetmap.josm.data.gpx.IGpxTrack;
    1515import org.openstreetmap.josm.gui.MainApplication;
    1616import org.openstreetmap.josm.gui.MainMenu;
    1717import org.openstreetmap.josm.gui.layer.GpxLayer;
    … …  
    6161                }
    6262                GpxData dataNew = new GpxData();
    6363
    64                 for (GpxTrack trk : data.getTracks()) {
     64                for (IGpxTrack trk : data.getTracks()) {
    6565                    HashMap<String, Object> attrib = new HashMap<>(trk.getAttributes());
    6666                    if (!trk.getAttributes().containsKey(GpxConstants.GPX_NAME)) {
    6767                        attrib.put(GpxConstants.GPX_NAME, track.filename);
    … …  
    7070                        attrib.put(GpxConstants.GPX_DESC, track.description);
    7171                    }
    7272                    // replace the existing trace in the unmodifiable tracks
    73                     dataNew.addTrack(new ImmutableGpxTrack(new ArrayList<>(trk.getSegments()), attrib));
     73                    dataNew.addTrack(new GpxTrack(new ArrayList<>(trk.getSegments()), attrib));
    7474                }
    7575
    7676                data = dataNew;

  • plugins/DirectUpload/build.xml

     
    44    <!-- enter the SVN commit message -->
    55    <property name="commit.message" value="applied JOSM Ticket 4498 (patch by ax) - oauth support for gpx upload (I accidentally committed parts of the path in [24236])"/>
    66    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    7     <property name="plugin.main.version" value="14153"/>
     7    <property name="plugin.main.version" value="xxx"/>
    88
    99    <!-- Configure these properties (replace "..." accordingly).
    1010         See https://josm.openstreetmap.de/wiki/DevelopersGuide/DevelopingPlugins

  • plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java

     
    2424import org.openstreetmap.josm.data.gpx.GpxConstants;
    2525import org.openstreetmap.josm.data.gpx.GpxData;
    2626import org.openstreetmap.josm.data.gpx.GpxTrack;
     27import org.openstreetmap.josm.data.gpx.IGpxTrack;
    2728import org.openstreetmap.josm.gui.ExtendedDialog;
    2829import org.openstreetmap.josm.gui.MainApplication;
    2930import org.openstreetmap.josm.gui.PleaseWaitRunnable;
    … …  
    177178      String description = "", title = " ", tags = "";
    178179      // non-breaking space in title fixes #10275
    179180      if (gpxData != null) {
    180           GpxTrack firstTrack = gpxData.tracks.isEmpty() ? null : gpxData.tracks.iterator().next();
     181          IGpxTrack firstTrack = gpxData.tracks.isEmpty() ? null : gpxData.tracks.iterator().next();
    181182          Object meta_desc = gpxData.attr.get(GpxConstants.META_DESC);
    182183          if (meta_desc != null) {
    183184              description = meta_desc.toString();

  • plugins/ElevationProfile/build.xml

     
    33    <!-- enter the SVN commit message -->
    44    <property name="commit.message" value="[josm_elevationprofile]"/>
    55    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    6     <property name="plugin.main.version" value="15496"/>
     6    <property name="plugin.main.version" value="xxx"/>
    77   
    88    <!-- Configure these properties (replace "..." accordingly).
    99         See https://josm.openstreetmap.de/wiki/DevelopersGuide/DevelopingPlugins

  • plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gpx/ElevationModel.java

     
    66
    77import org.openstreetmap.josm.data.gpx.GpxData;
    88import org.openstreetmap.josm.data.gpx.GpxRoute;
    9 import org.openstreetmap.josm.data.gpx.GpxTrack;
     9import org.openstreetmap.josm.data.gpx.IGpxTrack;
    1010import org.openstreetmap.josm.data.gpx.IGpxTrackSegment;
    1111import org.openstreetmap.josm.data.gpx.IWithAttributes;
    1212import org.openstreetmap.josm.data.gpx.WayPoint;
    … …  
    146146    }
    147147
    148148    @Override
    149     public void beginTrack(GpxTrack track) {
     149    public void beginTrack(IGpxTrack track) {
    150150        createProfile(track);
    151151    }
    152152
    153153    @Override
    154     public void endTrack(GpxTrack track) {
     154    public void endTrack(IGpxTrack track) {
    155155        if (curProfile == null) throw new RuntimeException("Internal error: No elevation profile");
    156156
    157157        curProfile.setDistance(track.length());
    … …  
    159159    }
    160160
    161161    @Override
    162     public void beginTrackSegment(GpxTrack track, IGpxTrackSegment segment) {
     162    public void beginTrackSegment(IGpxTrack track, IGpxTrackSegment segment) {
    163163        // Nothing to do here for now
    164164    }
    165165
    166166    @Override
    167     public void endTrackSegment(GpxTrack track, IGpxTrackSegment segment) {
     167    public void endTrackSegment(IGpxTrack track, IGpxTrackSegment segment) {
    168168        // Nothing to do here for now
    169169    }
    170170
    171171    @Override
    172     public void visitTrackPoint(WayPoint wp, GpxTrack track, IGpxTrackSegment segment) {
     172    public void visitTrackPoint(WayPoint wp, IGpxTrack track, IGpxTrackSegment segment) {
    173173        processWayPoint(wp);
    174174    }
    175175

  • plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gpx/GpxIterator.java

     
    55
    66import org.openstreetmap.josm.data.gpx.GpxData;
    77import org.openstreetmap.josm.data.gpx.GpxRoute;
    8 import org.openstreetmap.josm.data.gpx.GpxTrack;
     8import org.openstreetmap.josm.data.gpx.IGpxTrack;
    99import org.openstreetmap.josm.data.gpx.IGpxTrackSegment;
    1010import org.openstreetmap.josm.data.gpx.WayPoint;
    1111
    … …  
    4646        }
    4747
    4848        // tracks
    49         for (GpxTrack trk : data.tracks) {
     49        for (IGpxTrack trk : data.tracks) {
    5050            visitTrack(visitor, trk);
    5151        }
    5252    }
    … …  
    5757     * @param visitor
    5858     *            The visitor which inspects all GPX entities.
    5959     */
    60     public static void visit(GpxTrack track, IGpxVisitor visitor) {
     60    public static void visit(IGpxTrack track, IGpxVisitor visitor) {
    6161        visitTrack(visitor, track);
    6262    }
    6363
    … …  
    7373
    7474    // ---------------------- Helper methods ----------------
    7575
    76     private static void visitTrack(IGpxVisitor visitor, GpxTrack trk) {
     76    private static void visitTrack(IGpxVisitor visitor, IGpxTrack trk) {
    7777        if (trk == null) return;
    7878        if (visitor == null) return;
    7979

  • plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gpx/IGpxVisitor.java

     
    22package org.openstreetmap.josm.plugins.elevation.gpx;
    33
    44import org.openstreetmap.josm.data.gpx.GpxRoute;
    5 import org.openstreetmap.josm.data.gpx.GpxTrack;
     5import org.openstreetmap.josm.data.gpx.IGpxTrack;
    66import org.openstreetmap.josm.data.gpx.IGpxTrackSegment;
    77import org.openstreetmap.josm.data.gpx.WayPoint;
    88
    … …  
    2424    /**
    2525     * Starts a GPX track.
    2626     */
    27     void beginTrack(GpxTrack track);
     27    void beginTrack(IGpxTrack track);
    2828
    2929    /**
    3030     * Ends a GPX track.
    3131     */
    32     void endTrack(GpxTrack track);
     32    void endTrack(IGpxTrack track);
    3333
    3434    /**
    3535     * Starts a GPX route.
    … …  
    4545    /**
    4646     * Starts a segment within a GPX track.
    4747     */
    48     void beginTrackSegment(GpxTrack track, IGpxTrackSegment segment);
     48    void beginTrackSegment(IGpxTrack track, IGpxTrackSegment segment);
    4949
    5050    /**
    5151     * Ends a segment within a GPX track.
    5252     */
    53     void endTrackSegment(GpxTrack track, IGpxTrackSegment segment);
     53    void endTrackSegment(IGpxTrack track, IGpxTrackSegment segment);
    5454
    5555    /**
    5656     * Visits a way point within a GPX route.
    … …  
    6666     * @param track the track containing the way point.
    6767     * @param segment the track segment
    6868     */
    69     void visitTrackPoint(WayPoint wp, GpxTrack track, IGpxTrackSegment segment);
     69    void visitTrackPoint(WayPoint wp, IGpxTrack track, IGpxTrackSegment segment);
    7070
    7171    /**
    7272     * Visits a way point within a GPX route.

  • plugins/NanoLog/build.xml

     
    44    <!-- enter the SVN commit message -->
    55    <property name="commit.message" value="NanoLog"/>
    66    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    7     <property name="plugin.main.version" value="15496"/>
     7    <property name="plugin.main.version" value="xxx"/>
    88    <property name="plugin.author" value="Ilya Zverev"/>
    99    <property name="plugin.class" value="nanolog.NanoLogPlugin"/>
    1010    <property name="plugin.description" value="NanoLog adjustment and browsing layer"/>

  • plugins/NanoLog/src/nanolog/Correlator.java

     
    1111import org.openstreetmap.josm.data.coor.EastNorth;
    1212import org.openstreetmap.josm.data.coor.LatLon;
    1313import org.openstreetmap.josm.data.gpx.GpxData;
    14 import org.openstreetmap.josm.data.gpx.GpxTrack;
     14import org.openstreetmap.josm.data.gpx.IGpxTrack;
    1515import org.openstreetmap.josm.data.gpx.IGpxTrackSegment;
    1616import org.openstreetmap.josm.data.gpx.WayPoint;
    1717import org.openstreetmap.josm.data.projection.ProjectionRegistry;
    … …  
    4141        long firstExifDate = sortedEntries.get(0).getTime().getTime();
    4242        long firstGPXDate = -1;
    4343        outer:
    44         for (GpxTrack trk : data.tracks) {
     44        for (IGpxTrack trk : data.tracks) {
    4545            for (IGpxTrackSegment segment : trk.getSegments()) {
    4646                for (WayPoint curWp : segment.getWayPoints()) {
    4747                    String curDateWpStr = (String) curWp.attr.get("time");
    … …  
    8383        List<NanoLogEntry> sortedEntries = new ArrayList<>(entries);
    8484        //int ret = 0;
    8585        Collections.sort(sortedEntries);
    86         for (GpxTrack track : data.tracks) {
     86        for (IGpxTrack track : data.tracks) {
    8787            for (IGpxTrackSegment segment : track.getSegments()) {
    8888                long prevWpTime = 0;
    8989                WayPoint prevWp = null;
    … …  
    219219     */
    220220    public static long getGpxDate(GpxData data, LatLon pos) {
    221221        EastNorth en = ProjectionRegistry.getProjection().latlon2eastNorth(pos);
    222         for (GpxTrack track : data.tracks) {
     222        for (IGpxTrack track : data.tracks) {
    223223            for (IGpxTrackSegment segment : track.getSegments()) {
    224224                long prevWpTime = 0;
    225225                WayPoint prevWp = null;

  • plugins/editgpx/build.xml

     
    33    <!-- enter the SVN commit message -->
    44    <property name="commit.message" value="Changed constructor signature of plugin main class"/>
    55    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    6     <property name="plugin.main.version" value="15496"/>
     6    <property name="plugin.main.version" value="xxx"/>
    77   
    88    <!-- Configure these properties (replace "..." accordingly).
    99         See https://josm.openstreetmap.de/wiki/DevelopersGuide/DevelopingPlugins

  • plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/data/EditGpxData.java

     
    77import org.openstreetmap.josm.data.gpx.GpxData;
    88import org.openstreetmap.josm.data.gpx.GpxRoute;
    99import org.openstreetmap.josm.data.gpx.GpxTrack;
     10import org.openstreetmap.josm.data.gpx.IGpxTrack;
    1011import org.openstreetmap.josm.data.gpx.WayPoint;
    1112
    1213public class EditGpxData {
    … …  
    1718    private final List<WayPoint> waypoints = new ArrayList<>();
    1819
    1920    public void load(GpxData data) {
    20         for (GpxTrack track: data.tracks) {
     21        for (IGpxTrack track: data.tracks) {
    2122            tracks.add(new EditGpxTrack(track));
    2223        }
    2324        routes.clear();

  • plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/data/EditGpxTrack.java

     
    1111import java.util.TimeZone;
    1212
    1313import org.openstreetmap.josm.data.gpx.GpxTrack;
     14import org.openstreetmap.josm.data.gpx.IGpxTrack;
    1415import org.openstreetmap.josm.data.gpx.IGpxTrackSegment;
    1516import org.openstreetmap.josm.data.gpx.WayPoint;
    1617
    … …  
    2021    private final Map<String, Object> attributes = new HashMap<>();
    2122    private boolean isDeleted;
    2223
    23     public EditGpxTrack(GpxTrack track) {
     24    public EditGpxTrack(IGpxTrack track) {
    2425        attributes.putAll(track.getAttributes());
    2526        for (IGpxTrackSegment segment: track.getSegments()) {
    2627            segments.add(new EditGpxTrackSegment(segment));

  • plugins/gpsblam/build.xml

     
    44    <!-- enter the SVN commit message -->
    55    <property name="commit.message" value="Commit message"/>
    66    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    7     <property name="plugin.main.version" value="15496"/>
     7    <property name="plugin.main.version" value="xxx"/>
    88
    99    <!-- Configure these properties (replace "..." accordingly).
    1010         See https://josm.openstreetmap.de/wiki/DevelopersGuide/DevelopingPlugins

  • plugins/gpsblam/src/org/openstreetmap/josm/plugins/gpsblam/GPSBlamInputData.java

     
    99import java.util.LinkedList;
    1010
    1111import org.openstreetmap.josm.data.coor.CachedLatLon;
    12 import org.openstreetmap.josm.data.gpx.GpxTrack;
     12import org.openstreetmap.josm.data.gpx.IGpxTrack;
    1313import org.openstreetmap.josm.data.gpx.IGpxTrackSegment;
    1414import org.openstreetmap.josm.data.gpx.WayPoint;
    1515import org.openstreetmap.josm.data.projection.Projection;
    … …  
    3232        Projection projection = ProjectionRegistry.getProjection();
    3333        for (Layer l : layers) {
    3434            if (l.isVisible() && l instanceof GpxLayer) {
    35                 for (GpxTrack track : ((GpxLayer) l).data.tracks) {
     35                for (IGpxTrack track : ((GpxLayer) l).data.tracks) {
    3636                    for (IGpxTrackSegment segment: track.getSegments()) {
    3737                        for (WayPoint wayPoint : segment.getWayPoints()) {
    3838                            if (p2.equals(p1)) {

  • plugins/infomode/build.xml

     
    44    <!-- enter the SVN commit message -->
    55    <property name="commit.message" value="InfoMode : for shortcurt parser"/>
    66    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    7     <property name="plugin.main.version" value="15496"/>
     7    <property name="plugin.main.version" value="xxx"/>
    88
    99    <!-- Configure these properties (replace "..." accordingly).
    1010         See https://josm.openstreetmap.de/wiki/DevelopersGuide/DevelopingPlugins

  • plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java

     
    2525import org.openstreetmap.josm.actions.mapmode.MapMode;
    2626import org.openstreetmap.josm.data.Bounds;
    2727import org.openstreetmap.josm.data.coor.EastNorth;
    28 import org.openstreetmap.josm.data.gpx.GpxTrack;
     28import org.openstreetmap.josm.data.gpx.IGpxTrack;
    2929import org.openstreetmap.josm.data.gpx.IGpxTrackSegment;
    3030import org.openstreetmap.josm.data.gpx.WayPoint;
    3131import org.openstreetmap.josm.data.projection.ProjectionRegistry;
    … …  
    218218
    219219        if (l instanceof GpxLayer && pos != null) {
    220220            GpxLayer gpxL = (GpxLayer) l;
    221             Set<GpxTrack> toRemove = new HashSet<>();
    222             for (GpxTrack track : gpxL.data.tracks) {
     221            Set<IGpxTrack> toRemove = new HashSet<>();
     222            for (IGpxTrack track : gpxL.data.tracks) {
    223223                boolean f = true;
    224224                sg: for (IGpxTrackSegment seg : track.getSegments()) {
    225225                    for (WayPoint S : seg.getWayPoints()) {
    … …  
    240240
    241241            double minDist = 1e9, d;
    242242            WayPoint wp = null, oldWp = null, prevWp = null;
    243             GpxTrack trk = null;
     243            IGpxTrack trk = null;
    244244            double maxD = mv.getDist100Pixel()/3;
    245             for (GpxTrack track : gpxL.data.tracks) {
     245            for (IGpxTrack track : gpxL.data.tracks) {
    246246                for (IGpxTrackSegment seg : track.getSegments()) {
    247247                    oldWp = null; // next segment will have new previous point
    248248                    for (WayPoint S : seg.getWayPoints()) {

  • plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java

     
    1919import javax.swing.JPanel;
    2020
    2121import org.openstreetmap.josm.data.SystemOfMeasurement;
    22 import org.openstreetmap.josm.data.gpx.GpxTrack;
     22import org.openstreetmap.josm.data.gpx.IGpxTrack;
    2323import org.openstreetmap.josm.data.gpx.IGpxTrackSegment;
    2424import org.openstreetmap.josm.data.gpx.WayPoint;
    2525import org.openstreetmap.josm.gui.MainApplication;
    … …  
    3030
    3131class InfoPanel extends JPanel {
    3232
    33     private Collection<GpxTrack> tracks;
    34     private GpxTrack trk;
     33    private Collection<IGpxTrack> tracks;
     34    private IGpxTrack trk;
    3535
    3636    private JLabel label1 = new JLabel();
    3737    private JLabel label2 = new JLabel();
    … …  
    7272            @Override
    7373            public void actionPerformed(ActionEvent e) {
    7474            if (tracks == null) return;
    75             Set<GpxTrack> toRemove = new HashSet<>();
     75            Set<IGpxTrack> toRemove = new HashSet<>();
    7676
    7777            double tm = -1;
    7878            for (IGpxTrackSegment seg : trk.getSegments()) {
    … …  
    8383                    }
    8484                }
    8585
    86             for (GpxTrack track : tracks) {
     86            for (IGpxTrack track : tracks) {
    8787                boolean f = true;
    8888                sg: for (IGpxTrackSegment seg : track.getSegments()) {
    8989                    for (WayPoint S : seg.getWayPoints()) {
    … …  
    101101        });
    102102    }
    103103
    104     void setData(WayPoint wp, GpxTrack trk, double vel, Collection<GpxTrack> tracks) {
     104    void setData(WayPoint wp, IGpxTrack trk, double vel, Collection<IGpxTrack> tracks) {
    105105        this.tracks = tracks;
    106106        this.trk = trk;
    107107        if (!wp.hasDate()) {

  • plugins/livegps/build.xml

     
    11<?xml version="1.0" encoding="utf-8"?>
    22<project name="livegps" default="dist" basedir=".">
    33    <property name="commit.message" value="Changed the constructor signature of the plugin main class"/>
    4     <property name="plugin.main.version" value="14153"/>
     4    <property name="plugin.main.version" value="xxx"/>
    55       
    66    <!-- Configure these properties (replace "..." accordingly).
    77         See https://josm.openstreetmap.de/wiki/DevelopersGuide/DevelopingPlugins

  • plugins/livegps/src/livegps/AppendableGpxTrackSegment.java

     
    44import java.util.Collection;
    55
    66import org.openstreetmap.josm.data.Bounds;
    7 import org.openstreetmap.josm.data.gpx.GpxTrackSegment;
     7import org.openstreetmap.josm.data.gpx.IGpxTrackSegment;
    88import org.openstreetmap.josm.data.gpx.WayPoint;
     9import org.openstreetmap.josm.data.gpx.WithAttributes;
    910import org.openstreetmap.josm.tools.CopyList;
    1011
    1112/**
    … …  
    1213 * Thread safe implementation of GpxTrackSegement
    1314 *
    1415 */
    15 public class AppendableGpxTrackSegment implements GpxTrackSegment {
     16public class AppendableGpxTrackSegment extends WithAttributes implements IGpxTrackSegment {
    1617
    1718    private WayPoint[] wayPoints = new WayPoint[16];
    1819    private int size;

  • plugins/livegps/src/livegps/LiveGpsLayer.java

     
    1414
    1515import org.openstreetmap.josm.data.coor.LatLon;
    1616import org.openstreetmap.josm.data.gpx.GpxData;
    17 import org.openstreetmap.josm.data.gpx.GpxTrack;
     17import org.openstreetmap.josm.data.gpx.IGpxTrack;
    1818import org.openstreetmap.josm.data.gpx.WayPoint;
    1919import org.openstreetmap.josm.gui.MainApplication;
    2020import org.openstreetmap.josm.gui.layer.GpxLayer;
    … …  
    5050        Map<String, Object> attr = new HashMap<>();
    5151        attr.put("desc", "josm live gps");
    5252
    53         GpxTrack trackBeingWritten = new SingleSegmentGpxTrack(trackSegment, attr);
     53        IGpxTrack trackBeingWritten = new SingleSegmentGpxTrack(trackSegment, attr);
    5454        data.tracks.add(trackBeingWritten);
    5555
    5656        initIntervals();

  • plugins/livegps/src/livegps/SingleSegmentGpxTrack.java

     
    66import java.util.Map;
    77
    88import org.openstreetmap.josm.data.Bounds;
    9 import org.openstreetmap.josm.data.gpx.GpxTrack;
    10 import org.openstreetmap.josm.data.gpx.GpxTrackSegment;
     9import org.openstreetmap.josm.data.gpx.IGpxTrack;
     10import org.openstreetmap.josm.data.gpx.IGpxTrackSegment;
    1111import org.openstreetmap.josm.data.gpx.WithAttributes;
    1212
    13 public class SingleSegmentGpxTrack extends WithAttributes implements GpxTrack {
     13public class SingleSegmentGpxTrack extends WithAttributes implements IGpxTrack {
    1414
    15     private final GpxTrackSegment trackSegment;
     15    private final IGpxTrackSegment trackSegment;
    1616
    17     public SingleSegmentGpxTrack(GpxTrackSegment trackSegment, Map<String, Object> attributes) {
     17    public SingleSegmentGpxTrack(IGpxTrackSegment trackSegment, Map<String, Object> attributes) {
    1818        this.attr = Collections.unmodifiableMap(attributes);
    1919        this.trackSegment = trackSegment;
    2020    }
    … …  
    3030    }
    3131
    3232    @Override
    33     public Collection<GpxTrackSegment> getSegments() {
     33    public Collection<IGpxTrackSegment> getSegments() {
    3434        return Collections.singleton(trackSegment);
    3535    }
    3636

  • plugins/measurement/build.xml

     
    33    <!-- enter the SVN commit message -->
    44    <property name="commit.message" value="recompile dure to core change"/>
    55    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    6     <property name="plugin.main.version" value="15496"/>
     6    <property name="plugin.main.version" value="xxx"/>
    77    <property name="plugin.canloadatruntime" value="true"/>
    88   
    99    <!-- Configure these properties (replace "..." accordingly).

  • plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java

     
    2828
    2929import org.openstreetmap.josm.data.Bounds;
    3030import org.openstreetmap.josm.data.coor.LatLon;
    31 import org.openstreetmap.josm.data.gpx.GpxTrack;
     31import org.openstreetmap.josm.data.gpx.IGpxTrack;
    3232import org.openstreetmap.josm.data.gpx.IGpxTrackSegment;
    3333import org.openstreetmap.josm.data.gpx.WayPoint;
    3434import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
    … …  
    284284                    points = new ArrayList<>(32);
    285285                }
    286286
    287                 for (GpxTrack trk : gpx.data.tracks) {
     287                for (IGpxTrack trk : gpx.data.tracks) {
    288288                    for (IGpxTrackSegment trkseg : trk.getSegments()) {
    289289                        for(WayPoint p: trkseg.getWayPoints()){
    290290                            points.add(p);

  • plugins/public_transport/build.xml

     
    44    <!-- enter the SVN commit message -->
    55    <property name="commit.message" value="Commit message"/>
    66    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    7     <property name="plugin.main.version" value="15496"/>
     7    <property name="plugin.main.version" value="xxx"/>
    88
    99    <property name="plugin.author" value="Roland M. Olbricht"/>
    1010    <property name="plugin.class" value="org.openstreetmap.josm.plugins.public_transport.PublicTransportPlugin"/>

  • plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/actions/StopImporterAction.java

     
    2727import org.openstreetmap.josm.data.UndoRedoHandler;
    2828import org.openstreetmap.josm.data.coor.LatLon;
    2929import org.openstreetmap.josm.data.gpx.GpxData;
    30 import org.openstreetmap.josm.data.gpx.GpxTrack;
     30import org.openstreetmap.josm.data.gpx.IGpxTrack;
    3131import org.openstreetmap.josm.data.gpx.WayPoint;
    3232import org.openstreetmap.josm.data.osm.DataSet;
    3333import org.openstreetmap.josm.data.osm.Node;
    … …  
    209209        tracksListModel.clear();
    210210        if (data != null) {
    211211            Vector<TrackReference> trackRefs = new Vector<>();
    212             Iterator<GpxTrack> trackIter = data.tracks.iterator();
     212            Iterator<IGpxTrack> trackIter = data.tracks.iterator();
    213213            while (trackIter.hasNext()) {
    214                 GpxTrack track = trackIter.next();
     214                IGpxTrack track = trackIter.next();
    215215                trackRefs.add(new TrackReference(track, this));
    216216            }
    217217

  • plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/refs/TrackReference.java

     
    1313import org.openstreetmap.josm.command.Command;
    1414import org.openstreetmap.josm.data.UndoRedoHandler;
    1515import org.openstreetmap.josm.data.coor.LatLon;
    16 import org.openstreetmap.josm.data.gpx.GpxTrack;
     16import org.openstreetmap.josm.data.gpx.IGpxTrack;
    1717import org.openstreetmap.josm.data.gpx.IGpxTrackSegment;
    1818import org.openstreetmap.josm.data.gpx.WayPoint;
    1919import org.openstreetmap.josm.data.osm.Node;
    … …  
    2323import org.openstreetmap.josm.plugins.public_transport.models.TrackStoplistTableModel;
    2424
    2525public class TrackReference implements Comparable<TrackReference>, TableModelListener {
    26     public GpxTrack track;
     26    public IGpxTrack track;
    2727
    2828    public TrackStoplistTableModel stoplistTM;
    2929
    … …  
    3939
    4040    public boolean inEvent = false;
    4141
    42     public TrackReference(GpxTrack track, StopImporterAction controller) {
     42    public TrackReference(IGpxTrack track, StopImporterAction controller) {
    4343        this.track = track;
    4444        this.stoplistTM = new TrackStoplistTableModel(this);
    4545        this.stopwatchStart = "00:00:00";
    … …  
    7070        this.threshold = 20;
    7171    }
    7272
    73     public GpxTrack getGpxTrack() {
     73    public IGpxTrack getGpxTrack() {
    7474        return track;
    7575    }
    7676