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

Timestamp:

2014-01-03T19:32:18+01:00 (10 years ago)

Author:

Don-vip

Message:

fix compilation warnings + minor code refactorization

Location:

trunk/src/org/openstreetmap/josm/gui/layer

Files:

• gpx/ImportAudioAction.java (modified) (3 diffs)
• markerlayer/Marker.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/gpx/ImportAudioAction.java

@@ -7 +7 @@
 import java.awt.event.ActionEvent;
 import java.io.File;
-import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
@@ -32 +31 @@
 import org.openstreetmap.josm.tools.AudioUtil;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -125 +125 @@
      */
     private void importAudio(File wavFile, MarkerLayer ml, double firstStartTime, Markers markers) {
-        URL url = null;
+        URL url = Utils.fileToURL(wavFile);
         boolean hasTracks = layer.data.tracks != null && !layer.data.tracks.isEmpty();
         boolean hasWaypoints = layer.data.waypoints != null && !layer.data.waypoints.isEmpty();
-        try {
-            url = wavFile.toURI().toURL();
-        } catch (MalformedURLException e) {
-            Main.error("Unable to convert filename " + wavFile.getAbsolutePath() + " to URL");
-        }
         Collection<WayPoint> waypoints = new ArrayList<WayPoint>();
         boolean timedMarkersOmitted = false;
         boolean untimedMarkersOmitted = false;
-        double snapDistance = Main.pref.getDouble("marker.audiofromuntimedwaypoints.distance", 1.0e-3); /*
-         * about
-         * 25
-         * m
-         */
+        double snapDistance = Main.pref.getDouble("marker.audiofromuntimedwaypoints.distance", 1.0e-3); 
+        // about 25 m
         WayPoint wayPointFromTimeStamp = null;
 

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

@@ -39 +39 @@
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Utils;
 import org.openstreetmap.josm.tools.template_engine.ParseError;
 import org.openstreetmap.josm.tools.template_engine.TemplateEngineDataProvider;
@@ -210 +211 @@
                         // Try a relative file:// url, if the link is not in an URL-compatible form
                         if (relativePath != null) {
-                            try {
-                                url = new File(relativePath.getParentFile(), uri).toURI().toURL();
-                            } catch (MalformedURLException e1) {
-                                Main.warn("Unable to convert uri {0} to URL: {1}", uri, e1.getMessage());
-                            }
+                            url = Utils.fileToURL(new File(relativePath.getParentFile(), uri));
                         }
                     }