Fixed wrong order of input, unused import and changed name of protocol

2 files changed, 7 insertions, 7 deletions

diff --git a/src/org/traccar/protocol/GlobeKeeperProtocol.java b/src/org/traccar/protocol/AustinNBProtocol.java
index 9231c067c..c250e9b3d 100644
--- a/src/org/traccar/protocol/GlobeKeeperProtocol.java
+++ b/src/org/traccar/protocol/AustinNBProtocol.java
@@ -24,10 +24,10 @@ import org.traccar.TrackerServer;
 
 import java.util.List;
 
-public class GlobeKeeperProtocol extends BaseProtocol {
+public class AustinNBProtocol extends BaseProtocol {
 
-    public GlobeKeeperProtocol() {
-        super("globekeeper");
+    public AustinNBProtocol() {
+        super("austinnb");
     }
 
     @Override
@@ -37,7 +37,7 @@ public class GlobeKeeperProtocol extends BaseProtocol {
             protected void addSpecificHandlers(ChannelPipeline pipeline) {
                 pipeline.addLast("stringEncoder", new StringEncoder());
                 pipeline.addLast("stringDecoder", new StringDecoder());
-                pipeline.addLast("objectDecoder", new GlobeKeeperProtocolDecoder(GlobeKeeperProtocol.this));
+                pipeline.addLast("objectDecoder", new AustinNBProtocolDecoder(AustinNBProtocol.this));
             }
         });
     }
diff --git a/src/org/traccar/protocol/GlobeKeeperProtocolDecoder.java b/src/org/traccar/protocol/AustinNBProtocolDecoder.java
index c4daf4409..4c37ac9a2 100644
--- a/src/org/traccar/protocol/GlobeKeeperProtocolDecoder.java
+++ b/src/org/traccar/protocol/AustinNBProtocolDecoder.java
@@ -25,9 +25,9 @@ import org.traccar.model.Position;
 import java.net.SocketAddress;
 import java.util.regex.Pattern;
 
-public class GlobeKeeperProtocolDecoder extends BaseProtocolDecoder {
+public class AustinNBProtocolDecoder extends BaseProtocolDecoder {
 
-    public GlobeKeeperProtocolDecoder(GlobeKeeperProtocol protocol) {
+    public AustinNBProtocolDecoder(AustinNBProtocol protocol) {
         super(protocol);
     }
 
@@ -60,8 +60,8 @@ public class GlobeKeeperProtocolDecoder extends BaseProtocolDecoder {
         position.setTime(parser.nextDateTime());
 
         position.setValid(true);
-        position.setLongitude(Double.parseDouble(parser.next().replace(',', '.')));
         position.setLatitude(Double.parseDouble(parser.next().replace(',', '.')));
+        position.setLongitude(Double.parseDouble(parser.next().replace(',', '.')));
 
         return position;
     }