Index: /applications/editors/josm/plugins/wikipedia/src/org/wikipedia/WikidataTagCellRenderer.java =================================================================== --- /applications/editors/josm/plugins/wikipedia/src/org/wikipedia/WikidataTagCellRenderer.java (revision 32690) +++ /applications/editors/josm/plugins/wikipedia/src/org/wikipedia/WikidataTagCellRenderer.java (revision 32691) @@ -13,4 +13,5 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; +import java.util.stream.Collectors; import javax.swing.JLabel; @@ -19,5 +20,4 @@ import org.openstreetmap.josm.Main; -import org.openstreetmap.josm.tools.Predicates; import org.openstreetmap.josm.tools.Utils; @@ -61,5 +61,5 @@ } else if (id.contains(";")) { final List ids = Arrays.asList(id.split("\\s*;\\s*")); - if (Utils.forAll(ids, Predicates.stringMatchesPattern(WikipediaApp.WIKIDATA_PATTERN))) { + if (ids.stream().allMatch(i -> WikipediaApp.WIKIDATA_PATTERN.matcher(i).matches())) { return renderValues(ids, table, component); } @@ -94,5 +94,5 @@ texts.add(WikipediaApp.WikidataEntry.getLabelText(id, label)); } - component.setText("" + Utils.join("; ", texts)); + component.setText("" + texts.stream().collect(Collectors.joining("; "))); component.setToolTipText("" + Utils.joinAsHtmlUnorderedList(texts)); return component; Index: /applications/editors/josm/plugins/wikipedia/src/org/wikipedia/WikipediaApp.java =================================================================== --- /applications/editors/josm/plugins/wikipedia/src/org/wikipedia/WikipediaApp.java (revision 32690) +++ /applications/editors/josm/plugins/wikipedia/src/org/wikipedia/WikipediaApp.java (revision 32691) @@ -177,5 +177,5 @@ try { - final String requestBody = "articles=" + Utils.encodeUrl(Utils.join(",", articleNames)); + final String requestBody = "articles=" + Utils.encodeUrl(articleNames.stream().collect(Collectors.joining(","))); try (final Scanner scanner = new Scanner( HttpClient.create(new URL(url), "POST").setReasonForRequest("Wikipedia") Index: /applications/editors/josm/plugins/wikipedia/src/org/wikipedia/WikipediaCopyTemplate.java =================================================================== --- /applications/editors/josm/plugins/wikipedia/src/org/wikipedia/WikipediaCopyTemplate.java (revision 32690) +++ /applications/editors/josm/plugins/wikipedia/src/org/wikipedia/WikipediaCopyTemplate.java (revision 32691) @@ -100,9 +100,8 @@ protected Node getSelectedNode() { DataSet ds = getLayerManager().getEditDataSet(); - if (ds == null || ds.getSelected() == null) { + if (ds == null) { return null; } else { - Collection nodes = Utils.filteredCollection(ds.getSelected(), Node.class); - return nodes.isEmpty() ? null : nodes.iterator().next(); + return (Node) ds.getSelected().stream().filter(Node.class::isInstance).findFirst().orElse(null); } }