Changeset 12783 in josm


Ignore:
Timestamp:
2017-09-08T02:50:52+02:00 (2 years ago)
Author:
Don-vip
Message:

see #15229 - fix warnings

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFileWrapper.java

    r12777 r12783  
    2424    private final String gridFileName;
    2525
    26     public static float NTV2_SOURCE_PRIORITY_LOCAL = 10f;
    27     public static float NTV2_SOURCE_PRIORITY_DOWNLOAD = 5f;
     26    public static final float NTV2_SOURCE_PRIORITY_LOCAL = 10f;
     27    public static final float NTV2_SOURCE_PRIORITY_DOWNLOAD = 5f;
    2828
    29     private static Map<Float, NTV2GridShiftFileSource> sources =
    30             new TreeMap<Float, NTV2GridShiftFileSource>(Collections.reverseOrder());
     29    private static Map<Float, NTV2GridShiftFileSource> sources = new TreeMap<>(Collections.reverseOrder());
    3130
    3231    /**
  • trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2Proj4DirGridShiftFileSource.java

    r12777 r12783  
    1818 * @since 12777
    1919 */
    20 public class NTV2Proj4DirGridShiftFileSource implements NTV2GridShiftFileSource, PlatformVisitor<List<File>> {
     20public final class NTV2Proj4DirGridShiftFileSource implements NTV2GridShiftFileSource, PlatformVisitor<List<File>> {
    2121
    2222    private NTV2Proj4DirGridShiftFileSource() {
  • trunk/src/org/openstreetmap/josm/tools/PlatformHook.java

    r12780 r12783  
    3434     * Visitor to construct a PlatformHook from a given {@link Platform} object.
    3535     */
    36     static final PlatformVisitor<PlatformHook> CONSTRUCT_FROM_PLATFORM = new PlatformVisitor<PlatformHook>() {
     36    final PlatformVisitor<PlatformHook> CONSTRUCT_FROM_PLATFORM = new PlatformVisitor<PlatformHook>() {
    3737        @Override
    3838        public PlatformHook visitUnixoid() {
  • trunk/test/performance/org/openstreetmap/josm/gui/mappaint/MapRendererPerformanceTest.java

    r12651 r12783  
    2626import org.junit.rules.Timeout;
    2727import org.openstreetmap.josm.JOSMFixture;
     28import org.openstreetmap.josm.Main;
    2829import org.openstreetmap.josm.PerformanceTestUtils;
    2930import org.openstreetmap.josm.TestUtils;
     
    3536import org.openstreetmap.josm.data.osm.visitor.paint.StyledMapRenderer.StyleRecord;
    3637import org.openstreetmap.josm.data.preferences.sources.SourceEntry;
    37 import org.openstreetmap.josm.data.projection.Projections;
    3838import org.openstreetmap.josm.gui.MainApplication;
    3939import org.openstreetmap.josm.gui.NavigatableComponent;
     
    187187                scale = SCALE_Z17;
    188188            }
    189             nc.zoomTo(Projections.project(center), scale);
     189            nc.zoomTo(Main.getProjection().latlon2eastNorth(center), scale);
    190190            if (checkScale) {
    191191                int lvl = Selector.OptimizedGeneralSelector.scale2level(nc.getDist100Pixel());
Note: See TracChangeset for help on using the changeset viewer.