From ddb197a15d427b0b84ffe399e8b6ac6bd9fbbd5c Mon Sep 17 00:00:00 2001
From: James Cotton <peabody124@gmail.com>
Date: Wed, 8 Aug 2012 10:04:52 -0500
Subject: [PATCH] AndroidGCS: Move the  telemetry functionality into its own
 package

---
 .../org/openpilot/androidgcs/ObjectManagerActivity.java    | 5 +++--
 .../src/org/openpilot/androidgcs/TelemetryWidget.java      | 2 ++
 androidgcs/src/org/openpilot/androidgcs/UAVLocation.java   | 7 ++++---
 .../androidgcs/{ => telemetry}/BluetoothUAVTalk.java       | 2 +-
 .../androidgcs/{ => telemetry}/OPTelemetryService.java     | 2 +-
 .../openpilot/androidgcs/{ => telemetry}/TcpUAVTalk.java   | 2 +-
 6 files changed, 12 insertions(+), 8 deletions(-)
 rename androidgcs/src/org/openpilot/androidgcs/{ => telemetry}/BluetoothUAVTalk.java (99%)
 rename androidgcs/src/org/openpilot/androidgcs/{ => telemetry}/OPTelemetryService.java (99%)
 rename androidgcs/src/org/openpilot/androidgcs/{ => telemetry}/TcpUAVTalk.java (98%)

diff --git a/androidgcs/src/org/openpilot/androidgcs/ObjectManagerActivity.java b/androidgcs/src/org/openpilot/androidgcs/ObjectManagerActivity.java
index 7a868187a..d01aa3a86 100644
--- a/androidgcs/src/org/openpilot/androidgcs/ObjectManagerActivity.java
+++ b/androidgcs/src/org/openpilot/androidgcs/ObjectManagerActivity.java
@@ -34,8 +34,9 @@ import java.util.ListIterator;
 import java.util.Observable;
 import java.util.Observer;
 
-import org.openpilot.androidgcs.OPTelemetryService.LocalBinder;
-import org.openpilot.androidgcs.OPTelemetryService.TelemTask;
+import org.openpilot.androidgcs.telemetry.OPTelemetryService;
+import org.openpilot.androidgcs.telemetry.OPTelemetryService.LocalBinder;
+import org.openpilot.androidgcs.telemetry.OPTelemetryService.TelemTask;
 import org.openpilot.uavtalk.UAVObject;
 import org.openpilot.uavtalk.UAVObjectManager;
 
diff --git a/androidgcs/src/org/openpilot/androidgcs/TelemetryWidget.java b/androidgcs/src/org/openpilot/androidgcs/TelemetryWidget.java
index c457d8d1d..d874c9b12 100644
--- a/androidgcs/src/org/openpilot/androidgcs/TelemetryWidget.java
+++ b/androidgcs/src/org/openpilot/androidgcs/TelemetryWidget.java
@@ -22,6 +22,8 @@
  */
 package org.openpilot.androidgcs;
 
+import org.openpilot.androidgcs.telemetry.OPTelemetryService;
+
 import android.appwidget.AppWidgetManager;
 import android.appwidget.AppWidgetProvider;
 import android.content.ComponentName;
diff --git a/androidgcs/src/org/openpilot/androidgcs/UAVLocation.java b/androidgcs/src/org/openpilot/androidgcs/UAVLocation.java
index 87a8067ca..f13b0ff1c 100644
--- a/androidgcs/src/org/openpilot/androidgcs/UAVLocation.java
+++ b/androidgcs/src/org/openpilot/androidgcs/UAVLocation.java
@@ -27,8 +27,9 @@ import java.util.List;
 import java.util.Observable;
 import java.util.Observer;
 
-import org.openpilot.androidgcs.OPTelemetryService.LocalBinder;
-import org.openpilot.androidgcs.OPTelemetryService.TelemTask;
+import org.openpilot.androidgcs.telemetry.OPTelemetryService;
+import org.openpilot.androidgcs.telemetry.OPTelemetryService.LocalBinder;
+import org.openpilot.androidgcs.telemetry.OPTelemetryService.TelemTask;
 import org.openpilot.uavtalk.UAVDataObject;
 import org.openpilot.uavtalk.UAVObject;
 import org.openpilot.uavtalk.UAVObjectManager;
@@ -72,7 +73,7 @@ public class UAVLocation extends MapActivity
 	UAVObjectManager objMngr;
     boolean mBound = false;
     boolean mConnected = false;
-    LocalBinder binder;
+	org.openpilot.androidgcs.telemetry.OPTelemetryService.LocalBinder binder;
 
     GeoPoint homeLocation;
     GeoPoint uavLocation;
diff --git a/androidgcs/src/org/openpilot/androidgcs/BluetoothUAVTalk.java b/androidgcs/src/org/openpilot/androidgcs/telemetry/BluetoothUAVTalk.java
similarity index 99%
rename from androidgcs/src/org/openpilot/androidgcs/BluetoothUAVTalk.java
rename to androidgcs/src/org/openpilot/androidgcs/telemetry/BluetoothUAVTalk.java
index c85f9fc75..db3d44134 100644
--- a/androidgcs/src/org/openpilot/androidgcs/BluetoothUAVTalk.java
+++ b/androidgcs/src/org/openpilot/androidgcs/telemetry/BluetoothUAVTalk.java
@@ -22,7 +22,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package org.openpilot.androidgcs;
+package org.openpilot.androidgcs.telemetry;
 
 import java.io.IOException;
 import java.util.Set;
diff --git a/androidgcs/src/org/openpilot/androidgcs/OPTelemetryService.java b/androidgcs/src/org/openpilot/androidgcs/telemetry/OPTelemetryService.java
similarity index 99%
rename from androidgcs/src/org/openpilot/androidgcs/OPTelemetryService.java
rename to androidgcs/src/org/openpilot/androidgcs/telemetry/OPTelemetryService.java
index fb3106f97..54ab74fe2 100644
--- a/androidgcs/src/org/openpilot/androidgcs/OPTelemetryService.java
+++ b/androidgcs/src/org/openpilot/androidgcs/telemetry/OPTelemetryService.java
@@ -24,7 +24,7 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-package org.openpilot.androidgcs;
+package org.openpilot.androidgcs.telemetry;
 
 import java.io.IOException;
 import java.util.Observable;
diff --git a/androidgcs/src/org/openpilot/androidgcs/TcpUAVTalk.java b/androidgcs/src/org/openpilot/androidgcs/telemetry/TcpUAVTalk.java
similarity index 98%
rename from androidgcs/src/org/openpilot/androidgcs/TcpUAVTalk.java
rename to androidgcs/src/org/openpilot/androidgcs/telemetry/TcpUAVTalk.java
index a1d775aa3..439069d29 100644
--- a/androidgcs/src/org/openpilot/androidgcs/TcpUAVTalk.java
+++ b/androidgcs/src/org/openpilot/androidgcs/telemetry/TcpUAVTalk.java
@@ -21,7 +21,7 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-package org.openpilot.androidgcs;
+package org.openpilot.androidgcs.telemetry;
 
 import java.io.IOException;
 import java.net.InetAddress;