Changeset 8332 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2015-05-06T00:23:51+02:00 (9 years ago)

Author:

Don-vip

Message:

fix various issues:

• performance - inefficient use of keySet iterator instead of entrySet iterator
• squid:S2674: The value returned from a stream read should be checked
• remove unused imports
• improve javadoc

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• downloadtasks/DownloadOsmChangeTask.java (modified) (3 diffs)
• search/SearchAction.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmChangeTask.java

@@ -9 +9 @@
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.concurrent.Future;
 import java.util.regex.Matcher;
@@ -128 +129 @@
         private final Map<OsmPrimitive, Date> toLoad;
 
-        public HistoryLoaderAndListener(Map<OsmPrimitive, Date> toLoad) {
+        private HistoryLoaderAndListener(Map<OsmPrimitive, Date> toLoad) {
             this.toLoad = toLoad;
             add(toLoad.keySet());
@@ -138 +139 @@
         public void historyUpdated(HistoryDataSet source, PrimitiveId id) {
             Map<OsmPrimitive, Date> toLoadNext = new HashMap<>();
-            for (Iterator<OsmPrimitive> it = toLoad.keySet().iterator(); it.hasNext();) {
-                OsmPrimitive p = it.next();
+            for (Iterator<Entry<OsmPrimitive, Date>> it = toLoad.entrySet().iterator(); it.hasNext();) {
+                Entry<OsmPrimitive, Date> entry = it.next();
+                OsmPrimitive p = entry.getKey();
                 History history = source.getHistory(p.getPrimitiveId());
-                Date date = toLoad.get(p);
+                Date date = entry.getValue();
                 // If the history has been loaded and a timestamp is known
                 if (history != null && date != null) {

trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java

@@ -573 +573 @@
         public boolean allElements;
 
+        /**
+         * Constructs a new {@code SearchSetting}.
+         */
         public SearchSetting() {
             this("", SearchMode.replace, false /* case insensitive */,