Changeset 12620 in josm for trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java

Timestamp:

2017-08-22T22:26:32+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15182 - deprecate all Main logging methods and introduce suitable replacements in Logging for most of them

File:

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

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

@@ -22 +22 @@
 import org.openstreetmap.josm.data.cache.JCSCacheManager;
 import org.openstreetmap.josm.tools.ExifReader;
+import org.openstreetmap.josm.tools.Logging;
 
 /**
  * Loads thumbnail previews for a list of images from a {@link GeoImageLayer}.
- * 
+ *
  * Thumbnails are loaded in the background and cached on disk for the next session.
  */
@@ -69 +70 @@
                         Main.pref.getCacheDirectory().getPath() + File.separator + "geoimage-thumbnails");
             } catch (IOException e) {
-                Main.warn("Failed to initialize cache for geoimage-thumbnails");
-                Main.warn(e);
+                Logging.warn("Failed to initialize cache for geoimage-thumbnails");
+                Logging.warn(e);
             }
         }
@@ -77 +78 @@
     @Override
     public void run() {
-        Main.debug("Load Thumbnails");
+        Logging.debug("Load Thumbnails");
         tracker = new MediaTracker(Main.map.mapView);
         for (ImageEntry entry : data) {
@@ -104 +105 @@
                 BufferedImageCacheEntry cacheEntry = cache.get(cacheIdent);
                 if (cacheEntry != null && cacheEntry.getImage() != null) {
-                    Main.debug(" from cache");
+                    Logging.debug(" from cache");
                     return cacheEntry.getImage();
                 }
             } catch (IOException e) {
-                Main.warn(e);
+                Logging.warn(e);
             }
         }
@@ -117 +118 @@
             tracker.waitForID(0);
         } catch (InterruptedException e) {
-            Main.error(" InterruptedException while loading thumb");
+            Logging.error(" InterruptedException while loading thumb");
             Thread.currentThread().interrupt();
             return null;
         }
         if (tracker.isErrorID(1) || img.getWidth(null) <= 0 || img.getHeight(null) <= 0) {
-            Main.error(" Invalid image");
+            Logging.error(" Invalid image");
             return null;
         }
@@ -154 +155 @@
                 Thread.sleep(10);
             } catch (InterruptedException e) {
-                Main.warn("InterruptedException while drawing thumb");
+                Logging.warn("InterruptedException while drawing thumb");
                 Thread.currentThread().interrupt();
             }
@@ -162 +163 @@
 
         if (scaledBI.getWidth() <= 0 || scaledBI.getHeight() <= 0) {
-            Main.error(" Invalid image");
+            Logging.error(" Invalid image");
             return null;
         }
@@ -171 +172 @@
                 cache.put(cacheIdent, new BufferedImageCacheEntry(output.toByteArray()));
             } catch (IOException e) {
-                Main.warn("Failed to save geoimage thumb to cache");
-                Main.warn(e);
+                Logging.warn("Failed to save geoimage thumb to cache");
+                Logging.warn(e);
             }
         }