Changeset 12636 in josm for trunk/src/org/openstreetmap/josm/data/validation

Timestamp:

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

Author:

Don-vip

Message:

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

Location:

trunk/src/org/openstreetmap/josm/data/validation

Files:

• OsmValidator.java (modified) (2 diffs)
• Test.java (modified) (3 diffs)
• tests/DuplicateNode.java (modified) (2 diffs)
• tests/UnconnectedWays.java (modified) (2 diffs)
• tests/UntaggedWay.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java

@@ -58 +58 @@
 import org.openstreetmap.josm.data.validation.tests.WayConnectedToArea;
 import org.openstreetmap.josm.data.validation.tests.WronglyOrderedWays;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.ValidatorLayer;
 import org.openstreetmap.josm.gui.preferences.projection.ProjectionPreference;
@@ -238 +239 @@
         if (errorLayer == null) {
             errorLayer = new ValidatorLayer();
-            Main.getLayerManager().addLayer(errorLayer);
+            MainApplication.getLayerManager().addLayer(errorLayer);
         }
     }

trunk/src/org/openstreetmap/josm/data/validation/Test.java

@@ -15 +15 @@
 import javax.swing.JPanel;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.search.SearchCompiler.NotOutsideDataSourceArea;
 import org.openstreetmap.josm.command.Command;
@@ -24 +23 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.visitor.AbstractVisitor;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
@@ -331 +331 @@
         }
         if (!primitivesToDelete.isEmpty()) {
-            return DeleteCommand.delete(Main.getLayerManager().getEditLayer(), primitivesToDelete);
+            return DeleteCommand.delete(MainApplication.getLayerManager().getEditLayer(), primitivesToDelete);
         } else {
             return null;

trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java

@@ -34 +34 @@
 import org.openstreetmap.josm.data.validation.Test;
 import org.openstreetmap.josm.data.validation.TestError;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.tools.MultiMap;
@@ -333 +334 @@
 
             if (Command.checkOutlyingOrIncompleteOperation(nodes, Collections.singleton(target)) == Command.IS_OK)
-                return MergeNodesAction.mergeNodes(Main.getLayerManager().getEditLayer(), nodes, target);
+                return MergeNodesAction.mergeNodes(MainApplication.getLayerManager().getEditLayer(), nodes, target);
         }
 

trunk/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java

@@ -31 +31 @@
 import org.openstreetmap.josm.data.validation.Test;
 import org.openstreetmap.josm.data.validation.TestError;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.preferences.validator.ValidatorPreference;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
@@ -168 +169 @@
         mindist = Main.pref.getDouble(PREFIX + ".node_way_distance", 10.0);
         minmiddledist = Main.pref.getDouble(PREFIX + ".way_way_distance", 0.0);
-        DataSet dataSet = Main.getLayerManager().getEditDataSet();
+        DataSet dataSet = MainApplication.getLayerManager().getEditDataSet();
         dsArea = dataSet == null ? null : dataSet.getDataSourceArea();
     }

trunk/src/org/openstreetmap/josm/data/validation/tests/UntaggedWay.java

@@ -9 +9 @@
 import java.util.Set;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -19 +18 @@
 import org.openstreetmap.josm.data.validation.Test;
 import org.openstreetmap.josm.data.validation.TestError;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 
@@ -142 +142 @@
     public void startTest(ProgressMonitor monitor) {
         super.startTest(monitor);
-        DataSet ds = Main.getLayerManager().getEditDataSet();
+        DataSet ds = MainApplication.getLayerManager().getEditDataSet();
         if (ds == null)
             return;