Changeset 10439 in osm for applications/editors/josm


Ignore:
Timestamp:
2008-09-03T10:11:37+02:00 (16 years ago)
Author:
stoecker
Message:

build fixes

Location:
applications/editors/josm/plugins
Files:
5 edited

Legend:

Unmodified
Added
Removed

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

    r10122 r10439  
    5656  <target name="compile" depends="init">
    5757    <echo message="creating ${plugin.jar}"/>
    58     <javac srcdir="src" classpath="../../core/dist/josm-custom.jar" destdir="build">
     58    <javac srcdir="src" classpath="${josm}" destdir="build">
    5959      <compilerarg value="-Xlint:deprecation"/>
    6060    </javac>

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

    r10410 r10439  
    11<project name="globalsat" default="dist" basedir=".">
    22
    3         <!-- point to your JOSM directory -->
    4         <property name="josm" location="../../core/dist/josm-custom.jar" />
    5         <property name="RXTX" location="./libs/RXTXcomm.jar" />
     3  <!-- josm "user home" directory depends on the platform used (windows has a different place than unix/linux) -->
     4  <property environment="env"/>
     5  <condition property="josm.home.dir" value="${env.APPDATA}/JOSM" else="${user.home}/.josm">
     6    <and>
     7      <os family="windows"/>
     8    </and>
     9  </condition>
    610
    7         <path id="classpath">
    8                 <fileset id="RXTX" file="${RXTX}"/>
    9                 <fileset file="${josm}"/>
    10         </path>
     11  <!-- compilation properties -->
     12  <property name="josm.build.dir"   value="../../core"/>
     13  <property name="josm.plugins.dir" value="${josm.home.dir}/plugins"/>
     14  <property name="josm"             location="../../core/dist/josm-custom.jar" />
     15  <property name="RXTX"             location="./libs/RXTXcomm.jar" />
     16  <property name="plugin.build.dir" value="build"/>
     17  <property name="plugin.dist.dir"  value="../../dist"/>
     18  <property name="plugin.name"      value="${ant.project.name}"/>
     19  <property name="plugin.jar"       value="../../dist/${plugin.name}.jar"/>
    1120
    12         <target name="init">
    13                 <mkdir dir="build"></mkdir>
    14                 <mkdir dir="dist"></mkdir>
    15         </target>
     21  <property name="ant.build.javac.target" value="1.5"/>
    1622
    17         <target name="compile" depends="init">
    18                 <javac srcdir="src" classpathref="classpath" debug="true" destdir="build" target="1.5">
    19                 <!-- <javac srcdir="src" classpathref="classpath" debug="true" destdir="build" target="1.5"> -->
    20 <!--            <javac srcdir="src" classpath="${RXTX}" debug="true" destdir="build" target="1.5"> -->
     23  <path id="classpath">
     24    <fileset id="RXTX" file="${RXTX}"/>
     25    <fileset file="${josm}"/>
     26  </path>
    2127
    22                         <include name="**/*.java" />
    23                 </javac>
    24         </target>
     28  <target name="dist" depends="compile">
     29    <unjar dest="build">
     30      <fileset refid="RXTX" />
     31    </unjar>
     32    <!-- images -->
     33    <copy todir="build/images">
     34      <fileset dir="images" />
     35    </copy>
    2536
    26         <target name="dist" depends="compile">
    27                 <unjar dest="build">
    28                         <fileset refid="RXTX" />
    29                 </unjar>
    30                 <copy todir="build/images" >
    31                         <fileset dir="images" />
    32                 </copy>
    33                 <jar destfile="dist/globalsat.jar" basedir="build">
    34                         <manifest>
    35                                 <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.globalsat.GlobalsatPlugin" />
    36                                 <attribute name="Plugin-Description" value="Provide a dialog to read stored tracks from a Globalsat DG100 datalogger into a GPX-layer. Depends on installed rxtx library." />
    37                                 <attribute name="Plugin-Author" value="ramack@raphael-mack.de" />
    38                                 <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
    39                                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
    40                         </manifest>
    41                 </jar>
    42         </target>
     37    <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
     38      <env key="LANG" value="C"/>
     39      <arg value="info"/>
     40      <arg value="--xml"/>
     41      <arg value="."/>
     42    </exec>
     43    <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
     44    <delete file="REVISION"/>
    4345
    44         <target name="clean">
    45                 <delete dir="build" />
    46                 <delete dir="dist" />
    47         </target>
     46    <jar destfile="${plugin.jar}" basedir="build">
     47      <manifest>
     48        <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.globalsat.GlobalsatPlugin" />
     49        <attribute name="Plugin-Description" value="Provide a dialog to read stored tracks from a Globalsat DG100 datalogger into a GPX-layer. Depends on installed rxtx library." />
     50        <attribute name="Plugin-Author" value="ramack@raphael-mack.de" />
     51        <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
     52        <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
     53      </manifest>
     54    </jar>
     55  </target>
    4856
    49         <target name="install" depends="dist">
    50                 <copy file="dist/globalsat.jar" todir="${user.home}/.josm/plugins"/>
    51         </target>
     57  <target name="compile" depends="init">
     58    <echo message="creating ${plugin.jar}"/>
     59    <javac srcdir="src" classpathref="classpath" destdir="build">
     60      <compilerarg value="-Xlint:deprecation"/>
     61    </javac>
     62  </target>
     63
     64  <target name="init">
     65    <mkdir dir="${plugin.build.dir}" />
     66  </target>
     67
     68  <target name="clean">
     69    <delete dir="${plugin.build.dir}" />
     70    <delete file="${plugin.jar}" />
     71  </target>
     72
     73  <target name="install" depends="dist">
     74    <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
     75  </target>
    5276</project>

  • applications/editors/josm/plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java

    r10378 r10439  
    1414import org.openstreetmap.josm.gui.IconToggleButton;
    1515import org.openstreetmap.josm.gui.MapFrame;
    16 import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
    1716import org.openstreetmap.josm.gui.layer.Layer;
    1817import org.openstreetmap.josm.gui.layer.GpxLayer;

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

    r10410 r10439  
    11<project name="measurement" default="dist" basedir=".">
    22
    3         <!-- point to your JOSM directory -->
    4         <property name="josm" location="../../core/dist/josm-custom.jar" />
     3  <!-- josm "user home" directory depends on the platform used (windows has a different place than unix/linux) -->
     4  <property environment="env"/>
     5  <condition property="josm.home.dir" value="${env.APPDATA}/JOSM" else="${user.home}/.josm">
     6    <and>
     7      <os family="windows"/>
     8    </and>
     9  </condition>
    510
     11  <!-- compilation properties -->
     12  <property name="josm.build.dir"   value="../../core"/>
     13  <property name="josm.plugins.dir" value="${josm.home.dir}/plugins"/>
     14  <property name="josm"             location="../../core/dist/josm-custom.jar" />
     15  <property name="plugin.build.dir" value="build"/>
     16  <property name="plugin.dist.dir"  value="../../dist"/>
     17  <property name="plugin.name"      value="${ant.project.name}"/>
     18  <property name="plugin.jar"       value="../../dist/${plugin.name}.jar"/>
    619
    7         <target name="init">
    8                 <mkdir dir="build"></mkdir>
    9                 <mkdir dir="dist"></mkdir>
    10         </target>
     20  <property name="ant.build.javac.target" value="1.5"/>
    1121
    12         <target name="compile" depends="init">
    13                 <javac srcdir="src" classpath="${josm}" debug="true" destdir="build" target="1.5">
    14                         <include name="**/*.java" />
    15                 </javac>
    16         </target>
     22  <target name="dist" depends="compile">
     23    <!-- images -->
     24    <copy todir="build/images">
     25      <fileset dir="images" />
     26    </copy>
    1727
    18         <target name="dist" depends="compile">
    19                 <copy todir="build/images" >
    20                         <fileset dir="images" />
    21                 </copy>
    22                 <jar destfile="dist/measurement.jar" basedir="build">
    23                         <manifest>
    24                                 <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.measurement.MeasurementPlugin" />
    25                                 <attribute name="Plugin-Description" value="Provide a measurement dialog and a layer to measure length and angle of segments (there are no segments anymore, I know. Any idea how the angle should be measures now?) and create measurement paths (which also can be imported from a gps layer)" />
    26                                 <attribute name="Plugin-Author" value="mail@raphael-mack.de" />
    27                                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
    28                                 <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
    29                         </manifest>
    30                 </jar>
    31         </target>
     28    <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
     29      <env key="LANG" value="C"/>
     30      <arg value="info"/>
     31      <arg value="--xml"/>
     32      <arg value="."/>
     33    </exec>
     34    <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
     35    <delete file="REVISION"/>
    3236
    33         <target name="clean">
    34                 <delete dir="build" />
    35                 <delete dir="dist" />
    36         </target>
     37    <jar destfile="${plugin.jar}" basedir="build">
     38      <manifest>
     39        <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.measurement.MeasurementPlugin" />
     40        <attribute name="Plugin-Description" value="Provide a measurement dialog and a layer to measure length and angle of segments and create measurement paths (which also can be imported from a gps layer)" />
     41        <attribute name="Plugin-Author" value="mail@raphael-mack.de" />
     42        <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
     43        <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
     44      </manifest>
     45    </jar>
     46  </target>
    3747
    38         <target name="install" depends="dist">
    39                 <copy file="dist/measurement.jar" todir="${user.home}/.josm/plugins"/>
    40         </target>
    41        
     48  <target name="compile" depends="init">
     49    <echo message="creating ${plugin.jar}"/>
     50    <javac srcdir="src" classpath="${josm}" destdir="build">
     51      <compilerarg value="-Xlint:deprecation"/>
     52    </javac>
     53  </target>
     54
     55  <target name="init">
     56    <mkdir dir="${plugin.build.dir}" />
     57  </target>
     58
     59  <target name="clean">
     60    <delete dir="${plugin.build.dir}" />
     61    <delete file="${plugin.jar}" />
     62  </target>
     63
     64  <target name="install" depends="dist">
     65    <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
     66  </target>
    4267</project>

  • applications/editors/josm/plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java

    r10410 r10439  
    7878        JPanel valuePanel = new JPanel(new GridLayout(0,2));
    7979       
    80         valuePanel.add(new JLabel("Path Length"));
     80        valuePanel.add(new JLabel(tr("Path Length")));
    8181       
    8282        pathLengthLabel = new JLabel("0 m");
    8383        valuePanel.add(pathLengthLabel);
    8484       
    85         valuePanel.add(new JLabel("Selection Length"));
     85        valuePanel.add(new JLabel(tr("Selection Length")));
    8686       
    8787        selectLengthLabel = new JLabel("0 m");
    8888        valuePanel.add(selectLengthLabel);
    8989
    90         valuePanel.add(new JLabel("Selection Area"));
     90        valuePanel.add(new JLabel(tr("Selection Area")));
    9191       
    92         selectAreaLabel = new JLabel("0 m²");
     92        selectAreaLabel = new JLabel("0 m\uc2b2");
    9393        valuePanel.add(selectAreaLabel);
    9494       
    95         JLabel angle = new JLabel("Angle");
     95        JLabel angle = new JLabel(tr("Angle"));
    9696        angle.setToolTipText(tr("Angle between two selected Nodes"));
    9797        valuePanel.add(angle);
    9898       
    99         segAngleLabel = new JLabel("- °");
     99        segAngleLabel = new JLabel("- \uc2b0");
    100100        valuePanel.add(segAngleLabel);
    101101       
    … …  
    144144                                dlg.selectLengthLabel.setText(new DecimalFormat("#0.00").format(length) + " m");
    145145
    146                                 dlg.segAngleLabel.setText(new DecimalFormat("#0.0").format(segAngle) + " °");           
    147                                 dlg.selectAreaLabel.setText(new DecimalFormat("#0.00").format(area) + " m²");
     146                                dlg.segAngleLabel.setText(new DecimalFormat("#0.0").format(segAngle) + " \uc2b0");             
     147                                dlg.selectAreaLabel.setText(new DecimalFormat("#0.00").format(area) + " m\uc2b2");
    148148
    149149                        }
Note: See TracChangeset for help on using the changeset viewer.