Changeset 6248 in josm for trunk/src/org/openstreetmap/josm/io/OsmConnection.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/OsmConnection.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/io/OsmConnection.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.net.Authenticator.RequestorType;
 import java.net.HttpURLConnection;
-import java.net.Authenticator.RequestorType;
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
@@ -19 +19 @@
 import org.openstreetmap.josm.gui.preferences.server.OAuthAccessTokenHolder;
 import org.openstreetmap.josm.io.auth.CredentialsAgentException;
+import org.openstreetmap.josm.io.auth.CredentialsAgentResponse;
 import org.openstreetmap.josm.io.auth.CredentialsManager;
-import org.openstreetmap.josm.io.auth.CredentialsAgentResponse;
 import org.openstreetmap.josm.tools.Base64;
 
@@ -132 +132 @@
             addOAuthAuthorizationHeader(connection);
         } else {
-            String msg = tr("Warning: unexpected value for preference ''{0}''. Got ''{1}''.", "osm-server.auth-method", authMethod);
-            System.err.println(msg);
+            String msg = tr("Unexpected value for preference ''{0}''. Got ''{1}''.", "osm-server.auth-method", authMethod);
+            Main.warn(msg);
             throw new OsmTransferException(msg);
         }