Changeset 10294 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2016-05-29T00:14:28+02:00 (8 years ago)

Author:

Don-vip

Message:

sonar - squid:S1848 - refactor URL checks

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• dialogs/changeset/query/UrlBasedQueryPanel.java (modified) (1 diff)
• preferences/server/OsmApiUrlInputPanel.java (modified) (2 diffs)

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

@@ -134 +134 @@
         }
         String path = url.getPath();
-        String query = url.getQuery();
         if (path == null || !path.endsWith("/changesets"))
             return null;
 
         try {
-            return ChangesetQuery.buildFromUrlQuery(query);
+            return ChangesetQuery.buildFromUrlQuery(url.getQuery());
         } catch (ChangesetQueryUrlException e) {
             Main.warn(e.getMessage());

trunk/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java

@@ -14 +14 @@
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.util.Arrays;
 
@@ -258 +256 @@
             if (getComponent().getText().trim().isEmpty())
                 return false;
-
-            try {
-                new URL(getComponent().getText().trim());
-                return true;
-            } catch (MalformedURLException e) {
-                return false;
-            }
+            return Utils.isValidUrl(getComponent().getText().trim());
         }