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

Timestamp:

2013-09-21T01:16:55+02:00 (11 years ago)

Author:

Don-vip

Message:

FindBugs - fix blocker issue (Performance - The equals and hashCode methods of URL are blocking)

File:

• trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java

@@ -15 +15 @@
 import java.awt.event.MouseEvent;
 import java.io.File;
-import java.net.URL;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -274 +275 @@
         double adjustment = AudioPlayer.position() - startMarker.offset; // in seconds
         boolean seenStart = false;
-        URL url = startMarker.url();
-        for (Marker m : data) {
-            if (m == startMarker) {
-                seenStart = true;
-            }
-            if (seenStart) {
-                AudioMarker ma = (AudioMarker) m; // it must be an AudioMarker
-                if (ma.url().equals(url)) {
-                    ma.adjustOffset(adjustment);
-                }
-            }
+        try {
+            URI uri = startMarker.url().toURI();
+            for (Marker m : data) {
+                if (m == startMarker) {
+                    seenStart = true;
+                }
+                if (seenStart && m instanceof AudioMarker) {
+                    AudioMarker ma = (AudioMarker) m;
+                    // Do not ever call URL.equals but use URI.equals instead to avoid Internet connection
+                    // See http://michaelscharf.blogspot.fr/2006/11/javaneturlequals-and-hashcode-make.html for details
+                    if (ma.url().toURI().equals(uri)) {
+                        ma.adjustOffset(adjustment);
+                    }
+                }
+            }
+        } catch (URISyntaxException e) {
+            Main.warn("URISyntaxException: "+e.getMessage());
         }
         return true;