#19 Open executions in the tab of the main window

introfog · introfog · commit e8bd5b3fdab3 · 2024-11-03T19:23:09.000+03:00
diff --git a/src/main/java/com/github/introfog/gitwave/controller/main/DirectoryTabController.java b/src/main/java/com/github/introfog/gitwave/controller/main/DirectoryTabController.java
@@ -42,6 +42,13 @@ public boolean isValid() {
             LOGGER.warn("Directory '{}' is empty, running git command was skipped.", directory.getText());
             DialogFactory.createErrorAlert("Invalid directory", "Directory can't be empty.");
             return false;
+        } else {
+            File directoryToRunIn = new File(directory.getText());
+            if (!directoryToRunIn.exists() || !directoryToRunIn.isDirectory()) {
+                DialogFactory.createInfoAlert("Invalid directory",
+                        "Specified directory either doesn't exist or isn't a directory.");
+                return false;
+            }
         }
         return true;
     }
diff --git a/src/main/java/com/github/introfog/gitwave/controller/main/ExecutionController.java b/src/main/java/com/github/introfog/gitwave/controller/main/ExecutionController.java
@@ -16,39 +16,51 @@
 
 package com.github.introfog.gitwave.controller.main;
 
-import com.github.introfog.gitwave.controller.BaseController;
-import com.github.introfog.gitwave.model.StageFactory;
-import com.github.introfog.gitwave.model.StageFactory.FxmlStageHolder;
-
+import java.util.Map;
 import javafx.application.Platform;
-import javafx.fxml.FXML;
+import javafx.geometry.Insets;
+import javafx.scene.control.Tab;
+import javafx.scene.control.TabPane;
 import javafx.scene.input.KeyCode;
+import org.fxmisc.flowless.VirtualizedScrollPane;
 import org.fxmisc.richtext.InlineCssTextArea;
 
