From d31f68d80a8e3ae75fa0c2f02b9ca258486a3cad Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Wed, 26 Jul 2017 17:52:27 +0500
Subject: - Implement base manager classes as generics - Remame getDeviceById
 and getDeviceByUniqueId functions

---
 src/org/traccar/database/PermissionsManager.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/org/traccar/database/PermissionsManager.java')

diff --git a/src/org/traccar/database/PermissionsManager.java b/src/org/traccar/database/PermissionsManager.java
index 54e5ed979..3b03c1900 100644
--- a/src/org/traccar/database/PermissionsManager.java
+++ b/src/org/traccar/database/PermissionsManager.java
@@ -18,6 +18,7 @@ package org.traccar.database;
 import org.traccar.Context;
 import org.traccar.helper.Log;
 import org.traccar.model.Attribute;
+import org.traccar.model.BaseModel;
 import org.traccar.model.Calendar;
 import org.traccar.model.Device;
 import org.traccar.model.Driver;
@@ -99,7 +100,7 @@ public class PermissionsManager {
         devicePermissions.clear();
         try {
             GroupTree groupTree = new GroupTree(Context.getGroupsManager().getItems(
-                    Group.class, Context.getGroupsManager().getAllItems()),
+                    Context.getGroupsManager().getAllItems()),
                     Context.getDeviceManager().getAllDevices());
             for (Permission groupPermission : dataManager.getPermissions(User.class, Group.class)) {
                 Set<Long> userGroupPermissions = getGroupPermissions(groupPermission.getOwnerId());
@@ -284,7 +285,7 @@ public class PermissionsManager {
 
     public void checkPermission(Class<?> object, long userId, long objectId)
             throws SecurityException {
-        SimpleObjectManager manager = null;
+        SimpleObjectManager<? extends BaseModel> manager = null;
 
         if (object.equals(Device.class)) {
             checkDevice(userId, objectId);
-- 
cgit v1.2.3