Changeset 12620 in josm for trunk/src/org/openstreetmap/josm/io/session/SessionReader.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/io/session/SessionReader.java (modified) (8 diffs)

trunk/src/org/openstreetmap/josm/io/session/SessionReader.java

@@ -45 +45 @@
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.JosmRuntimeException;
+import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.MultiMap;
 import org.openstreetmap.josm.tools.Utils;
@@ -447 +448 @@
             active = !activeAtt.isEmpty() ? (Integer.parseInt(activeAtt)-1) : -1;
         } catch (NumberFormatException e) {
-            Main.warn("Unsupported value for 'active' layer attribute. Ignoring it. Error was: "+e.getMessage());
+            Logging.warn("Unsupported value for 'active' layer attribute. Ignoring it. Error was: "+e.getMessage());
             active = -1;
         }
@@ -468 +469 @@
                         idx = Integer.valueOf(e.getAttribute("index"));
                     } catch (NumberFormatException ex) {
-                        Main.warn(ex);
+                        Logging.warn(ex);
                     }
                     if (idx == null) {
@@ -485 +486 @@
                                 d = Integer.valueOf(sd);
                             } catch (NumberFormatException ex) {
-                                Main.warn(ex);
+                                Logging.warn(ex);
                             }
                             if (d != null) {
@@ -567 +568 @@
                 }
                 if (exception != null) {
-                    Main.error(exception);
+                    Logging.error(exception);
                     if (!GraphicsEnvironment.isHeadless()) {
                         CancelOrContinueDialog dialog = new CancelOrContinueDialog();
@@ -607 +608 @@
                     layer.setOpacity(opacity);
                 } catch (NumberFormatException ex) {
-                    Main.warn(ex);
+                    Logging.warn(ex);
                 }
             }
@@ -625 +626 @@
                     Double.parseDouble(centerEl.getAttribute("lon")));
         } catch (NumberFormatException ex) {
-            Main.warn(ex);
+            Logging.warn(ex);
         }
         if (center == null) return null;
@@ -634 +635 @@
             return new SessionViewportData(center, scale);
         } catch (NumberFormatException ex) {
-            Main.warn(ex);
+            Logging.warn(ex);
             return null;
         }