Changeset 8332 in josm for trunk/src/org/openstreetmap/josm/gui/io

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/gui/io

Files:

• UploadDialog.java (modified) (2 diffs)
• UploadStrategySelectionPanel.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java

@@ -11 +11 @@
 import java.awt.FlowLayout;
 import java.awt.GridBagLayout;
-import java.awt.Image;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
@@ -28 +27 @@
 import javax.swing.BorderFactory;
 import javax.swing.Icon;
-import javax.swing.ImageIcon;
 import javax.swing.JButton;
 import javax.swing.JComponent;

trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java

@@ -20 +20 @@
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Map.Entry;
 
 import javax.swing.BorderFactory;
@@ -275 +276 @@
     protected UploadStrategy getUploadStrategy() {
         UploadStrategy strategy = null;
-        for (UploadStrategy s: rbStrategy.keySet()) {
-            if (rbStrategy.get(s).isSelected()) {
-                strategy = s;
+        for (Entry<UploadStrategy, JRadioButton> e : rbStrategy.entrySet()) {
+            if (e.getValue().isSelected()) {
+                strategy = e.getKey();
                 break;
             }