Changeset 12620 in josm for trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java

Timestamp:

2017-08-22T22:26:32+02:00 (9 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/tools/PlatformHookWindows.java (modified) (13 diffs)

trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java

@@ -177 +177 @@
                 }
             } catch (NumberFormatException | ReflectiveOperationException e) {
-                Main.error(e);
+                Logging.error(e);
             }
         }
@@ -304 +304 @@
             sb.append(" (").append(getCurrentBuild()).append(')');
         } catch (ReflectiveOperationException e) {
-            Main.error(e);
+            Logging.error(e);
         }
         return sb.toString();
@@ -346 +346 @@
             insecurePubKey = KeyFactory.getInstance("RSA").generatePublic(new X509EncodedKeySpec(INSECURE_PUBLIC_KEY));
         } catch (InvalidKeySpecException | NoSuchAlgorithmException e) {
-            Main.error(e);
+            Logging.error(e);
             return;
         }
@@ -362 +362 @@
                 } catch (InvalidKeyException | NoSuchProviderException | SignatureException e) {
                     // If exception this is not a certificate related to JOSM, just trace it
-                    Main.trace(alias + " --> " + e.getClass().getName());
-                    Main.trace(e);
+                    Logging.trace(alias + " --> " + e.getClass().getName());
+                    Logging.trace(e);
                 }
             }
@@ -385 +385 @@
             JOptionPane.showMessageDialog(Main.parent, message.toString(), tr("Warning"), JOptionPane.WARNING_MESSAGE);
             for (String alias : insecureCertificates) {
-                Main.warn(tr("Removing insecure certificate from {0} keystore: {1}", WINDOWS_ROOT, alias));
+                Logging.warn(tr("Removing insecure certificate from {0} keystore: {1}", WINDOWS_ROOT, alias));
                 try {
                     ks.deleteEntry(alias);
                 } catch (KeyStoreException e) {
-                    Main.error(e, tr("Unable to remove insecure certificate from keystore: {0}", e.getMessage()));
+                    Logging.log(Logging.LEVEL_ERROR, tr("Unable to remove insecure certificate from keystore: {0}", e.getMessage()), e);
                 }
             }
@@ -404 +404 @@
             if (alias != null) {
                 // JOSM certificate found, return
-                Main.debug(tr("JOSM localhost certificate found in {0} keystore: {1}", WINDOWS_ROOT, alias));
+                Logging.debug(tr("JOSM localhost certificate found in {0} keystore: {1}", WINDOWS_ROOT, alias));
                 return false;
             }
         } catch (ArrayIndexOutOfBoundsException e) {
             // catch error of JDK-8172244 as bug seems to not be fixed anytime soon
-            Main.error(e, "JDK-8172244 occured. Abort HTTPS setup");
+            Logging.log(Logging.LEVEL_ERROR, "JDK-8172244 occured. Abort HTTPS setup", e);
             return false;
         }
@@ -425 +425 @@
         }
         // install it to Windows-ROOT keystore, used by IE, Chrome and Safari, but not by Firefox
-        Main.info(tr("Adding JOSM localhost certificate to {0} keystore", WINDOWS_ROOT));
+        Logging.info(tr("Adding JOSM localhost certificate to {0} keystore", WINDOWS_ROOT));
         ks.setEntry(entryAlias, trustedCert, null);
         return true;
@@ -508 +508 @@
         Path templateFile = FileSystems.getDefault().getPath(javaLibPath, templateFileName);
         if (!Files.isReadable(templateFile)) {
-            Main.warn("extended font config - unable to find font config template file {0}", templateFile.toString());
+            Logging.warn("extended font config - unable to find font config template file {0}", templateFile.toString());
             return;
         }
@@ -532 +532 @@
                             extras.add(entry);
                         } else {
-                            Main.trace("extended font config - already registered font for charset ''{0}'' - skipping ''{1}''",
+                            Logging.trace("extended font config - already registered font for charset ''{0}'' - skipping ''{1}''",
                                     entry.charset, entry.name);
                         }
                     } else {
-                        Main.trace("extended font config - Font ''{0}'' not found on system - skipping", entry.name);
+                        Logging.trace("extended font config - Font ''{0}'' not found on system - skipping", entry.name);
                     }
                 }
@@ -548 +548 @@
                     String prevValue = props.getProperty(key);
                     if (prevValue != null && !prevValue.equals(value)) {
-                        Main.warn("extended font config - overriding ''{0}={1}'' with ''{2}''", key, prevValue, value);
+                        Logging.warn("extended font config - overriding ''{0}={1}'' with ''{2}''", key, prevValue, value);
                     }
                     w.append(key + '=' + value + '\n');
@@ -561 +561 @@
                     String prevValue = props.getProperty(key);
                     if (prevValue != null && !prevValue.equals(value)) {
-                        Main.warn("extended font config - overriding ''{0}={1}'' with ''{2}''", key, prevValue, value);
+                        Logging.warn("extended font config - overriding ''{0}={1}'' with ''{2}''", key, prevValue, value);
                     }
                     w.append(key + '=' + value + '\n');
@@ -575 +575 @@
             Utils.updateSystemProperty("sun.awt.fontconfig", fontconfigFile.toString());
         } catch (IOException ex) {
-            Main.error(ex);
+            Logging.error(ex);
         }
     }
@@ -603 +603 @@
             fontsAvail.add(""); // for devanagari
         } catch (IOException ex) {
-            Main.error(ex, false);
-            Main.warn("extended font config - failed to load available Fonts");
+            Logging.log(Logging.LEVEL_ERROR, ex);
+            Logging.warn("extended font config - failed to load available Fonts");
             fontsAvail = null;
         }