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

Timestamp:

2016-07-10T22:56:50+02:00 (8 years ago)

Author:

simon04

Message:

JOSM/wikipedia: refactor WikipediaEntry fields for clarification

Location:

applications/editors/josm/plugins/wikipedia

Files:

• src/org/wikipedia/WikipediaApp.java (modified) (8 diffs)
• src/org/wikipedia/WikipediaToggleDialog.java (modified) (2 diffs)
• test/unit/org/wikipedia/WikipediaAppTest.java (modified) (3 diffs)

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

@@ -96 +96 @@
                             (double) xpathLon.evaluate(node, XPathConstants.NUMBER));
                     if ("wikidata".equals(wikipediaLang)) {
-                        entries.add(new WikidataEntry(name, latLon, null));
+                        entries.add(new WikidataEntry(name, null, latLon));
                     } else {
-                        entries.add(new WikipediaEntry(name, wikipediaLang, name, latLon
+                        entries.add(new WikipediaEntry(wikipediaLang, name, name, latLon
                         ));
                     }
@@ -109 +109 @@
                     final List<WikipediaEntry> entriesWithLabel = new ArrayList<>(nodes.getLength());
                     for (WikipediaEntry entry : entries) {
-                        entriesWithLabel.add(new WikidataEntry(entry.wikipediaArticle, entry.coordinate, labels.get(entry.wikipediaArticle)));
+                        entriesWithLabel.add(new WikidataEntry(entry.wikipediaArticle, labels.get(entry.wikipediaArticle), entry.coordinate));
                     }
                     return entriesWithLabel;
@@ -134 +134 @@
                 while (scanner.hasNext()) {
                     final String article = scanner.next().trim().replace("_", " ");
-                    entries.add(new WikipediaEntry(article, wikipediaLang, article));
+                    entries.add(new WikipediaEntry(wikipediaLang, article));
                 }
                 return entries;
@@ -149 +149 @@
             @Override
             public WikipediaEntry apply(String x) {
-                return new WikipediaEntry(x, wikipediaLang, x);
+                return new WikipediaEntry(wikipediaLang, x);
             }
         }));
@@ -409 +409 @@
     static class WikipediaEntry implements Comparable<WikipediaEntry> {
 
-        final String name;
+        final String label;
         final String wikipediaLang, wikipediaArticle;
         final LatLon coordinate;
         private Boolean wiwosmStatus;
 
-        public WikipediaEntry(String name, String wikipediaLang, String wikipediaArticle) {
-            this(name, wikipediaLang, wikipediaArticle, null);
-        }
-
-        public WikipediaEntry(String name, String wikipediaLang, String wikipediaArticle, LatLon coordinate) {
-            this.name = name;
+        WikipediaEntry(String wikipediaLang, String wikipediaArticle) {
+            this(wikipediaLang, wikipediaArticle, null, null);
+        }
+
+        WikipediaEntry(String wikipediaLang, String wikipediaArticle, String label, LatLon coordinate) {
+            this.label = label;
             this.wikipediaLang = wikipediaLang;
             this.wikipediaArticle = wikipediaArticle;
@@ -442 +442 @@
 
         public String getLabelText() {
-            return name;
+            return wikipediaArticle;
         }
 
         @Override
         public String toString() {
-            return name;
+            return wikipediaArticle;
         }
 
         @Override
         public int compareTo(WikipediaEntry o) {
-            return AlphanumComparator.getInstance().compare(name, o.name);
+            return AlphanumComparator.getInstance().compare(label, o.label);
         }
     }
@@ -458 +458 @@
     static class WikidataEntry extends WikipediaEntry {
 
-        WikidataEntry(String id, LatLon coordinate, String label) {
-            super(label, "wikidata", id, coordinate);
+        WikidataEntry(String id, String label, LatLon coordinate) {
+            super("wikidata", id, label, coordinate);
             ensureValidWikidataId(id);
         }
@@ -470 +470 @@
         @Override
         public String getLabelText() {
-            return getLabelText(name, wikipediaArticle);
+            return getLabelText(label, wikipediaArticle);
         }
 

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

@@ -43 +43 @@
 import org.openstreetmap.josm.tools.LanguageInfo;
 import org.openstreetmap.josm.tools.OpenBrowser;
+import org.openstreetmap.josm.tools.Utils;
 import org.wikipedia.WikipediaApp.WikipediaEntry;
 
@@ -78 +79 @@
                             Main.map.mapView.zoomTo(bbox);
                         }
-                        SearchAction.search(entry.name.replaceAll("\\(.*\\)", ""), SearchAction.SearchMode.replace);
+                        final String search = Utils.firstNonNull(entry.label, entry.wikipediaArticle).replaceAll("\\(.*\\)", "");
+                        SearchAction.search(search, SearchAction.SearchMode.replace);
                     }
                 }

applications/editors/josm/plugins/wikipedia/test/unit/org/wikipedia/WikipediaAppTest.java

@@ -133 +133 @@
     @Test
     public void testGetBrowserUrl() {
-        final WikipediaEntry entry = new WikipediaEntry("Sternheim & Emanuel", "de", "Sternheim & Emanuel");
+        final WikipediaEntry entry = new WikipediaEntry("de", "Sternheim & Emanuel");
         assertThat(entry.getBrowserUrl(), is("https://de.wikipedia.org/wiki/Sternheim_%26_Emanuel"));
     }
@@ -156 +156 @@
             @Override
             public boolean evaluate(WikipediaEntry entry) {
-                return "Q865406".equals(entry.wikipediaArticle) && "wikidata".equals(entry.wikipediaLang) && "Birgitzer Alm".equals(entry.name);
+                return "Q865406".equals(entry.wikipediaArticle) && "wikidata".equals(entry.wikipediaLang) && "Birgitzer Alm".equals(entry.label);
             }
         }));
@@ -192 +192 @@
     @Test
     public void testWIWOSMStatus() throws Exception {
-        final WikipediaEntry entry1 = new WikipediaEntry(null, "en", "Vienna");
-        final WikipediaEntry entry2 = new WikipediaEntry(null, "en", "London");
-        final WikipediaEntry entry3 = new WikipediaEntry(null, "en", "a-non-existing-article");
+        final WikipediaEntry entry1 = new WikipediaEntry("en", "Vienna");
+        final WikipediaEntry entry2 = new WikipediaEntry("en", "London");
+        final WikipediaEntry entry3 = new WikipediaEntry("en", "a-non-existing-article");
         WikipediaApp.updateWIWOSMStatus("en", Arrays.asList(entry1, entry2, entry3));
         assertThat(entry1.getWiwosmStatus(), is(true));