Changeset 22548 in osm


Ignore:
Timestamp:
2010-08-03T08:13:23+02:00 (14 years ago)
Author:
jttt
Message:

Adapt to latest josm

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

Legend:

Unmodified
Added
Removed

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

    r21706 r22548  
    1818**
    1919** To build against the core in ../../core, create a correct manifest and deploy to
    20 ** SVN, 
     20** SVN,
    2121**    set the properties commit.message and plugin.main.version
    2222** and run
    … …  
    2929
    3030        <property name="commit.message" value="Changed constructor signature of plugin main class" />
    31         <property name="plugin.main.version" value="2907" />
     31        <property name="plugin.main.version" value="3408" />
    3232
    3333
    … …  
    8989
    9090        <!--
    91          ************************** Publishing the plugin *********************************** 
     91         ************************** Publishing the plugin ***********************************
    9292        -->
    9393        <!--
    94         ** extracts the JOSM release for the JOSM version in ../core and saves it in the 
     94        ** extracts the JOSM release for the JOSM version in ../core and saves it in the
    9595        ** property ${coreversion.info.entry.revision}
    9696        **
    … …  
    141141
    142142        <!--
    143         ** commits the plugin.jar 
     143        ** commits the plugin.jar
    144144        -->
    145145        <target name="commit-dist">
    146146                <echo>
    147147***** Properties of published ${plugin.jar} *****
    148 Commit message    : '${commit.message}'                                 
     148Commit message    : '${commit.message}'
    149149Plugin-Mainversion: ${plugin.main.version}
    150150JOSM build version: ${coreversion.info.entry.revision}
    151151Plugin-Version    : ${version.entry.commit.revision}
    152 ***** / Properties of published ${plugin.jar} *****                                     
    153                                        
     152***** / Properties of published ${plugin.jar} *****
     153
    154154Now commiting ${plugin.jar} ...
    155155</echo>

  • applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java

    r21582 r22548  
    77
    88import java.awt.Color;
    9 import java.awt.Component;
    109import java.awt.Graphics2D;
    1110import java.awt.Point;
    … …  
    1413
    1514import javax.swing.AbstractAction;
     15import javax.swing.Action;
    1616import javax.swing.Icon;
    1717import javax.swing.ImageIcon;
    18 import javax.swing.JMenuItem;
    19 import javax.swing.JSeparator;
    2018
    2119import org.openstreetmap.josm.Main;
    … …  
    7371
    7472        @Override
    75         public Component[] getMenuEntries() {
    76                 return new Component[] {
    77                                 new JMenuItem(LayerListDialog.getInstance().createShowHideLayerAction(this)),
    78                                 new JMenuItem(LayerListDialog.getInstance().createDeleteLayerAction(this)),
    79                                 new JSeparator(),
    80                                 new JMenuItem(layerImport),
    81                                 new JMenuItem(new ConvertToGpxLayerAction()),
    82                                 new JMenuItem(new ConvertToAnonTimeGpxLayerAction()),
    83                                 new JSeparator(),
    84                                 new JMenuItem(new LayerListPopup.InfoAction(this))};
     73        public Action[] getMenuEntries() {
     74                return new Action[] {
     75                                LayerListDialog.getInstance().createShowHideLayerAction(),
     76                                LayerListDialog.getInstance().createDeleteLayerAction(),
     77                                SeparatorLayerAction.INSTANCE,
     78                                layerImport,
     79                                new ConvertToGpxLayerAction(),
     80                                new ConvertToAnonTimeGpxLayerAction(),
     81                                SeparatorLayerAction.INSTANCE,
     82                                new LayerListPopup.InfoAction(this)};
    8583        }
    8684

  • applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java

    r21474 r22548  
    2525 * TODO:
    2626 * - BUG: when importing eGpxLayer is shown as RawGpxLayer??
    27  * - BUG: after deletion of layer not all data is deleted (eg dataset)
    2827 * - implement reset if user made mistake while marking
    2928 *

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

    r21706 r22548  
    1818**
    1919** To build against the core in ../../core, create a correct manifest and deploy to
    20 ** SVN, 
     20** SVN,
    2121**    set the properties commit.message and plugin.main.version
    2222** and run
    … …  
    2828
    2929        <property name="commit.message" value="Changed the constructor signature of the plugin main class" />
    30         <property name="plugin.main.version" value="3157" />
     30        <property name="plugin.main.version" value="3408" />
    3131
    3232        <property name="josm"                   location="../../core/dist/josm-custom.jar"/>
    … …  
    8787
    8888        <!--
    89                  ************************** Publishing the plugin *********************************** 
     89                 ************************** Publishing the plugin ***********************************
    9090                -->
    9191        <!--
    92                 ** extracts the JOSM release for the JOSM version in ../core and saves it in the 
     92                ** extracts the JOSM release for the JOSM version in ../core and saves it in the
    9393                ** property ${coreversion.info.entry.revision}
    9494                **
    … …  
    139139
    140140        <!--
    141                 ** commits the plugin.jar 
     141                ** commits the plugin.jar
    142142                -->
    143143        <target name="commit-dist">
    144144                <echo>
    145145        ***** Properties of published ${plugin.jar} *****
    146         Commit message    : '${commit.message}'                                 
     146        Commit message    : '${commit.message}'
    147147        Plugin-Mainversion: ${plugin.main.version}
    148148        JOSM build version: ${coreversion.info.entry.revision}
    149149        Plugin-Version    : ${version.entry.commit.revision}
    150         ***** / Properties of published ${plugin.jar} *****                                     
    151                                                
     150        ***** / Properties of published ${plugin.jar} *****
     151
    152152        Now commiting ${plugin.jar} ...
    153153        </echo>

  • applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java

    r20682 r22548  
    3030import static org.openstreetmap.josm.tools.I18n.tr;
    3131
    32 import java.awt.Component;
    3332import java.awt.Dimension;
    3433import java.awt.Graphics2D;
    … …  
    4241import java.util.List;
    4342
     43import javax.swing.Action;
    4444import javax.swing.Icon;
    4545import javax.swing.ImageIcon;
    46 import javax.swing.JMenuItem;
    47 import javax.swing.JSeparator;
    4846import javax.swing.JToolTip;
    4947
    … …  
    7472    private static ImageIcon iconError = OsbPlugin.loadIcon("icon_error16.png");
    7573    private static ImageIcon iconValid = OsbPlugin.loadIcon("icon_valid16.png");
    76    
     74
    7775    private OsbDialog dialog;
    7876
    … …  
    10098
    10199    @Override
    102     public Component[] getMenuEntries() {
    103         return new Component[]{
    104                 new JMenuItem(LayerListDialog.getInstance().createShowHideLayerAction(this)),
    105                 new JMenuItem(LayerListDialog.getInstance().createDeleteLayerAction(this)),
    106                 new JSeparator(),
    107                 new JMenuItem(new RenameLayerAction(null, this)),
    108                 new JSeparator(),
    109                 new JMenuItem(new LayerListPopup.InfoAction(this))};
     100    public Action[] getMenuEntries() {
     101        return new Action[]{
     102                LayerListDialog.getInstance().createShowHideLayerAction(),
     103                LayerListDialog.getInstance().createDeleteLayerAction(),
     104                SeparatorLayerAction.INSTANCE,
     105                new RenameLayerAction(null, this),
     106                SeparatorLayerAction.INSTANCE,
     107                new LayerListPopup.InfoAction(this)};
    110108    }
    111109
    … …  
    272270
    273271    public void mouseExited(MouseEvent e) {}
    274    
     272
    275273    public DataSet getDataSet() {
    276274        return data;
Note: See TracChangeset for help on using the changeset viewer.