Improve formatting to follow coding standard more closely

CS2103AUG2016-W14-C4 · Nov 6, 2016 · 8c2fbaa · 8c2fbaa
1 parent a242dd6
commit 8c2fbaa
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 14 deletions.
diff --git a/src/main/java/seedu/taskitty/logic/commands/EditCommand.java b/src/main/java/seedu/taskitty/logic/commands/EditCommand.java
@@ -5,7 +5,9 @@
 import java.util.HashSet;
 import java.util.Optional;
 import java.util.Set;
+import java.util.logging.Logger;
 
+import seedu.taskitty.commons.core.LogsCenter;
 import seedu.taskitty.commons.core.Messages;
 import seedu.taskitty.commons.core.UnmodifiableObservableList;
 import seedu.taskitty.commons.exceptions.IllegalValueException;
@@ -27,6 +29,9 @@
  */
 
 public class EditCommand extends Command {
+
+    private static final Logger logger = LogsCenter.getLogger(EditCommand.class);
+
 
     public static final String COMMAND_WORD = "edit";
 
@@ -56,7 +61,7 @@ public class EditCommand extends Command {
      *             if any of the raw values are invalid
      */
     public EditCommand(String[] data, Set<String> tags, int targetIndex, int categoryIndex, 
-                       String commandText) throws IllegalValueException {
+            String commandText) throws IllegalValueException {
 
         assert categoryIndex >= 0 && categoryIndex < 3;
 
@@ -83,12 +88,14 @@ public CommandResult execute() {
         }
 
         taskToEdit = lastShownList.get(targetIndex - 1);
+        logger.info("Task to be edited: " + taskToEdit.getAsText());
 
         try {
             Optional<CommandResult> result = updateToEditVariable();
-            if (result.isPresent()) {
+            if (isInvalidResult(result)) {
                 return result.get();
             }
+            logger.info("New edited task: " + toEdit.getAsText());
             model.editTask(taskToEdit, toEdit);
             model.storeCommandInfo(COMMAND_WORD, commandText, toEdit, taskToEdit);
         } catch (UniqueTaskList.DuplicateTaskException e) {
@@ -97,8 +104,8 @@ public CommandResult execute() {
             return new CommandResult(ive.getMessage());
         }
 
-        return new CommandResult(String.format(MESSAGE_SUCCESS, Task.CATEGORIES[categoryIndex] + targetIndex,
-                                 toEdit));
+        return new CommandResult(String.format(MESSAGE_SUCCESS, Task.CATEGORIES[categoryIndex] + targetIndex, 
+                toEdit));
     }
 
     /**
@@ -115,15 +122,15 @@ private Optional<CommandResult> updateToEditVariable() throws IllegalValueExcept
         } else if (data.length == Task.DEADLINE_COMPONENT_COUNT) {
             setTaskNameToExistingTaskNameIfTaskNameNotEdited();
             Optional<CommandResult> invalidResult = setDeadlineEndTimeToExistingEndTimeIfEndTimeNotEdited();
-            if (invalidResult.isPresent()) {
+            if (isInvalidResult(invalidResult)) {
                 return invalidResult;
             };
             createNewEditedDeadline();
             markAsOverdueIfTaskToEditIsOverdue();
         } else if (data.length == Task.EVENT_COMPONENT_COUNT) {
             setTaskNameToExistingTaskNameIfTaskNameNotEdited();
             Optional<CommandResult> invalidResult = setEventStartTimeToExistingStartTimeIfStartTimeNotEdited();
-            if (invalidResult.isPresent()) {
+            if (isInvalidResult(invalidResult)) {
                 return invalidResult;
             };
             setEventEndTimeToExistingEndTimeIfEndTimeNotEdited();
@@ -133,6 +140,15 @@ private Optional<CommandResult> updateToEditVariable() throws IllegalValueExcept
         return emptyOptional();
     }
 
+    /**
+     * Checks if the Optional parameter is an invalid result
+     * @param invalidResult
+     * @return true if Optional is an invalid result (ie Optional is not empty)
+     */
+    private boolean isInvalidResult(Optional<CommandResult> invalidResult) {
+        return invalidResult.isPresent();
+    }
+
     // ================ Setter methods ==============================
 
     /**
@@ -146,7 +162,7 @@ private Optional<CommandResult> setEventStartTimeToExistingStartTimeIfStartTimeN
         if (data[Task.EVENT_COMPONENT_INDEX_START_TIME] == null) {
             if (categoryIndex != Task.EVENT_CATEGORY_INDEX) {
                 return Optional.of(new CommandResult(String.format(MESSAGE_INVALID_COMMAND_FORMAT, 
-                                                        Command.MESSAGE_FORMAT + MESSAGE_PARAMETER)));
+                        Command.MESSAGE_FORMAT + MESSAGE_PARAMETER)));
             }
             data[Task.EVENT_COMPONENT_INDEX_START_TIME] = taskToEdit.getPeriod().getStartTime().toString();
         }
@@ -164,7 +180,7 @@ private Optional<CommandResult> setDeadlineEndTimeToExistingEndTimeIfEndTimeNotE
         if (data[Task.DEADLINE_COMPONENT_INDEX_END_TIME] == null) {
             if (categoryIndex != Task.DEADLINE_CATEGORY_INDEX) {
                 return Optional.of(new CommandResult(String.format(MESSAGE_INVALID_COMMAND_FORMAT, 
-                                                        Command.MESSAGE_FORMAT + MESSAGE_PARAMETER)));
+                        Command.MESSAGE_FORMAT + MESSAGE_PARAMETER)));
             }
             data[Task.DEADLINE_COMPONENT_INDEX_END_TIME] = taskToEdit.getPeriod().getEndTime().toString();
         }

diff --git a/src/main/java/seedu/taskitty/logic/parser/CommandParser.java b/src/main/java/seedu/taskitty/logic/parser/CommandParser.java
@@ -126,11 +126,11 @@ private Command preparePath(String argument) {
             return new IncorrectCommand(String.format(PathCommand.MESSAGE_INVALID_MISSING_FILEPATH,
                     PathCommand.MESSAGE_VALID_FILEPATH_USAGE));
         } else if (args.length() < FILE_EXTENSION_LENGTH) {
-            return new IncorrectCommand(
-                    String.format(PathCommand.MESSAGE_INVALID_FILEPATH, PathCommand.MESSAGE_VALID_FILEPATH_USAGE));
+            return new IncorrectCommand(String.format(PathCommand.MESSAGE_INVALID_FILEPATH, 
+                    PathCommand.MESSAGE_VALID_FILEPATH_USAGE));
         } else if (!isValidFileXmlExtension(args)) {
-            return new IncorrectCommand(
-                    String.format(PathCommand.MESSAGE_INVALID_FILEPATH, PathCommand.MESSAGE_VALID_FILEPATH_USAGE));
+            return new IncorrectCommand(String.format(PathCommand.MESSAGE_INVALID_FILEPATH, 
+                    PathCommand.MESSAGE_VALID_FILEPATH_USAGE));
         }
         return new PathCommand(args);
     }
@@ -471,7 +471,8 @@ private Command prepareDone(String args) {
         String[] indexes = dataArgs.split(WHITE_SPACE_REGEX_STRING);        
         ArrayList<Pair<Integer, Integer>> listOfIndexes = getListOfIndexes(indexes);
 
-        if (listOfIndexes.contains(null)) { // if any of the index is null, there was an error in the indexes provided
+        // if any of the index is null, there was an error in the indexes provided
+        if (listOfIndexes.contains(null)) { 
             return createNewIncorrectCommand(messageParameter);
         }
 
@@ -619,6 +620,7 @@ private IncorrectCommand createNewIncorrectCommand(String messageParameter) {
      */
     private EditCommand createNewEditCommand(String args, Pair<Integer, Integer> categoryAndIndexPair,
             String taskDetailArguments, String tagArguments) throws IllegalValueException {
+
         return new EditCommand(extractTaskDetailsUsingNatty(taskDetailArguments), getTagsFromArgs(tagArguments),
                 categoryAndIndexPair.getValue(), categoryAndIndexPair.getKey(), args);
     }

diff --git a/src/test/java/guitests/EditCommandTest.java b/src/test/java/guitests/EditCommandTest.java
@@ -144,7 +144,7 @@ private void assertEditSuccess(TestTask taskToEdit, int index, char category, Te
 
         //confirm the new card contains the right data
         TaskCardHandle editedCard = taskListPanel.navigateToTask(taskToEdit.getName().fullName, 
-                                                                 taskToEdit.getPeriod().getNumArgs());
+                taskToEdit.getPeriod().getNumArgs());
         assertMatching(taskToEdit, editedCard);
 
         //confirm the list now contains all previous tasks plus the new edited task