Changeset 9296 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2016-01-04T01:06:23+01:00 (9 years ago)

Author:

Don-vip

Message:

fix #12249 - Fix Findbugs warnings "Exceptional return value of java.io.File.delete() ignored"

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• PlatformHookOsx.java (modified) (2 diffs)
• PlatformHookWindows.java (modified) (1 diff)
• Utils.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/tools/PlatformHookOsx.java

@@ -2 +2 @@
 package org.openstreetmap.josm.tools;
 
+import static org.openstreetmap.josm.tools.I18n.marktr;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
@@ -366 +367 @@
                         Main.info("Copying old preferences file to new location");
                         Utils.copyFile(oldPref, newPref);
-                        if (!oldPref.delete()) {
-                            Main.warn("Unable to delete old preferences file: "+oldPref.getPath());
-                        }
+                        Utils.deleteFile(oldPref, marktr("Unable to delete old preferences file {0}"));
                     } catch (IOException e) {
                         Main.error(e);

trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java

@@ -190 +190 @@
     public boolean rename(File from, File to) {
         if (to.exists())
-            to.delete();
+            Utils.deleteFile(to);
         return from.renameTo(to);
     }

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -2 +2 @@
 package org.openstreetmap.josm.tools;
 
+import static org.openstreetmap.josm.tools.I18n.marktr;
 import static org.openstreetmap.josm.tools.I18n.tr;
 import static org.openstreetmap.josm.tools.I18n.trn;
@@ -446 +447 @@
                     if (file.isDirectory()) {
                         deleteDirectory(file);
-                    } else if (!file.delete()) {
-                        Main.warn("Unable to delete file: "+file.getPath());
+                    } else {
+                        deleteFile(file);
                     }
                 }
@@ -453 +454 @@
         }
         return path.delete();
+    }
+
+    /**
+     * Deletes a file and log a default warning if the deletion fails.
+     * @param file file to delete
+     * and must contain a single parameter <code>{0}</code> for the file path
+     * @return {@code true} if and only if the file is successfully deleted; {@code false} otherwise
+     * @since XXXX
+     */
+    public static boolean deleteFile(File file) {
+        return deleteFile(file, marktr("Unable to delete file {0}"));
+    }
+
+    /**
+     * Deletes a file and log a configurable warning if the deletion fails.
+     * @param file file to delete
+     * @param warnMsg warning message. It will be translated with {@code tr()}
+     * and must contain a single parameter <code>{0}</code> for the file path
+     * @return {@code true} if and only if the file is successfully deleted; {@code false} otherwise
+     * @since XXXX
+     */
+    public static boolean deleteFile(File file, String warnMsg) {
+        boolean result = file.delete();
+        if (!result) {
+            Main.warn(tr(warnMsg, file.getPath()));
+        }
+        return result;
     }