aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2016-05-16 12:41:29 +0500
committerAbyss777 <abyss@fox5.ru>2016-05-16 12:41:29 +0500
commit4915e5e1fd8f3fa440a3cac18679b42f495e7d1d (patch)
tree20e4fc2d192b060f7fabc4b1d0b1a526cee29837
parent1df49e504686ba324b9d31aba9d730ab6bf8bf33 (diff)
downloadtrackermap-server-4915e5e1fd8f3fa440a3cac18679b42f495e7d1d.tar.gz
trackermap-server-4915e5e1fd8f3fa440a3cac18679b42f495e7d1d.tar.bz2
trackermap-server-4915e5e1fd8f3fa440a3cac18679b42f495e7d1d.zip
Code style fixes
-rw-r--r--src/org/traccar/protocol/WondexProtocol.java4
-rw-r--r--src/org/traccar/protocol/WondexProtocolEncoder.java54
-rw-r--r--test/org/traccar/protocol/WondexProtocolEncoderTest.java4
3 files changed, 31 insertions, 31 deletions
diff --git a/src/org/traccar/protocol/WondexProtocol.java b/src/org/traccar/protocol/WondexProtocol.java
index 0049429b7..639669767 100644
--- a/src/org/traccar/protocol/WondexProtocol.java
+++ b/src/org/traccar/protocol/WondexProtocol.java
@@ -50,9 +50,9 @@ public class WondexProtocol extends BaseProtocol {
serverList.add(new TrackerServer(new ConnectionlessBootstrap(), this.getName()) {
@Override
protected void addSpecificHandlers(ChannelPipeline pipeline) {
- pipeline.addLast("stringEncoder", new StringEncoder());
+ pipeline.addLast("stringEncoder", new StringEncoder());
pipeline.addLast("stringDecoder", new StringDecoder());
- pipeline.addLast("objectEncoder", new WondexProtocolEncoder());
+ pipeline.addLast("objectEncoder", new WondexProtocolEncoder());
pipeline.addLast("objectDecoder", new WondexProtocolDecoder(WondexProtocol.this));
}
});
diff --git a/src/org/traccar/protocol/WondexProtocolEncoder.java b/src/org/traccar/protocol/WondexProtocolEncoder.java
index 628546760..c8bc58b40 100644
--- a/src/org/traccar/protocol/WondexProtocolEncoder.java
+++ b/src/org/traccar/protocol/WondexProtocolEncoder.java
@@ -1,27 +1,27 @@
-package org.traccar.protocol;
-
-import org.traccar.StringProtocolEncoder;
-import org.traccar.helper.Log;
-import org.traccar.model.Command;;
-
-public class WondexProtocolEncoder extends StringProtocolEncoder {
- @Override
- protected Object encodeCommand(Command command) {
-
- // Temporary put default password
- command.set(Command.KEY_DEVICE_PASSWORD, "0000");
-
- switch (command.getType()) {
- case Command.TYPE_REBOOT_DEVICE:
- return formatCommand(command, "$WP+REBOOT={%s}", Command.KEY_DEVICE_PASSWORD);
- case Command.TYPE_POSITION_SINGLE:
- return formatCommand(command, "$WP+GETLOCATION={%s}", Command.KEY_DEVICE_PASSWORD);
- default:
- Log.warning(new UnsupportedOperationException(command.getType()));
- break;
- }
-
- return null;
- }
-
-}
+package org.traccar.protocol;
+
+import org.traccar.StringProtocolEncoder;
+import org.traccar.helper.Log;
+import org.traccar.model.Command;;
+
+public class WondexProtocolEncoder extends StringProtocolEncoder {
+ @Override
+ protected Object encodeCommand(Command command) {
+
+ // Temporary put default password
+ command.set(Command.KEY_DEVICE_PASSWORD, "0000");
+
+ switch (command.getType()) {
+ case Command.TYPE_REBOOT_DEVICE:
+ return formatCommand(command, "$WP+REBOOT={%s}", Command.KEY_DEVICE_PASSWORD);
+ case Command.TYPE_POSITION_SINGLE:
+ return formatCommand(command, "$WP+GETLOCATION={%s}", Command.KEY_DEVICE_PASSWORD);
+ default:
+ Log.warning(new UnsupportedOperationException(command.getType()));
+ break;
+ }
+
+ return null;
+ }
+
+}
diff --git a/test/org/traccar/protocol/WondexProtocolEncoderTest.java b/test/org/traccar/protocol/WondexProtocolEncoderTest.java
index b898b2c8a..fb038a18b 100644
--- a/test/org/traccar/protocol/WondexProtocolEncoderTest.java
+++ b/test/org/traccar/protocol/WondexProtocolEncoderTest.java
@@ -10,12 +10,12 @@ public class WondexProtocolEncoderTest extends ProtocolTest {
public void testEncode() throws Exception {
WondexProtocolEncoder encoder = new WondexProtocolEncoder();
-
+
Command command = new Command();
command.setDeviceId(2);
command.setType(Command.TYPE_POSITION_SINGLE);
command.set(Command.KEY_DEVICE_PASSWORD, "0000");
-
+
Assert.assertEquals("$WP+GETLOCATION=0000", encoder.encodeCommand(command));
}