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

Timestamp:

2016-05-16T04:05:58+02:00 (9 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/gui

Files:

• PleaseWaitRunnable.java (modified) (2 diffs)
• oauth/OsmOAuthAuthorizationClient.java (modified) (1 diff)
• widgets/JosmImageView.java (modified) (4 diffs)

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