Changeset 1814 in josm for trunk/src/org/openstreetmap/josm/actions/JosmAction.java

Timestamp:

2009-07-19T19:04:49+02:00 (15 years ago)

Author:

Gubaer

Message:

removed dependencies to Main.ds, removed Main.ds
removed AddVisitor, NameVisitor, DeleteVisitor - unnecessary double dispatching for these simple cases

File:

• trunk/src/org/openstreetmap/josm/actions/JosmAction.java (modified) (3 diffs)

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

@@ -9 +9 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.tools.Destroyable;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -61 +62 @@
         putValue(SHORT_DESCRIPTION, Main.platform.makeTooltip(tooltip, sc));
         putValue("toolbar", iconName);
-        if (register)
+        if (register) {
             Main.toolbar.register(this);
+        }
     }
 
@@ -92 +94 @@
     private void setHelpId() {
         String helpId = "Action/"+getClass().getName().substring(getClass().getName().lastIndexOf('.')+1);
-        if (helpId.endsWith("Action"))
+        if (helpId.endsWith("Action")) {
             helpId = helpId.substring(0, helpId.length()-6);
+        }
         putValue("help", helpId);
     }
+
+    /**
+     * Replies the current edit layer
+     * 
+     * @return the current edit layer. null, if no edit layer exists
+     */
+    protected OsmDataLayer getEditLayer() {
+        return Main.main.getEditLayer();
+    }
+
+    /**
+     * Replies the current dataset
+     * 
+     * @return the current dataset. null, if no current dataset exists
+     */
+    protected DataSet getCurrentDataSet() {
+        return Main.main.getCurrentDataSet();
+    }
 }