aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-11-01 18:41:40 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2015-11-01 18:41:40 +1300
commitbf57bcad19ff56a6c96b1436356fc30beabd3eeb (patch)
treefd07225df8a58befea685d1150ba8efc6b1658a2
parent966082dc8f7068e74a439f98c4f668f63f37e35f (diff)
downloadtrackermap-server-bf57bcad19ff56a6c96b1436356fc30beabd3eeb.tar.gz
trackermap-server-bf57bcad19ff56a6c96b1436356fc30beabd3eeb.tar.bz2
trackermap-server-bf57bcad19ff56a6c96b1436356fc30beabd3eeb.zip
Rename T800X decoder classes
-rw-r--r--debug.xml1
-rw-r--r--src/org/traccar/protocol/T800xProtocol.java5
-rw-r--r--src/org/traccar/protocol/T800xProtocolDecoder.java (renamed from src/org/traccar/protocol/T800XProtocolDecoder.java)4
-rw-r--r--test/org/traccar/protocol/T800xProtocolDecoderTest.java (renamed from test/org/traccar/protocol/T800XProtocolDecoderTest.java)7
4 files changed, 6 insertions, 11 deletions
diff --git a/debug.xml b/debug.xml
index a5951ddd4..1abb97e07 100644
--- a/debug.xml
+++ b/debug.xml
@@ -335,5 +335,6 @@
<entry key='blackkite.port'>5091</entry>
<entry key='adm.port'>5092</entry>
<entry key='watch.port'>5093</entry>
+ <entry key='t800x.port'>5094</entry>
</properties>
diff --git a/src/org/traccar/protocol/T800xProtocol.java b/src/org/traccar/protocol/T800xProtocol.java
index 51cb64e8c..599123df2 100644
--- a/src/org/traccar/protocol/T800xProtocol.java
+++ b/src/org/traccar/protocol/T800xProtocol.java
@@ -17,9 +17,6 @@ package org.traccar.protocol;
import org.jboss.netty.bootstrap.ServerBootstrap;
import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.handler.codec.frame.LineBasedFrameDecoder;
-import org.jboss.netty.handler.codec.string.StringDecoder;
-import org.jboss.netty.handler.codec.string.StringEncoder;
import org.traccar.BaseProtocol;
import org.traccar.TrackerServer;
@@ -36,7 +33,7 @@ public class T800xProtocol extends BaseProtocol {
serverList.add(new TrackerServer(new ServerBootstrap(), getName()) {
@Override
protected void addSpecificHandlers(ChannelPipeline pipeline) {
- pipeline.addLast("objectDecoder", new T800XProtocolDecoder(T800xProtocol.this));
+ pipeline.addLast("objectDecoder", new T800xProtocolDecoder(T800xProtocol.this));
}
});
}
diff --git a/src/org/traccar/protocol/T800XProtocolDecoder.java b/src/org/traccar/protocol/T800xProtocolDecoder.java
index c42b16f39..654d52eda 100644
--- a/src/org/traccar/protocol/T800XProtocolDecoder.java
+++ b/src/org/traccar/protocol/T800xProtocolDecoder.java
@@ -15,9 +15,9 @@ import java.net.SocketAddress;
import java.text.SimpleDateFormat;
import java.util.*;
-public class T800XProtocolDecoder extends BaseProtocolDecoder {
+public class T800xProtocolDecoder extends BaseProtocolDecoder {
- public T800XProtocolDecoder(T800xProtocol protocol) {
+ public T800xProtocolDecoder(T800xProtocol protocol) {
super(protocol);
}
diff --git a/test/org/traccar/protocol/T800XProtocolDecoderTest.java b/test/org/traccar/protocol/T800xProtocolDecoderTest.java
index 091562a73..7bb149ae6 100644
--- a/test/org/traccar/protocol/T800XProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/T800xProtocolDecoderTest.java
@@ -5,15 +5,12 @@ import org.jboss.netty.buffer.ChannelBuffers;
import org.junit.Test;
import org.traccar.helper.ChannelBufferTools;
-/**
- * Created by Ankit on 21-10-2015.
- */
-public class T800XProtocolDecoderTest extends TestCase {
+public class T800xProtocolDecoderTest extends TestCase {
@Test
public void testDecode() throws Exception {
- /*T800XProtocolDecoder decoder = new T800XProtocolDecoder(new TestDataManager(), null, null);
+ /*T800xProtocolDecoder decoder = new T800xProtocolDecoder(new TestDataManager(), null, null);
assertNull(decoder.decode(null, null, ChannelBuffers.wrappedBuffer(ChannelBufferTools.convertHexString(
"232301001500020357367031063979150208625010"))));