Changeset 13313 in osm for applications/editors/josm

Timestamp:

2009-01-22T17:07:55+01:00 (16 years ago)

Author:

stoecker

Message:

removed wrong version stuff

Location:

applications/editors/josm/plugins/remotecontrol

Files:

• build.xml (modified) (4 diffs)
• src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/remotecontrol/Util.java (deleted)

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

@@ -1 +1 @@
 <project name="remotecontrol" default="dist" basedir=".">
-<!-- compilation properties -->
-    <property name="josm.build.dir"   value="../../core"/>
-    <property name="josm.home.dir"    value="${user.home}/.josm"/>
-    <property name="josm"         location="../../core/dist/josm-custom.jar" />
-    <property name="plugin.build.dir" value="build"/>
-    <property name="plugin.dist.dir"  value="../../dist"/>
-    <property name="plugin.name"      value="${ant.project.name}"/>
-    <property name="plugin.jar"       value="../../dist/${plugin.name}.jar"/>
+    <property name="josm"                   location="../../core/dist/josm-custom.jar" />
+    <property name="plugin.dist.dir"        value="../../dist"/>
+    <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">
@@ -14 +10 @@
     <target name="compile" depends="init">
         <echo message="creating ${plugin.jar}"/>
-        <javac srcdir="src" classpath="${josm}" destdir="build" debug="true">
+        <javac srcdir="src" classpath="${josm}" debug="true" destdir="build">
+            <compilerarg value="-Xlint:deprecation"/>
+            <compilerarg value="-Xlint:unchecked"/>
             <include name="**/*.java" />
         </javac>
     </target>
     <target name="dist" depends="compile">
-        <copy todir="${plugin.build.dir}/images">
-            <fileset dir="images"/>
+        <copy todir="${plugin.build.dir}/images" >
+            <fileset dir="images" />
         </copy>
         <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
@@ -33 +31 @@
             <manifest>
                 <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.remotecontrol.RemoteControlPlugin"/>
+                <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
+                <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
                 <attribute name="Plugin-Description" value="A plugin allowing other applications to send commands to JOSM." />
-                <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
                 <attribute name="Plugin-Mainversion" value="1180"/>
-                <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
                 <attribute name="Author" value="Frederik Ramm &lt;frederik@remote.org&gt;"/>
             </manifest>
@@ -45 +43 @@
         <delete file="${plugin.jar}" />
     </target>
-    <target name="install" depends="dist">
-        <copy file="${plugin.jar}" todir="${user.home}/.josm/plugins"/>
-    </target>
-    <target name="test" depends="install">
-        <java jar="${josm}" fork="true"/>
-    </target>
 </project>

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

@@ -12 +12 @@
 import org.openstreetmap.josm.gui.preferences.PreferenceDialog;
 import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
-import org.openstreetmap.josm.plugins.remotecontrol.Util.Version;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.I18n;
@@ -30 +29 @@
     public void addGui(final PreferenceDialog gui)
     {
-        Version ver = Util.getVersion();
         String description = tr("A plugin that allows JOSM to be controlled from other applications.");
-        if (ver != null)
-            description += "<br><br>" + tr("Version: {0}<br>Last change at {1}", ver.revision, ver.time) + "<br><br>";
         JPanel remote = gui.createPreferenceTab("remotecontrol.gif", tr("Remote Control"), tr("Settings for the Remote Control plugin."));
         remote.add(new JLabel("<html>"+tr("The Remote Control plugin will always listen on port 8111 on localhost." +