Index: /applications/editors/josm/plugins/proj4j/src/org/osgeo/proj4j/Registry.java =================================================================== --- /applications/editors/josm/plugins/proj4j/src/org/osgeo/proj4j/Registry.java (revision 32048) +++ /applications/editors/josm/plugins/proj4j/src/org/osgeo/proj4j/Registry.java (revision 32049) @@ -105,7 +105,7 @@ } - private Map projRegistry; - - private void register( String name, Class cls, String description ) { + private Map> projRegistry; + + private void register( String name, Class cls, String description ) { projRegistry.put( name, cls ); } @@ -114,5 +114,5 @@ // if ( projRegistry == null ) // initialize(); - Class cls = (Class)projRegistry.get( name ); + Class cls = (Class)projRegistry.get( name ); if ( cls != null ) { try { @@ -136,5 +136,5 @@ if (projRegistry != null) return; - projRegistry = new HashMap(); + projRegistry = new HashMap<>(); register( "aea", AlbersProjection.class, "Albers Equal Area" ); register( "aeqd", EquidistantAzimuthalProjection.class, "Azimuthal Equidistant" ); Index: /applications/editors/josm/plugins/proj4j/src/org/osgeo/proj4j/datum/GeocentricConverter.java =================================================================== --- /applications/editors/josm/plugins/proj4j/src/org/osgeo/proj4j/datum/GeocentricConverter.java (revision 32048) +++ /applications/editors/josm/plugins/proj4j/src/org/osgeo/proj4j/datum/GeocentricConverter.java (revision 32049) @@ -140,5 +140,5 @@ double SPHI; /* sin of searched geodetic latitude */ double SDPHI; /* end-criterium: addition-theorem of sin(Latitude(iter)-Latitude(iter-1)) */ - boolean At_Pole; /* indicates location is in polar region */ + //boolean At_Pole; /* indicates location is in polar region */ int iter; /* # of continous iteration, max. 30 is always enough (s.a.) */ @@ -150,5 +150,5 @@ double Height; - At_Pole = false; + //At_Pole = false; P = Math.sqrt(X*X+Y*Y); RR = Math.sqrt(X*X+Y*Y+Z*Z); @@ -158,5 +158,5 @@ /* special case, if P=0. (X=0., Y=0.) */ - At_Pole = true; + //At_Pole = true; Longitude = 0.0; Index: /applications/editors/josm/plugins/proj4j/src/org/osgeo/proj4j/io/CSVRecordParser.java =================================================================== --- /applications/editors/josm/plugins/proj4j/src/org/osgeo/proj4j/io/CSVRecordParser.java (revision 32048) +++ /applications/editors/josm/plugins/proj4j/src/org/osgeo/proj4j/io/CSVRecordParser.java (revision 32049) @@ -58,5 +58,5 @@ { loc = 0; - List vals = new ArrayList(); + List vals = new ArrayList<>(); int lineLen = record.length(); while (loc < lineLen) { Index: /applications/editors/josm/plugins/proj4j/src/org/osgeo/proj4j/io/MetaCRSTestCase.java =================================================================== --- /applications/editors/josm/plugins/proj4j/src/org/osgeo/proj4j/io/MetaCRSTestCase.java (revision 32048) +++ /applications/editors/josm/plugins/proj4j/src/org/osgeo/proj4j/io/MetaCRSTestCase.java (revision 32049) @@ -9,6 +9,4 @@ private static final CoordinateTransformFactory ctFactory = new CoordinateTransformFactory(); - private boolean verbose = true; - String testName; String testMethod; Index: /applications/editors/josm/plugins/proj4j/src/org/osgeo/proj4j/io/MetaCRSTestFileReader.java =================================================================== --- /applications/editors/josm/plugins/proj4j/src/org/osgeo/proj4j/io/MetaCRSTestFileReader.java (revision 32048) +++ /applications/editors/josm/plugins/proj4j/src/org/osgeo/proj4j/io/MetaCRSTestFileReader.java (revision 32049) @@ -34,13 +34,7 @@ throws IOException { - LineNumberReader lineReader = new LineNumberReader(new FileReader(file)); - List tests = null; - try { - tests = parseFile(lineReader); + try (LineNumberReader lineReader = new LineNumberReader(new FileReader(file))) { + return parseFile(lineReader); } - finally { - lineReader.close(); - } - return tests; } Index: /applications/editors/josm/plugins/proj4j/src/org/osgeo/proj4j/io/Proj4FileReader.java =================================================================== --- /applications/editors/josm/plugins/proj4j/src/org/osgeo/proj4j/io/Proj4FileReader.java (revision 32048) +++ /applications/editors/josm/plugins/proj4j/src/org/osgeo/proj4j/io/Proj4FileReader.java (revision 32049) @@ -28,15 +28,7 @@ throw new IllegalStateException("Unable to access CRS file: " + filename); } - BufferedReader reader = new BufferedReader( - new InputStreamReader(inStr) ); - String[] args; - try { - args = readFile(reader, name); + try (BufferedReader reader = new BufferedReader(new InputStreamReader(inStr))) { + return readFile(reader, name); } - finally { - if (reader != null) - reader.close(); - } - return args; } @@ -76,5 +68,5 @@ throw new IOException( t.lineno()+": '>' expected" ); t.nextToken(); - List v = new ArrayList(); + List v = new ArrayList<>(); while ( t.ttype != '<' ) { @@ -116,5 +108,5 @@ } - private static void addParam(List v, String key, String value) + private static void addParam(List v, String key, String value) { String plusKey = key; Index: /applications/editors/josm/plugins/proj4j/src/org/osgeo/proj4j/parser/DatumParameters.java =================================================================== --- /applications/editors/josm/plugins/proj4j/src/org/osgeo/proj4j/parser/DatumParameters.java (revision 32048) +++ /applications/editors/josm/plugins/proj4j/src/org/osgeo/proj4j/parser/DatumParameters.java (revision 32049) @@ -23,6 +23,6 @@ private final static double RA4 = .04722222222222222222; /* 17/360 */ private final static double RA6 = .02215608465608465608; /* 67/3024 */ - private final static double RV4 = .06944444444444444444; /* 5/72 */ - private final static double RV6 = .04243827160493827160; /* 55/1296 */ + //private final static double RV4 = .06944444444444444444; /* 5/72 */ + //private final static double RV6 = .04243827160493827160; /* 55/1296 */ private Datum datum = null; Index: /applications/editors/josm/plugins/proj4j/src/org/osgeo/proj4j/parser/Proj4Keyword.java =================================================================== --- /applications/editors/josm/plugins/proj4j/src/org/osgeo/proj4j/parser/Proj4Keyword.java (revision 32048) +++ /applications/editors/josm/plugins/proj4j/src/org/osgeo/proj4j/parser/Proj4Keyword.java (revision 32049) @@ -54,5 +54,5 @@ private static Set supportedParams = null; - public static synchronized Set supportedParameters() + public static synchronized Set supportedParameters() { if (supportedParams == null) { @@ -110,5 +110,5 @@ } - public static void checkUnsupported(Collection params) + public static void checkUnsupported(Collection params) { for (Object s : params) { Index: /applications/editors/josm/plugins/proj4j/src/org/osgeo/proj4j/parser/Proj4Parser.java =================================================================== --- /applications/editors/josm/plugins/proj4j/src/org/osgeo/proj4j/parser/Proj4Parser.java (revision 32048) +++ /applications/editors/josm/plugins/proj4j/src/org/osgeo/proj4j/parser/Proj4Parser.java (revision 32049) @@ -27,5 +27,5 @@ return null; - Map params = createParameterMap(args); + Map params = createParameterMap(args); Proj4Keyword.checkUnsupported(params.keySet()); DatumParameters datumParam = new DatumParameters(); @@ -45,5 +45,5 @@ * initialized from a PROJ.4 argument list. */ - private Projection parseProjection( Map params, Ellipsoid ellipsoid ) { + private Projection parseProjection( Map params, Ellipsoid ellipsoid ) { Projection projection = null; @@ -136,5 +136,5 @@ } - private void parseDatum(Map params, DatumParameters datumParam) + private void parseDatum(Map params, DatumParameters datumParam) { String towgs84 = (String) params.get(Proj4Keyword.towgs84); @@ -193,5 +193,5 @@ } - private void parseEllipsoid(Map params, DatumParameters datumParam) + private void parseEllipsoid(Map params, DatumParameters datumParam) { double b = 0; @@ -280,5 +280,5 @@ * @param datumParam */ - private void parseEllipsoidModifiers(Map params, DatumParameters datumParam) + private void parseEllipsoidModifiers(Map params, DatumParameters datumParam) { /** @@ -292,6 +292,6 @@ } - private Map createParameterMap(String[] args) { - Map params = new HashMap(); + private Map createParameterMap(String[] args) { + Map params = new HashMap<>(); for (int i = 0; i < args.length; i++) { String arg = args[i];