Changeset 27477 in osm for applications/editors/josm


Ignore:
Timestamp:
2012-01-16T16:07:15+01:00 (13 years ago)
Author:
malcolmh
Message:

save

Location:
applications/editors/josm/plugins/smed/plugs
Files:
10 added
1 deleted
1 edited
3 copied

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/plugins/smed/plugs/oseam/build.xml

    r27379 r27477  
    148148        </delete>
    149149    </target>
    150     <!--
    151     **********************************************************
    152     ** install - install the plugin in your local JOSM installation
    153     ** for developing
    154     **********************************************************
    155     -->
    156     <target name="install-develop" depends="dist">
    157         <property environment="env"/>
    158         <condition property="josm.plugins.dir" value="${env.APPDATA}/JOSM/plugins/splug" else="${user.home}/.josm/plugins/splug">
    159             <and>
    160                 <os family="windows"/>
    161             </and>
    162         </condition>
    163         <delete>
    164             <fileset dir="${josm.plugins.dir}">
    165                 <include name="${delete_string}"/>
    166             </fileset>
    167         </delete>
    168         <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
    169         <delete file="${plugin.jar}"/>
    170     </target>
    171     <!--
    172     ************************** Publishing the plugin ***********************************
    173     -->
    174     <!--
    175         ** extracts the JOSM release for the JOSM version in ../core and saves it in the
    176         ** property ${coreversion.info.entry.revision}
    177         **
    178         -->
    179     <target name="core-info">
    180         <exec append="false" output="core.info.xml" executable="svn" failifexecutionfails="false">
    181             <env key="LANG" value="C"/>
    182             <arg value="info"/>
    183             <arg value="--xml"/>
    184             <arg value="../../core"/>
    185         </exec>
    186         <xmlproperty file="core.info.xml" prefix="coreversion" keepRoot="true" collapseAttributes="true"/>
    187         <echo>Building against core revision ${coreversion.info.entry.revision}.</echo>
    188         <echo>Plugin-Mainversion is set to ${plugin.main.version}.</echo>
    189         <delete file="core.info.xml"/>
    190     </target>
    191     <!--
    192         ** commits the source tree for this plugin
    193         -->
    194     <target name="commit-current">
    195         <echo>Commiting the plugin source with message '${commit.message}' ...</echo>
    196         <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
    197             <env key="LANG" value="C"/>
    198             <arg value="commit"/>
    199             <arg value="-m '${commit.message}'"/>
    200             <arg value="."/>
    201         </exec>
    202     </target>
    203     <!--
    204         ** updates (svn up) the source tree for this plugin
    205         -->
    206     <target name="update-current">
    207         <echo>Updating plugin source ...</echo>
    208         <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
    209             <env key="LANG" value="C"/>
    210             <arg value="up"/>
    211             <arg value="."/>
    212         </exec>
    213         <echo>Updating ${plugin.jar} ...</echo>
    214         <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
    215             <env key="LANG" value="C"/>
    216             <arg value="up"/>
    217             <arg value="../dist/${plugin.jar}"/>
    218         </exec>
    219     </target>
    220     <!--
    221         ** commits the plugin.jar
    222         -->
    223     <target name="commit-dist">
    224         <echo>
    225     ***** Properties of published ${plugin.jar} *****
    226     Commit message    : '${commit.message}'                 
    227     Plugin-Mainversion: ${plugin.main.version}
    228     JOSM build version: ${coreversion.info.entry.revision}
    229     Plugin-Version    : ${version.entry.commit.revision}
    230     ***** / Properties of published ${plugin.jar} *****                 
    231                        
    232     Now commiting ${plugin.jar} ...
    233     </echo>
    234         <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
    235             <env key="LANG" value="C"/>
    236             <arg value="-m '${commit.message}'"/>
    237             <arg value="commit"/>
    238             <arg value="${plugin.jar}"/>
    239         </exec>
    240     </target>
    241     <!-- ** make sure svn is present as a command line tool ** -->
    242     <target name="ensure-svn-present">
    243         <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false" failonerror="false" resultproperty="svn.exit.code">
    244             <env key="LANG" value="C"/>
    245             <arg value="--version"/>
    246         </exec>
    247         <fail message="Fatal: command 'svn --version' failed. Please make sure svn is installed on your system.">
    248             <!-- return code not set at all? Most likely svn isn't installed -->
    249             <condition>
    250                 <not>
    251                     <isset property="svn.exit.code"/>
    252                 </not>
    253             </condition>
    254         </fail>
    255         <fail message="Fatal: command 'svn --version' failed. Please make sure a working copy of svn is installed on your system.">
    256             <!-- error code from SVN? Most likely svn is not what we are looking on this system -->
    257             <condition>
    258                 <isfailure code="${svn.exit.code}"/>
    259             </condition>
    260         </fail>
    261     </target>
    262     <target name="publish">
    263         <!-- depends="ensure-svn-present,core-info,commit-current,update-current,clean,dist,commit-dist" -->
    264         <echo>No normal josm-plugin, publishing over smed !!!
    265             1. ant - dist to each subplugin
    266             2. ant publish to smed
    267         </echo>
    268     </target>
    269150</project>

  • applications/editors/josm/plugins/smed/plugs/wayarea/build.xml

    r27463 r27477  
    2828**
    2929-->
    30 <project name="OSeaM" default="dist" basedir=".">
     30<project name="WayArea" default="dist" basedir=".">
    3131    <!-- enter the SVN commit message -->
    3232    <property name="commit.message" value="some new features in internationalising"/>
    … …  
    148148        </delete>
    149149    </target>
    150     <!--
    151     **********************************************************
    152     ** install - install the plugin in your local JOSM installation
    153     ** for developing
    154     **********************************************************
    155     -->
    156     <target name="install-develop" depends="dist">
    157         <property environment="env"/>
    158         <condition property="josm.plugins.dir" value="${env.APPDATA}/JOSM/plugins/splug" else="${user.home}/.josm/plugins/splug">
    159             <and>
    160                 <os family="windows"/>
    161             </and>
    162         </condition>
    163         <delete>
    164             <fileset dir="${josm.plugins.dir}">
    165                 <include name="${delete_string}"/>
    166             </fileset>
    167         </delete>
    168         <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
    169         <delete file="${plugin.jar}"/>
    170     </target>
    171     <!--
    172     ************************** Publishing the plugin ***********************************
    173     -->
    174     <!--
    175         ** extracts the JOSM release for the JOSM version in ../core and saves it in the
    176         ** property ${coreversion.info.entry.revision}
    177         **
    178         -->
    179     <target name="core-info">
    180         <exec append="false" output="core.info.xml" executable="svn" failifexecutionfails="false">
    181             <env key="LANG" value="C"/>
    182             <arg value="info"/>
    183             <arg value="--xml"/>
    184             <arg value="../../core"/>
    185         </exec>
    186         <xmlproperty file="core.info.xml" prefix="coreversion" keepRoot="true" collapseAttributes="true"/>
    187         <echo>Building against core revision ${coreversion.info.entry.revision}.</echo>
    188         <echo>Plugin-Mainversion is set to ${plugin.main.version}.</echo>
    189         <delete file="core.info.xml"/>
    190     </target>
    191     <!--
    192         ** commits the source tree for this plugin
    193         -->
    194     <target name="commit-current">
    195         <echo>Commiting the plugin source with message '${commit.message}' ...</echo>
    196         <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
    197             <env key="LANG" value="C"/>
    198             <arg value="commit"/>
    199             <arg value="-m '${commit.message}'"/>
    200             <arg value="."/>
    201         </exec>
    202     </target>
    203     <!--
    204         ** updates (svn up) the source tree for this plugin
    205         -->
    206     <target name="update-current">
    207         <echo>Updating plugin source ...</echo>
    208         <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
    209             <env key="LANG" value="C"/>
    210             <arg value="up"/>
    211             <arg value="."/>
    212         </exec>
    213         <echo>Updating ${plugin.jar} ...</echo>
    214         <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
    215             <env key="LANG" value="C"/>
    216             <arg value="up"/>
    217             <arg value="../dist/${plugin.jar}"/>
    218         </exec>
    219     </target>
    220     <!--
    221         ** commits the plugin.jar
    222         -->
    223     <target name="commit-dist">
    224         <echo>
    225     ***** Properties of published ${plugin.jar} *****
    226     Commit message    : '${commit.message}'                 
    227     Plugin-Mainversion: ${plugin.main.version}
    228     JOSM build version: ${coreversion.info.entry.revision}
    229     Plugin-Version    : ${version.entry.commit.revision}
    230     ***** / Properties of published ${plugin.jar} *****                 
    231                        
    232     Now commiting ${plugin.jar} ...
    233     </echo>
    234         <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
    235             <env key="LANG" value="C"/>
    236             <arg value="-m '${commit.message}'"/>
    237             <arg value="commit"/>
    238             <arg value="${plugin.jar}"/>
    239         </exec>
    240     </target>
    241     <!-- ** make sure svn is present as a command line tool ** -->
    242     <target name="ensure-svn-present">
    243         <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false" failonerror="false" resultproperty="svn.exit.code">
    244             <env key="LANG" value="C"/>
    245             <arg value="--version"/>
    246         </exec>
    247         <fail message="Fatal: command 'svn --version' failed. Please make sure svn is installed on your system.">
    248             <!-- return code not set at all? Most likely svn isn't installed -->
    249             <condition>
    250                 <not>
    251                     <isset property="svn.exit.code"/>
    252                 </not>
    253             </condition>
    254         </fail>
    255         <fail message="Fatal: command 'svn --version' failed. Please make sure a working copy of svn is installed on your system.">
    256             <!-- error code from SVN? Most likely svn is not what we are looking on this system -->
    257             <condition>
    258                 <isfailure code="${svn.exit.code}"/>
    259             </condition>
    260         </fail>
    261     </target>
    262     <target name="publish">
    263         <!-- depends="ensure-svn-present,core-info,commit-current,update-current,clean,dist,commit-dist" -->
    264         <echo>No normal josm-plugin, publishing over smed !!!
    265             1. ant - dist to each subplugin
    266             2. ant publish to smed
    267         </echo>
    268     </target>
    269150</project>

  • applications/editors/josm/plugins/smed/plugs/wayarea/src/wayarea/WayArea.java

    r27463 r27477  
    1 package oseam;
     1package wayarea;
    22
    33import java.net.URL;
    44
    5 import oseam.dialogs.OSeaMAction;
    6 import oseam.Messages;
     5import wayarea.dialogs.WayAreaAction;
     6import wayarea.Messages;
    77
    88import javax.swing.ImageIcon;
    … …  
    1414import smed.plug.ifc.SmedPluginManager;
    1515
    16 public class OSeaM implements SmedPluggable {
     16public class WayArea implements SmedPluggable {
    1717
    1818        private int index = -1;
    1919        private String msg = "";
    20         private OSeaMAction oseam = null;
     20        private WayAreaAction wayarea = null;
    2121        private SmedPluginManager manager = null;
    2222
    … …  
    6262        @Override
    6363        public String getFileName() {
    64                 return "OSeaM.jar";
     64                return "WayArea.jar";
    6565        }
    6666
    6767        @Override
    6868        public ImageIcon getIcon() {
    69                 URL url = getClass().getResource("/images/Smp.png");
     69                URL url = getClass().getResource("/images/wayarea.png");
    7070                if (url == null)
    7171                        return null;
    … …  
    8282        public JComponent getComponent() {
    8383                manager.showVisualMessage(msg);
    84                 oseam = new OSeaMAction(manager);
     84                wayarea = new WayAreaAction(manager);
    8585
    86                 return oseam.getOSeaMPanel();
     86                return wayarea.getWayAreaPanel();
    8787        }
    8888

  • applications/editors/josm/plugins/smed/plugs/wayarea/src/wayarea/dialogs/WayAreaAction.java

    r27463 r27477  
    1 package oseam.dialogs;
     1package wayarea.dialogs;
    22
    3 import oseam.panels.*;
     3import wayarea.panels.*;
    44
    55import java.awt.*;
    … …  
    1111import org.openstreetmap.josm.data.osm.*;
    1212
    13 import oseam.Messages;
    14 import oseam.seamarks.SeaMark;
     13import wayarea.Messages;
    1514import smed.plug.ifc.SmedPluginManager;
    1615
    17 public class OSeaMAction {
     16public class WayAreaAction {
    1817
    19         private OSeaMAction dlg = null;
     18        private WayAreaAction dlg = null;
    2019        public SmedPluginManager manager = null;;
    2120        public PanelMain panelMain = null;
    … …  
    3534                                                if (nextNode.compareTo(node) != 0) {
    3635                                                        node = nextNode;
    37                                                         panelMain.mark.parseMark(node);
     36//                                                      panelMain.mark.parseMark(node);
    3837                                                }
    3938                                        } else {
    4039                                                node = null;
    41                                                 panelMain.mark.clrMark();
     40//                                              panelMain.mark.clrMark();
    4241                                                manager.showVisualMessage(Messages.getString("OneNode"));
    4342                                        }
    … …  
    4645                        if (nextNode == null) {
    4746                                node = null;
    48                                 panelMain.mark.clrMark();
     47//                              panelMain.mark.clrMark();
    4948                                manager.showVisualMessage(Messages.getString("SelectNode"));
    5049                        }
    … …  
    5251        };
    5352
    54         public OSeaMAction(SmedPluginManager mngr) {
     53        public WayAreaAction(SmedPluginManager mngr) {
    5554
    5655                // System.out.println("hello");
    … …  
    6665        }
    6766
    68         public JPanel getOSeaMPanel() {
     67        public JPanel getWayAreaPanel() {
    6968                if (panelMain == null) {
    7069                        panelMain = new PanelMain(this);
Note: See TracChangeset for help on using the changeset viewer.