Changeset 12620 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/remotecontrol/RemoteControlPreference.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/gui/preferences/remotecontrol/RemoteControlPreference.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/remotecontrol/RemoteControlPreference.java

@@ -39 +39 @@
 import org.openstreetmap.josm.io.remotecontrol.handler.RequestHandler;
 import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.PlatformHookWindows;
 
@@ -127 +128 @@
                             tr("Certificate has been successfully installed.") :
                             tr("Certificate is already installed. Nothing to do.");
-                    Main.info(msg);
+                    Logging.info(msg);
                     JOptionPane.showMessageDialog(wrapper, msg);
                 } catch (IOException | GeneralSecurityException ex) {
-                    Main.error(ex);
+                    Logging.error(ex);
                 }
             });
@@ -138 +139 @@
                     KeyStore ks = PlatformHookWindows.getRootKeystore();
                     if (ks.containsAlias(RemoteControlHttpsServer.ENTRY_ALIAS)) {
-                        Main.info(tr("Removing certificate {0} from root keystore.", RemoteControlHttpsServer.ENTRY_ALIAS));
+                        Logging.info(tr("Removing certificate {0} from root keystore.", RemoteControlHttpsServer.ENTRY_ALIAS));
                         ks.deleteEntry(RemoteControlHttpsServer.ENTRY_ALIAS);
                         msg = tr("Certificate has been successfully uninstalled.");
@@ -144 +145 @@
                         msg = tr("Certificate is not installed. Nothing to do.");
                     }
-                    Main.info(msg);
+                    Logging.info(msg);
                     JOptionPane.showMessageDialog(wrapper, msg);
                 } catch (KeyStoreException | NoSuchAlgorithmException | CertificateException | IOException ex) {
-                    Main.error(ex);
+                    Logging.error(ex);
                 }
             });