Changeset 29711 in osm for applications/editors


Ignore:
Timestamp:
2013-06-26T22:50:08+02:00 (11 years ago)
Author:
donvip
Message:

[josm_poly] Update to JOSM 6031

Location:
applications/editors/josm/plugins/poly
Files:
4 added
2 edited

Legend:

Unmodified
Added
Removed

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

    r29435 r29711  
    11<?xml version="1.0" encoding="utf-8"?>
    2 <!--
    3 ** This is a template build file for the PBF 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 you default plugin directory) run
    16 **
    17 **    > ant  install
    18 **
    19 ** The generated plugin jar is not automatically available in JOSMs plugin configuration
    20 ** dialog. You have to check it in first.
    21 **
    22 ** Use the ant target 'publish' to check in the plugin and make it available to other
    23 ** JOSM users:
    24 **    set the properties commit.message and plugin.main.version
    25 ** and run
    26 **    > ant  publish
    27 **
    28 **
    29 -->
    302<project name="poly" default="dist" basedir=".">
     3   
    314    <!-- enter the SVN commit message -->
    325    <property name="commit.message" value="Commit message"/>
    336    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    34     <property name="plugin.main.version" value="4523"/>
    35     <!-- should not be necessary to change the following properties -->
    36     <property name="josm" location="../../core/dist/josm-custom.jar"/>
    37     <property name="plugin.build.dir" value="build"/>
    38     <property name="plugin.src.dir" value="src"/>
    39     <!-- this is the directory where the plugin jar is copied to -->
    40     <property name="plugin.dist.dir" value="../../dist"/>
    41     <property name="ant.build.javac.source" value="1.6"/>
    42     <property name="ant.build.javac.target" value="1.6"/>
    43     <property name="plugin.dist.dir" value="../../dist"/>
    44     <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/>
    45     <!--
    46     **********************************************************
    47     ** init - initializes the build
    48     **********************************************************
     7    <property name="plugin.main.version" value="6031"/>
     8
     9    <!-- Configure these properties (replace "..." accordingly).
     10         See http://josm.openstreetmap.de/wiki/DevelopersGuide/DevelopingPlugins
    4911    -->
    50     <target name="init">
    51         <mkdir dir="${plugin.build.dir}"/>
    52     </target>
    53     <!--
    54     **********************************************************
    55     ** compile - complies the source tree
    56     **********************************************************
    57     -->
    58     <target name="compile" depends="init">
    59         <echo message="compiling sources for  ${plugin.jar} ... "/>
    60         <javac classpath="${josm}" debug="true" destdir="${plugin.build.dir}" includeAntRuntime="false">
    61             <compilerarg value="-Xlint:deprecation"/>
    62             <compilerarg value="-Xlint:unchecked"/>
    63                 <src path="src" />
    64         </javac>
    65     </target>
    66     <!--
    67     **********************************************************
    68     ** dist - creates the plugin jar
    69     **********************************************************
    70     -->
    71     <target name="dist" depends="compile,revision">
    72         <echo message="creating ${ant.project.name}.jar ... "/>
    73         <copy todir="${plugin.build.dir}/resources">
    74             <fileset dir="resources"/>
    75         </copy>
    76         <copy todir="${plugin.build.dir}/images">
    77             <fileset dir="images"/>
    78         </copy>
    79         <copy todir="${plugin.build.dir}/data">
    80             <fileset dir="data"/>
    81         </copy>
    82         <copy todir="${plugin.build.dir}">
    83             <fileset dir=".">
    84                 <include name="README"/>
    85                 <include name="gpl-3.0.txt"/>
    86             </fileset>
    87         </copy>
    88         <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
    89             <!--
    90             ************************************************
    91             ** configure these properties. Most of them will be copied to the plugins
    92             ** manifest file. Property values will also show up in the list available
    93             ** plugins: http://josm.openstreetmap.de/wiki/Plugins.
    94             **
    95             ************************************************
    96             -->
    97             <manifest>
    98                 <attribute name="Author" value="Zverik"/>
    99                 <attribute name="Plugin-Class" value="poly.PolyPlugin"/>
    100                 <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
    101                 <attribute name="Plugin-Description" value="Read and write osmosis poly filter files"/>
    102                 <attribute name="Plugin-Early" value="false"/>
    103                 <!--<attribute name="Plugin-Icon" value="images/pbf_24.png"/>-->
    104                 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/wiki/Osmosis/Polygon_Filter_File_Format"/>
    105                 <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
    106                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
    107             </manifest>
    108         </jar>
    109     </target>
    110     <!--
    111     **********************************************************
    112     ** revision - extracts the current revision number for the
    113     **    file build.number and stores it in the XML property
    114     **    version.*
    115     **********************************************************
    116     -->
    117     <target name="revision">
    118         <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
    119             <env key="LANG" value="C"/>
    120             <arg value="info"/>
    121             <arg value="--xml"/>
    122             <arg value="."/>
    123         </exec>
    124         <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
    125         <delete file="REVISION"/>
    126     </target>
    127     <!--
    128     **********************************************************
    129     ** clean - clean up the build environment
    130     **********************************************************
    131     -->
    132     <target name="clean">
    133         <delete dir="${plugin.build.dir}"/>
    134         <delete file="${plugin.jar}"/>
    135     </target>
    136     <!--
    137     **********************************************************
    138     ** install - install the plugin in your local JOSM installation
    139     **********************************************************
    140     -->
    141     <target name="install" depends="dist">
    142         <property environment="env"/>
    143         <condition property="josm.plugins.dir" value="${env.APPDATA}/JOSM/plugins" else="${user.home}/.josm/plugins">
    144             <and>
    145                 <os family="windows"/>
    146             </and>
    147         </condition>
    148         <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
    149     </target>
    150     <!--
    151     ************************** Publishing the plugin ***********************************
    152     -->
    153     <!--
    154     ** extracts the JOSM release for the JOSM version in ../core and saves it in the
    155     ** property ${coreversion.info.entry.revision}
    156     -->
    157     <target name="core-info">
    158         <exec append="false" output="core.info.xml" executable="svn" failifexecutionfails="false">
    159             <env key="LANG" value="C"/>
    160             <arg value="info"/>
    161             <arg value="--xml"/>
    162             <arg value="../../core"/>
    163         </exec>
    164         <xmlproperty file="core.info.xml" prefix="coreversion" keepRoot="true" collapseAttributes="true"/>
    165         <echo>Building against core revision ${coreversion.info.entry.revision}.</echo>
    166         <echo>Plugin-Mainversion is set to ${plugin.main.version}.</echo>
    167         <delete file="core.info.xml"/>
    168     </target>
    169     <!-- commits the source tree for this plugin -->
    170     <target name="commit-current">
    171         <echo>Commiting the plugin source with message '${commit.message}' ...</echo>
    172         <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
    173             <env key="LANG" value="C"/>
    174             <arg value="commit"/>
    175             <arg value="-m '${commit.message}'"/>
    176             <arg value="."/>
    177         </exec>
    178     </target>
    179     <!-- updates (svn up) the source tree for this plugin -->
    180     <target name="update-current">
    181         <echo>Updating plugin source ...</echo>
    182         <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
    183             <env key="LANG" value="C"/>
    184             <arg value="up"/>
    185             <arg value="."/>
    186         </exec>
    187         <echo>Updating ${plugin.jar} ...</echo>
    188         <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
    189             <env key="LANG" value="C"/>
    190             <arg value="up"/>
    191             <arg value="../dist/${plugin.jar}"/>
    192         </exec>
    193     </target>
    194     <!-- commits the plugin.jar -->
    195     <target name="commit-dist">
    196         <echo>
    197     ***** Properties of published ${plugin.jar} *****
    198     Commit message    : '${commit.message}'                   
    199     Plugin-Mainversion: ${plugin.main.version}
    200     JOSM build version: ${coreversion.info.entry.revision}
    201     Plugin-Version    : ${version.entry.commit.revision}
    202     ***** / Properties of published ${plugin.jar} *****                   
    203                        
    204     Now commiting ${plugin.jar} ...
    205     </echo>
    206         <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
    207             <env key="LANG" value="C"/>
    208             <arg value="-m '${commit.message}'"/>
    209             <arg value="commit"/>
    210             <arg value="${plugin.jar}"/>
    211         </exec>
    212     </target>
    213     <!-- make sure svn is present as a command line tool -->
    214     <target name="ensure-svn-present">
    215         <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false" failonerror="false" resultproperty="svn.exit.code">
    216             <env key="LANG" value="C"/>
    217             <arg value="--version"/>
    218         </exec>
    219         <fail message="Fatal: command 'svn --version' failed. Please make sure svn is installed on your system.">
    220             <!-- return code not set at all? Most likely svn isn't installed -->
    221             <condition>
    222                 <not>
    223                     <isset property="svn.exit.code"/>
    224                 </not>
    225             </condition>
    226         </fail>
    227         <fail message="Fatal: command 'svn --version' failed. Please make sure a working copy of svn is installed on your system.">
    228             <!-- error code from SVN? Most likely svn is not what we are looking on this system -->
    229             <condition>
    230                 <isfailure code="${svn.exit.code}"/>
    231             </condition>
    232         </fail>
    233     </target>
    234     <target name="publish" depends="ensure-svn-present,core-info,commit-current,update-current,clean,dist,commit-dist">
    235     </target>
     12    <property name="plugin.author" value="Zverik"/>
     13    <property name="plugin.class" value="poly.PolyPlugin"/>
     14    <property name="plugin.description" value="Read and write osmosis poly filter files"/>
     15    <!--<property name="plugin.icon" value="images/..."/>-->
     16    <property name="plugin.link" value="http://wiki.openstreetmap.org/wiki/Osmosis/Polygon_Filter_File_Format"/>
     17    <!--<property name="plugin.early" value="..."/>-->
     18    <!--<property name="plugin.requires" value="..."/>-->
     19    <!--<property name="plugin.stage" value="..."/>-->
     20
     21    <!-- ** include targets that all plugins have in common ** -->
     22    <import file="../build-common.xml"/>
    23623</project>

  • applications/editors/josm/plugins/poly/src/poly/DownloadPolyTask.java

    r28570 r29711  
    3030
    3131    @Override
    32     public boolean acceptsUrl( String url ) {
    33         return url != null && url.matches("http://.*/.*\\.poly");
     32    public String[] getPatterns() {
     33        return new String[]{"http://.*/.*\\.poly"};
    3434    }
    35    
     35
     36    @Override
     37    public String getTitle() {
     38        return tr("Download Osmosis poly");
     39    }
     40
    3641    public class ServerPolyReader extends OsmServerReader {
    3742        private String url;
Note: See TracChangeset for help on using the changeset viewer.