Changeset 9854 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint

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/gui/mappaint/mapcss/MapCSSStyleSource.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java

@@ -22 +22 @@
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.NoSuchElementException;
 import java.util.Set;
 import java.util.concurrent.locks.ReadWriteLock;
@@ -157 +158 @@
             @Override
             public boolean hasNext() {
-                return next >= 0;
+                return next >= 0 && next < rules.size();
             }
 
             @Override
             public MapCSSRule next() {
+                if (!hasNext())
+                    throw new NoSuchElementException();
                 MapCSSRule rule = rules.get(next);
                 next = ruleCandidates.nextSetBit(next + 1);