Merge pull request #14 from AY1920S1-CS2113T-F14-3/master

Pull

src/main/java/CustomExceptions/RoomShareException.java

@@ -5,8 +5,8 @@
 public class RoomShareException extends Exception {
     private static final String outOfBounds_Text = "Index is out of Bounds!";
     private static final String anomaly_Text = "Anomaly Detected";
-    private static final String emptylist_Text = "List is empty";
-    private static final String timeclash_Text = "Time Clash Detected";
+    private static final String emptyList_Text = "List is empty";
+    private static final String timeClash_Text = "Time Clash Detected";
     private static final String wrongFormat_Text = "Wrong Format Detected";
     private static final String wrongPriority_Text = "Wrong Priority Detected";
     private static final String subTask_Text = "Meetings do not support Subtasks";
@@ -18,13 +18,12 @@ public class RoomShareException extends Exception {
      */
     public RoomShareException(ExceptionType type){
         switch(type) {
-        case emptylist:
-            System.out.println(emptylist_Text);
+        case emptyList:
+            System.out.println(emptyList_Text);
             break;
-
+            
         case timeClash:
-            System.out.println(timeclash_Text);
-            break;
+            System.out.println(timeClash_Text);
 
         case wrongFormat:
             System.out.println(wrongFormat_Text);

src/main/java/Enums/ExceptionType.java

@@ -1,5 +1,5 @@
 package Enums;
 
 public enum ExceptionType {
-    timeClash, emptylist, wrongFormat, empty, outOfBounds, wrongPriority, test, subTask
+    timeClash, emptyList, wrongFormat, empty, outOfBounds, wrongPriority, test, subTask
 }

src/main/java/Enums/TimeUnit.java

@@ -1,5 +1,5 @@
 package Enums;
 
 public enum TimeUnit {
-    month, day, hours, minutes
+    month, day, hours, minutes, unDefined
 }

src/main/java/Model_Classes/Assignment.java

@@ -23,12 +23,6 @@ public class Assignment extends Task {
      */
     public Assignment (String description, Date by) {
         super(description, by);
-        //super.by = by;
-        //this.isFixedDuration = false;
-    }
-
-    public Assignment (String description, String duration, TimeUnit unit) {
-        super(description, null);
     }
 
     /**

src/main/java/Model_Classes/FixedDuration.java

@@ -5,7 +5,6 @@
 public class FixedDuration extends Meeting {
     private String duration;
     private String unit;
-    private Date at;
 
     /**
      * Constructor for fixed duration
@@ -27,6 +26,10 @@ public String getDuration(){
         return duration;
     }
 
+    /**
+     * Return time unit of the duration of event
+     * @return time unit of the duration of event
+     */
     public String getUnit() {
         return unit;
     }

src/main/java/Model_Classes/Meeting.java

@@ -9,8 +9,8 @@
  */
 public class Meeting extends Task {
     private boolean isFixedDuration;
-    private String duration;
-    private TimeUnit timeUnit;
+    private int duration = 0;
+    private TimeUnit timeUnit = TimeUnit.unDefined;
     /**
      * Constructor for Event object
      * Takes in inputs for description of the event and the time the event occurs
@@ -19,12 +19,11 @@ public class Meeting extends Task {
      */
     public Meeting(String description, Date at) {
         super(description, at);
-        //this.at = at;
         this.isFixedDuration = false;
     }
 
-    public Meeting (String description, String duration, TimeUnit unit) {
-        super(description, null);
+    public Meeting (String description, Date date, int duration, TimeUnit unit) {
+        super(description, date);
         this.duration = duration;
         this.timeUnit = unit;
         this.isFixedDuration = true;
@@ -37,7 +36,7 @@ public Meeting (String description, String duration, TimeUnit unit) {
     @Override
     public String toString() {
         if (isFixedDuration){
-            return "[M]" + super.toString() + " (in: " + duration + " " + timeUnit.toString() + ")";
+            return "[M]" + super.toString() + " (on: " + super.getDate() + ") (duration: " + duration + " " + timeUnit.toString() + ")";
         } else {
             return "[M]" + super.toString() + " (on: " + super.getDate() + ")";
         }
@@ -48,7 +47,7 @@ public boolean isFixedDuration() {
     }
 
     public String getDuration() {
-        return duration;
+        return Integer.toString(duration);
     }
 
     public TimeUnit getTimeUnit() {

src/main/java/Model_Classes/Task.java

@@ -30,6 +30,8 @@ public Task(String description, Date time) {
         this.isDone = false;
         this.priority = Priority.low;
         this.time = time;
+        this.user = "everyone";
+        this.recurrenceSchedule = RecurrenceScheduleType.none;
     }
 
     /**
@@ -45,7 +47,7 @@ public String getUser() {
      * @return time the task was created
      */
 
-    public void setUser(String user) {
+    public void setAssignee(String user) {
         this.user = user;
     }
 
@@ -57,6 +59,13 @@ public boolean getDone() {
         return isDone;
     }
 
+    /**
+     * Sets the task to be done
+     */
+    public void setDone(boolean done) {
+        isDone = done;
+    }
+
     /**
      * Returns the status of the completion of the task.
      * shows a tick if done, and a cross if not done.
@@ -78,13 +87,6 @@ public String getDescription() {
      */
     public Priority getPriority() { return priority; }
 
-    /**
-     * Sets the task to be done
-     */
-    public void setDone(boolean done) {
-        isDone = done;
-    }
-
     /**
      * Sets the priority of the task
      * @param p priority of the task
@@ -114,6 +116,10 @@ public void setRecurrenceSchedule(RecurrenceScheduleType recurrenceSchedule) {
         }
     }
 
+    /**
+     * Return whether the task is recurred
+     * @return hasRecurring: whether the task is recurred
+     */
     public boolean hasRecurring() {
         return hasRecurring;
     }
@@ -157,5 +163,4 @@ public void snoozeHour(int amount){
     public void snoozeMinute(int amount){
         this.time.setMinutes(this.time.getMinutes() + amount);
     }
-
 }

src/main/java/Operations/Help.java

@@ -23,4 +23,8 @@ public void showHelp(String keyword) {
                 break;
         }
     }
+
+    public void helpCommandList() {
+        ui.helpList();
+    }
 }

src/main/java/Operations/Parser.java

@@ -25,14 +25,18 @@ public Parser() {
     }
 
     /**
-     * Returns the command that the user has given Duke.
-     * @return command The command given by the user to Duke.
+     * Returns the command that the user has given RoomShare
+     * @return command The command given by the user to RoomShare
      */
     public String getCommand() {
         String command = scanner.next().toLowerCase().trim();
         return command;
     }
 
+    /**
+     * Return the line of command that the user has given Duke
+     * @return command The line of command given by the user to RoomShare
+     */
     public String getCommandLine() {
         String command = scanner.nextLine().toLowerCase().trim();
         return command;

src/main/java/Operations/RecurHandler.java

@@ -51,14 +51,14 @@ public boolean checkRecurrence() {
                         Assignment recurringAssignment= new Assignment(description, getNewDate(check));
                         recurringAssignment.setRecurrenceSchedule(type);
                         recurringAssignment.setPriority(check.getPriority());
-                        recurringAssignment.setUser(check.getUser());
+                        recurringAssignment.setAssignee(check.getUser());
                         taskList.replace(index, recurringAssignment);
                         isEdited = true;
                     } else {
                         Meeting recurringMeeting= new Meeting(description, getNewDate(check));
                         recurringMeeting.setRecurrenceSchedule(type);
                         recurringMeeting.setPriority(check.getPriority());
-                        recurringMeeting.setUser(check.getUser());
+                        recurringMeeting.setAssignee(check.getUser());
                         taskList.replace(index, recurringMeeting);
                         isEdited = true;
                     }