Changeset 12620 in josm for trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.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/data/imagery/WMTSTileSource.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java

@@ -58 +58 @@
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -293 +294 @@
         this.layers = getCapabilities();
         if (info.getDefaultLayers().isEmpty()) {
-            Main.warn(tr("No default layer selected, choosing first layer."));
+            Logging.warn(tr("No default layer selected, choosing first layer."));
             if (!layers.isEmpty()) {
                 Layer first = layers.iterator().next();
@@ -383 +384 @@
             } catch (XMLStreamException e) {
                 cf.clear();
-                Main.warn(new String(data, StandardCharsets.UTF_8));
+                Logging.warn(new String(data, StandardCharsets.UTF_8));
                 throw new IllegalArgumentException(e);
             }
@@ -491 +492 @@
         if (layer.format == null) {
             // no format found - it's mandatory parameter - can't use this layer
-            Main.warn(tr("Can''t use layer {0} because no supported formats where found. Layer is available in formats: {1}",
+            Logging.warn(tr("Can''t use layer {0} because no supported formats where found. Layer is available in formats: {1}",
                     layer.getUserTitle(),
                     String.join(", ", unsupportedFormats)));
@@ -725 +726 @@
         }
         // if no layers is found, fallback to default mercator tile size. Maybe it will work
-        Main.warn("WMTS: Could not determine tile size. Using default tile size of: {0}", getDefaultTileSize());
+        Logging.warn("WMTS: Could not determine tile size. Using default tile size of: {0}", getDefaultTileSize());
         return getDefaultTileSize();
     }