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

Timestamp:

2016-05-16T04:05:58+02:00 (8 years ago)

Author:

Don-vip

Message:

findbugs: DP_DO_INSIDE_DO_PRIVILEGED + UWF_UNWRITTEN_FIELD + RC_REF_COMPARISON + OBL_UNSATISFIED_OBLIGATION_EXCEPTION_EDGE

File:

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

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

@@ -1203 +1203 @@
             structPrototype = klass.getConstructor().newInstance();
         } catch (ReflectiveOperationException ex) {
-            throw new RuntimeException(ex);
+            throw new IllegalArgumentException(ex);
         }
 
@@ -1211 +1211 @@
                 continue;
             }
-            f.setAccessible(true);
+            Utils.setObjectsAccessible(f);
             try {
                 Object fieldValue = f.get(struct);
                 Object defaultFieldValue = f.get(structPrototype);
-                if (fieldValue != null) {
-                    if (f.getAnnotation(writeExplicitly.class) != null || !Objects.equals(fieldValue, defaultFieldValue)) {
-                        String key = f.getName().replace('_', '-');
-                        if (fieldValue instanceof Map) {
-                            hash.put(key, mapToJson((Map) fieldValue));
-                        } else if (fieldValue instanceof MultiMap) {
-                            hash.put(key, multiMapToJson((MultiMap) fieldValue));
-                        } else {
-                            hash.put(key, fieldValue.toString());
-                        }
+                if (fieldValue != null && (f.getAnnotation(writeExplicitly.class) != null || !Objects.equals(fieldValue, defaultFieldValue))) {
+                    String key = f.getName().replace('_', '-');
+                    if (fieldValue instanceof Map) {
+                        hash.put(key, mapToJson((Map<?, ?>) fieldValue));
+                    } else if (fieldValue instanceof MultiMap) {
+                        hash.put(key, multiMapToJson((MultiMap<?, ?>) fieldValue));
+                    } else {
+                        hash.put(key, fieldValue.toString());
                     }
                 }
-            } catch (IllegalArgumentException | IllegalAccessException ex) {
+            } catch (IllegalAccessException ex) {
                 throw new RuntimeException(ex);
             }
@@ -1261 +1259 @@
             } catch (NoSuchFieldException ex) {
                 continue;
-            } catch (SecurityException ex) {
-                throw new RuntimeException(ex);
             }
             if (f.getAnnotation(pref.class) == null) {
                 continue;
             }
-            f.setAccessible(true);
+            Utils.setObjectsAccessible(f);
             if (f.getType() == Boolean.class || f.getType() == boolean.class) {
                 value = Boolean.valueOf(key_value.getValue());
@@ -1326 +1322 @@
             try {
                 Field field = Toolkit.class.getDeclaredField("resources");
-                field.setAccessible(true);
+                Utils.setObjectsAccessible(field);
                 field.set(null, ResourceBundle.getBundle("sun.awt.resources.awt"));
             } catch (ReflectiveOperationException e) {