Index: applications/editors/josm/plugins/wikipedia/src/org/wikipedia/WikipediaApp.java =================================================================== --- applications/editors/josm/plugins/wikipedia/src/org/wikipedia/WikipediaApp.java (revision 30099) +++ applications/editors/josm/plugins/wikipedia/src/org/wikipedia/WikipediaApp.java (revision 30100) @@ -251,5 +251,5 @@ static class WikipediaEntry implements Comparable { - final String name, description; + final String name; final String wikipediaLang, wikipediaArticle; final LatLon coordinate; @@ -258,10 +258,9 @@ public WikipediaEntry(String name, String description, LatLon coordinate) { this.name = name; - this.description = description; this.coordinate = coordinate; - final WikipediaLangArticle wp = WikipediaLangArticle.parseFromUrl(getHrefFromDescription()); + final WikipediaLangArticle wp = WikipediaLangArticle.parseFromUrl(getHrefFromDescription(description)); if (wp == null) { - System.err.println("Could not extract Wikipedia tag from: " + getHrefFromDescription()); + System.err.println("Could not extract Wikipedia tag from: " + getHrefFromDescription(description)); } this.wikipediaLang = wp == null ? null : wp.lang; @@ -271,5 +270,4 @@ public WikipediaEntry(String name, String wikipediaLang, String wikipediaArticle) { this.name = name; - this.description = null; this.wikipediaLang = wikipediaLang; this.wikipediaArticle = wikipediaArticle; @@ -277,5 +275,5 @@ } - protected final String getHrefFromDescription() { + protected final String getHrefFromDescription(final String description) { if (description == null) { return null; @@ -316,10 +314,6 @@ public String getBrowserUrl() { - if (getHrefFromDescription() != null) { - return getHrefFromDescription().replace(" ", "_"); - } else { - return "http://" + wikipediaLang + ".wikipedia.org/wiki/" - + encodeURL(wikipediaArticle.replace(" ", "_")); - } + return "http://" + wikipediaLang + ".wikipedia.org/wiki/" + + encodeURL(wikipediaArticle.replace(" ", "_")); } Index: applications/editors/josm/plugins/wikipedia/src/org/wikipedia/WikipediaToggleDialog.java =================================================================== --- applications/editors/josm/plugins/wikipedia/src/org/wikipedia/WikipediaToggleDialog.java (revision 30099) +++ applications/editors/josm/plugins/wikipedia/src/org/wikipedia/WikipediaToggleDialog.java (revision 30100) @@ -96,7 +96,4 @@ label.setToolTipText(tr("Not linked yet")); } - if (entry.description != null) { - label.setToolTipText("" + entry.description + ""); - } return label; }