Changeset 4164 in josm for trunk/src

Timestamp:

2011-06-25T00:05:35+02:00 (13 years ago)

Author:

stoecker

Message:

fix #5510 - strip white space and return from WMS/TMS URLs

Location:

trunk/src/org/openstreetmap/josm/gui/preferences

Files:

• AddWMSLayerPanel.java (modified) (2 diffs)
• ImageryPreference.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java

@@ -108 +108 @@
                 try {
                     setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
-                    attemptGetCapabilities(serviceUrlText.getText());
+                    attemptGetCapabilities(sanitize(serviceUrlText.getText()));
                 } finally {
                     setCursor(beforeCursor);
@@ -224 +224 @@
     }
 
+    private String sanitize(String s) {
+        return s.replaceAll("[\r\n]+","").trim();
+    }
+
     private String buildTMSUrl() {
         StringBuilder a = new StringBuilder("tms:");
-        a.append(tmsURL.getText());
+        a.append(sanitize(tmsURL.getText()));
         return a.toString();
     }

trunk/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java

@@ -444 +444 @@
             public NewEntryAction() {
                 putValue(NAME, tr("New"));
-                putValue(SHORT_DESCRIPTION, tr("add a new wms/tms entry by entering the url"));
+                putValue(SHORT_DESCRIPTION, tr("Add a new WMS/TMS entry by entering the URL"));
                 putValue(SMALL_ICON, ImageProvider.get("dialogs", "add"));
             }
@@ -464 +464 @@
             public RemoveEntryAction() {
                 putValue(NAME, tr("Remove"));
-                putValue(SHORT_DESCRIPTION, tr("remove entry"));
+                putValue(SHORT_DESCRIPTION, tr("Remove entry"));
                 putValue(SMALL_ICON, ImageProvider.get("dialogs", "delete"));
                 updateEnabledState();