Changeset 29532 in osm


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

[josm_fastdraw] Fix projet name, build.xml and some warnings

Location:
applications/editors/josm/plugins/FastDraw
Files:
2 added
6 edited

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/plugins/FastDraw

    • Property svn:ignore

      •  

        old new  
        11build
        22svn.log
         3bin

  • applications/editors/josm/plugins/FastDraw/.classpath

    r26067 r29532  
    22<classpath>
    33        <classpathentry kind="src" path="src"/>
    4         <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
    5         <classpathentry combineaccessrules="false" kind="src" path="/josm"/>
     4        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
     5        <classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
    66        <classpathentry kind="output" path="bin"/>
    77</classpath>

  • applications/editors/josm/plugins/FastDraw/.project

    r26067 r29532  
    11<?xml version="1.0" encoding="UTF-8"?>
    22<projectDescription>
    3         <name>josm-ImproveWayAccuracy</name>
     3        <name>josm-FastDraw</name>
    44        <comment></comment>
    55        <projects>

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

    r29457 r29532  
    11<?xml version="1.0" encoding="utf-8"?>
    2 <!--
    3 ** This is a template build file for a JOSM  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="FastDraw" default="dist" basedir=".">
    313    <!-- enter the SVN commit message -->
    … …  
    335    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    346    <property name="plugin.main.version" value="5739"/>
    35     <!--
    36       ************************************************
    37       ** should not be necessary to change the following properties
    38      -->
    39     <property name="josm" location="../../core/dist/josm-custom.jar"/>
    40     <property name="josm_location" value="../../core/dist"/>
    41     <property name="plugin.build.dir" value="build"/>
    42     <property name="plugin.src.dir" value="src"/>
    43     <!-- this is the directory where the plugin jar is copied to -->
    44     <property name="plugin.dist.dir" value="../../dist"/>
    45     <property name="ant.build.javac.target" value="1.5"/>
    46     <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/>
    47     <!--
    48     **********************************************************
    49     ** init - initializes the build
    50     **********************************************************
     7   
     8    <!-- Configure these properties (replace "..." accordingly).
     9         See http://josm.openstreetmap.de/wiki/DevelopersGuide/DevelopingPlugins
    5110    -->
    52     <target name="init">
    53         <mkdir dir="${plugin.build.dir}"/>
    54     </target>
    55     <!--
    56     **********************************************************
    57     ** compile - complies the source tree
    58     **********************************************************
    59     -->
    60     <target name="compile" depends="init">
    61         <echo message="compiling sources for  ${plugin.jar} ... "/>
    62         <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}">
    63             <compilerarg value="-Xlint:deprecation"/>
    64             <compilerarg value="-Xlint:unchecked"/>
    65         </javac>
    66     </target>
    67     <!--
    68     **********************************************************
    69     ** dist - creates the plugin jar
    70     **********************************************************
    71     -->
    72     <target name="dist" depends="compile, revision">
    73         <echo message="creating ${ant.project.name}.jar ... "/>
    74         <copy todir="${plugin.build.dir}/resources">
    75             <fileset dir="resources"/>
    76         </copy>
    77         <copy todir="${plugin.build.dir}/images">
    78             <fileset dir="images"/>
    79         </copy>
    80         <copy todir="${plugin.build.dir}/data">
    81             <fileset dir="data"/>
    82         </copy>
    83         <copy todir="${plugin.build.dir}">
    84             <fileset dir=".">
    85                 <include name="README"/>
    86                 <include name="LICENSE"/>
    87             </fileset>
    88         </copy>
    89         <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
    90             <!--
    91         ************************************************
    92         ** configure these properties. Most of them will be copied to the plugins
    93         ** manifest file. Property values will also show up in the list available
    94         ** plugins: http://josm.openstreetmap.de/wiki/Plugins.
    95         **
    96         ************************************************
    97     -->
    98             <manifest>
    99                 <attribute name="Author" value="Alexei Kasatkin"/>
    100                 <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.fastdraw.FastDrawingPlugin"/>
    101                 <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
    102                 <attribute name="Plugin-Icon" value="images/favicon.png"/>
    103                 <attribute name="Plugin-Description" value="Fast drawing ways by mouse"/>
    104                 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/FastDraw"/>
    105                 <attribute name="ru_Plugin-Link" value="http://wiki.openstreetmap.org/wiki/RU:JOSM/Plugins/FastDraw"/>
    106                 <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
    107                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
    108             </manifest>
    109         </jar>
    110     </target>
    111     <!--
    112     **********************************************************
    113     ** revision - extracts the current revision number for the
    114     **    file build.number and stores it in the XML property
    115     **    version.*
    116     **********************************************************
    117     -->
    118     <target name="revision">
    119         <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
    120             <env key="LANG" value="C"/>
    121             <arg value="info"/>
    122             <arg value="--xml"/>
    123             <arg value="."/>
    124         </exec>
    125         <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
    126         <delete file="REVISION"/>
    127     </target>
    128     <!--
    129     **********************************************************
    130     ** clean - clean up the build environment
    131     **********************************************************
    132     -->
    133     <target name="clean">
    134         <delete dir="${plugin.build.dir}"/>
    135         <delete file="${plugin.jar}"/>
    136     </target>
    137     <!--
    138     **********************************************************
    139     ** install - install the plugin in your local JOSM installation
    140     **********************************************************
    141     -->
    142     <target name="install" depends="dist">
    143         <property environment="env"/>
    144         <condition property="josm.plugins.dir" value="${env.APPDATA}/JOSM/plugins" else="${user.home}/.josm/plugins">
    145             <and>
    146                 <os family="windows"/>
    147             </and>
    148         </condition>
    149         <copy file="${plugin.jar}" todir="${josm.plugins.dir}" force="true"/>
    150     </target>
    151     <!--
    152     ************************** Publishing the plugin ***********************************
    153     -->
    154     <!--
    155         ** extracts the JOSM release for the JOSM version in ../core and saves it in the
    156         ** property ${coreversion.info.entry.revision}
    157         **
    158         -->
    159     <target name="core-info">
    160         <exec append="false" output="core.info.xml" executable="svn" failifexecutionfails="false">
    161             <env key="LANG" value="C"/>
    162             <arg value="info"/>
    163             <arg value="--xml"/>
    164             <arg value="../../core"/>
    165         </exec>
    166         <xmlproperty file="core.info.xml" prefix="coreversion" keepRoot="true" collapseAttributes="true"/>
    167         <echo>Building against core revision ${coreversion.info.entry.revision}.</echo>
    168         <echo>Plugin-Mainversion is set to ${plugin.main.version}.</echo>
    169         <delete file="core.info.xml"/>
    170     </target>
    171     <!--
    172         ** commits the source tree for this plugin
    173         -->
    174     <target name="commit-current">
    175         <echo>Commiting the plugin source with message '${commit.message}' ...</echo>
    176         <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
    177             <env key="LANG" value="C"/>
    178             <arg value="commit"/>
    179             <arg value="-m '${commit.message}'"/>
    180             <arg value="."/>
    181         </exec>
    182     </target>
    183     <!--
    184         ** updates (svn up) the source tree for this plugin
    185         -->
    186     <target name="update-current">
    187         <echo>Updating plugin source ...</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="."/>
    192         </exec>
    193         <echo>Updating ${plugin.jar} ...</echo>
    194         <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
    195             <env key="LANG" value="C"/>
    196             <arg value="up"/>
    197             <arg value="../dist/${plugin.jar}"/>
    198         </exec>
    199     </target>
    200     <!--
    201         ** commits the plugin.jar
    202         -->
    203     <target name="commit-dist">
    204         <echo>
    205     ***** Properties of published ${plugin.jar} *****
    206     Commit message    : '${commit.message}'                   
    207     Plugin-Mainversion: ${plugin.main.version}
    208     JOSM build version: ${coreversion.info.entry.revision}
    209     Plugin-Version    : ${version.entry.commit.revision}
    210     ***** / Properties of published ${plugin.jar} *****                   
    211                        
    212     Now commiting ${plugin.jar} ...
    213     </echo>
    214         <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
    215             <env key="LANG" value="C"/>
    216             <arg value="-m '${commit.message}'"/>
    217             <arg value="commit"/>
    218             <arg value="${plugin.jar}"/>
    219         </exec>
    220     </target>
    221     <!-- ** make sure svn is present as a command line tool ** -->
    222     <target name="ensure-svn-present">
    223         <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false" failonerror="false" resultproperty="svn.exit.code">
    224             <env key="LANG" value="C"/>
    225             <arg value="--version"/>
    226         </exec>
    227         <fail message="Fatal: command 'svn --version' failed. Please make sure svn is installed on your system.">
    228             <!-- return code not set at all? Most likely svn isn't installed -->
    229             <condition>
    230                 <not>
    231                     <isset property="svn.exit.code"/>
    232                 </not>
    233             </condition>
    234         </fail>
    235         <fail message="Fatal: command 'svn --version' failed. Please make sure a working copy of svn is installed on your system.">
    236             <!-- error code from SVN? Most likely svn is not what we are looking on this system -->
    237             <condition>
    238                 <isfailure code="${svn.exit.code}"/>
    239             </condition>
    240         </fail>
    241     </target>
    242     <target name="dist_and_launch" depends="clean,dist">
    243         <copy file="${plugin.jar}" tofile="${josm_location}/appdata/JOSM/plugins/${ant.project.name}.jar"/>
    244         <exec executable="${josm_location}/josm-custom-launch.bat"/>
    245     </target>
    246     <target name="publish" depends="ensure-svn-present,core-info,commit-current,update-current,clean,dist,commit-dist">
    247     </target>
    248     <target name="runjosm" depends="install">
    249         <java jar="${josm}" fork="true">
    250         </java>
    251     </target>
     11    <property name="plugin.author" value="Alexei Kasatkin"/>
     12    <property name="plugin.class" value="org.openstreetmap.josm.plugins.fastdraw.FastDrawingPlugin"/>
     13    <property name="plugin.description" value="Fast drawing ways by mouse"/>
     14    <property name="plugin.icon" value="images/favicon.png"/>
     15    <property name="plugin.link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/FastDraw"/>
     16
     17    <!-- ** include targets that all plugins have in common ** -->
     18    <import file="../build-common.xml"/>
    25219</project>

  • applications/editors/josm/plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/DrawnPolyLine.java

    r29453 r29532  
    293293
    294294    private double pointSegmentDistance(Point p, Point p1, Point p2) {
    295         double a,b,x,y,l,h,kt,kn,dist;
     295        double a,b,x,y,l,kt,kn,dist;
    296296        x=p.x-p1.x; y=p.y-p1.y;
    297297        a=p2.x-p1.x; b=p2.y-p1.y;

  • applications/editors/josm/plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java

    r29531 r29532  
    6363    private final Cursor cursorShift;
    6464    private final Cursor cursorReady;
    65     private final Cursor cursorNode;
     65    //private final Cursor cursorNode;
    6666    private final Cursor cursorDrawing;
    6767    private boolean nearSomeNode;
    … …  
    9292        cursorShift = ImageProvider.getCursor("crosshair", "new");
    9393        cursorReady = ImageProvider.getCursor("crosshair", "ready");
    94         cursorNode = ImageProvider.getCursor("crosshair", "joinnode");
     94        //cursorNode = ImageProvider.getCursor("crosshair", "joinnode");
    9595        cursorDrawing = ImageProvider.getCursor("crosshair", "mode");
    9696        //loadPrefs();
    … …  
    596596            TagPaster tp = new TagPaster(Main.pasteBuffer.getDirectlyAdded(), ts);
    597597            List<Tag> execute = tp.execute();
    598             Map<String,String> tgs=new HashMap<String,String>();
    599598            for (Tag t : execute) {
    600599                w.put(t.getKey(), t.getValue());
    … …  
    675674
    676675    private void loadFromWay(Way w) {
    677         List<LatLon> pts=line.getPoints();
    678 
    679676        Collection<Command> cmds = new LinkedList<Command>();
    680677       
    681         Node firstNode=null;
    682678        Object[] nodes = w.getNodes().toArray();
    683679        int n=nodes.length;
Note: See TracChangeset for help on using the changeset viewer.