Changeset 26471 in osm for applications

Timestamp:

2011-08-07T12:01:15+02:00 (13 years ago)

Author:

jttt

Message:

Adapt to latest josm

Location:

applications/editors/josm/plugins/gpxfilter

Files:

• build.xml (modified) (3 diffs)
• src/gpxfilter/EGpxLayer.java (modified) (4 diffs)

applications/editors/josm/plugins/gpxfilter/build.xml

@@ -32 +32 @@
     <property name="commit.message" value="Commit message"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="3835"/>
+    <property name="plugin.main.version" value="4282"/>
     <!--
       ************************************************
@@ -148 +148 @@
     </target>
     <!--
-    ************************** Publishing the plugin *********************************** 
-    -->
-    <!--
-        ** extracts the JOSM release for the JOSM version in ../core and saves it in the 
+    ************************** Publishing the plugin ***********************************
+    -->
+    <!--
+        ** extracts the JOSM release for the JOSM version in ../core and saves it in the
         ** property ${coreversion.info.entry.revision}
         **
@@ -197 +197 @@
     </target>
     <!--
-        ** commits the plugin.jar 
+        ** commits the plugin.jar
         -->
     <target name="commit-dist">
         <echo>
     ***** Properties of published ${plugin.jar} *****
-    Commit message    : '${commit.message}'                    
+    Commit message    : '${commit.message}'
     Plugin-Mainversion: ${plugin.main.version}
     JOSM build version: ${coreversion.info.entry.revision}
     Plugin-Version    : ${version.entry.commit.revision}
-    ***** / Properties of published ${plugin.jar} *****                    
-                        
+    ***** / Properties of published ${plugin.jar} *****
+
     Now commiting ${plugin.jar} ...
     </echo>

applications/editors/josm/plugins/gpxfilter/src/gpxfilter/EGpxLayer.java

@@ -18 +18 @@
 import java.awt.geom.Rectangle2D;
 import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.text.DateFormat;
 import java.util.ArrayList;
@@ -123 +125 @@
                         data.mergeFrom(newData);
                     }
-                    
+
                     if (!EGpxLayer.this.painting) {
                         Main.map.repaint();
@@ -934 +936 @@
      */
     private void importAudio(File wavFile, MarkerLayer ml, double firstStartTime, Markers markers) {
-        String uri = "file:".concat(wavFile.getAbsolutePath());
+        URL url = null;
+        try {
+            url = wavFile.toURI().toURL();
+        } catch (MalformedURLException e) {
+            System.err.println("Unable to convert filename " + wavFile.getAbsolutePath() + " to URL");
+        }
         Collection<WayPoint> waypoints = new ArrayList<WayPoint>();
         boolean timedMarkersOmitted = false;
@@ -1103 +1110 @@
             }
             double offset = w.time - firstTime;
-            String name;
-            if (w.attr.containsKey("name")) {
-                name = w.getString("name");
-            } else if (w.attr.containsKey("desc")) {
-                name = w.getString("desc");
-            } else {
-                name = AudioMarker.inventName(offset);
-            }
-            AudioMarker am = AudioMarker.create(w.getCoor(), name, uri, ml, w.time, offset);
+            AudioMarker am = new AudioMarker(w.getCoor(), w, url, ml, w.time, offset);
             /*
              * timeFromAudio intended for future use to shift markers of this type on