-public class ExecutionController extends BaseController {
-    @FXML
-    private InlineCssTextArea canvas;
-
+public class ExecutionController {
     private boolean wasClosed = false;
     private boolean isExecutionFinished = false;
+    private final InlineCssTextArea canvas;
+    private final Tab tab;
+    private final TabPane tabPane;
+    private final Map<Tab, ExecutionController> executionTabs;
+
+    public ExecutionController(TabPane tabPane, Map<Tab, ExecutionController> executionTabs) {
+        canvas = new InlineCssTextArea("Searching git repositories...");
+        canvas.setEditable(false);
+        canvas.setFocusTraversable(false);
+        canvas.setPadding(new Insets(10, 2, 2, 2));
+        canvas.setStyle("-fx-font-family: verdana; -fx-font-size: 12;");
+
+        VirtualizedScrollPane<InlineCssTextArea> scrollPane = new VirtualizedScrollPane<>(canvas);
+
+        tab = new Tab("Execution " + tabPane.getTabs().size());
+        tab.setContent(scrollPane);
 
-    @Override
-    public void initialize(FxmlStageHolder fxmlStageHolder) {
-        super.initialize(fxmlStageHolder);
-        fxmlStageHolder.getStage().setOnCloseRequest(event -> {
-            beforeStageClose();
+        tabPane.getTabs().add(tab);
+        tabPane.getSelectionModel().select(tab);
+        canvas.requestFocus();
+
+        this.executionTabs = executionTabs;
+        this.tabPane = tabPane;
+        executionTabs.put(tab, this);
+
+        tab.setOnCloseRequest(event -> {
+            close();
         });
         canvas.setOnKeyPressed(event -> {
             if (event.getCode() == KeyCode.ESCAPE || event.getCode() == KeyCode.ENTER) {
                 if (isExecutionFinished) {
-                    closeStage();
-                }
-            }
-        });
-        fxmlStageHolder.getScene().setOnKeyPressed(event -> {
-            if (event.getCode() == KeyCode.ESCAPE || event.getCode() == KeyCode.ENTER) {
-                if (isExecutionFinished) {
-                    closeStage();
+                    tabPane.getTabs().remove(tab);
+                    close();
                 }
             }
         });
@@ -82,10 +94,15 @@ public boolean wasClosed() {
         return wasClosed;
     }
 
-    @Override
-    protected void closeStage() {
-        beforeStageClose();
-        super.closeStage();
+    public void close() {
+        wasClosed = true;
+        executionTabs.remove(tab);
+        if (!tabPane.getTabs().isEmpty()) {
+            Tab previousTab = tabPane.getTabs().get(tabPane.getTabs().size() - 1);
+            if (executionTabs.get(previousTab) != null) {
+                executionTabs.get(previousTab).canvas.requestFocus();
+            }
+        }
     }
 
     private void commonWritingPart(String line, String style) {
@@ -95,9 +112,4 @@ private void commonWritingPart(String line, String style) {
             canvas.requestFollowCaret();
         });
     }
-
-    private void beforeStageClose() {
-        wasClosed = true;
-        StageFactory.unregisterExecutingController(this);
-    }
 }
diff --git a/src/main/java/com/github/introfog/gitwave/controller/main/MainController.java b/src/main/java/com/github/introfog/gitwave/controller/main/MainController.java
@@ -20,20 +20,23 @@
 import com.github.introfog.gitwave.model.AppConfig;
 import com.github.introfog.gitwave.model.AppConstants;
 import com.github.introfog.gitwave.model.CommandExecutor;
-import com.github.introfog.gitwave.model.DialogFactory;
-import com.github.introfog.gitwave.model.StageFactory;
 import com.github.introfog.gitwave.model.StageFactory.FxmlStageHolder;
 import com.github.introfog.gitwave.model.dto.ParameterDto;
 
 import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import javafx.concurrent.Task;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.Label;
 import javafx.scene.control.Menu;
 import javafx.scene.control.MenuItem;
 import javafx.scene.control.SeparatorMenuItem;
+import javafx.scene.control.Tab;
+import javafx.scene.control.TabPane;
 import javafx.scene.control.TableView;
 import javafx.scene.control.TextField;
 import javafx.stage.Stage;
@@ -65,6 +68,10 @@ public class MainController extends BaseController {
     @FXML
     private SeparatorMenuItem updateMenuItemSeparator;
 
+    @FXML
+    private TabPane executionTabPage;
+    private final Map<Tab, ExecutionController> executionTabs = new HashMap<>();
+
     @Override
     public void initialize(FxmlStageHolder fxmlStageHolder) {
         super.initialize(fxmlStageHolder);
@@ -73,9 +80,10 @@ public void initialize(FxmlStageHolder fxmlStageHolder) {
             event.consume();
 
             AppConfig.getInstance().closeApp();
-            for (ExecutionController executionController : StageFactory.getExecutingControllers()) {
-                executionController.getStage().close();
+            for (ExecutionController controller: new ArrayList<>(executionTabs.values())) {
+                controller.close();
             }
+            executionTabPage.getTabs().clear();
             primaryStage.close();
         });
 
@@ -113,23 +121,16 @@ protected void runCommand() {
                 && commandTabController.isValid() && parametersTabController.isValid()) {
 
             File directoryToRunIn = new File(directoryTabController.getDirectory());
-            if (!directoryToRunIn.exists() || !directoryToRunIn.isDirectory()) {
-                DialogFactory.createInfoAlert("Invalid directory",
-                        "Specified directory either doesn't exist or isn't a directory.");
-                return;
-            }
             AppConfig.getInstance().setLastRunFolder(directoryToRunIn.getAbsolutePath());
 
-            final FxmlStageHolder executionWindow = StageFactory.createNoneModalExecutionWindow();
-            executionWindow.getStage().show();
-            ExecutionController executionController = executionWindow.getFxmlLoader().getController();
 
+            ExecutionController controller = new ExecutionController(executionTabPage, executionTabs);
             new Thread(new Task<>() {
                 @Override
                 protected Void call() {
                     final List<File> repositoriesToRunCommand = CommandExecutor.searchGitRepositories(directoryToRunIn);
 
-                    CommandExecutor.executeCommand(repositoriesToRunCommand, executionController,
+                    CommandExecutor.executeCommand(repositoriesToRunCommand, controller,
                             commandTabController.getCommandWithParameters());
                     return null;
                 }
diff --git a/src/main/java/com/github/introfog/gitwave/model/StageFactory.java b/src/main/java/com/github/introfog/gitwave/model/StageFactory.java
@@ -19,12 +19,9 @@
 import com.github.introfog.gitwave.GitWaveLauncher;
 import com.github.introfog.gitwave.controller.BaseController;
 import com.github.introfog.gitwave.controller.EditController;
-import com.github.introfog.gitwave.controller.main.ExecutionController;
 import com.github.introfog.gitwave.model.dto.CommandDto;
 
 import java.io.IOException;
-import java.util.HashSet;
-import java.util.Set;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Scene;
 import javafx.scene.image.Image;
@@ -36,36 +33,10 @@
 public final class StageFactory {
     private static final Logger LOGGER = LoggerFactory.getLogger(StageFactory.class);
 
-    private static final Set<ExecutionController> executingControllers = new HashSet<>();
-
     private StageFactory() {
         // private constructor
     }
 
-    public static void registerExecutionController(ExecutionController executionController) {
-        executingControllers.add(executionController);
-    }
-
-    public static void unregisterExecutingController(ExecutionController executionController) {
-        executingControllers.remove(executionController);
-    }
-
-    public static Set<ExecutionController> getExecutingControllers() {
-        return executingControllers;
-    }
-
-    public static FxmlStageHolder createNoneModalExecutionWindow() {
-        FxmlStageHolder holder = StageFactory.createNoneModalStage("view/execution.fxml", "Command execution result");
-        holder.getStage().setMinWidth(200);
-        holder.getStage().setMinHeight(200);
-        int alreadyOpenedExecutors = getExecutingControllers().size();
-        int shift = 20;
-        holder.getStage().setX(100 + (alreadyOpenedExecutors * shift));
-        holder.getStage().setY(100 + (alreadyOpenedExecutors * shift));
-        registerExecutionController(holder.getFxmlLoader().getController());
-        return holder;
-    }
-
     public static FxmlStageHolder createModalExploreWindow() {
         FxmlStageHolder holder = StageFactory.createModalStage("view/explorer.fxml", "Command explorer");
         holder.getStage().setMinWidth(400);
@@ -111,7 +82,7 @@ public static FxmlStageHolder createModalUpdateWindow() {
     public static FxmlStageHolder createPrimaryExecuteWindow(Stage stage) {
         final FxmlStageHolder holder = creteStage("view/main.fxml", "GitWave", stage);
         holder.getStage().setMinWidth(400);
-        holder.getStage().setMinHeight(340);
+        holder.getStage().setMinHeight(500);
         return holder;
     }
 
diff --git a/src/main/resources/com/github/introfog/gitwave/view/execution.fxml b/src/main/resources/com/github/introfog/gitwave/view/execution.fxml
diff --git a/src/main/resources/com/github/introfog/gitwave/view/main.fxml b/src/main/resources/com/github/introfog/gitwave/view/main.fxml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Hyperlink?>
 <?import javafx.scene.control.Label?>
@@ -18,16 +19,17 @@
 <?import javafx.scene.layout.GridPane?>
 <?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.text.Font?>
-<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="300.0" prefWidth="450.0" style="-fx-font-family: verdana; -fx-font-size: 12;" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.github.introfog.gitwave.controller.main.MainController">
+<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="600.0" style="-fx-font-family: verdana; -fx-font-size: 12;" xmlns="http://javafx.com/javafx/17.0.12" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.github.introfog.gitwave.controller.main.MainController">
    <children>
       <GridPane AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
         <columnConstraints>
           <ColumnConstraints hgrow="ALWAYS" minWidth="10.0" prefWidth="100.0" />
         </columnConstraints>
         <rowConstraints>
           <RowConstraints maxHeight="25.0" minHeight="25.0" prefHeight="25.0" vgrow="NEVER" />
-          <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-          <RowConstraints maxHeight="63.0" minHeight="63.0" prefHeight="63.0" vgrow="NEVER" />
+          <RowConstraints maxHeight="212.0" minHeight="212.0" prefHeight="212.0" vgrow="SOMETIMES" />
+          <RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="NEVER" />
+            <RowConstraints minHeight="63.0" vgrow="NEVER" />
         </rowConstraints>
          <children>
             <MenuBar prefHeight="25.0" prefWidth="450.0" GridPane.vgrow="NEVER">
@@ -122,17 +124,23 @@
             </TabPane>
             <AnchorPane prefHeight="200.0" prefWidth="200.0" GridPane.rowIndex="2" GridPane.vgrow="NEVER">
                <children>
-                  <Button layoutX="386.0" layoutY="36.0" mnemonicParsing="false" onAction="#runCommand" text="4. Run" AnchorPane.bottomAnchor="20.0" AnchorPane.rightAnchor="20.0">
+                  <Separator layoutY="17.0" prefWidth="200.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
+                  <Button layoutX="386.0" layoutY="36.0" mnemonicParsing="false" onAction="#runCommand" text="4. Run" AnchorPane.bottomAnchor="9.0" AnchorPane.rightAnchor="20.0">
                      <font>
                         <Font name="Verdana" size="12.0" />
                      </font></Button>
                   <Hyperlink focusTraversable="false" layoutY="25.0" onAction="#foundIssue" text="Found an issue?" AnchorPane.bottomAnchor="5.0" AnchorPane.leftAnchor="5.0">
                      <font>
                         <Font name="Verdana" size="12.0" />
                      </font></Hyperlink>
-                  <Separator layoutY="17.0" prefWidth="200.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
+                  <Separator prefWidth="200.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" />
                </children>
             </AnchorPane>
+            <TabPane fx:id="executionTabPage" prefHeight="200.0" prefWidth="200.0" tabClosingPolicy="ALL_TABS" GridPane.hgrow="ALWAYS" GridPane.rowIndex="3" GridPane.vgrow="ALWAYS">
+               <GridPane.margin>
+                  <Insets bottom="20.0" left="20.0" right="20.0" />
+               </GridPane.margin>
+            </TabPane>
          </children>
       </GridPane>
    </children>

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,13 @@ public boolean isValid() {`
`42`	`42`	`LOGGER.warn("Directory '{}' is empty, running git command was skipped.", directory.getText());`
`43`	`43`	`DialogFactory.createErrorAlert("Invalid directory", "Directory can't be empty.");`
`44`	`44`	`return false;`
	`45`	`+ } else {`
	`46`	`+ File directoryToRunIn = new File(directory.getText());`
	`47`	`+ if (!directoryToRunIn.exists() \|\| !directoryToRunIn.isDirectory()) {`
	`48`	`+ DialogFactory.createInfoAlert("Invalid directory",`
	`49`	`+ "Specified directory either doesn't exist or isn't a directory.");`
	`50`	`+ return false;`
	`51`	`+ }`
`45`	`52`	`}`
`46`	`53`	`return true;`
`47`	`54`	`}`