Changeset 30737 in osm for applications/editors/josm/plugins/wikipedia

Timestamp:

2014-10-18T23:07:52+02:00 (10 years ago)

Author:

donvip

Message:

[josm_plugins] fix Java 7 / unused code warnings

Location:

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

Files:

• WikipediaAddNamesAction.java (modified) (1 diff)
• WikipediaApp.java (modified) (5 diffs)
• WikipediaToggleDialog.java (modified) (1 diff)

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

@@ -31 +31 @@
     public void actionPerformed(ActionEvent e) {
         final WikipediaApp.WikipediaLangArticle wp = WikipediaApp.WikipediaLangArticle.parseTag("wikipedia", getWikipediaValue());
-        List<String[]> tags = new ArrayList<String[]>();
+        List<String[]> tags = new ArrayList<>();
         for (WikipediaApp.WikipediaLangArticle i : WikipediaApp.getInterwikiArticles(wp.lang, wp.article)) {
             if (useWikipediaLangArticle(i)) {

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

@@ -54 +54 @@
             NodeList nodes = (NodeList) xpathPlacemark.evaluate(doc, XPathConstants.NODESET);
             // construct WikipediaEntry for each XML element
-            List<WikipediaEntry> entries = new ArrayList<WikipediaEntry>(nodes.getLength());
+            List<WikipediaEntry> entries = new ArrayList<>(nodes.getLength());
             for (int i = 0; i < nodes.getLength(); i++) {
                 final String[] coord = xpathCoord.evaluate(nodes.item(i)).split(",");
@@ -79 +79 @@
             System.out.println("Wikipedia: GET " + url);
             final Scanner scanner = new Scanner(new URL(url).openStream(), "UTF-8").useDelimiter("\n");
-            final List<WikipediaEntry> entries = new ArrayList<WikipediaEntry>();
+            final List<WikipediaEntry> entries = new ArrayList<>();
             while (scanner.hasNext()) {
                 final String article = scanner.next().trim().replace("_", " ");
@@ -92 +92 @@
     static List<WikipediaEntry> getEntriesFromClipboard(final String wikipediaLang) {
         final List<String> clipboardLines = Arrays.asList(Utils.getClipboardContent().split("[\\n\\r]+"));
-        return new ArrayList<WikipediaEntry>(Utils.transform(clipboardLines, new Function<String, WikipediaEntry>() {
+        return new ArrayList<>(Utils.transform(clipboardLines, new Function<String, WikipediaEntry>() {
 
             @Override
@@ -102 +102 @@
 
     static void updateWIWOSMStatus(String wikipediaLang, Collection<WikipediaEntry> entries) {
-        Collection<String> articleNames = new ArrayList<String>();
+        Collection<String> articleNames = new ArrayList<>();
         for (WikipediaEntry i : entries) {
             articleNames.add(i.wikipediaArticle);
         }
-        Map<String, Boolean> status = new HashMap<String, Boolean>();
+        Map<String, Boolean> status = new HashMap<>();
         if (!articleNames.isEmpty()) {
             final String url = "https://tools.wmflabs.org/wiwosm/osmjson/getGeoJSON.php?action=check"
@@ -162 +162 @@
     static Collection<WikipediaLangArticle> getInterwikiArticles(String wikipediaLang, String article) {
         try {
-            Collection<WikipediaLangArticle> r = new ArrayList<WikipediaLangArticle>();
+            Collection<WikipediaLangArticle> r = new ArrayList<>();
             final String url = "https://" + wikipediaLang + ".wikipedia.org/w/api.php" +
                     "?action=query" +

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

@@ -59 +59 @@
     String titleContext = null;
     final StringProperty wikipediaLang = new StringProperty("wikipedia.lang", LanguageInfo.getJOSMLocaleCode().substring(0, 2));
-    final Set<String> articles = new HashSet<String>();
+    final Set<String> articles = new HashSet<>();
     final DefaultListModel<WikipediaEntry> model = new DefaultListModel<>();
     final JList<WikipediaEntry> list = new JList<WikipediaEntry>(model) {