Ignore:
Timestamp:
2014-04-26T17:39:23+02:00 (6 years ago)
Author:
Don-vip
Message:

see #8465 - use diamond operator where applicable

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

Legend:

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

    r6990 r7005  
    7575        public boolean hasValue;
    7676
    77         public static final Map<String, Param> paramsByKey = new HashMap<String, Param>();
     77        public static final Map<String, Param> paramsByKey = new HashMap<>();
    7878        static {
    7979            for (Param p : Param.values()) {
     
    161161
    162162    private Map<String, String> parseParameterList(String pref) throws ProjectionConfigurationException {
    163         Map<String, String> parameters = new HashMap<String, String>();
     163        Map<String, String> parameters = new HashMap<>();
    164164        String[] parts = Utils.WHITE_SPACES_PATTERN.split(pref.trim());
    165165        if (pref.trim().isEmpty()) {
     
    292292        if (numStr.length != 3 && numStr.length != 7)
    293293            throw new ProjectionConfigurationException(tr("Unexpected number of arguments for parameter ''towgs84'' (must be 3 or 7)"));
    294         List<Double> towgs84Param = new ArrayList<Double>();
     294        List<Double> towgs84Param = new ArrayList<>();
    295295        for (String str : numStr) {
    296296            try {
  • trunk/src/org/openstreetmap/josm/data/projection/Projections.java

    r6995 r7005  
    6060     * should be compatible to PROJ.4
    6161     */
    62     public static final Map<String, ProjFactory> projs = new HashMap<String, ProjFactory>();
    63     public static final Map<String, Ellipsoid> ellipsoids = new HashMap<String, Ellipsoid>();
    64     public static final Map<String, Datum> datums = new HashMap<String, Datum>();
    65     public static final Map<String, NTV2GridShiftFileWrapper> nadgrids = new HashMap<String, NTV2GridShiftFileWrapper>();
    66     public static final Map<String, Pair<String, String>> inits = new HashMap<String, Pair<String, String>>();
     62    public static final Map<String, ProjFactory> projs = new HashMap<>();
     63    public static final Map<String, Ellipsoid> ellipsoids = new HashMap<>();
     64    public static final Map<String, Datum> datums = new HashMap<>();
     65    public static final Map<String, NTV2GridShiftFileWrapper> nadgrids = new HashMap<>();
     66    public static final Map<String, Pair<String, String>> inits = new HashMap<>();
    6767
    6868    static {
     
    158158    }
    159159
    160     private static final Set<String> allCodes = new HashSet<String>();
    161     private static final Map<String, ProjectionChoice> allProjectionChoicesByCode = new HashMap<String, ProjectionChoice>();
    162     private static final Map<String, Projection> projectionsByCode_cache = new HashMap<String, Projection>();
     160    private static final Set<String> allCodes = new HashSet<>();
     161    private static final Map<String, ProjectionChoice> allProjectionChoicesByCode = new HashMap<>();
     162    private static final Map<String, Projection> projectionsByCode_cache = new HashMap<>();
    163163
    164164    static {
  • trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java

    r6995 r7005  
    167167    private NTV2SubGrid[] createSubGridTree(NTV2SubGrid[] subGrid) {
    168168        int topLevelCount = 0;
    169         HashMap<String, List<NTV2SubGrid>> subGridMap = new HashMap<String, List<NTV2SubGrid>>();
     169        HashMap<String, List<NTV2SubGrid>> subGridMap = new HashMap<>();
    170170        for (int i = 0; i < subGrid.length; i++) {
    171171            if ("NONE".equalsIgnoreCase(subGrid[i].getParentSubGridName())) {
Note: See TracChangeset for help on using the changeset viewer.