Changeset 10223 in josm for trunk/src/org/openstreetmap/josm/tools

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/tools

Files:

• Diff.java (modified) (1 diff)
• Utils.java (modified) (3 diffs)

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;
+                }
+            });
+        }
+    }
 }