X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=tim%2Fprune%2Fgui%2Fmap%2FMapSource.java;h=c4e294665e128def7d1fcbfb048cb516624d5d00;hb=2d8cb72e84d5cc1089ce77baf1e34ea3ea2f8465;hp=d838ef34d99d47a7f7fe524b8a63e87cf98609b6;hpb=4d5796d02a15808311c09448d79e6e7d1de9d636;p=GpsPrune.git diff --git a/tim/prune/gui/map/MapSource.java b/tim/prune/gui/map/MapSource.java index d838ef3..c4e2946 100644 --- a/tim/prune/gui/map/MapSource.java +++ b/tim/prune/gui/map/MapSource.java @@ -84,11 +84,19 @@ public abstract class MapSource { if (inUrl == null || inUrl.equals("")) {return null;} String urlstr = inUrl; + boolean urlOk = false; + // check prefix - try { - new URL(urlstr.replace('[', 'w').replace(']', 'w')); + try + { + urlOk = new URL(urlstr.replace('[', 'w').replace(']', 'w')).toString() != null; } catch (MalformedURLException e) + { + urlOk = false; + } + + if (!urlOk) { // fail if protocol specified if (urlstr.indexOf("://") >= 0) {return null;} @@ -100,7 +108,8 @@ public abstract class MapSource urlstr = urlstr + "/"; } // Validate current url, return null if not ok - try { + try + { URL url = new URL(urlstr.replace('[', 'w').replace(']', 'w')); // url host must contain a dot if (url.getHost().indexOf('.') < 0) {return null;}