From 23099b942619a2470e6ad5dace4146cecf16f300 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sun, 4 Mar 2012 10:36:01 +0000 Subject: --- src/org/traccar/DataManager.java | 2 +- src/org/traccar/Device.java | 2 +- src/org/traccar/Position.java | 2 +- src/org/traccar/Server.java | 2 +- src/org/traccar/TrackerEventHandler.java | 2 +- src/org/traccar/TrackerServer.java | 2 +- src/org/traccar/helper/AdvancedConnection.java | 2 +- src/org/traccar/helper/NamedParameterStatement.java | 2 +- src/org/traccar/protocol/gl100/Gl100ProtocolDecoder.java | 2 +- src/org/traccar/protocol/gl200/Gl200ProtocolDecoder.java | 2 +- src/org/traccar/protocol/gps103/Gps103ProtocolDecoder.java | 2 +- src/org/traccar/protocol/t55/T55ProtocolDecoder.java | 10 +++++----- src/org/traccar/protocol/tk103/Tk103ProtocolDecoder.java | 2 +- src/org/traccar/protocol/xexun/XexunFrameDecoder.java | 2 +- src/org/traccar/protocol/xexun/XexunProtocolDecoder.java | 2 +- src/org/traccar/protocol/xexun2/Xexun2ProtocolDecoder.java | 2 +- 16 files changed, 20 insertions(+), 20 deletions(-) (limited to 'src/org/traccar') diff --git a/src/org/traccar/DataManager.java b/src/org/traccar/DataManager.java index c2ba588cd..9fc873bdb 100644 --- a/src/org/traccar/DataManager.java +++ b/src/org/traccar/DataManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2010 Anton Tananaev (anton@tananaev.com) + * 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. diff --git a/src/org/traccar/Device.java b/src/org/traccar/Device.java index ad952bac8..bf77d2e91 100644 --- a/src/org/traccar/Device.java +++ b/src/org/traccar/Device.java @@ -1,5 +1,5 @@ /* - * Copyright 2010 Anton Tananaev (anton@tananaev.com) + * 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. diff --git a/src/org/traccar/Position.java b/src/org/traccar/Position.java index a4e15cede..79191c4d5 100644 --- a/src/org/traccar/Position.java +++ b/src/org/traccar/Position.java @@ -1,5 +1,5 @@ /* - * Copyright 2010 Anton Tananaev (anton@tananaev.com) + * 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. diff --git a/src/org/traccar/Server.java b/src/org/traccar/Server.java index 94e6f7ac3..4ba9ec9fa 100644 --- a/src/org/traccar/Server.java +++ b/src/org/traccar/Server.java @@ -1,5 +1,5 @@ /* - * Copyright 2010 Anton Tananaev (anton@tananaev.com) + * 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. diff --git a/src/org/traccar/TrackerEventHandler.java b/src/org/traccar/TrackerEventHandler.java index 78be1b340..4750c14c1 100644 --- a/src/org/traccar/TrackerEventHandler.java +++ b/src/org/traccar/TrackerEventHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2010 Anton Tananaev (anton@tananaev.com) + * 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. diff --git a/src/org/traccar/TrackerServer.java b/src/org/traccar/TrackerServer.java index 20beaec5e..6f602d365 100644 --- a/src/org/traccar/TrackerServer.java +++ b/src/org/traccar/TrackerServer.java @@ -1,5 +1,5 @@ /* - * Copyright 2010 Anton Tananaev (anton@tananaev.com) + * 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. diff --git a/src/org/traccar/helper/AdvancedConnection.java b/src/org/traccar/helper/AdvancedConnection.java index 4b91ee1f5..30be4dba8 100644 --- a/src/org/traccar/helper/AdvancedConnection.java +++ b/src/org/traccar/helper/AdvancedConnection.java @@ -1,5 +1,5 @@ /* - * Copyright 2010 Anton Tananaev (anton@tananaev.com) + * 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. diff --git a/src/org/traccar/helper/NamedParameterStatement.java b/src/org/traccar/helper/NamedParameterStatement.java index 5fbc57d78..0e84e9827 100644 --- a/src/org/traccar/helper/NamedParameterStatement.java +++ b/src/org/traccar/helper/NamedParameterStatement.java @@ -1,5 +1,5 @@ /* - * Copyright 2010 Anton Tananaev (anton@tananaev.com) + * 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. diff --git a/src/org/traccar/protocol/gl100/Gl100ProtocolDecoder.java b/src/org/traccar/protocol/gl100/Gl100ProtocolDecoder.java index 25ce737fc..f762753b4 100644 --- a/src/org/traccar/protocol/gl100/Gl100ProtocolDecoder.java +++ b/src/org/traccar/protocol/gl100/Gl100ProtocolDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright 2010 Anton Tananaev (anton@tananaev.com) + * 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. diff --git a/src/org/traccar/protocol/gl200/Gl200ProtocolDecoder.java b/src/org/traccar/protocol/gl200/Gl200ProtocolDecoder.java index a6daa141a..984eb91d8 100644 --- a/src/org/traccar/protocol/gl200/Gl200ProtocolDecoder.java +++ b/src/org/traccar/protocol/gl200/Gl200ProtocolDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright 2010 Anton Tananaev (anton@tananaev.com) + * 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. diff --git a/src/org/traccar/protocol/gps103/Gps103ProtocolDecoder.java b/src/org/traccar/protocol/gps103/Gps103ProtocolDecoder.java index 7c11e939f..46a089057 100644 --- a/src/org/traccar/protocol/gps103/Gps103ProtocolDecoder.java +++ b/src/org/traccar/protocol/gps103/Gps103ProtocolDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright 2010 Anton Tananaev (anton@tananaev.com) + * 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. diff --git a/src/org/traccar/protocol/t55/T55ProtocolDecoder.java b/src/org/traccar/protocol/t55/T55ProtocolDecoder.java index 8247b9fd4..ad674d4a8 100644 --- a/src/org/traccar/protocol/t55/T55ProtocolDecoder.java +++ b/src/org/traccar/protocol/t55/T55ProtocolDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright 2010 Anton Tananaev (anton@tananaev.com) + * 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. @@ -32,7 +32,7 @@ import org.jboss.netty.channel.ChannelState; import org.jboss.netty.channel.ChannelStateEvent; /** - * Gps 103 tracker protocol decoder + * T55 tracker protocol decoder */ public class T55ProtocolDecoder extends OneToOneDecoder { @@ -70,10 +70,10 @@ public class T55ProtocolDecoder extends OneToOneDecoder { "([NS])," + "(\\d{3})(\\d{2}.\\d{4})," + // Longitude (DDDMM.MMMM) "([EW])," + - "(\\d+.\\d{2})?," + // Speed - "(\\d+.\\d{2})?," + // Course + "(\\d+.\\d{2})?," + // Speed + "(\\d+.\\d{2})?," + // Course "(\\d{2})(\\d{2})(\\d{2})" + // Date (DDMMYY) - ".+"); // Other (Checksumm) + ".+"); // Other (Checksumm) /** * Decode message diff --git a/src/org/traccar/protocol/tk103/Tk103ProtocolDecoder.java b/src/org/traccar/protocol/tk103/Tk103ProtocolDecoder.java index de81faec5..bc5685ecd 100644 --- a/src/org/traccar/protocol/tk103/Tk103ProtocolDecoder.java +++ b/src/org/traccar/protocol/tk103/Tk103ProtocolDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright 2010 Anton Tananaev (anton@tananaev.com) + * 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. diff --git a/src/org/traccar/protocol/xexun/XexunFrameDecoder.java b/src/org/traccar/protocol/xexun/XexunFrameDecoder.java index f09fd337d..6fd32a4c5 100644 --- a/src/org/traccar/protocol/xexun/XexunFrameDecoder.java +++ b/src/org/traccar/protocol/xexun/XexunFrameDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright 2010 Anton Tananaev (anton@tananaev.com) + * 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. diff --git a/src/org/traccar/protocol/xexun/XexunProtocolDecoder.java b/src/org/traccar/protocol/xexun/XexunProtocolDecoder.java index 8102650cd..c73047576 100644 --- a/src/org/traccar/protocol/xexun/XexunProtocolDecoder.java +++ b/src/org/traccar/protocol/xexun/XexunProtocolDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright 2010 Anton Tananaev (anton@tananaev.com) + * 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. diff --git a/src/org/traccar/protocol/xexun2/Xexun2ProtocolDecoder.java b/src/org/traccar/protocol/xexun2/Xexun2ProtocolDecoder.java index 8f9fb7535..b8ed8a54f 100644 --- a/src/org/traccar/protocol/xexun2/Xexun2ProtocolDecoder.java +++ b/src/org/traccar/protocol/xexun2/Xexun2ProtocolDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright 2010 Anton Tananaev (anton@tananaev.com) + * 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. -- cgit v1.2.3