diff --git a/resources/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/LocalFile.java b/resources/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/LocalFile.java index 853a90a0b47..c70b677e1a9 100644 --- a/resources/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/LocalFile.java +++ b/resources/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/LocalFile.java @@ -611,7 +611,7 @@ private void handleWriteIOException(IOException e) throws CoreException { public void putInfo(IFileInfo info, int options, IProgressMonitor monitor) throws CoreException { boolean success = true; if ((options & EFS.SET_ATTRIBUTES) != 0) { - success &= LocalFileNativesManager.putFileInfo(filePath, info, options); + success &= LocalFileNativesManager.putFileInfo(filePath, info); } //native does not currently set last modified if ((options & EFS.SET_LAST_MODIFIED) != 0) { diff --git a/resources/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/LocalFileNativesManager.java b/resources/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/LocalFileNativesManager.java index 8a9fe40831f..6142c2755ba 100644 --- a/resources/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/LocalFileNativesManager.java +++ b/resources/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/LocalFileNativesManager.java @@ -92,8 +92,8 @@ public static FileInfo fetchFileInfo(String fileName) { return HANDLER.fetchFileInfo(fileName); } - public static boolean putFileInfo(String fileName, IFileInfo info, int options) { - return HANDLER.putFileInfo(fileName, info, options); + public static boolean putFileInfo(String fileName, IFileInfo info) { + return HANDLER.putFileInfo(fileName, info); } public static IFileInfo[] listDirectoryAndGetFileInfos(String fileName) { diff --git a/resources/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/NativeHandler.java b/resources/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/NativeHandler.java index 6ea955cd605..656b1781f1a 100644 --- a/resources/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/NativeHandler.java +++ b/resources/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/NativeHandler.java @@ -25,7 +25,7 @@ public abstract class NativeHandler { public abstract FileInfo fetchFileInfo(String fileName); - public abstract boolean putFileInfo(String fileName, IFileInfo info, int options); + public abstract boolean putFileInfo(String fileName, IFileInfo info); protected static final String[] EMPTY_STRING_ARRAY = {}; diff --git a/resources/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/Win32Handler.java b/resources/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/Win32Handler.java index 30405005f3f..71264ba68b0 100644 --- a/resources/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/Win32Handler.java +++ b/resources/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/Win32Handler.java @@ -85,7 +85,7 @@ public FileInfo fetchFileInfo(String fileName) { } @Override - public boolean putFileInfo(String fileName, IFileInfo info, int options) { + public boolean putFileInfo(String fileName, IFileInfo info) { WString lpFileName = new WString(toLongWindowsPath(fileName)); long dwFileAttributes = FileAPIh.GetFileAttributesW(lpFileName); if (dwFileAttributes == FileAPIh.INVALID_FILE_ATTRIBUTES) { diff --git a/resources/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/linux/LinuxFileHandler.java b/resources/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/linux/LinuxFileHandler.java index d739286efcd..a7ff7ab0c4d 100644 --- a/resources/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/linux/LinuxFileHandler.java +++ b/resources/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/linux/LinuxFileHandler.java @@ -32,8 +32,8 @@ public FileInfo fetchFileInfo(String fileName) { } @Override - public boolean putFileInfo(String fileName, IFileInfo info, int options) { - return LinuxFileNatives.putFileInfo(fileName, info, options); + public boolean putFileInfo(String fileName, IFileInfo info) { + return LinuxFileNatives.putFileInfo(fileName, info); } @Override diff --git a/resources/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/linux/LinuxFileNatives.java b/resources/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/linux/LinuxFileNatives.java index a50462736e2..ab0de0e924a 100644 --- a/resources/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/linux/LinuxFileNatives.java +++ b/resources/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/linux/LinuxFileNatives.java @@ -155,7 +155,7 @@ public static FileInfo fetchFileInfo(String fileName) { return info; } - public static boolean putFileInfo(String fileName, IFileInfo info, int options) { + public static boolean putFileInfo(String fileName, IFileInfo info) { int code = 0; byte[] name = fileNameToBytes(fileName); if (name == null) { diff --git a/resources/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/nio/DefaultHandler.java b/resources/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/nio/DefaultHandler.java index d8e9cbe2d74..38c2ed88dba 100644 --- a/resources/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/nio/DefaultHandler.java +++ b/resources/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/nio/DefaultHandler.java @@ -17,7 +17,9 @@ import java.io.File; import java.io.IOException; -import java.nio.file.*; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; import java.nio.file.attribute.BasicFileAttributes; import org.eclipse.core.filesystem.EFS; import org.eclipse.core.filesystem.IFileInfo; @@ -87,7 +89,7 @@ public int getSupportedAttributes() { } @Override - public boolean putFileInfo(String fileName, IFileInfo info, int options) { + public boolean putFileInfo(String fileName, IFileInfo info) { // In all cases we will set the information on the symbolic link target // and not the symbolic link itself. This is consistent with the approach // taken above in fetchInfo. diff --git a/resources/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/nio/PosixHandler.java b/resources/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/nio/PosixHandler.java index 55ec5ac3104..726f11c20b7 100644 --- a/resources/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/nio/PosixHandler.java +++ b/resources/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/nio/PosixHandler.java @@ -16,8 +16,14 @@ package org.eclipse.core.internal.filesystem.local.nio; import java.io.IOException; -import java.nio.file.*; -import java.nio.file.attribute.*; +import java.nio.file.Files; +import java.nio.file.LinkOption; +import java.nio.file.NoSuchFileException; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.nio.file.attribute.PosixFileAttributeView; +import java.nio.file.attribute.PosixFileAttributes; +import java.nio.file.attribute.PosixFilePermission; import java.util.HashSet; import java.util.Set; import org.eclipse.core.filesystem.EFS; @@ -88,7 +94,7 @@ public int getSupportedAttributes() { } @Override - public boolean putFileInfo(String fileName, IFileInfo info, int options) { + public boolean putFileInfo(String fileName, IFileInfo info) { Path path = Paths.get(fileName); Set perms = new HashSet<>(); diff --git a/resources/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/unix/UnixFileHandler.java b/resources/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/unix/UnixFileHandler.java index c13ae00f851..52016487e9d 100644 --- a/resources/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/unix/UnixFileHandler.java +++ b/resources/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/unix/UnixFileHandler.java @@ -32,7 +32,7 @@ public FileInfo fetchFileInfo(String fileName) { } @Override - public boolean putFileInfo(String fileName, IFileInfo info, int options) { - return UnixFileNatives.putFileInfo(fileName, info, options); + public boolean putFileInfo(String fileName, IFileInfo info) { + return UnixFileNatives.putFileInfo(fileName, info); } } diff --git a/resources/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/unix/UnixFileNatives.java b/resources/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/unix/UnixFileNatives.java index c69c79b2421..463831c9297 100644 --- a/resources/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/unix/UnixFileNatives.java +++ b/resources/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/unix/UnixFileNatives.java @@ -134,7 +134,7 @@ public static FileInfo fetchFileInfo(String fileName) { return info; } - public static boolean putFileInfo(String fileName, IFileInfo info, int options) { + public static boolean putFileInfo(String fileName, IFileInfo info) { int code = 0; byte[] name = fileNameToBytes(fileName); if (name == null) {