Changeset 29035 in osm


Ignore:
Timestamp:
2012-12-05T00:08:18+01:00 (12 years ago)
Author:
donvip
Message:

[josm_terracer] Simplify build.xml + fix warnings

Location:
applications/editors/josm/plugins/terracer
Files:
1 deleted
5 edited

Legend:

Unmodified
Added
Removed

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

    r27852 r29035  
    11<?xml version="1.0" encoding="utf-8"?>
    2 <!--
    3 ** This is a template build file for the terracer 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="terracer" default="dist" basedir=".">
    28     <property name="josm" location="../../core/dist/josm-custom.jar"/>
    29     <property name="plugin.dist.dir" value="../../dist"/>
    30     <property name="plugin.build.dir" value="build"/>
    31     <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/>
    32     <property name="ant.build.javac.target" value="1.5"/>
    333    <property name="commit.message" value="applied #j5760 (patch by robome) - Order of housenumbers not correct"/>
    344    <property name="plugin.main.version" value="4980"/>
    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="Matt Amos"/>
    55                 <attribute name="Plugin-Class" value="terracer.TerracerPlugin"/>
    56                 <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
    57                 <attribute name="Plugin-Description" value="Make terraced houses out of single blocks."/>
    58                 <attribute name="Plugin-Icon" value="images/terrace.png"/>
    59                 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/Terracer"/>
    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 ***********************************
    90         -->
    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         </exec>
    103         <xmlproperty file="core.info.xml" prefix="coreversion" keepRoot="true" collapseAttributes="true"/>
    104         <echo>Building against core revision ${coreversion.info.entry.revision}.</echo>
    105         <echo>Plugin-Mainversion is set to ${plugin.main.version}.</echo>
    106         <delete file="core.info.xml"/>
    107     </target>
    108     <!--
    109              ** commits the source tree for this plugin
    110             -->
    111     <target name="commit-current">
    112         <echo>Commiting the plugin source with message '${commit.message}' ...</echo>
    113         <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
    114             <env key="LANG" value="C"/>
    115             <arg value="commit"/>
    116             <arg value="-m '${commit.message}'"/>
    117             <arg value="."/>
    118         </exec>
    119     </target>
    120     <!--
    121             ** updates (svn up) the source tree for this plugin
    122             -->
    123     <target name="update-current">
    124         <echo>Updating plugin source ...</echo>
    125         <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
    126             <env key="LANG" value="C"/>
    127             <arg value="up"/>
    128             <arg value="."/>
    129         </exec>
    130         <echo>Updating ${plugin.jar} ...</echo>
    131         <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
    132             <env key="LANG" value="C"/>
    133             <arg value="up"/>
    134             <arg value="../dist/${plugin.jar}"/>
    135         </exec>
    136     </target>
    137     <!--
    138              ** commits the plugin.jar
    139              -->
    140     <target name="commit-dist">
    141         <echo>
    142     ***** Properties of published ${plugin.jar} *****
    143     Commit message    : '${commit.message}'
    144     Plugin-Mainversion: ${plugin.main.version}
    145     JOSM build version: ${coreversion.info.entry.revision}
    146     Plugin-Version    : ${version.entry.commit.revision}
    147     ***** / Properties of published ${plugin.jar} *****
    1485
    149     Now commiting ${plugin.jar} ...
    150     </echo>
    151         <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
    152             <env key="LANG" value="C"/>
    153             <arg value="-m '${commit.message}'"/>
    154             <arg value="commit"/>
    155             <arg value="${plugin.jar}"/>
    156         </exec>
    157     </target>
    158     <target name="publish" depends="core-info,commit-current,update-current,clean,dist,commit-dist">
    159             </target>
     6        <property name="plugin.author" value="Matt Amos"/>
     7    <property name="plugin.class" value="terracer.TerracerPlugin"/>
     8    <property name="plugin.description" value="Make terraced houses out of single blocks."/>
     9    <property name="plugin.icon" value="images/terrace.png"/>
     10    <property name="plugin.link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/Terracer"/>
     11
     12    <!-- ** include targets that all plugins have in common ** -->
     13    <import file="../build-common.xml"/>
    16014</project>

  • applications/editors/josm/plugins/terracer/src/terracer/HouseNumberInputDialog.java

    r24713 r29035  
    1616import java.awt.GridBagConstraints;
    1717import java.awt.GridBagLayout;
     18import java.awt.event.ActionEvent;
    1819import java.util.ArrayList;
    1920import java.util.Iterator;
    20 import java.awt.event.ActionEvent;
    2121import java.util.TreeSet;
    2222
    … …  
    5757    final static String INTERPOLATION = "plugins.terracer.interpolation";
    5858
    59     final private Way street;
     59    //final private Way street;
    6060    final private String streetName;
    6161    final private boolean relationExists;
    … …  
    100100        );
    101101        this.inputHandler = handler;
    102         this.street = street;
     102        //this.street = street;
    103103        this.streetName = streetName;
    104104        this.relationExists = relationExists;
    … …  
    230230     */
    231231    @Override protected void buttonAction(int buttonIndex, final ActionEvent evt) {
    232         String a = evt.getActionCommand();
     232        //String a = evt.getActionCommand();
    233233        this.inputHandler.actionPerformed(evt);
    234234    }

  • applications/editors/josm/plugins/terracer/src/terracer/HouseNumberInputHandler.java

    r26149 r29035  
    4242 * @author casualwalker
    4343 */
     44@SuppressWarnings("serial")
    4445public class HouseNumberInputHandler extends JosmAction implements ActionListener, FocusListener, ItemListener {
    4546    private final TerracerAction terracerAction;

  • applications/editors/josm/plugins/terracer/src/terracer/ReverseTerraceAction.java

    r27852 r29035  
    3333 * they were found.
    3434 */
     35@SuppressWarnings("serial")
    3536public class ReverseTerraceAction extends JosmAction {
    3637

  • applications/editors/josm/plugins/terracer/src/terracer/TerracerAction.java

    r27852 r29035  
    5858 * @author zere
    5959 */
     60@SuppressWarnings("serial")
    6061public final class TerracerAction extends JosmAction {
    6162
    … …  
    8889
    8990        class InvalidUserInputException extends Exception {
    90             InvalidUserInputException(String message) {
     91            /*InvalidUserInputException(String message) {
    9192                super(message);
    92             }
     93            }*/
    9394
    9495            InvalidUserInputException() {
Note: See TracChangeset for help on using the changeset viewer.