Changeset 223 in josm for src/org

Timestamp:

2007-04-28T12:02:51+02:00 (17 years ago)

Author:

imi

Message:

• fixed valid URL detection in MarkerLayer (removed com.sun.* stuff)

File:

• src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java (modified) (4 diffs)

src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java

@@ -6 +6 @@
 import java.awt.event.ActionListener;
 import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.HashMap;
 import java.util.LinkedList;
@@ -17 +19 @@
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.tools.ImageProvider;
-
-import com.sun.org.apache.xerces.internal.util.URI;
 
 /**
@@ -75 +75 @@
 
                                 // Try a relative file:// url, if the link is not in an URL-compatible form
-                                if (relativePath != null && link != null && !URI.isWellFormedAddress(link))
+                                if (relativePath != null && link != null && !isWellFormedAddress(link))
                                         link = new File(relativePath, link).toURI().toString();
 
@@ -87 +87 @@
                                         return WebMarker.create(ll, link);
                         }
+
+                        private boolean isWellFormedAddress(String link) {
+                                try {
+                                        new URL(link);
+                                        return true;
+                                } catch (MalformedURLException x) {
+                                        return false;
+                                }
+            }
                 });
         }