Changeset 14120 in josm for trunk/test/functional/org/openstreetmap

Timestamp:

2018-08-11T17:29:48+02:00 (6 years ago)

Author:

Don-vip

Message:

see #15229 - deprecate all Main methods related to projections. New ProjectionRegistry class

Location:

trunk/test/functional/org/openstreetmap/josm

Files:

• gui/conflict/pair/properties/PropertiesMergerTestFT.java (modified) (2 diffs)
• gui/mappaint/MapCSSRendererTest.java (modified) (3 diffs)
• io/OsmServerBackreferenceReaderTest.java (modified) (3 diffs)

trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergerTestFT.java

@@ -6 +6 @@
 import javax.swing.JFrame;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.data.projection.Projections;
 
@@ -18 +18 @@
 
     protected void build() {
-        Main.setProjection(Projections.getProjectionByCode("EPSG:4326")); // WGS 84
+        ProjectionRegistry.setProjection(Projections.getProjectionByCode("EPSG:4326")); // WGS 84
 
         setLayout(new BorderLayout());

trunk/test/functional/org/openstreetmap/josm/gui/mappaint/MapCSSRendererTest.java

@@ -31 +31 @@
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.Bounds;
@@ -38 +37 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.visitor.paint.StyledMapRenderer;
+import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.io.IllegalDataException;
 import org.openstreetmap.josm.io.OsmReader;
@@ -183 +183 @@
 
         ProjectionBounds pb = new ProjectionBounds();
-        pb.extend(Main.getProjection().latlon2eastNorth(testConfig.getTestArea().getMin()));
-        pb.extend(Main.getProjection().latlon2eastNorth(testConfig.getTestArea().getMax()));
+        pb.extend(ProjectionRegistry.getProjection().latlon2eastNorth(testConfig.getTestArea().getMin()));
+        pb.extend(ProjectionRegistry.getProjection().latlon2eastNorth(testConfig.getTestArea().getMax()));
         double scale = (pb.maxEast - pb.minEast) / testConfig.imageWidth;
 

trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java

@@ -26 +26 @@
 import org.junit.Test;
 import org.openstreetmap.josm.JOSMFixture;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.APIDataSet;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -38 +37 @@
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.data.projection.Projections;
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
@@ -167 +167 @@
         //
         Config.getPref().putBoolean("osm-server.atomic-upload", false);
-        Main.setProjection(Projections.getProjectionByCode("EPSG:3857")); // Mercator
+        ProjectionRegistry.setProjection(Projections.getProjectionByCode("EPSG:3857")); // Mercator
         Logging.setLogLevel(Logging.LEVEL_DEBUG);