Make FileUtils#moveToTrash a varargs method

java-native-access · Feb 13, 2020 · 7edf6ea · 7edf6ea
1 parent 653c185
commit 7edf6ea
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -2,14 +2,15 @@ NOTE: as of JNA 4.0, JNA is now dual-licensed under LGPL and AL 2.0 (see LICENSE
 
 NOTE: JNI native support is typically incompatible between minor versions, and almost always incompatible between major versions.
 
-Next Release (5.5.1)
+Next Release (5.6.0)
 ====================
 
 Features
 --------
+* [#1160](https://github.com/java-native-access/jna/issues/1160): Make FileUtils#moveToTrash a varargs method - [@matthiasblaesing](https://github.com/matthiasblaesing).
 
-Features
---------
+Bug Fixes
+---------
 
 
 Release 5.5.0

diff --git a/contrib/platform/src/com/sun/jna/platform/FileUtils.java b/contrib/platform/src/com/sun/jna/platform/FileUtils.java
@@ -42,7 +42,7 @@ public boolean hasTrash() {
      * @param files files to move
      * @throws IOException on failure.
      */
-    public abstract void moveToTrash(File[] files) throws IOException;
+    public abstract void moveToTrash(File... files) throws IOException;
 
     /** Canonical lazy loading of a singleton. */
     private static class Holder {
@@ -90,14 +90,16 @@ private File getTrashDirectory() {
             return trash;
         }
 
+        @Override
         public boolean hasTrash() {
             return getTrashDirectory().exists();
         }
 
         /** The default implementation attempts to move the file to
          * the desktop "Trash" folder.
          */
-        public void moveToTrash(File[] files) throws IOException {
+        @Override
+        public void moveToTrash(File... files) throws IOException {
             File trash = getTrashDirectory();
             if (!trash.exists()) {
                 throw new IOException("No trash location found (define fileutils.trash to be the path to the trash)");

diff --git a/contrib/platform/src/com/sun/jna/platform/mac/MacFileUtils.java b/contrib/platform/src/com/sun/jna/platform/mac/MacFileUtils.java
@@ -68,7 +68,7 @@ class FSRef extends Structure {
     }
 
     @Override
-    public void moveToTrash(File[] files) throws IOException {
+    public void moveToTrash(File... files) throws IOException {
         List<String> failed = new ArrayList<String>();
         for (File src: files) {
             FileManager.FSRef fsref = new FileManager.FSRef();

diff --git a/contrib/platform/src/com/sun/jna/platform/win32/W32FileUtils.java b/contrib/platform/src/com/sun/jna/platform/win32/W32FileUtils.java
@@ -30,11 +30,13 @@
 
 public class W32FileUtils extends FileUtils {
 
+    @Override
     public boolean hasTrash() {
         return true;
     }
 
-    public void moveToTrash(File[] files) throws IOException {
+    @Override
+    public void moveToTrash(File... files) throws IOException {
         Shell32 shell = Shell32.INSTANCE;
         ShellAPI.SHFILEOPSTRUCT fileop = new ShellAPI.SHFILEOPSTRUCT();
         fileop.wFunc = ShellAPI.FO_DELETE;