From f5863f88ac8c332c5ea08362608a897788c08031 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 9 Apr 2019 15:55:32 -0700
Subject: [PATCH] Added color property.

---
 .../erik/mobibot/msg/ErrorMessage.java        |  8 +++-
 .../net/thauvin/erik/mobibot/msg/Message.java | 46 +++++++++++++++++--
 .../erik/mobibot/msg/NoticeMessage.java       |  8 +++-
 .../erik/mobibot/msg/PublicMessage.java       |  8 +++-
 4 files changed, 63 insertions(+), 7 deletions(-)

diff --git a/src/main/java/net/thauvin/erik/mobibot/msg/ErrorMessage.java b/src/main/java/net/thauvin/erik/mobibot/msg/ErrorMessage.java
index 89c6306..9bd0ea7 100644
--- a/src/main/java/net/thauvin/erik/mobibot/msg/ErrorMessage.java
+++ b/src/main/java/net/thauvin/erik/mobibot/msg/ErrorMessage.java
@@ -39,9 +39,15 @@ package net.thauvin.erik.mobibot.msg;
  * @since 1.0
  */
 public class ErrorMessage extends Message {
-    public ErrorMessage(String message) {
+    public ErrorMessage(final String message) {
         this.setMessage(message);
         this.setError(true);
         this.setNotice(true);
     }
+    public ErrorMessage(final String message, final String color) {
+        this.setMessage(message);
+        this.setError(true);
+        this.setNotice(true);
+        this.setColor(color);
+    }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/msg/Message.java b/src/main/java/net/thauvin/erik/mobibot/msg/Message.java
index cfc9902..84d49ef 100644
--- a/src/main/java/net/thauvin/erik/mobibot/msg/Message.java
+++ b/src/main/java/net/thauvin/erik/mobibot/msg/Message.java
@@ -31,6 +31,8 @@
  */
 package net.thauvin.erik.mobibot.msg;
 
+import org.jibble.pircbot.Colors;
+
 /**
  * The <code>Message</code> class.
  *
@@ -39,6 +41,7 @@ package net.thauvin.erik.mobibot.msg;
  * @since 1.0
  */
 public class Message {
+    private String color = Colors.NORMAL;
     private boolean isError;
     private boolean isNotice;
     private String msg = "";
@@ -55,13 +58,48 @@ public class Message {
      *
      * @param message  The message.
      * @param isNotice The notice flag.
+     * @param isError  The error flag.
      */
-    public Message(String message, boolean isNotice, boolean isError) {
+    public Message(final String message, final boolean isNotice, final boolean isError) {
         msg = message;
         this.isNotice = isNotice;
         this.isError = isError;
     }
 
+
+    /**
+     * Creates a new message.
+     *
+     * @param message  The message.
+     * @param isNotice The notice flag.
+     * @param isError  The error flag
+     * @param color    The color.
+     */
+    public Message(final String message, final boolean isNotice, final boolean isError, final String color) {
+        msg = message;
+        this.isNotice = isNotice;
+        this.isError = isError;
+        this.color = color;
+    }
+
+    /**
+     * Returns the color.
+     *
+     * @return The color,
+     */
+    public String getColor() {
+        return color;
+    }
+
+    /**
+     * Set the color
+     *
+     * @param color The new color.
+     */
+    public void setColor(final String color) {
+        this.color = color;
+    }
+
     /**
      * Returns the message.
      *
@@ -76,7 +114,7 @@ public class Message {
      *
      * @param message The new message.
      */
-    public void setMessage(String message) {
+    public void setMessage(final String message) {
         msg = message;
     }
 
@@ -94,7 +132,7 @@ public class Message {
      *
      * @param error The error flag.
      */
-    public void setError(boolean error) {
+    public void setError(final boolean error) {
         isError = error;
     }
 
@@ -112,7 +150,7 @@ public class Message {
      *
      * @param isNotice The notice flag.
      */
-    public void setNotice(boolean isNotice) {
+    public void setNotice(final boolean isNotice) {
         this.isNotice = isNotice;
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/msg/NoticeMessage.java b/src/main/java/net/thauvin/erik/mobibot/msg/NoticeMessage.java
index d8f016a..80bfe9e 100644
--- a/src/main/java/net/thauvin/erik/mobibot/msg/NoticeMessage.java
+++ b/src/main/java/net/thauvin/erik/mobibot/msg/NoticeMessage.java
@@ -39,8 +39,14 @@ package net.thauvin.erik.mobibot.msg;
  * @since 1.0
  */
 public class NoticeMessage extends Message {
-    public NoticeMessage(String message) {
+    public NoticeMessage(final String message) {
         this.setMessage(message);
         this.setNotice(true);
     }
+
+    public NoticeMessage(final String message, final String color) {
+        this.setMessage(message);
+        this.setNotice(true);
+        this.setColor(color);
+    }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/msg/PublicMessage.java b/src/main/java/net/thauvin/erik/mobibot/msg/PublicMessage.java
index af10e94..b47da23 100644
--- a/src/main/java/net/thauvin/erik/mobibot/msg/PublicMessage.java
+++ b/src/main/java/net/thauvin/erik/mobibot/msg/PublicMessage.java
@@ -39,8 +39,14 @@ package net.thauvin.erik.mobibot.msg;
  * @since 1.0
  */
 public class PublicMessage extends Message {
-    public PublicMessage(String message) {
+    public PublicMessage(final String message) {
         this.setMessage(message);
         this.setNotice(false);
     }
+
+    public PublicMessage(final String message, final String color) {
+        this.setMessage(message);
+        this.setNotice(false);
+        this.setColor(color);
+    }
 }