From d46a86522947c94a1bc0117e8cec935fd7576b35 Mon Sep 17 00:00:00 2001
From: James Cotton <peabody124@gmail.com>
Date: Thu, 9 Aug 2012 23:26:36 -0500
Subject: [PATCH] AndroidGCS: UAVTalk no longer extends Observable since there
 is only one listener anyway we use a setListener pattern.

---
 androidgcs/src/org/openpilot/uavtalk/UAVTalk.java | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/androidgcs/src/org/openpilot/uavtalk/UAVTalk.java b/androidgcs/src/org/openpilot/uavtalk/UAVTalk.java
index c538352a4..722e96560 100644
--- a/androidgcs/src/org/openpilot/uavtalk/UAVTalk.java
+++ b/androidgcs/src/org/openpilot/uavtalk/UAVTalk.java
@@ -31,12 +31,11 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
-import java.util.Observable;
 
 import junit.framework.Assert;
 import android.util.Log;
 
-public class UAVTalk extends Observable {
+public class UAVTalk {
 
 	static final String TAG = "UAVTalk";
 	public static int LOGLEVEL = 0;
@@ -673,6 +672,7 @@ public class UAVTalk extends Observable {
 				(respObj.getInstID() == obj.getInstID() || respAllInstances)) {
 			if (transactionListener != null)
 				transactionListener.TransactionFailed(obj);
+			respObj = null;
 		}
 	}
 
@@ -686,9 +686,7 @@ public class UAVTalk extends Observable {
 				&& (respObj.getInstID() == obj.getInstID() || respAllInstances)) {
 			if (transactionListener != null)
 				transactionListener.TransactionSucceeded(obj);
-			/*respObj = null;
-			setChanged();
-			notifyObservers(obj);*/
+			respObj = null;
 		}
 	}