Refactoring: fixing references in the code because of the last commit.

DroidPlanner/src/com/droidplanner/drone/Drone.java

@@ -5,26 +5,36 @@
 import com.droidplanner.drone.DroneInterfaces.DroneTypeListner;
 import com.droidplanner.drone.DroneInterfaces.HudUpdatedListner;
 import com.droidplanner.drone.DroneInterfaces.MapUpdatedListner;
+import com.droidplanner.drone.variables.Altitude;
+import com.droidplanner.drone.variables.Battery;
+import com.droidplanner.drone.variables.Calibration;
+import com.droidplanner.drone.variables.GPS;
+import com.droidplanner.drone.variables.Mission;
+import com.droidplanner.drone.variables.Orientation;
+import com.droidplanner.drone.variables.Parameters;
+import com.droidplanner.drone.variables.Speed;
+import com.droidplanner.drone.variables.State;
+import com.droidplanner.drone.variables.Type;
 import com.droidplanner.helpers.TTS;
 import com.droidplanner.service.MAVLinkClient;
 import com.droidplanner.waypoints.WaypointMananger;
 
 public class Drone {
-	public DroneType type = new DroneType(this);
-	public DroneGPS GPS = new DroneGPS(this);
-	public DroneSpeed speed = new DroneSpeed(this);
-	public DroneState state = new DroneState(this);
-	public DroneBattery battery = new DroneBattery(this);
-	public DroneMission mission = new DroneMission(this);
-	public DroneAltitude altitude = new DroneAltitude(this);
-	public DroneOrientation orientation = new DroneOrientation(this);
-	public DroneParameters parameters;
+	public Type type = new Type(this);
+	public GPS GPS = new GPS(this);
+	public Speed speed = new Speed(this);
+	public State state = new State(this);
+	public Battery battery = new Battery(this);
+	public Mission mission = new Mission(this);
+	public Altitude altitude = new Altitude(this);
+	public Orientation orientation = new Orientation(this);
+	public Parameters parameters;
 	public WaypointMananger waypointMananger;
-	public DroneCalibration calibrationSetup = new DroneCalibration(this);
+	public Calibration calibrationSetup = new Calibration(this);
 
-	TTS tts;
-	protected MAVLinkClient MavClient;
-	protected Context context;
+	public TTS tts;
+	public MAVLinkClient MavClient;
+	public Context context;
 
 	private HudUpdatedListner hudListner;
 	private MapUpdatedListner mapListner;
@@ -36,7 +46,7 @@ public Drone(TTS tts, MAVLinkClient mavClient,
 		this.MavClient = mavClient;
 		this.context = context;
 		waypointMananger = new WaypointMananger(this.MavClient, mission);
-		parameters = new DroneParameters(this);
+		parameters = new Parameters(this);
 	}
 
 	public void setHudListner(HudUpdatedListner listner) {
@@ -66,19 +76,19 @@ public void setDisttowpAndSpeedAltErrors(double disttowp, double alt_error,
 		notifyHudUpdate();
 	}
 
-	void notifyPositionChange() {
+	public void notifyPositionChange() {
 		if (mapListner != null) {
 			mapListner.onDroneUpdate();
 		}
 	}
 
-	void notifyTypeChanged() {
+	public void notifyTypeChanged() {
 		if (typeListner != null) {
 			typeListner.onDroneTypeChanged();
 		}
 	}
 
-	void notifyHudUpdate() {
+	public void notifyHudUpdate() {
 		if (hudListner != null)
 			hudListner.onDroneUpdate();
 	}

DroidPlanner/src/com/droidplanner/drone/variables/Altitude.java

@@ -1,10 +1,13 @@
-package com.droidplanner.drone;
+package com.droidplanner.drone.variables;
 
-public class DroneAltitude extends DroneVariable {
+import com.droidplanner.drone.Drone;
+import com.droidplanner.drone.DroneVariable;
+
+public class Altitude extends DroneVariable {
 	private double altitude = 0;
 	private double targetAltitude = 0;
 
-	public DroneAltitude(Drone myDrone) {
+	public Altitude(Drone myDrone) {
 		super(myDrone);
 	}
 

DroidPlanner/src/com/droidplanner/drone/variables/Battery.java

@@ -1,11 +1,14 @@
-package com.droidplanner.drone;
+package com.droidplanner.drone.variables;
 
-public class DroneBattery extends DroneVariable {
+import com.droidplanner.drone.Drone;
+import com.droidplanner.drone.DroneVariable;
+
+public class Battery extends DroneVariable {
 	private double battVolt = -1;
 	private double battRemain = -1;
 	private double battCurrent = -1;
 
-	public DroneBattery(Drone myDrone) {
+	public Battery(Drone myDrone) {
 		super(myDrone);
 	}
 

DroidPlanner/src/com/droidplanner/drone/variables/Calibration.java

@@ -1,4 +1,4 @@
-package com.droidplanner.drone;
+package com.droidplanner.drone.variables;
 
 import android.app.AlertDialog;
 import android.content.Context;
@@ -8,13 +8,15 @@
 import com.MAVLink.Messages.MAVLinkMessage;
 import com.MAVLink.Messages.ardupilotmega.msg_statustext;
 import com.droidplanner.MAVLink.MavLinkCalibration;
+import com.droidplanner.drone.Drone;
+import com.droidplanner.drone.DroneVariable;
 
-public class DroneCalibration extends DroneVariable implements OnClickListener {
+public class Calibration extends DroneVariable implements OnClickListener {
 	private Context context;
 
 	private int count;
 
-	public DroneCalibration(Drone drone) {
+	public Calibration(Drone drone) {
 		super(drone);
 	}
 

DroidPlanner/src/com/droidplanner/drone/variables/GPS.java

@@ -1,14 +1,16 @@
-package com.droidplanner.drone;
+package com.droidplanner.drone.variables;
 
+import com.droidplanner.drone.Drone;
+import com.droidplanner.drone.DroneVariable;
 import com.google.android.gms.maps.model.LatLng;
 
-public class DroneGPS extends DroneVariable {
+public class GPS extends DroneVariable {
 	private double gps_eph= -1;
 	private int satCount = -1;
 	private int fixType= -1;
 	private LatLng position;
 
-	public DroneGPS(Drone myDrone) {
+	public GPS(Drone myDrone) {
 		super(myDrone);
 	}
 

DroidPlanner/src/com/droidplanner/drone/variables/Mission.java

@@ -1,4 +1,4 @@
-package com.droidplanner.drone;
+package com.droidplanner.drone.variables;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -9,10 +9,12 @@
 import com.MAVLink.waypoint;
 import com.MAVLink.Messages.ardupilotmega.msg_mission_ack;
 import com.droidplanner.DroidPlannerApp.OnWaypointReceivedListner;
+import com.droidplanner.drone.Drone;
+import com.droidplanner.drone.DroneVariable;
 import com.droidplanner.waypoints.WaypointMananger.OnWaypointManagerListner;
 import com.google.android.gms.maps.model.LatLng;
 
-public class DroneMission extends DroneVariable implements
+public class Mission extends DroneVariable implements
 		OnWaypointManagerListner {
 
 	private waypoint home = new waypoint(0.0, 0.0, 0.0);
@@ -23,7 +25,7 @@ public class DroneMission extends DroneVariable implements
 
 	public OnWaypointReceivedListner waypointsListner;
 
-	public DroneMission(Drone myDrone) {
+	public Mission(Drone myDrone) {
 		super(myDrone);
 	}
 

DroidPlanner/src/com/droidplanner/drone/variables/Orientation.java

@@ -1,11 +1,14 @@
-package com.droidplanner.drone;
+package com.droidplanner.drone.variables;
 
-public class DroneOrientation extends DroneVariable {
+import com.droidplanner.drone.Drone;
+import com.droidplanner.drone.DroneVariable;
+
+public class Orientation extends DroneVariable {
 	private double roll = 0;
 	private double pitch = 0;
 	private double yaw = 0;
 
-	public DroneOrientation(Drone myDrone) {
+	public Orientation(Drone myDrone) {
 		super(myDrone);
 	}
 

DroidPlanner/src/com/droidplanner/drone/variables/Parameters.java

@@ -1,4 +1,4 @@
-package com.droidplanner.drone;
+package com.droidplanner.drone.variables;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -8,6 +8,9 @@
 import com.MAVLink.Messages.MAVLinkMessage;
 import com.MAVLink.Messages.ardupilotmega.msg_param_value;
 import com.droidplanner.MAVLink.MavLinkParameters;
+import com.droidplanner.drone.Drone;
+import com.droidplanner.drone.DroneInterfaces;
+import com.droidplanner.drone.DroneVariable;
 import com.droidplanner.parameters.Parameter;
 
 /**
@@ -18,12 +21,12 @@
  * MAV Message.
  * 
  */
-public class DroneParameters extends DroneVariable {
+public class Parameters extends DroneVariable {
 	private List<Parameter> parameters = new ArrayList<Parameter>();
 
 	public DroneInterfaces.OnParameterManagerListner parameterListner;
 
-	public DroneParameters(Drone myDrone) {
+	public Parameters(Drone myDrone) {
 		super(myDrone);
 	}
 

DroidPlanner/src/com/droidplanner/drone/variables/Speed.java

@@ -1,12 +1,15 @@
-package com.droidplanner.drone;
+package com.droidplanner.drone.variables;
 
-public class DroneSpeed extends DroneVariable {
+import com.droidplanner.drone.Drone;
+import com.droidplanner.drone.DroneVariable;
+
+public class Speed extends DroneVariable {
 	private double verticalSpeed = 0;
 	private double groundSpeed = 0;
 	private double airSpeed = 0;
 	private double targetSpeed = 0;
 
-	public DroneSpeed(Drone myDrone) {
+	public Speed(Drone myDrone) {
 		super(myDrone);
 	}
 

DroidPlanner/src/com/droidplanner/drone/variables/State.java

@@ -1,15 +1,17 @@
-package com.droidplanner.drone;
+package com.droidplanner.drone.variables;
 
 import com.MAVLink.waypoint;
 import com.MAVLink.Messages.ApmModes;
 import com.droidplanner.MAVLink.MavLinkModes;
+import com.droidplanner.drone.Drone;
+import com.droidplanner.drone.DroneVariable;
 
-public class DroneState extends DroneVariable {
+public class State extends DroneVariable {
 	private boolean failsafe = false;
 	private boolean armed = false;
 	private ApmModes mode = ApmModes.UNKNOWN;
 
-	public DroneState(Drone myDrone) {
+	public State(Drone myDrone) {
 		super(myDrone);
 	}
 

DroidPlanner/src/com/droidplanner/drone/variables/Type.java

@@ -1,11 +1,13 @@
-package com.droidplanner.drone;
+package com.droidplanner.drone.variables;
 
 import com.MAVLink.Messages.enums.MAV_TYPE;
+import com.droidplanner.drone.Drone;
+import com.droidplanner.drone.DroneVariable;
 
-public class DroneType extends DroneVariable{
+public class Type extends DroneVariable{
 	private int type = MAV_TYPE.MAV_TYPE_FIXED_WING;
 
-	public DroneType(Drone myDrone) {
+	public Type(Drone myDrone) {
 		super(myDrone);
 	}