Changeset 12620 in josm for trunk/src/org/openstreetmap/josm/gui/help

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/help/HelpBrowser.java (modified) (7 diffs)

trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java

@@ -52 +52 @@
 import org.openstreetmap.josm.tools.InputMapUtils;
 import org.openstreetmap.josm.tools.LanguageInfo.LocaleType;
+import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.OpenBrowser;
 import org.openstreetmap.josm.tools.WindowGeometry;
@@ -142 +143 @@
             css = new String(cf.getByteContent(), StandardCharsets.ISO_8859_1);
         } catch (IOException e) {
-            Main.error(tr("Failed to read CSS file ''help-browser.css''. Exception is: {0}", e.toString()));
-            Main.error(e);
+            Logging.error(tr("Failed to read CSS file ''help-browser.css''. Exception is: {0}", e.toString()));
+            Logging.error(e);
             return ss;
         }
@@ -236 +237 @@
             help.getEditorKit().read(new StringReader(content), document, 0);
         } catch (IOException | BadLocationException e) {
-            Main.error(e);
+            Logging.error(e);
         }
         help.setDocument(document);
@@ -300 +301 @@
             content = reader.fetchHelpTopicContent(url, true);
         } catch (MissingHelpContentException e) {
-            Main.trace(e);
+            Logging.trace(e);
             url = getHelpTopicUrl(buildAbsoluteHelpTopic(relativeHelpTopic, LocaleType.BASELANGUAGE));
             try {
                 content = reader.fetchHelpTopicContent(url, true);
             } catch (MissingHelpContentException e1) {
-                Main.trace(e1);
+                Logging.trace(e1);
                 url = getHelpTopicUrl(buildAbsoluteHelpTopic(relativeHelpTopic, LocaleType.ENGLISH));
                 try {
                     content = reader.fetchHelpTopicContent(url, true);
                 } catch (MissingHelpContentException e2) {
-                    Main.debug(e2);
+                    Logging.debug(e2);
                     this.url = url;
                     handleMissingHelpContent(relativeHelpTopic);
                     return;
                 } catch (HelpContentReaderException e2) {
-                    Main.error(e2);
+                    Logging.error(e2);
                     handleHelpContentReaderException(relativeHelpTopic, e2);
                     return;
                 }
             } catch (HelpContentReaderException e1) {
-                Main.error(e1);
+                Logging.error(e1);
                 handleHelpContentReaderException(relativeHelpTopic, e1);
                 return;
             }
         } catch (HelpContentReaderException e) {
-            Main.error(e);
+            Logging.error(e);
             handleHelpContentReaderException(relativeHelpTopic, e);
             return;
@@ -346 +347 @@
             content = reader.fetchHelpTopicContent(url, true);
         } catch (MissingHelpContentException e) {
-            Main.debug(e);
+            Logging.debug(e);
             this.url = url;
             handleMissingHelpContent(absoluteHelpTopic);
             return;
         } catch (HelpContentReaderException e) {
-            Main.error(e);
+            Logging.error(e);
             handleHelpContentReaderException(absoluteHelpTopic, e);
             return;
@@ -377 +378 @@
                 this.url = url;
             } catch (HelpContentReaderException e) {
-                Main.warn(e);
+                Logging.warn(e);
                 HelpAwareOptionPane.showOptionDialog(
                         Main.parent,
@@ -587 +588 @@
                     }
                 } catch (BadLocationException e) {
-                    Main.warn(tr("Bad location in HTML document. Exception was: {0}", e.toString()));
-                    Main.error(e);
+                    Logging.warn(tr("Bad location in HTML document. Exception was: {0}", e.toString()));
+                    Logging.error(e);
                 }
             }