Changeset 9645 in josm for trunk/src/org

Timestamp:

2016-01-27T02:01:55+01:00 (8 years ago)

Author:

Don-vip

Message:

fix findbugs issue RV_RETURN_VALUE_IGNORED_BAD_PRACTICE for java.io.File.mkdirs

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/validation/OsmValidator.java (modified) (1 diff)
• gui/io/DownloadFileTask.java (modified) (2 diffs)
• io/CachedFile.java (modified) (1 diff)
• plugins/Plugin.java (modified) (1 diff)
• tools/PlatformHookOsx.java (modified) (1 diff)
• tools/Utils.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java

@@ -166 +166 @@
             File pathDir = new File(getValidatorDir());
             if (!pathDir.exists()) {
-                pathDir.mkdirs();
+                Utils.mkDirs(pathDir);
             }
         } catch (Exception e) {

trunk/src/org/openstreetmap/josm/gui/io/DownloadFileTask.java

@@ -96 +96 @@
                 File newDir = file.getParentFile();
                 if (!newDir.exists()) {
-                    newDir.mkdirs();
+                    Utils.mkDirs(newDir);
                 }
             }
@@ -184 +184 @@
                 File newFile = new File(dir, ze.getName());
                 if (ze.isDirectory()) {
-                    newFile.mkdirs();
+                    Utils.mkDirs(newFile);
                 } else try (InputStream is = zf.getInputStream(ze)) {
                     Files.copy(is, newFile.toPath(), StandardCopyOption.REPLACE_EXISTING);

trunk/src/org/openstreetmap/josm/io/CachedFile.java

@@ -427 +427 @@
         File destDirFile = new File(destDir);
         if (!destDirFile.exists()) {
-            destDirFile.mkdirs();
+            Utils.mkDirs(destDirFile);
         }
 

trunk/src/org/openstreetmap/josm/plugins/Plugin.java

@@ -118 +118 @@
         File pluginDir = new File(pluginDirName);
         if (!pluginDir.exists()) {
-            pluginDir.mkdirs();
+            Utils.mkDirs(pluginDir);
         }
         try (InputStream in = getClass().getResourceAsStream(from)) {

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

@@ -364 +364 @@
                 if (!newPref.exists()) {
                     try {
-                        Main.pref.getPreferencesDirectory().mkdirs();
+                        Utils.mkDirs(Main.pref.getPreferencesDirectory());
                         Main.info("Copying old preferences file to new location");
                         Utils.copyFile(oldPref, newPref);

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

@@ -460 +460 @@
      * 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 9296
@@ -480 +479 @@
         if (!result) {
             Main.warn(tr(warnMsg, file.getPath()));
+        }
+        return result;
+    }
+
+    /**
+     * Creates a directory and log a default warning if the creation fails.
+     * @param dir directory to create
+     * @return {@code true} if and only if the directory is successfully created; {@code false} otherwise
+     * @since 9645
+     */
+    public static boolean mkDirs(File dir) {
+        return mkDirs(dir, marktr("Unable to create directory {0}"));
+    }
+
+    /**
+     * Creates a directory and log a configurable warning if the creation fails.
+     * @param dir directory to create
+     * @param warnMsg warning message. It will be translated with {@code tr()}
+     * and must contain a single parameter <code>{0}</code> for the directory path
+     * @return {@code true} if and only if the directory is successfully created; {@code false} otherwise
+     * @since 9645
+     */
+    public static boolean mkDirs(File dir, String warnMsg) {
+        boolean result = dir.mkdirs();
+        if (!result) {
+            Main.warn(tr(warnMsg, dir.getPath()));
         }
         return result;