Changeset 12636 in josm for trunk/src/org/openstreetmap/josm/actions/ValidateAction.java

Timestamp:

2017-08-24T22:53:50+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15182 - deprecate Main.getLayerManager(). Replacement: gui.MainApplication.getLayerManager()

File:

• trunk/src/org/openstreetmap/josm/actions/ValidateAction.java (modified) (4 diffs)

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

@@ -12 +12 @@
 import java.util.Optional;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.validation.OsmValidator;
@@ -77 +76 @@
         Collection<OsmPrimitive> selection;
         if (getSelectedItems) {
-            selection = Main.getLayerManager().getEditDataSet().getAllSelected();
+            selection = getLayerManager().getEditDataSet().getAllSelected();
             if (selection.isEmpty()) {
-                selection = Main.getLayerManager().getEditDataSet().allNonDeletedPrimitives();
+                selection = getLayerManager().getEditDataSet().allNonDeletedPrimitives();
                 lastSelection = null;
             } else {
@@ -88 +87 @@
         } else {
             selection = Optional.ofNullable(lastSelection).orElseGet(
-                    () -> Main.getLayerManager().getEditDataSet().allNonDeletedPrimitives());
+                    () -> getLayerManager().getEditDataSet().allNonDeletedPrimitives());
         }
 
@@ -147 +146 @@
                 map.validatorDialog.unfurlDialog();
                 //FIXME: nicer way to find / invalidate the corresponding error layer
-                Main.getLayerManager().getLayersOfType(ValidatorLayer.class).forEach(ValidatorLayer::invalidate);
+                MainApplication.getLayerManager().getLayersOfType(ValidatorLayer.class).forEach(ValidatorLayer::invalidate);
             });
         }