Skip to content

Commit 62a173f

Browse files
committed
squash. cleanup, formatting
1 parent 9a1afee commit 62a173f

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

irods/src/main/java/ch/cyberduck/core/irods/IRODSAttributesFinderFeature.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public PathAttributes find(final Path file, final ListProgressListener listener)
5353
final String logicalPath = file.getAbsolute();
5454
final IRODSConnection conn = session.getClient();
5555

56-
ObjectStatus status = IRODSFilesystem.status(session.getClient().getRcComm(), logicalPath);
56+
ObjectStatus status = IRODSFilesystem.status(conn.getRcComm(), logicalPath);
5757

5858
if(IRODSFilesystem.isDataObject(status)) {
5959
log.debug("data object exists in iRODS. fetching data using GenQuery2.");

irods/src/main/java/ch/cyberduck/core/irods/IRODSDeleteFeature.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import ch.cyberduck.core.preferences.PreferencesReader;
2525
import ch.cyberduck.core.transfer.TransferStatus;
2626

27+
import org.irods.irods4j.high_level.connection.IRODSConnection;
2728
import org.irods.irods4j.high_level.vfs.IRODSFilesystem;
2829
import org.irods.irods4j.high_level.vfs.IRODSFilesystem.RemoveOptions;
2930
import org.irods.irods4j.high_level.vfs.ObjectStatus;
@@ -73,18 +74,19 @@ public void delete(final Map<Path, TransferStatus> files, final PasswordCallback
7374
callback.delete(file);
7475

7576
try {
76-
String absolute = file.getAbsolute();
77-
ObjectStatus status = IRODSFilesystem.status(session.getClient().getRcComm(), absolute);
77+
final IRODSConnection conn = session.getClient();
78+
final String logicalPath = file.getAbsolute();
79+
final ObjectStatus status = IRODSFilesystem.status(conn.getRcComm(), logicalPath);
7880

7981
if(!IRODSFilesystem.exists(status)) {
80-
throw new NotfoundException(String.format("%s doesn't exist", absolute));
82+
throw new NotfoundException(String.format("%s doesn't exist", logicalPath));
8183
}
8284

8385
if(status.getType() == ObjectType.DATA_OBJECT) {
84-
IRODSFilesystem.remove(session.getClient().getRcComm(), absolute, removeOptions);
86+
IRODSFilesystem.remove(conn.getRcComm(), logicalPath, removeOptions);
8587
}
8688
else if(status.getType() == ObjectType.COLLECTION) {
87-
IRODSFilesystem.removeAll(session.getClient().getRcComm(), absolute, removeOptions);
89+
IRODSFilesystem.removeAll(conn.getRcComm(), logicalPath, removeOptions);
8890
}
8991
}
9092
catch(IOException | IRODSException e) {

irods/src/main/java/ch/cyberduck/core/irods/IRODSMoveFeature.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ public IRODSMoveFeature(IRODSSession session) {
4242
}
4343

4444
@Override
45-
public Path move(final Path file, final Path renamed, final TransferStatus status, final Delete.Callback callback, final ConnectionCallback connectionCallback) throws BackgroundException {
45+
public Path move(final Path file, final Path renamed, final TransferStatus status,
46+
final Delete.Callback callback, final ConnectionCallback connectionCallback) throws BackgroundException {
4647
try {
4748
final IRODSConnection conn = session.getClient();
4849
if(!IRODSFilesystem.exists(conn.getRcComm(), file.getAbsolute())) {

0 commit comments

Comments
 (0)