From 1f2328bd8f4e341dda897fcd52418beb6cf1b83a Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Tue, 8 Mar 2016 22:05:40 +1300
Subject: Add new and update old data models

---
 src/org/traccar/database/DataManager.java        | 6 +++---
 src/org/traccar/database/PermissionsManager.java | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/org/traccar/database')

diff --git a/src/org/traccar/database/DataManager.java b/src/org/traccar/database/DataManager.java
index 73984952e..f040ecd20 100644
--- a/src/org/traccar/database/DataManager.java
+++ b/src/org/traccar/database/DataManager.java
@@ -39,7 +39,7 @@ import org.traccar.Config;
 import org.traccar.helper.Log;
 import org.traccar.model.Device;
 import org.traccar.model.MiscFormatter;
-import org.traccar.model.Permission;
+import org.traccar.model.DevicePermission;
 import org.traccar.model.Position;
 import org.traccar.model.Server;
 import org.traccar.model.User;
@@ -221,9 +221,9 @@ public class DataManager implements IdentityManager {
                 .executeUpdate();
     }
 
-    public Collection<Permission> getPermissions() throws SQLException {
+    public Collection<DevicePermission> getPermissions() throws SQLException {
         return QueryBuilder.create(dataSource, getQuery("database.getPermissionsAll"))
-                .executeQuery(Permission.class);
+                .executeQuery(DevicePermission.class);
     }
 
     public Collection<Device> getAllDevices() throws SQLException {
diff --git a/src/org/traccar/database/PermissionsManager.java b/src/org/traccar/database/PermissionsManager.java
index c676dea23..29228ceeb 100644
--- a/src/org/traccar/database/PermissionsManager.java
+++ b/src/org/traccar/database/PermissionsManager.java
@@ -22,7 +22,7 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 import org.traccar.helper.Log;
-import org.traccar.model.Permission;
+import org.traccar.model.DevicePermission;
 import org.traccar.model.Server;
 import org.traccar.model.User;
 
@@ -56,7 +56,7 @@ public class PermissionsManager {
             for (User user : dataManager.getUsers()) {
                 users.put(user.getId(), user);
             }
-            for (Permission permission : dataManager.getPermissions()) {
+            for (DevicePermission permission : dataManager.getPermissions()) {
                 getPermissions(permission.getUserId()).add(permission.getDeviceId());
             }
         } catch (SQLException error) {
-- 
cgit v1.2.3