aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/database/DataManager.java
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2016-03-08 22:05:40 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2016-03-08 22:05:40 +1300
commit1f2328bd8f4e341dda897fcd52418beb6cf1b83a (patch)
tree5d45665cc47058f7dddaf1f203914a5d832b996b /src/org/traccar/database/DataManager.java
parentfef4d92b25ef420f2926865b073835132881e7d6 (diff)
downloadtrackermap-server-1f2328bd8f4e341dda897fcd52418beb6cf1b83a.tar.gz
trackermap-server-1f2328bd8f4e341dda897fcd52418beb6cf1b83a.tar.bz2
trackermap-server-1f2328bd8f4e341dda897fcd52418beb6cf1b83a.zip
Add new and update old data models
Diffstat (limited to 'src/org/traccar/database/DataManager.java')
-rw-r--r--src/org/traccar/database/DataManager.java6
1 files changed, 3 insertions, 3 deletions
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 {