Changeset 32977 in osm

Timestamp:

2016-09-11T13:47:49+02:00 (8 years ago)

Author:

nokutu

Message:

More FindBugs

Location:

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary

Files:

• MapillarySign.java (modified) (1 diff)
• actions/WalkThread.java (modified) (4 diffs)
• gui/MapillaryImageDisplay.java (modified) (2 diffs)

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillarySign.java

@@ -32 +32 @@
       try (
         BufferedReader br = new BufferedReader(new InputStreamReader(
-          MapillarySign.class.getResourceAsStream("/data/signs/" + country + ".cson")
+          MapillarySign.class.getResourceAsStream("/data/signs/" + country + ".cson"), "UTF-8"
         ));
       ) {

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/WalkThread.java

@@ -18 +18 @@
  *
  * @author nokutu
- *
  */
 public class WalkThread extends Thread implements MapillaryDataListener {
@@ -33 +32 @@
    * Main constructor.
    *
-   * @param interval
-   *          How often the images switch.
-   * @param waitForPicture
-   *          If it must wait for the full resolution picture or just the
-   *          thumbnail.
-   * @param followSelected
-   *          Zoom to each image that is selected.
-   * @param goForward
-   *          true to go forward; false to go backwards.
+   * @param interval How often the images switch.
+   * @param waitForPicture If it must wait for the full resolution picture or just the
+   * thumbnail.
+   * @param followSelected Zoom to each image that is selected.
+   * @param goForward true to go forward; false to go backwards.
    */
   public WalkThread(int interval, boolean waitForPicture,
-      boolean followSelected, boolean goForward) {
+                    boolean followSelected, boolean goForward) {
     this.interval = interval;
     this.waitForFullQuality = waitForPicture;
@@ -67 +62 @@
         }
         try {
-          synchronized (this) {
-            // Waits for full quality picture.
-            final BufferedImage displayImage = MapillaryMainDialog.getInstance().mapillaryImageDisplay.getImage();
-            if (this.waitForFullQuality && image instanceof MapillaryImage) {
-              while (displayImage == this.lastImage || displayImage == null || displayImage.getWidth() < 2048) {
-                wait(100);
-              }
-            } else { // Waits for thumbnail.
-              while (displayImage == this.lastImage || displayImage == null || displayImage.getWidth() < 320) {
-                wait(100);
-              }
+          // Waits for full quality picture.
+          final BufferedImage displayImage = MapillaryMainDialog.getInstance().mapillaryImageDisplay.getImage();
+          if (this.waitForFullQuality && image instanceof MapillaryImage) {
+            while (displayImage == this.lastImage || displayImage == null || displayImage.getWidth() < 2048) {
+              Thread.sleep(100);
             }
-            while (this.paused) {
-              wait(100);
-            }
-            wait(this.interval);
-            while (this.paused) {
-              wait(100);
+          } else { // Waits for thumbnail.
+            while (displayImage == this.lastImage || displayImage == null || displayImage.getWidth() < 320) {
+              Thread.sleep(100);
             }
           }
+          while (this.paused) {
+            Thread.sleep(100);
+          }
+          wait(this.interval);
+          while (this.paused) {
+            Thread.sleep(100);
+          }
           this.lastImage = MapillaryMainDialog.getInstance().mapillaryImageDisplay.getImage();
-          synchronized (this) {
-            if (this.goForward) {
-              this.data.selectNext(this.followSelected);
-            } else {
-              this.data.selectPrevious(this.followSelected);
-            }
+          if (this.goForward) {
+            this.data.selectNext(this.followSelected);
+          } else {
+            this.data.selectPrevious(this.followSelected);
           }
         } catch (InterruptedException e) {
@@ -108 +99 @@
   /**
    * Downloads n images into the cache beginning from the supplied start-image (including the start-image itself).
+   *
    * @param startImage the image to start with (this and the next n-1 images in the same sequence are downloaded)
    * @param n the number of images to download

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryImageDisplay.java

@@ -41 +41 @@
 
   /** The image currently displayed */
-  private transient BufferedImage image;
+  private volatile BufferedImage image;
 
   /**
@@ -47 +47 @@
    * rectangle is calculated each time the zoom is modified
    */
-  private Rectangle visibleRect;
+  private volatile Rectangle visibleRect;
 
   /**