Changeset 17858 in osm for applications/editors

Timestamp:

2009-09-30T10:11:08+02:00 (15 years ago)

Author:

vsandre

Message:

• update loadUrl() to be compatible with josm 2215
• minor changes to build.xml

Location:

applications/editors/josm/plugins/remotecontrol

Files:

• build.xml (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java (modified) (1 diff)

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

@@ -4 +4 @@
     <property name="plugin.build.dir"       value="build"/>
     <property name="plugin.jar"             value="${plugin.dist.dir}/${ant.project.name}.jar"/>
-    <property name="ant.build.javac.target" value="1.5"/>
     <target name="init">
         <mkdir dir="${plugin.build.dir}"/>
@@ -10 +9 @@
     <target name="compile" depends="init">
         <echo message="creating ${plugin.jar}"/>
-        <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}">
-            <compilerarg value="-Xlint:deprecation"/>
+        <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}"
+                       target="1.5" source="1.5" encoding="UTF-8">
+                <compilerarg value="-Xlint:deprecation"/>
             <compilerarg value="-Xlint:unchecked"/>
         </javac>
@@ -26 +26 @@
                 <attribute name="Plugin-Description" value="Let other applications send commands to JOSM."/>
                 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/index.php/JOSM/Plugins/RemoteControl"/>
-                <attribute name="Plugin-Mainversion" value="2057"/>
+                <attribute name="Plugin-Mainversion" value="2215"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
             </manifest>

applications/editors/josm/plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java

@@ -255 +255 @@
 
                     DownloadTask osmTask = new DownloadOsmTask();
-                    osmTask.loadUrl(false, URLDecoder.decode(args.get("url"), "UTF-8"));
+                    osmTask.loadUrl(false, URLDecoder.decode(args.get("url"), "UTF-8"), null);
                 } catch (LoadDeniedException ex) {
                     System.out.println("RemoteControl: import forbidden by preferences");