aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/protocol
diff options
context:
space:
mode:
authorninioe <ninioe@gmail.com>2016-07-19 09:07:23 +0300
committerninioe <ninioe@gmail.com>2016-07-19 09:07:23 +0300
commitef40f3317392068692606b484c6782b95b554cbf (patch)
tree41c48e6c87620a6444aed0ad5706a94e26b1662d /src/org/traccar/protocol
parent04627d7473e4ea21d6ecd950cbb3fdd6fa249429 (diff)
parentd3e063cf9de8a45bed4dfe87b73aadfd8d2edeab (diff)
downloadtrackermap-server-ef40f3317392068692606b484c6782b95b554cbf.tar.gz
trackermap-server-ef40f3317392068692606b484c6782b95b554cbf.tar.bz2
trackermap-server-ef40f3317392068692606b484c6782b95b554cbf.zip
Merge remote-tracking branch 'refs/remotes/tananaev/master'
Diffstat (limited to 'src/org/traccar/protocol')
-rw-r--r--src/org/traccar/protocol/CarcellProtocol.java52
-rw-r--r--src/org/traccar/protocol/CarcellProtocolDecoder.java166
-rw-r--r--src/org/traccar/protocol/CarcellProtocolEncoder.java40
-rw-r--r--src/org/traccar/protocol/Gt06ProtocolDecoder.java14
-rw-r--r--src/org/traccar/protocol/MegastekProtocolDecoder.java2
-rw-r--r--src/org/traccar/protocol/MiniFinderProtocolDecoder.java26
-rw-r--r--src/org/traccar/protocol/SuntechProtocol.java5
-rw-r--r--src/org/traccar/protocol/SuntechProtocolEncoder.java16
-rw-r--r--src/org/traccar/protocol/T800xProtocol.java6
-rw-r--r--src/org/traccar/protocol/T800xProtocolDecoder.java11
-rw-r--r--src/org/traccar/protocol/T800xProtocolEncoder.java63
11 files changed, 390 insertions, 11 deletions
diff --git a/src/org/traccar/protocol/CarcellProtocol.java b/src/org/traccar/protocol/CarcellProtocol.java
new file mode 100644
index 000000000..5982e9cf8
--- /dev/null
+++ b/src/org/traccar/protocol/CarcellProtocol.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2016 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;
+
+import java.util.List;
+
+import org.jboss.netty.bootstrap.ServerBootstrap;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.handler.codec.string.StringDecoder;
+import org.jboss.netty.handler.codec.string.StringEncoder;
+import org.traccar.BaseProtocol;
+import org.traccar.CharacterDelimiterFrameDecoder;
+import org.traccar.TrackerServer;
+import org.traccar.model.Command;
+
+public class CarcellProtocol extends BaseProtocol {
+
+ public CarcellProtocol() {
+ super("carcell");
+ setSupportedCommands(
+ Command.TYPE_ENGINE_STOP,
+ Command.TYPE_ENGINE_RESUME);
+ }
+
+ @Override
+ public void initTrackerServers(List<TrackerServer> serverList) {
+ serverList.add(new TrackerServer(new ServerBootstrap(), this.getName()) {
+ @Override
+ protected void addSpecificHandlers(ChannelPipeline pipeline) {
+ pipeline.addLast("frameDecoder", new CharacterDelimiterFrameDecoder(1024, '\r'));
+ pipeline.addLast("stringEncoder", new StringEncoder());
+ pipeline.addLast("stringDecoder", new StringDecoder());
+ pipeline.addLast("objectEncoder", new CarcellProtocolEncoder());
+ pipeline.addLast("objectDecoder", new CarcellProtocolDecoder(CarcellProtocol.this));
+ }
+ });
+ }
+
+}
diff --git a/src/org/traccar/protocol/CarcellProtocolDecoder.java b/src/org/traccar/protocol/CarcellProtocolDecoder.java
new file mode 100644
index 000000000..50b294f45
--- /dev/null
+++ b/src/org/traccar/protocol/CarcellProtocolDecoder.java
@@ -0,0 +1,166 @@
+/*
+ * Copyright 2016 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;
+
+import java.net.SocketAddress;
+import java.util.regex.Pattern;
+
+import org.jboss.netty.channel.Channel;
+import org.traccar.BaseProtocolDecoder;
+import org.traccar.helper.DateBuilder;
+import org.traccar.helper.Parser;
+import org.traccar.helper.Parser.CoordinateFormat;
+import org.traccar.helper.PatternBuilder;
+import org.traccar.helper.UnitsConverter;
+import org.traccar.model.Position;
+
+public class CarcellProtocolDecoder extends BaseProtocolDecoder {
+
+ public CarcellProtocolDecoder(CarcellProtocol protocol) {
+ super(protocol);
+ }
+
+ private static final Pattern PATTERN = new PatternBuilder()
+ .expression("([$%])") // memory flag
+ .number("(d+),") // imei
+ .groupBegin()
+ .number("([NS])(dd)(dd).(dddd),") // latitude
+ .number("([EW])(ddd)(dd).(dddd),") // longitude
+ .or()
+ .text("CEL,")
+ .number("([NS])(d+.d+),") // latitude
+ .number("([EW])(d+.d+),") // longitude
+ .groupEnd()
+ .number("(d+),") // speed
+ .number("(d+),") // course
+ .groupBegin()
+ .number("([-+]ddd)([-+]ddd)([-+]ddd),") // x,y,z
+ .or()
+ .number("(d+),") // accel
+ .groupEnd()
+ .number("(d+),") // battery
+ .number("(d+),") // csq
+ .number("(d),") // jamming
+ .number("(d+),") // hdop
+ .expression("([CG]),?") // clock type
+ .number("(dd)(dd)(dd),") // date
+ .number("(dd)(dd)(dd),") // time
+ .number("(d),") // block
+ .number("(d),") // ignition
+ .groupBegin()
+ .number("(d),") // cloned
+ .expression("([AF])") // panic
+ .number("(d),") // painel
+ .number("(d+),") // battery voltage
+ .or()
+ .number("(dd),") // time
+ .expression("([AF])") // panic
+ .number("(d),") // aux
+ .number("(d{2,4}),") // battery voltage
+ .number("(d{20}),") // ccid
+ .groupEnd()
+ .number("(xx)") // crc
+ .any() // full format
+ .compile();
+
+ @Override
+ protected Object decode(
+ Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
+
+ Parser parser = new Parser(PATTERN, (String) msg);
+
+ if (!parser.matches()) {
+ return null;
+ }
+
+ Position position = new Position();
+ position.setProtocol(getProtocolName());
+ position.set(Position.KEY_ARCHIVE, parser.next().equals("%"));
+ position.setValid(true);
+
+ if (!identify(parser.next(), channel, remoteAddress)) {
+ return null;
+ }
+
+ position.setDeviceId(getDeviceId());
+
+ if (parser.hasNext(8)) {
+ position.setLatitude(parser.nextCoordinate(CoordinateFormat.HEM_DEG_MIN_MIN));
+ position.setLongitude(parser.nextCoordinate(CoordinateFormat.HEM_DEG_MIN_MIN));
+ }
+
+ if (parser.hasNext(4)) {
+ position.setLatitude(parser.nextCoordinate(CoordinateFormat.HEM_DEG));
+ position.setLongitude(parser.nextCoordinate(CoordinateFormat.HEM_DEG));
+ }
+
+ position.setSpeed(UnitsConverter.knotsFromKph(parser.nextInt()));
+ position.setCourse(parser.nextInt());
+
+ if (parser.hasNext(3)) {
+ position.set("x", parser.nextInt());
+ position.set("y", parser.nextInt());
+ position.set("z", parser.nextInt());
+ }
+
+ if (parser.hasNext(1)) {
+ position.set("accel", parser.nextInt());
+ }
+
+ Double internalBattery = (parser.nextDouble() + 100d) * 0.0294d;
+ position.set(Position.KEY_BATTERY, internalBattery);
+ position.set(Position.KEY_GSM, parser.nextInt());
+ position.set("jamming", parser.next().equals("1"));
+ position.set(Position.KEY_GPS, parser.nextInt());
+
+ parser.next(); // clock type
+
+ DateBuilder dateBuilder = new DateBuilder().
+ setDateReverse(parser.nextInt(), parser.nextInt(), parser.nextInt())
+ .setTime(parser.nextInt(), parser.nextInt(), parser.nextInt());
+ position.setTime(dateBuilder.getDate());
+
+ position.set("blocked", parser.next().equals("1"));
+ position.set(Position.KEY_IGNITION, parser.next().equals("1"));
+
+ if (parser.hasNext(4)) {
+ position.set("cloned", parser.next().equals("1"));
+
+ parser.next(); // panic button status
+
+ String painelStatus = parser.next();
+ position.set(Position.KEY_ALARM, painelStatus.equals("1"));
+ position.set("painel", painelStatus.equals("2"));
+
+ Double mainVoltage = parser.nextDouble() / 100d;
+ position.set(Position.KEY_POWER, mainVoltage);
+ }
+
+ if (parser.hasNext(5)) {
+ position.set("timeUntilDelivery", parser.nextInt());
+ parser.next(); // panic button status
+ parser.next(); // aux
+
+ Double mainVoltage = parser.nextDouble() / 100d;
+ position.set(Position.KEY_POWER, mainVoltage);
+
+ position.set("iccid", parser.next());
+ }
+
+ return position;
+ }
+
+}
diff --git a/src/org/traccar/protocol/CarcellProtocolEncoder.java b/src/org/traccar/protocol/CarcellProtocolEncoder.java
new file mode 100644
index 000000000..d01a11e52
--- /dev/null
+++ b/src/org/traccar/protocol/CarcellProtocolEncoder.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2016 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;
+
+import org.traccar.StringProtocolEncoder;
+import org.traccar.helper.Log;
+import org.traccar.model.Command;
+
+public class CarcellProtocolEncoder extends StringProtocolEncoder {
+
+ @Override
+ protected Object encodeCommand(Command command) {
+
+ switch (command.getType()) {
+ case Command.TYPE_ENGINE_STOP:
+ return formatCommand(command, "$SRVCMD,{%s},BA#\r\n", Command.KEY_UNIQUE_ID);
+ case Command.TYPE_ENGINE_RESUME:
+ return formatCommand(command, "$SRVCMD,{%s},BD#\r\n", Command.KEY_UNIQUE_ID);
+ default:
+ Log.warning(new UnsupportedOperationException(command.getType()));
+ break;
+ }
+
+ return null;
+ }
+
+}
diff --git a/src/org/traccar/protocol/Gt06ProtocolDecoder.java b/src/org/traccar/protocol/Gt06ProtocolDecoder.java
index ce915fde8..57e2d64b7 100644
--- a/src/org/traccar/protocol/Gt06ProtocolDecoder.java
+++ b/src/org/traccar/protocol/Gt06ProtocolDecoder.java
@@ -277,7 +277,19 @@ public class Gt06ProtocolDecoder extends BaseProtocolDecoder {
if (type == MSG_INFO) {
int subType = buf.readUnsignedByte();
- if (subType == 0x05) {
+ if (subType == 0x00) {
+
+ Position position = new Position();
+ position.setDeviceId(getDeviceId());
+ position.setProtocol(getProtocolName());
+
+ getLastLocation(position, null);
+
+ position.set(Position.KEY_POWER, buf.readUnsignedShort() * 0.01);
+
+ return position;
+
+ } else if (subType == 0x05) {
Position position = new Position();
position.setDeviceId(getDeviceId());
diff --git a/src/org/traccar/protocol/MegastekProtocolDecoder.java b/src/org/traccar/protocol/MegastekProtocolDecoder.java
index 0c332d0da..ca554aa48 100644
--- a/src/org/traccar/protocol/MegastekProtocolDecoder.java
+++ b/src/org/traccar/protocol/MegastekProtocolDecoder.java
@@ -173,7 +173,7 @@ public class MegastekProtocolDecoder extends BaseProtocolDecoder {
position.set(Position.KEY_CHARGE, Integer.parseInt(charger) == 1);
}
- if (parser.hasNext(3)) {
+ if (parser.hasNext(4)) {
position.set(Position.KEY_MCC, parser.nextInt());
position.set(Position.KEY_MNC, parser.nextInt());
position.set(Position.KEY_LAC, parser.nextInt(16));
diff --git a/src/org/traccar/protocol/MiniFinderProtocolDecoder.java b/src/org/traccar/protocol/MiniFinderProtocolDecoder.java
index 089b491d2..96eaaf0fa 100644
--- a/src/org/traccar/protocol/MiniFinderProtocolDecoder.java
+++ b/src/org/traccar/protocol/MiniFinderProtocolDecoder.java
@@ -90,9 +90,33 @@ public class MiniFinderProtocolDecoder extends BaseProtocolDecoder {
if (parser.hasNext(5)) {
int flags = parser.nextInt(16);
- position.set(Position.KEY_FLAGS, flags);
+
position.setValid(BitUtil.check(flags, 0));
+ if (BitUtil.check(flags, 2)) {
+ position.set(Position.KEY_ALARM, Position.ALARM_FAULT);
+ }
+ if (BitUtil.check(flags, 6)) {
+ position.set(Position.KEY_ALARM, Position.ALARM_SOS);
+ }
+ if (BitUtil.check(flags, 7)) {
+ position.set(Position.KEY_ALARM, Position.ALARM_OVERSPEED);
+ }
+ if (BitUtil.check(flags, 8)) {
+ position.set(Position.KEY_ALARM, Position.ALARM_FALL_DOWN);
+ }
+ if (BitUtil.check(flags, 12)) {
+ position.set(Position.KEY_ALARM, Position.ALARM_LOW_BATTERY);
+ }
+ if (BitUtil.check(flags, 14)) {
+ position.set(Position.KEY_ALARM, Position.ALARM_MOTION);
+ }
+ if (BitUtil.check(flags, 15)) {
+ position.set(Position.KEY_ALARM, Position.ALARM_MOVEMENT);
+ }
+
+ position.set(Position.KEY_GSM, BitUtil.between(flags, 16, 20));
+
position.setAltitude(parser.nextDouble());
position.set(Position.KEY_BATTERY, parser.next());
diff --git a/src/org/traccar/protocol/SuntechProtocol.java b/src/org/traccar/protocol/SuntechProtocol.java
index ce0e73280..4a40e1bfc 100644
--- a/src/org/traccar/protocol/SuntechProtocol.java
+++ b/src/org/traccar/protocol/SuntechProtocol.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2015 - 2016 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.
@@ -31,6 +31,9 @@ public class SuntechProtocol extends BaseProtocol {
public SuntechProtocol() {
super("suntech");
setSupportedCommands(
+ Command.TYPE_OUTPUT_CONTROL,
+ Command.TYPE_REBOOT_DEVICE,
+ Command.TYPE_POSITION_SINGLE,
Command.TYPE_ENGINE_STOP,
Command.TYPE_ENGINE_RESUME);
}
diff --git a/src/org/traccar/protocol/SuntechProtocolEncoder.java b/src/org/traccar/protocol/SuntechProtocolEncoder.java
index d988f97be..000583759 100644
--- a/src/org/traccar/protocol/SuntechProtocolEncoder.java
+++ b/src/org/traccar/protocol/SuntechProtocolEncoder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2015 - 2016 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.
@@ -25,6 +25,20 @@ public class SuntechProtocolEncoder extends StringProtocolEncoder {
protected Object encodeCommand(Command command) {
switch (command.getType()) {
+ case Command.TYPE_REBOOT_DEVICE:
+ return formatCommand(command, "SA200CMD;{%s};02;Reboot\r", Command.KEY_UNIQUE_ID);
+ case Command.TYPE_POSITION_SINGLE:
+ return formatCommand(command, "SA200GTR;{%s};02;\r", Command.KEY_UNIQUE_ID);
+ case Command.TYPE_OUTPUT_CONTROL:
+ if (command.getAttributes().containsKey(Command.KEY_DATA)) {
+ if (command.getAttributes().get(Command.KEY_DATA).equals("1")) {
+ return formatCommand(command, "SA200CMD;{%s};02;Enable{%s}\r",
+ Command.KEY_UNIQUE_ID, Command.KEY_INDEX);
+ } else {
+ return formatCommand(command, "SA200CMD;{%s};02;Disable{%s}\r",
+ Command.KEY_UNIQUE_ID, Command.KEY_INDEX);
+ }
+ }
case Command.TYPE_ENGINE_STOP:
return formatCommand(command, "SA200CMD;{%s};02;Enable1\r", Command.KEY_UNIQUE_ID);
case Command.TYPE_ENGINE_RESUME:
diff --git a/src/org/traccar/protocol/T800xProtocol.java b/src/org/traccar/protocol/T800xProtocol.java
index f98dfc943..05650124c 100644
--- a/src/org/traccar/protocol/T800xProtocol.java
+++ b/src/org/traccar/protocol/T800xProtocol.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2015 - 2016 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.
@@ -20,6 +20,7 @@ import org.jboss.netty.channel.ChannelPipeline;
import org.jboss.netty.handler.codec.frame.LengthFieldBasedFrameDecoder;
import org.traccar.BaseProtocol;
import org.traccar.TrackerServer;
+import org.traccar.model.Command;
import java.util.List;
@@ -27,6 +28,8 @@ public class T800xProtocol extends BaseProtocol {
public T800xProtocol() {
super("t800x");
+ setSupportedCommands(
+ Command.TYPE_CUSTOM);
}
@Override
@@ -35,6 +38,7 @@ public class T800xProtocol extends BaseProtocol {
@Override
protected void addSpecificHandlers(ChannelPipeline pipeline) {
pipeline.addLast("frameDecoder", new LengthFieldBasedFrameDecoder(1024, 3, 2, -5, 0));
+ pipeline.addLast("objectEncoder", new T800xProtocolEncoder());
pipeline.addLast("objectDecoder", new T800xProtocolDecoder(T800xProtocol.this));
}
});
diff --git a/src/org/traccar/protocol/T800xProtocolDecoder.java b/src/org/traccar/protocol/T800xProtocolDecoder.java
index 67a4d55ca..dcf45bb06 100644
--- a/src/org/traccar/protocol/T800xProtocolDecoder.java
+++ b/src/org/traccar/protocol/T800xProtocolDecoder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2015 - 2016 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.
@@ -34,10 +34,11 @@ public class T800xProtocolDecoder extends BaseProtocolDecoder {
super(protocol);
}
- private static final int MSG_LOGIN = 0x01;
- private static final int MSG_GPS = 0x02;
- private static final int MSG_HEARTBEAT = 0x03;
- private static final int MSG_ALARM = 0x04;
+ public static final int MSG_LOGIN = 0x01;
+ public static final int MSG_GPS = 0x02;
+ public static final int MSG_HEARTBEAT = 0x03;
+ public static final int MSG_ALARM = 0x04;
+ public static final int MSG_COMMAND = 0x81;
private static float readSwappedFloat(ChannelBuffer buf) {
byte[] bytes = new byte[4];
diff --git a/src/org/traccar/protocol/T800xProtocolEncoder.java b/src/org/traccar/protocol/T800xProtocolEncoder.java
new file mode 100644
index 000000000..d603328e2
--- /dev/null
+++ b/src/org/traccar/protocol/T800xProtocolEncoder.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2016 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;
+
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.buffer.ChannelBuffers;
+import org.traccar.BaseProtocolEncoder;
+import org.traccar.helper.Log;
+import org.traccar.model.Command;
+
+import javax.xml.bind.DatatypeConverter;
+import java.nio.charset.StandardCharsets;
+
+public class T800xProtocolEncoder extends BaseProtocolEncoder {
+
+ public static final int MODE_SETTING = 0x01;
+ public static final int MODE_BROADCAST = 0x02;
+ public static final int MODE_FORWARD = 0x03;
+
+ private ChannelBuffer encodeContent(Command command, String content) {
+
+ ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
+
+ buf.writeByte('#');
+ buf.writeByte('#');
+ buf.writeByte(T800xProtocolDecoder.MSG_COMMAND);
+ buf.writeShort(7 + 8 + 1 + content.length());
+ buf.writeShort(1); // serial number
+ buf.writeBytes(DatatypeConverter.parseHexBinary("0" + getUniqueId(command.getDeviceId())));
+ buf.writeByte(MODE_SETTING);
+ buf.writeBytes(content.getBytes(StandardCharsets.US_ASCII));
+
+ return buf;
+ }
+
+ @Override
+ protected Object encodeCommand(Command command) {
+
+ switch (command.getType()) {
+ case Command.TYPE_CUSTOM:
+ return encodeContent(command, (String) command.getAttributes().get(Command.KEY_DATA));
+ default:
+ Log.warning(new UnsupportedOperationException(command.getType()));
+ break;
+ }
+
+ return null;
+ }
+
+}