- Removed OIL_CUT

- Renamed guard to armed
- Style fixes and optimizations

1 files changed, 11 insertions, 4 deletions

diff --git a/src/org/traccar/protocol/NoranProtocolDecoder.java b/src/org/traccar/protocol/NoranProtocolDecoder.java
index 5b4533422..aaecfc1db 100644
--- a/src/org/traccar/protocol/NoranProtocolDecoder.java
+++ b/src/org/traccar/protocol/NoranProtocolDecoder.java
@@ -91,14 +91,21 @@ public class NoranProtocolDecoder extends BaseProtocolDecoder {
             position.setValid(BitUtil.check(buf.readUnsignedByte(), 0));
 
             short alarm = buf.readUnsignedByte();
-            if (alarm == 1) {
+            switch (alarm) {
+            case 1:
                 position.set(Position.KEY_ALARM, Position.ALARM_SOS);
-            } else if (alarm == 2) {
+                break;
+            case 2:
                 position.set(Position.KEY_ALARM, Position.ALARM_OVERSPEED);
-            } else if (alarm == 3) {
+                break;
+            case 3:
                 position.set(Position.KEY_ALARM, Position.ALARM_GEOFENCE_EXIT);
-            } else if (alarm == 9) {
+                break;
+            case 9:
                 position.set(Position.KEY_ALARM, Position.ALARM_POWER_OFF);
+                break;
+            default:
+                break;
             }
 
             if (newFormat) {