update Authorship - Marx

CS2103AUG2016-W14-C2 · Nov 6, 2016 · 276ea21 · 276ea21
1 parent 7a9f4ce
commit 276ea21
Show file tree

Hide file tree

Showing 17 changed files with 90 additions and 102 deletions.
diff --git a/src/main/java/seedu/menion/background/SendEmail.java b/src/main/java/seedu/menion/background/SendEmail.java
@@ -18,20 +18,19 @@
 public class SendEmail {
 
     public static final String MESSAGE_BODY = "Hey you missed a task deadline! Here is the info: ";
-
+    public static final String EMAIL_SUBJECT = "Menion! You missed a deadline!";
+
     final String senderEmailID = "menioncena@gmail.com";
     final String senderPassword = "johncena2103";
     final String emailSMTPserver = "smtp.gmail.com";
     final String emailServerPort = "465";
-
+    
     /**
      * Variables that will be set in send method.
      */
     String userEmail = null;
     String emailBody = null;
     String motivationalQuote = null;
-
-    String emailSubject = "Menion! You missed a deadline!";
     String remind = UnremindCommand.REMINDER_OFF;
 
     // public void send(ReadOnlyActivity dub) {
@@ -67,7 +66,7 @@ public void send(ReadOnlyActivity outdated) throws FileNotFoundException, Messag
             MimeMessage msg = new MimeMessage(session);
             emailBody = getMessageBody(outdated);
             msg.setText(emailBody);
-            msg.setSubject(emailSubject);
+            msg.setSubject(EMAIL_SUBJECT);
             msg.setFrom(new InternetAddress(senderEmailID));
             msg.addRecipient(Message.RecipientType.TO, new InternetAddress(userEmail));
             Transport.send(msg);

diff --git a/src/main/java/seedu/menion/logic/commands/CompleteCommand.java b/src/main/java/seedu/menion/logic/commands/CompleteCommand.java
@@ -11,10 +11,9 @@
 import seedu.menion.model.activity.UniqueActivityList.DuplicateTaskException;
 
 /**
- * 
- * @author Marx A0139164A Completes an activity given the index and it's
- *         activtyType
+ * Completes an activity given the index and it's activtyType
  */
+//@@author A0139164A
 public class CompleteCommand extends Command {
 
     public static final String COMMAND_WORD = "complete";
@@ -64,11 +63,8 @@ public CommandResult execute() {
             return new CommandResult(MESSAGE_ALREADY_COMPLETED);
         }
 
-        callCompleteActivity(targetType, activityToComplete); // Calls the correct method depending
-                                          // on type of activity.
-
+        callCompleteActivity(targetType, activityToComplete); // Calls the correct method depending on type of activity.
         model.updateRecentChangedActivity(activityToComplete);
-
         return new CommandResult(String.format(MESSAGE_COMPLETED_ACTIVITY_SUCCESS, activityToComplete));
     }
 
@@ -95,8 +91,8 @@ private void callCompleteActivity(String targetType, ReadOnlyActivity activityTo
      * 
      */
     public void storePreviousState() {
+
         assert model != null;
-
         ReadOnlyActivityManager beforeState = new ActivityManager(model.getActivityManager());
         model.addStateToUndoStack(beforeState);
     }

diff --git a/src/main/java/seedu/menion/logic/commands/EditCommand.java b/src/main/java/seedu/menion/logic/commands/EditCommand.java
@@ -79,7 +79,6 @@ public CommandResult execute() {
             indicateAttemptToExecuteIncorrectCommand();
             return new CommandResult(Messages.MESSAGE_INVALID_ACTIVITY_DISPLAYED_INDEX);
         }
-
         model.updateRecentChangedActivity(activityToEdit);
         return new CommandResult(String.format(MESSAGE_EDITED_ACTIVITY_SUCCESS, activityToEdit));
     }
@@ -101,7 +100,6 @@ private void floatingTaskEdit(ReadOnlyActivity floatingTaskToEdit, int paramToCh
             model.editTaskDateTime(floatingTaskToEdit, this.newDate, this.newTime);
             break;
         }
-
     }
 
     private void taskEdit(ReadOnlyActivity taskToEdit, int paramToChange) throws IllegalValueException, ActivityNotFoundException {

diff --git a/src/main/java/seedu/menion/logic/parser/EditParser.java b/src/main/java/seedu/menion/logic/parser/EditParser.java
@@ -32,7 +32,6 @@ public class EditParser {
             + "Example: " + EditCommand.COMMAND_WORD+ " task 1 n: write in red ink \n" 
             + "Example: " + EditCommand.COMMAND_WORD + " event 1 name: ORD";
 
-
     UnmodifiableObservableList<ReadOnlyActivity> lastShownList; // List of all current activities.
     public static String[] editDetails = new String[6];
     private static ArrayList<String> fromNatty = new ArrayList<String>();
@@ -42,7 +41,6 @@ public static String[] parseEditCommand(String details) throws IllegalValueExcep
 
         String[] input = details.split("\\s+");
 
-        System.out.println("editDetails length: "+  editDetails.length);
         // Checks for valid number of parameters.
         // Must be 5 and above. [Command] + [Type] + [index] + [parameter] + [changes]
         if (editDetails.length <= 4) {

diff --git a/src/main/java/seedu/menion/model/ActivityManager.java b/src/main/java/seedu/menion/model/ActivityManager.java
@@ -155,13 +155,15 @@ public void addEvent(Activity t) throws UniqueActivityList.DuplicateTaskExceptio
      * @param activityToComplete
      */
     public void completeTask(ReadOnlyActivity activityToComplete) throws ActivityNotFoundException {
+
         Activity dub = (Activity)activityToComplete;
         dub.setCompleted();
         tasks.getInternalList().set(tasks.getIndexOf(activityToComplete), dub);  
         Collections.sort(tasks.getInternalList(), new TaskComparator());
     }
 
     public void completeFloatingTask(ReadOnlyActivity activityToComplete) throws ActivityNotFoundException {
+
         Activity dub = (Activity)activityToComplete;
         dub.setCompleted();
         floatingTasks.getInternalList().set(floatingTasks.getIndexOf(activityToComplete), dub);
@@ -174,13 +176,15 @@ public void completeFloatingTask(ReadOnlyActivity activityToComplete) throws Act
      * @param activityToUncomplete
      */
     public void unCompleteFloatingTask(ReadOnlyActivity activityToUncomplete) throws ActivityNotFoundException {
+
         Activity dub = (Activity)activityToUncomplete;
         dub.setUncompleted();
         floatingTasks.getInternalList().set(floatingTasks.getIndexOf(activityToUncomplete), dub);
         Collections.sort(floatingTasks.getInternalList(), new FloatingTaskComparator());
     }
 
     public void unCompleteTask(ReadOnlyActivity activityToUncomplete) throws ActivityNotFoundException {
+
         Activity dub = (Activity)activityToUncomplete;
         dub.setUncompleted();
         tasks.getInternalList().set(tasks.getIndexOf(activityToUncomplete), dub);
@@ -194,13 +198,15 @@ public void unCompleteTask(ReadOnlyActivity activityToUncomplete) throws Activit
      * @throws IllegalValueException 
      */
     public void editFloatingTaskName(ReadOnlyActivity floatingTaskToEdit, String changes) throws IllegalValueException, ActivityNotFoundException {
+
         Activity dub = (Activity)floatingTaskToEdit;
         dub.setActivityName(changes);
         floatingTasks.getInternalList().set(floatingTasks.getIndexOf(floatingTaskToEdit), dub);
         Collections.sort(floatingTasks.getInternalList(), new FloatingTaskComparator());
     }
 
     public void editTaskName(ReadOnlyActivity taskToEdit, String changes) throws IllegalValueException, ActivityNotFoundException {
+
         Activity dub = (Activity)taskToEdit;
         dub.setActivityName(changes);
         tasks.getInternalList().set(tasks.getIndexOf(taskToEdit), dub); 
@@ -221,18 +227,21 @@ public void editEventName(ReadOnlyActivity eventToEdit, String changes) throws I
      * @throws IllegalValueException 
      */
     public void editFloatingTaskNote(ReadOnlyActivity floatingTaskToEdit, String changes) throws IllegalValueException, ActivityNotFoundException {
+
         Activity dub = (Activity)floatingTaskToEdit;
         dub.setActivityNote(changes);
         floatingTasks.getInternalList().set(floatingTasks.getIndexOf(floatingTaskToEdit), dub);
     }
 
     public void editTaskNote(ReadOnlyActivity taskToEdit, String changes) throws IllegalValueException, ActivityNotFoundException {
+
         Activity dub = (Activity)taskToEdit;
         dub.setActivityNote(changes);
         tasks.getInternalList().set(tasks.getIndexOf(taskToEdit), dub); 
     }
 
     public void editEventNote(ReadOnlyActivity eventToEdit, String changes) throws IllegalValueException, ActivityNotFoundException {
+
         Activity dub = (Activity)eventToEdit;
         dub.setActivityNote(changes);
         events.getInternalList().set(events.getIndexOf(eventToEdit), dub);
@@ -246,6 +255,7 @@ public void editEventNote(ReadOnlyActivity eventToEdit, String changes) throws I
      * @throws ActivityNotFoundException 
      */
     public void editTaskToFloating(ReadOnlyActivity taskToEdit) throws IllegalValueException, ActivityNotFoundException {
+
         ActivityName name = taskToEdit.getActivityName();
         Note note = taskToEdit.getNote();
         Completed status = taskToEdit.getActivityStatus();
@@ -255,6 +265,7 @@ public void editTaskToFloating(ReadOnlyActivity taskToEdit) throws IllegalValueE
     }
 
     public void editTaskDateTime(ReadOnlyActivity taskToEdit, String newDate, String newTime) throws IllegalValueException, ActivityNotFoundException {
+
         Activity dub = (Activity)taskToEdit;
         dub.setActivityStartDateTime(newDate, newTime);
         // Check if the task is overdue/not overdue after an edit.
@@ -276,19 +287,20 @@ public void editTaskDateTime(ReadOnlyActivity taskToEdit, String newDate, String
             addTask(dub);
             return;
         }
-
         tasks.getInternalList().set(tasks.getIndexOf(taskToEdit), dub); 
         Collections.sort(tasks.getInternalList(), new TaskComparator());
     }
 
     public void editEventStartDateTime(ReadOnlyActivity eventToEdit, String newDate, String newTime) throws IllegalValueException, ActivityNotFoundException {
+
         Activity dub = (Activity)eventToEdit;
         dub.setActivityStartDateTime(newDate, newTime);
         events.getInternalList().set(events.getIndexOf(eventToEdit), dub);
         Collections.sort(events.getInternalList(), new EventComparator());
     }
 
-    public void editEventEndDateTime(ReadOnlyActivity eventToEdit, String newDate, String newTime) throws IllegalValueException, ActivityNotFoundException {    
+    public void editEventEndDateTime(ReadOnlyActivity eventToEdit, String newDate, String newTime) throws IllegalValueException, ActivityNotFoundException {  
+
         Activity dub = (Activity)eventToEdit;
         dub.setActivityEndDateTime(newDate, newTime);
         events.getInternalList().set(events.getIndexOf(eventToEdit), dub);

diff --git a/src/main/java/seedu/menion/model/Model.java b/src/main/java/seedu/menion/model/Model.java
@@ -33,35 +33,30 @@ public interface Model {
     void UncompleteTask(ReadOnlyActivity activityToUncomplete) throws ActivityNotFoundException;
 
     /** 
-     * Edits the name of the given Activity, given it's index. 
-     * @throws IllegalValueException 
+     * Edits the name of the given Activity, given it's index. @throws IllegalValueException 
      */
     void editFloatingTaskName(ReadOnlyActivity floatingTaskToEdit, String changes) throws IllegalValueException, ActivityNotFoundException;
     void editTaskName(ReadOnlyActivity taskToEdit, String changes) throws IllegalValueException, ActivityNotFoundException;
     void editEventName(ReadOnlyActivity eventToEdit, String changes) throws IllegalValueException, ActivityNotFoundException;
 
     /**
-     * Edits the note of the given Activity, given it's index. 
-     * @throws IllegalValueException 
+     * Edits the note of the given Activity, given it's index @throws IllegalValueException 
      */
     void editFloatingTaskNote(ReadOnlyActivity floatingTaskToEdit, String changes) throws IllegalValueException, ActivityNotFoundException;
     void editTaskNote(ReadOnlyActivity taskToEdit, String changes) throws IllegalValueException, ActivityNotFoundException;
     void editEventNote(ReadOnlyActivity eventToEdit, String changes) throws IllegalValueException, ActivityNotFoundException;
 
     /**
-     * Edits the Start Date & Time of the given Task/Event, given it's index. 
-     * @throws IllegalValueException 
+     * Edits the Start Date & Time of the given Task/Event, given it's index @throws IllegalValueException 
      */
     void editTaskToFloating(ReadOnlyActivity taskToEdit) throws IllegalValueException, ActivityNotFoundException;
     void editTaskDateTime(ReadOnlyActivity taskToEdit, String newDate, String newTime) throws IllegalValueException, ActivityNotFoundException;
     void editEventEndDateTime(ReadOnlyActivity eventToEdit, String newDate, String newTime) throws IllegalValueException, ActivityNotFoundException;
     void editEventStartDateTime(ReadOnlyActivity eventToEdit, String newDate, String newTime) throws IllegalValueException, ActivityNotFoundException;
 
-
     //@@author A0139515A
     /**
      * Methods for undo 
-     * 
      */
 
     /** add an activity manager state into undo stack */

diff --git a/src/main/java/seedu/menion/model/ModelManager.java b/src/main/java/seedu/menion/model/ModelManager.java
@@ -91,7 +91,6 @@ private void indicateActivityManagerChanged() {
      * Methods for undo 
      * 
      */
-
     @Override
     public void addStateToUndoStack(ReadOnlyActivityManager activityManager) {
     	activityManagerUndoStack.push(activityManager);
@@ -146,50 +145,52 @@ public ReadOnlyActivity getMostRecentUpdatedActivity() {
      */
     @Override
     public void completeFloatingTask(ReadOnlyActivity activityToComplete) throws ActivityNotFoundException {
+
         activityManager.completeFloatingTask(activityToComplete);
         indicateActivityManagerChanged();
     }
+
     @Override
     public void completeTask(ReadOnlyActivity activityToComplete) throws ActivityNotFoundException {
+
         activityManager.completeTask(activityToComplete);
         indicateActivityManagerChanged();
     }
-
+    
     /**
      * Methods for Un-completing an activity
      */
     @Override
     public void UncompleteFloatingTask(ReadOnlyActivity activityToUncomplete) throws ActivityNotFoundException {
+
         activityManager.unCompleteFloatingTask(activityToUncomplete);
         indicateActivityManagerChanged();
     }
 
     @Override
     public void UncompleteTask(ReadOnlyActivity activityToUncomplete) throws ActivityNotFoundException {
+
         activityManager.unCompleteTask(activityToUncomplete);
         indicateActivityManagerChanged();
     }
 
-
-    //@@author A0139164A
-    /**
-     * Methods for editing Activity's name
-     * @throws IllegalValueException 
-     */
     @Override
-    public void editFloatingTaskName(ReadOnlyActivity floatingTaskToEdit, String changes) throws IllegalValueException, ActivityNotFoundException{
+    public void editFloatingTaskName(ReadOnlyActivity floatingTaskToEdit, String changes) throws IllegalValueException, ActivityNotFoundException {
+
         activityManager.editFloatingTaskName(floatingTaskToEdit, changes);
         indicateActivityManagerChanged();
     }
 
     @Override 
     public void editTaskName(ReadOnlyActivity taskToEdit, String changes) throws IllegalValueException, ActivityNotFoundException {
+
         activityManager.editTaskName(taskToEdit, changes);
         indicateActivityManagerChanged();
     }
 
     @Override
     public void editEventName(ReadOnlyActivity eventToEdit, String changes) throws IllegalValueException, ActivityNotFoundException {
+
         activityManager.editEventName(eventToEdit, changes);
         indicateActivityManagerChanged();
     }
@@ -200,6 +201,7 @@ public void editEventName(ReadOnlyActivity eventToEdit, String changes) throws I
      */
     @Override
     public void editFloatingTaskNote(ReadOnlyActivity floatingTaskToEdit, String changes) throws IllegalValueException, ActivityNotFoundException {
+
         activityManager.editFloatingTaskNote(floatingTaskToEdit, changes);
         indicateActivityManagerChanged();
     }
@@ -212,6 +214,7 @@ public void editTaskNote(ReadOnlyActivity taskToEdit, String changes) throws Ill
 
     @Override
     public void editEventNote(ReadOnlyActivity eventToEdit, String changes) throws IllegalValueException, ActivityNotFoundException {
+
         activityManager.editEventNote(eventToEdit, changes);
         indicateActivityManagerChanged();
     }
@@ -220,29 +223,33 @@ public void editEventNote(ReadOnlyActivity eventToEdit, String changes) throws I
      * Methods for editting Activities Starting Date & Time
      * @throws IllegalValueException 
      */
-
     @Override
     public void editTaskToFloating(ReadOnlyActivity taskToEdit)
             throws IllegalValueException, ActivityNotFoundException {
+
         activityManager.editTaskToFloating(taskToEdit);
         indicateActivityManagerChanged();
 
     }
+
     @Override
     public void editTaskDateTime(ReadOnlyActivity taskToEdit, String newDate, String newTime) throws IllegalValueException, ActivityNotFoundException {
+
         activityManager.editTaskDateTime(taskToEdit, newDate, newTime);
         indicateActivityManagerChanged();
     }
 
     @Override 
     public void editEventStartDateTime(ReadOnlyActivity eventToEdit, String newDate, String newTime) throws IllegalValueException, ActivityNotFoundException {
+
         activityManager.editEventStartDateTime(eventToEdit, newDate, newTime);
         indicateActivityManagerChanged();
 
     }
 
     @Override
     public void editEventEndDateTime(ReadOnlyActivity eventToEdit, String newDate, String newTime) throws IllegalValueException, ActivityNotFoundException {
+
         activityManager.editEventEndDateTime(eventToEdit, newDate, newTime);
         indicateActivityManagerChanged();
     }