remove optional in getAsText

CS2103AUG2016-W10-C1 · Oct 29, 2016 · a117831 · a117831
1 parent 92893d2
commit a117831
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 17 deletions.
diff --git a/src/main/java/seedu/taskman/model/event/ReadOnlyEvent.java b/src/main/java/seedu/taskman/model/event/ReadOnlyEvent.java
@@ -39,13 +39,15 @@ default boolean isSameStateAs(ReadOnlyEvent other) {
      */
     default String getAsText() {
         final StringBuilder builder = new StringBuilder();
-        builder.append(getTitle())
-                //.append(" Recurring: ")
-                //.append(getFrequency())
-                .append(" Schedule: ")
-                .append(getSchedule())
-                .append(" Tags: ");
-        getTags().forEach(builder::append);
+        builder.append(getTitle());
+        if (getSchedule().isPresent()) {
+            builder.append("\nSchedule: ")
+                    .append(getSchedule().get().toFormalString());
+        }
+        if (!getTags().getInternalList().isEmpty()){
+            builder.append("\nTags: ");
+            getTags().forEach(builder::append);
+        }
         return builder.toString();
     }
 

diff --git a/src/main/java/seedu/taskman/model/event/ReadOnlyTask.java b/src/main/java/seedu/taskman/model/event/ReadOnlyTask.java
@@ -27,17 +27,25 @@ default boolean isSameStateAs(ReadOnlyTask other) {
     default String getAsText() {
         final StringBuilder builder = new StringBuilder();
         builder.append(getTitle())
-                .append(" Status: ")
-                .append(getStatus())
-                .append(" Deadline: ")
-                .append(getDeadline())
-                //.append(" Frequency: ")
-                //.append(getFrequency())
-                .append(" Schedule: ")
-                .append(getSchedule())
-                .append(" Tags: ");
+                .append("\nStatus: ")
+                .append(getStatus());
+        if (getDeadline().isPresent()) {
+            builder.append("\nDeadline: ")
+                    .append(getDeadline().get().toString());
+        }
+        if (getSchedule().isPresent()) {
+            builder.append("\nSchedule: ")
+                    .append(getSchedule().get().toString());
+        }
+        if (getFrequency().isPresent()){
+            //builder.append(" Frequency: ")
+            //.append(getFrequency());
+        }
+        if (!getTags().getInternalList().isEmpty()){
+            builder.append("\nTags: ");
+            getTags().forEach(builder::append);
+        }
 
-        getTags().forEach(builder::append);
         return builder.toString();
     }
 }