Changeset 13220 in josm for trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java

Timestamp:

2017-12-18T00:46:58+01:00 (6 years ago)

Author:

Don-vip

Message:

see #15574:

• additionally refactors ImageDisplay to use ImageEntry instead; stores width and height info while metadata of images are read; might break plugin code (patch by cmuelle8, minor changes)
• remove double semicolon causing ​https://github.com/pmd/pmd/issues/785
• enable PMD rule DoNotCallGarbageCollectionExplicitly
• disable SpotBugs rule ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD

File:

• trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java

@@ -323 +323 @@
                 // Set only if the image is new to preserve zoom and position if the same image is redisplayed
                 // (e.g. to update the OSD).
-                imgDisplay.setImage(entry.getFile(), entry.getExifOrientation());
+                imgDisplay.setImage(entry);
             }
             setTitle(tr("Geotagged Images") + (entry.getFile() != null ? " - " + entry.getFile().getName() : ""));
@@ -356 +356 @@
             // do not actually show the dialog again with a blank image if currently hidden (fix #10672)
             setTitle(tr("Geotagged Images"));
-            imgDisplay.setImage(null, null);
+            imgDisplay.setImage(null);
             imgDisplay.setOsdText("");
             return;