Changeset 12783 in josm

Timestamp:

2017-09-08T02:50:52+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15229 - fix warnings

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFileWrapper.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/projection/datum/NTV2Proj4DirGridShiftFileSource.java (modified) (1 diff)
• src/org/openstreetmap/josm/tools/PlatformHook.java (modified) (1 diff)
• test/performance/org/openstreetmap/josm/gui/mappaint/MapRendererPerformanceTest.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFileWrapper.java

@@ -24 +24 @@
     private final String gridFileName;
 
-    public static float NTV2_SOURCE_PRIORITY_LOCAL = 10f;
-    public static float NTV2_SOURCE_PRIORITY_DOWNLOAD = 5f;
+    public static final float NTV2_SOURCE_PRIORITY_LOCAL = 10f;
+    public static final float NTV2_SOURCE_PRIORITY_DOWNLOAD = 5f;
 
-    private static Map<Float, NTV2GridShiftFileSource> sources =
-            new TreeMap<Float, NTV2GridShiftFileSource>(Collections.reverseOrder());
+    private static Map<Float, NTV2GridShiftFileSource> sources = new TreeMap<>(Collections.reverseOrder());
 
     /**

trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2Proj4DirGridShiftFileSource.java

@@ -18 +18 @@
  * @since 12777
  */
-public class NTV2Proj4DirGridShiftFileSource implements NTV2GridShiftFileSource, PlatformVisitor<List<File>> {
+public final class NTV2Proj4DirGridShiftFileSource implements NTV2GridShiftFileSource, PlatformVisitor<List<File>> {
 
     private NTV2Proj4DirGridShiftFileSource() {

trunk/src/org/openstreetmap/josm/tools/PlatformHook.java

@@ -34 +34 @@
      * Visitor to construct a PlatformHook from a given {@link Platform} object.
      */
-    static final PlatformVisitor<PlatformHook> CONSTRUCT_FROM_PLATFORM = new PlatformVisitor<PlatformHook>() {
+    final PlatformVisitor<PlatformHook> CONSTRUCT_FROM_PLATFORM = new PlatformVisitor<PlatformHook>() {
         @Override
         public PlatformHook visitUnixoid() {

trunk/test/performance/org/openstreetmap/josm/gui/mappaint/MapRendererPerformanceTest.java

@@ -26 +26 @@
 import org.junit.rules.Timeout;
 import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.PerformanceTestUtils;
 import org.openstreetmap.josm.TestUtils;
@@ -35 +36 @@
 import org.openstreetmap.josm.data.osm.visitor.paint.StyledMapRenderer.StyleRecord;
 import org.openstreetmap.josm.data.preferences.sources.SourceEntry;
-import org.openstreetmap.josm.data.projection.Projections;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.NavigatableComponent;
@@ -187 +187 @@
                 scale = SCALE_Z17;
             }
-            nc.zoomTo(Projections.project(center), scale);
+            nc.zoomTo(Main.getProjection().latlon2eastNorth(center), scale);
             if (checkScale) {
                 int lvl = Selector.OptimizedGeneralSelector.scale2level(nc.getDist100Pixel());