Changeset 3835 in josm


Ignore:
Timestamp:
2011-01-31T00:10:01+01:00 (11 years ago)
Author:
stoecker
Message:

fix #5885

Location:
trunk/src/org/openstreetmap/josm/actions
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java

    r3826 r3835  
    2525    public void actionPerformed(ActionEvent e) {
    2626        if (!isEnabled()) return;
    27         ImageryLayer wmsLayer = ImageryLayer.create(info);
    28         Main.main.addLayer(wmsLayer);
     27        Main.main.addLayer(ImageryLayer.create(info));
    2928    }
    3029
  • trunk/src/org/openstreetmap/josm/actions/DeleteAction.java

    r3083 r3835  
    2626        if(!Main.map.mapView.isActiveLayerVisible())
    2727            return;
    28         new org.openstreetmap.josm.actions.mapmode.DeleteAction(Main.map)
    29         .doActionPerformed(e);
     28        org.openstreetmap.josm.actions.mapmode.DeleteAction.doActionPerformed(e);
    3029    }
    3130
  • trunk/src/org/openstreetmap/josm/actions/JosmAction.java

    r3504 r3835  
    127127     * @return the current edit layer. null, if no edit layer exists
    128128     */
    129     protected OsmDataLayer getEditLayer() {
     129    protected static OsmDataLayer getEditLayer() {
    130130        return Main.main.getEditLayer();
    131131    }
     
    136136     * @return the current dataset. null, if no current dataset exists
    137137     */
    138     protected DataSet getCurrentDataSet() {
     138    protected static DataSet getCurrentDataSet() {
    139139        return Main.main.getCurrentDataSet();
    140140    }
  • trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java

    r3177 r3835  
    133133    @Override public void actionPerformed(ActionEvent e) {
    134134        super.actionPerformed(e);
    135         if(!Main.map.mapView.isActiveLayerDrawable())
    136             return;
    137135        doActionPerformed(e);
    138136    }
    139137
    140     public void doActionPerformed(ActionEvent e) {
     138    static public void doActionPerformed(ActionEvent e) {
    141139        if(!Main.map.mapView.isActiveLayerDrawable())
    142140            return;
Note: See TracChangeset for help on using the changeset viewer.