Changeset 12537 in josm for trunk/src/org/openstreetmap/josm/data/Preferences.java

Timestamp:

2017-07-30T00:22:46+02:00 (7 years ago)

Author:

Don-vip

Message:

PMD - VariableNamingConventions

File:

• trunk/src/org/openstreetmap/josm/data/Preferences.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -1457 +1457 @@
             throw new IllegalArgumentException(ex);
         }
-        for (Entry<String, String> key_value : hash.entrySet()) {
+        for (Entry<String, String> keyValue : hash.entrySet()) {
             Object value;
             Field f;
             try {
-                f = klass.getDeclaredField(key_value.getKey().replace('-', '_'));
+                f = klass.getDeclaredField(keyValue.getKey().replace('-', '_'));
             } catch (NoSuchFieldException ex) {
                 Main.trace(ex);
@@ -1471 +1471 @@
             Utils.setObjectsAccessible(f);
             if (f.getType() == Boolean.class || f.getType() == boolean.class) {
-                value = Boolean.valueOf(key_value.getValue());
+                value = Boolean.valueOf(keyValue.getValue());
             } else if (f.getType() == Integer.class || f.getType() == int.class) {
                 try {
-                    value = Integer.valueOf(key_value.getValue());
+                    value = Integer.valueOf(keyValue.getValue());
                 } catch (NumberFormatException nfe) {
                     continue;
@@ -1480 +1480 @@
             } else if (f.getType() == Double.class || f.getType() == double.class) {
                 try {
-                    value = Double.valueOf(key_value.getValue());
+                    value = Double.valueOf(keyValue.getValue());
                 } catch (NumberFormatException nfe) {
                     continue;
                 }
             } else if (f.getType() == String.class) {
-                value = key_value.getValue();
+                value = keyValue.getValue();
             } else if (f.getType().isAssignableFrom(Map.class)) {
-                value = mapFromJson(key_value.getValue());
+                value = mapFromJson(keyValue.getValue());
             } else if (f.getType().isAssignableFrom(MultiMap.class)) {
-                value = multiMapFromJson(key_value.getValue());
+                value = multiMapFromJson(keyValue.getValue());
             } else
                 throw new JosmRuntimeException("unsupported preference primitive type");