Changeset 12620 in josm for trunk/src/org/openstreetmap/josm/data/cache

Timestamp:

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

Author:

Don-vip

Message:

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

Location:

trunk/src/org/openstreetmap/josm/data/cache

Files:

• CacheEntryAttributes.java (modified) (3 diffs)
• HostLimitQueue.java (modified) (5 diffs)
• JCSCacheManager.java (modified) (2 diffs)
• JCSCachedTileLoaderJob.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/data/cache/CacheEntryAttributes.java

@@ -11 +11 @@
 
 import org.apache.commons.jcs.engine.ElementAttributes;
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.tools.Logging;
 
 /**
@@ -162 +162 @@
         for (Entry<String, String> e: map.entrySet()) {
             if (RESERVED_KEYS.contains(e.getKey())) {
-                Main.info("Metadata key configuration contains key {0} which is reserved for internal use");
+                Logging.info("Metadata key configuration contains key {0} which is reserved for internal use");
             } else {
                 attrs.put(e.getKey(), e.getValue());
@@ -191 +191 @@
      */
     public void setError(Exception error) {
-        setErrorMessage(Main.getErrorMessage(error));
+        setErrorMessage(Logging.getErrorMessage(error));
     }
 

trunk/src/org/openstreetmap/josm/data/cache/HostLimitQueue.java

@@ -12 +12 @@
 import java.util.concurrent.TimeUnit;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.tools.Logging;
 
 /**
@@ -67 +67 @@
                         url = job.getUrl();
                     } catch (IOException e) {
-                        Main.debug(e);
+                        Logging.debug(e);
                     }
-                    Main.debug("TMS - Skipping job {0} because host limit reached", url);
+                    Logging.debug("TMS - Skipping job {0} because host limit reached", url);
                 }
             }
@@ -90 +90 @@
                 // acquire my got interrupted, first offer back what was taken
                 if (!offer(job)) {
-                    Main.warn("Unable to offer back " + job);
+                    Logging.warn("Unable to offer back " + job);
                 }
                 throw e;
@@ -110 +110 @@
             // acquire my got interrupted, first offer back what was taken
             if (!offer(job)) {
-                Main.warn("Unable to offer back " + job);
+                Logging.warn("Unable to offer back " + job);
             }
             throw e;
@@ -209 +209 @@
             limit.release();
             if (limit.availablePermits() > hostLimit) {
-                Main.warn("More permits than it should be");
+                Logging.warn("More permits than it should be");
             }
         }

trunk/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java

@@ -31 +31 @@
 import org.openstreetmap.josm.data.preferences.BooleanProperty;
 import org.openstreetmap.josm.data.preferences.IntegerProperty;
+import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -91 +92 @@
                 String msg = formatter.formatMessage(record);
                 if (record.getLevel().intValue() >= Level.SEVERE.intValue()) {
-                    Main.error(msg);
+                    Logging.error(msg);
                 } else if (record.getLevel().intValue() >= Level.WARNING.intValue()) {
-                    Main.warn(msg);
+                    Logging.warn(msg);
                     // downgrade INFO level to debug, as JCS is too verbose at INFO level
                 } else if (record.getLevel().intValue() >= Level.INFO.intValue()) {
-                    Main.debug(msg);
+                    Logging.debug(msg);
                 } else {
-                    Main.trace(msg);
+                    Logging.trace(msg);
                 }
             }

trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java

@@ -22 +22 @@
 import org.apache.commons.jcs.engine.behavior.ICacheElement;
 import org.openstreetmap.gui.jmapviewer.FeatureAdapter;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.cache.ICachedLoaderListener.LoadResult;
 import org.openstreetmap.josm.data.preferences.IntegerProperty;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.HttpClient;
+import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -216 +216 @@
             return getUrl().getHost();
         } catch (IOException e) {
-            Main.trace(e);
+            Logging.trace(e);
             return null;
         }
@@ -264 +264 @@
             } catch (IOException e) {
                 listeners = null;
-                Main.trace(e);
+                Logging.trace(e);
             }
         }
@@ -406 +406 @@
             attributes.setError(e);
             LOG.log(Level.WARNING, "JCS - Exception during download {0}", getUrlNoException());
-            Main.warn(e);
+            Logging.warn(e);
             Thread.currentThread().interrupt();
         }
@@ -446 +446 @@
             } catch (NumberFormatException e) {
                 // ignore malformed Cache-Control headers
-                Main.trace(e);
+                Logging.trace(e);
             }
         }