Merge 1d3cac9 into ba59f37

docs/DeveloperGuide.adoc

@@ -1109,7 +1109,7 @@ Use case ends.
 +
 Use case ends.
 
-//@@ChenSongJian
+//@@author ChenSongJian
 [discrete]
 === Use case: Add Expense(UC11)
 

src/main/java/seedu/address/logic/LogicManager.java

@@ -67,7 +67,7 @@ public ObservableList<Person> getFilteredPersonList() {
         return model.getFilteredPersonList();
     }
     /*
-    //@@ChenSongJian
+    //@@author ChenSongJian
     @Override
     public ObservableList<Expense> getFilteredExpenseList() {
         return model.getFilteredExpenseList();

src/main/java/seedu/address/ui/CommandBox.java

@@ -4,6 +4,7 @@
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
+import org.controlsfx.control.textfield.AutoCompletionBinding;
 import org.controlsfx.control.textfield.TextFields;
 
 import javafx.collections.ObservableList;
@@ -30,6 +31,7 @@ public class CommandBox extends UiPart<Region> {
     private final Logger logger = LogsCenter.getLogger(CommandBox.class);
     private final Logic logic;
     private ListElementPointer historySnapshot;
+    private AutoCompletionBinding autoCompletionBinding;
 
     private ArrayList<String> commandList;
 
@@ -42,8 +44,8 @@ public CommandBox(Logic logic) {
         this.commandList = logic.getCommandList();
         // calls #setStyleToDefault() whenever there is a change to the text of the command box.
         commandTextField.textProperty().addListener((unused1, unused2, unused3) -> setStyleToDefault());
-        //@@ChenSongJian
-        TextFields.bindAutoCompletion(commandTextField, commandList -> {
+        //@@author ChenSongJian
+        autoCompletionBinding = TextFields.bindAutoCompletion(commandTextField, commandList -> {
             return commandList.getUserText().isEmpty() ? null : this.commandList.stream().filter(command -> {
                 return command.toLowerCase().startsWith(commandList.getUserText().toLowerCase());
             }).collect(Collectors.toList());
@@ -161,5 +163,9 @@ private void setStyleToIndicateCommandFailure() {
 
         styleClass.add(ERROR_STYLE_CLASS);
     }
-
+    //@@author ChenSongJian
+    public void offAutoComplete() {
+        this.autoCompletionBinding.dispose();
+    }
+    //@@
 }

src/test/java/guitests/guihandles/CommandBoxHandle.java

@@ -29,7 +29,7 @@ public void run(String command) {
         click();
         guiRobot.interact(() -> getRootNode().setText(command));
         guiRobot.pauseForHuman();
-
+        guiRobot.type(KeyCode.ESCAPE);
         guiRobot.type(KeyCode.ENTER);
     }
 

src/test/java/seedu/address/ui/CommandBoxTest.java

@@ -31,6 +31,7 @@ public void setUp() {
         Logic logic = new LogicManager(model);
 
         CommandBox commandBox = new CommandBox(logic);
+        commandBox.offAutoComplete();
         commandBoxHandle = new CommandBoxHandle(getChildNode(commandBox.getRoot(),
                 CommandBoxHandle.COMMAND_INPUT_FIELD_ID));
         uiPartRule.setUiPart(commandBox);