Changeset 31377 in osm

Timestamp:

2015-07-15T16:34:41+02:00 (10 years ago)

Author:

nokutu

Message:

Imported images show their names and capture time in the dialog titlebar

Location:

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

Files:

• MapillaryData.java (modified) (1 diff)
• gui/MapillaryMainDialog.java (modified) (7 diffs)

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

@@ -228 +228 @@
       if (image instanceof MapillaryImage) {
         MapillaryImage mapillaryImage = (MapillaryImage) image;
-        // Donwloadins thumbnails of surrounding pictures.
+        // Downloading thumbnails of surrounding pictures.
         if (mapillaryImage.next() != null) {
           new MapillaryCache(((MapillaryImage) mapillaryImage.next()).getKey(), MapillaryCache.Type.THUMBNAIL).submit(

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

@@ -163 +163 @@
         mapillaryImageDisplay.hyperlink.setVisible(true);
         MapillaryImage mapillaryImage = (MapillaryImage) this.image;
-        updateTitle();
-
         mapillaryImageDisplay.hyperlink.setURL(mapillaryImage.getKey());
         // Downloads the thumbnail.
@@ -182 +180 @@
       } else if (image instanceof MapillaryImportedImage) {
         mapillaryImageDisplay.hyperlink.setVisible(false);
+        mapillaryImageDisplay.hyperlink.setURL(null);
         MapillaryImportedImage mapillaryImage = (MapillaryImportedImage) this.image;
         try {
@@ -188 +187 @@
           Main.error(e);
         }
-        mapillaryImageDisplay.hyperlink.setURL(null);
-      }
+      }
+      updateTitle();
     }
   }
@@ -223 +222 @@
     } else {
       if (this.image != null) {
-        MapillaryImage mapillaryImage = (MapillaryImage) this.image;
-        String title = tr(BASE_TITLE);
-        if (mapillaryImage.getUser() != null)
-          title += " -- " + mapillaryImage.getUser();
-        if (mapillaryImage.getCapturedAt() != 0)
-          title += " -- " + mapillaryImage.getDate();
-        setTitle(title);
+        if (this.image instanceof MapillaryImage) {
+          MapillaryImage mapillaryImage = (MapillaryImage) this.image;
+          String title = tr(BASE_TITLE);
+          if (mapillaryImage.getUser() != null)
+            title += " -- " + mapillaryImage.getUser();
+          if (mapillaryImage.getCapturedAt() != 0)
+            title += " -- " + mapillaryImage.getDate();
+          setTitle(title);
+        }
+        else if (this.image instanceof MapillaryImportedImage) {
+          MapillaryImportedImage mapillaryImportedImage = (MapillaryImportedImage) this.image;
+          String title = tr(BASE_TITLE);
+          title += " -- " + mapillaryImportedImage.getFile().getName();
+          title += " -- " + mapillaryImportedImage.getDate();
+          setTitle(title);
+        }
       }
     }
@@ -257 +265 @@
     @Override
     public void actionPerformed(ActionEvent e) {
-      if (MapillaryMainDialog.getInstance().getImage() != null) {
-        MapillaryData.getInstance().selectNext();
-      }
+      MapillaryData.getInstance().selectNext();
     }
   }
@@ -278 +284 @@
     @Override
     public void actionPerformed(ActionEvent e) {
-      if (MapillaryMainDialog.getInstance().getImage() != null) {
-        MapillaryData.getInstance().selectPrevious();
-      }
+      MapillaryData.getInstance().selectPrevious();
     }
   }
@@ -395 +399 @@
   public void selectedImageChanged(MapillaryAbstractImage oldImage,
       MapillaryAbstractImage newImage) {
-    setImage(MapillaryData.getInstance().getSelectedImage());
+    setImage(newImage);
     updateImage();
   }