Merge 66e2958 into f523a0a

CS2103AUG2016-W11-C2 · Oct 27, 2016 · 606a3ee · 606a3ee
2 parents f523a0a + 66e2958
commit 606a3ee
Show file tree

Hide file tree

Showing 18 changed files with 113 additions and 182 deletions.
diff --git a/src/main/java/seedu/agendum/logic/commands/AddCommand.java b/src/main/java/seedu/agendum/logic/commands/AddCommand.java
@@ -15,8 +15,8 @@ public class AddCommand extends Command {
 
     public static final String COMMAND_WORD = "add";
 
-    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 COMMAND_FORMAT = "add <name> \nadd <name> by <deadline> \nadd <name> from <start-time> to <end-time>";
+    public static final 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"
@@ -28,8 +28,6 @@ public class AddCommand extends Command {
 
     private Task toAdd = null;
 
-    public AddCommand() {}
-
 	//@@author A0003878Y
     /**
      * Convenience constructor using name
@@ -81,19 +79,16 @@ public CommandResult execute() {
         }
 
     }
-
-    @Override
-    public String getName() {
+
+    public static String getName() {
         return COMMAND_WORD;
     }
-
-    @Override
-    public String getFormat() {
+
+    public static String getFormat() {
         return COMMAND_FORMAT;
     }
-
-    @Override
-    public String getDescription() {
+
+    public static String getDescription() {
         return COMMAND_DESCRIPTION;
     }
 

diff --git a/src/main/java/seedu/agendum/logic/commands/ClearCommand.java b/src/main/java/seedu/agendum/logic/commands/ClearCommand.java
@@ -9,31 +9,26 @@ 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 Agendum";
+    public static final String COMMAND_FORMAT = "clear";
+    public static final String COMMAND_DESCRIPTION = "clear all tasks in Agendum";
     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() {
+    public static String getName() {
         return COMMAND_WORD;
     }
 
-    @Override
-    public String getFormat() {
+    public static String getFormat() {
         return COMMAND_FORMAT;
     }
 
-    @Override
-    public String getDescription() {
+    public static String getDescription() {
         return COMMAND_DESCRIPTION;
     }
 }
diff --git a/src/main/java/seedu/agendum/logic/commands/Command.java b/src/main/java/seedu/agendum/logic/commands/Command.java
@@ -14,18 +14,22 @@ public abstract class Command {
     /**
      * Return the name of this command.
      */
-    public abstract String getName();
-
+    public static String getName() {
+        return null;
+    }
+
     /**
      * Return the format of this command.
      */
-    public abstract String getFormat();
+    public static String getFormat() {
+        return null;
+    }
     /**
      * Return the description of this command.
      */
-    public abstract String getDescription();
-
-    public Command() {};
+    public static String getDescription() {
+        return null;
+    }
 
     /**
      * Constructs a feedback message to summarise an operation that displayed a listing of tasks.

diff --git a/src/main/java/seedu/agendum/logic/commands/DeleteCommand.java b/src/main/java/seedu/agendum/logic/commands/DeleteCommand.java
@@ -16,8 +16,8 @@ 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 COMMAND_FORMAT = "delete <index> \ndelete <index> <more-indexes>";
+    public static final 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"
@@ -29,8 +29,6 @@ public class DeleteCommand extends Command {
 
     public ArrayList<ReadOnlyTask> tasksToDelete;
 
-    public DeleteCommand() {}
-
     //@@author A0133367E
     public DeleteCommand(Set<Integer> targetIndexes) {
         this.targetIndexes = new ArrayList<Integer>(targetIndexes);
@@ -68,18 +66,15 @@ private boolean isAnyIndexInvalid(UnmodifiableObservableList<ReadOnlyTask> lastS
     }
 
   //@@author
-    @Override
-    public String getName() {
+    public static String getName() {
         return COMMAND_WORD;
     }
 
-    @Override
-    public String getFormat() {
+    public static String getFormat() {
         return COMMAND_FORMAT;
     }
 
-    @Override
-    public String getDescription() {
+    public static String getDescription() {
         return COMMAND_DESCRIPTION;
     }
 

diff --git a/src/main/java/seedu/agendum/logic/commands/ExitCommand.java b/src/main/java/seedu/agendum/logic/commands/ExitCommand.java
@@ -10,30 +10,25 @@ 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 COMMAND_FORMAT = "exit";
+    public static final String COMMAND_DESCRIPTION = "exit Agendum";
     public static final String MESSAGE_EXIT_ACKNOWLEDGEMENT = "Exiting Agendum as requested ...";
-
-    public ExitCommand() {}
 
     @Override
     public CommandResult execute() {
         EventsCenter.getInstance().post(new ExitAppRequestEvent());
         return new CommandResult(MESSAGE_EXIT_ACKNOWLEDGEMENT);
     }
 
-    @Override
-    public String getName() {
+    public static String getName() {
         return COMMAND_WORD;
     }
 
-    @Override
-    public String getFormat() {
+    public static String getFormat() {
         return COMMAND_FORMAT;
     }
 
-    @Override
-    public String getDescription() {
+    public static String getDescription() {
         return COMMAND_DESCRIPTION;
     }
 }
diff --git a/src/main/java/seedu/agendum/logic/commands/FindCommand.java b/src/main/java/seedu/agendum/logic/commands/FindCommand.java
@@ -10,16 +10,14 @@ 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 COMMAND_FORMAT= "find <keyword> \nfind <keyword> <more keywords>";
+    public static final 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 Set<String> keywords = null;
-
-    public FindCommand() {};
 
     public FindCommand(Set<String> keywords) {
         this.keywords = keywords;
@@ -31,18 +29,15 @@ public CommandResult execute() {
         return new CommandResult(getMessageForTaskListShownSummary(model.getFilteredTaskList().size()));
     }
 
-    @Override
-    public String getName() {
+    public static String getName() {
         return COMMAND_WORD;
     }
 
-    @Override
-    public String getFormat() {
+    public static String getFormat() {
         return COMMAND_FORMAT;
     }
 
-    @Override
-    public String getDescription() {
+    public static String getDescription() {
         return COMMAND_DESCRIPTION;
     }
 

diff --git a/src/main/java/seedu/agendum/logic/commands/HelpCommand.java b/src/main/java/seedu/agendum/logic/commands/HelpCommand.java
@@ -11,33 +11,28 @@ 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 COMMAND_FORMAT = "help";
+    public static final 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() {
+    public static String getName() {
         return COMMAND_WORD;
     }
 
-    @Override
-    public String getFormat() {
+    public static String getFormat() {
         return COMMAND_FORMAT;
     }
 
-    @Override
-    public String getDescription() {
+    public static String getDescription() {
         return COMMAND_DESCRIPTION;
     }
 }
diff --git a/src/main/java/seedu/agendum/logic/commands/IncorrectCommand.java b/src/main/java/seedu/agendum/logic/commands/IncorrectCommand.java
@@ -18,18 +18,15 @@ public CommandResult execute() {
         return new CommandResult(feedbackToUser);
     }
 
-    @Override
-    public String getName() {
+    public static String getName() {
         return null;
     }
 
-    @Override
-    public String getFormat() {
+    public static String getFormat() {
         return null;
     }
 
-    @Override
-    public String getDescription() {
+    public static String getDescription() {
         return null;
     }
 

diff --git a/src/main/java/seedu/agendum/logic/commands/ListCommand.java b/src/main/java/seedu/agendum/logic/commands/ListCommand.java
@@ -8,30 +8,25 @@ public class ListCommand extends Command {
 
  // COMMAND_WORD, COMMAND_FORMAT, COMMAND_DESCRIPTION are for display in help window
     public static final String COMMAND_WORD = "list";
-    public static String COMMAND_FORMAT = "list \n";
-    public static String COMMAND_DESCRIPTION = "list all your tasks";
+    public static final String COMMAND_FORMAT = "list \n";
+    public static final String COMMAND_DESCRIPTION = "list all your tasks";
     public static final String MESSAGE_SUCCESS = "Listed all tasks";
 
-    public ListCommand() {}
-
     @Override
     public CommandResult execute() {
         model.updateFilteredListToShowAll();
         return new CommandResult(MESSAGE_SUCCESS);
     }
 
-    @Override
-    public String getName() {
+    public static String getName() {
         return COMMAND_WORD;
     }
 
-    @Override
-    public String getFormat() {
+    public static String getFormat() {
         return COMMAND_FORMAT;
     }
 
-    @Override
-    public String getDescription() {
+    public static String getDescription() {
         return COMMAND_DESCRIPTION;
     }
 }
diff --git a/src/main/java/seedu/agendum/logic/commands/LoadCommand.java b/src/main/java/seedu/agendum/logic/commands/LoadCommand.java
@@ -63,18 +63,15 @@ private boolean isFileExists() {
         return FileUtil.isFileExists(pathToFile);
     }
 
-    @Override
-    public String getName() {
+    public static String getName() {
         return COMMAND_WORD;
     }
 
-    @Override
-    public String getFormat() {
+    public static String getFormat() {
         return COMMAND_FORMAT;
     }
 
-    @Override
-    public String getDescription() {
+    public static String getDescription() {
         return COMMAND_DESCRIPTION;
     }
 

diff --git a/src/main/java/seedu/agendum/logic/commands/MarkCommand.java b/src/main/java/seedu/agendum/logic/commands/MarkCommand.java
@@ -16,8 +16,8 @@ public class MarkCommand extends Command {
 
     // COMMAND_WORD, COMMAND_FORMAT, COMMAND_DESCRIPTION are for display in help window
     public static final String COMMAND_WORD = "mark";
-    public static String COMMAND_FORMAT = "mark <index> \nmark <index> <more-indexes>";
-    public static String COMMAND_DESCRIPTION ="mark task(s) as completed";
+    public static final String COMMAND_FORMAT = "mark <index> \nmark <index> <more-indexes>";
+    public static final String COMMAND_DESCRIPTION ="mark task(s) as completed";
     public static final String MESSAGE_USAGE = COMMAND_WORD
             + ": Marks the tasks(s) identified by their index numbers used in the last task listing.\n"
             + "Parameters: INDEX... (must be a positive number)\n"
@@ -28,8 +28,6 @@ public class MarkCommand extends Command {
     public ArrayList<Integer> targetIndexes;
 
     public ArrayList<ReadOnlyTask> tasksToMark;
-
-    public MarkCommand() {}
 
     //@@author A0133367E
     public MarkCommand(Set<Integer> targetIndexes) {
@@ -68,18 +66,15 @@ private boolean isAnyIndexInvalid(UnmodifiableObservableList<ReadOnlyTask> lastS
     }
 
     //@@author
-    @Override
-    public String getName() {
+    public static String getName() {
         return COMMAND_WORD;
     }
 
-    @Override
-    public String getFormat() {
+    public static String getFormat() {
         return COMMAND_FORMAT;
     }
 
-    @Override
-    public String getDescription() {
+    public static String getDescription() {
         return COMMAND_DESCRIPTION;
     }
 }