Changeset 32754 in osm

Timestamp:

2016-08-01T22:47:14+02:00 (8 years ago)

Author:

donvip

Message:

fix error-prone warnings

Location:

applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters

Files:

• gui/FilterPanel.java (modified) (2 diffs)
• model/FiltersManager.java (modified) (1 diff)
• preferences/FiltersDownloader.java (modified) (5 diffs)
• preferences/RasterFiltersPreferences.java (modified) (1 diff)

applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/gui/FilterPanel.java

@@ -286 +286 @@
                                 if ((i % 20) == 0) {
 
-                                        labelTable.put(new Integer(i),
+                                        labelTable.put(Integer.valueOf(i),
                                                         new JLabel(String.valueOf(i * delta / 100)));
 
@@ -294 +294 @@
                         try {
 
-                                slider = new JSlider(JSlider.HORIZONTAL, minValue, maxValue,
-                                                new Double(initValue).intValue());
+                                slider = new JSlider(JSlider.HORIZONTAL, minValue, maxValue, (int) initValue);
                                 slider.setMinorTickSpacing(maxValue / 4);
                                 slider.setName(json.getString("name"));

applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/model/FiltersManager.java

@@ -79 +79 @@
                         clazz = FiltersDownloader.loader.loadClass(filterState
                                         .getFilterClassName());
-                        filter = (Filter) clazz.newInstance();
-
-                } catch (InstantiationException | IllegalAccessException e) {
-                        e.printStackTrace();
-                } catch (ClassNotFoundException e) {
+                        filter = (Filter) clazz.getConstructor().newInstance();
+
+                } catch (ReflectiveOperationException | IllegalArgumentException | SecurityException e) {
                         e.printStackTrace();
                 }

applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/preferences/FiltersDownloader.java

@@ -20 +20 @@
 import java.net.URLClassLoader;
 import java.net.URLConnection;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -223 +225 @@
                 Main.debug("EXIST FILE? " + file.exists());
 
-                try {
-                        FileReader fileReader = new FileReader(file);
-                        BufferedReader br = new BufferedReader(fileReader);
-
-                        String temp = null;
+                try (BufferedReader br = Files.newBufferedReader(file.toPath(), StandardCharsets.UTF_8)) {
+                        String temp;
 
                         while ((temp = br.readLine()) != null) {
@@ -244 +243 @@
                                 }
                         }
-
-                        br.close();
                 } catch (IOException e) {
                         e.printStackTrace();
@@ -289 +286 @@
                 Main.debug("pluginDir and urls map" + file.getAbsoluteFile());
 
-                FileWriter fileWriter = null;
-                BufferedWriter writer = null;
-                try {
-                        fileWriter = new FileWriter(file);
-                        writer = new BufferedWriter(fileWriter);
-                } catch (IOException e) {
-                        e.printStackTrace();
-                }
-
-                for (JsonObject temp : metaList) {
+                try (BufferedWriter writer = Files.newBufferedWriter(file.toPath(), StandardCharsets.UTF_8)) {
+                    for (JsonObject temp : metaList) {
                         JsonArray binaries = temp.getJsonArray("binaries");
 
@@ -314 +303 @@
                                 }
                         }
-                }
-
-                try {
-                        writer.close();
-                        fileWriter.close();
+                    }
                 } catch (IOException e) {
                         e.printStackTrace();

applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/preferences/RasterFiltersPreferences.java

@@ -108 +108 @@
         }
 
-        class FiltersTableModel extends AbstractTableModel {
+        static class FiltersTableModel extends AbstractTableModel {
 
                 String[] columnNames = { "Filter Name", "Author", "Description", "" };