Changeset 13617 in josm for trunk

Timestamp:

2018-04-12T01:18:50+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #16180 - make sure changeset dialog example URLs are valid

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java (modified) (5 diffs)
• test/unit/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanelTest.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java

@@ -12 +12 @@
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
 
 import javax.swing.BorderFactory;
@@ -75 +78 @@
     }
 
+    protected static List<String> getExamples() {
+        return Arrays.asList(
+                Main.getOSMWebsite()+"/history?open=true",
+                OsmApi.getOsmApi().getBaseUrl()+"/changesets?open=true");
+    }
+
     protected JPanel buildHelpPanel() {
         String apiUrl = OsmApi.getOsmApi().getBaseUrl();
@@ -83 +92 @@
                 + "<p><strong>" + tr("Examples") + "</strong></p>"
                 + "<ul>"
-                + "<li><a href=\""+Main.getOSMWebsite()+"/history?open=true\">"+Main.getOSMWebsite()+"/history?open=true</a></li>"
-                + "<li><a href=\""+apiUrl+"/changesets?open=true\">"+apiUrl+"/changesets?open=true</a></li>"
+                + String.join("", getExamples().stream().map(
+                        s -> "<li><a href=\""+s+"\">"+s+"</a></li>").collect(Collectors.toList()))
                 + "</ul>"
                 + tr("Note that changeset queries are currently always submitted to ''{0}'', regardless of the "
@@ -121 +130 @@
     }
 
-    protected boolean isValidChangesetQueryUrl(String text) {
+    protected static boolean isValidChangesetQueryUrl(String text) {
         return buildChangesetQuery(text) != null;
     }
 
-    protected ChangesetQuery buildChangesetQuery(String text) {
+    protected static ChangesetQuery buildChangesetQuery(String text) {
         URL url = null;
         try {
@@ -133 +142 @@
         }
         String path = url.getPath();
-        if (path == null || !path.endsWith("/changesets"))
+        if (path == null || (!path.endsWith("/changesets") && !path.endsWith("/history")))
             return null;
 

trunk/test/unit/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanelTest.java

@@ -3 +3 @@
 
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 import org.junit.Rule;
@@ -29 +30 @@
         assertNotNull(new UrlBasedQueryPanel());
     }
+
+    /**
+     * Checks that examples displayed in panel are correct.
+     */
+    @Test
+    public void testExamplesAreCorrect() {
+        for (String example : UrlBasedQueryPanel.getExamples()) {
+            assertTrue(example, UrlBasedQueryPanel.isValidChangesetQueryUrl(example));
+        }
+    }
 }