fixing scaling images -> nullpointer, patch by yossarian

[mir.git] / source / mircoders / accesscontrol / AccessControl.java

diff --git a/source/mircoders/accesscontrol/AccessControl.java b/source/mircoders/accesscontrol/AccessControl.java
index 9f0dc3b..93a7d28 100755 (executable)
--- a/source/mircoders/accesscontrol/AccessControl.java
+++ b/source/mircoders/accesscontrol/AccessControl.java
@@ -36,8 +36,7 @@ import java.util.Vector;
 import mir.config.MirPropertiesConfiguration;
 import mir.log.LoggerWrapper;
 import mircoders.entity.EntityUsers;
-import mircoders.module.*;
-import mircoders.storage.*;
+import mircoders.module.ModuleContent;
 
 public class AccessControl {
   private UserAccessControl user;
@@ -122,11 +121,11 @@ public class AccessControl {
     }
 
     public boolean mayAddUsers(EntityUsers aSubject) {
-      return superusers.contains(aSubject.getValue("login"));
+      return superusers.contains(aSubject.getFieldValue("login"));
     }
 
     protected boolean isSuperUser(EntityUsers aUser) {
-      return superusers.contains(aUser.getValue("login"));
+      return superusers.contains(aUser.getFieldValue("login"));
     }
 
     public void assertMayEditUser(EntityUsers aSubject, EntityUsers anObject) throws AuthorizationExc, AuthorizationFailure {
@@ -141,11 +140,11 @@ public class AccessControl {
     }
 
     public boolean mayEditUser(EntityUsers aSubject, EntityUsers anObject) {
-      return superusers.contains(aSubject.getValue("login"));
+      return superusers.contains(aSubject.getFieldValue("login"));
     }
 
     public boolean mayEditUsers(EntityUsers aSubject) {
-      return superusers.contains(aSubject.getValue("login"));
+      return superusers.contains(aSubject.getFieldValue("login"));
     }
 
     public void assertMayDeleteUser(EntityUsers aSubject, EntityUsers anObject) throws AuthorizationExc, AuthorizationFailure {
@@ -159,15 +158,15 @@ public class AccessControl {
     }
 
     public boolean mayDeleteUser(EntityUsers aSubject, EntityUsers anObject) {
-      return superusers.contains(aSubject.getValue("login"));
+      return superusers.contains(aSubject.getFieldValue("login"));
     }
 
     public boolean mayDeleteUsers(EntityUsers aSubject) {
-      return superusers.contains(aSubject.getValue("login"));
+      return superusers.contains(aSubject.getFieldValue("login"));
     }
 
     public boolean mayChangeUserPassword(EntityUsers aSubject, EntityUsers anObject) {
-      return aSubject.getId().equals(anObject.getId()) || superusers.contains(aSubject.getValue("login"));
+      return aSubject.getId().equals(anObject.getId()) || superusers.contains(aSubject.getFieldValue("login"));
     }
 
     public void assertMayChangeUserPassword(EntityUsers aSubject, EntityUsers anObject) throws AuthorizationExc, AuthorizationFailure {
@@ -187,7 +186,7 @@ public class AccessControl {
     private boolean lockingOptional;
 
     public ArticleAccessControl(boolean aLockingEnabled, boolean aLockingOptional) {
-      contentModule = new ModuleContent(DatabaseContent.getInstance());
+      contentModule = new ModuleContent();
       lockingEnabled = aLockingEnabled;
       lockingOptional = aLockingOptional;
     }