Changeset 7005 in josm for trunk/test/unit/org/openstreetmap/josm/data/projection

Timestamp:

2014-04-26T17:39:23+02:00 (12 years ago)

Author:

Don-vip

Message:

see #8465 - use diamond operator where applicable

Location:

trunk/test/unit/org/openstreetmap/josm/data/projection

Files:

• ProjectionRefTest.java (modified) (1 diff)
• ProjectionRegressionTest.java (modified) (4 diffs)

trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionRefTest.java

@@ -33 +33 @@
      */
     public static void main(String[] args) {
-        Map<String, Projection> allCodes = new HashMap<String, Projection>();
+        Map<String, Projection> allCodes = new HashMap<>();
         for (ProjectionChoice pc : ProjectionPreference.getProjectionChoices()) {
             for (String code : pc.allCodes()) {

trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java

@@ -58 +58 @@
         setUp();
 
-        Map<String, Projection> supportedCodesMap = new HashMap<String, Projection>();
+        Map<String, Projection> supportedCodesMap = new HashMap<>();
         for (ProjectionChoice pc : ProjectionPreference.getProjectionChoices()) {
             for (String code : pc.allCodes()) {
@@ -68 +68 @@
         }
 
-        List<TestData> prevData = new ArrayList<TestData>();
+        List<TestData> prevData = new ArrayList<>();
         if (new File(PROJECTION_DATA_FILE).exists()) {
             prevData = readData();
         }
-        Map<String,TestData> prevCodesMap = new HashMap<String,TestData>();
+        Map<String,TestData> prevCodesMap = new HashMap<>();
         for (TestData data : prevData) {
             prevCodesMap.put(data.code, data);
         }
 
-        Set<String> codesToWrite = new LinkedHashSet<String>();
+        Set<String> codesToWrite = new LinkedHashSet<>();
         for (TestData data : prevData) {
             if (supportedCodesMap.containsKey(data.code)) {
@@ -116 +116 @@
     private static List<TestData> readData() throws IOException, FileNotFoundException {
         BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(PROJECTION_DATA_FILE), Utils.UTF_8));
-        List<TestData> result = new ArrayList<TestData>();
+        List<TestData> result = new ArrayList<>();
         String line;
         while ((line = in.readLine()) != null) {
@@ -159 +159 @@
     public void regressionTest() throws IOException, FileNotFoundException {
         List<TestData> allData = readData();
-        Set<String> dataCodes = new HashSet<String>();
+        Set<String> dataCodes = new HashSet<>();
         for (TestData data : allData) {
             dataCodes.add(data.code);