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

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

@@ -21 +21 @@
 import org.openstreetmap.josm.gui.preferences.server.ProxyPreferencesPanel;
 import org.openstreetmap.josm.gui.preferences.server.ProxyPreferencesPanel.ProxyPolicy;
+import org.openstreetmap.josm.tools.Logging;
 
 /**
@@ -93 +94 @@
             port = Integer.parseInt(value);
         } catch (NumberFormatException e) {
-            Main.error(tr("Unexpected format for port number in preference ''{0}''. Got ''{1}''.", property, value));
-            Main.error(tr("The proxy will not be used."));
+            Logging.error(tr("Unexpected format for port number in preference ''{0}''. Got ''{1}''.", property, value));
+            Logging.error(tr("The proxy will not be used."));
             return 0;
         }
         if (port <= 0 || port > 65_535) {
-            Main.error(tr("Illegal port number in preference ''{0}''. Got {1}.", property, port));
-            Main.error(tr("The proxy will not be used."));
+            Logging.error(tr("Illegal port number in preference ''{0}''. Got {1}.", property, port));
+            Logging.error(tr("The proxy will not be used."));
             return 0;
         }
@@ -116 +117 @@
             proxyPolicy = ProxyPolicy.fromName(value);
             if (proxyPolicy == null) {
-                Main.warn(tr("Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no proxy.",
+                Logging.warn(tr("Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no proxy.",
                         ProxyPreferencesPanel.PROXY_POLICY, value));
                 proxyPolicy = ProxyPolicy.NO_PROXY;
@@ -128 +129 @@
                 httpProxySocketAddress = new InetSocketAddress(host, port);
             } else {
-                Main.warn(tr("Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''.", host, port));
-                Main.warn(tr("The proxy will not be used."));
+                Logging.warn(tr("Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''.", host, port));
+                Logging.warn(tr("The proxy will not be used."));
             }
         }
@@ -140 +141 @@
                 socksProxySocketAddress = new InetSocketAddress(host, port);
             } else {
-                Main.warn(tr("Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''.", host, port));
-                Main.warn(tr("The proxy will not be used."));
+                Logging.warn(tr("Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''.", host, port));
+                Logging.warn(tr("The proxy will not be used."));
             }
         }
@@ -153 +154 @@
     public void connectFailed(URI uri, SocketAddress sa, IOException ioe) {
         // Just log something. The network stack will also throw an exception which will be caught somewhere else
-        Main.error(tr("Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}", sa.toString(), uri.toString(), ioe.toString()));
+        Logging.error(tr("Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}",
+                sa.toString(), uri.toString(), ioe.toString()));
         // Remember errors to give a friendly user message asking to review proxy configuration
         errorResources.add(uri.toString());
@@ -203 +205 @@
         case USE_SYSTEM_SETTINGS:
             if (!jvmWillUseSystemProxies) {
-                Main.warn(tr("The JVM is not configured to lookup proxies from the system settings. "+
+                Logging.warn(tr("The JVM is not configured to lookup proxies from the system settings. "+
                         "The property ''java.net.useSystemProxies'' was missing at startup time.  Will not use a proxy."));
                 return NO_PROXY_LIST;