Changeset 6248 in josm for trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java

Timestamp:

2013-09-23T16:47:50+02:00 (11 years ago)

Author:

Don-vip

Message:

Rework console output:

• new log level "error"
• Replace nearly all calls to system.out and system.err to Main.(error|warn|info|debug)
• Remove some unnecessary debug output
• Some messages are modified (removal of "Info", "Warning", "Error" from the message itself -> notable i18n impact but limited to console error messages not seen by the majority of users, so that's ok)

File:

• trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java

@@ -20 +20 @@
 import javax.xml.parsers.DocumentBuilderFactory;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
@@ -127 +128 @@
         }
 
-        System.out.println("GET " + getCapabilitiesUrl.toString());
+        Main.info("GET " + getCapabilitiesUrl.toString());
         URLConnection openConnection = Utils.openHttpConnection(getCapabilitiesUrl);
         InputStream inputStream = openConnection.getInputStream();
@@ -139 +140 @@
         String incomingData = ba.toString();
 
-        //System.out.println("WMS capabilities:\n"+incomingData+"\n");
         try {
             DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance();
@@ -149 +149 @@
                 @Override
                 public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException {
-                    System.out.println("Ignoring DTD " + publicId + ", " + systemId);
+                    Main.info("Ignoring DTD " + publicId + ", " + systemId);
                     return new InputSource(new StringReader(""));
                 }
@@ -175 +175 @@
                 String baseURL = child.getAttribute("xlink:href");
                 if (baseURL != null && !baseURL.equals(serviceUrlStr)) {
-                    System.out.println("GetCapabilities specifies a different service URL: " + baseURL);
+                    Main.info("GetCapabilities specifies a different service URL: " + baseURL);
                     serviceUrl = new URL(baseURL);
                 }