Changeset 13652 in josm for trunk

Timestamp:

2018-04-21T01:50:32+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15744 - add/rework traces

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/MapView.java (modified) (1 diff)
• tools/ImageProvider.java (modified) (2 diffs)
• tools/ImageResource.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/MapView.java

@@ -165 +165 @@
         protected synchronized void traceRandomRepaint() {
             if (!ignoreRepaint) {
-                System.err.println("Repaint:");
-                Thread.dumpStack();
+                Logging.trace("Repaint: {0} from {1}", Thread.currentThread().getStackTrace()[3], Thread.currentThread());
             }
             ignoreRepaint = false;

trunk/src/org/openstreetmap/josm/tools/ImageProvider.java

@@ -665 +665 @@
         if (ir == null) {
             return null;
+        } else if (Logging.isTraceEnabled()) {
+            Logging.trace("get {0} from {1}", this, Thread.currentThread());
         }
         if (virtualMaxWidth != -1 || virtualMaxHeight != -1)
@@ -2028 +2030 @@
         }
     }
+
+    @Override
+    public String toString() {
+        return ("ImageProvider ["
+                + (dirs != null && !dirs.isEmpty() ? "dirs=" + dirs + ", " : "") + (id != null ? "id=" + id + ", " : "")
+                + (subdir != null && !subdir.isEmpty() ? "subdir=" + subdir + ", " : "") + (name != null ? "name=" + name + ", " : "")
+                + (archive != null ? "archive=" + archive + ", " : "")
+                + (inArchiveDir != null && !inArchiveDir.isEmpty() ? "inArchiveDir=" + inArchiveDir : "") + ']').replaceAll(", \\]", "]");
+    }
 }

trunk/src/org/openstreetmap/josm/tools/ImageResource.java

@@ -275 +275 @@
         else
             return getImageIcon(new Dimension(-1, maxHeight), multiResolution);
-   }
+    }
+
+    @Override
+    public String toString() {
+        return "ImageResource ["
+                + (svg != null ? "svg=" + svg : "")
+                + (baseImage != null ? "baseImage=" + baseImage : "") + ']';
+    }
 }