Refactor MessageList to use getter/setters

bglasber · Oct 19, 2013 · 0d77d2f · 0d77d2f
1 parent 29035dc
commit 0d77d2f
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 4 deletions.
diff --git a/Skypebot/src/main/java/skypebot/engine/Engine.java b/Skypebot/src/main/java/skypebot/engine/Engine.java
@@ -28,7 +28,7 @@ public class Engine {
     private static ExecutorService executor;
     private static Logger logger = Logger.getLogger( Engine.class.getCanonicalName() );
     private static DbManager dbManager;
-    public static MessageList messageList;
+    private static MessageList messageList;
 
     public Engine() {
         dbManager = createDbManager();
@@ -154,4 +154,30 @@ private int getNumberOfCores() {
         return cores;
     }
 
+    public static void AddToMessageList( ChatMessage m ) {
+        messageList.Put( m );
+    }
+
+    public static void AddToMessageList(
+        String person,
+        String message
+    ) {
+        messageList.Put(
+            person,
+            message
+        );
+    }
+
+    public static String GetQuotableMessage(
+        String person,
+        String textToMatch,
+        int numMessages
+    ) {
+        return messageList.GetMessageToQuote(
+            person,
+            textToMatch,
+            numMessages
+        );
+    }
+
 }
diff --git a/Skypebot/src/main/java/skypebot/handlers/RememberHandler.java b/Skypebot/src/main/java/skypebot/handlers/RememberHandler.java
@@ -69,7 +69,7 @@ public void handle( ChatMessage m ) {
                 name
             );
             logger.debug( "Found Real Name: " + realName );
-            String message = Engine.messageList.GetMessageToQuote(
+            String message = Engine.GetQuotableMessage(
                 realName,
                 text,
                 Integer.parseInt( num )

diff --git a/Skypebot/src/main/java/skypebot/handlers/ResponseHandler.java b/Skypebot/src/main/java/skypebot/handlers/ResponseHandler.java
@@ -54,7 +54,7 @@ else if( m.getContent().contains( "bucket, what was that" ) ) {
                 return;
             }
             logger.trace( "Putting the message into the message list" );
-            Engine.messageList.Put( m );
+            Engine.AddToMessageList( m );
 
             //Gives us a number between 0.0 and 1.0, this should give us 35% chance of not responding
             boolean referencedOverride = m.getContent().contains( "bucket" ) || m.getContent().contains( "Bucket" );
@@ -98,7 +98,7 @@ else if( m.getContent().contains( "bucket, what was that" ) ) {
                     m.getChat(),
                     response[ 1 ]
                 );
-                Engine.messageList.Put(
+                Engine.AddToMessageList(
                     "Bucket",
                     messageResponse
                 );