From a1178319a981d754adddca270eede0987963b4b4 Mon Sep 17 00:00:00 2001
From: leeyimin <imleeyimin@gmail.com>
Date: Sun, 30 Oct 2016 00:12:35 +0800
Subject: [PATCH] remove optional in getAsText

---
 .../taskman/model/event/ReadOnlyEvent.java    | 16 ++++++-----
 .../taskman/model/event/ReadOnlyTask.java     | 28 ++++++++++++-------
 2 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/src/main/java/seedu/taskman/model/event/ReadOnlyEvent.java b/src/main/java/seedu/taskman/model/event/ReadOnlyEvent.java
index 32105a03f3ee..cc295803e9ff 100644
--- 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
index fe81cdc6f353..8ebf2d079ba4 100644
--- 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();
     }
 }