Changeset 12795 in josm for trunk/src


Ignore:
Timestamp:
2017-09-09T10:35:27+02:00 (7 years ago)
Author:
bastiK
Message:

see #15273, see #15229 - fix unit tests, PMD, etc.

Location:
trunk/src/org/openstreetmap/josm
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/org/openstreetmap/josm/data/coor/conversion/LatLonParser.java

    r12792 r12795  
    5454        private double lat = Double.NaN;
    5555        private double lon = Double.NaN;
     56    }
     57
     58    private LatLonParser() {
     59        // private constructor
    5660    }
    5761

  • trunk/src/org/openstreetmap/josm/data/projection/ProjectionCLI.java

    r12792 r12795  
    3333    public static final ProjectionCLI INSTANCE = new ProjectionCLI();
    3434
    35     private boolean argInverse = false;
    36     private boolean argSwitchInput = false;
    37     private boolean argSwitchOutput = false;
     35    private boolean argInverse = false;         // NOPMD
     36    private boolean argSwitchInput = false;     // NOPMD
     37    private boolean argSwitchOutput = false;    // NOPMD
    3838
    3939    @Override
    … …  
    6262                argSwitchOutput = true;
    6363                break;
     64            default:
     65                // ignore
    6466            }
    6567        }
    … …  
    127129                "    EOF\n"+
    128130                "       => 1250371.1334500168 6545331.055189664\n" +
    129                 "          -1.3208998232319113E7 4486401.160664663\n" +
    130                 "";
     131                "          -1.3208998232319113E7 4486401.160664663\n";
    131132    }
    132133

  • trunk/src/org/openstreetmap/josm/gui/MainApplication.java

    r12792 r12795  
    978978        Main.toolbar = toolbar;
    979979        ProjectionPreference.setProjection();
    980         NTV2GridShiftFileWrapper.registerNTV2GridShiftFileSource(
    981                 NTV2GridShiftFileWrapper.NTV2_SOURCE_PRIORITY_LOCAL,
    982                 NTV2Proj4DirGridShiftFileSource.getInstance());
    983         NTV2GridShiftFileWrapper.registerNTV2GridShiftFileSource(
    984                 NTV2GridShiftFileWrapper.NTV2_SOURCE_PRIORITY_DOWNLOAD,
    985                 JOSM_WEBSITE_NTV2_SOURCE);
     980        setupNadGridSources();
    986981        GuiHelper.translateJavaInternalMessages();
    987982        preConstructorInit();
    … …  
    10371032            RepaintManager.setCurrentManager(new CheckThreadViolationRepaintManager());
    10381033        }
     1034    }
     1035
     1036    /**
     1037     * Setup the sources for NTV2 grid shift files for projection support.
     1038     * @since 12795
     1039     */
     1040    public static void setupNadGridSources() {
     1041        NTV2GridShiftFileWrapper.registerNTV2GridShiftFileSource(
     1042                NTV2GridShiftFileWrapper.NTV2_SOURCE_PRIORITY_LOCAL,
     1043                NTV2Proj4DirGridShiftFileSource.getInstance());
     1044        NTV2GridShiftFileWrapper.registerNTV2GridShiftFileSource(
     1045                NTV2GridShiftFileWrapper.NTV2_SOURCE_PRIORITY_DOWNLOAD,
     1046                JOSM_WEBSITE_NTV2_SOURCE);
    10391047    }
    10401048
Note: See TracChangeset for help on using the changeset viewer.