Merge pull request #416 from HemanshuGandhi/feature-block-content-edi…

…t-view

Feature block content edit view [View]

src/main/java/com/notably/logic/commands/EditCommand.java

@@ -2,7 +2,6 @@
 
 import static java.util.Objects.requireNonNull;
 
-import com.notably.logic.commands.exceptions.CommandException;
 import com.notably.model.Model;
 
 /**
@@ -15,10 +14,9 @@ public class EditCommand extends Command {
     /**
      * Edit the Block body of the current directory.
      * @param notablyModel used to access the tree structure.
-     * @throws CommandException
      */
     public void execute(Model notablyModel) {
         requireNonNull(notablyModel);
+        notablyModel.setBlockEditable(true);
     }
 }
-

src/main/java/com/notably/view/MainWindow.java

@@ -15,6 +15,7 @@
 import javafx.fxml.FXML;
 import javafx.scene.control.MenuItem;
 import javafx.scene.control.TextInputControl;
+import javafx.scene.effect.ColorAdjust;
 import javafx.scene.input.KeyCombination;
 import javafx.scene.input.KeyEvent;
 import javafx.scene.layout.StackPane;
@@ -47,6 +48,9 @@ public class MainWindow extends ViewPart<Stage> {
     @FXML
     private MenuItem helpMenuItem;
 
+    @FXML
+    private VBox mainWindow;
+
     @FXML
     private StackPane sideBarPlaceholder;
 
@@ -62,14 +66,12 @@ public class MainWindow extends ViewPart<Stage> {
     public MainWindow(Stage primaryStage, Logic logic, Model model) {
         super(FXML, primaryStage);
 
-        // Set dependencies
         this.primaryStage = primaryStage;
         this.logic = logic;
         this.model = model;
 
-        // Configure the VIEW
         setWindowDefaultSize(logic.getGuiSettings());
-
+        //setWindowSettings(primaryStage);
         setAccelerators();
 
         initializeHelpWindow(model);
@@ -79,6 +81,24 @@ public Stage getPrimaryStage() {
         return primaryStage;
     }
 
+    /**
+     * Provides an alternative way to set the settings of the main window, as an alternative
+     * to doing so via fxml tags.
+     *
+     * @param primaryStage the stage corresponding to the main app window.
+     */
+    private void setWindowSettings(Stage primaryStage) {
+        primaryStage.focusedProperty().addListener(((observable, unused, isFocused) -> {
+            if (isFocused) {
+                mainWindow.setEffect(null);
+            } else {
+                ColorAdjust colorAdjust = new ColorAdjust();
+                colorAdjust.setBrightness(-0.4);
+                mainWindow.setEffect(colorAdjust);
+            }
+        }));
+    }
+
     private void setAccelerators() {
         setAccelerator(helpMenuItem, KeyCombination.valueOf("F1"));
     }
@@ -125,7 +145,7 @@ void fillInnerParts() {
         sidebarTreeView = new SideBarTreeView(model.getBlockTree(), model.currentlyOpenPathProperty());
         sideBarPlaceholder.getChildren().add(sidebarTreeView.getRoot());
 
-        blockContent = new BlockContent(blockContentPlaceholder, model);
+        blockContent = new BlockContent(blockContentPlaceholder, logic, model);
 
         suggestionsWindowView = new SuggestionsWindowView(model.getSuggestions(), model.responseTextProperty());
         suggestionsWindow.getChildren().add(suggestionsWindowView.getRoot());

src/main/java/com/notably/view/blockcontent/BlockContent.java

@@ -1,7 +1,8 @@
 package com.notably.view.blockcontent;
 
-import java.util.Objects;
+import static com.notably.commons.util.CollectionUtil.requireAllNonNull;
 
+import com.notably.logic.Logic;
 import com.notably.model.Model;
 
 import javafx.scene.layout.StackPane;
@@ -10,15 +11,15 @@
  * View of the currently open block's content.
  */
 public class BlockContent {
+
     private final BlockContentDisplayView blockContentDisplayView;
     private final BlockContentEditView blockContentEditView;
 
-    public BlockContent(StackPane blockContentPlaceholder, Model model) {
-        Objects.requireNonNull(blockContentPlaceholder);
-        Objects.requireNonNull(model);
+    public BlockContent(StackPane blockContentPlaceholder, Logic logic, Model model) {
+        requireAllNonNull(blockContentPlaceholder, model, logic);
 
         blockContentDisplayView = new BlockContentDisplayView(model);
-        blockContentEditView = new BlockContentEditView(model);
+        blockContentEditView = new BlockContentEditView(logic, model);
 
         // TODO: Integrate BlockContentEditView
         blockContentPlaceholder.getChildren().addAll(blockContentDisplayView.getRoot());

src/main/java/com/notably/view/blockcontent/BlockContentDisplayView.java

@@ -16,8 +16,8 @@
  * Read-only and rendered view of the currently open block's content.
  */
 public class BlockContentDisplayView extends ViewPart<WebView> {
-    private static final String FXML = "blockcontent/BlockContentDisplayView.fxml";
 
+    private static final String FXML = "blockcontent/BlockContentDisplayView.fxml";
     private final Model model;
 
     @FXML