From 077b5a737cf735002e9bf74859c915444452f835 Mon Sep 17 00:00:00 2001
From: amilasilva88 <amilasilva88@gmail.com>
Date: Fri, 14 Aug 2015 11:37:32 +0800
Subject: Refactoring - tabs to spaces and naming conventions

---
 src/org/traccar/ODOMeterHandler.java | 52 ------------------------------------
 src/org/traccar/OdometerHandler.java | 52 ++++++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 52 deletions(-)
 delete mode 100644 src/org/traccar/ODOMeterHandler.java
 create mode 100644 src/org/traccar/OdometerHandler.java

(limited to 'src')

diff --git a/src/org/traccar/ODOMeterHandler.java b/src/org/traccar/ODOMeterHandler.java
deleted file mode 100644
index 781dd274d..000000000
--- a/src/org/traccar/ODOMeterHandler.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * 
- */
-package org.traccar;
-
-import org.traccar.helper.DistanceCalculator;
-import org.traccar.helper.Log;
-import org.traccar.model.Position;
-
-/**
- * <p>
- *  Odometer handler
- * </p>
- * 
- * @author Amila Silva
- *
- */
-public class ODOMeterHandler extends BaseDataHandler {
-
-	public ODOMeterHandler() {
-		Log.debug("System based odometer calculation enabled for all devices");
-	}
-
-	private Position getLastPosition(long deviceId) {
-		if (Context.getConnectionManager() != null) {
-			return Context.getConnectionManager().getLastPosition(deviceId);
-		}
-		return null;
-	}
-
-	private Position calculateDistance(Position position) {
-		Position last = getLastPosition(position.getDeviceId());
-		if (last != null) {
-			double distance = DistanceCalculator.distance(
-					position.getLatitude(), position.getLongitude(),
-					last.getLatitude(), last.getLongitude());
-			distance = Math.round((distance) * 100.0) / 100.0;
-			double odoMeter = distance + last.getOdoMeter();
-//			Log.debug("::: Device Course : " + position.getDeviceId()
-//					+ ", Distance :" + distance + "m, Odometer :" + odoMeter
-//					+ " m");
-			position.setOdoMeter(odoMeter);
-		}
-		return position;
-	}
-
-	@Override
-	protected Position handlePosition(Position position) {
-		return calculateDistance(position);
-	}
-
-}
diff --git a/src/org/traccar/OdometerHandler.java b/src/org/traccar/OdometerHandler.java
new file mode 100644
index 000000000..781dd274d
--- /dev/null
+++ b/src/org/traccar/OdometerHandler.java
@@ -0,0 +1,52 @@
+/**
+ * 
+ */
+package org.traccar;
+
+import org.traccar.helper.DistanceCalculator;
+import org.traccar.helper.Log;
+import org.traccar.model.Position;
+
+/**
+ * <p>
+ *  Odometer handler
+ * </p>
+ * 
+ * @author Amila Silva
+ *
+ */
+public class ODOMeterHandler extends BaseDataHandler {
+
+	public ODOMeterHandler() {
+		Log.debug("System based odometer calculation enabled for all devices");
+	}
+
+	private Position getLastPosition(long deviceId) {
+		if (Context.getConnectionManager() != null) {
+			return Context.getConnectionManager().getLastPosition(deviceId);
+		}
+		return null;
+	}
+
+	private Position calculateDistance(Position position) {
+		Position last = getLastPosition(position.getDeviceId());
+		if (last != null) {
+			double distance = DistanceCalculator.distance(
+					position.getLatitude(), position.getLongitude(),
+					last.getLatitude(), last.getLongitude());
+			distance = Math.round((distance) * 100.0) / 100.0;
+			double odoMeter = distance + last.getOdoMeter();
+//			Log.debug("::: Device Course : " + position.getDeviceId()
+//					+ ", Distance :" + distance + "m, Odometer :" + odoMeter
+//					+ " m");
+			position.setOdoMeter(odoMeter);
+		}
+		return position;
+	}
+
+	@Override
+	protected Position handlePosition(Position position) {
+		return calculateDistance(position);
+	}
+
+}
-- 
cgit v1.2.3