Move commands to CMD class

[~andy/iBeaconNav] / src / edu / ucla / iBeaconNav / Main.java

diff --git a/src/edu/ucla/iBeaconNav/Main.java b/src/edu/ucla/iBeaconNav/Main.java
index 81f40513eaac3c3d532331ccc57b72523658996a..b74f9c81cc7fa5eed372561461032696211b30af 100644 (file)
--- 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();