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

Timestamp:

2013-10-04T03:27:01+02:00 (11 years ago)

Author:

Don-vip

Message:

Sonar/Findbugs - Avoid commented-out lines of code, javadoc

File:

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

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

@@ -1 +1 @@
 // License: GPL. See LICENSE file for details.
-// Copyright 2007 by Christian Gallioz (aka khris78)
-// Parts of code from Geotagged plugin (by Rob Neild)
-// and the core JOSM source code (by Immanuel Scholz and others)
-
 package org.openstreetmap.josm.gui.layer.geoimage;
 
@@ -56 +52 @@
     public static ImageViewerDialog getInstance() {
         if (dialog == null)
-            throw new AssertionError(); // a new instance needs to be created first
+            throw new AssertionError("a new instance needs to be created first"); 
         return dialog;
     }
@@ -68 +64 @@
         tr("Tool: {0}", tr("Display geotagged images")), KeyEvent.VK_Y, Shortcut.DIRECT), 200);
 
-        /* Don't show a detached dialog right from the start. */
+        // Don't show a detached dialog right from the start.
         if (isShowing && !isDocked) {
             setIsShowing(false);
@@ -219 +215 @@
     public void displayImage(GeoImageLayer layer, ImageEntry entry) {
         synchronized(this) {
-            //            if (currentLayer == layer && currentEntry == entry) {
-            //                repaint();
-            //                return;
-            //            }                     TODO: pop up image dialog but don't load image again
+            // TODO: pop up image dialog but don't load image again
 
             if (centerView && Main.isDisplayingMapView() && entry != null && entry.getPos() != null) {
@@ -245 +238 @@
                 osd.append(tr("\nDirection {0}\u00b0", Math.round(entry.getExifImgDir())));
             }
-            //if (entry.getPos()  != null) {
-            //    osd.append(tr("\nlat: {0}, lon: {1}", Double.toString(entry.getPos().lat()), Double.toString(entry.getPos().lon())));
-            //}
-            //osd.append(tr("\nfile mtime: {0}", Long.toString(entry.getFile().lastModified())));
             DateFormat dtf = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT);
             if (entry.getExifTime() != null) {