Merge pull request #71 from CS2103AUG2016-T14-C2/V0.4-Refactor-And-Cl…

…eanup Merge V0.4-Refactor-And-Cleanup
CS2103AUG2016-T14-C2 · Oct 21, 2016 · 9d448c2 · 9d448c2
2 parents 0bc2ad0 + b722c1c
commit 9d448c2
Show file tree

Hide file tree

Showing 78 changed files with 147 additions and 1,772 deletions.
diff --git a/src/main/java/seedu/savvytasker/MainApp.java b/src/main/java/seedu/savvytasker/MainApp.java
@@ -31,7 +31,7 @@
 public class MainApp extends Application {
     private static final Logger logger = LogsCenter.getLogger(MainApp.class);
 
-    public static final Version VERSION = new Version(1, 0, 0, true);
+    public static final Version VERSION = new Version(0, 4, 0, true);
 
     protected Ui ui;
     protected Logic logic;
@@ -44,7 +44,7 @@ public MainApp() {}
 
     @Override
     public void init() throws Exception {
-        logger.info("=============================[ Initializing AddressBook ]===========================");
+        logger.info("=============================[ Initializing Savvy Tasker ]===========================");
         super.init();
 
         config = initConfig(getApplicationParameter("config"));
@@ -74,14 +74,14 @@ private Model initModelManager(Storage storage, UserPrefs userPrefs) {
         try {
             savvyTaskerOptional = storage.readSavvyTasker();
             if(!savvyTaskerOptional.isPresent()){
-                logger.info("Data file not found. Will be starting with an empty AddressBook");
+                logger.info("Data file not found. Will be starting with an empty Savvy Tasker");
             }
             initialData = savvyTaskerOptional.orElse(new SavvyTasker());
         } catch (DataConversionException e) {
-            logger.warning("Data file not in the correct format. Will be starting with an empty AddressBook");
+            logger.warning("Data file not in the correct format. Will be starting with an empty Savvy Tasker");
             initialData = new SavvyTasker();
         } catch (IOException e) {
-            logger.warning("Problem while reading from the file. . Will be starting with an empty AddressBook");
+            logger.warning("Problem while reading from the file. . Will be starting with an empty Savvy Tasker");
             initialData = new SavvyTasker();
         }
 
@@ -138,7 +138,7 @@ protected UserPrefs initPrefs(Config config) {
                     "Using default user prefs");
             initializedPrefs = new UserPrefs();
         } catch (IOException e) {
-            logger.warning("Problem while reading from the file. . Will be starting with an empty AddressBook");
+            logger.warning("Problem while reading from the file. . Will be starting with an empty Savvy Tasker");
             initializedPrefs = new UserPrefs();
         }
 
@@ -158,13 +158,13 @@ private void initEventsCenter() {
 
     @Override
     public void start(Stage primaryStage) {
-        logger.info("Starting AddressBook " + MainApp.VERSION);
+        logger.info("Starting Savvy Tasker " + MainApp.VERSION);
         ui.start(primaryStage);
     }
 
     @Override
     public void stop() {
-        logger.info("============================ [ Stopping Address Book ] =============================");
+        logger.info("============================ [ Stopping Savvy Tasker ] =============================");
         ui.stop();
         try {
             storage.saveUserPrefs(userPrefs);

diff --git a/src/main/java/seedu/savvytasker/commons/core/GuiSettings.java b/src/main/java/seedu/savvytasker/commons/core/GuiSettings.java
@@ -9,6 +9,10 @@
  */
 public class GuiSettings implements Serializable {
 
+    /**
+     * Generated serial
+     */
+    private static final long serialVersionUID = -7442507632162266083L;
     private static final double DEFAULT_HEIGHT = 600;
     private static final double DEFAULT_WIDTH = 740;
 

diff --git a/src/main/java/seedu/savvytasker/commons/core/UnmodifiableObservableList.java b/src/main/java/seedu/savvytasker/commons/core/UnmodifiableObservableList.java
@@ -95,7 +95,7 @@ public final SortedList<E> sorted(Comparator<E> comparator) {
     public final SortedList<E> sorted() {
         return sorted(Comparator.nullsFirst((o1, o2) -> {
             if (o1 instanceof Comparable) {
-                return ((Comparable) o1).compareTo(o2);
+                return ((Comparable<E>) o1).compareTo(o2);
             }
             return Collator.getInstance().compare(o1.toString(), o2.toString());
         }));

diff --git a/src/main/java/seedu/savvytasker/commons/events/model/AddressBookChangedEvent.java b/src/main/java/seedu/savvytasker/commons/events/model/AddressBookChangedEvent.java
diff --git a/src/main/java/seedu/savvytasker/commons/events/ui/JumpToListRequestEvent.java b/src/main/java/seedu/savvytasker/commons/events/ui/JumpToListRequestEvent.java
@@ -3,7 +3,7 @@
 import seedu.savvytasker.commons.events.BaseEvent;
 
 /**
- * Indicates a request to jump to the list of persons
+ * Indicates a request to jump to the list of tasks
  */
 public class JumpToListRequestEvent extends BaseEvent {
 

diff --git a/src/main/java/seedu/savvytasker/commons/events/ui/TaskPanelSelectionChangedEvent.java b/src/main/java/seedu/savvytasker/commons/events/ui/TaskPanelSelectionChangedEvent.java
@@ -1,7 +1,7 @@
 package seedu.savvytasker.commons.events.ui;
 
 import seedu.savvytasker.commons.events.BaseEvent;
-import seedu.savvytasker.model.person.ReadOnlyTask;
+import seedu.savvytasker.model.task.ReadOnlyTask;
 
 /**
  * Represents a selection change in the Person List Panel

diff --git a/src/main/java/seedu/savvytasker/commons/exceptions/DataConversionException.java b/src/main/java/seedu/savvytasker/commons/exceptions/DataConversionException.java
@@ -4,6 +4,11 @@
  * Represents an error during conversion of data from one format to another
  */
 public class DataConversionException extends Exception {
+    /**
+     * Generated serial
+     */
+    private static final long serialVersionUID = -5908631495910190437L;
+
     public DataConversionException(Exception cause) {
         super(cause);
     }

diff --git a/src/main/java/seedu/savvytasker/commons/exceptions/DuplicateDataException.java b/src/main/java/seedu/savvytasker/commons/exceptions/DuplicateDataException.java
@@ -4,6 +4,11 @@
  * Signals an error caused by duplicate data where there should be none.
  */
 public abstract class DuplicateDataException extends IllegalValueException {
+    /**
+     * Generated serial
+     */
+    private static final long serialVersionUID = 5045611929659070003L;
+
     public DuplicateDataException(String message) {
         super(message);
     }

diff --git a/src/main/java/seedu/savvytasker/commons/exceptions/IllegalValueException.java b/src/main/java/seedu/savvytasker/commons/exceptions/IllegalValueException.java
@@ -4,6 +4,11 @@
  * Signals that some given data does not fulfill some constraints.
  */
 public class IllegalValueException extends Exception {
+    /**
+     * Generated serial
+     */
+    private static final long serialVersionUID = 193885632897265498L;
+
     /**
      * @param message should contain relevant information on the failed constraint(s)
      */

diff --git a/src/main/java/seedu/savvytasker/commons/util/CollectionUtil.java b/src/main/java/seedu/savvytasker/commons/util/CollectionUtil.java
diff --git a/src/main/java/seedu/savvytasker/commons/util/JsonUtil.java b/src/main/java/seedu/savvytasker/commons/util/JsonUtil.java
@@ -20,6 +20,11 @@
 public class JsonUtil {
     private static class LevelDeserializer extends FromStringDeserializer<Level> {
 
+        /**
+         * Generated serial
+         */
+        private static final long serialVersionUID = 7901046138205615293L;
+
         protected LevelDeserializer(Class<?> vc) {
             super(vc);
         }

diff --git a/src/main/java/seedu/savvytasker/logic/Logic.java b/src/main/java/seedu/savvytasker/logic/Logic.java
@@ -2,7 +2,7 @@
 
 import javafx.collections.ObservableList;
 import seedu.savvytasker.logic.commands.CommandResult;
-import seedu.savvytasker.model.person.ReadOnlyTask;
+import seedu.savvytasker.model.task.ReadOnlyTask;
 
 /**
  * API of the Logic component

diff --git a/src/main/java/seedu/savvytasker/logic/LogicManager.java b/src/main/java/seedu/savvytasker/logic/LogicManager.java
@@ -7,7 +7,7 @@
 import seedu.savvytasker.logic.commands.CommandResult;
 import seedu.savvytasker.logic.parser.*;
 import seedu.savvytasker.model.Model;
-import seedu.savvytasker.model.person.ReadOnlyTask;
+import seedu.savvytasker.model.task.ReadOnlyTask;
 import seedu.savvytasker.storage.Storage;
 
 import java.util.Stack;

diff --git a/src/main/java/seedu/savvytasker/logic/commands/AddCommand.java b/src/main/java/seedu/savvytasker/logic/commands/AddCommand.java
@@ -1,8 +1,8 @@
 package seedu.savvytasker.logic.commands;
 
 import seedu.savvytasker.logic.commands.models.AddCommandModel;
-import seedu.savvytasker.model.person.*;
-import seedu.savvytasker.model.person.TaskList.DuplicateTaskException;
+import seedu.savvytasker.model.task.Task;
+import seedu.savvytasker.model.task.TaskList.DuplicateTaskException;
 
 /**
  * Adds a person to the address book.
@@ -42,7 +42,6 @@ public CommandResult execute() {
             model.addTask(toAdd);
             return new CommandResult(String.format(MESSAGE_SUCCESS, toAdd));
         } catch (DuplicateTaskException e) {
-            assert false; // ModelManager will ensure no duplicated tasks
             return new CommandResult(MESSAGE_DUPLICATE_TASK);
         }
 

diff --git a/src/main/java/seedu/savvytasker/logic/commands/AliasCommand.java b/src/main/java/seedu/savvytasker/logic/commands/AliasCommand.java
@@ -1,8 +1,8 @@
 package seedu.savvytasker.logic.commands;
 
 import seedu.savvytasker.logic.commands.models.AliasCommandModel;
-import seedu.savvytasker.model.person.*;
-import seedu.savvytasker.model.person.TaskList.DuplicateTaskException;
+import seedu.savvytasker.model.task.Task;
+import seedu.savvytasker.model.task.TaskList.DuplicateTaskException;
 
 /**
  * Command to create aliases

diff --git a/src/main/java/seedu/savvytasker/logic/commands/DeleteCommand.java b/src/main/java/seedu/savvytasker/logic/commands/DeleteCommand.java
@@ -5,8 +5,8 @@
 import seedu.savvytasker.commons.core.Messages;
 import seedu.savvytasker.commons.core.UnmodifiableObservableList;
 import seedu.savvytasker.logic.commands.models.DeleteCommandModel;
-import seedu.savvytasker.model.person.ReadOnlyTask;
-import seedu.savvytasker.model.person.TaskList.TaskNotFoundException;
+import seedu.savvytasker.model.task.ReadOnlyTask;
+import seedu.savvytasker.model.task.TaskList.TaskNotFoundException;
 
 /**
  * Deletes a person identified using it's last displayed index from the address book.

diff --git a/src/main/java/seedu/savvytasker/logic/commands/ModifyCommand.java b/src/main/java/seedu/savvytasker/logic/commands/ModifyCommand.java
@@ -3,8 +3,9 @@
 import seedu.savvytasker.commons.core.Messages;
 import seedu.savvytasker.commons.core.UnmodifiableObservableList;
 import seedu.savvytasker.logic.commands.models.ModifyCommandModel;
-import seedu.savvytasker.model.person.*;
-import seedu.savvytasker.model.person.TaskList.TaskNotFoundException;
+import seedu.savvytasker.model.task.ReadOnlyTask;
+import seedu.savvytasker.model.task.Task;
+import seedu.savvytasker.model.task.TaskList.TaskNotFoundException;
 
 /**
  * Adds a person to the address book.

diff --git a/src/main/java/seedu/savvytasker/logic/commands/SelectCommand.java b/src/main/java/seedu/savvytasker/logic/commands/SelectCommand.java
@@ -4,7 +4,7 @@
 import seedu.savvytasker.commons.core.Messages;
 import seedu.savvytasker.commons.core.UnmodifiableObservableList;
 import seedu.savvytasker.commons.events.ui.JumpToListRequestEvent;
-import seedu.savvytasker.model.person.ReadOnlyTask;
+import seedu.savvytasker.model.task.ReadOnlyTask;
 
 /**
  * Selects a person identified using it's last displayed index from the address book.

diff --git a/src/main/java/seedu/savvytasker/logic/commands/UnaliasCommand.java b/src/main/java/seedu/savvytasker/logic/commands/UnaliasCommand.java
@@ -2,8 +2,8 @@
 
 import seedu.savvytasker.commons.exceptions.IllegalValueException;
 import seedu.savvytasker.logic.commands.models.AliasCommandModel;
-import seedu.savvytasker.model.person.*;
-import seedu.savvytasker.model.person.TaskList.DuplicateTaskException;
+import seedu.savvytasker.model.task.Task;
+import seedu.savvytasker.model.task.TaskList.DuplicateTaskException;
 
 /**
  * Command to remove aliases

diff --git a/src/main/java/seedu/savvytasker/logic/parser/MarkCommandParser.java b/src/main/java/seedu/savvytasker/logic/parser/MarkCommandParser.java
@@ -4,9 +4,7 @@
 import java.util.regex.Pattern;
 
 import seedu.savvytasker.commons.core.Messages;
-import seedu.savvytasker.logic.commands.DeleteCommand;
 import seedu.savvytasker.logic.commands.MarkCommand;
-import seedu.savvytasker.logic.commands.models.DeleteCommandModel;
 
 public class MarkCommandParser implements CommandParser<MarkCommand> {
     private static final String HEADER = "mark";
@@ -33,7 +31,7 @@ public String getRequiredFormat() {
     public MarkCommand parse(String commandText) throws ParseException {
         Matcher matcher = REGEX_PATTERN.matcher(commandText);
         if (matcher.matches()) {
-            int[] indices = parseIndices(matcher.group(REGEX_REF_INDICES));
+            parseIndices(matcher.group(REGEX_REF_INDICES));
 
             // TODO: Integrate with MarkCommand properly
             return new MarkCommand();

diff --git a/src/main/java/seedu/savvytasker/logic/parser/RedoCommandParser.java b/src/main/java/seedu/savvytasker/logic/parser/RedoCommandParser.java
@@ -1,9 +1,7 @@
 package seedu.savvytasker.logic.parser;
 
 import seedu.savvytasker.commons.core.Messages;
-import seedu.savvytasker.logic.commands.ExitCommand;
 import seedu.savvytasker.logic.commands.RedoCommand;
-import seedu.savvytasker.logic.commands.UndoCommand;
 
 public class RedoCommandParser implements CommandParser<RedoCommand> {
     private static final String HEADER = "redo";

diff --git a/src/main/java/seedu/savvytasker/logic/parser/UndoCommandParser.java b/src/main/java/seedu/savvytasker/logic/parser/UndoCommandParser.java
@@ -1,7 +1,6 @@
 package seedu.savvytasker.logic.parser;
 
 import seedu.savvytasker.commons.core.Messages;
-import seedu.savvytasker.logic.commands.ExitCommand;
 import seedu.savvytasker.logic.commands.UndoCommand;
 
 public class UndoCommandParser implements CommandParser<UndoCommand> {

diff --git a/src/main/java/seedu/savvytasker/logic/parser/UnmarkCommandParser.java b/src/main/java/seedu/savvytasker/logic/parser/UnmarkCommandParser.java
@@ -4,9 +4,7 @@
 import java.util.regex.Pattern;
 
 import seedu.savvytasker.commons.core.Messages;
-import seedu.savvytasker.logic.commands.DeleteCommand;
 import seedu.savvytasker.logic.commands.UnmarkCommand;
-import seedu.savvytasker.logic.commands.models.DeleteCommandModel;
 
 public class UnmarkCommandParser implements CommandParser<UnmarkCommand> {
     private static final String HEADER = "unmark";
@@ -33,7 +31,7 @@ public String getRequiredFormat() {
     public UnmarkCommand parse(String commandText) throws ParseException {
         Matcher matcher = REGEX_PATTERN.matcher(commandText);
         if (matcher.matches()) {
-            int[] indices = parseIndices(matcher.group(REGEX_REF_INDICES));
+            parseIndices(matcher.group(REGEX_REF_INDICES));
 
             // TODO: Integrate UnmarkCommand properly!
             return new UnmarkCommand();