Migrate G protocols

1 files changed, 9 insertions, 9 deletions

diff --git a/src/org/traccar/protocol/Gps056FrameDecoder.java b/src/org/traccar/protocol/Gps056FrameDecoder.java
index 4ce83dc0a..7cfd54c4e 100644
--- a/src/org/traccar/protocol/Gps056FrameDecoder.java
+++ b/src/org/traccar/protocol/Gps056FrameDecoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Anton Tananaev (anton@traccar.org)
+ * Copyright 2017 - 2018 Anton Tananaev (anton@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,26 +15,26 @@
  */
 package org.traccar.protocol;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.handler.codec.frame.FrameDecoder;
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import org.traccar.BaseFrameDecoder;
 
 import java.nio.charset.StandardCharsets;
 
-public class Gps056FrameDecoder extends FrameDecoder {
+public class Gps056FrameDecoder extends BaseFrameDecoder {
 
     private static final int MESSAGE_HEADER = 4;
 
     @Override
     protected Object decode(
-            ChannelHandlerContext ctx, Channel channel, ChannelBuffer buf) throws Exception {
+            ChannelHandlerContext ctx, Channel channel, ByteBuf buf) throws Exception {
 
         if (buf.readableBytes() >= MESSAGE_HEADER) {
             int length = Integer.parseInt(buf.toString(2, 2, StandardCharsets.US_ASCII)) + 5;
             if (buf.readableBytes() >= length) {
-                ChannelBuffer frame = buf.readBytes(length);
-                while (buf.readable() && buf.getUnsignedByte(buf.readerIndex()) != '$') {
+                ByteBuf frame = buf.readBytes(length);
+                while (buf.isReadable() && buf.getUnsignedByte(buf.readerIndex()) != '$') {
                     buf.readByte();
                 }
                 return frame;