Merge pull request #918 from jon-stumpf/enhancement-eliminate-hardcoded-protocol-names

Eliminate hardcoded protocol names

1 files changed, 7 insertions, 4 deletions

diff --git a/src/org/traccar/protocol/Ev603ProtocolDecoder.java b/src/org/traccar/protocol/Ev603ProtocolDecoder.java
index a57a0e79b..7c596d479 100644
--- a/src/org/traccar/protocol/Ev603ProtocolDecoder.java
+++ b/src/org/traccar/protocol/Ev603ProtocolDecoder.java
@@ -17,13 +17,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;

@@ -32,8 +35,8 @@ public class Ev603ProtocolDecoder extends BaseProtocolDecoder{
 

     private Long deviceId;

 

-    public Ev603ProtocolDecoder(ServerManager serverManager) {

-        super(serverManager);

+    public Ev603ProtocolDecoder(DataManager dataManager, String protocol, Properties properties) {

+        super(dataManager, protocol, properties);

     }

 

     private static final Pattern pattern = Pattern.compile(

@@ -74,7 +77,7 @@ public class Ev603ProtocolDecoder extends BaseProtocolDecoder{
             // Create new position

             Position position = new Position();

             position.setDeviceId(deviceId);

-            ExtendedInfoFormatter extendedInfo = new ExtendedInfoFormatter("ev603");

+            ExtendedInfoFormatter extendedInfo = new ExtendedInfoFormatter(getProtocol());

             Integer index = 1;

 

             // Date