From 622706ec1c8e2a78dae161a1db64b09247efbfd9 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Mon, 26 Oct 2015 14:32:15 +1300
Subject: Remove readHexString util method

---
 src/org/traccar/helper/ChannelBufferTools.java      | 20 --------------------
 src/org/traccar/protocol/TzoneProtocolDecoder.java  |  2 +-
 test/org/traccar/helper/ChannelBufferToolsTest.java | 11 -----------
 3 files changed, 1 insertion(+), 32 deletions(-)

diff --git a/src/org/traccar/helper/ChannelBufferTools.java b/src/org/traccar/helper/ChannelBufferTools.java
index 6c61287c9..db628a76b 100644
--- a/src/org/traccar/helper/ChannelBufferTools.java
+++ b/src/org/traccar/helper/ChannelBufferTools.java
@@ -49,26 +49,6 @@ public final class ChannelBufferTools {
         return result;
     }
 
-    /**
-     * Return hex string
-     */
-    public static String readHexString(ChannelBuffer buf, int length) {
-
-        StringBuilder result = new StringBuilder();
-        Formatter formatter = new Formatter(result);
-
-        for (int i = 0; i < length / 2; i++) {
-            formatter.format("%02x", buf.readByte());
-        }
-
-        if (length % 2 != 0) {
-            int b = buf.getUnsignedByte(buf.readerIndex());
-            formatter.format("%01x", b >>> 4);
-        }
-
-        return result.toString();
-    }
-
     /**
      * Read BCD coded coordinate (first byte has sign bit)
      */
diff --git a/src/org/traccar/protocol/TzoneProtocolDecoder.java b/src/org/traccar/protocol/TzoneProtocolDecoder.java
index 6805708b9..8f33831df 100644
--- a/src/org/traccar/protocol/TzoneProtocolDecoder.java
+++ b/src/org/traccar/protocol/TzoneProtocolDecoder.java
@@ -150,7 +150,7 @@ public class TzoneProtocolDecoder extends BaseProtocolDecoder {
                         length += 1;
                     }
 
-                    String num = ChannelBufferTools.readHexString(buf, length);
+                    String num = ChannelBuffers.hexDump(buf.readBytes(length / 2));
 
                     if (odd) {
                         num = num.substring(1);
diff --git a/test/org/traccar/helper/ChannelBufferToolsTest.java b/test/org/traccar/helper/ChannelBufferToolsTest.java
index 64f010ea5..6e2c6310c 100644
--- a/test/org/traccar/helper/ChannelBufferToolsTest.java
+++ b/test/org/traccar/helper/ChannelBufferToolsTest.java
@@ -14,16 +14,5 @@ public class ChannelBufferToolsTest {
                 ChannelBuffers.wrappedBuffer(buf), 5);
         assertEquals(1903, result);
     }
-    
-    @Test
-    public void testReadHexString() {
-        byte[] buf = {0x01, (byte) 0x90, 0x34};
-        String result = ChannelBufferTools.readHexString(
-                ChannelBuffers.wrappedBuffer(buf), 5);
-        assertEquals("01903", result);
-        
-        result = String.valueOf(Long.parseLong(result));
-        assertEquals("1903", result);
-    }
 
 }
-- 
cgit v1.2.3