Skip to content

Remove unused options parameter from NativeHandler.putFileInfo #2924

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
HannesWell wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Remove unused options parameter from NativeHandler.putFileInfo #2924

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/LocalFile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions ...re.filesystem/src/org/eclipse/core/internal/filesystem/local/LocalFileNativesManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion ...eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/NativeHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {};

Expand Down
2 changes: 1 addition & 1 deletion ....eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/Win32Handler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions ...ore.filesystem/src/org/eclipse/core/internal/filesystem/local/linux/LinuxFileHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...ore.filesystem/src/org/eclipse/core/internal/filesystem/local/linux/LinuxFileNatives.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
6 changes: 4 additions & 2 deletions ...se.core.filesystem/src/org/eclipse/core/internal/filesystem/local/nio/DefaultHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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.
Expand Down
12 changes: 9 additions & 3 deletions ...ipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/nio/PosixHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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<PosixFilePermission> perms = new HashSet<>();

Expand Down
4 changes: 2 additions & 2 deletions ....core.filesystem/src/org/eclipse/core/internal/filesystem/local/unix/UnixFileHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
2 changes: 1 addition & 1 deletion ....core.filesystem/src/org/eclipse/core/internal/filesystem/local/unix/UnixFileNatives.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Loading