Changeset 3835 in josm for trunk/src/org

Timestamp:

2011-01-31T00:10:01+01:00 (14 years ago)

Author:

stoecker

Message:

fix #5885

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• AddImageryLayerAction.java (modified) (1 diff)
• DeleteAction.java (modified) (1 diff)
• JosmAction.java (modified) (2 diffs)
• mapmode/DeleteAction.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java

@@ -25 +25 @@
     public void actionPerformed(ActionEvent e) {
         if (!isEnabled()) return;
-        ImageryLayer wmsLayer = ImageryLayer.create(info);
-        Main.main.addLayer(wmsLayer);
+        Main.main.addLayer(ImageryLayer.create(info));
     }
 

trunk/src/org/openstreetmap/josm/actions/DeleteAction.java

@@ -26 +26 @@
         if(!Main.map.mapView.isActiveLayerVisible())
             return;
-        new org.openstreetmap.josm.actions.mapmode.DeleteAction(Main.map)
-        .doActionPerformed(e);
+        org.openstreetmap.josm.actions.mapmode.DeleteAction.doActionPerformed(e);
     }
 

trunk/src/org/openstreetmap/josm/actions/JosmAction.java

@@ -127 +127 @@
      * @return the current edit layer. null, if no edit layer exists
      */
-    protected OsmDataLayer getEditLayer() {
+    protected static OsmDataLayer getEditLayer() {
         return Main.main.getEditLayer();
     }
@@ -136 +136 @@
      * @return the current dataset. null, if no current dataset exists
      */
-    protected DataSet getCurrentDataSet() {
+    protected static DataSet getCurrentDataSet() {
         return Main.main.getCurrentDataSet();
     }

trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java

@@ -133 +133 @@
     @Override public void actionPerformed(ActionEvent e) {
         super.actionPerformed(e);
-        if(!Main.map.mapView.isActiveLayerDrawable())
-            return;
         doActionPerformed(e);
     }
 
-    public void doActionPerformed(ActionEvent e) {
+    static public void doActionPerformed(ActionEvent e) {
         if(!Main.map.mapView.isActiveLayerDrawable())
             return;