Complete GUI console

Author: pcastornii

alpha-assembly/alpha-assembly-maven-plugin/src/main/resources/com/techsenger/alpha/assembly/maven/plugin/gui-config.xml

@@ -60,14 +60,6 @@
         <Module groupId="com.techsenger.tabshell" artifactId="tabshell-dialogs" version="${bom.tabshell.version}"/>
         <Module groupId="com.techsenger.tabshell" artifactId="tabshell-layout" version="${bom.tabshell.version}"/>
 
-        <!--### RICH TEXT ###-->
-        <!-- todo: check versions -->
-        <Module groupId="org.fxmisc.richtext" artifactId="richtextfx" version="${bom.richtextfx.version}"/>
-        <Module groupId="org.fxmisc.flowless" artifactId="flowless" version="${bom.flowless.version}"/>
-        <Module groupId="org.fxmisc.undo" artifactId="undofx" version="${undofx.version}"/>
-        <Module groupId="org.fxmisc.wellbehaved" artifactId="wellbehavedfx" version="${wellbehavedfx.version}"/>
-        <Module groupId="org.reactfx" artifactId="reactfx" version="${reactfx.version}"/>
-
         <!--### UML ###-->
         <Module groupId="net.sourceforge.plantuml" artifactId="plantuml-asl" version="${bom.plantuml.version}"/>
 

alpha-core/src/main/java/com/techsenger/alpha/core/impl/DefaultFramework.java

