Changeset 9127 in josm for trunk

Timestamp:

2015-12-15T10:36:12+01:00 (8 years ago)

Author:

bastiK

Message:

see #12186 - simplify method return type

File:

• trunk/src/org/openstreetmap/josm/data/projection/Projections.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/data/projection/Projections.java

@@ -142 +142 @@
         nadgrids.put("ntf_r93_b.gsb", NTV2GridShiftFileWrapper.ntf_rgf93);
 
+        List<ProjectionDefinition> pds;
         try {
-            inits = loadProjectionDefinitions("resource://data/projection/epsg");
+            pds = loadProjectionDefinitions("resource://data/projection/epsg");
         } catch (IOException ex) {
             throw new RuntimeException(ex);
+        }
+        inits = new LinkedHashMap<>();
+        for (ProjectionDefinition pd : pds) {
+            inits.put(pd.code, pd);
         }
     }
@@ -203 +208 @@
      * @throws java.io.IOException
      */
-    public static Map<String, ProjectionDefinition> loadProjectionDefinitions(String path) throws IOException {
+    public static List<ProjectionDefinition> loadProjectionDefinitions(String path) throws IOException {
         try (
             InputStream in = new CachedFile(path).getInputStream();
@@ -221 +226 @@
      * @throws java.io.IOException
      */
-    public static Map<String, ProjectionDefinition> loadProjectionDefinitions(BufferedReader r) throws IOException {
-        Map<String, ProjectionDefinition> result = new LinkedHashMap<>();
+    public static List<ProjectionDefinition> loadProjectionDefinitions(BufferedReader r) throws IOException {
+        List<ProjectionDefinition> result = new ArrayList<>();
         Pattern epsgPattern = Pattern.compile("<(\\d+)>(.*)<>");
         String line, lastline = "";
@@ -234 +239 @@
                     String code = "EPSG:" + m.group(1);
                     String definition = m.group(2).trim();
-                    result.put(code, new ProjectionDefinition(code, name, definition));
+                    result.add(new ProjectionDefinition(code, name, definition));
                 } else {
                     Main.warn("Failed to parse line from the EPSG projection definition: "+line);