Replace resultAction with onResult in dialog

Author: pcastornii

tabshell-core/src/main/java/com/techsenger/tabshell/core/dialog/AbstractDialogPresenter.java

@@ -58,7 +58,7 @@ public void setDisabled(boolean disabled) {
         }
     }
 
-    private Consumer<ResultButtonName> resultAction = (name) -> closeSafely();
+    private Consumer<ResultButtonName> onResult = (name) -> closeSafely();
 
     private boolean active;
 
@@ -266,13 +266,13 @@ public Icon<?> getIcon() {
     }
 
     @Override
-    public Consumer<ResultButtonName> getResultAction() {
-        return resultAction;
+    public Consumer<ResultButtonName> getOnResult() {
+        return onResult;
     }
 
     @Override
-    public void setResultAction(Consumer<ResultButtonName> resultAction) {
-        this.resultAction = resultAction;
+    public void setOnResult(Consumer<ResultButtonName> resultAction) {
+        this.onResult = resultAction;
     }
 
     @Override
@@ -294,8 +294,8 @@ protected void restoreAppearance() {
     }
 
     protected void onResult(ResultButtonName name) {
-        if (this.resultAction != null) {
-            this.resultAction.accept(name);
+        if (this.onResult != null) {
+            this.onResult.accept(name);
         }
     }
 

tabshell-core/src/main/java/com/techsenger/tabshell/core/dialog/DialogPort.java

@@ -39,7 +39,7 @@ public interface DialogPort extends DialogShared, PopupPort {
      *
      * @return the result action consumer, or {@code null} if the default close behavior is used
      */
-    Consumer<ResultButtonName> getResultAction();
+    Consumer<ResultButtonName> getOnResult();
 
     /**
      * Sets the action to be executed when a result button is clicked.
@@ -51,7 +51,7 @@ public interface DialogPort extends DialogShared, PopupPort {
      *
      * @param action the result action consumer, or {@code null} to reset to the default close behavior
      */
-    void setResultAction(Consumer<ResultButtonName> action);
+    void setOnResult(Consumer<ResultButtonName> action);
 
     /**
      * Returns whether this dialog is active.

tabshell-demo/src/main/java/com/techsenger/tabshell/demo/browser/MenuAwareAreaPresenter.java

@@ -76,7 +76,7 @@ protected void onBarIncludedSelected(boolean value) {
 
     protected void onDialogOpen(OverlayScope scope) {
         var dialog = getView().getComposer().openDemoDialog(scope, true);
-        dialog.setResultAction((name) -> {
+        dialog.setOnResult((name) -> {
             if (name == DemoResultButtons.OK) {
                 dialog.closeSafely();
             }

tabshell-demo/src/main/java/com/techsenger/tabshell/demo/dialogs/DialogsDialogPresenter.java

@@ -107,7 +107,7 @@ protected void postInitialize() {
         setResizable(true);
         setTitle("Dialogs");
         view.setDialogTypes(Arrays.asList(DialogType.values()));
-        setResultAction((result) -> {
+        setOnResult((result) -> {
             closeSafely();
         });
         setRightButtons(DialogsDialogButtons.CLOSE);
@@ -131,7 +131,7 @@ private void showFileChooserDialog(FileChooserType type) {
         this.storageRegistry.refreshDefaultStorages();
         var params = new FileChooserDialogParams(type, this.storageRegistry.getAllStorages(), settings, historyManager);
         var port = getView().getComposer().openFileChooserDialog(params);
-        port.setResultAction((buttonName) -> {
+        port.setOnResult((buttonName) -> {
             if (buttonName == FileChooserDialogButtons.OK) {
                 var result = port.getResult();
                 System.out.println("Result: " + result.getUri());

tabshell-demo/src/main/java/com/techsenger/tabshell/demo/ide/IdeMainTabPresenter.java

@@ -95,7 +95,7 @@ protected ComponentDescriptor createDescriptor() {
 
     protected void onDialogOpen() {
         var dialog = getView().getComposer().openDemoDialog(true);
-        dialog.setResultAction((name) -> {
+        dialog.setOnResult((name) -> {
             if (name == DemoResultButtons.OK) {
                 dialog.closeSafely();
             }

tabshell-demo/src/main/java/com/techsenger/tabshell/demo/page/PageDialogPresenter.java

@@ -53,7 +53,7 @@ public void prepareToClose(Consumer<ClosePreparationResult> resultCallback) {
     protected void postInitialize() {
         super.postInitialize();
         getView().setTitle("Page Dialog");
-        setResultAction((button) -> closeSafely());
+        setOnResult((button) -> closeSafely());
         setRightButtons(PageDialogButtons.OK);
         setButtonDefault(PageDialogButtons.OK, true);
         setMinWidth(500);

tabshell-demo/src/main/java/com/techsenger/tabshell/demo/theme/ThemeDialogPresenter.java

@@ -70,7 +70,7 @@ protected void postInitialize() {
         getView().setTheme(settings.getTheme());
         setRightButtons(ThemeDialogButtons.CANCEL, ThemeDialogButtons.OK);
         setButtonDefault(ThemeDialogButtons.OK, true);
-        setResultAction((buttonName) -> {
+        setOnResult((buttonName) -> {
             if (buttonName == ThemeDialogButtons.OK) {
                 settings.setTheme(this.theme);
             }

tabshell-devtools/src/main/java/com/techsenger/tabshell/devtools/node/EnumEditorDialogPresenter.java

@@ -33,7 +33,7 @@ public class EnumEditorDialogPresenter<V extends EnumEditorDialogView> extends A
 
     public EnumEditorDialogPresenter(V view, EditorDialogParams params) {
         super(view, params);
-        setResultAction((button) -> {
+        setOnResult((button) -> {
             if (button == EditorDialogButtons.OK) {
                 try {
                     applyValue(getTask(), value);

tabshell-devtools/src/main/java/com/techsenger/tabshell/devtools/node/InsetEditorDialogPresenter.java

@@ -35,7 +35,7 @@ public class InsetEditorDialogPresenter<V extends InsetEditorDialogView> extends
 
     public InsetEditorDialogPresenter(V view, EditorDialogParams params) {
         super(view, params);
-        setResultAction((button) -> {
+        setOnResult((button) -> {
             if (button == EditorDialogButtons.OK) {
                 try {
                     var value = top + "," + right + "," + bottom + "," + left;

tabshell-devtools/src/main/java/com/techsenger/tabshell/devtools/node/TextEditorDialogPresenter.java

@@ -32,7 +32,7 @@ public class TextEditorDialogPresenter<V extends TextEditorDialogView> extends A
 
     public TextEditorDialogPresenter(V view, EditorDialogParams params) {
         super(view, params);
-        setResultAction((button) -> {
+        setOnResult((button) -> {
             if (button == EditorDialogButtons.OK) {
                 try {
                     applyValue(getTask(), value);