Merge 257d599 into 58671b0

build.gradle

@@ -76,10 +76,10 @@ allprojects {
     }
 
     shadowJar {
-        archiveName = "addressbook.jar"
+        archiveName = "agendum.jar"
 
         manifest {
-            attributes "Main-Class": "seedu.address.MainApp"
+            attributes "Main-Class": "seedu.agendum.MainApp"
         }
 
         destinationDir = file("${buildDir}/jar/")
@@ -115,8 +115,8 @@ tasks.coveralls {
     onlyIf { System.env.'CI' }
 }
 
-class AddressBookTest extends Test {
-    public AddressBookTest() {
+class AgendumTest extends Test {
+    public AgendumTest() {
     	  forkEvery = 1
         systemProperty 'testfx.setup.timeout', '60000'
     }
@@ -130,7 +130,7 @@ class AddressBookTest extends Test {
     }
 }
 
-task guiTests(type: AddressBookTest) {
+task guiTests(type: AgendumTest) {
     include 'guitests/**'
 
     jacoco {
@@ -139,16 +139,16 @@ task guiTests(type: AddressBookTest) {
 }
 
 
-task nonGuiTests(type: AddressBookTest) {
-    include 'seedu/address/**'
+task nonGuiTests(type: AgendumTest) {
+    include 'seedu/agendum/**'
 
     jacoco {
         destinationFile = new File("${buildDir}/jacoco/test.exec")
     }
 }
 
 // Test mode depends on whether headless task has been run
-task allTests(type: AddressBookTest) {
+task allTests(type: AgendumTest) {
     jacoco {
         destinationFile = new File("${buildDir}/jacoco/test.exec")
     }

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

@@ -17,5 +17,8 @@ public interface Logic {
 
     /** Returns the filtered list of tasks */
     ObservableList<ReadOnlyTask> getFilteredTaskList();
+
+    /** Returns list of completed tasks */
+    ObservableList<ReadOnlyTask> getCompletedTaskList();
 
 }

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

@@ -38,4 +38,12 @@ public CommandResult execute(String commandText) {
     public ObservableList<ReadOnlyTask> getFilteredTaskList() {
         return model.getFilteredTaskList();
     }
+
+    /**
+     * Requires implementation here
+     */
+    @Override
+    public ObservableList<ReadOnlyTask> getCompletedTaskList() {
+        return null;
+    }
 }

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

@@ -15,15 +15,20 @@ public class AddCommand extends Command {
 
     public static final String COMMAND_WORD = "add";
 
-    public static final String MESSAGE_USAGE = COMMAND_WORD + ": Adds a task with no time and date. "
+    public static String COMMAND_FORMAT = "add <name> \nadd <name> by <deadline> \nadd <name> from <start-time> to <end-time>";
+    public static String COMMAND_DESCRIPTION = "adds a task to Agendum";
+
+    public static final String MESSAGE_USAGE = COMMAND_WORD + ": Adds a task with no time and date. \n"
             + "Parameters: NAME\n"
             + "Example: " + COMMAND_WORD
             + " Watch Star Wars t/movies";
 
     public static final String MESSAGE_SUCCESS = "New task added: %1$s";
     public static final String MESSAGE_DUPLICATE_TASK = "This task already exists";
 
-    private final Task toAdd;
+    private Task toAdd = null;
+
+    public AddCommand() {}
 
     /**
      * Convenience constructor using name
@@ -75,5 +80,21 @@ public CommandResult execute() {
         }
 
     }
+
+    @Override
+    public String getName() {
+        return COMMAND_WORD;
+    }
+
+    @Override
+    public String getFormat() {
+        return COMMAND_FORMAT;
+    }
+
+    @Override
+    public String getDescription() {
+        return COMMAND_DESCRIPTION;
+    }
 
 }
+

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

@@ -6,17 +6,34 @@
  * Clears the to do list.
  */
 public class ClearCommand extends Command {
-
+
+    // COMMAND_WORD, COMMAND_FORMAT, COMMAND_DESCRIPTION are for display in help window
     public static final String COMMAND_WORD = "clear";
+    public static String COMMAND_FORMAT = "clear";
+    public static String COMMAND_DESCRIPTION = "clear all tasks in Agemdum";
     public static final String MESSAGE_SUCCESS = "Your tasks have been cleared!";
 
     public ClearCommand() {}
 
-
     @Override
     public CommandResult execute() {
         assert model != null;
         model.resetData(ToDoList.getEmptyToDoList());
         return new CommandResult(MESSAGE_SUCCESS);
     }
+
+    @Override
+    public String getName() {
+        return COMMAND_WORD;
+    }
+
+    @Override
+    public String getFormat() {
+        return COMMAND_FORMAT;
+    }
+
+    @Override
+    public String getDescription() {
+        return COMMAND_DESCRIPTION;
+    }
 }

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

@@ -10,7 +10,23 @@
  */
 public abstract class Command {
     protected Model model;
-
+
+    /**
+     * Return the name of this command.
+     */
+    public abstract String getName();
+
+    /**
+     * Return the format of this command.
+     */
+    public abstract String getFormat();
+    /**
+     * Return the description of this command.
+     */
+    public abstract String getDescription();
+
+    public Command() {};
+
     /**
      * Constructs a feedback message to summarise an operation that displayed a listing of tasks.
      *

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

@@ -14,19 +14,23 @@
  */
 public class DeleteCommand extends Command {
 
+    // COMMAND_WORD, COMMAND_FORMAT, COMMAND_DESCRIPTION are for display in help window
     public static final String COMMAND_WORD = "delete";
-
+    public static String COMMAND_FORMAT = "delete <index> \ndelete <index> <more-indexes>";
+    public static String COMMAND_DESCRIPTION = "delete task(s) from Agendum";
     public static final String MESSAGE_USAGE = COMMAND_WORD
             + ": Deletes the tasks(s) identified by their index numbers used in the last task listing.\n"
             + "Parameters: INDEX... (must be a positive number)\n"
             + "Example: " + COMMAND_WORD + " 1 2 5-6";
 
     public static final String MESSAGE_DELETE_TASK_SUCCESS = "Deleted Task(s): %1$s";
 
-    public final ArrayList<Integer> targetIndexes;
+    public ArrayList<Integer> targetIndexes;
 
-    public final ArrayList<ReadOnlyTask> tasksToDelete;
+    public ArrayList<ReadOnlyTask> tasksToDelete;
 
+    public DeleteCommand() {}
+
     public DeleteCommand(Set<Integer> targetIndexes) {
         this.targetIndexes = new ArrayList<Integer>(targetIndexes);
         Collections.sort(this.targetIndexes);
@@ -62,4 +66,19 @@ private boolean isAnyIndexInvalid(UnmodifiableObservableList<ReadOnlyTask> lastS
         return targetIndexes.stream().anyMatch(index -> index > lastShownList.size());
     }
 
+    @Override
+    public String getName() {
+        return COMMAND_WORD;
+    }
+
+    @Override
+    public String getFormat() {
+        return COMMAND_FORMAT;
+    }
+
+    @Override
+    public String getDescription() {
+        return COMMAND_DESCRIPTION;
+    }
+
 }

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

@@ -8,10 +8,12 @@
  */
 public class ExitCommand extends Command {
 
+    // COMMAND_WORD, COMMAND_FORMAT, COMMAND_DESCRIPTION are for display in help window
     public static final String COMMAND_WORD = "exit";
-
+    public static String COMMAND_FORMAT = "exit";
+    public static String COMMAND_DESCRIPTION = "exit Agendum";
     public static final String MESSAGE_EXIT_ACKNOWLEDGEMENT = "Exiting Agendum as requested ...";
-
+    
     public ExitCommand() {}
 
     @Override
@@ -20,4 +22,18 @@ public CommandResult execute() {
         return new CommandResult(MESSAGE_EXIT_ACKNOWLEDGEMENT);
     }
 
+    @Override
+    public String getName() {
+        return COMMAND_WORD;
+    }
+
+    @Override
+    public String getFormat() {
+        return COMMAND_FORMAT;
+    }
+
+    @Override
+    public String getDescription() {
+        return COMMAND_DESCRIPTION;
+    }
 }

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

@@ -8,15 +8,19 @@
  */
 public class FindCommand extends Command {
 
+ // COMMAND_WORD, COMMAND_FORMAT, COMMAND_DESCRIPTION are for display in help window
     public static final String COMMAND_WORD = "find";
-
+    public static String COMMAND_FORMAT= "find <keyword> \nfind <keyword> <more keywords>";
+    public static String COMMAND_DESCRIPTION = "search for task(s) based on keywords";
     public static final String MESSAGE_USAGE = COMMAND_WORD + ": Finds all tasks whose names contain any of "
             + "the specified keywords (case-sensitive) and displays them as a list with index numbers.\n"
             + "Parameters: KEYWORD [MORE_KEYWORDS]...\n"
             + "Example: " + COMMAND_WORD + " star wars";
 
-    private final Set<String> keywords;
+    private Set<String> keywords = null;
 
+    public FindCommand() {};
+
     public FindCommand(Set<String> keywords) {
         this.keywords = keywords;
     }
@@ -27,4 +31,19 @@ public CommandResult execute() {
         return new CommandResult(getMessageForTaskListShownSummary(model.getFilteredTaskList().size()));
     }
 
+    @Override
+    public String getName() {
+        return COMMAND_WORD;
+    }
+
+    @Override
+    public String getFormat() {
+        return COMMAND_FORMAT;
+    }
+
+    @Override
+    public String getDescription() {
+        return COMMAND_DESCRIPTION;
+    }
+
 }

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

@@ -9,18 +9,35 @@
  */
 public class HelpCommand extends Command {
 
+ // COMMAND_WORD, COMMAND_FORMAT, COMMAND_DESCRIPTION are for display in help window
     public static final String COMMAND_WORD = "help";
-
+    public static String COMMAND_FORMAT = "help";
+    public static String COMMAND_DESCRIPTION = "view Agendum’s command summary";
     public static final String MESSAGE_USAGE = COMMAND_WORD + ": Shows program usage instructions.\n"
             + "Example: " + COMMAND_WORD;
 
     public static final String SHOWING_HELP_MESSAGE = "Opened help window.";
-
+    
     public HelpCommand() {}
 
     @Override
     public CommandResult execute() {
         EventsCenter.getInstance().post(new ShowHelpRequestEvent());
         return new CommandResult(SHOWING_HELP_MESSAGE);
     }
+
+    @Override
+    public String getName() {
+        return COMMAND_WORD;
+    }
+
+    @Override
+    public String getFormat() {
+        return COMMAND_FORMAT;
+    }
+
+    @Override
+    public String getDescription() {
+        return COMMAND_DESCRIPTION;
+    }
 }

src/main/java/seedu/agendum/logic/commands/IncorrectCommand.java

@@ -18,5 +18,20 @@ public CommandResult execute() {
         return new CommandResult(feedbackToUser);
     }
 
+    @Override
+    public String getName() {
+        return null;
+    }
+
+    @Override
+    public String getFormat() {
+        return null;
+    }
+
+    @Override
+    public String getDescription() {
+        return null;
+    }
+
 }