Use same code formatting for switches

17 files changed, 228 insertions, 235 deletions

diff --git a/src/org/traccar/notification/NotificationFormatter.java b/src/org/traccar/notification/NotificationFormatter.java
index fb8019900..ae1a58d3a 100644
--- a/src/org/traccar/notification/NotificationFormatter.java
+++ b/src/org/traccar/notification/NotificationFormatter.java
@@ -201,14 +201,14 @@ public final class NotificationFormatter {
         DecimalFormat df = new DecimalFormat("#.##");
         String result = df.format(speed) + " kn";
         switch (Context.getPermissionsManager().getUser(userId).getSpeedUnit()) {
-        case "kmh":
-            result = df.format(UnitsConverter.kphFromKnots(speed)) + " km/h";
-            break;
-        case "mph":
-            result = df.format(UnitsConverter.mphFromKnots(speed)) + " mph";
-            break;
-        default:
-            break;
+            case "kmh":
+                result = df.format(UnitsConverter.kphFromKnots(speed)) + " km/h";
+                break;
+            case "mph":
+                result = df.format(UnitsConverter.mphFromKnots(speed)) + " mph";
+                break;
+            default:
+                break;
         }
         return result;
     }
diff --git a/src/org/traccar/protocol/EelinkProtocolDecoder.java b/src/org/traccar/protocol/EelinkProtocolDecoder.java
index 7403fd18a..87d706aff 100644
--- a/src/org/traccar/protocol/EelinkProtocolDecoder.java
+++ b/src/org/traccar/protocol/EelinkProtocolDecoder.java
@@ -66,31 +66,31 @@ public class EelinkProtocolDecoder extends BaseProtocolDecoder {
 
     private String decodeAlarm(Short value) {
         switch (value) {
-        case 0x01:
-            return Position.ALARM_POWER_OFF;
-        case 0x02:
-            return Position.ALARM_SOS;
-        case 0x03:
-            return Position.ALARM_LOW_BATTERY;
-        case 0x04:
-            return Position.ALARM_VIBRATION;
-        case 0x08:
-        case 0x09:
-            return Position.ALARM_GPS_ANTENNA_CUT;
-        case 0x81:
-            return Position.ALARM_LOW_SPEED;
-        case 0x82:
-            return Position.ALARM_OVERSPEED;
-        case 0x83:
-            return Position.ALARM_GEOFENCE_ENTER;
-        case 0x84:
-            return Position.ALARM_GEOFENCE_EXIT;
-        case 0x85:
-            return Position.ALARM_ACCIDENT;
-        case 0x86:
-            return Position.ALARM_FALL_DOWN;
-        default:
-            return null;
+            case 0x01:
+                return Position.ALARM_POWER_OFF;
+            case 0x02:
+                return Position.ALARM_SOS;
+            case 0x03:
+                return Position.ALARM_LOW_BATTERY;
+            case 0x04:
+                return Position.ALARM_VIBRATION;
+            case 0x08:
+            case 0x09:
+                return Position.ALARM_GPS_ANTENNA_CUT;
+            case 0x81:
+                return Position.ALARM_LOW_SPEED;
+            case 0x82:
+                return Position.ALARM_OVERSPEED;
+            case 0x83:
+                return Position.ALARM_GEOFENCE_ENTER;
+            case 0x84:
+                return Position.ALARM_GEOFENCE_EXIT;
+            case 0x85:
+                return Position.ALARM_ACCIDENT;
+            case 0x86:
+                return Position.ALARM_FALL_DOWN;
+            default:
+                return null;
         }
     }
 
diff --git a/src/org/traccar/protocol/GnxProtocolDecoder.java b/src/org/traccar/protocol/GnxProtocolDecoder.java
index a2ee5ae48..b88d306a8 100644
--- a/src/org/traccar/protocol/GnxProtocolDecoder.java
+++ b/src/org/traccar/protocol/GnxProtocolDecoder.java
@@ -71,13 +71,10 @@ public class GnxProtocolDecoder extends BaseProtocolDecoder {
         String type = sentence.substring(5, 8);
 
         Pattern pattern;
-        switch (type) {
-            case "MIF":
-                pattern = PATTERN_MIF;
-                break;
-            default:
-                pattern = PATTERN_OTHER;
-                break;
+        if (type.equals("MIF")) {
+            pattern = PATTERN_MIF;
+        } else {
+            pattern = PATTERN_OTHER;
         }
 
         Parser parser = new Parser(pattern, sentence);
@@ -115,12 +112,8 @@ public class GnxProtocolDecoder extends BaseProtocolDecoder {
         position.setLatitude(parser.nextCoordinate(Parser.CoordinateFormat.DEG_HEM));
         position.setLongitude(parser.nextCoordinate(Parser.CoordinateFormat.DEG_HEM));
 
-        switch (type) {
-            case "MIF":
-                position.set(Position.KEY_RFID, parser.next());
-                break;
-            default:
-                break;
+        if (type.equals("MIF")) {
+            position.set(Position.KEY_RFID, parser.next());
         }
 
         return position;
diff --git a/src/org/traccar/protocol/Gps103ProtocolDecoder.java b/src/org/traccar/protocol/Gps103ProtocolDecoder.java
index af7efa959..1a34a6bd8 100644
--- a/src/org/traccar/protocol/Gps103ProtocolDecoder.java
+++ b/src/org/traccar/protocol/Gps103ProtocolDecoder.java
@@ -104,20 +104,20 @@ public class Gps103ProtocolDecoder extends BaseProtocolDecoder {
 
     private String decodeAlarm(String value) {
         switch (value) {
-        case "tracker":
-            return null;
-        case "help me":
-            return Position.ALARM_SOS;
-        case "low battery":
-            return Position.ALARM_LOW_BATTERY;
-        case "stockade":
-            return Position.ALARM_GEOFENCE;
-        case "move":
-            return Position.ALARM_MOVEMENT;
-        case "speed":
-            return Position.ALARM_OVERSPEED;
-        default:
-            return null;
+            case "tracker":
+                return null;
+            case "help me":
+                return Position.ALARM_SOS;
+            case "low battery":
+                return Position.ALARM_LOW_BATTERY;
+            case "stockade":
+                return Position.ALARM_GEOFENCE;
+            case "move":
+                return Position.ALARM_MOVEMENT;
+            case "speed":
+                return Position.ALARM_OVERSPEED;
+            default:
+                return null;
         }
     }
 
diff --git a/src/org/traccar/protocol/GranitProtocolEncoder.java b/src/org/traccar/protocol/GranitProtocolEncoder.java
index 961f183f5..805bfbe24 100644
--- a/src/org/traccar/protocol/GranitProtocolEncoder.java
+++ b/src/org/traccar/protocol/GranitProtocolEncoder.java
@@ -30,18 +30,18 @@ public class GranitProtocolEncoder extends BaseProtocolEncoder {
         String commandString = "";
 
         switch (command.getType()) {
-        case Command.TYPE_IDENTIFICATION:
-            commandString = "BB+IDNT";
-            break;
-        case Command.TYPE_REBOOT_DEVICE:
-            commandString = "BB+RESET";
-            break;
-        case Command.TYPE_POSITION_SINGLE:
-            commandString = "BB+RRCD";
-            break;
-        default:
-            Log.warning(new UnsupportedOperationException(command.getType()));
-            return null;
+            case Command.TYPE_IDENTIFICATION:
+                commandString = "BB+IDNT";
+                break;
+            case Command.TYPE_REBOOT_DEVICE:
+                commandString = "BB+RESET";
+                break;
+            case Command.TYPE_POSITION_SINGLE:
+                commandString = "BB+RRCD";
+                break;
+            default:
+                Log.warning(new UnsupportedOperationException(command.getType()));
+                return null;
         }
         if (!commandString.isEmpty()) {
             ChannelBuffer commandBuf = ChannelBuffers.dynamicBuffer();
diff --git a/src/org/traccar/protocol/Gt06ProtocolDecoder.java b/src/org/traccar/protocol/Gt06ProtocolDecoder.java
index 10e19b131..4af814e24 100644
--- a/src/org/traccar/protocol/Gt06ProtocolDecoder.java
+++ b/src/org/traccar/protocol/Gt06ProtocolDecoder.java
@@ -165,26 +165,26 @@ public class Gt06ProtocolDecoder extends BaseProtocolDecoder {
 
     private String decodeAlarm(short value) {
         switch (value) {
-        case 0x01:
-            return Position.ALARM_SOS;
-        case 0x02:
-            return Position.ALARM_POWER_CUT;
-        case 0x03:
-        case 0x09:
-            return Position.ALARM_VIBRATION;
-        case 0x04:
-            return Position.ALARM_GEOFENCE_ENTER;
-        case 0x05:
-            return Position.ALARM_GEOFENCE_EXIT;
-        case 0x06:
-            return Position.ALARM_OVERSPEED;
-        case 0x0E:
-        case 0x0F:
-            return Position.ALARM_LOW_BATTERY;
-        case 0x11:
-            return Position.ALARM_POWER_OFF;
-        default:
-            break;
+            case 0x01:
+                return Position.ALARM_SOS;
+            case 0x02:
+                return Position.ALARM_POWER_CUT;
+            case 0x03:
+            case 0x09:
+                return Position.ALARM_VIBRATION;
+            case 0x04:
+                return Position.ALARM_GEOFENCE_ENTER;
+            case 0x05:
+                return Position.ALARM_GEOFENCE_EXIT;
+            case 0x06:
+                return Position.ALARM_OVERSPEED;
+            case 0x0E:
+            case 0x0F:
+                return Position.ALARM_LOW_BATTERY;
+            case 0x11:
+                return Position.ALARM_POWER_OFF;
+            default:
+                break;
         }
         return null;
     }
diff --git a/src/org/traccar/protocol/MegastekProtocolDecoder.java b/src/org/traccar/protocol/MegastekProtocolDecoder.java
index a330947b1..3ea76536c 100644
--- a/src/org/traccar/protocol/MegastekProtocolDecoder.java
+++ b/src/org/traccar/protocol/MegastekProtocolDecoder.java
@@ -343,31 +343,31 @@ public class MegastekProtocolDecoder extends BaseProtocolDecoder {
 
     private String decodeAlarm(String value) {
         switch (value) {
-        case "SOS":
-        case "Help":
-            return Position.ALARM_SOS;
-        case "Over Speed":
-        case "OverSpeed":
-            return Position.ALARM_OVERSPEED;
-        case "LowSpeed":
-            return Position.ALARM_LOW_SPEED;
-        case "Low Battery":
-        case "LowBattery":
-            return Position.ALARM_LOW_BATTERY;
-        case "VIB":
-            return Position.ALARM_VIBRATION;
-        case "Move in":
-        case "Geo in":
-        case "Geo1 in":
-        case "Geo2 in":
-            return Position.ALARM_GEOFENCE_ENTER;
-        case "Move out":
-        case "Geo out":
-        case "Geo1 out":
-        case "Geo2 out":
-            return Position.ALARM_GEOFENCE_EXIT;
-        default:
-            return null;
+            case "SOS":
+            case "Help":
+                return Position.ALARM_SOS;
+            case "Over Speed":
+            case "OverSpeed":
+                return Position.ALARM_OVERSPEED;
+            case "LowSpeed":
+                return Position.ALARM_LOW_SPEED;
+            case "Low Battery":
+            case "LowBattery":
+                return Position.ALARM_LOW_BATTERY;
+            case "VIB":
+                return Position.ALARM_VIBRATION;
+            case "Move in":
+            case "Geo in":
+            case "Geo1 in":
+            case "Geo2 in":
+                return Position.ALARM_GEOFENCE_ENTER;
+            case "Move out":
+            case "Geo out":
+            case "Geo1 out":
+            case "Geo2 out":
+                return Position.ALARM_GEOFENCE_EXIT;
+            default:
+                return null;
         }
     }
 
diff --git a/src/org/traccar/protocol/MeiligaoProtocolDecoder.java b/src/org/traccar/protocol/MeiligaoProtocolDecoder.java
index f1a87f4b7..f0e5032b4 100644
--- a/src/org/traccar/protocol/MeiligaoProtocolDecoder.java
+++ b/src/org/traccar/protocol/MeiligaoProtocolDecoder.java
@@ -173,22 +173,22 @@ public class MeiligaoProtocolDecoder extends BaseProtocolDecoder {
 
     private String decodeAlarm(short value) {
         switch (value) {
-        case 0x01:
-            return Position.ALARM_SOS;
-        case 0x10:
-            return Position.ALARM_LOW_BATTERY;
-        case 0x11:
-            return Position.ALARM_OVERSPEED;
-        case 0x12:
-            return Position.ALARM_MOVEMENT;
-        case 0x13:
-            return Position.ALARM_GEOFENCE_ENTER;
-        case 0x50:
-            return Position.ALARM_POWER_OFF;
-        case 0x53:
-            return Position.ALARM_GPS_ANTENNA_CUT;
-        default:
-            return null;
+            case 0x01:
+                return Position.ALARM_SOS;
+            case 0x10:
+                return Position.ALARM_LOW_BATTERY;
+            case 0x11:
+                return Position.ALARM_OVERSPEED;
+            case 0x12:
+                return Position.ALARM_MOVEMENT;
+            case 0x13:
+                return Position.ALARM_GEOFENCE_ENTER;
+            case 0x50:
+                return Position.ALARM_POWER_OFF;
+            case 0x53:
+                return Position.ALARM_GPS_ANTENNA_CUT;
+            default:
+                return null;
         }
     }
 
diff --git a/src/org/traccar/protocol/NoranProtocolDecoder.java b/src/org/traccar/protocol/NoranProtocolDecoder.java
index aaecfc1db..e062a9907 100644
--- a/src/org/traccar/protocol/NoranProtocolDecoder.java
+++ b/src/org/traccar/protocol/NoranProtocolDecoder.java
@@ -92,20 +92,20 @@ public class NoranProtocolDecoder extends BaseProtocolDecoder {
 
             short alarm = buf.readUnsignedByte();
             switch (alarm) {
-            case 1:
-                position.set(Position.KEY_ALARM, Position.ALARM_SOS);
-                break;
-            case 2:
-                position.set(Position.KEY_ALARM, Position.ALARM_OVERSPEED);
-                break;
-            case 3:
-                position.set(Position.KEY_ALARM, Position.ALARM_GEOFENCE_EXIT);
-                break;
-            case 9:
-                position.set(Position.KEY_ALARM, Position.ALARM_POWER_OFF);
-                break;
-            default:
-                break;
+                case 1:
+                    position.set(Position.KEY_ALARM, Position.ALARM_SOS);
+                    break;
+                case 2:
+                    position.set(Position.KEY_ALARM, Position.ALARM_OVERSPEED);
+                    break;
+                case 3:
+                    position.set(Position.KEY_ALARM, Position.ALARM_GEOFENCE_EXIT);
+                    break;
+                case 9:
+                    position.set(Position.KEY_ALARM, Position.ALARM_POWER_OFF);
+                    break;
+                default:
+                    break;
             }
 
             if (newFormat) {
diff --git a/src/org/traccar/protocol/T800xProtocolDecoder.java b/src/org/traccar/protocol/T800xProtocolDecoder.java
index 8301450d5..d92145e05 100644
--- a/src/org/traccar/protocol/T800xProtocolDecoder.java
+++ b/src/org/traccar/protocol/T800xProtocolDecoder.java
@@ -62,19 +62,19 @@ public class T800xProtocolDecoder extends BaseProtocolDecoder {
 
     private String decodeAlarm(short value) {
         switch (value) {
-        case 3:
-            return Position.ALARM_SOS;
-        case 4:
-            return Position.ALARM_OVERSPEED;
-        case 5:
-            return Position.ALARM_GEOFENCE_ENTER;
-        case 6:
-            return Position.ALARM_GEOFENCE_EXIT;
-        case 8:
-        case 10:
-            return Position.ALARM_VIBRATION;
-        default:
-            break;
+            case 3:
+                return Position.ALARM_SOS;
+            case 4:
+                return Position.ALARM_OVERSPEED;
+            case 5:
+                return Position.ALARM_GEOFENCE_ENTER;
+            case 6:
+                return Position.ALARM_GEOFENCE_EXIT;
+            case 8:
+            case 10:
+                return Position.ALARM_VIBRATION;
+            default:
+                break;
         }
         return null;
     }
diff --git a/src/org/traccar/protocol/Tk103ProtocolDecoder.java b/src/org/traccar/protocol/Tk103ProtocolDecoder.java
index 7b3f44d33..c638e7f27 100644
--- a/src/org/traccar/protocol/Tk103ProtocolDecoder.java
+++ b/src/org/traccar/protocol/Tk103ProtocolDecoder.java
@@ -78,20 +78,20 @@ public class Tk103ProtocolDecoder extends BaseProtocolDecoder {
 
     private String decodeAlarm(int value) {
         switch (value) {
-        case 1:
-            return Position.ALARM_ACCIDENT;
-        case 2:
-            return Position.ALARM_SOS;
-        case 3:
-            return Position.ALARM_VIBRATION;
-        case 4:
-            return Position.ALARM_LOW_SPEED;
-        case 5:
-            return Position.ALARM_OVERSPEED;
-        case 6:
-            return Position.ALARM_GEOFENCE_EXIT;
-        default:
-            return null;
+            case 1:
+                return Position.ALARM_ACCIDENT;
+            case 2:
+                return Position.ALARM_SOS;
+            case 3:
+                return Position.ALARM_VIBRATION;
+            case 4:
+                return Position.ALARM_LOW_SPEED;
+            case 5:
+                return Position.ALARM_OVERSPEED;
+            case 6:
+                return Position.ALARM_GEOFENCE_EXIT;
+            default:
+                return null;
         }
     }
 
diff --git a/src/org/traccar/protocol/TotemProtocolDecoder.java b/src/org/traccar/protocol/TotemProtocolDecoder.java
index e7a689a8b..fbda41921 100644
--- a/src/org/traccar/protocol/TotemProtocolDecoder.java
+++ b/src/org/traccar/protocol/TotemProtocolDecoder.java
@@ -161,18 +161,18 @@ public class TotemProtocolDecoder extends BaseProtocolDecoder {
 
     private String decodeAlarm(Short value) {
         switch (value) {
-        case 0x01:
-            return Position.ALARM_SOS;
-        case 0x10:
-            return Position.ALARM_LOW_BATTERY;
-        case 0x11:
-            return Position.ALARM_OVERSPEED;
-        case 0x42:
-            return Position.ALARM_GEOFENCE_EXIT;
-        case 0x43:
-            return Position.ALARM_GEOFENCE_ENTER;
-        default:
-            return null;
+            case 0x01:
+                return Position.ALARM_SOS;
+            case 0x10:
+                return Position.ALARM_LOW_BATTERY;
+            case 0x11:
+                return Position.ALARM_OVERSPEED;
+            case 0x42:
+                return Position.ALARM_GEOFENCE_EXIT;
+            case 0x43:
+                return Position.ALARM_GEOFENCE_ENTER;
+            default:
+                return null;
         }
     }
 
diff --git a/src/org/traccar/protocol/TzoneProtocolDecoder.java b/src/org/traccar/protocol/TzoneProtocolDecoder.java
index 4b530efa4..477dc6399 100644
--- a/src/org/traccar/protocol/TzoneProtocolDecoder.java
+++ b/src/org/traccar/protocol/TzoneProtocolDecoder.java
@@ -34,18 +34,18 @@ public class TzoneProtocolDecoder extends BaseProtocolDecoder {
 
     private String decodeAlarm(Short value) {
         switch (value) {
-        case 0x01:
-            return Position.ALARM_SOS;
-        case 0x10:
-            return Position.ALARM_LOW_BATTERY;
-        case 0x11:
-            return Position.ALARM_OVERSPEED;
-        case 0x42:
-            return Position.ALARM_GEOFENCE_EXIT;
-        case 0x43:
-            return Position.ALARM_GEOFENCE_ENTER;
-        default:
-            return null;
+            case 0x01:
+                return Position.ALARM_SOS;
+            case 0x10:
+                return Position.ALARM_LOW_BATTERY;
+            case 0x11:
+                return Position.ALARM_OVERSPEED;
+            case 0x42:
+                return Position.ALARM_GEOFENCE_EXIT;
+            case 0x43:
+                return Position.ALARM_GEOFENCE_ENTER;
+            default:
+                return null;
         }
     }
 
diff --git a/src/org/traccar/protocol/WialonProtocolEncoder.java b/src/org/traccar/protocol/WialonProtocolEncoder.java
index b68dacd79..d3a0fc3b9 100644
--- a/src/org/traccar/protocol/WialonProtocolEncoder.java
+++ b/src/org/traccar/protocol/WialonProtocolEncoder.java
@@ -25,17 +25,17 @@ public class WialonProtocolEncoder extends StringProtocolEncoder {
     @Override
     protected Object encodeCommand(Command command) {
         switch (command.getType()) {
-        case Command.TYPE_REBOOT_DEVICE:
-            return formatCommand(command, "reboot\r\n");
-        case Command.TYPE_SEND_USSD:
-            return formatCommand(command, "USSD:{%s}\r\n", Command.KEY_PHONE);
-        case Command.TYPE_IDENTIFICATION:
-            return formatCommand(command, "VER?\r\n");
-        case Command.TYPE_OUTPUT_CONTROL:
-            return formatCommand(command, "L{%s}={%s}\r\n", Command.KEY_INDEX, Command.KEY_DATA);
-        default:
-            Log.warning(new UnsupportedOperationException(command.getType()));
-            break;
+            case Command.TYPE_REBOOT_DEVICE:
+                return formatCommand(command, "reboot\r\n");
+            case Command.TYPE_SEND_USSD:
+                return formatCommand(command, "USSD:{%s}\r\n", Command.KEY_PHONE);
+            case Command.TYPE_IDENTIFICATION:
+                return formatCommand(command, "VER?\r\n");
+            case Command.TYPE_OUTPUT_CONTROL:
+                return formatCommand(command, "L{%s}={%s}\r\n", Command.KEY_INDEX, Command.KEY_DATA);
+            default:
+                Log.warning(new UnsupportedOperationException(command.getType()));
+                break;
         }
         return null;
     }
diff --git a/src/org/traccar/protocol/WondexProtocolEncoder.java b/src/org/traccar/protocol/WondexProtocolEncoder.java
index 918c22cda..c350838d0 100644
--- a/src/org/traccar/protocol/WondexProtocolEncoder.java
+++ b/src/org/traccar/protocol/WondexProtocolEncoder.java
@@ -26,15 +26,15 @@ public class WondexProtocolEncoder extends StringProtocolEncoder {
         initDevicePassword(command, "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);
-        case Command.TYPE_IDENTIFICATION:
-            return formatCommand(command, "$WP+VER={%s}", Command.KEY_DEVICE_PASSWORD);
-        default:
-            Log.warning(new UnsupportedOperationException(command.getType()));
-            break;
+            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);
+            case Command.TYPE_IDENTIFICATION:
+                return formatCommand(command, "$WP+VER={%s}", Command.KEY_DEVICE_PASSWORD);
+            default:
+                Log.warning(new UnsupportedOperationException(command.getType()));
+                break;
         }
 
         return null;
diff --git a/src/org/traccar/protocol/XexunProtocolDecoder.java b/src/org/traccar/protocol/XexunProtocolDecoder.java
index 7ec2685fa..06f255b91 100644
--- a/src/org/traccar/protocol/XexunProtocolDecoder.java
+++ b/src/org/traccar/protocol/XexunProtocolDecoder.java
@@ -67,15 +67,15 @@ public class XexunProtocolDecoder extends BaseProtocolDecoder {
     private String decodeAlarm(String value) {
         if (value != null) {
             switch (value) {
-            case "help me!":
-                return Position.ALARM_SOS;
-            case "low battery":
-                return Position.ALARM_LOW_BATTERY;
-            case "move!":
-            case "moved!":
-                return Position.ALARM_MOVEMENT;
-            default:
-                break;
+                case "help me!":
+                    return Position.ALARM_SOS;
+                case "low battery":
+                    return Position.ALARM_LOW_BATTERY;
+                case "move!":
+                case "moved!":
+                    return Position.ALARM_MOVEMENT;
+                default:
+                    break;
             }
         }
         return null;
diff --git a/src/org/traccar/reports/ReportUtils.java b/src/org/traccar/reports/ReportUtils.java
index 924dff4c1..818920ad5 100644
--- a/src/org/traccar/reports/ReportUtils.java
+++ b/src/org/traccar/reports/ReportUtils.java
@@ -69,14 +69,14 @@ public final class ReportUtils {
                 && lastPosition.getAttributes().get(Position.KEY_FUEL) != null) {
             try {
                 switch (firstPosition.getProtocol()) {
-                case "meitrack":
-                case "galileo":
-                case "noran":
-                    return new BigDecimal(firstPosition.getAttributes().get(Position.KEY_FUEL).toString())
-                            .subtract(new BigDecimal(lastPosition.getAttributes().get(Position.KEY_FUEL).toString()))
-                            .setScale(2, RoundingMode.HALF_EVEN).toString() + " %";
-                default:
-                    break;
+                    case "meitrack":
+                    case "galileo":
+                    case "noran":
+                        BigDecimal v = new BigDecimal(firstPosition.getAttributes().get(Position.KEY_FUEL).toString());
+                        v = v.subtract(new BigDecimal(lastPosition.getAttributes().get(Position.KEY_FUEL).toString()));
+                        return v.setScale(2, RoundingMode.HALF_EVEN).toString() + " %";
+                    default:
+                        break;
                 }
             } catch (Exception error) {
                 Log.warning(error);