Move composer interface to view interface

Author: pcastornii

weaverbird-gui/src/main/java/com/techsenger/weaverbird/gui/console/CompletionPopupFxView.java

@@ -38,7 +38,7 @@
  *
  * @author Pavel Castornii
  */
-public class CompletionPopupFxView<P extends CompletionPopupPresenter<?, ?>>
+public class CompletionPopupFxView<P extends CompletionPopupPresenter<?>>
         extends AbstractPopupFxView<P> implements CompletionPopupView {
 
     private final ListView<CompletionItem<?>> listView = new ListView<>();

weaverbird-gui/src/main/java/com/techsenger/weaverbird/gui/console/CompletionPopupPresenter.java

@@ -23,7 +23,6 @@
 import com.techsenger.tabshell.core.CloseCheckResult;
 import com.techsenger.tabshell.core.ClosePreparationResult;
 import com.techsenger.tabshell.core.popup.AbstractPopupPresenter;
-import com.techsenger.tabshell.core.popup.PopupComposer;
 import java.util.Collection;
 import java.util.Comparator;
 import java.util.List;
@@ -34,8 +33,8 @@
  *
  * @author Pavel Castornii
  */
-public class CompletionPopupPresenter<V extends CompletionPopupView, C extends PopupComposer>
-        extends AbstractPopupPresenter<V, C> implements CompletionPopupPort {
+public class CompletionPopupPresenter<V extends CompletionPopupView> extends AbstractPopupPresenter<V>
+        implements CompletionPopupPort {
 
     private final Collection<CommandInfo> commands;
 

weaverbird-gui/src/main/java/com/techsenger/weaverbird/gui/console/ConsoleTabComposer.java

@@ -16,19 +16,19 @@
 
 package com.techsenger.weaverbird.gui.console;
 
-import com.techsenger.weaverbird.core.api.message.Message;
-import com.techsenger.weaverbird.core.api.message.MessageType;
-import com.techsenger.weaverbird.executor.api.command.CommandInfo;
-import com.techsenger.weaverbird.executor.api.command.ParameterDescriptor;
-import com.techsenger.weaverbird.net.client.api.ClientService;
-import com.techsenger.weaverbird.net.client.api.ClientSession;
 import com.techsenger.tabshell.core.ShellFxView;
 import com.techsenger.tabshell.core.tab.AbstractTabFxView;
 import com.techsenger.tabshell.material.Anchors;
 import com.techsenger.tabshell.material.style.StyleClasses;
 import com.techsenger.tabshell.material.style.StyleUtils;
 import com.techsenger.tabshell.material.theme.AtlantaFxTheme;
 import com.techsenger.toolkit.fx.utils.NodeUtils;
+import com.techsenger.weaverbird.core.api.message.Message;
+import com.techsenger.weaverbird.core.api.message.MessageType;
+import com.techsenger.weaverbird.executor.api.command.CommandInfo;
+import com.techsenger.weaverbird.executor.api.command.ParameterDescriptor;
+import com.techsenger.weaverbird.net.client.api.ClientService;
+import com.techsenger.weaverbird.net.client.api.ClientSession;
 import java.awt.Toolkit;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -53,7 +53,7 @@
  *
  * @author Pavel Castornii
  */
-public class ConsoleTabFxView<P extends ConsoleTabPresenter<?, ?>> extends AbstractTabFxView<P>
+public class ConsoleTabFxView<P extends ConsoleTabPresenter<?>> extends AbstractTabFxView<P>
         implements ConsoleTabView {
 
     private static final class CssRichTextArea extends RichTextArea {
@@ -76,7 +76,7 @@ public StyleHandlerRegistry getStyleHandlerRegistry() {
         }
     };
 
-    protected class Composer extends AbstractTabFxView<P>.Composer implements ConsoleTabComposer {
+    protected class Composer extends AbstractTabFxView<P>.Composer implements ConsoleTabView.Composer {
 
         private final ConsoleTabFxView<P> view = ConsoleTabFxView.this;
 

weaverbird-gui/src/main/java/com/techsenger/weaverbird/gui/console/ConsoleTabFxView.java

@@ -16,6 +16,12 @@
 
 package com.techsenger.weaverbird.gui.console;
 
+import com.techsenger.patternfx.mvp.Descriptor;
+import com.techsenger.tabshell.core.CloseCheckResult;
+import com.techsenger.tabshell.core.ClosePreparationResult;
+import com.techsenger.tabshell.core.UiExecutor;
+import com.techsenger.tabshell.core.settings.SettingsSubscription;
+import com.techsenger.tabshell.core.tab.AbstractTabPresenter;
 import com.techsenger.weaverbird.core.api.Constants;
 import com.techsenger.weaverbird.core.api.Framework;
 import com.techsenger.weaverbird.core.api.message.DefaultMessage;
@@ -25,30 +31,24 @@
 import com.techsenger.weaverbird.executor.api.CommandExecutorFactory;
 import com.techsenger.weaverbird.executor.api.CommandSyntax;
 import com.techsenger.weaverbird.executor.api.command.Commands;
+import com.techsenger.weaverbird.gui.WeaverbirdComponents;
 import com.techsenger.weaverbird.gui.style.ConsoleIcons;
 import com.techsenger.weaverbird.net.client.api.ClientService;
 import com.techsenger.weaverbird.net.client.api.ClientSession;
-import com.techsenger.patternfx.mvp.Descriptor;
-import com.techsenger.tabshell.core.CloseCheckResult;
-import com.techsenger.tabshell.core.ClosePreparationResult;
-import com.techsenger.tabshell.core.UiExecutor;
-import com.techsenger.tabshell.core.settings.SettingsSubscription;
-import com.techsenger.tabshell.core.tab.AbstractTabPresenter;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.function.Consumer;
 import java.util.regex.Pattern;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import com.techsenger.weaverbird.gui.WeaverbirdComponents;
 
 /**
  *
  * @author Pavel Castornii
  */
-public class ConsoleTabPresenter<V extends ConsoleTabView, C extends ConsoleTabComposer>
-        extends AbstractTabPresenter<V, C> implements CompletionPopupAwarePort, ConsoleToolBarAwarePort {
+public class ConsoleTabPresenter<V extends ConsoleTabView> extends AbstractTabPresenter<V>
+        implements CompletionPopupAwarePort, ConsoleToolBarAwarePort {
 
     /**
      * Input without prompt. Contains the information about the current token (next to caret).
@@ -132,8 +132,9 @@ private static boolean isTokenChar(char ch) {
 
     public ConsoleTabPresenter(V view, Framework framework, ClientService client, ClientSession session) {
         super(view);
-        getComposer().setClient(client);
-        getComposer().setSession(session);
+        var composer = getView().getComposer();
+        composer.setClient(client);
+        composer.setSession(session);
         CommandExecutor ex = null;
         try {
             ex = CommandExecutorFactory.create(framework, client);
@@ -169,7 +170,7 @@ public void onElementSubmitted(CompletionType type, String text) {
 
     @Override
     public void onPopupClose() {
-        getComposer().removePopup();
+        getView().getComposer().removePopup();
         getView().requestFocus();
     }
 
@@ -228,9 +229,10 @@ protected void showPrompt() {
     }
 
     protected void onElementSubmitted() {
-        var popup = getComposer().getPopupPort();
+        var composer = getView().getComposer();
+        var popup = composer.getPopupPort();
         addElement(popup.getType(), popup.getSelectedItemText());
-        getComposer().removePopup();
+        composer.removePopup();
         getView().requestFocus();
     }
 
@@ -251,7 +253,7 @@ protected void onAutocomplete(String paragraph) {
         if (processingCommand) {
             var commands = executor.getCommandsByName().values();
             var sessionExists = executor.getCommandContext().getSession() != null;
-            getComposer().addCommandPopup(commands, sessionExists, elementToken, offset);
+            getView().getComposer().addCommandPopup(commands, sessionExists, elementToken, offset);
         } else {
             var splits = this.input.text.trim().split(Pattern.quote(" "));
             var cmd = splits[0].trim();
@@ -260,7 +262,7 @@ protected void onAutocomplete(String paragraph) {
             }
             var command = executor.getCommandsByName().get(cmd);
             if (command != null) {
-                getComposer().addParameterPopup(command.getParameters(), elementToken, offset);
+                getView().getComposer().addParameterPopup(command.getParameters(), elementToken, offset);
             }
         }
     }
@@ -270,7 +272,7 @@ protected void onCaretChanged(Integer caretOffset) {
     }
 
     protected void onCopyAvailable(boolean value) {
-        getComposer().getToolBarPort().onCopyAvailable(value);
+        getView().getComposer().getToolBarPort().onCopyAvailable(value);
     }
 
     protected void onCommandsSubmitted(String paragraph, int width) {
@@ -295,7 +297,7 @@ protected void onCommandsSubmitted(String paragraph, int width) {
                 });
                 var newSession = executor.getCommandContext().getSession();
                 if (!Objects.equals(oldSession, newSession)) {
-                    UiExecutor.execute(() -> getComposer().getToolBarPort().updateSession(newSession));
+                    UiExecutor.execute(() -> getView().getComposer().getToolBarPort().updateSession(newSession));
                 }
                 updatePrompt();
                 // syncSessionBarAndContext(null);
@@ -318,7 +320,7 @@ protected void onCommandsSubmitted(String paragraph, int width) {
     }
 
     protected void onTextInput(String paragraph) {
-        var popup = getComposer().getPopupPort();
+        var popup = getView().getComposer().getPopupPort();
         if (popup == null) {
             return;
         }
@@ -332,7 +334,7 @@ protected void onTextInput(String paragraph) {
     }
 
     protected void onMoveUp() {
-        var popup = getComposer().getPopupPort();
+        var popup = getView().getComposer().getPopupPort();
         if (popup == null) {
             scrollHistoryUp();
         } else {
@@ -341,7 +343,7 @@ protected void onMoveUp() {
     }
 
     protected void onMoveDown() {
-        var popup = getComposer().getPopupPort();
+        var popup = getView().getComposer().getPopupPort();
         if (popup == null) {
             scrollHistoryDown();
         } else {
@@ -404,7 +406,7 @@ private void addElement(CompletionType type, String element) {
         }
         var newInput = oldInput + (element == null ? "" : element + " ");
         getView().updateInput(newInput);
-        getComposer().removePopup();
+        getView().getComposer().removePopup();
         getView().requestFocus();
         this.input = null;
     }

weaverbird-gui/src/main/java/com/techsenger/weaverbird/gui/console/ConsoleTabPresenter.java

@@ -16,8 +16,13 @@
 
 package com.techsenger.weaverbird.gui.console;
 
-import com.techsenger.weaverbird.core.api.message.Message;
 import com.techsenger.tabshell.core.tab.TabView;
+import com.techsenger.weaverbird.core.api.message.Message;
+import com.techsenger.weaverbird.executor.api.command.CommandInfo;
+import com.techsenger.weaverbird.executor.api.command.ParameterDescriptor;
+import com.techsenger.weaverbird.net.client.api.ClientService;
+import com.techsenger.weaverbird.net.client.api.ClientSession;
+import java.util.Collection;
 import java.util.List;
 import java.util.Set;
 import javafx.scene.text.Font;
@@ -28,6 +33,26 @@
  */
 public interface ConsoleTabView extends TabView {
 
+    interface Composer extends TabView.Composer {
+
+        void setClient(ClientService client);
+
+        void setSession(ClientSession session);
+
+        ConsoleToolBarPort getToolBarPort();
+
+        void addCommandPopup(Collection<CommandInfo> commands, boolean sessionExists, String token, int offset);
+
+        void addParameterPopup(List<ParameterDescriptor> parameters,  String token, int offset);
+
+        CompletionPopupPort getPopupPort();
+
+        void removePopup();
+    }
+
+    @Override
+    Composer getComposer();
+
     void setMonospaceFont(Font font);
 
     void printPrompt(String prompt);

weaverbird-gui/src/main/java/com/techsenger/weaverbird/gui/console/ConsoleTabView.java

@@ -17,11 +17,11 @@
 package com.techsenger.weaverbird.gui.console;
 
 import atlantafx.base.theme.Styles;
-import com.techsenger.weaverbird.gui.session.AbstractSessionToolBarFxView;
-import com.techsenger.weaverbird.gui.style.ConsoleIcons;
 import com.techsenger.tabshell.material.icon.FontIconView;
 import com.techsenger.tabshell.material.style.StyleClasses;
 import com.techsenger.toolkit.fx.Spacer;
+import com.techsenger.weaverbird.gui.session.AbstractSessionToolBarFxView;
+import com.techsenger.weaverbird.gui.style.ConsoleIcons;
 import javafx.geometry.Orientation;
 import javafx.scene.control.Button;
 import javafx.scene.control.Separator;
@@ -31,7 +31,7 @@
  *
  * @author Pavel Castornii
  */
-public class ConsoleToolBarFxView<P extends ConsoleToolBarPresenter<?, ?>> extends AbstractSessionToolBarFxView<P>
+public class ConsoleToolBarFxView<P extends ConsoleToolBarPresenter<?>> extends AbstractSessionToolBarFxView<P>
         implements ConsoleToolBarView {
 
     private final Button clearButton = new Button(null, new FontIconView(ConsoleIcons.CLEAR));

weaverbird-gui/src/main/java/com/techsenger/weaverbird/gui/console/ConsoleToolBarFxView.java

@@ -16,19 +16,18 @@
 
 package com.techsenger.weaverbird.gui.console;
 
+import com.techsenger.patternfx.mvp.Descriptor;
+import com.techsenger.weaverbird.gui.WeaverbirdComponents;
 import com.techsenger.weaverbird.gui.session.AbstractSessionToolBarPresenter;
 import com.techsenger.weaverbird.net.client.api.ClientService;
 import com.techsenger.weaverbird.net.client.api.ClientSession;
-import com.techsenger.patternfx.mvp.Descriptor;
-import com.techsenger.tabshell.core.area.AreaComposer;
-import com.techsenger.weaverbird.gui.WeaverbirdComponents;
 
 /**
  *
  * @author Pavel Castornii
  */
-public class ConsoleToolBarPresenter<V extends ConsoleToolBarView, C extends AreaComposer>
-        extends AbstractSessionToolBarPresenter<V, C> implements ConsoleToolBarPort {
+public class ConsoleToolBarPresenter<V extends ConsoleToolBarView> extends AbstractSessionToolBarPresenter<V>
+        implements ConsoleToolBarPort {
 
     private final ConsoleToolBarAwarePort toolBarAware;