Changeset 15502 in josm for trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java

Timestamp:

2019-11-03T22:11:11+01:00 (6 years ago)

Author:

Don-vip

Message:

see #16796 - use IGpxTrack in GpxData (patch by Bjoeni)

File:

• trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java (modified) (16 diffs)

trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java

@@ -73 +73 @@
      * A list of tracks this file consists of
      */
-    private final ArrayList<GpxTrack> privateTracks = new ArrayList<>();
+    private final ArrayList<IGpxTrack> privateTracks = new ArrayList<>();
     /**
      * GPX routes in this file
@@ -100 +100 @@
      * @see #getTracks()
      */
-    public final Collection<GpxTrack> tracks = new ListeningCollection<GpxTrack>(privateTracks, this::invalidate) {
+    public final Collection<IGpxTrack> tracks = new ListeningCollection<IGpxTrack>(privateTracks, this::invalidate) {
 
         @Override
-        protected void removed(GpxTrack cursor) {
+        protected void removed(IGpxTrack cursor) {
             cursor.removeListener(proxy);
             super.removed(cursor);
@@ -109 +109 @@
 
         @Override
-        protected void added(GpxTrack cursor) {
+        protected void added(IGpxTrack cursor) {
             super.added(cursor);
             cursor.addListener(proxy);
@@ -174 +174 @@
 
         if (cutOverlapping) {
-            for (GpxTrack trk : other.privateTracks) {
+            for (IGpxTrack trk : other.privateTracks) {
                 cutOverlapping(trk, connect);
             }
@@ -186 +186 @@
     }
 
-    private void cutOverlapping(GpxTrack trk, boolean connect) {
+    private void cutOverlapping(IGpxTrack trk, boolean connect) {
         List<IGpxTrackSegment> segsOld = new ArrayList<>(trk.getSegments());
         List<IGpxTrackSegment> segsNew = new ArrayList<>();
@@ -366 +366 @@
         if (segSpans == null) {
             segSpans = new ArrayList<>();
-            for (GpxTrack trk : privateTracks) {
+            for (IGpxTrack trk : privateTracks) {
                 for (IGpxTrackSegment seg : trk.getSegments()) {
                     GpxTrackSegmentSpan s = GpxTrackSegmentSpan.tryGetFromSegment(seg);
@@ -392 +392 @@
      * @return The tracks.
      */
-    public synchronized Collection<GpxTrack> getTracks() {
+    public synchronized Collection<IGpxTrack> getTracks() {
         return Collections.unmodifiableCollection(privateTracks);
     }
@@ -418 +418 @@
      * @since 12156
      */
-    public synchronized void addTrack(GpxTrack track) {
+    public synchronized void addTrack(IGpxTrack track) {
         if (privateTracks.stream().anyMatch(t -> t == track)) {
             throw new IllegalArgumentException(MessageFormat.format("The track was already added to this data: {0}", track));
@@ -432 +432 @@
      * @since 12156
      */
-    public synchronized void removeTrack(GpxTrack track) {
+    public synchronized void removeTrack(IGpxTrack track) {
         if (!privateTracks.removeIf(t -> t == track)) {
             throw new IllegalArgumentException(MessageFormat.format("The track was not in this data: {0}", track));
@@ -626 +626 @@
      * @return The stream
      * @see #getTracks()
-     * @see GpxTrack#getSegments()
+     * @see IGpxTrack#getSegments()
      * @see IGpxTrackSegment#getWayPoints()
      * @since 12156
@@ -698 +698 @@
             }
         }
-        for (GpxTrack trk : privateTracks) {
+        for (IGpxTrack trk : privateTracks) {
             Bounds trkBounds = trk.getBounds();
             if (trkBounds != null) {
@@ -716 +716 @@
      */
     public synchronized double length() {
-        return privateTracks.stream().mapToDouble(GpxTrack::length).sum();
+        return privateTracks.stream().mapToDouble(IGpxTrack::length).sum();
     }
 
@@ -724 +724 @@
      * @return  minimum and maximum dates in array of 2 elements
      */
-    public static Date[] getMinMaxTimeForTrack(GpxTrack trk) {
+    public static Date[] getMinMaxTimeForTrack(IGpxTrack trk) {
         final LongSummaryStatistics statistics = trk.getSegments().stream()
                 .flatMap(seg -> seg.getWayPoints().stream())
@@ -793 +793 @@
         double py = p.north();
         double rx = 0.0, ry = 0.0, sx, sy, x, y;
-        for (GpxTrack track : privateTracks) {
+        for (IGpxTrack track : privateTracks) {
             for (IGpxTrackSegment seg : track.getSegments()) {
                 WayPoint r = null;
@@ -907 +907 @@
     public static class LinesIterator implements Iterator<Line> {
 
-        private Iterator<GpxTrack> itTracks;
+        private Iterator<IGpxTrack> itTracks;
         private int idxTracks;
         private Iterator<IGpxTrackSegment> itTrackSegments;
@@ -915 +915 @@
         private final boolean[] trackVisibility;
         private Map<String, Object> trackAttributes;
-        private GpxTrack curTrack;
+        private IGpxTrack curTrack;
 
         /**