Organise packages and ui message

src/main/java/command/ListCommand.java

@@ -6,8 +6,6 @@
 public class ListCommand extends Command {
     private TaskList list;
 
-    public ListCommand() {}
-
     public static ListCommand createCommand() {
         return new ListCommand();
     }

src/main/java/exception/DukeException.java

@@ -1,5 +1,6 @@
 package exception;
 
+import ui.message.ErrorMessage;
 import ui.message.Message;
 
 public class DukeException extends Exception {
@@ -8,6 +9,6 @@ public DukeException(String message) {
     }
 
     public Message getOutputMessage() {
-        return new Message(this.getMessage());
+        return new ErrorMessage(this.getMessage());
     }
 }

src/main/java/storage/Storage.java

@@ -1,6 +1,7 @@
 package storage;
 
 import tasklist.TaskList;
+import ui.message.ErrorMessage;
 import ui.message.Message;
 
 import java.io.File;
@@ -19,7 +20,7 @@ public static StorageFile loadListFile() {
             String filePath = String.format("%s/%s", dataDirectoryPath, listFileName);
             return StorageFile.loadFile(filePath);
         } catch (IOException e) {
-            Message message = new Message("There was a problem in getting the list data");
+            Message message = new ErrorMessage("There was a problem in loading the list data");
             message.print();
             return null;
         }
@@ -31,7 +32,7 @@ public static TaskList scanListFileDataToList(StorageFile listFile) {
             listFile.scanFileDataToList(list);
             return list;
         } catch (FileNotFoundException e) {
-            Message message = new Message("There was a problem in scanning the list data to a list");
+            Message message = new ErrorMessage("There was a problem in scanning the storage data to a list");
             message.print();
             return null;
         }

src/main/java/ui/message/DoneMessage.java

@@ -15,7 +15,7 @@ public class DoneMessage extends Message {
      * @param message the string to be used in the done message
      */
     public DoneMessage(String message) {
-        super(message);
+        super(message,"≧(´▽｀)≦");
     }
 
     /**
@@ -27,14 +27,4 @@ public DoneMessage(String message) {
     public String getMessage() {
         return DONE_PREFIX + "\n\t\t" + super.getMessage();
     }
-
-    /**
-     * Gets the message with a happy face added to it
-     *
-     * @return the string message with a happy face
-     */
-    @Override
-    public String getMessageWithFace() {
-        return this.getMessage() + " ≧(´▽｀)≦";
-    }
 }

src/main/java/ui/message/ErrorMessage.java

@@ -0,0 +1,7 @@
+package ui.message;
+
+public class ErrorMessage extends Message {
+    public ErrorMessage(String message) {
+        super(message, "｢(ﾟﾍﾟ)");
+    }
+}

src/main/java/ui/message/ExitMessage.java

@@ -13,16 +13,6 @@ public class ExitMessage extends Message {
      * @param message the string to be used in the exit message
      */
     public ExitMessage(String message) {
-        super(message);
-    }
-
-    /**
-     * Gets the message with a waving face added to it
-     *
-     * @return the string message with a waving face
-     */
-    @Override
-    public String getMessageWithFace() {
-        return this.getMessage() + " ヾ(=´･∀･｀=)";
+        super(message, "ヾ(=´･∀･｀=)");
     }
 }

src/main/java/ui/message/GreetMessage.java

@@ -13,16 +13,6 @@ public class GreetMessage extends Message {
      * @param message the string to be used in the greeting message
      */
     public GreetMessage(String message) {
-        super(message);
-    }
-
-    /**
-     * Gets the message with a cheering face added to it
-     *
-     * @return the string message with a cheering face
-     */
-    @Override
-    public String getMessageWithFace() {
-        return this.getMessage() + " ٩(｡•́‿•̀｡)۶";
+        super(message, "٩(｡•́‿•̀｡)۶");
     }
 }

src/main/java/ui/message/ListChangeMessage.java

@@ -15,7 +15,7 @@ public class ListChangeMessage extends Message {
      * @param itemsInList the number of items in the list after the change.
      */
     public ListChangeMessage(String message, int itemsInList) {
-        super(message);
+        super(message, "(＾＾)b");
         this.itemsInList = itemsInList;
     }
 
@@ -35,14 +35,4 @@ public String getMessage() {
                 numOfTasks,
                 task);
     }
-
-    /**
-     * Gets the message with a thumbs up face added to it.
-     *
-     * @return the string message with a thumbs up face.
-     */
-    @Override
-    public String getMessageWithFace() {
-        return this.getMessage() + " (＾＾)b";
-    }
 }

src/main/java/ui/message/ListMessage.java

@@ -15,7 +15,7 @@ public class ListMessage extends Message {
      * @param message the string to be used in the list message
      */
     public ListMessage(String message) {
-        super(message);
+        super(message, "ヽ(°〇°)ﾉ");
     }
 
     /**
@@ -27,14 +27,4 @@ public ListMessage(String message) {
     public String getMessage() {
         return LIST_PREFIX + "\n\t" + super.getMessage();
     }
-
-    /**
-     * Gets the message with a shocked face added to it
-     *
-     * @return the string message with a shocked face
-     */
-    @Override
-    public String getMessageWithFace() {
-        return this.getMessage() + "ヽ(°〇°)ﾉ";
-    }
 }

src/main/java/ui/message/Message.java

@@ -5,24 +5,26 @@
  * It includes methods to format the output message.
  */
 public class Message {
-    private static String FORMATTED_LINE = "_________________________________________________";
-    private String message;
+    private final static String FORMATTED_LINE = "_________________________________________________";
+    private final String message;
+    private String face;
 
-    /**
-     * Constructor to instantiate a `ui.message.DukeOutputMessage`.
-     *
-     * @param message the string to be used in the output message
-     */
-    public Message(String message) {
+    public Message(String message, String face) {
         this.message = message;
+        this.face = face;
     }
 
     protected String getMessage() {
         return this.message;
     }
 
-    protected String getMessageWithFace() {
-        return this.message + " ｢(ﾟﾍﾟ)";
+    private String getMessageWithFace() {
+        char lastCharacter = this.getMessage().charAt(this.getMessage().length() - 1);
+
+        if (Character.isWhitespace(lastCharacter)) {
+            return String.format("%s%s", this.getMessage(), this.face);
+        }
+        return String.format("%s %s", this.getMessage(), this.face);
     }
 
     private String getFormattedMessage() {