6 files changed, 88 insertions, 13 deletions
diff --git a/src/org/traccar/events/IgnitionEventHandler.java b/src/org/traccar/events/IgnitionEventHandler.java
index 297049ccd..ae813f77b 100644
--- a/src/org/traccar/events/IgnitionEventHandler.java
+++ b/src/org/traccar/events/IgnitionEventHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2016 Anton Tananaev (anton.tananaev@gmail.com), Andrey Kunitsyn (abyss@fox5.ru)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,8 +40,8 @@ public class IgnitionEventHandler extends BaseEventHandler {
 
         boolean ignition = false;
         Object ignitionObject = position.getAttributes().get(Position.KEY_IGNITION);
-        if (ignitionObject != null && Boolean.parseBoolean(ignitionObject.toString())) {
-            ignition = true;
+        if (ignitionObject != null && ignitionObject instanceof Boolean) {
+            ignition = (Boolean) ignitionObject;
         }
 
         boolean oldIgnition = false;
@@ -50,8 +50,8 @@ public class IgnitionEventHandler extends BaseEventHandler {
         if (lastPosition != null) {
             oldIgnitionObject = lastPosition.getAttributes().get(Position.KEY_IGNITION);
         }
-        if (oldIgnitionObject != null && Boolean.parseBoolean(oldIgnitionObject.toString())) {
-            oldIgnition = true;
+        if (oldIgnitionObject != null && oldIgnitionObject instanceof Boolean) {
+            oldIgnition = (Boolean) oldIgnitionObject;
         }
 
         if (ignition && !oldIgnition) {
diff --git a/src/org/traccar/reports/Events.java b/src/org/traccar/reports/Events.java
index fbbd3131b..c8233e4eb 100644
--- a/src/org/traccar/reports/Events.java
+++ b/src/org/traccar/reports/Events.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2016 Anton Tananaev (anton.tananaev@gmail.com), Andrey Kunitsyn (abyss@fox5.ru)
+ *
+ * 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.reports;
 
 import java.sql.SQLException;
diff --git a/src/org/traccar/reports/ReportUtils.java b/src/org/traccar/reports/ReportUtils.java
index 5041871f7..76f0ed631 100644
--- a/src/org/traccar/reports/ReportUtils.java
+++ b/src/org/traccar/reports/ReportUtils.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2016 Anton Tananaev (anton.tananaev@gmail.com), Andrey Kunitsyn (abyss@fox5.ru)
+ *
+ * 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.reports;
 
 import java.util.ArrayList;
diff --git a/src/org/traccar/reports/Route.java b/src/org/traccar/reports/Route.java
index 9622151e7..282a6e3f3 100644
--- a/src/org/traccar/reports/Route.java
+++ b/src/org/traccar/reports/Route.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2016 Anton Tananaev (anton.tananaev@gmail.com), Andrey Kunitsyn (abyss@fox5.ru)
+ *
+ * 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.reports;
 
 import java.sql.SQLException;
diff --git a/src/org/traccar/reports/Summary.java b/src/org/traccar/reports/Summary.java
index 2c777b9bb..5c6fa8423 100644
--- a/src/org/traccar/reports/Summary.java
+++ b/src/org/traccar/reports/Summary.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2016 Anton Tananaev (anton.tananaev@gmail.com), Andrey Kunitsyn (abyss@fox5.ru)
+ *
+ * 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.reports;
 
 import java.math.BigDecimal;
@@ -38,7 +53,7 @@ public final class Summary {
                             && previousPosition.getAttributes().get(Position.KEY_IGNITION) != null
                             && Boolean.parseBoolean(previousPosition.getAttributes()
                                     .get(Position.KEY_IGNITION).toString())) {
-                        result.addMotorHours(position.getFixTime().getTime()
+                        result.addEngineHours(position.getFixTime().getTime()
                                 - previousPosition.getFixTime().getTime());
                     }
                 }
diff --git a/src/org/traccar/reports/model/SummaryReport.java b/src/org/traccar/reports/model/SummaryReport.java
index 01006558f..dfab2f3b8 100644
--- a/src/org/traccar/reports/model/SummaryReport.java
+++ b/src/org/traccar/reports/model/SummaryReport.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2016 Anton Tananaev (anton.tananaev@gmail.com), Andrey Kunitsyn (abyss@fox5.ru)
+ *
+ * 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.reports.model;
 
 public class SummaryReport {
@@ -48,14 +63,14 @@ public class SummaryReport {
         }
     }
 
-    private long motorHours;
-    public long getMotorHours() {
-        return motorHours;
+    private long engineHours;
+    public long getEngineHours() {
+        return engineHours;
     }
-    public void setMotorHours(long motorHours) {
-        this.motorHours = motorHours;
+    public void setEngineHours(long engineHours) {
+        this.engineHours = engineHours;
     }
-    public void addMotorHours(long motorHours) {
-        this.motorHours += motorHours;
+    public void addEngineHours(long engineHours) {
+        this.engineHours += engineHours;
     }
 }