Changeset 32704 in osm for applications/editors

Timestamp:

2016-07-23T23:51:22+02:00 (8 years ago)

Author:

simon04

Message:

JOSM/wikipedia: switch to Java 8

Location:

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

Files:

• WikidataTagCellRenderer.java (modified) (1 diff)
• WikipediaAddNamesAction.java (modified) (2 diffs)
• WikipediaApp.java (modified) (6 diffs)
• WikipediaCategorySearchDialog.java (modified) (2 diffs)
• WikipediaCopyTemplate.java (modified) (2 diffs)
• WikipediaToggleDialog.java (modified) (1 diff)
• XPath.java (modified) (1 diff)

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

@@ -70 +70 @@
     protected JLabel renderValues(Collection<String> ids, JTable table, JLabel component) {
 
-        for (String id : ids) {
-            if (!labelCache.containsKey(id)) {
-                labelCache.put(id, Main.worker.submit(new LabelLoader(id, table)));
-            }
-        }
+        ids.stream()
+                .filter(id -> !labelCache.containsKey(id))
+                .forEach(id -> {
+                    labelCache.put(id, Main.worker.submit(new LabelLoader(id, table)));
+                });
 
         final Collection<String> texts = new ArrayList<>(ids.size());

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

@@ -15 +15 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.preferences.StringProperty;
 import org.openstreetmap.josm.io.remotecontrol.AddTagsDialog;
-import org.openstreetmap.josm.tools.LanguageInfo;
 
 public class WikipediaAddNamesAction extends JosmAction {
@@ -31 +29 @@
         final WikipediaApp.WikipediaLangArticle wp = WikipediaApp.WikipediaLangArticle.parseTag("wikipedia", getWikipediaValue());
         List<String[]> tags = new ArrayList<>();
-        for (WikipediaApp.WikipediaLangArticle i : WikipediaApp.getInterwikiArticles(wp.lang, wp.article)) {
-            if (useWikipediaLangArticle(i)) {
-                tags.add(new String[]{"name:" + i.lang, i.article});
-            }
-        }
+        WikipediaApp.getInterwikiArticles(wp.lang, wp.article).stream()
+                .filter(this::useWikipediaLangArticle)
+                .map(i -> new String[]{"name:" + i.lang, i.article})
+                .forEach(tags::add);
         if (Main.isDebugEnabled()) {
             Main.debug(tags.toString());

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

@@ -27 +27 @@
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.xpath.XPathExpressionException;
 
 import org.openstreetmap.josm.Main;
@@ -33 +32 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Tag;
+import org.openstreetmap.josm.gui.datatransfer.ClipboardUtils;
 import org.openstreetmap.josm.tools.AlphanumComparator;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
@@ -42 +42 @@
 public final class WikipediaApp {
 
-    public static Pattern WIKIDATA_PATTERN = Pattern.compile("Q\\d+");
+    public static final Pattern WIKIDATA_PATTERN = Pattern.compile("Q\\d+");
     private static final DocumentBuilder DOCUMENT_BUILDER = newDocumentBuilder();
     private static final XPath X_PATH = XPath.getInstance();
@@ -141 +141 @@
     static List<WikipediaEntry> getEntriesFromClipboard(final String wikipediaLang) {
         return Pattern.compile("[\\n\\r]+")
-                .splitAsStream(Utils.getClipboardContent())
+                .splitAsStream(ClipboardUtils.getClipboardStringContent())
                 .map(x -> new WikipediaEntry(wikipediaLang, x))
                 .collect(Collectors.toList());
@@ -290 +290 @@
     }
 
-    private static String getFirstField(Collection<String> languages, String field, Node entity) throws XPathExpressionException {
+    private static String getFirstField(Collection<String> languages, String field, Node entity) {
         return languages.stream()
                 .map(language -> X_PATH.evaluateString(language != null
@@ -302 +302 @@
     static Collection<WikipediaLangArticle> getInterwikiArticles(String wikipediaLang, String article) {
         try {
-            Collection<WikipediaLangArticle> r = new ArrayList<>();
             final String url = getSiteUrl(wikipediaLang) + "/w/api.php" +
                     "?action=query" +

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

@@ -5 +5 @@
 
 import java.awt.Dimension;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.util.Collections;
 import java.util.List;
@@ -51 +49 @@
     }
 
-    @Override
-    protected void buttonAction(int buttonIndex, ActionEvent evt) {
-        super.buttonAction(buttonIndex, evt);
-    }
-
     private static class Selector extends WikiSearchTextResultListPanel<String> {
 

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

@@ -18 +18 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.MainMenu;
-import org.openstreetmap.josm.tools.Utils;
+import org.openstreetmap.josm.gui.datatransfer.ClipboardUtils;
 
 public class WikipediaCopyTemplate {
@@ -83 +83 @@
                 return;
             }
-            Utils.copyToClipboard(pattern
+            ClipboardUtils.copyString(pattern
                     .replace("{lat}", Double.toString(node.getCoor().lat()))
                     .replace("{lon}", Double.toString(node.getCoor().lon())));

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

@@ -186 +186 @@
         protected void process(List<WikipediaEntry> chunks) {
             model.clear();
-            for (WikipediaEntry i : chunks) {
-                model.addElement(i);
-            }
+            chunks.forEach(model::addElement);
             updateTitle();
             updateWikipediaArticles();

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

@@ -19 +19 @@
 public class XPath implements javax.xml.xpath.XPath {
     private final javax.xml.xpath.XPath xPath;
-    private static XPath INSTANCE = new XPath(XPathFactory.newInstance().newXPath());
+    private static final XPath INSTANCE = new XPath(XPathFactory.newInstance().newXPath());
 
     private XPath(javax.xml.xpath.XPath xPath) {