Changeset 13332 in osm for applications/editors/josm/plugins/validator

Timestamp:

2009-01-23T22:36:04+01:00 (17 years ago)

Author:

stoecker

Message:

fixes for new plugin handling

Location:

applications/editors/josm/plugins/validator

Files:

• build.xml (modified) (4 diffs)
• src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/validator/util/Util.java (modified) (1 diff)

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

@@ -1 +1 @@
 <project name="validator" default="dist" basedir=".">
-<!-- compilation properties -->
-    <property name="josm.build.dir"   value="../../core"/>
-    <property name="josm.home.dir"    value="${user.home}/.josm"/>
-    <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"/>
-<!-- point to your JOSM directory -->
-    <property name="josm" location="../../core/dist/josm-custom.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">
@@ -15 +10 @@
     <target name="compile" depends="init">
         <echo message="creating ${plugin.jar}"/>
-        <javac srcdir="src" classpath="${josm}" destdir="build" debug="true" encoding="UTF-8">
+        <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}" encoding="UTF-8">
+            <compilerarg value="-Xlint:deprecation"/>
+            <compilerarg value="-Xlint:unchecked"/>
             <include name="**/*.java" />
         </javac>
     </target>
-    <target name="dist" depends="clean, compile">
-        <copy todir="build/images">
+    <target name="dist" depends="compile">
+        <copy todir="${plugin.build.dir}/images">
             <fileset dir="images"/>
         </copy>
@@ -31 +28 @@
         <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
         <delete file="REVISION"/>
-        <jar destfile="${plugin.jar}" basedir="build">
+        <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
             <manifest>
                 <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.validator.OSMValidatorPlugin"/>
@@ -42 +39 @@
         </jar>
     </target>
-<!-- clean target -->
     <target name="clean">
         <delete dir="${plugin.build.dir}" />
         <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"></java>
-    </target>
 </project>

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java

@@ -16 +16 @@
 import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
 import org.openstreetmap.josm.plugins.validator.util.Util;
-import org.openstreetmap.josm.plugins.validator.util.Util.Version;
 import org.openstreetmap.josm.tools.GBC;
 
@@ -89 +88 @@
         testPane.setBorder(null);
 
-        Version ver = Util.getVersion();
         String description = tr("An OSM data validator that checks for common errors made by users and editor programs.");
-        if( ver != null )
-            description += "<br>" + tr("Version {0} - Last change at {1}", ver.revision, ver.time);
         JPanel tab = gui.createPreferenceTab("validator", tr("Data validator"), description);
         tab.add(testPane, GBC.eol().fill(GBC.BOTH));

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/Util.java

@@ -30 +30 @@
     {
         return Main.pref.getPreferencesDir() + "plugins/validator/";
-    }
-
-    /**
-     * Returns the version
-     * @return The version of the application
-     */
-    public static Version getVersion()
-    {
-        PluginInformation info = PluginInformation.getLoaded("validator");
-        if( info == null )
-            return null;
-
-        return new Version(info.version, info.attr.get("Plugin-Date"));
-    }
-
-    /**
-     * Utility class for displaying versions
-     *
-     * @author frsantos
-     */
-    public static class Version
-    {
-        /** The revision */
-        public String revision;
-        /** The build time */
-        public String time;
-
-        /**
-         * Constructor
-         * @param revision
-         * @param time
-         */
-        public Version(String revision, String time)
-        {
-            this.revision = revision;
-            this.time = time;
-        }
     }