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/Events.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/org/traccar/reports/Events.java')

diff --git a/src/org/traccar/reports/Events.java b/src/org/traccar/reports/Events.java
index de4354371..9e14bd3db 100644
--- a/src/org/traccar/reports/Events.java
+++ b/src/org/traccar/reports/Events.java
@@ -20,7 +20,7 @@ public final class Events {
     public static String getJson(long userId, Collection<Long> deviceIds, Collection<Long> groupIds,
             Collection<String> types, Date from, Date to) throws SQLException {
         JsonObjectBuilder json = Json.createObjectBuilder();
-        for (long deviceId: ReportUtils.getReportedDevices(deviceIds, groupIds)) {
+        for (long deviceId: ReportUtils.getDeviceList(deviceIds, groupIds)) {
             Context.getPermissionsManager().checkDevice(userId, deviceId);
             for (String type : types) {
                 json.add(String.valueOf(deviceId), JsonConverter.arrayToJson(Context.getDataManager()
@@ -34,12 +34,12 @@ public final class Events {
             Collection<String> types, Date from, Date to) throws SQLException {
         CsvBuilder csv = new CsvBuilder();
         csv.addHeaderLine(new Event());
-        for (long deviceId: ReportUtils.getReportedDevices(deviceIds, groupIds)) {
+        for (long deviceId: ReportUtils.getDeviceList(deviceIds, groupIds)) {
             Context.getPermissionsManager().checkDevice(userId, deviceId);
             for (String type : types) {
                 csv.addArray(Context.getDataManager().getEvents(deviceId, type, from, to));
             }
         }
-        return csv.get();
+        return csv.build();
     }
 }
-- 
cgit v1.2.3