Changeset 29661 in osm


Ignore:
Timestamp:
2013-06-16T13:52:13+02:00 (12 years ago)
Author:
donvip
Message:

[josm_plugins] see #josm8799 - update plugins fixaddresses, czechaddresses, public_transport to JOSM 6010

Location:
applications/editors/josm/plugins
Files:
2 added
1 deleted
14 edited

Legend:

Unmodified
Added
Removed

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

    r29519 r29661  
    44        <property name="commit.message" value="fix compile error (core changes)"/>
    55        <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    6     <property name="plugin.main.version" value="5886"/>
     6    <property name="plugin.main.version" value="6010"/>
    77       
    88    <!-- Configure these properties (replace "..." accordingly).

  • applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/AddressEditContainer.java

    r29081 r29661  
    533533                        for (OsmPrimitive osmPrimitive : osmData) {
    534534                                if (osmPrimitive.isUsable()) {
    535                                         osmPrimitive.visit(this);
     535                                        osmPrimitive.accept(this);
    536536                                }
    537537                        }

  • applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/GuessAddressRunnable.java

    r27326 r29661  
    177177                                                        break;
    178178                                                }
    179                                                 way.visit(guesser);                                             
     179                                                way.accept(guesser);                                           
    180180                                        }
    181181                                       
    … …  
    197197                                                        break;
    198198                                                }
    199                                                 node.visit(guesser);                                           
     199                                                node.accept(guesser);                                           
    200200                                        }
    201201                                       

  • applications/editors/josm/plugins/czechaddress

    • Property svn:ignore

      •  

        old new  
        22.log.xsl.swp
        33.git
         4bin

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

    r19621 r29661  
    33        <classpathentry excluding="src/" including="images/**" kind="src" path=""/>
    44        <classpathentry kind="src" path="src"/>
    5         <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JDK 6"/>
     5        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
    66        <classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
    77        <classpathentry kind="output" path="bin"/>

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

    r29435 r29661  
    3333            <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/wiki/CS:JOSM/Plugins/CzechAddress"/>
    3434            <attribute name="Plugin-Icon" value="images/preferences/czech_flag.png"/>
    35             <attribute name="Plugin-Mainversion" value="4980"/>
     35            <attribute name="Plugin-Mainversion" value="6010"/>
    3636            <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
    3737        </manifest>

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/LocationSelector.java

    r26299 r29661  
    9292        for (OsmPrimitive op : dataSet.allPrimitives()) {
    9393            if (op instanceof Node) {
    94                 ((Node) op).visit(visitor);
     94                ((Node) op).accept(visitor);
    9595            } else if (op instanceof Way) {
    96                 ((Way) op).visit(visitor);
     96                ((Way) op).accept(visitor);
    9797            }
    9898        }

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/proposal/ExtractAddressIntoNodeProposal.java

    r16750 r29661  
    5555
    5656        BoundingXYVisitor visitor = new BoundingXYVisitor();
    57         way.visit(visitor);
     57        way.accept(visitor);
    5858
    5959        Node addrNode = new Node(visitor.getBounds().getCenter());

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

    r20071 r29661  
    22<classpath>
    33        <classpathentry kind="src" path="src"/>
    4         <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
     4        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
    55        <classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
    66        <classpathentry kind="output" path="build"/>

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

    r20071 r29661  
    11<?xml version="1.0" encoding="UTF-8"?>
    22<projectDescription>
    3         <name>public_transport</name>
     3        <name>JOSM-public_transport</name>
    44        <comment></comment>
    55        <projects>

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

    r29435 r29661  
    11<?xml version="1.0" encoding="utf-8"?>
    2 <!--
    3 ** Usage
    4 ** =====
    5 ** To build it run
    6 **
    7 **    > ant  dist
    8 **
    9 ** To install the generated plugin locally (in you default plugin directory) run
    10 **
    11 **    > ant  install
    12 **
    13 ** The generated plugin jar is not automatically available in JOSMs plugin configuration
    14 ** dialog. You have to check it in first.
    15 **
    16 -->
    172<project name="public_transport" default="dist" basedir=".">
    18     <property name="josm.basedir" location="../.."/>
    19     <property name="plugin.main.version" value="5679"/>
    20     <!--
    21       ************************************************
    22       ** should not be necessary to change the following properties
    23      -->
    24     <property name="josm" location="${josm.basedir}/core/dist/josm-custom.jar"/>
    25     <property name="plugin.build.dir" value="build"/>
    26     <property name="plugin.src.dir" value="src"/>
    27     <!-- this is the directory where the plugin jar is copied to -->
    28     <property name="plugin.dist.dir" value="${josm.basedir}/dist"/>
    29     <property name="ant.build.javac.source" value="1.6"/>
    30     <property name="ant.build.javac.target" value="1.6"/>
    31     <property name="plugin.dist.dir" value="${josm.basedir}/dist"/>
    32     <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/>
    33     <!--
    34     **********************************************************
    35     ** init - initializes the build
    36     **********************************************************
    37     -->
    38     <target name="init">
    39         <mkdir dir="${plugin.build.dir}"/>
    40     </target>
    41     <!--
    42     **********************************************************
    43     ** compile - complies the source tree
    44     **********************************************************
    45     -->
    46     <target name="compile" depends="init">
    47         <echo message="compiling sources for  ${plugin.jar} ... "/>
    48         <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}">
    49             <compilerarg value="-Xlint:deprecation"/>
    50             <compilerarg value="-Xlint:unchecked"/>
    51         </javac>
    52     </target>
    53     <!--
    54     **********************************************************
    55     ** dist - creates the plugin jar
    56     **********************************************************
    57     -->
    58     <target name="dist" depends="compile,revision">
    59         <echo message="creating ${ant.project.name}.jar ... "/>
    60         <copy todir="${plugin.build.dir}/resources">
    61             <fileset dir="resources"/>
    62         </copy>
    63         <copy todir="${plugin.build.dir}/images">
    64             <fileset dir="images"/>
    65         </copy>
    66         <copy todir="${plugin.build.dir}/data">
    67             <fileset dir="data"/>
    68         </copy>
    69         <copy todir="${plugin.build.dir}">
    70             <fileset dir=".">
    71                 <include name="README"/>
    72                 <include name="LICENSE"/>
    73             </fileset>
    74         </copy>
    75         <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
    76             <!--
    77         ************************************************
    78         ** configure these properties. Most of them will be copied to the plugins
    79         ** manifest file. Property values will also show up in the list available
    80         ** plugins: http://josm.openstreetmap.de/wiki/Plugins.
    81         **
    82         ************************************************
    83     -->
    84             <manifest>
    85                 <attribute name="Author" value="Roland M. Olbricht"/>
    86                 <attribute name="Plugin-Class" value="public_transport.PublicTransportPlugin"/>
    87                 <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
    88                 <attribute name="Plugin-Description" value="This plugin simplifies the mapping and editing of public transport routes."/>
    89                 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/public_transport"/>
    90                 <attribute name="Plugin-Mainversion" value="4980"/>
    91                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
    92             </manifest>
    93         </jar>
    94     </target>
    95     <!--
    96     **********************************************************
    97     ** revision - extracts the current revision number for the
    98     **    file build.number and stores it in the XML property
    99     **    version.*
    100     **********************************************************
    101     -->
    102     <target name="revision">
    103         <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
    104             <env key="LANG" value="C"/>
    105             <arg value="info"/>
    106             <arg value="--xml"/>
    107             <arg value="."/>
    108         </exec>
    109         <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
    110         <delete file="REVISION"/>
    111     </target>
    112     <!--
    113     **********************************************************
    114     ** clean - clean up the build environment
    115     **********************************************************
    116     -->
    117     <target name="clean">
    118         <delete dir="${plugin.build.dir}"/>
    119         <delete file="${plugin.jar}"/>
    120     </target>
    121     <!--
    122     **********************************************************
    123     ** install - install the plugin in your local JOSM installation
    124     **********************************************************
    125     -->
    126     <target name="install" depends="dist">
    127         <property environment="env"/>
    128         <condition property="josm.plugins.dir" value="${env.APPDATA}/JOSM/plugins" else="${user.home}/.josm/plugins">
    129             <and>
    130                 <os family="windows"/>
    131             </and>
    132         </condition>
    133         <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
    134     </target>
     3
     4    <!-- enter the SVN commit message -->
     5    <property name="commit.message" value="Commit message"/>
     6    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
     7    <property name="plugin.main.version" value="6010"/>
     8
     9    <property name="plugin.author" value="Roland M. Olbricht"/>
     10    <property name="plugin.class" value="public_transport.PublicTransportPlugin"/>
     11    <property name="plugin.description" value="This plugin simplifies the mapping and editing of public transport routes."/>
     12    <!-- <property name="plugin.icon" value=""/> -->
     13    <property name="plugin.link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/public_transport"/>
     14
     15    <!-- ** include targets that all plugins have in common ** -->
     16    <import file="../build-common.xml"/>
    13517</project>

  • applications/editors/josm/plugins/public_transport/src/public_transport/GTFSImporterAction.java

    r26168 r29661  
    346346      int j = consideredLines.elementAt(i);
    347347      if (nodes.elementAt(j) != null)
    348         nodes.elementAt(j).visit(box);
     348        nodes.elementAt(j).accept(box);
    349349    }
    350350    if (box.getBounds() == null)

  • applications/editors/josm/plugins/public_transport/src/public_transport/RoutePatternAction.java

    r28326 r29661  
    12221222          if ((itineraryTable.isRowSelected(i)) && (itineraryData.ways.elementAt(i) != null))
    12231223          {
    1224             itineraryData.ways.elementAt(i).visit(box);
     1224            itineraryData.ways.elementAt(i).accept(box);
    12251225          }
    12261226        }
    … …  
    12321232          if (itineraryData.ways.elementAt(i) != null)
    12331233          {
    1234             itineraryData.ways.elementAt(i).visit(box);
     1234            itineraryData.ways.elementAt(i).accept(box);
    12351235          }
    12361236        }
    … …  
    15081508          if (stoplistTable.isRowSelected(i))
    15091509          {
    1510             stoplistData.nodes.elementAt(i).visit(box);
     1510            stoplistData.nodes.elementAt(i).accept(box);
    15111511          }
    15121512        }
    … …  
    15161516        for (int i = 0; i < stoplistData.getRowCount(); ++i)
    15171517        {
    1518           stoplistData.nodes.elementAt(i).visit(box);
     1518          stoplistData.nodes.elementAt(i).accept(box);
    15191519        }
    15201520      }

  • applications/editors/josm/plugins/public_transport/src/public_transport/StopImporterAction.java

    r29222 r29661  
    376376      int j = consideredLines.elementAt(i);
    377377      if (nodes.elementAt(j) != null)
    378         nodes.elementAt(j).visit(box);
     378        nodes.elementAt(j).accept(box);
    379379    }
    380380    if (box.getBounds() == null)
Note: See TracChangeset for help on using the changeset viewer.