Ignore:
Timestamp:
2013-03-07T22:10:13+01:00 (12 years ago)
Author:
stoecker
Message:

fix deprecations, cleanup some more build.xml's

Location:
applications/editors/josm/plugins/colorscheme
Files:
2 edited
3 moved

Legend:

Unmodified
Added
Removed

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

    r27863 r29351  
    11<?xml version="1.0" encoding="utf-8"?>
    22<!--
    3 ** This is the build file for the colorscheme plugin
     3** This is a template build file for a JOSM  plugin.
    44**
    55** Maintaining versions
    66** ====================
    7 ** see README.template
     7** See README.template
    88**
    99** Usage
    1010** =====
    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 **
     11** Call "ant help" to get possible build targets.
    2512**
    2613-->
    2714<project name="colorscheme" default="dist" basedir=".">
     15
     16    <!-- enter the SVN commit message -->
    2817    <property name="commit.message" value="Uses new constructor for Plugin"/>
    29     <property name="plugin.main.version" value="4968"/>
    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}">
    47             <fileset dir="src">
    48                 <include name="*.xml"/>
    49             </fileset>
    50         </copy>
    51         <copy todir="${plugin.build.dir}/data">
    52             <fileset dir="data"/>
    53         </copy>
    54         <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
    55             <manifest>
    56                 <attribute name="Author" value="Christof Dallermassl"/>
    57                 <attribute name="Plugin-Class" value="at.dallermassl.josm.plugin.colorscheme.ColorSchemePlugin"/>
    58                 <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
    59                 <attribute name="Plugin-Description" value="Allows the user to create different color schemes and to switch between them. Just change the colors and create a new scheme. Used to switch to a white background with matching colors for better visibility in bright sunlight. See dialog in preferences and ''Map Settings'' (strange but true :-)"/>
    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} *****
     18    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
     19    <property name="plugin.main.version" value="5631"/>
    14820
    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     <!-- ** make sure svn is present as a command line tool ** -->
    159     <target name="ensure-svn-present">
    160         <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false" failonerror="false" resultproperty="svn.exit.code">
    161             <env key="LANG" value="C"/>
    162             <arg value="--version"/>
    163         </exec>
    164         <fail message="Fatal: command 'svn --version' failed. Please make sure svn is installed on your system.">
    165             <!-- return code not set at all? Most likely svn isn't installed -->
    166             <condition>
    167                 <not>
    168                     <isset property="svn.exit.code"/>
    169                 </not>
    170             </condition>
    171         </fail>
    172         <fail message="Fatal: command 'svn --version' failed. Please make sure a working copy of svn is installed on your system.">
    173             <!-- error code from SVN? Most likely svn is not what we are looking on this system -->
    174             <condition>
    175                 <isfailure code="${svn.exit.code}"/>
    176             </condition>
    177         </fail>
    178     </target>
    179     <target name="publish" depends="ensure-svn-present,core-info,commit-current,update-current,clean,dist,commit-dist">
    180     </target>
     21    <property name="plugin.author" value="Christof Dallermassl"/>
     22    <property name="plugin.class" value="at.dallermassl.josm.plugin.colorscheme.ColorSchemePlugin"/>
     23    <property name="plugin.description" value="Allows the user to create different color schemes and to switch between them. Just change the colors and create a new scheme. Used to switch to a white background with matching colors for better visibility in bright sunlight. See dialog in display preferences."/>
     24
     25    <!-- ** include targets that all plugins have in common ** -->
     26    <import file="../build-common.xml"/>
     27
    18128</project>

  • applications/editors/josm/plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java

    r27863 r29351  
    128128        JScrollPane scrollpane = new JScrollPane(panel);
    129129        scrollpane.setBorder(BorderFactory.createEmptyBorder( 0, 0, 0, 0 ));
    130         gui.getDisplayPreference().displaycontent.addTab(tr("Color Schemes"), scrollpane);
     130        gui.getDisplayPreference().getTabPane().addTab(tr("Color Schemes"), scrollpane);
    131131    }
    132132
Note: See TracChangeset for help on using the changeset viewer.