Changeset 10972 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2016-09-07T01:23:17+02:00 (8 years ago)

Author:

Don-vip

Message:

remove deprecated stuff - gsoc-core

File:

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

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

@@ -23 +23 @@
 import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeEvent;
 import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListener;
-import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.progress.PleaseWaitProgressMonitor;
 import org.openstreetmap.josm.tools.Destroyable;
@@ -38 +37 @@
  * a layer change event or a selection change event it invokes {@link #updateEnabledState()}.
  * Subclasses can override {@link #updateEnabledState()} in order to update the {@link #isEnabled()}-state
- * of a JosmAction depending on the {@link #getCurrentDataSet()} and the current layers
- * (see also {@link #getEditLayer()}).
+ * of a JosmAction depending on the {@link #getLayerManager()} state.
  *
  * destroy() from interface Destroyable is called e.g. for MapModes, when the last layer has
@@ -270 +268 @@
     }
 
-    /**
-     * Replies the current edit layer
-     *
-     * @return the current edit layer. null, if no edit layer exists
-     * @deprecated Use {@link #getLayerManager()}.getEditLayer() instead. To be removed in end of 2016.
-     */
-    @Deprecated
-    public static OsmDataLayer getEditLayer() {
-        return Main.getLayerManager().getEditLayer();
-    }
-
-    /**
-     * Replies the current dataset.
-     *
-     * @return the current dataset. null, if no current dataset exists
-     * @deprecated Use {@link #getLayerManager()}.getEditDataSet() instead. To be removed in end of 2016.
-     */
-    @Deprecated
-    public static DataSet getCurrentDataSet() {
-        return Main.getLayerManager().getEditDataSet();
-    }
-
     protected static void waitFuture(final Future<?> future, final PleaseWaitProgressMonitor monitor) {
         Main.worker.submit(() -> {