From 44f026f881efa6207ab79fb5bada20ab67f018a0 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Wed, 27 Apr 2016 11:21:27 +1200
Subject: Rename ChannelBufferTools to BcdUtil

---
 src/org/traccar/helper/BcdUtil.java            | 63 +++++++++++++++++++++++
 src/org/traccar/helper/ChannelBufferTools.java | 70 --------------------------
 2 files changed, 63 insertions(+), 70 deletions(-)
 create mode 100644 src/org/traccar/helper/BcdUtil.java
 delete mode 100644 src/org/traccar/helper/ChannelBufferTools.java

(limited to 'src/org/traccar/helper')

diff --git a/src/org/traccar/helper/BcdUtil.java b/src/org/traccar/helper/BcdUtil.java
new file mode 100644
index 000000000..a248daf22
--- /dev/null
+++ b/src/org/traccar/helper/BcdUtil.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2012 - 2016 Anton Tananaev (anton.tananaev@gmail.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.helper;
+
+import org.jboss.netty.buffer.ChannelBuffer;
+
+public final class BcdUtil {
+
+    private BcdUtil() {
+    }
+
+    public static int readInteger(ChannelBuffer buf, int digits) {
+        int result = 0;
+
+        for (int i = 0; i < digits / 2; i++) {
+            int b = buf.readUnsignedByte();
+            result *= 10;
+            result += b >>> 4;
+            result *= 10;
+            result += b & 0x0f;
+        }
+
+        if (digits % 2 != 0) {
+            int b = buf.getUnsignedByte(buf.readerIndex());
+            result *= 10;
+            result += b >>> 4;
+        }
+
+        return result;
+    }
+
+    public static double readCoordinate(ChannelBuffer buf) {
+        int b1 = buf.readUnsignedByte();
+        int b2 = buf.readUnsignedByte();
+        int b3 = buf.readUnsignedByte();
+        int b4 = buf.readUnsignedByte();
+
+        double value = (b2 & 0xf) * 10 + (b3 >> 4);
+        value += (((b3 & 0xf) * 10 + (b4 >> 4)) * 10 + (b4 & 0xf)) / 1000.0;
+        value /= 60;
+        value += ((b1 >> 4 & 0x7) * 10 + (b1 & 0xf)) * 10 + (b2 >> 4);
+
+        if ((b1 & 0x80) != 0) {
+            value = -value;
+        }
+
+        return value;
+    }
+
+}
diff --git a/src/org/traccar/helper/ChannelBufferTools.java b/src/org/traccar/helper/ChannelBufferTools.java
deleted file mode 100644
index ad2369bed..000000000
--- a/src/org/traccar/helper/ChannelBufferTools.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright 2012 Anton Tananaev (anton.tananaev@gmail.com)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.traccar.helper;
-
-import org.jboss.netty.buffer.ChannelBuffer;
-
-public final class ChannelBufferTools {
-
-    private ChannelBufferTools() {
-    }
-
-    /**
-     * Convert hex to integer (length in hex digits)
-     */
-    public static int readHexInteger(ChannelBuffer buf, int length) {
-
-        int result = 0;
-
-        for (int i = 0; i < length / 2; i++) {
-            int b = buf.readUnsignedByte();
-            result *= 10;
-            result += b >>> 4;
-            result *= 10;
-            result += b & 0x0f;
-        }
-
-        if (length % 2 != 0) {
-            int b = buf.getUnsignedByte(buf.readerIndex());
-            result *= 10;
-            result += b >>> 4;
-        }
-
-        return result;
-    }
-
-    /**
-     * Read BCD coded coordinate (first byte has sign bit)
-     */
-    public static double readCoordinate(ChannelBuffer buf) {
-        int b1 = buf.readUnsignedByte();
-        int b2 = buf.readUnsignedByte();
-        int b3 = buf.readUnsignedByte();
-        int b4 = buf.readUnsignedByte();
-
-        double value = (b2 & 0xf) * 10 + (b3 >> 4);
-        value += (((b3 & 0xf) * 10 + (b4 >> 4)) * 10 + (b4 & 0xf)) / 1000.0;
-        value /= 60;
-        value += ((b1 >> 4 & 0x7) * 10 + (b1 & 0xf)) * 10 + (b2 >> 4);
-
-        if ((b1 & 0x80) != 0) {
-            value = -value;
-        }
-
-        return value;
-    }
-
-}
-- 
cgit v1.2.3