Merge 7c4fb33 into 6116d3a

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

@@ -0,0 +1,89 @@
+package seedu.address.logic;
+
+import java.util.ArrayList;
+
+import seedu.address.model.Model;
+import seedu.address.model.person.ReadOnlyPerson;
+
+
+/**
+ * AutoComplete class integrated into LogicManager to keep track of current set
+ * of autocomplete suggestions
+ */
+public class AutoComplete {
+
+    private final String[] baseCommands = { "add", "edit", "select", "delete", "clear",
+        "backup", "find", "list", "history", "exit", "help", "undo", "redo"
+    };
+    private ArrayList<String> personsStringArray;
+    private String[] autoCompleteList;
+    private Model model;
+
+    public AutoComplete(Model model) {
+        this.model = model;
+        autoCompleteList = baseCommands;
+        personsStringArray = new ArrayList<String>();
+        this.updatePersonsArray();
+    }
+
+    /**
+     * Updates AutoComplete suggestions according to user typed input
+     * @param userInput
+     */
+    public void updateAutoCompleteList(String userInput) {
+        switch (userInput) {
+        case "":
+            this.resetAutocompleteList();
+            break;
+        case "find":
+            this.autoCompleteList = getConcatPersonsArray("find");
+            break;
+        case "edit":
+            this.autoCompleteList = getConcatPersonsArray("edit");
+            break;
+        case "delete":
+            this.autoCompleteList = getConcatPersonsArray("delete");
+            break;
+        default:
+            return;
+        }
+    }
+
+    // Concatenate Persons to suggestions when command typed
+    private String[] getConcatPersonsArray(String command) {
+        String[] newAutoCompleteList = new String[personsStringArray.size()];
+        for (int i = 0; i < personsStringArray.size(); i++) {
+            if (command.equals("find")) {
+                newAutoCompleteList[i] = command + " " + personsStringArray.get(i);
+            } else {
+                newAutoCompleteList[i] = command + " " + (i + 1);
+            }
+        }
+        return newAutoCompleteList;
+    }
+
+    /**
+     * Reset autocomplete suggestions to base commands
+     */
+    public void resetAutocompleteList() {
+        this.autoCompleteList = baseCommands;
+    }
+
+    /**
+     * Update array of persons suggestions when list modified
+     */
+    public void updatePersonsArray() {
+        personsStringArray.clear();
+        for (ReadOnlyPerson p: model.getFilteredPersonList()) {
+            personsStringArray.add(p.getName().toString());
+        }
+    }
+
+    /**
+     * Getter for auto-complete list suggestions
+     */
+    // Update array of persons suggestions when list modified
+    public String[] getAutoCompleteList() {
+        return autoCompleteList;
+    }
+}

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

@@ -22,6 +22,11 @@ public interface Logic {
     /** Returns an unmodifiable view of the filtered list of persons */
     ObservableList<ReadOnlyPerson> getFilteredPersonList();
 
+    /** Updates and gets list of Auto-complete Strings */
+    void updateAutoCompleteList(String userInput);
+    String[] getAutoCompleteList();
+
+
     /** Returns the list of input entered by the user, encapsulated in a {@code ListElementPointer} object */
     ListElementPointer getHistorySnapshot();
 }

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

@@ -23,12 +23,24 @@ public class LogicManager extends ComponentManager implements Logic {
     private final CommandHistory history;
     private final AddressBookParser addressBookParser;
     private final UndoRedoStack undoRedoStack;
+    private AutoComplete autoCompleteList;
 
     public LogicManager(Model model) {
         this.model = model;
         this.history = new CommandHistory();
         this.addressBookParser = new AddressBookParser();
         this.undoRedoStack = new UndoRedoStack();
+        this.autoCompleteList = new AutoComplete(model);
+    }
+
+    @Override
+    public void updateAutoCompleteList(String userInput) {
+        autoCompleteList.updateAutoCompleteList(userInput);
+    }
+
+    @Override
+    public String[] getAutoCompleteList() {
+        return autoCompleteList.getAutoCompleteList();
     }
 
     @Override
@@ -39,6 +51,8 @@ public CommandResult execute(String commandText) throws CommandException, ParseE
             command.setData(model, history, undoRedoStack);
             CommandResult result = command.execute();
             undoRedoStack.push(command);
+            autoCompleteList.resetAutocompleteList();
+            autoCompleteList.updatePersonsArray();
             return result;
         } finally {
             history.add(commandText);

src/main/java/seedu/address/logic/commands/CommandResult.java

@@ -13,7 +13,7 @@ public CommandResult(String feedbackToUser) {
         this.feedbackToUser = requireNonNull(feedbackToUser);
     }
 
-    public CommandResult(String firstFeedBackToUser, String SecondFeedBackToUser) {
-        this.feedbackToUser = requireNonNull(firstFeedBackToUser + "\n" + SecondFeedBackToUser);
+    public CommandResult(String firstFeedBackToUser, String secondFeedBackToUser) {
+        this.feedbackToUser = requireNonNull(firstFeedBackToUser + "\n" + secondFeedBackToUser);
     }
 }

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

@@ -1,7 +1,11 @@
 package seedu.address.ui;
 
+import java.util.Arrays;
 import java.util.logging.Logger;
 
+import org.controlsfx.control.textfield.TextFields;
+
+import impl.org.controlsfx.autocompletion.SuggestionProvider;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
 import javafx.scene.control.TextField;
@@ -29,13 +33,16 @@ public class CommandBox extends UiPart<Region> {
 
     @FXML
     private TextField commandTextField;
+    private SuggestionProvider suggestions;
 
     public CommandBox(Logic logic) {
         super(FXML);
         this.logic = logic;
         // calls #setStyleToDefault() whenever there is a change to the text of the command box.
         commandTextField.textProperty().addListener((unused1, unused2, unused3) -> setStyleToDefault());
         historySnapshot = logic.getHistorySnapshot();
+        suggestions = SuggestionProvider.create((Arrays.asList(logic.getAutoCompleteList())));
+        TextFields.bindAutoCompletion(commandTextField, suggestions);
     }
 
     /**
@@ -56,7 +63,10 @@ private void handleKeyPress(KeyEvent keyEvent) {
             navigateToNextInput();
             break;
         default:
-            // let JavaFx handle the keypress
+            // Update textfield autocomplete options
+            logic.updateAutoCompleteList(commandTextField.getText());
+            suggestions.clearSuggestions();
+            suggestions.addPossibleSuggestions(Arrays.asList(logic.getAutoCompleteList()));
         }
     }