@@ -189,12 +189,13 @@ public RepoService getRepoService() {
     public synchronized void shutdown() {
         shuttingDown = true;
         logger.debug("Shutting down framework");
-        List<ComponentDescriptor> descriptors =
-                new ArrayList<>(componentManager.getDescriptors());
+        List<ComponentDescriptor> descriptors = new ArrayList<>(componentManager.getDescriptors());
         Collections.sort(descriptors, new Comparator<ComponentDescriptor>() {
+
             @Override public int compare(ComponentDescriptor d1, ComponentDescriptor d2) {
                 return d2.getId() - d1.getId(); // reverse
             }
+
         });
         for (ComponentDescriptor descriptor : descriptors) {
             try {

alpha-executor/src/main/java/com/techsenger/alpha/executor/api/CommandExecutorFactory.java

@@ -18,6 +18,8 @@
 
 import com.techsenger.alpha.core.api.Framework;
 import com.techsenger.alpha.executor.impl.DefaultCommandExecutor;
+import com.techsenger.alpha.net.client.api.ClientService;
+import com.techsenger.alpha.net.client.api.ClientServiceFactory;
 
 /**
  *
@@ -26,7 +28,11 @@
 public final class CommandExecutorFactory {
 
     public static CommandExecutor create(Framework framework) throws Exception {
-        return new DefaultCommandExecutor(framework);
+        return new DefaultCommandExecutor(framework, ClientServiceFactory.create());
+    }
+
+    public static CommandExecutor create(Framework framework, ClientService client) throws Exception {
+        return new DefaultCommandExecutor(framework, client);
     }
 
     private CommandExecutorFactory() {

alpha-executor/src/main/java/com/techsenger/alpha/executor/impl/DefaultCommandContext.java

@@ -22,7 +22,6 @@
 import com.techsenger.alpha.executor.api.ParameterProvider;
 import com.techsenger.alpha.executor.api.command.ExecutionTarget;
 import com.techsenger.alpha.net.client.api.ClientService;
-import com.techsenger.alpha.net.client.api.ClientServiceFactory;
 import com.techsenger.alpha.net.client.api.ClientSession;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -47,7 +46,7 @@ public class DefaultCommandContext implements CommandContext {
 
     private ClientSession session;
 
-    private ClientService client = ClientServiceFactory.create();
+    private final ClientService client;
 
     private ExecutionProgress progress;
 
@@ -56,9 +55,10 @@ public class DefaultCommandContext implements CommandContext {
     /**
      * Constructor.
      */
-    public DefaultCommandContext(Framework framework, CommandExecutor executor) {
+    public DefaultCommandContext(Framework framework, CommandExecutor executor, ClientService client) {
         this.framework = framework;
         this.executor = executor;
+        this.client = client;
     }
 
     @Override

alpha-executor/src/main/java/com/techsenger/alpha/executor/impl/DefaultCommandExecutor.java

@@ -69,6 +69,7 @@
 import com.techsenger.alpha.executor.spi.Command;
 import com.techsenger.alpha.executor.spi.CommandDescriptor;
 import com.techsenger.alpha.executor.spi.CommandService;
+import com.techsenger.alpha.net.client.api.ClientService;
 import com.techsenger.toolkit.core.StopWatch;
 import com.techsenger.toolkit.core.StringUtils;
 import com.techsenger.toolkit.core.jpms.ServiceUtils;
@@ -102,8 +103,8 @@ public final class DefaultCommandExecutor implements CommandExecutor {
     /**
      * Constructor.
      */
-    public DefaultCommandExecutor(Framework framework) throws Exception {
-        this.commandContext = new DefaultCommandContext(framework, this);
+    public DefaultCommandExecutor(Framework framework, ClientService client) throws Exception {
+        this.commandContext = new DefaultCommandContext(framework, this, client);
         var commandProviders = ServiceUtils.loadProviders(DefaultCommandExecutor.class.getModule().getLayer(), false,
                 CommandService.class);
         var customCommands = commandProviders.stream()

alpha-executor/src/main/java/com/techsenger/alpha/executor/impl/commands/ComponentDeployCommand.java

@@ -48,8 +48,8 @@ public class ComponentDeployCommand extends AbstractComponentNameVerCommand {
     private List<String> parentAliases = new ArrayList<>();
 
     @Parameter(names = {"--use-parent-cl"}, required = false,
-            description = "sets whether the class loader of the parent component should be used; "
-                    + "can be used only for components with one parent having one loader")
+            description = "use the parent component's class loader "
+                    + "(only if there is a single parent with a single loader)")
     private boolean useParentClassLoader;
 
     @Override

alpha-executor/src/main/java/com/techsenger/alpha/executor/spi/AbstractCommand.java

@@ -41,7 +41,7 @@ public abstract  class AbstractCommand implements Command {
      * Continue on fail.
      */
     @Parameter(names = {"--continue-on-fail"}, required = false,
-            description = "allows program to execute next command if this command has given an error,"
+            description = "allows program to execute next command if this command has given an error, "
             + "default is false")
     private boolean continueOnFail = false;
 

alpha-gui/pom.xml

@@ -22,10 +22,6 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
-<!--        <dependency>
-            <groupId>org.fxmisc.richtext</groupId>
-            <artifactId>richtextfx</artifactId>
-        </dependency>-->
         <dependency>
             <groupId>org.openjfx</groupId>
             <artifactId>jfx-incubator-richtext</artifactId>

alpha-gui/src/main/java/com/techsenger/alpha/gui/AlphaApplication.java

@@ -16,8 +16,8 @@
 
 package com.techsenger.alpha.gui;
 
-import com.techsenger.alpha.gui.console.InMemoryHistoryManager;
 import com.techsenger.alpha.gui.menu.FileMenuRegistrar;
+import com.techsenger.alpha.gui.style.ConsoleIcons;
 import com.techsenger.tabshell.core.DefaultShellContext;
 import com.techsenger.tabshell.core.DefaultShellFxView;
 import com.techsenger.tabshell.core.DefaultShellPresenter;
@@ -27,9 +27,10 @@
 import com.techsenger.tabshell.icons.IconStylesheetFactory;
 import com.techsenger.tabshell.layout.tabhost.TabHostFxView;
 import com.techsenger.tabshell.layout.tabhost.TabHostPresenter;
+import com.techsenger.tabshell.material.style.Stylesheet;
 import com.techsenger.tabshell.material.theme.AtlantaFxTheme;
+import java.util.ArrayList;
 import javafx.application.Application;
-import javafx.application.Platform;
 import javafx.scene.text.Font;
 import javafx.stage.Stage;
 
@@ -57,12 +58,15 @@ public AppearanceSettings getAppearance() {
 
     @Override
     public void start(Stage stage) throws Exception {
-        var shellView = new DefaultShellFxView<>(this, stage, IconStylesheetFactory.forAll());
+        var stylesheets = new ArrayList<Stylesheet>(IconStylesheetFactory.forAll());
+        stylesheets.add(new Stylesheet(ConsoleIcons.class.getResource("icons.css")));
+        var shellView = new DefaultShellFxView<>(this, stage, stylesheets);
         var context = new DefaultShellContext(createSettings(), new InMemoryHistoryManager(), getHostServices());
         var shellPresenter = new DefaultShellPresenter<>(shellView, context);
-        shellPresenter.setOnClose(() -> Platform.exit());
+        shellPresenter.setOnClose(() ->
+                Thread.startVirtualThread(() -> ModuleActivatorProvider.getFramework().shutdown()));
         shellPresenter.initialize();
-        shellView.setTitle("Console");
+        shellView.setTitle("Alpha Framework");
 
         var workspaceView = new TabHostFxView<>(true);
         var workspacePresenter = new TabHostPresenter<>(workspaceView);

alpha-gui/src/main/java/com/techsenger/alpha/gui/AlphaComponents.java

@@ -43,6 +43,8 @@ public interface AlphaComponents {
 
     ComponentName CONSOLE_TAB = new DefaultComponentName("Console Tab");
 
+    ComponentName CONSOLE_TOOL_BAR = new DefaultComponentName("Console ToolBar");
+
 //    ShellTabKey FILE_TAB = new ShellTabKey("File Tab");
 //
 //    TabKey CONVERTED_XML_TAB = new TabKey("Converted XML Tab");