From 1423589b8378f8176a0ad31571ab0c62141f3ec6 Mon Sep 17 00:00:00 2001
From: Andy Spencer <andy753421@gmail.com>
Date: Fri, 7 Mar 2014 06:45:00 +0000
Subject: [PATCH] Move commands to CMD class

---
 src/edu/ucla/iBeaconNav/CMD.java  | 16 ++++++++++++++++
 src/edu/ucla/iBeaconNav/Main.java |  8 ++++----
 src/edu/ucla/iBeaconNav/Task.java | 27 +++++++--------------------
 3 files changed, 27 insertions(+), 24 deletions(-)
 create mode 100644 src/edu/ucla/iBeaconNav/CMD.java

diff --git a/src/edu/ucla/iBeaconNav/CMD.java b/src/edu/ucla/iBeaconNav/CMD.java
new file mode 100644
index 0000000..2ea4201
--- /dev/null
+++ b/src/edu/ucla/iBeaconNav/CMD.java
@@ -0,0 +1,16 @@
+package edu.ucla.iBeaconNav;
+
+public class CMD {
+	/* Main -> Task Messsages */
+	static enum Command {
+		REGISTER,
+		CONNECT,
+		DISCONNECT,
+	};
+
+	/* Task -> Main messages */
+	static enum Response {
+		POSITION,
+		NOTIFY,
+	};
+}
diff --git a/src/edu/ucla/iBeaconNav/Main.java b/src/edu/ucla/iBeaconNav/Main.java
index 81f4051..b74f9c8 100644
--- a/src/edu/ucla/iBeaconNav/Main.java
+++ b/src/edu/ucla/iBeaconNav/Main.java
@@ -83,7 +83,7 @@ public class Main extends Activity
 	{
 		Util.debug("Main: register");
 		startService(new Intent(this, Task.class)
-				.putExtra("Command",   Task.Command.REGISTER)
+				.putExtra("Command",   CMD.Command.REGISTER)
 				.putExtra("Messenger", this.messenger));
 	}
 
@@ -91,14 +91,14 @@ public class Main extends Activity
 	{
 		Util.debug("Main: connect");
 		startService(new Intent(this, Task.class)
-				.putExtra("Command", Task.Command.CONNECT));
+				.putExtra("Command", CMD.Command.CONNECT));
 	}
 
 	private void disconnect()
 	{
 		Util.debug("Main: disconnect");
 		startService(new Intent(this, Task.class)
-				.putExtra("Command", Task.Command.DISCONNECT));
+				.putExtra("Command", CMD.Command.DISCONNECT));
 	}
 
 	private void quit()
@@ -259,7 +259,7 @@ public class Main extends Activity
 	{
 		public void handleMessage(android.os.Message msg)
 		{
-			Task.Response resp = Task.Response.values()[msg.what];
+			CMD.Response resp = CMD.Response.values()[msg.what];
 			switch (resp) {
 				case POSITION:
 					Main.this.onPosition();
diff --git a/src/edu/ucla/iBeaconNav/Task.java b/src/edu/ucla/iBeaconNav/Task.java
index 049776e..6d8c777 100644
--- a/src/edu/ucla/iBeaconNav/Task.java
+++ b/src/edu/ucla/iBeaconNav/Task.java
@@ -24,25 +24,12 @@ import com.radiusnetworks.ibeacon.service.*;
 
 public class Task extends Service implements IBeaconConsumer, RangeNotifier, MonitorNotifier
 {
-	/* Main -> Task Messsages */
-	static enum Command {
-		REGISTER,
-		CONNECT,
-		DISCONNECT,
-	};
-
-	/* Task -> Main messages */
-	static enum Response {
-		POSITION,
-		NOTIFY,
-	};
-
 	/* Private data */
 	private Messenger      messenger;
 	private IBeaconManager ibeacon;
 
 	/* Private methods */
-	private void tellMain(Response cmd, Object value)
+	private void tellMain(CMD.Response cmd, Object value)
 	{
 		try {
 			android.os.Message msg = android.os.Message.obtain();
@@ -57,7 +44,7 @@ public class Task extends Service implements IBeaconConsumer, RangeNotifier, Mon
 	private void notify(String text, int icon)
 	{
 		// Notify Main
-		this.tellMain(Task.Response.NOTIFY, text);
+		this.tellMain(CMD.Response.NOTIFY, text);
 
 		// Notification bar
 		//Notification  note   = new Notification(icon, null, 0);
@@ -75,10 +62,10 @@ public class Task extends Service implements IBeaconConsumer, RangeNotifier, Mon
 		this.startForeground(1, note);
 	}
 
-	private void handle(Command cmd, Messenger mgr)
+	private void handle(CMD.Command cmd, Messenger mgr)
 	{
 		// Validate messenger
-		if (cmd != Task.Command.REGISTER && mgr != null && mgr != this.messenger)
+		if (cmd != CMD.Command.REGISTER && mgr != null && mgr != this.messenger)
 			Util.debug("Task: handle - invalid messenger");
 
 		// Handle the command
@@ -135,9 +122,9 @@ public class Task extends Service implements IBeaconConsumer, RangeNotifier, Mon
 	public int onStartCommand(Intent intent, int flags, int startId)
 	{
 		Util.debug("Task: onStartCommand");
-		int       rval = super.onStartCommand(intent, flags, startId);
-		Command   cmd  =   (Command)intent.getExtras().get("Command");
-		Messenger mgr  = (Messenger)intent.getExtras().get("Messenger");
+		int         rval = super.onStartCommand(intent, flags, startId);
+		CMD.Command cmd  = (CMD.Command)intent.getExtras().get("Command");
+		Messenger   mgr  = (Messenger)intent.getExtras().get("Messenger");
 		this.handle(cmd, mgr);
 		return rval;
 	}
-- 
2.43.2