Changeset 29533 in osm


Ignore:
Timestamp:
2013-04-23T13:31:32+02:00 (12 years ago)
Author:
donvip
Message:

[josm_editgpx] Fix build.xml and some warnings

Location:
applications/editors/josm/plugins/editgpx
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/plugins/editgpx

    • Property svn:ignore

      •  

        old new  
        11build
         2bin

  • applications/editors/josm/plugins/editgpx/.settings/org.eclipse.jdt.core.prefs

    r23659 r29533  
    1 #Sat Oct 16 19:18:33 CEST 2010
    21eclipse.preferences.version=1
     2org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
     3org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
     4org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
     5org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
     6org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
     7org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
     8org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
     9org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
     10org.eclipse.jdt.core.compiler.problem.deadCode=warning
     11org.eclipse.jdt.core.compiler.problem.deprecation=warning
     12org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
     13org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
     14org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
     15org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
     16org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
     17org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
     18org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
     19org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
     20org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
     21org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
     22org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
     23org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
     24org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
     25org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
     26org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
     27org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
     28org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
     29org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
     30org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
     31org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
     32org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
     33org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
     34org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
     35org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
     36org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
     37org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
     38org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
     39org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
     40org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
     41org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
     42org.eclipse.jdt.core.compiler.problem.nullReference=warning
     43org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
     44org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
     45org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
     46org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
     47org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
     48org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
     49org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
     50org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
     51org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
     52org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
     53org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
     54org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
     55org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
     56org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
     57org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
     58org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
     59org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
     60org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
     61org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
     62org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
     63org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
     64org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
     65org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
     66org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
     67org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
     68org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
     69org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
     70org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
     71org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
     72org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
     73org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
     74org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
     75org.eclipse.jdt.core.compiler.problem.unusedImport=warning
     76org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
     77org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
     78org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
     79org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
     80org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
     81org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
     82org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
     83org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
     84org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
     85org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
    386org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
    487org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

  • applications/editors/josm/plugins/editgpx/build.xml

    r29435 r29533  
    11<?xml version="1.0" encoding="utf-8"?>
    2 <!--
    3 ** This is the build file for the editgpx plugin
    4 **
    5 ** Maintaining versions
    6 ** ====================
    7 ** see README.template
    8 **
    9 ** Usage
    10 ** =====
    11 ** To build it run
    12 **
    13 **    > ant  dist
    14 **
    15 ** To install the generated plugin locally (in your default plugin directory) run
    16 **
    17 **    > ant  install
    18 **
    19 ** To build against the core in ../../core, create a correct manifest and deploy to
    20 ** SVN,
    21 **    set the properties commit.message and plugin.main.version
    22 ** and run
    23 **    > ant  publish
    24 **
    25 **
    26 -->
    272<project name="editgpx" default="dist" basedir=".">
     3    <!-- enter the SVN commit message -->
    284    <property name="commit.message" value="Changed constructor signature of plugin main class"/>
     5    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    296    <property name="plugin.main.version" value="5035"/>
    30     <property name="josm" location="../../core/dist/josm-custom.jar"/>
    31     <property name="plugin.dist.dir" value="../../dist"/>
    32     <property name="plugin.build.dir" value="build"/>
    33     <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/>
    34     <property name="ant.build.javac.target" value="1.5"/>
    35     <target name="init">
    36         <mkdir dir="${plugin.build.dir}"/>
    37     </target>
    38     <target name="compile" depends="init">
    39         <echo message="creating ${plugin.jar}"/>
    40         <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}">
    41             <compilerarg value="-Xlint:deprecation"/>
    42             <compilerarg value="-Xlint:unchecked"/>
    43         </javac>
    44     </target>
    45     <target name="dist" depends="compile,revision">
    46         <copy todir="${plugin.build.dir}/images">
    47             <fileset dir="images"/>
    48         </copy>
    49         <copy todir="${plugin.build.dir}/data">
    50             <fileset dir="data"/>
    51         </copy>
    52         <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
    53             <manifest>
    54                 <attribute name="Author" value="Martin Garbe"/>
    55                 <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.editgpx.EditGpxPlugin"/>
    56                 <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
    57                 <attribute name="Plugin-Description" value="Allows the user to anonymize timestamps and delete parts of huge GPX tracks very fast."/>
    58                 <attribute name="Plugin-Icon" value="images/mapmode/editgpx_mode.png"/>
    59                 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/EditGpx"/>
    60                 <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
    61                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
    62             </manifest>
    63         </jar>
    64     </target>
    65     <target name="revision">
    66         <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
    67             <env key="LANG" value="C"/>
    68             <arg value="info"/>
    69             <arg value="--xml"/>
    70             <arg value="."/>
    71         </exec>
    72         <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
    73         <delete file="REVISION"/>
    74     </target>
    75     <target name="clean">
    76         <delete dir="${plugin.build.dir}"/>
    77         <delete file="${plugin.jar}"/>
    78     </target>
    79     <target name="install" depends="dist">
    80         <property environment="env"/>
    81         <condition property="josm.plugins.dir" value="${env.APPDATA}/JOSM/plugins" else="${user.home}/.josm/plugins">
    82             <and>
    83                 <os family="windows"/>
    84             </and>
    85         </condition>
    86         <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
    87     </target>
    88     <!--
    89      ************************** Publishing the plugin ***********************************
     7   
     8    <!-- Configure these properties (replace "..." accordingly).
     9         See http://josm.openstreetmap.de/wiki/DevelopersGuide/DevelopingPlugins
    9010    -->
    91     <!--
    92     ** extracts the JOSM release for the JOSM version in ../core and saves it in the
    93     ** property ${coreversion.info.entry.revision}
    94     **
    95     -->
    96     <target name="core-info">
    97         <exec append="false" output="core.info.xml" executable="svn" failifexecutionfails="false">
    98             <env key="LANG" value="C"/>
    99             <arg value="info"/>
    100             <arg value="--xml"/>
    101             <!-- <arg value="../../core"/>-->
    102             <arg value="../JOSM"/>
    103         </exec>
    104         <xmlproperty file="core.info.xml" prefix="coreversion" keepRoot="true" collapseAttributes="true"/>
    105         <echo>Building against core revision ${coreversion.info.entry.revision}.</echo>
    106         <echo>Plugin-Mainversion is set to ${plugin.main.version}.</echo>
    107         <delete file="core.info.xml"/>
    108     </target>
    109     <!--
    110     ** commits the source tree for this plugin
    111     -->
    112     <target name="commit-current">
    113         <echo>Commiting the plugin source with message '${commit.message}' ...</echo>
    114         <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
    115             <env key="LANG" value="C"/>
    116             <arg value="commit"/>
    117             <arg value="-m '${commit.message}'"/>
    118             <arg value="."/>
    119         </exec>
    120     </target>
    121     <!--
    122     ** updates (svn up) the source tree for this plugin
    123     -->
    124     <target name="update-current">
    125         <echo>Updating plugin source ...</echo>
    126         <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
    127             <env key="LANG" value="C"/>
    128             <arg value="up"/>
    129             <arg value="."/>
    130         </exec>
    131         <echo>Updating ${plugin.jar} ...</echo>
    132         <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
    133             <env key="LANG" value="C"/>
    134             <arg value="up"/>
    135             <arg value="../dist/${plugin.jar}"/>
    136         </exec>
    137     </target>
    138     <!--
    139     ** commits the plugin.jar
    140     -->
    141     <target name="commit-dist">
    142         <echo>
    143 ***** Properties of published ${plugin.jar} *****
    144 Commit message    : '${commit.message}'
    145 Plugin-Mainversion: ${plugin.main.version}
    146 JOSM build version: ${coreversion.info.entry.revision}
    147 Plugin-Version    : ${version.entry.commit.revision}
    148 ***** / Properties of published ${plugin.jar} *****
     11    <property name="plugin.author" value="Martin Garbe"/>
     12    <property name="plugin.class" value="org.openstreetmap.josm.plugins.editgpx.EditGpxPlugin"/>
     13    <property name="plugin.description" value="Allows the user to anonymize timestamps and delete parts of huge GPX tracks very fast."/>
     14    <property name="plugin.icon" value="images/mapmode/editgpx_mode.png"/>
     15    <property name="plugin.link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/EditGpx"/>
    14916
    150 Now commiting ${plugin.jar} ...
    151 </echo>
    152         <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
    153             <env key="LANG" value="C"/>
    154             <arg value="-m '${commit.message}'"/>
    155             <arg value="commit"/>
    156             <arg value="${plugin.jar}"/>
    157         </exec>
    158     </target>
    159     <!-- ** make sure svn is present as a command line tool ** -->
    160     <target name="ensure-svn-present">
    161         <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false" failonerror="false" resultproperty="svn.exit.code">
    162             <env key="LANG" value="C"/>
    163             <arg value="--version"/>
    164         </exec>
    165         <fail message="Fatal: command 'svn --version' failed. Please make sure svn is installed on your system.">
    166             <!-- return code not set at all? Most likely svn isn't installed -->
    167             <condition>
    168                 <not>
    169                     <isset property="svn.exit.code"/>
    170                 </not>
    171             </condition>
    172         </fail>
    173         <fail message="Fatal: command 'svn --version' failed. Please make sure a working copy of svn is installed on your system.">
    174             <!-- error code from SVN? Most likely svn is not what we are looking on this system -->
    175             <condition>
    176                 <isfailure code="${svn.exit.code}"/>
    177             </condition>
    178         </fail>
    179     </target>
    180     <target name="publish" depends="ensure-svn-present,core-info,commit-current,update-current,clean,dist,commit-dist">
    181     </target>
     17    <!-- ** include targets that all plugins have in common ** -->
     18    <import file="../build-common.xml"/>
    18219</project>

  • applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java

    r29531 r29533  
    140140    }
    141141
    142     //context item "Convert to GPX layer"
     142    /**
     143     * Context item "Convert to GPX layer"
     144     */
    143145    public class ConvertToGpxLayerAction extends AbstractAction {
    144146        public ConvertToGpxLayerAction() {
    … …  
    157159    }
    158160
    159     //context item "Convert to GPX layer with anonymised time"
     161    /**
     162     * Context item "Convert to GPX layer with anonymised time"
     163     */
    160164    public class ConvertToAnonTimeGpxLayerAction extends AbstractAction {
    161165        public ConvertToAnonTimeGpxLayerAction() {
Note: See TracChangeset for help on using the changeset viewer.