From b5bd3e35f563825c9d40eaa04c02bc6397029219 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Tue, 15 Jan 2013 00:19:39 +1300
Subject: Pass ServerManager to every protocol decoder

---
 .../traccar/protocol/MeitrackProtocolDecoder.java    | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/org/traccar/protocol/MeitrackProtocolDecoder.java')

diff --git a/src/org/traccar/protocol/MeitrackProtocolDecoder.java b/src/org/traccar/protocol/MeitrackProtocolDecoder.java
index 6bb9a915f..87d222c37 100644
--- a/src/org/traccar/protocol/MeitrackProtocolDecoder.java
+++ b/src/org/traccar/protocol/MeitrackProtocolDecoder.java
@@ -21,21 +21,21 @@ 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.GenericProtocolDecoder;
+import org.traccar.BaseProtocolDecoder;
+import org.traccar.ServerManager;
 import org.traccar.helper.Log;
-import org.traccar.model.DataManager;
 import org.traccar.model.Position;
 
 /**
  * Meitrack protocol decoder
  */
-public class MeitrackProtocolDecoder extends GenericProtocolDecoder {
+public class MeitrackProtocolDecoder extends BaseProtocolDecoder {
 
     /**
      * Initialize
      */
-    public MeitrackProtocolDecoder(DataManager dataManager) {
-        super(dataManager);
+    public MeitrackProtocolDecoder(ServerManager serverManager) {
+        super(serverManager);
     }
 
     /**
@@ -94,11 +94,11 @@ public class MeitrackProtocolDecoder extends GenericProtocolDecoder {
         extendedInfo.append("<event>");
         extendedInfo.append(parser.group(index++));
         extendedInfo.append("</event>");
-        
+
         // Coordinates
         position.setLatitude(Double.valueOf(parser.group(index++)));
         position.setLongitude(Double.valueOf(parser.group(index++)));
-        
+
         // Time
         Calendar time = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
         time.clear();
@@ -109,10 +109,10 @@ public class MeitrackProtocolDecoder extends GenericProtocolDecoder {
         time.set(Calendar.MINUTE, Integer.valueOf(parser.group(index++)));
         time.set(Calendar.SECOND, Integer.valueOf(parser.group(index++)));
         position.setTime(time.getTime());
-        
+
         // Validity
         position.setValid(parser.group(index++).compareTo("A") == 0 ? true : false);
-        
+
         // Satellites
         extendedInfo.append("<satellites>");
         extendedInfo.append(parser.group(index++));
@@ -136,7 +136,7 @@ public class MeitrackProtocolDecoder extends GenericProtocolDecoder {
 
         // Altitude
         position.setAltitude(Double.valueOf(parser.group(index++)));
-        
+
         // Milage
         extendedInfo.append("<milage>");
         extendedInfo.append(parser.group(index++));
-- 
cgit v1.2.3