From 16771c045a3d6fdffad322e55b6d346c93a03f71 Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Mon, 8 Aug 2016 11:55:27 +0500
Subject: - Used @Consumes and @Produces instead of direct header access

- Renamed General to Summary
- Other changes
---
 src/org/traccar/reports/model/GeneralReport.java | 42 ------------------------
 src/org/traccar/reports/model/SummaryReport.java | 42 ++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 42 deletions(-)
 delete mode 100644 src/org/traccar/reports/model/GeneralReport.java
 create mode 100644 src/org/traccar/reports/model/SummaryReport.java

(limited to 'src/org/traccar/reports/model')

diff --git a/src/org/traccar/reports/model/GeneralReport.java b/src/org/traccar/reports/model/GeneralReport.java
deleted file mode 100644
index f60bb7238..000000000
--- a/src/org/traccar/reports/model/GeneralReport.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.traccar.reports.model;
-
-public class GeneralReport {
-
-    private String deviceName;
-    public String getDeviceName() {
-        return deviceName;
-    }
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
-    }
-
-    private double distance = 0;
-    public double getDistance() {
-        return distance;
-    }
-    public void setDistance(double distance) {
-        this.distance = distance;
-    }
-
-    public void addDistance(double distance) {
-        this.distance += distance;
-    }
-
-    private double averageSpeed = 0;
-    public double getAverageSpeed() {
-        return averageSpeed;
-    }
-    public void setAverageSpeed(double averageSpeed) {
-        this.averageSpeed = averageSpeed;
-    }
-
-    private double maxSpeed = 0;
-    public double getMaxSpeed() {
-        return maxSpeed;
-    }
-    public void setMaxSpeed(double maxSpeed) {
-        if (maxSpeed > this.maxSpeed) {
-            this.maxSpeed = maxSpeed;
-        }
-    }
-}
diff --git a/src/org/traccar/reports/model/SummaryReport.java b/src/org/traccar/reports/model/SummaryReport.java
new file mode 100644
index 000000000..aed3915f1
--- /dev/null
+++ b/src/org/traccar/reports/model/SummaryReport.java
@@ -0,0 +1,42 @@
+package org.traccar.reports.model;
+
+public class SummaryReport {
+
+    private String deviceName;
+    public String getDeviceName() {
+        return deviceName;
+    }
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
+    private double distance;
+    public double getDistance() {
+        return distance;
+    }
+    public void setDistance(double distance) {
+        this.distance = distance;
+    }
+
+    public void addDistance(double distance) {
+        this.distance += distance;
+    }
+
+    private double averageSpeed;
+    public double getAverageSpeed() {
+        return averageSpeed;
+    }
+    public void setAverageSpeed(double averageSpeed) {
+        this.averageSpeed = averageSpeed;
+    }
+
+    private double maxSpeed;
+    public double getMaxSpeed() {
+        return maxSpeed;
+    }
+    public void setMaxSpeed(double maxSpeed) {
+        if (maxSpeed > this.maxSpeed) {
+            this.maxSpeed = maxSpeed;
+        }
+    }
+}
-- 
cgit v1.2.3