Change protocol name to correct one

6 files changed, 10 insertions, 11 deletions

diff --git a/debug.xml b/debug.xml
index 37a9dc92c..f80a50c25 100644
--- a/debug.xml
+++ b/debug.xml
@@ -305,6 +305,6 @@
     <entry key='arknav.port'>5107</entry>
     <entry key='supermate.port'>5108</entry>
     <entry key='appello.port'>5109</entry>
-    <entry key='ldpl.port'>5110</entry>
+    <entry key='idpl.port'>5110</entry>
 
 </properties>
diff --git a/setup/unix/traccar.xml b/setup/unix/traccar.xml
index bcb9a79e5..03ba845fc 100644
--- a/setup/unix/traccar.xml
+++ b/setup/unix/traccar.xml
@@ -297,6 +297,6 @@
     <entry key='arknav.port'>5107</entry>
     <entry key='supermate.port'>5108</entry>
     <entry key='appello.port'>5109</entry>
-    <entry key='ldpl.port'>5110</entry>
+    <entry key='idpl.port'>5110</entry>
 
 </properties>
diff --git a/setup/windows/traccar.xml b/setup/windows/traccar.xml
index 9191c5ffb..71f56f4c7 100644
--- a/setup/windows/traccar.xml
+++ b/setup/windows/traccar.xml
@@ -297,6 +297,6 @@
     <entry key='arknav.port'>5107</entry>

     <entry key='supermate.port'>5108</entry>

     <entry key='appello.port'>5109</entry>

-    <entry key='ldpl.port'>5110</entry>

+    <entry key='idpl.port'>5110</entry>

 

 </properties>

diff --git a/src/org/traccar/protocol/LdplProtocol.java b/src/org/traccar/protocol/IdplProtocol.java
index 01780a645..c35ae039d 100644
--- a/src/org/traccar/protocol/LdplProtocol.java
+++ b/src/org/traccar/protocol/IdplProtocol.java
@@ -17,7 +17,6 @@ package org.traccar.protocol;
 
 import java.util.List;
 
-import org.jboss.netty.bootstrap.ConnectionlessBootstrap;
 import org.jboss.netty.bootstrap.ServerBootstrap;
 import org.jboss.netty.channel.ChannelPipeline;
 import org.jboss.netty.handler.codec.frame.LineBasedFrameDecoder;
@@ -26,9 +25,9 @@ import org.jboss.netty.handler.codec.string.StringEncoder;
 import org.traccar.BaseProtocol;
 import org.traccar.TrackerServer;
 
-public class LdplProtocol extends BaseProtocol {
+public class IdplProtocol extends BaseProtocol {
 
-    public LdplProtocol() {
+    public IdplProtocol() {
         super("ldpl");
     }
 
@@ -40,7 +39,7 @@ public class LdplProtocol extends BaseProtocol {
                 pipeline.addLast("frameDecoder", new LineBasedFrameDecoder(1024));
                 pipeline.addLast("stringEncoder", new StringEncoder());
                 pipeline.addLast("stringDecoder", new StringDecoder());
-                pipeline.addLast("objectDecoder", new LdplProtocolDecoder(LdplProtocol.this));
+                pipeline.addLast("objectDecoder", new IdplProtocolDecoder(IdplProtocol.this));
             }
         });
     }
diff --git a/src/org/traccar/protocol/LdplProtocolDecoder.java b/src/org/traccar/protocol/IdplProtocolDecoder.java
index 5b14fc118..1824111b4 100644
--- a/src/org/traccar/protocol/LdplProtocolDecoder.java
+++ b/src/org/traccar/protocol/IdplProtocolDecoder.java
@@ -27,9 +27,9 @@ import org.traccar.helper.Parser.CoordinateFormat;
 import org.traccar.helper.PatternBuilder;
 import org.traccar.model.Position;
 
-public class LdplProtocolDecoder extends BaseProtocolDecoder {
+public class IdplProtocolDecoder extends BaseProtocolDecoder {
 
-    public LdplProtocolDecoder(Protocol protocol) {
+    public IdplProtocolDecoder(Protocol protocol) {
         super(protocol);
     }
 
diff --git a/test/org/traccar/protocol/LdplProtocolDecoderTest.java b/test/org/traccar/protocol/IdplProtocolDecoderTest.java
index bfe196b81..4340ebc3d 100644
--- a/test/org/traccar/protocol/LdplProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/IdplProtocolDecoderTest.java
@@ -3,12 +3,12 @@ package org.traccar.protocol;
 import org.junit.Test;
 import org.traccar.ProtocolTest;
 
-public class LdplProtocolDecoderTest extends ProtocolTest {
+public class IdplProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
 
-        LdplProtocolDecoder decoder = new LdplProtocolDecoder(new LdplProtocol());
+        IdplProtocolDecoder decoder = new IdplProtocolDecoder(new IdplProtocol());
         
         verifyPosition(decoder, text(
                 "*ID1,863071011086474,210314,153218,A,1831.4577,N,07351.1433,E,0.79,240.64,9,20,A,1,4.20,0,1,01,1,0,0,A01,R,935D#"),