Changeset 30738 in osm for applications/editors/josm/plugins/proj4j

Timestamp:

2014-10-19T01:27:04+02:00 (10 years ago)

Author:

donvip

Message:

[josm_plugins] fix java 7 warnings / global usage of try-with-resource

File:

• applications/editors/josm/plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/Proj4JProjectionChoice.java (modified) (5 diffs)

applications/editors/josm/plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/Proj4JProjectionChoice.java

@@ -64 +64 @@
         sorter = new TableRowSorter<>(model);
     }
-    
+
     @Override
     public String getId() {
@@ -74 +74 @@
         return new Proj4JPanel(actionListener);
     }
-    
+
     protected class Proj4JPanel extends JPanel {
-        
+
         public Proj4JPanel(ActionListener actionListener) {
             GridBagConstraints c = new GridBagConstraints();
@@ -94 +94 @@
                     new DocumentListener() {
 
+                        @Override
                         public void insertUpdate(DocumentEvent e) {
                             newFilter();
                         }
 
+                        @Override
                         public void removeUpdate(DocumentEvent e) {
                             newFilter();
                         }
 
+                        @Override
                         public void changedUpdate(DocumentEvent e) {
                             newFilter();
@@ -213 +216 @@
         }
 
+        @Override
         public void valueChanged(ListSelectionEvent e) {
             updateSelectedCode();
@@ -258 +262 @@
         public CRSTableModel() throws java.io.IOException {
             // Read projection information from file, (authority, code, description)
-            InputStream inStr = getClass().getResourceAsStream("/resources/projections.txt");
-            BufferedReader fh = new BufferedReader(new InputStreamReader(inStr));
-
-            String s;
-            while ((s = fh.readLine()) != null) {
-                String f[] = s.split("\t");
-                if (f.length >= 3) {
-                    crsList.add(new CRSEntry(f[0], f[1], f[2]));
+            try (
+                InputStream inStr = getClass().getResourceAsStream("/resources/projections.txt");
+                BufferedReader fh = new BufferedReader(new InputStreamReader(inStr));
+            ) {
+                String s;
+                while ((s = fh.readLine()) != null) {
+                    String f[] = s.split("\t");
+                    if (f.length >= 3) {
+                        crsList.add(new CRSEntry(f[0], f[1], f[2]));
+                    }
                 }
             }
-            fh.close();
         }