* Properly parse Server Broadcast Message. (Fixes #14)

Mikeware · May 5, 2015 · bbfeb1d · bbfeb1d
1 parent ad24491
commit bbfeb1d
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 14 deletions.
diff --git a/java_client_src/src/ihs/apcs/spacebattle/GraphicalClient.java b/java_client_src/src/ihs/apcs/spacebattle/GraphicalClient.java
@@ -120,7 +120,7 @@ public <T> void parseMessage(MwnpMessage msg) throws IOException, IllegalArgumen
 
 			RegistrationData data = ship.registerShip(numImages, width, height);
 
-			MwnpMessage response = new MwnpMessage(new int[]{netId, 0}, data);
+			MwnpMessage response = new MwnpMessage(new Integer[]{netId, 0}, data);
 			messenger.sendMessage(response);
 		} else if (msg.getCommand().equals("ENV")) {
 			Environment<?> env = (Environment<?>)msg.getData();
@@ -140,7 +140,7 @@ public <T> void parseMessage(MwnpMessage msg) throws IOException, IllegalArgumen
 			} else if (cmd instanceof SelfDestructCommand) {
 				disconnect();
 			} else {
-				MwnpMessage response = new MwnpMessage(new int[]{netId, 0}, cmd);
+				MwnpMessage response = new MwnpMessage(new Integer[]{netId, 0}, cmd);
 				messenger.sendMessage(response);
 			}
 		} else if (msg.getCommand().equals("ERROR")) {
@@ -152,7 +152,7 @@ public void disconnect() throws IOException {
 		System.out.println("Attempting to disconnect...");
 		if (!disconnected) {
 			System.out.println("Sending disconnect message...");
-			MwnpMessage disconnect = new MwnpMessage(new int[]{netId, 0}, "MWNL2_DISCONNECT", null);
+			MwnpMessage disconnect = new MwnpMessage(new Integer[]{netId, 0}, "MWNL2_DISCONNECT", null);
 			messenger.sendMessage(disconnect);
 			System.out.println("Ending listener...");
 			listener.end();

diff --git a/java_client_src/src/ihs/apcs/spacebattle/TextClient.java b/java_client_src/src/ihs/apcs/spacebattle/TextClient.java
@@ -101,6 +101,7 @@ public static void main(String[] args) {
 			// Wait for termination command
 			System.out.println("Type QUIT to disconnect from server and end program");
 			Scanner kb = new Scanner(System.in);
+			// TODO: Be able to break-out of this loop and end program when the client receives a disconnect message
 			while (kb.hasNextLine() && !kb.nextLine().equalsIgnoreCase("QUIT"));
 			kb.close();
 		} catch (IOException ex) {
@@ -147,7 +148,7 @@ public <T> void parseMessage(MwnpMessage msg) throws IOException, IllegalArgumen
 			RegistrationData data = ship.registerShip(numImages, width, height);
 			data = new RegistrationData(data.getName() + shipSuffix, data.getColor(), data.getImage());
 
-			MwnpMessage response = new MwnpMessage(new int[]{netId, 0}, data);
+			MwnpMessage response = new MwnpMessage(new Integer[]{netId, 0}, data);
 			messenger.sendMessage(response);
 		} else if (msg.getCommand().equals("ENV")) {
 			Environment<?> env = (Environment<?>)msg.getData();
@@ -179,7 +180,7 @@ public <T> void parseMessage(MwnpMessage msg) throws IOException, IllegalArgumen
 			} else if (cmd instanceof SelfDestructCommand) {
 				disconnect();
 			} else {
-				MwnpMessage response = new MwnpMessage(new int[]{netId, 0}, cmd);
+				MwnpMessage response = new MwnpMessage(new Integer[]{netId, 0}, cmd);
 				messenger.sendMessage(response);
 			}
 		} else if (msg.getCommand().equals("ERROR")) {
@@ -195,7 +196,7 @@ public void disconnect() throws IOException {
 		System.out.println("Attempting to disconnect...");
 		if (!disconnected) {
 			logMessage("Sending disconnect message...");
-			MwnpMessage disconnect = new MwnpMessage(new int[]{netId, 0}, "MWNL2_DISCONNECT", null);
+			MwnpMessage disconnect = new MwnpMessage(new Integer[]{netId, 0}, "MWNL2_DISCONNECT", null);
 			messenger.sendMessage(disconnect);
 			logMessage("Ending listener...");
 			listener.end();

diff --git a/java_client_src/src/ihs/apcs/spacebattle/networking/MwnpMessage.java b/java_client_src/src/ihs/apcs/spacebattle/networking/MwnpMessage.java
@@ -11,7 +11,7 @@
 import ihs.apcs.spacebattle.util.StringStringMap;
 
 public class MwnpMessage {
-	private int[] ids;
+	private Integer[] ids;
 	private String command;
 	private Object data;
 
@@ -47,26 +47,26 @@ public static void RegisterGameType(String gameName)
 		}
 	}
 
-	public MwnpMessage(int[] ids, String command, Object data) {
+	public MwnpMessage(Integer[] ids, String command, Object data) {
 		this.ids = ids;
 		this.command = command;
 		this.data = data;
 	}
 
-	public MwnpMessage(int[] ids, ShipCommand cmd) throws IllegalArgumentException, IllegalAccessException {
+	public MwnpMessage(Integer[] ids, ShipCommand cmd) throws IllegalArgumentException, IllegalAccessException {
 		this.ids = ids;
 		this.command = "SCMD";
 		this.data = cmd.getMessage();
 	}
 
-	public MwnpMessage(int[] ids, RegistrationData regData) {
+	public MwnpMessage(Integer[] ids, RegistrationData regData) {
 		this.ids = ids;
 		this.command = "REGISTER";
 		this.data = regData;
 	}
 
-	public int getSenderId() { return ids[0]; }
-	public int getReceiverId() { return ids[1]; }
+	public Integer getSenderId() { return ids[0]; }
+	public Integer getReceiverId() { return ids[1]; }
 	public String getCommand() { return command; }
 	public Object getData() { return data; }
 
@@ -91,12 +91,12 @@ public static MwnpMessage parseMessage(String messageText) {
 			String data = messageText.substring(id.length() + command.length() + 2);		
 
 			return new MwnpMessage (
-					gson.fromJson(id, int[].class),
+					gson.fromJson(id, Integer[].class),
 					gson.fromJson(command, String.class), 
 					gson.fromJson(data, dataType));
 		} else {
 			return new MwnpMessage (
-					gson.fromJson(id, int[].class), // TODO: handle [#, null] type message on broadcast of server closing 
+					gson.fromJson(id, Integer[].class), 
 					gson.fromJson(command, String.class), 
 					null);			
 		}