Changeset 5502 in josm for trunk/src/org/openstreetmap/josm/gui/layer

Timestamp:

2012-09-07T22:18:59+02:00 (12 years ago)

Author:

Don-vip

Message:

fix some compilation warnings

File:

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

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

@@ -25 +25 @@
 import javax.swing.JCheckBoxMenuItem;
 import javax.swing.JOptionPane;
-import javax.swing.SwingUtilities;
 
 import org.openstreetmap.josm.Main;
@@ -87 +86 @@
             if (firstTime < 0 && wpt_has_link) {
                 firstTime = time;
-                for (GpxLink oneLink : (Collection<GpxLink>) wpt.attr.get(GpxData.META_LINKS)) {
-                    lastLinkedFile = oneLink.uri;
-                    break;
+                for (Object oneLink : wpt.getCollection(GpxData.META_LINKS)) {
+                    if (oneLink instanceof GpxLink) {
+                        lastLinkedFile = ((GpxLink)oneLink).uri;
+                        break;
+                    }
                 }
             }
             if (wpt_has_link) {
-                for (GpxLink oneLink : (Collection<GpxLink>) wpt.attr.get(GpxData.META_LINKS)) {
-                    if (!oneLink.uri.equals(lastLinkedFile)) {
-                        firstTime = time;
+                for (Object oneLink : wpt.getCollection(GpxData.META_LINKS)) {
+                    if (oneLink instanceof GpxLink) {
+                        String uri = ((GpxLink)oneLink).uri;
+                        if (!uri.equals(lastLinkedFile)) {
+                            firstTime = time;
+                        }
+                        lastLinkedFile = uri;
+                        break;
                     }
-                    lastLinkedFile = oneLink.uri;
-                    break;
                 }
             }