#1775 Users caching - revert changes; added jaxb-core

SCADA-LTS · Sep 20, 2021 · d9e1ada · d9e1ada
1 parent 5b629d1
commit d9e1ada
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
diff --git a/src/org/scada_lts/permissions/service/ViewUserPermissionsService.java b/src/org/scada_lts/permissions/service/ViewUserPermissionsService.java
@@ -18,17 +18,17 @@ public ViewUserPermissionsService(ViewDAO viewDAO) {
     }
 
     @Override
-    public List<ViewAccess> getPermissions(User object) {
-        return viewDAO.selectViewPermissions(object.getId());
+    public List<ViewAccess> getPermissions(User user) {
+        return viewDAO.selectViewPermissions(user.getId());
     }
 
     @Override
-    public void addOrUpdatePermissions(User object, List<ViewAccess> toAddOrUpdate) {
-        viewDAO.insertPermissions(object.getId(), toAddOrUpdate);
+    public void addOrUpdatePermissions(User user, List<ViewAccess> toAddOrUpdate) {
+        viewDAO.insertPermissions(user.getId(), toAddOrUpdate);
     }
 
     @Override
-    public void removePermissions(User object, List<ViewAccess> toRemove) {
-        viewDAO.deletePermissions(object.getId(), toRemove);
+    public void removePermissions(User user, List<ViewAccess> toRemove) {
+        viewDAO.deletePermissions(user.getId(), toRemove);
     }
 }
diff --git a/src/org/scada_lts/permissions/service/WatchListProfilePermissionsService.java b/src/org/scada_lts/permissions/service/WatchListProfilePermissionsService.java
@@ -17,17 +17,17 @@ public WatchListProfilePermissionsService(IUsersProfileDAO usersProfileDAO) {
     }
 
     @Override
-    public List<WatchListAccess> getPermissions(UsersProfileVO object) {
-        return usersProfileDAO.selectWatchListPermissionsByProfileId(object.getId());
+    public List<WatchListAccess> getPermissions(UsersProfileVO profile) {
+        return usersProfileDAO.selectWatchListPermissionsByProfileId(profile.getId());
     }
 
     @Override
-    public void addOrUpdatePermissions(UsersProfileVO object, List<WatchListAccess> toAddOrUpdate) {
-        usersProfileDAO.insertWatchListUsersProfile(object.getId(), toAddOrUpdate);
+    public void addOrUpdatePermissions(UsersProfileVO profile, List<WatchListAccess> toAddOrUpdate) {
+        usersProfileDAO.insertWatchListUsersProfile(profile.getId(), toAddOrUpdate);
     }
 
     @Override
-    public void removePermissions(UsersProfileVO object, List<WatchListAccess> toRemove) {
-        usersProfileDAO.deleteWatchListUsersProfile(object.getId(), toRemove);
+    public void removePermissions(UsersProfileVO profile, List<WatchListAccess> toRemove) {
+        usersProfileDAO.deleteWatchListUsersProfile(profile.getId(), toRemove);
     }
 }
diff --git a/src/org/scada_lts/permissions/service/WatchListUserPermissionsService.java b/src/org/scada_lts/permissions/service/WatchListUserPermissionsService.java
@@ -17,18 +17,18 @@ public WatchListUserPermissionsService(WatchListDAO watchListDAO) {
     }
 
     @Override
-    public List<WatchListAccess> getPermissions(User object) {
-        return watchListDAO.selectWatchListPermissions(object.getId());
+    public List<WatchListAccess> getPermissions(User user) {
+        return watchListDAO.selectWatchListPermissions(user.getId());
     }
 
     @Override
-    public void addOrUpdatePermissions(User object, List<WatchListAccess> toAddOrUpdate) {
-        watchListDAO.insertPermissions(object.getId(), toAddOrUpdate);
+    public void addOrUpdatePermissions(User user, List<WatchListAccess> toAddOrUpdate) {
+        watchListDAO.insertPermissions(user.getId(), toAddOrUpdate);
     }
 
     @Override
-    public void removePermissions(User object, List<WatchListAccess> toRemove) {
-        watchListDAO.deletePermissions(object.getId(), toRemove);
+    public void removePermissions(User user, List<WatchListAccess> toRemove) {
+        watchListDAO.deletePermissions(user.getId(), toRemove);
     }
 
 }
diff --git a/tomcat/lib/istack-commons-runtime-4.1.0-M1.jar b/tomcat/lib/istack-commons-runtime-4.1.0-M1.jar
diff --git a/tomcat/lib/jaxb-core-3.0.2.jar b/tomcat/lib/jaxb-core-3.0.2.jar