Changeset 2676 in josm for trunk/src/org/openstreetmap/josm/corrector

Timestamp:

2009-12-24T08:48:40+01:00 (11 years ago)

Author:

jttt

Message:

Fix some of the warnings found by FindBugs

Location:

trunk/src/org/openstreetmap/josm/corrector

Files:

• ReverseWayTagCorrector.java (modified) (1 diff)
• TagCorrector.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java

@@ -23 +23 @@
     private static class PrefixSuffixSwitcher {
 
+        private static final String SEPARATOR = "[:_]?";
+
         private final String a;
         private final String b;
         private final Pattern startPattern;
         private final Pattern endPattern;
-
-        private final String SEPARATOR = "[:_]?";
 
         public PrefixSuffixSwitcher(String a, String b) {

trunk/src/org/openstreetmap/josm/corrector/TagCorrector.java

@@ -13 +13 @@
 import java.util.Map;
 import java.util.Set;
+import java.util.Map.Entry;
 
 import javax.swing.JLabel;
@@ -151 +152 @@
 
             if (answer == JOptionPane.YES_OPTION) {
-                for (OsmPrimitive primitive : tagCorrectionsMap.keySet()) {
-                    List<TagCorrection> tagCorrections =
-                        tagCorrectionsMap.get(primitive);
+                for (Entry<OsmPrimitive, List<TagCorrection>> entry : tagCorrectionsMap.entrySet()) {
+                    List<TagCorrection> tagCorrections = entry.getValue();
+                    OsmPrimitive primitive = entry.getKey();
 
                     // create the clone
@@ -186 +187 @@
                     }
                 }
-                for (OsmPrimitive primitive : roleCorrectionMap.keySet()) {
-                    List<RoleCorrection> roleCorrections = roleCorrectionMap
-                    .get(primitive);
+                for (Entry<OsmPrimitive, List<RoleCorrection>> entry : roleCorrectionMap.entrySet()) {
+                    OsmPrimitive primitive = entry.getKey();
+                    List<RoleCorrection> roleCorrections = entry.getValue();
 
                     for (int i = 0; i < roleCorrections.size(); i++) {