Changeset 31518 in osm for applications/editors/josm/plugins

Timestamp:

2015-08-21T22:43:38+02:00 (9 years ago)

Author:

nokutu

Message:

Change build.gradle to use latest JOSM version and fixed code issues related to a recent JOSM upload.

Location:

applications/editors/josm/plugins/mapillary

Files:

• build.gradle (modified) (1 diff)
• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/mapillary/cache/CacheUtils.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryMainDialog.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/mapillary/io/export/MapillaryExportDownloadThread.java (modified) (2 diffs)

applications/editors/josm/plugins/mapillary/build.gradle

@@ -29 +29 @@
   // The JOSM-version can be specified as "latest", "tested" or "snapshot-1234" (replace 1234 by the desired version number).
   // For revisions older than the last ~60 versions, also append "Archiv" to the repository URL above
-  compile 'org.openstreetmap.josm:josm:tested'
+  compile 'org.openstreetmap.josm:josm:latest'
   compile 'org.apache.commons:commons-imaging:1.0-SNAPSHOT'
 

applications/editors/josm/plugins/mapillary/build.xml

@@ -5 +5 @@
     <property name="plugin.main.version" value="8433"/>
     <property name="plugin.canloadatruntime" value="true"/>
-    <property name="plugin.version" value="1.0"/>
+    <property name="plugin.version" value="1.0.1"/>
     <property name="plugin.author" value="nokutu &lt;nokutu@openmailbox.org&gt;"/>
     <property name="plugin.class" value="org.openstreetmap.josm.plugins.mapillary.MapillaryPlugin"/>

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/cache/CacheUtils.java

@@ -1 +1 @@
 package org.openstreetmap.josm.plugins.mapillary.cache;
 
+import java.io.IOException;
+
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.cache.CacheEntry;
 import org.openstreetmap.josm.data.cache.CacheEntryAttributes;
@@ -41 +44 @@
    * in cache.
    *
-   * @param img The image to be downloaded.
+   * @param img
+   *          The image to be downloaded.
    * @param pic
    *          The picture type to be downloaded (full quality, thumbnail or
@@ -51 +55 @@
         if (new MapillaryCache(img.getKey(), MapillaryCache.Type.THUMBNAIL)
             .get() == null)
-          new MapillaryCache(img.getKey(), MapillaryCache.Type.THUMBNAIL)
-              .submit(IGNORE_DOWNLOAD, false);
+          submit(img.getKey(), MapillaryCache.Type.THUMBNAIL, IGNORE_DOWNLOAD);
         if (new MapillaryCache(img.getKey(), MapillaryCache.Type.FULL_IMAGE)
             .get() == null)
-          new MapillaryCache(img.getKey(), MapillaryCache.Type.FULL_IMAGE)
-              .submit(IGNORE_DOWNLOAD, false);
+          submit(img.getKey(), MapillaryCache.Type.FULL_IMAGE, IGNORE_DOWNLOAD);
         break;
       case THUMBNAIL:
-        new MapillaryCache(img.getKey(), MapillaryCache.Type.THUMBNAIL).submit(
-            IGNORE_DOWNLOAD, false);
+        submit(img.getKey(), MapillaryCache.Type.THUMBNAIL, IGNORE_DOWNLOAD);
         break;
       case FULL_IMAGE:
-        new MapillaryCache(img.getKey(), MapillaryCache.Type.FULL_IMAGE)
-            .submit(IGNORE_DOWNLOAD, false);
+        submit(img.getKey(), MapillaryCache.Type.FULL_IMAGE, IGNORE_DOWNLOAD);
         break;
+    }
+  }
+
+  /**
+   * Requests the picture with the given key and quality and uses the given
+   * listener.
+   *
+   * @param key
+   *          The key of the picture to be requested.
+   * @param type
+   *          The quality of the picture to be requested.
+   * @param lis
+   *          The listener that is going to receive the picture.
+   */
+  public static void submit(String key, MapillaryCache.Type type,
+      ICachedLoaderListener lis) {
+    try {
+      new MapillaryCache(key, type).submit(lis, false);
+    } catch (IOException e) {
+      Main.error(e);
     }
   }

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

@@ -244 +244 @@
         this.thumbnailCache = new MapillaryCache(mapillaryImage.getKey(),
             MapillaryCache.Type.THUMBNAIL);
-        this.thumbnailCache.submit(this, false);
+        try {
+          this.thumbnailCache.submit(this, false);
+        } catch (IOException e) {
+          Main.error(e);
+        }
 
         // Downloads the full resolution image.
@@ -252 +256 @@
           this.imageCache = new MapillaryCache(mapillaryImage.getKey(),
               MapillaryCache.Type.FULL_IMAGE);
-          this.imageCache.submit(this, false);
+          try {
+            this.imageCache.submit(this, false);
+          } catch (IOException e) {
+            Main.error(e);
+          }
         }
       } else if (this.image instanceof MapillaryImportedImage) {

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/io/export/MapillaryExportDownloadThread.java

@@ -14 +14 @@
 import org.openstreetmap.josm.plugins.mapillary.MapillaryAbstractImage;
 import org.openstreetmap.josm.plugins.mapillary.MapillaryImage;
+import org.openstreetmap.josm.plugins.mapillary.cache.CacheUtils;
 import org.openstreetmap.josm.plugins.mapillary.cache.MapillaryCache;
 
@@ -54 +55 @@
   @Override
   public void run() {
-    new MapillaryCache(this.image.getKey(), MapillaryCache.Type.FULL_IMAGE)
-        .submit(this, false);
+    CacheUtils.submit(this.image.getKey(), MapillaryCache.Type.FULL_IMAGE, this);
   }