Changeset 10223 in josm for trunk/src

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

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/Preferences.java (modified) (4 diffs)
• gui/PleaseWaitRunnable.java (modified) (2 diffs)
• gui/oauth/OsmOAuthAuthorizationClient.java (modified) (1 diff)
• gui/widgets/JosmImageView.java (modified) (4 diffs)
• io/Compression.java (modified) (2 diffs)
• io/OsmReader.java (modified) (2 diffs)
• tools/Diff.java (modified) (1 diff)
• tools/Utils.java (modified) (3 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) {

trunk/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java

@@ -25 +25 @@
  */
 public abstract class PleaseWaitRunnable implements Runnable, CancelListener {
-    private boolean canceled;
     private boolean ignoreException;
     private final String title;
@@ -150 +149 @@
     @Override
     public final void run() {
-        if (canceled)
-            return; // since realRun isn't executed, do not call to finish
-
         if (EventQueue.isDispatchThread()) {
             new Thread(new Runnable() {

trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java

@@ -91 +91 @@
         if (provider != null) {
             try {
-                // TODO
-                Field f =  provider.getClass().getDeclaredField("connection");
-                f.setAccessible(true);
+                Field f = provider.getClass().getDeclaredField("connection");
+                Utils.setObjectsAccessible(f);
                 HttpURLConnection con = (HttpURLConnection) f.get(provider);
                 if (con != null) {

trunk/src/org/openstreetmap/josm/gui/widgets/JosmImageView.java

@@ -17 +17 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -47 +48 @@
         widthField = ImageView.class.getDeclaredField("width");
         heightField = ImageView.class.getDeclaredField("height");
-        imageField.setAccessible(true);
-        stateField.setAccessible(true);
-        widthField.setAccessible(true);
-        heightField.setAccessible(true);
+        Utils.setObjectsAccessible(imageField, stateField, widthField, heightField);
     }
 
@@ -102 +100 @@
             // And update the size params
             Method updateImageSize = ImageView.class.getDeclaredMethod("updateImageSize");
-            updateImageSize.setAccessible(true);
+            Utils.setObjectsAccessible(updateImageSize);
             updateImageSize.invoke(this);
         } finally {
@@ -130 +128 @@
             } else {
                 Method loadImage = ImageView.class.getDeclaredMethod("loadImage");
-                loadImage.setAccessible(true);
+                Utils.setObjectsAccessible(loadImage);
                 loadImage.invoke(this);
             }

trunk/src/org/openstreetmap/josm/io/Compression.java

@@ -96 +96 @@
      * @throws IOException if any I/O error occurs
      */
-    @SuppressWarnings("resource")
     public static InputStream getUncompressedFileInputStream(File file) throws IOException {
-        return byExtension(file.getName()).getUncompressedInputStream(new FileInputStream(file));
+        FileInputStream in = new FileInputStream(file);
+        try {
+            return byExtension(file.getName()).getUncompressedInputStream(in);
+        } catch (IOException e) {
+            Utils.close(in);
+            throw e;
+        }
     }
 
@@ -129 +134 @@
      * @throws IOException if any I/O error occurs
      */
-    @SuppressWarnings("resource")
     public static OutputStream getCompressedFileOutputStream(File file) throws IOException {
-        return byExtension(file.getName()).getCompressedOutputStream(new FileOutputStream(file));
+        FileOutputStream out = new FileOutputStream(file);
+        try {
+            return byExtension(file.getName()).getCompressedOutputStream(out);
+        } catch (IOException e) {
+            Utils.close(out);
+            throw e;
+        }
     }
 }

trunk/src/org/openstreetmap/josm/io/OsmReader.java

@@ -11 +11 @@
 import java.util.Collection;
 import java.util.List;
+import java.util.Objects;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -355 +356 @@
         }
         // Read changeset info if neither upload-changeset nor id are set, or if they are both set to the same value
-        if (id == uploadChangesetId || (id != null && id.equals(uploadChangesetId))) {
+        if (Objects.equals(id, uploadChangesetId)) {
             uploadChangeset = new Changeset(id != null ? id.intValue() : 0);
             while (true) {

trunk/src/org/openstreetmap/josm/tools/Diff.java

@@ -386 +386 @@
     }
 
-    private boolean inhibit;
-
     /**
      * Adjust inserts/deletes of blank lines to join changes as much as possible.
      */
     private void shift_boundaries() {
-        if (inhibit)
-            return;
         filevec[0].shift_boundaries(filevec[1]);
         filevec[1].shift_boundaries(filevec[0]);

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -26 +26 @@
 import java.io.InputStreamReader;
 import java.io.UnsupportedEncodingException;
+import java.lang.reflect.AccessibleObject;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -34 +35 @@
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
+import java.security.AccessController;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
+import java.security.PrivilegedAction;
 import java.text.Bidi;
 import java.text.MessageFormat;
@@ -1537 +1540 @@
     }
 
+    /**
+     * Sets {@code AccessibleObject}(s) accessible.
+     * @param objects objects
+     * @see AccessibleObject#setAccessible
+     * @since 10223
+     */
+    public static void setObjectsAccessible(final AccessibleObject ... objects) {
+        if (objects != null && objects.length > 0) {
+            AccessController.doPrivileged(new PrivilegedAction<Object>() {
+                @Override
+                public Object run() {
+                    for (AccessibleObject o : objects) {
+                        o.setAccessible(true);
+                    }
+                    return null;
+                }
+            });
+        }
+    }
 }