Get rid of dependency injection of controllers

Author: introfog

src/main/java/com/github/introfog/gitwave/controller/ExecuteController.java

@@ -78,22 +78,6 @@ public void initialize(FxmlStageHolder fxmlStageHolder) {
         });
     }
 
-    private void updateFields(String currentMainText, TextField field, boolean isCommand) {
-        final String sourceMainText = isCommand ? sourceCommand.getCommand() : sourceCommand.getDescription();
-        final String sourceSecText = isCommand ? sourceCommand.getDescription() : sourceCommand.getCommand();
-        final String currentSecText = isCommand ? description.getText() : command.getText();
-
-        if (sourceMainText.equals(currentMainText)){
-            field.setStyle(GREEN_TEXT_CSS_STYLE);
-            if (sourceSecText.equals(currentSecText)) {
-                save.setDisable(true);
-            }
-        } else {
-            save.setDisable(false);
-            field.setStyle(RED_TEXT_CSS_STYLE);
-        }
-    }
-
     @FXML
     protected void browseDirectory() {
         DirectoryChooser directoryChooser = new DirectoryChooser();
@@ -119,11 +103,15 @@ protected void clean() {
     @FXML
     protected void chooseFromSaved() {
         FxmlStageHolder holder = StageFactory.createModalExploreWindow();
-
-        ExploreController exploreController = holder.getFxmlLoader().getController();
-        exploreController.setExecuteController(this);
-
         holder.getStage().showAndWait();
+        ExploreController exploreController = holder.getFxmlLoader().getController();
+        final CommandDto pickedItem = exploreController.getPickedItem();
+        if (pickedItem != null) {
+            specifySourceCommand(pickedItem);
+        }
+        for (CommandDto removed : exploreController.getRemovedItems()) {
+            removeSourceCommand(removed);
+        }
     }
 
     @FXML
@@ -189,7 +177,23 @@ protected void foundIssue() {
         AppConfig.getInstance().getHostServices().showDocument(AppConstants.LINK_TO_GIT_CONTRIBUTING_FILE);
     }
 
-    void specifySourceCommand(CommandDto commandDto) {
+    private void updateFields(String currentMainText, TextField field, boolean isCommand) {
+        final String sourceMainText = isCommand ? sourceCommand.getCommand() : sourceCommand.getDescription();
+        final String sourceSecText = isCommand ? sourceCommand.getDescription() : sourceCommand.getCommand();
+        final String currentSecText = isCommand ? description.getText() : command.getText();
+
+        if (sourceMainText.equals(currentMainText)){
+            field.setStyle(GREEN_TEXT_CSS_STYLE);
+            if (sourceSecText.equals(currentSecText)) {
+                save.setDisable(true);
+            }
+        } else {
+            save.setDisable(false);
+            field.setStyle(RED_TEXT_CSS_STYLE);
+        }
+    }
+
+    private void specifySourceCommand(CommandDto commandDto) {
         save.setDisable(true);
         sourceCommand = commandDto;
         if (commandDto == null) {
@@ -205,7 +209,8 @@ void specifySourceCommand(CommandDto commandDto) {
         }
     }
 
-    void removeSavedCommand(CommandDto commandDto) {
+    private void removeSourceCommand(CommandDto commandDto) {
+        AppConfig.getInstance().removeCommand(commandDto);
         if (Objects.equals(commandDto, sourceCommand)) {
             sourceCommand = null;
             command.setStyle(BLACK_TEXT_CSS_STYLE);

src/main/java/com/github/introfog/gitwave/controller/ExploreController.java

@@ -20,6 +20,7 @@
 import com.github.introfog.gitwave.model.StageFactory.FxmlStageHolder;
 import com.github.introfog.gitwave.model.dto.CommandDto;
 
+import java.util.ArrayList;
 import java.util.List;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
@@ -40,8 +41,8 @@ public class ExploreController extends BaseController {
 
     @FXML
     private AnchorPane anchor;
-
-    private ExecuteController executeController;
+    private CommandDto pickedItem;
+    private final List<CommandDto> removedItems = new ArrayList<>();
 
     @Override
     public void initialize(FxmlStageHolder fxmlStageHolder) {
@@ -60,23 +61,18 @@ protected void mouseClick(MouseEvent event) {
         if (event.getClickCount() >= 2) {
             final CommandDto selectedItem = commandsTable.getSelectionModel().getSelectedItem();
             if (selectedItem != null) {
-                executeController.specifySourceCommand(selectedItem);
+                pickedItem = selectedItem;
                 closeStage();
             }
         }
     }
 
-    void setExecuteController(ExecuteController executeController) {
-        this.executeController = executeController;
+    public CommandDto getPickedItem() {
+        return pickedItem;
     }
 
-    private void removeCommand(CommandDto item) {
-        if (item == null) {
-            return;
-        }
-        commandsTable.getItems().remove(item);
-        executeController.removeSavedCommand(item);
-        AppConfig.getInstance().removeCommand(item);
+    public List<CommandDto> getRemovedItems() {
+        return removedItems;
     }
 
     private void setUpAndFillTable() {
@@ -124,7 +120,10 @@ protected void updateItem(String item, boolean empty) {
                 setGraphic(removeButton);
                 removeButton.setOnAction(event -> {
                     CommandDto selectedItem = getTableView().getItems().get(getIndex());
-                    exploreController.removeCommand(selectedItem);
+                    if (selectedItem != null) {
+                        exploreController.commandsTable.getItems().remove(selectedItem);
+                        exploreController.removedItems.add(selectedItem);
+                    }
                 });
             }
         }