2 files changed, 0 insertions, 220 deletions
diff --git a/src/org/traccar/protocol/xexun/XexunFrameDecoder.java b/src/org/traccar/protocol/xexun/XexunFrameDecoder.java
deleted file mode 100644
index 6fd32a4c5..000000000
--- a/src/org/traccar/protocol/xexun/XexunFrameDecoder.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright 2012 Anton Tananaev (anton.tananaev@gmail.com)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.traccar.protocol.xexun;
-
-import org.jboss.netty.handler.codec.frame.FrameDecoder;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.buffer.ChannelBuffer;
-
-public class XexunFrameDecoder extends FrameDecoder {
-
-    /**
-     * Find string in network buffer
-     */
-    private static Integer find(
-            ChannelBuffer buf,
-            Integer start,
-            Integer length,
-            String subString) {
-
-        int index = start;
-        boolean match;
-
-        for (; index < length; index++) {
-            match = true;
-
-            for (int i = 0; i < subString.length(); i++) {
-                char c = (char) buf.getByte(index + i);
-                if (c != subString.charAt(i)) {
-                    match = false;
-                    break;
-                }
-            }
-
-            if (match) {
-                return index;
-            }
-        }
-
-        return null;
-    }
-
-    protected Object decode(
-            ChannelHandlerContext ctx,
-            Channel channel,
-            ChannelBuffer buf) throws Exception {
-
-        // Check minimum length
-        int length = buf.readableBytes();
-        if (length < 100) {
-            return null;
-        }
-
-        // Find start
-        Integer beginIndex = find(buf, 0, length, "GPRMC");
-        if (beginIndex == null) {
-            return null;
-        }
-
-        // Find identifier
-        Integer idIndex = find(buf, beginIndex, length, "imei:");
-        if (idIndex == null) {
-            return null;
-        }
-
-        // Find end
-        Integer endIndex = find(buf, idIndex, length, ",");
-        if (endIndex == null) {
-            return null;
-        }
-
-        // Read buffer
-        buf.skipBytes(beginIndex);
-        ChannelBuffer frame = buf.readBytes(endIndex - beginIndex + 1);
-
-        return frame;
-    }
-
-}
diff --git a/src/org/traccar/protocol/xexun/XexunProtocolDecoder.java b/src/org/traccar/protocol/xexun/XexunProtocolDecoder.java
deleted file mode 100644
index 46b88f8a3..000000000
--- a/src/org/traccar/protocol/xexun/XexunProtocolDecoder.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright 2012 Anton Tananaev (anton.tananaev@gmail.com)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.traccar.protocol.xexun;
-
-import java.util.Calendar;
-import java.util.GregorianCalendar;
-import java.util.regex.Pattern;
-import java.util.regex.Matcher;
-import java.text.ParseException;
-import java.util.TimeZone;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.traccar.Position;
-import org.traccar.DataManager;
-import org.traccar.GenericProtocolDecoder;
-
-/**
- * Xexun tracker protocol decoder
- */
-public class XexunProtocolDecoder extends GenericProtocolDecoder {
-
-    /**
-     * Initialize
-     */
-    public XexunProtocolDecoder(DataManager dataManager, Integer resetDelay) {
-        super(dataManager, resetDelay);
-    }
-
-    /**
-     * Regular expressions pattern
-     */
-    static private Pattern pattern = Pattern.compile(
-            "GPRMC," +
-            "([\\d]{2})([\\d]{2})([\\d]{2}).([\\d]{3})," + // Time (HHMMSS.SSS)
-            "([AV])," +                         // Validity
-            "([\\d]{2})([\\d]{2}.[\\d]{4})," +  // Latitude (DDMM.MMMM)
-            "([NS])," +
-            "([\\d]{3})([\\d]{2}.[\\d]{4})," +  // Longitude (DDDMM.MMMM)
-            "([EW])," +
-            "([\\d]+.[\\d]+)," +                // Speed
-            "([\\d]+.[\\d]+)?," +               // Course
-            "([\\d]{2})([\\d]{2})([\\d]{2})," + // Date (DDMMYY)
-            ".*imei:" +
-            "([\\d]+),");                       // IMEI
-
-    /**
-     * Decode message
-     */
-    protected Object decode(
-            ChannelHandlerContext ctx, Channel channel, Object msg)
-            throws Exception {
-
-        // Parse message
-        String sentence = (String) msg;
-        Matcher parser = pattern.matcher(sentence);
-        if (!parser.matches()) {
-            throw new ParseException(null, 0);
-        }
-
-        // Create new position
-        Position position = new Position();
-
-        Integer index = 1;
-
-        // Time
-        Calendar time = new GregorianCalendar(TimeZone.getTimeZone("UTC"));
-        time.clear();
-        time.set(Calendar.HOUR, Integer.valueOf(parser.group(index++)));
-        time.set(Calendar.MINUTE, Integer.valueOf(parser.group(index++)));
-        time.set(Calendar.SECOND, Integer.valueOf(parser.group(index++)));
-        time.set(Calendar.MILLISECOND, Integer.valueOf(parser.group(index++)));
-
-        // Validity
-        position.setValid(parser.group(index++).compareTo("A") == 0 ? true : false);
-
-        // Latitude
-        Double latitude = Double.valueOf(parser.group(index++));
-        latitude += Double.valueOf(parser.group(index++)) / 60;
-        if (parser.group(index++).compareTo("S") == 0) latitude = -latitude;
-        position.setLatitude(latitude);
-
-        // Longitude
-        Double lonlitude = Double.valueOf(parser.group(index++));
-        lonlitude += Double.valueOf(parser.group(index++)) / 60;
-        if (parser.group(index++).compareTo("W") == 0) lonlitude = -lonlitude;
-        position.setLongitude(lonlitude);
-
-        // Altitude
-        position.setAltitude(0.0);
-        
-        // Speed
-        position.setSpeed(Double.valueOf(parser.group(index++)));
-
-        // Course
-        String course = parser.group(index++);
-        if (course != null) {
-            position.setCourse(Double.valueOf(course));
-        } else {
-            position.setCourse(0.0);
-        }
-
-        // Date
-        time.set(Calendar.DAY_OF_MONTH, Integer.valueOf(parser.group(index++)));
-        time.set(Calendar.MONTH, Integer.valueOf(parser.group(index++)) - 1);
-        time.set(Calendar.YEAR, 2000 + Integer.valueOf(parser.group(index++)));
-        position.setTime(time.getTime());
-
-        // Get device by IMEI
-        String imei = parser.group(index++);
-        position.setDeviceId(getDataManager().getDeviceByImei(imei).getId());
-
-        return position;
-    }
-
-}