Override options in transfer only.

Author: dkocher

core/src/main/java/ch/cyberduck/core/editor/EditSaveWorker.java

@@ -38,7 +38,6 @@
 import ch.cyberduck.core.transfer.TransferPrompt;
 import ch.cyberduck.core.transfer.TransferSpeedometer;
 import ch.cyberduck.core.transfer.UploadTransfer;
-import ch.cyberduck.core.transfer.upload.AbstractUploadFilter;
 import ch.cyberduck.core.transfer.upload.UploadFilterOptions;
 import ch.cyberduck.core.worker.SingleTransferWorker;
 import ch.cyberduck.core.worker.Worker;
@@ -73,14 +72,9 @@ public TransferAction action(final Session<?> source,
                                          final TransferPrompt prompt, final ListProgressListener listener) {
                 return TransferAction.overwrite;
             }
-
-            @Override
-            public AbstractUploadFilter filter(final Session<?> session, final Session<?> destination, final TransferAction action, final ProgressListener listener) {
-                return super.filter(session, destination, action, listener).withOptions(new UploadFilterOptions(host)
-                        .withVersioning(PreferencesFactory.get().getBoolean("editor.upload.file.versioning"))
-                        .withPermission(PreferencesFactory.get().getBoolean("editor.upload.permissions.change")));
-            }
-        };
+        }.withOptions(new UploadFilterOptions(bookmark)
+                .withVersioning(PreferencesFactory.get().getBoolean("editor.upload.file.versioning"))
+                .withPermission(PreferencesFactory.get().getBoolean("editor.upload.permissions.change")));
         this.listener = listener;
     }
 

core/src/main/java/ch/cyberduck/core/transfer/download/AbstractDownloadFilter.java

@@ -77,7 +77,7 @@ public abstract class AbstractDownloadFilter implements TransferPathFilter {
     private final IconService icon = IconServiceFactory.get();
 
     protected AttributesFinder attribute;
-    private DownloadFilterOptions options;
+    private final DownloadFilterOptions options;
 
     protected AbstractDownloadFilter(final SymlinkResolver<Path> symlinkResolver, final Session<?> session, final DownloadFilterOptions options) {
         this.symlinkResolver = symlinkResolver;
@@ -98,11 +98,6 @@ public AbstractDownloadFilter withAttributes(final AttributesFinder attributes)
         return this;
     }
 
-    public AbstractDownloadFilter withOptions(final DownloadFilterOptions options) {
-        this.options = options;
-        return this;
-    }
-
     @Override
     public boolean accept(final Path file, final Local local, final TransferStatus parent) throws BackgroundException {
         final Local volume = local.getVolume();

core/src/main/java/ch/cyberduck/core/transfer/upload/AbstractUploadFilter.java

@@ -73,7 +73,7 @@ public abstract class AbstractUploadFilter implements TransferPathFilter {
 
     protected Find find;
     protected AttributesFinder attribute;
-    protected UploadFilterOptions options;
+    private final UploadFilterOptions options;
 
     public AbstractUploadFilter(final SymlinkResolver<Local> symlinkResolver, final Session<?> session,
                                 final UploadFilterOptions options) {
@@ -97,11 +97,6 @@ public AbstractUploadFilter withAttributes(final AttributesFinder attributes) {
         return this;
     }
 
-    public AbstractUploadFilter withOptions(final UploadFilterOptions options) {
-        this.options = options;
-        return this;
-    }
-
     @Override
     public boolean accept(final Path file, final Local local, final TransferStatus parent) throws BackgroundException {
         if(!local.exists()) {

core/src/test/java/ch/cyberduck/core/transfer/UploadTransferTest.java

@@ -419,12 +419,7 @@ public void transfer(final Session<?> source, final Session<?> destination, fina
                 segment.setComplete();
                 set.set(true);
             }
-
-            @Override
-            public AbstractUploadFilter filter(final Session<?> source, final Session<?> destination, final TransferAction action, final ProgressListener listener) {
-                return super.filter(source, destination, action, listener).withOptions(new UploadFilterOptions(host).withTemporary(true));
-            }
-        };
+        }.withOptions(new UploadFilterOptions(host).withTemporary(true));
         final SingleTransferWorker worker = new SingleTransferWorker(session, null, transfer, new TransferOptions(),
             new TransferSpeedometer(transfer), new DisabledTransferPrompt() {
             @Override