Changeset 32976 in osm for applications/editors/josm

Timestamp:

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

Author:

nokutu

Message:

Mor findbugs issues

Location:

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

Files:

• io/download/MapillaryDownloader.java (modified) (3 diffs)
• io/download/MapillarySquareDownloadManagerThread.java (modified) (4 diffs)
• utils/ImageUtil.java (modified) (1 diff)

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/io/download/MapillaryDownloader.java

@@ -81 +81 @@
 
   /** All the Threads that have been run. Used to interrupt them properly. */
-  private static List<Thread> threads = new ArrayList<>();
+  //private static List<Thread> threads = new ArrayList<>();
 
   /** Max area to be downloaded */
@@ -130 +130 @@
   }
 
-  private static void run(Thread t) {
-    threads.add(t);
+  private static void run(Runnable t) {
+    //threads.add(t);
     executor.execute(t);
   }
@@ -245 +245 @@
    */
   public static void stopAll() {
-    for (Thread t : threads) {
+    /*for (Thread t : threads) {
       if (t.isAlive())
         Main.info(t+" is still alive!");
       t.interrupt();
     }
-    threads.clear();
+    threads.clear();*/
     executor.shutdownNow();
     try {

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/io/download/MapillarySquareDownloadManagerThread.java

@@ -26 +26 @@
  * @see MapillaryTrafficSignDownloadThread
  */
-public class MapillarySquareDownloadManagerThread extends Thread {
+public class MapillarySquareDownloadManagerThread implements Runnable {
 
   private final Bounds bounds;
 
-  private final ThreadPoolExecutor downloadExecutor = new ThreadPoolExecutor(3, 5,
-      25, TimeUnit.SECONDS, new ArrayBlockingQueue<Runnable>(5));
-  private final ThreadPoolExecutor completeExecutor = new ThreadPoolExecutor(3, 5,
-      25, TimeUnit.SECONDS, new ArrayBlockingQueue<Runnable>(5));
-  private final ThreadPoolExecutor signsExecutor = new ThreadPoolExecutor(3, 5, 25,
-      TimeUnit.SECONDS, new ArrayBlockingQueue<Runnable>(5));
+  private ThreadPoolExecutor downloadExecutor;
+  private ThreadPoolExecutor completeExecutor;
+  private ThreadPoolExecutor signsExecutor;
 
   /**
@@ -49 +46 @@
   @Override
   public void run() {
+    downloadExecutor = new ThreadPoolExecutor(3, 5,
+      25, TimeUnit.SECONDS, new ArrayBlockingQueue<>(5));
+    completeExecutor = new ThreadPoolExecutor(3, 5,
+      25, TimeUnit.SECONDS, new ArrayBlockingQueue<>(5));
+    signsExecutor = new ThreadPoolExecutor(3, 5, 25,
+      TimeUnit.SECONDS, new ArrayBlockingQueue<>(5));
+
     try {
       PluginState.startDownload();
@@ -77 +81 @@
       this.downloadExecutor.execute(new MapillarySequenceDownloadThread(this.downloadExecutor, bounds, page));
       while (this.downloadExecutor.getQueue().remainingCapacity() == 0) {
-        Thread.sleep(500);
+        Thread.sleep(100);
       }
       page++;
@@ -120 +124 @@
     this.signsExecutor.awaitTermination(15, TimeUnit.SECONDS);
   }
-
-  @Override
-  public void interrupt() {
-    super.interrupt();
-    this.downloadExecutor.shutdownNow();
-    this.completeExecutor.shutdownNow();
-    this.signsExecutor.shutdownNow();
-    try {
-      this.downloadExecutor.awaitTermination(15, TimeUnit.SECONDS);
-      this.completeExecutor.awaitTermination(15, TimeUnit.SECONDS);
-      this.signsExecutor.awaitTermination(15, TimeUnit.SECONDS);
-    } catch (InterruptedException e) {
-      Main.error(e);
-    }
-  }
 }

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/utils/ImageUtil.java

@@ -46 +46 @@
       throw new IOException(f.getAbsolutePath() + " not found or not readable!");
     } else if (f.isDirectory()) {
-      for (File child : f.listFiles()) {
+      File[] files = f.listFiles();
+      assert files != null;
+      for (File child : files) {
         try {
           images.addAll(readImagesFrom(child, defaultLL));