Changeset 12718 in josm for trunk/src/org/openstreetmap/josm/command/Command.java

Timestamp:

2017-09-04T00:50:22+02:00 (9 years ago)

Author:

Don-vip

Message:

see #13036 - see #15229 - see #15182 - make Commands depends only on a DataSet, not a Layer. This removes a lot of GUI dependencies

File:

• trunk/src/org/openstreetmap/josm/command/Command.java (modified) (7 diffs)

trunk/src/org/openstreetmap/josm/command/Command.java

@@ -35 +35 @@
  * one atomic action on a specific dataset, such as move or delete.
  *
- * The command remembers the {@link OsmDataLayer} it is operating on.
+ * The command remembers the {@link DataSet} it is operating on.
  *
  * @author imi
@@ -135 +135 @@
     private Map<OsmPrimitive, PrimitiveData> cloneMap = new HashMap<>();
 
-    /** the layer which this command is applied to */
+    /**
+     * the layer which this command is applied to
+     * @deprecated to be removed end of 2017. Use {@link #data} instead
+     */
+    @Deprecated
     private final OsmDataLayer layer;
 
@@ -146 +150 @@
     public Command() {
         this.layer = MainApplication.getLayerManager().getEditLayer();
-        this.data = layer != null ? layer.data : null;
+        this.data = layer != null ? layer.data : Main.main.getEditDataSet();
     }
 
@@ -154 +158 @@
      * @param layer the data layer. Must not be null.
      * @throws IllegalArgumentException if layer is null
-     */
+     * @deprecated to be removed end of 2017. Use {@link #Command(DataSet)} instead
+     */
+    @Deprecated
     public Command(OsmDataLayer layer) {
         CheckParameterUtil.ensureParameterNotNull(layer, "layer");
@@ -216 +222 @@
      * @param oldLayer the old layer that was removed
      * @return true if this command is invalid after that layer is removed.
-     */
+     * @deprecated to be removed end of 2017.
+     */
+    @Deprecated
     public boolean invalidBecauselayerRemoved(Layer oldLayer) {
         return layer == oldLayer;
@@ -234 +242 @@
      * Replies the layer this command is (or was) applied to.
      * @return the layer this command is (or was) applied to
-     */
+     * @deprecated to be removed end of 2017. Use {@link #getAffectedDataSet} instead
+     */
+    @Deprecated
     protected OsmDataLayer getLayer() {
         return layer;
@@ -371 +381 @@
      * Invalidate all layers that were affected by this command.
      * @see Layer#invalidate()
-     */
+     * @deprecated to be removed end of 2017.
+     */
+    @Deprecated
     public void invalidateAffectedLayers() {
         OsmDataLayer layer = getLayer();