From b77c0c55c6972e33cd4ac6bf54ef013088d0e90d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20Sch=C3=A4fer?= <florian@schaeferban.de>
Date: Mon, 2 Jul 2018 14:08:40 +0200
Subject: [PATCH] Name the download options more precisely

---
 src/main/java/org/wikipedia/gui/WikiLayer.java            | 4 +---
 .../java/org/wikipedia/gui/WikipediaToggleDialog.java     | 8 ++++++--
 .../org/wikipedia/validator/WikipediaAgainstWikidata.java | 2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/wikipedia/gui/WikiLayer.java b/src/main/java/org/wikipedia/gui/WikiLayer.java
index 8178d0ed..b0824b83 100644
--- a/src/main/java/org/wikipedia/gui/WikiLayer.java
+++ b/src/main/java/org/wikipedia/gui/WikiLayer.java
@@ -4,13 +4,11 @@
 import java.awt.BasicStroke;
 import java.awt.Color;
 import java.awt.Graphics2D;
-import java.awt.Insets;
 import java.awt.Point;
 import java.awt.RenderingHints;
 import java.awt.geom.Arc2D;
 import java.awt.geom.Ellipse2D;
 import java.awt.geom.Path2D;
-import java.awt.geom.Rectangle2D;
 import java.text.MessageFormat;
 import java.util.Collection;
 import java.util.Collections;
@@ -122,7 +120,7 @@ public void paint(final Graphics2D g, final MapView mv, final Bounds bbox) {
         paintWikiMarkers(g, selectedEntries.stream().map(it -> Collections.singleton(mv.getPoint(it.coordinate))).collect(Collectors.toList()), true);
     }
 
-    private void paintWikiMarkers(final Graphics2D g, final Collection<Collection<Point>> clusters, final boolean selected) {
+    private static void paintWikiMarkers(final Graphics2D g, final Collection<Collection<Point>> clusters, final boolean selected) {
         g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
         g.setRenderingHint(RenderingHints.KEY_ALPHA_INTERPOLATION, RenderingHints.VALUE_ALPHA_INTERPOLATION_QUALITY);
         g.setStroke(new BasicStroke(selected ? 3 : 2));
diff --git a/src/main/java/org/wikipedia/gui/WikipediaToggleDialog.java b/src/main/java/org/wikipedia/gui/WikipediaToggleDialog.java
index b73cb2df..7288c729 100644
--- a/src/main/java/org/wikipedia/gui/WikipediaToggleDialog.java
+++ b/src/main/java/org/wikipedia/gui/WikipediaToggleDialog.java
@@ -165,7 +165,11 @@ class WikipediaLoadCoordinatesAction extends AbstractAction {
         private final boolean wikidata;
 
         WikipediaLoadCoordinatesAction(boolean wikidata) {
-            super(wikidata ? tr("Wikidata") : tr("Coordinates"));
+            super(
+                wikidata
+                ? tr("Wikidata items in viewport")
+                : tr("Wikipedia articles in viewport (for language {0})", WikiProperties.WIKIPEDIA_LANGUAGE.get())
+            );
             this.wikidata = wikidata;
             new ImageProvider("dialogs", wikidata ? "wikidata" : "wikipedia").getResource().attachImageIcon(this, true);
             putValue(SHORT_DESCRIPTION, wikidata
@@ -226,7 +230,7 @@ protected void process(List<WikipediaEntry> chunks) {
     class WikipediaLoadCategoryAction extends AbstractAction {
 
         WikipediaLoadCategoryAction() {
-            super(tr("Category"));
+            super(tr("all Wikipedia articles in Category"));
             new ImageProvider("data", "sequence").getResource().attachImageIcon(this, true);
             putValue(SHORT_DESCRIPTION, tr("Fetches a list of all Wikipedia articles of a category"));
         }
diff --git a/src/main/java/org/wikipedia/validator/WikipediaAgainstWikidata.java b/src/main/java/org/wikipedia/validator/WikipediaAgainstWikidata.java
index d6aaefa4..e9811a28 100644
--- a/src/main/java/org/wikipedia/validator/WikipediaAgainstWikidata.java
+++ b/src/main/java/org/wikipedia/validator/WikipediaAgainstWikidata.java
@@ -104,7 +104,7 @@ private void checkBatch(final String language, final List<TestCompanion> primiti
     }
 
     static class TestCompanion extends BatchProcessedTagTest.TestCompanion {
-        final String language;
+        final String language; // TODO: Use WikipediaSite here to verify a wiki in that language actually exists
         final String title;
         final String qId;
         private TestCompanion(final OsmPrimitive primitive, String language, String title, final String qId) {