From 26659e3631901a46e35a5c2ac89c698a52277b0a Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Wed, 14 Oct 2015 10:10:30 +1300
Subject: Fix some check style issues

---
 src/org/traccar/FilterHandler.java | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

(limited to 'src/org/traccar/FilterHandler.java')

diff --git a/src/org/traccar/FilterHandler.java b/src/org/traccar/FilterHandler.java
index 870132fe0..79f40c979 100644
--- a/src/org/traccar/FilterHandler.java
+++ b/src/org/traccar/FilterHandler.java
@@ -31,12 +31,8 @@ public class FilterHandler extends BaseDataHandler {
     private final long filterLimit;
 
     public FilterHandler(
-            boolean filterInvalid,
-            boolean filterZero,
-            boolean filterDuplicate,
-            boolean filterFuture,
-            int filterDistance,
-            long filterLimit) {
+            boolean filterInvalid, boolean filterZero, boolean filterDuplicate,
+            boolean filterFuture, int filterDistance, long filterLimit) {
 
         this.filterInvalid = filterInvalid;
         this.filterZero = filterZero;
@@ -69,9 +65,7 @@ public class FilterHandler extends BaseDataHandler {
     }
 
     private boolean filterZero(Position position) {
-        return filterZero &&
-                position.getLatitude() == 0.0 &&
-                position.getLongitude() == 0.0;
+        return filterZero && position.getLatitude() == 0.0 && position.getLongitude() == 0.0;
     }
 
     private boolean filterDuplicate(Position position) {
@@ -122,12 +116,8 @@ public class FilterHandler extends BaseDataHandler {
 
     private boolean filter(Position p) {
 
-        boolean result =
-                filterInvalid(p) ||
-                filterZero(p) ||
-                filterDuplicate(p) ||
-                filterFuture(p) ||
-                filterDistance(p);
+        boolean result = filterInvalid(p) || filterZero(p)
+                || filterDuplicate(p) || filterFuture(p) || filterDistance(p);
 
         if (filterLimit(p)) {
             result = false;
@@ -142,7 +132,10 @@ public class FilterHandler extends BaseDataHandler {
 
     @Override
     protected Position handlePosition(Position position) {
-        return filter(position) ? null : position;
+        if (filter(position)) {
+            return null;
+        }
+        return position;
     }
 
 }
-- 
cgit v1.2.3