Changeset 31848 in osm for applications/editors/josm/plugins/wikipedia/src/org

Timestamp:

2015-12-22T18:51:36+01:00 (9 years ago)

Author:

simon04

Message:

JOSM/wikipedia: use Main for logging

Location:

applications/editors/josm/plugins/wikipedia/src/org/wikipedia

Files:

• WikipediaApp.java (modified) (7 diffs)
• WikipediaToggleDialog.java (modified) (1 diff)

applications/editors/josm/plugins/wikipedia/src/org/wikipedia/WikipediaApp.java

@@ -47 +47 @@
             final String url = "https://tools.wmflabs.org/wp-world/marks.php?"
                     + "bbox=" + bbox + "&LANG=" + wikipediaLang;
-            System.out.println("Wikipedia: GET " + url);
+            Main.info("Wikipedia: GET " + url);
             // parse XML document
             final XPathExpression xpathPlacemark = XPathFactory.newInstance().newXPath().compile("//Placemark");
@@ -81 +81 @@
                     + "&depth=" + depth
                     + "&cat=" + encodeURL(category);
-            System.out.println("Wikipedia: GET " + url);
+            Main.info("Wikipedia: GET " + url);
             try (final InputStream in = Utils.openURL(new URL(url));
                  final Scanner scanner = new Scanner(in, "UTF-8").useDelimiter("\n")) {
@@ -116 +116 @@
             final String url = "https://tools.wmflabs.org/wiwosm/osmjson/getGeoJSON.php?action=check"
                     + "&lang=" + wikipediaLang;
-            System.out.println("Wikipedia: POST " + url + " " + articleNames);
+            Main.info("Wikipedia: POST " + url + " " + articleNames);
 
             try {
@@ -175 +175 @@
                     "&lllimit=500" +
                     "&format=xml";
-            System.out.println("Wikipedia: GET " + url);
+            Main.info("Wikipedia: GET " + url);
             try (final InputStream in = Utils.openURL(new URL(url))) {
                 final Document xml = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(in);
@@ -270 +270 @@
             final WikipediaLangArticle wp = WikipediaLangArticle.parseFromUrl(getHrefFromDescription(description));
             if (wp == null) {
-                System.err.println("Could not extract Wikipedia tag from: " + getHrefFromDescription(description));
+                Main.warn("Could not extract Wikipedia tag from: " + getHrefFromDescription(description));
             }
             this.wikipediaLang = wp == null ? null : wp.lang;
@@ -291 +291 @@
                 return m.group(1);
             } else {
-                System.err.println("Could not parse URL from: " + description);
+                Main.warn("Could not parse URL from: " + description);
                 return null;
             }
@@ -305 +305 @@
                         + "&lang=" + wikipediaLang
                         + "&article=" + encodeURL(wikipediaArticle);
-                System.out.println("Wikipedia: GET " + url);
+                Main.info("Wikipedia: GET " + url);
                 try (final InputStream in = Utils.openURL(new URL(url));
                      final Scanner scanner = new Scanner(in, "UTF-8")) {

applications/editors/josm/plugins/wikipedia/src/org/wikipedia/WikipediaToggleDialog.java

@@ -228 +228 @@
             if (list.getSelectedValue() != null) {
                 final String url = ((WikipediaEntry) list.getSelectedValue()).getBrowserUrl();
-                System.out.println("Wikipedia: opening " + url);
+                Main.info("Wikipedia: opening " + url);
                 OpenBrowser.displayUrl(url);
             }