aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2013-04-26 19:57:44 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2013-04-26 19:57:44 +1200
commit1cd60e56770fd3643be9e3dd163198e8b84992a7 (patch)
tree68ec8810dc9a70300dd8b29f773147a2bef598f5
parent91e64abefb70be18d842181f75c7e392d68057f0 (diff)
downloadtrackermap-server-1cd60e56770fd3643be9e3dd163198e8b84992a7.tar.gz
trackermap-server-1cd60e56770fd3643be9e3dd163198e8b84992a7.tar.bz2
trackermap-server-1cd60e56770fd3643be9e3dd163198e8b84992a7.zip
Rename ST210 to St210
-rw-r--r--src/org/traccar/ServerManager.java2
-rw-r--r--src/org/traccar/protocol/St210ProtocolDecoder.java (renamed from src/org/traccar/protocol/ST210ProtocolDecoder.java)6
-rw-r--r--test/org/traccar/protocol/St210ProtocolDecoderTest.java (renamed from test/org/traccar/protocol/ST210ProtocolDecoderTest.java)5
3 files changed, 6 insertions, 7 deletions
diff --git a/src/org/traccar/ServerManager.java b/src/org/traccar/ServerManager.java
index 34c903cc5..48dd2ddc8 100644
--- a/src/org/traccar/ServerManager.java
+++ b/src/org/traccar/ServerManager.java
@@ -416,7 +416,7 @@ public class ServerManager {
pipeline.addLast("frameDecoder",
new DelimiterBasedFrameDecoder(1024, ChannelBuffers.wrappedBuffer(delimiter)));
pipeline.addLast("stringDecoder", new StringDecoder());
- pipeline.addLast("objectDecoder", new ST210ProtocolDecoder(ServerManager.this));
+ pipeline.addLast("objectDecoder", new St210ProtocolDecoder(ServerManager.this));
}
});
}
diff --git a/src/org/traccar/protocol/ST210ProtocolDecoder.java b/src/org/traccar/protocol/St210ProtocolDecoder.java
index d8d42eed6..bea7d1ad6 100644
--- a/src/org/traccar/protocol/ST210ProtocolDecoder.java
+++ b/src/org/traccar/protocol/St210ProtocolDecoder.java
@@ -14,10 +14,10 @@ import org.traccar.helper.Log;
import org.traccar.model.DataManager;
import org.traccar.model.Position;
-public class ST210ProtocolDecoder extends BaseProtocolDecoder {
+public class St210ProtocolDecoder extends BaseProtocolDecoder {
- public ST210ProtocolDecoder(ServerManager serverManager) {
+ public St210ProtocolDecoder(ServerManager serverManager) {
super(serverManager);
}
@@ -482,7 +482,7 @@ public class ST210ProtocolDecoder extends BaseProtocolDecoder {
return null;
}
- public static Pattern getPattern(List<ST210FIELDS> protocol) {
+ private static Pattern getPattern(List<ST210FIELDS> protocol) {
String patternStr = "";
diff --git a/test/org/traccar/protocol/ST210ProtocolDecoderTest.java b/test/org/traccar/protocol/St210ProtocolDecoderTest.java
index d84993b95..d49976021 100644
--- a/test/org/traccar/protocol/ST210ProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/St210ProtocolDecoderTest.java
@@ -2,15 +2,14 @@ package org.traccar.protocol;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
-
import org.junit.Test;
-public class ST210ProtocolDecoderTest {
+public class St210ProtocolDecoderTest {
@Test
public void testDecode() throws Exception {
- ST210ProtocolDecoder decoder = new ST210ProtocolDecoder(null);
+ St210ProtocolDecoder decoder = new St210ProtocolDecoder(null);
decoder.setDataManager(new TestDataManager());
//Status