Changeset 12691 in josm for trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.java

Timestamp:

2017-08-28T19:26:47+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15182 - introduce Main.getEditDataSet to avoid unneeded GUI dependence in validator tests and tagging presets

File:

• trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.java

@@ -86 +86 @@
      */
     public synchronized void add(final Command c) {
-        DataSet ds = Optional.ofNullable(c.getAffectedDataSet()).orElseGet(() -> MainApplication.getLayerManager().getEditDataSet());
+        DataSet ds = Optional.ofNullable(c.getAffectedDataSet()).orElseGet(() -> Main.main.getEditDataSet());
         Collection<? extends OsmPrimitive> oldSelection = null;
         if (ds != null) {
@@ -115 +115 @@
         if (commands.isEmpty())
             return;
-        DataSet ds = MainApplication.getLayerManager().getEditDataSet();
+        DataSet ds = Main.main.getEditDataSet();
         Collection<? extends OsmPrimitive> oldSelection = null;
         if (ds != null) {
@@ -156 +156 @@
         if (redoCommands.isEmpty())
             return;
-        DataSet ds = MainApplication.getLayerManager().getEditDataSet();
+        DataSet ds = Main.main.getEditDataSet();
         Collection<? extends OsmPrimitive> oldSelection = ds.getSelected();
         for (int i = 0; i < num; ++i) {