Merge pull request #16931 from iterate-ch/bugfix/MD-22327-error

Include cause in error message.

Author: dkocher

core/src/main/java/ch/cyberduck/core/exception/LocalAccessDeniedException.java

@@ -33,6 +33,10 @@ public LocalAccessDeniedException(final String detail, final Throwable cause) {
         super(detail, cause);
     }
 
+    public LocalAccessDeniedException(final String message, final String detail, final Throwable cause) {
+        super(message, detail, cause);
+    }
+
     @Override
     public String getHelp() {
         return LocaleFactory.localizedString("Please verify disk permissions", "Support");

core/src/main/java/ch/cyberduck/core/local/DefaultLocalDirectoryFeature.java

@@ -35,7 +35,7 @@ public void mkdir(final Local file) throws AccessDeniedException {
         }
         catch(IOException e) {
             throw new LocalAccessDeniedException(MessageFormat.format(LocaleFactory.localizedString(
-                    "Cannot create folder {0}", "Error"), file.getName()), e);
+                    "Cannot create folder {0}", "Error"), file.getName()), e.getMessage(), e);
         }
     }
 }

core/src/main/java/ch/cyberduck/core/local/DefaultLocalTouchFeature.java

@@ -51,12 +51,12 @@ public void touch(final Local file) throws AccessDeniedException {
             catch(FileAlreadyExistsException e) {
                 log.warn("File {} already exists", file);
                 throw new LocalAccessDeniedException(MessageFormat.format(
-                        LocaleFactory.localizedString("Cannot create {0}", "Error"), file.getAbsolute()), e);
+                        LocaleFactory.localizedString("Cannot create {0}", "Error"), file.getAbsolute()), e.getMessage(), e);
             }
         }
         catch(IOException e) {
             throw new LocalAccessDeniedException(MessageFormat.format(
-                LocaleFactory.localizedString("Cannot create {0}", "Error"), file.getAbsolute()), e);
+                    LocaleFactory.localizedString("Cannot create {0}", "Error"), file.getAbsolute()), e.getMessage(), e);
         }
         log.debug("Created file {}", file);
     }

core/src/main/java/ch/cyberduck/core/local/DefaultLocalTrashFeature.java

@@ -18,12 +18,14 @@
  */
 
 import ch.cyberduck.core.Local;
+import ch.cyberduck.core.LocaleFactory;
 import ch.cyberduck.core.exception.LocalAccessDeniedException;
 import ch.cyberduck.core.local.features.Trash;
 
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
+import java.text.MessageFormat;
 
 public class DefaultLocalTrashFeature implements Trash {
 
@@ -33,7 +35,8 @@ public void trash(Local file) throws LocalAccessDeniedException {
             Files.delete(Paths.get(file.getAbsolute()));
         }
         catch(IOException e) {
-            throw new LocalAccessDeniedException(String.format("Failed to move %s to Trash", file.getName()), e);
+            throw new LocalAccessDeniedException(MessageFormat.format(LocaleFactory.localizedString(
+                    "Cannot delete {0}", "Error"), file.getName()), e.getMessage(), e);
         }
     }
 }

core/src/main/java/ch/cyberduck/core/local/DefaultSymlinkFeature.java

@@ -23,6 +23,7 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
+import java.text.MessageFormat;
 
 public class DefaultSymlinkFeature implements Symlink {
 
@@ -32,8 +33,8 @@ public void symlink(final Local link, final String target) throws AccessDeniedEx
             Files.createSymbolicLink(Paths.get(link.getAbsolute()), Paths.get(target));
         }
         catch(IOException | UnsupportedOperationException e) {
-            throw new AccessDeniedException(String.format("%s %s",
-                    LocaleFactory.localizedString("Cannot create file", "Error"), link.getAbsolute()), e);
+            throw new AccessDeniedException(MessageFormat.format(LocaleFactory.localizedString(
+                    "Cannot create {0}", "Error"), link.getName()), e.getMessage(), e);
         }
     }
 }

core/src/test/java/ch/cyberduck/core/local/DefaultLocalTouchFeatureTest.java

@@ -37,8 +37,7 @@ public void testFailure() {
         }
         catch(AccessDeniedException e) {
             final String s = l.getName();
-            assertEquals("Cannot create " + PreferencesFactory.get().getProperty("local.delimiter") + s + ". Please verify disk permissions.", e.getDetail());
-            assertEquals("Access denied", e.getMessage());
+            assertEquals(String.format("Cannot create %s%s", PreferencesFactory.get().getProperty("local.delimiter"), s), e.getMessage());
         }
     }