Changeset 12620 in josm for trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageEntry.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/ImageEntry.java (modified) (6 diffs)

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

@@ -8 +8 @@
 import java.util.Date;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.CachedLatLon;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.tools.ExifReader;
 import org.openstreetmap.josm.tools.JosmRuntimeException;
+import org.openstreetmap.josm.tools.Logging;
 
 import com.drew.imaging.jpeg.JpegMetadataReader;
@@ -440 +440 @@
             metadata = JpegMetadataReader.readMetadata(file);
         } catch (CompoundException | IOException ex) {
-            Main.error(ex);
+            Logging.error(ex);
             setExifTime(null);
             setExifCoor(null);
@@ -452 +452 @@
             setExifTime(ExifReader.readTime(metadata));
         } catch (JosmRuntimeException | IllegalArgumentException | IllegalStateException ex) {
-            Main.warn(ex);
+            Logging.warn(ex);
             setExifTime(null);
         }
@@ -465 +465 @@
             }
         } catch (MetadataException ex) {
-            Main.debug(ex);
+            Logging.debug(ex);
         }
 
@@ -489 +489 @@
             setPos(getExifCoor());
         } catch (MetadataException | IndexOutOfBoundsException ex) { // (other exceptions, e.g. #5271)
-            Main.error("Error reading EXIF from file: " + ex);
+            Logging.error("Error reading EXIF from file: " + ex);
             setExifCoor(null);
             setPos(null);
@@ -500 +500 @@
             }
         } catch (IndexOutOfBoundsException ex) { // (other exceptions, e.g. #5271)
-            Main.debug(ex);
+            Logging.debug(ex);
         }