Validate all options.

dkocher · dkocher · commit 94c6e9d686dc · 2025-11-19T17:12:56.000+01:00
diff --git a/binding/src/main/java/ch/cyberduck/binding/SheetController.java b/binding/src/main/java/ch/cyberduck/binding/SheetController.java
@@ -75,12 +75,10 @@ public void closeSheet(final NSButton sender) {
     public void closeSheetWithOption(int option) {
         log.debug("Close sheet with option {}", option);
         window.endEditingFor(null);
-        if(option == SheetCallback.DEFAULT_OPTION || option == SheetCallback.ALTERNATE_OPTION) {
-            if(!this.validate(option)) {
-                log.warn("Failed validation with option {}", option);
-                AppKitFunctionsLibrary.beep();
-                return;
-            }
+        if(!this.validate(option)) {
+            log.warn("Failed validation with option {}", option);
+            AppKitFunctionsLibrary.beep();
+            return;
         }
         handlers.forEach(h -> h.closed(window, option));
     }
diff --git a/osx/src/main/java/ch/cyberduck/ui/cocoa/controller/DownloadController.java b/osx/src/main/java/ch/cyberduck/ui/cocoa/controller/DownloadController.java
@@ -91,7 +91,7 @@ public void callback(final int returncode) {
                 try {
                     final Host host = HostParser.parse(urlField.stringValue());
                     final Path file = new Path(PathNormalizer.normalize(host.getDefaultPath()),
-                        EnumSet.of(detector.detect(host.getDefaultPath())));
+                            EnumSet.of(detector.detect(host.getDefaultPath())));
                     host.setDefaultPath(file.getParent().getAbsolute());
                     final Transfer transfer = new DownloadTransfer(host, file,
                             LocalFactory.get(LocalFactory.get(PreferencesFactory.get().getProperty("queue.download.folder")).setBookmark(
@@ -107,13 +107,16 @@ public void callback(final int returncode) {
 
     @Override
     public boolean validate(final int option) {
-        final Host host;
-        try {
-            host = HostParser.parse(urlField.stringValue());
+        if(option == DEFAULT_OPTION) {
+            final Host host;
+            try {
+                host = HostParser.parse(urlField.stringValue());
+            }
+            catch(HostParserException e) {
+                return false;
+            }
+            return StringUtils.isNotBlank(host.getDefaultPath());
         }
-        catch(HostParserException e) {
-            return false;
-        }
-        return StringUtils.isNotBlank(host.getDefaultPath());
+        return true;
     }
 }
diff --git a/osx/src/main/java/ch/cyberduck/ui/cocoa/controller/FileController.java b/osx/src/main/java/ch/cyberduck/ui/cocoa/controller/FileController.java
@@ -20,6 +20,7 @@
 import ch.cyberduck.binding.application.NSAlert;
 import ch.cyberduck.binding.application.NSTextField;
 import ch.cyberduck.binding.application.NSView;
+import ch.cyberduck.core.AbstractPath;
 import ch.cyberduck.core.Cache;
 import ch.cyberduck.core.Path;
 import ch.cyberduck.core.SimplePathPredicate;
@@ -61,20 +62,23 @@ protected void focus(final NSAlert alert) {
 
     @Override
     public boolean validate(final int option) {
-        final String input = StringUtils.trim(inputField.stringValue());
-        if(PreferencesFactory.get().getList("browser.filter.regex").stream().anyMatch(input::matches)) {
-            return false;
-        }
-        if(StringUtils.isNotBlank(input)) {
-            if(cache.get(workdir).toStream().filter(new SimplePathPredicate(new Path(workdir, input, EnumSet.of(Path.Type.file)))).findAny().isPresent()) {
+        if(option == DEFAULT_OPTION) {
+            final String input = StringUtils.trim(inputField.stringValue());
+            if(PreferencesFactory.get().getList("browser.filter.regex").stream().anyMatch(input::matches)) {
                 return false;
             }
-            if(cache.get(workdir).toStream().filter(new SimplePathPredicate(new Path(workdir, input, EnumSet.of(Path.Type.directory)))).findAny().isPresent()) {
-                return false;
+            if(StringUtils.isNotBlank(input)) {
+                if(cache.get(workdir).toStream().filter(new SimplePathPredicate(new Path(workdir, input, EnumSet.of(Path.Type.file)))).findAny().isPresent()) {
+                    return false;
+                }
+                if(cache.get(workdir).toStream().filter(new SimplePathPredicate(new Path(workdir, input, EnumSet.of(Path.Type.directory)))).findAny().isPresent()) {
+                    return false;
+                }
+                return true;
             }
-            return true;
+            return false;
         }
-        return false;
+        return true;
     }
 
     @Override
diff --git a/osx/src/main/java/ch/cyberduck/ui/cocoa/controller/GotoController.java b/osx/src/main/java/ch/cyberduck/ui/cocoa/controller/GotoController.java
@@ -110,7 +110,10 @@ public void callback(final int returncode) {
 
     @Override
     public boolean validate(final int option) {
-        return StringUtils.isNotBlank(folderCombobox.stringValue());
+        if(option == DEFAULT_OPTION) {
+            return StringUtils.isNotBlank(folderCombobox.stringValue());
+        }
+        return true;
     }
 
     private final class FolderComboboxModel extends ProxyController implements NSComboBox.DataSource {
diff --git a/osx/src/main/java/ch/cyberduck/ui/cocoa/controller/LoginController.java b/osx/src/main/java/ch/cyberduck/ui/cocoa/controller/LoginController.java
@@ -178,9 +178,8 @@ public void callback(final int returncode) {
 
     @Override
     public boolean validate(final int option) {
-        switch(option) {
-            case DEFAULT_OPTION:
-                return super.validate(option);
+        if(option == DEFAULT_OPTION) {
+            return super.validate(option);
         }
         return true;
     }
diff --git a/osx/src/main/java/ch/cyberduck/ui/cocoa/controller/MainController.java b/osx/src/main/java/ch/cyberduck/ui/cocoa/controller/MainController.java
@@ -781,7 +781,10 @@ public void callback(int returncode) {
 
             @Override
             public boolean validate(final int option) {
-                return StringUtils.isNotEmpty(bookmarksPopup.selectedItem().representedObject());
+                if(option == DEFAULT_OPTION) {
+                    return StringUtils.isNotEmpty(bookmarksPopup.selectedItem().representedObject());
+                }
+                return true;
             }
         };
         TransferControllerFactory.get().alert(controller);
diff --git a/osx/src/main/java/ch/cyberduck/ui/cocoa/controller/PasswordController.java b/osx/src/main/java/ch/cyberduck/ui/cocoa/controller/PasswordController.java
@@ -129,12 +129,10 @@ protected void focus(final NSAlert alert) {
 
     @Override
     public boolean validate(final int option) {
-        if(option == SheetCallback.ALTERNATE_OPTION) {
-            if(options.anonymous) {
-                return true;
-            }
+        if(option == DEFAULT_OPTION) {
+            return StringUtils.isNotBlank(inputField.stringValue());
         }
-        return StringUtils.isNotBlank(inputField.stringValue());
+        return true;
     }
 
     @Override
diff --git a/osx/src/main/java/ch/cyberduck/ui/cocoa/controller/VaultController.java b/osx/src/main/java/ch/cyberduck/ui/cocoa/controller/VaultController.java
@@ -112,14 +112,16 @@ public NSView getAccessoryView(final NSAlert alert) {
     @Override
     public boolean validate(final int option) {
         if(super.validate(option)) {
-            if(StringUtils.isBlank(passwordField.stringValue())) {
-                return false;
-            }
-            if(StringUtils.isBlank(confirmField.stringValue())) {
-                return false;
-            }
-            if(!StringUtils.equals(passwordField.stringValue(), confirmField.stringValue())) {
-                return false;
+            if(option == DEFAULT_OPTION) {
+                if(StringUtils.isBlank(passwordField.stringValue())) {
+                    return false;
+                }
+                if(StringUtils.isBlank(confirmField.stringValue())) {
+                    return false;
+                }
+                if(!StringUtils.equals(passwordField.stringValue(), confirmField.stringValue())) {
+                    return false;
+                }
             }
             return true;
         }

Original file line number	Diff line number	Diff line change
`@@ -178,9 +178,8 @@ public void callback(final int returncode) {`
`178`	`178`
`179`	`179`	`@Override`
`180`	`180`	`public boolean validate(final int option) {`
`181`		`- switch(option) {`
`182`		`- case DEFAULT_OPTION:`
`183`		`- return super.validate(option);`
	`181`	`+ if(option == DEFAULT_OPTION) {`
	`182`	`+ return super.validate(option);`
`184`	`183`	`}`
`185`	`184`	`return true;`
`186`	`185`	`}`
Original file line number	Diff line number	Diff line change
`@@ -129,12 +129,10 @@ protected void focus(final NSAlert alert) {`
`129`	`129`
`130`	`130`	`@Override`
`131`	`131`	`public boolean validate(final int option) {`
`132`		`- if(option == SheetCallback.ALTERNATE_OPTION) {`
`133`		`- if(options.anonymous) {`
`134`		`- return true;`
`135`		`- }`
	`132`	`+ if(option == DEFAULT_OPTION) {`
	`133`	`+ return StringUtils.isNotBlank(inputField.stringValue());`
`136`	`134`	`}`
`137`		`- return StringUtils.isNotBlank(inputField.stringValue());`
	`135`	`+ return true;`
`138`	`136`	`}`
`139`	`137`
`140`	`138`	`@Override`