Fixed bugged EndTime constructor

CS2103AUG2016-T13-C2 · Nov 2, 2016 · b279473 · b279473
1 parent 33aa77b
commit b279473
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/src/main/java/seedu/address/model/activity/event/EndTime.java b/src/main/java/seedu/address/model/activity/event/EndTime.java
@@ -41,8 +41,8 @@ public EndTime(StartTime starttime, String date) throws IllegalValueException {
             throw new IllegalValueException("Start Time Invalid");
         }
         // String[] recurring = starttime.RecurringMessage.split(" ");
-        if (starttime.recurring){
-            if(date.equals("")){
+        if (starttime.recurring) {
+            if(date.equals("")) {
                 recurring = true;
                 String recu[] = starttime.RecurringMessage.split(" ");
                 Calendar startcal = starttime.value;
@@ -51,17 +51,20 @@ public EndTime(StartTime starttime, String date) throws IllegalValueException {
                 RecurringMessage = recu[0] + " " + format1.format(startcal.getTime());
                 this.value = DateUtil.EndDateTime(startdate);
             }
-            else {recurringEndTime(starttime, startdate, date);
-            setDate(date);}
+            else {
+                recurringEndTime(starttime, startdate, date);
+                setDate(date);
             }
-        else if (date.equals("")) {
+        } else if (date.equals("")) {
             this.value = DateUtil.EndDateTime(startdate);
         } else if(date.split(" ").length==1){
             Calendar startcal = starttime.value;
             SimpleDateFormat format1 = new SimpleDateFormat("d-MM-yyyy");
             date = format1.format(startcal) + " " + date;
             setDate(date);
-        }                   
+        } else {
+            setDate(date);
+        }
 
     }
 

diff --git a/src/test/java/guitests/AddCommandTest.java b/src/test/java/guitests/AddCommandTest.java
@@ -20,7 +20,7 @@ public void add() {
         TestActivity[] currentList = td.getTypicalActivities();
         TestActivity activityToAdd = td.findHoon;
 
-         assertAddSuccess(activityToAdd, currentList);
+        assertAddSuccess(activityToAdd, currentList);
         currentList = TestUtil.addPersonsToList(currentList, activityToAdd);
 
         //add a task