Merge branch 'master' of github.com:se-edu/addressbook-level4

src/main/java/seedu/address/MainApp.java

@@ -199,7 +199,7 @@ public void stop() {
     @Subscribe
     public void handleExitAppRequestEvent(ExitAppRequestEvent event) {
         logger.info(LogsCenter.getEventHandlingLogMessage(event));
-        this.stop();
+        stop();
     }
 
     public static void main(String[] args) {

src/main/java/seedu/address/commons/core/GuiSettings.java

@@ -17,15 +17,15 @@ public class GuiSettings implements Serializable {
     private Point windowCoordinates;
 
     public GuiSettings() {
-        this.windowWidth = DEFAULT_WIDTH;
-        this.windowHeight = DEFAULT_HEIGHT;
-        this.windowCoordinates = null; // null represent no coordinates
+        windowWidth = DEFAULT_WIDTH;
+        windowHeight = DEFAULT_HEIGHT;
+        windowCoordinates = null; // null represent no coordinates
     }
 
     public GuiSettings(Double windowWidth, Double windowHeight, int xPosition, int yPosition) {
         this.windowWidth = windowWidth;
         this.windowHeight = windowHeight;
-        this.windowCoordinates = new Point(xPosition, yPosition);
+        windowCoordinates = new Point(xPosition, yPosition);
     }
 
     public Double getWindowWidth() {

src/main/java/seedu/address/commons/core/Version.java

@@ -71,19 +71,19 @@ public String toString() {
 
     @Override
     public int compareTo(Version other) {
-        if (this.major != other.major) {
-            return this.major - other.major;
+        if (major != other.major) {
+            return major - other.major;
         }
-        if (this.minor != other.minor) {
-            return this.minor - other.minor;
+        if (minor != other.minor) {
+            return minor - other.minor;
         }
-        if (this.patch != other.patch) {
-            return this.patch - other.patch;
+        if (patch != other.patch) {
+            return patch - other.patch;
         }
-        if (this.isEarlyAccess == other.isEarlyAccess()) {
+        if (isEarlyAccess == other.isEarlyAccess()) {
             return 0;
         }
-        if (this.isEarlyAccess) {
+        if (isEarlyAccess) {
             return -1;
         }
         return 1;
@@ -99,7 +99,7 @@ public boolean equals(Object obj) {
         }
         final Version other = (Version) obj;
 
-        return this.compareTo(other) == 0;
+        return compareTo(other) == 0;
     }
 
     @Override

src/main/java/seedu/address/commons/core/index/Index.java

@@ -49,6 +49,6 @@ public static Index fromOneBased(int oneBasedIndex) {
     public boolean equals(Object other) {
         return other == this // short circuit if same object
                 || (other instanceof Index // instanceof handles nulls
-                && this.zeroBasedIndex == ((Index) other).zeroBasedIndex); // state check
+                && zeroBasedIndex == ((Index) other).zeroBasedIndex); // state check
     }
 }

src/main/java/seedu/address/commons/events/ui/ExitAppRequestEvent.java

@@ -9,6 +9,6 @@ public class ExitAppRequestEvent extends BaseEvent {
 
     @Override
     public String toString() {
-        return this.getClass().getSimpleName();
+        return getClass().getSimpleName();
     }
 }

src/main/java/seedu/address/commons/events/ui/JumpToListRequestEvent.java

@@ -16,7 +16,7 @@ public JumpToListRequestEvent(Index targetIndex) {
 
     @Override
     public String toString() {
-        return this.getClass().getSimpleName();
+        return getClass().getSimpleName();
     }
 
 }

src/main/java/seedu/address/commons/events/ui/NewResultAvailableEvent.java

@@ -15,7 +15,7 @@ public NewResultAvailableEvent(String message) {
 
     @Override
     public String toString() {
-        return this.getClass().getSimpleName();
+        return getClass().getSimpleName();
     }
 
 }

src/main/java/seedu/address/commons/events/ui/PersonPanelSelectionChangedEvent.java

@@ -17,7 +17,7 @@ public PersonPanelSelectionChangedEvent(Person newSelection) {
 
     @Override
     public String toString() {
-        return this.getClass().getSimpleName();
+        return getClass().getSimpleName();
     }
 
     public Person getNewSelection() {

src/main/java/seedu/address/commons/events/ui/ShowHelpRequestEvent.java

@@ -9,7 +9,7 @@ public class ShowHelpRequestEvent extends BaseEvent {
 
     @Override
     public String toString() {
-        return this.getClass().getSimpleName();
+        return getClass().getSimpleName();
     }
 
 }

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

@@ -15,6 +15,10 @@ public CommandHistory() {
         userInputHistory = new LinkedList<>();
     }
 
+    public CommandHistory(CommandHistory commandHistory) {
+        userInputHistory = new LinkedList<>(commandHistory.userInputHistory);
+    }
+
     /**
      * Appends {@code userInput} to the list of user input entered.
      */
@@ -29,4 +33,26 @@ public void add(String userInput) {
     public List<String> getHistory() {
         return new LinkedList<>(userInputHistory);
     }
+
+    @Override
+    public boolean equals(Object obj) {
+        // short circuit if same object
+        if (obj == this) {
+            return true;
+        }
+
+        // instanceof handles nulls
+        if (!(obj instanceof CommandHistory)) {
+            return false;
+        }
+
+        // state check
+        CommandHistory other = (CommandHistory) obj;
+        return userInputHistory.equals(other.userInputHistory);
+    }
+
+    @Override
+    public int hashCode() {
+        return userInputHistory.hashCode();
+    }
 }

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

@@ -34,8 +34,7 @@ public CommandResult execute(String commandText) throws CommandException, ParseE
         logger.info("----------------[USER COMMAND][" + commandText + "]");
         try {
             Command command = addressBookParser.parseCommand(commandText);
-            command.setData(model, history);
-            return command.execute();
+            return command.execute(model, history);
         } finally {
             history.add(commandText);
         }

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

@@ -7,7 +7,9 @@
 import static seedu.address.logic.parser.CliSyntax.PREFIX_PHONE;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG;
 
+import seedu.address.logic.CommandHistory;
 import seedu.address.logic.commands.exceptions.CommandException;
+import seedu.address.model.Model;
 import seedu.address.model.person.Person;
 
 /**
@@ -46,7 +48,7 @@ public AddCommand(Person person) {
     }
 
     @Override
-    public CommandResult execute() throws CommandException {
+    public CommandResult execute(Model model, CommandHistory history) throws CommandException {
         requireNonNull(model);
 
         if (model.hasPerson(toAdd)) {

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

@@ -2,7 +2,9 @@
 
 import static java.util.Objects.requireNonNull;
 
+import seedu.address.logic.CommandHistory;
 import seedu.address.model.AddressBook;
+import seedu.address.model.Model;
 
 /**
  * Clears the address book.
@@ -14,7 +16,7 @@ public class ClearCommand extends Command {
 
 
     @Override
-    public CommandResult execute() {
+    public CommandResult execute(Model model, CommandHistory history) {
         requireNonNull(model);
         model.resetData(new AddressBook());
         model.commitAddressBook();

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

@@ -8,23 +8,15 @@
  * Represents a command with hidden internal logic and the ability to be executed.
  */
 public abstract class Command {
-    protected Model model;
-    protected CommandHistory history;
 
     /**
      * Executes the command and returns the result message.
      *
+     * @param model {@code Model} which the command should operate on.
+     * @param history {@code CommandHistory} which the command should operate on.
      * @return feedback message of the operation result for display
      * @throws CommandException If an error occurs during command execution.
      */
-    public abstract CommandResult execute() throws CommandException;
+    public abstract CommandResult execute(Model model, CommandHistory history) throws CommandException;
 
-    /**
-     * Provides any needed dependencies to the command.
-     * Commands making use of any of these should override this method to gain
-     * access to the dependencies.
-     */
-    public void setData(Model model, CommandHistory history) {
-        this.model = model;
-    }
 }

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

@@ -1,10 +1,14 @@
 package seedu.address.logic.commands;
 
+import static java.util.Objects.requireNonNull;
+
 import java.util.List;
 
 import seedu.address.commons.core.Messages;
 import seedu.address.commons.core.index.Index;
+import seedu.address.logic.CommandHistory;
 import seedu.address.logic.commands.exceptions.CommandException;
+import seedu.address.model.Model;
 import seedu.address.model.person.Person;
 
 /**
@@ -28,7 +32,8 @@ public DeleteCommand(Index targetIndex) {
     }
 
     @Override
-    public CommandResult execute() throws CommandException {
+    public CommandResult execute(Model model, CommandHistory history) throws CommandException {
+        requireNonNull(model);
         List<Person> lastShownList = model.getFilteredPersonList();
 
         if (targetIndex.getZeroBased() >= lastShownList.size()) {
@@ -45,6 +50,6 @@ public CommandResult execute() throws CommandException {
     public boolean equals(Object other) {
         return other == this // short circuit if same object
                 || (other instanceof DeleteCommand // instanceof handles nulls
-                && this.targetIndex.equals(((DeleteCommand) other).targetIndex)); // state check
+                && targetIndex.equals(((DeleteCommand) other).targetIndex)); // state check
     }
 }

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

@@ -17,7 +17,9 @@
 import seedu.address.commons.core.Messages;
 import seedu.address.commons.core.index.Index;
 import seedu.address.commons.util.CollectionUtil;
+import seedu.address.logic.CommandHistory;
 import seedu.address.logic.commands.exceptions.CommandException;
+import seedu.address.model.Model;
 import seedu.address.model.person.Address;
 import seedu.address.model.person.Email;
 import seedu.address.model.person.Name;
@@ -65,7 +67,8 @@ public EditCommand(Index index, EditPersonDescriptor editPersonDescriptor) {
     }
 
     @Override
-    public CommandResult execute() throws CommandException {
+    public CommandResult execute(Model model, CommandHistory history) throws CommandException {
+        requireNonNull(model);
         List<Person> lastShownList = model.getFilteredPersonList();
 
         if (index.getZeroBased() >= lastShownList.size()) {
@@ -148,7 +151,7 @@ public EditPersonDescriptor(EditPersonDescriptor toCopy) {
          * Returns true if at least one field is edited.
          */
         public boolean isAnyFieldEdited() {
-            return CollectionUtil.isAnyNonNull(this.name, this.phone, this.email, this.address, this.tags);
+            return CollectionUtil.isAnyNonNull(name, phone, email, address, tags);
         }
 
         public void setName(Name name) {

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

@@ -2,6 +2,8 @@
 
 import seedu.address.commons.core.EventsCenter;
 import seedu.address.commons.events.ui.ExitAppRequestEvent;
+import seedu.address.logic.CommandHistory;
+import seedu.address.model.Model;
 
 /**
  * Terminates the program.
@@ -13,7 +15,7 @@ public class ExitCommand extends Command {
     public static final String MESSAGE_EXIT_ACKNOWLEDGEMENT = "Exiting Address Book as requested ...";
 
     @Override
-    public CommandResult execute() {
+    public CommandResult execute(Model model, CommandHistory history) {
         EventsCenter.getInstance().post(new ExitAppRequestEvent());
         return new CommandResult(MESSAGE_EXIT_ACKNOWLEDGEMENT);
     }

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

@@ -1,6 +1,10 @@
 package seedu.address.logic.commands;
 
+import static java.util.Objects.requireNonNull;
+
 import seedu.address.commons.core.Messages;
+import seedu.address.logic.CommandHistory;
+import seedu.address.model.Model;
 import seedu.address.model.person.NameContainsKeywordsPredicate;
 
 /**
@@ -23,7 +27,8 @@ public FindCommand(NameContainsKeywordsPredicate predicate) {
     }
 
     @Override
-    public CommandResult execute() {
+    public CommandResult execute(Model model, CommandHistory history) {
+        requireNonNull(model);
         model.updateFilteredPersonList(predicate);
         return new CommandResult(
                 String.format(Messages.MESSAGE_PERSONS_LISTED_OVERVIEW, model.getFilteredPersonList().size()));
@@ -33,6 +38,6 @@ public CommandResult execute() {
     public boolean equals(Object other) {
         return other == this // short circuit if same object
                 || (other instanceof FindCommand // instanceof handles nulls
-                && this.predicate.equals(((FindCommand) other).predicate)); // state check
+                && predicate.equals(((FindCommand) other).predicate)); // state check
     }
 }

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

@@ -2,6 +2,8 @@
 
 import seedu.address.commons.core.EventsCenter;
 import seedu.address.commons.events.ui.ShowHelpRequestEvent;
+import seedu.address.logic.CommandHistory;
+import seedu.address.model.Model;
 
 /**
  * Format full help instructions for every command for display.
@@ -16,7 +18,7 @@ public class HelpCommand extends Command {
     public static final String SHOWING_HELP_MESSAGE = "Opened help window.";
 
     @Override
-    public CommandResult execute() {
+    public CommandResult execute(Model model, CommandHistory history) {
         EventsCenter.getInstance().post(new ShowHelpRequestEvent());
         return new CommandResult(SHOWING_HELP_MESSAGE);
     }

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

@@ -18,7 +18,8 @@ public class HistoryCommand extends Command {
     public static final String MESSAGE_NO_HISTORY = "You have not yet entered any commands.";
 
     @Override
-    public CommandResult execute() {
+    public CommandResult execute(Model model, CommandHistory history) {
+        requireNonNull(history);
         List<String> previousCommands = history.getHistory();
 
         if (previousCommands.isEmpty()) {
@@ -29,9 +30,4 @@ public CommandResult execute() {
         return new CommandResult(String.format(MESSAGE_SUCCESS, String.join("\n", previousCommands)));
     }
 
-    @Override
-    public void setData(Model model, CommandHistory history) {
-        requireNonNull(history);
-        this.history = history;
-    }
 }

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

@@ -1,7 +1,11 @@
 package seedu.address.logic.commands;
 
+import static java.util.Objects.requireNonNull;
 import static seedu.address.model.Model.PREDICATE_SHOW_ALL_PERSONS;
 
+import seedu.address.logic.CommandHistory;
+import seedu.address.model.Model;
+
 /**
  * Lists all persons in the address book to the user.
  */
@@ -13,7 +17,8 @@ public class ListCommand extends Command {
 
 
     @Override
-    public CommandResult execute() {
+    public CommandResult execute(Model model, CommandHistory history) {
+        requireNonNull(model);
         model.updateFilteredPersonList(PREDICATE_SHOW_ALL_PERSONS);
         return new CommandResult(MESSAGE_SUCCESS);
     }