Changed MessageServerControl to enums

diff --git a/src/uk/ac/ntu/n0521366/wsyd/libs/message/MessageServerControl.java b/src/uk/ac/ntu/n0521366/wsyd/libs/message/MessageServerControl.java
index 3b1cb94..fdf7f98 100644 (file)
--- a/src/uk/ac/ntu/n0521366/wsyd/libs/message/MessageServerControl.java
+++ b/src/uk/ac/ntu/n0521366/wsyd/libs/message/MessageServerControl.java
@@ -28,11 +28,14 @@ package uk.ac.ntu.n0521366.wsyd.libs.message;
  * @author eddie
  */
 public class MessageServerControl extends MessageAbstract {
+    public enum EXIT { NO, YES };
+    public enum RESTART { NO, YES };
+    
     public static final String _type = "ServerControl";
     
-    public boolean exitReq;
+    public EXIT exitReq;
     
-    public boolean restartReq;
+    public RESTART restartReq;
     
     public static String getType()
     {
@@ -45,7 +48,7 @@ public class MessageServerControl extends MessageAbstract {
         return _type;
     }
     
-    public MessageServerControl(boolean exit, boolean restart)
+    public MessageServerControl(EXIT exit, RESTART restart)
     {
         super();
         this.exitReq = exit;

diff --git a/src/uk/ac/ntu/n0521366/wsyd/server/ServerSocial.java b/src/uk/ac/ntu/n0521366/wsyd/server/ServerSocial.java
index 5a2c8ac..b4d65ee 100644 (file)
--- a/src/uk/ac/ntu/n0521366/wsyd/server/ServerSocial.java
+++ b/src/uk/ac/ntu/n0521366/wsyd/server/ServerSocial.java
@@ -392,8 +392,8 @@ public final class ServerSocial implements NetworkMessageEventListener {
             String type = nm.getMessage().getMessageType();
                     if (type.equals(MessageServerControl.getType())) { // ServerControl
                         MessageServerControl mp = (MessageServerControl)nm.getMessage();
-                        if (mp.exitReq == true) ServerSocial.exitRequested = true;
-                        if (mp.restartReq == true) ServerSocial.restartRequested = true;
+                        if (mp.exitReq == MessageServerControl.EXIT.YES) ServerSocial.exitRequested = true;
+                        if (mp.restartReq == MessageServerControl.RESTART.YES) ServerSocial.restartRequested = true;
                         }
         }
     }