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

Timestamp:

2016-02-23T02:11:42+01:00 (8 years ago)

Author:

Don-vip

Message:

sonar - squid:S2272 - "Iterator.next()" methods should throw "NoSuchElementException" + javadoc/code style

File:

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

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

@@ -11 +11 @@
 import java.util.List;
 import java.util.Map;
+import java.util.NoSuchElementException;
 import java.util.Set;
 
@@ -32 +33 @@
     public boolean fromServer;
 
+    /** Creator (usually software) */
     public String creator;
 
+    /** Tracks */
     public final Collection<GpxTrack> tracks = new LinkedList<>();
+    /** Routes */
     public final Collection<GpxRoute> routes = new LinkedList<>();
+    /** Waypoints */
     public final Collection<WayPoint> waypoints = new LinkedList<>();
 
@@ -46 +51 @@
     public final Set<DataSource> dataSources = new HashSet<>();
 
+    /**
+     * Merges data from another object.
+     * @param other existing GPX data
+     */
     public void mergeFrom(GpxData other) {
         if (storageFile == null && other.storageFile != null) {
@@ -361 +370 @@
     }
 
+    /**
+     * Resets the internal caches of east/north coordinates.
+     */
     public void resetEastNorthCache() {
         if (waypoints != null) {
@@ -401 +413 @@
         private final boolean[] trackVisibility;
 
+        /**
+         * Constructs a new {@code LinesIterator}.
+         * @param data GPX data
+         * @param trackVisibility An array indicating which tracks should be
+         * included in the iteration. Can be null, then all tracks are included.
+         */
         public LinesIterator(GpxData data, boolean[] trackVisibility) {
             itTracks = data.tracks.iterator();
@@ -416 +434 @@
         @Override
         public Collection<WayPoint> next() {
+            if (!hasNext()) {
+                throw new NoSuchElementException();
+            }
             Collection<WayPoint> current = next;
             next = getNext();