aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/protocol/CarscopProtocolDecoder.java
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2014-10-22 09:43:19 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2014-10-22 09:43:19 +1300
commit91395e9ac0dd5de366b87bb5d082990b15a946e9 (patch)
tree57aea8c58bbd8d197d61e6b7013937c44f950de7 /src/org/traccar/protocol/CarscopProtocolDecoder.java
parent8876e964cf26a090d11fd855642c95bc02a17c7f (diff)
parent0d59336ac1fbe9934260e56811c3bcafa0aeaeca (diff)
downloadtrackermap-server-91395e9ac0dd5de366b87bb5d082990b15a946e9.tar.gz
trackermap-server-91395e9ac0dd5de366b87bb5d082990b15a946e9.tar.bz2
trackermap-server-91395e9ac0dd5de366b87bb5d082990b15a946e9.zip
Merge pull request #918 from jon-stumpf/enhancement-eliminate-hardcoded-protocol-names
Eliminate hardcoded protocol names
Diffstat (limited to 'src/org/traccar/protocol/CarscopProtocolDecoder.java')
-rw-r--r--src/org/traccar/protocol/CarscopProtocolDecoder.java11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/org/traccar/protocol/CarscopProtocolDecoder.java b/src/org/traccar/protocol/CarscopProtocolDecoder.java
index 9748b2e09..e56036d0b 100644
--- a/src/org/traccar/protocol/CarscopProtocolDecoder.java
+++ b/src/org/traccar/protocol/CarscopProtocolDecoder.java
@@ -16,13 +16,16 @@
package org.traccar.protocol;
import java.util.Calendar;
+import java.util.Properties;
import java.util.TimeZone;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+
import org.jboss.netty.channel.Channel;
import org.jboss.netty.channel.ChannelHandlerContext;
+
import org.traccar.BaseProtocolDecoder;
-import org.traccar.ServerManager;
+import org.traccar.database.DataManager;
import org.traccar.helper.Log;
import org.traccar.model.ExtendedInfoFormatter;
import org.traccar.model.Position;
@@ -31,8 +34,8 @@ public class CarscopProtocolDecoder extends BaseProtocolDecoder {
private Long deviceId;
- public CarscopProtocolDecoder(ServerManager serverManager) {
- super(serverManager);
+ public CarscopProtocolDecoder(DataManager dataManager, String protocol, Properties properties) {
+ super(dataManager, protocol, properties);
}
// Very similar to TK103 protocol
@@ -80,7 +83,7 @@ public class CarscopProtocolDecoder extends BaseProtocolDecoder {
// Create new position
Position position = new Position();
position.setDeviceId(deviceId);
- ExtendedInfoFormatter extendedInfo = new ExtendedInfoFormatter("carscop");
+ ExtendedInfoFormatter extendedInfo = new ExtendedInfoFormatter(getProtocol());
index = 1;
// Time