xlawrence 2005/07/15 14:38:13 CEST
Modified files:
core/src/java/org/jahia/services/acl JahiaAbstractACL.java
Log:
Cleanup and removed wrong dependencies to class org.jahia.service.acl.JahiaACL
Revision Changes Path
1.8 +13 -13
jahia/core/src/java/org/jahia/services/acl/JahiaAbstractACL.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/acl/JahiaAbstractACL.java.diff?r1=1.7&r2=1.8&f=h
Index: JahiaAbstractACL.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/acl/JahiaAbstractACL.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- JahiaAbstractACL.java 15 Jul 2005 10:10:45 -0000 1.7
+++ JahiaAbstractACL.java 15 Jul 2005 12:38:12 -0000 1.8
@@ -55,7 +55,7 @@
/**
* Abstract implementation of ACL functionality for public API use. Most of
- * the implementation of this class delegates to the private JahiaACL class
+ * the implementation of this class delegates to the private JahiaAcl class
* for the real functionality.
*
* This class acts as a proxy to the real implementation, so that we can
@@ -358,7 +358,7 @@
/**
* Same as the other getUsernameList method except that it uses the
* current ACL as ParentACLFinder implementation and as the ACLResource
- * @see #getUsernameList(ParentACLFinder, ACLResourceInterface,
JahiaACLEntry)
+ * @see #getUsernameList(ParentACLFinder, ACLResourceInterface,
JahiaAclEntry)
*
* @param entry Access rights bits map. Set this parameter to null to
get all the
* user names regarding their access rights.
@@ -396,7 +396,7 @@
* @throws JahiaACLException Throws an exception if the current ACL
object was not initialized
* correctly.
*/
- public List getUsernameList (ParentACLFinder parentACLFinder,
ACLResourceInterface aclResource, JahiaACLEntry entry)
+ public List getUsernameList (ParentACLFinder parentACLFinder,
ACLResourceInterface aclResource, JahiaAclEntry entry)
throws JahiaACLException {
testProxy ();
return mACL.getUsernameList (parentACLFinder, aclResource, entry);
@@ -478,7 +478,7 @@
throws JahiaACLException {
testProxy ();
synchronized (mACL) {
- boolean result = mACL.clearEntries (JahiaACL.GROUP_TYPE_ENTRY);
+ boolean result = mACL.clearEntries (JahiaAcl.GROUP_TYPE_ENTRY);
getService().updateCache(mACL);
return result;
}
@@ -488,7 +488,7 @@
/**
* Same as the other getGroupNameList method except that it uses the
* current ACL as ParentACLFinder implementation and as the ACLResource
- * @see #getGroupnameList(ParentACLFinder, ACLResourceInterface,
JahiaACLEntry)
+ * @see #getGroupnameList(ParentACLFinder, ACLResourceInterface,
JahiaAclEntry)
* @param entry Access rights bits map. Set this parameter to null to
get all the
* group names regarding their access rights.
* @return Return a Vector holding all the String representation of the
@@ -521,7 +521,7 @@
* @throws JahiaACLException Throws an exception if the current ACL
object was not initialized
* correctly.
*/
- public List getGroupnameList (ParentACLFinder parentACLFinder,
ACLResourceInterface aclResource, JahiaACLEntry entry)
+ public List getGroupnameList (ParentACLFinder parentACLFinder,
ACLResourceInterface aclResource, JahiaAclEntry entry)
throws JahiaACLException {
testProxy ();
return mACL.getGroupnameList (parentACLFinder, aclResource, entry);
@@ -531,7 +531,7 @@
/**
* Same as the other getGroupnameListNoAdmin method except that it uses
the
* current ACL as ParentACLFinder implementation and as the ACLResource
- * @see #getGroupnameListNoAdmin(ParentACLFinder, ACLResourceInterface,
JahiaACLEntry)
+ * @see #getGroupnameListNoAdmin(ParentACLFinder, ACLResourceInterface,
JahiaAclEntry)
*
* @param entry Access rights bits map. Set this parameter to null to
get all the
* group names regarding their access rights.
@@ -564,7 +564,7 @@
* group is present in the ACL, it will be empty.
* @throws JahiaACLException
*/
- public List getGroupnameListNoAdmin (ParentACLFinder parentACLFinder,
ACLResourceInterface aclResource, JahiaACLEntry entry)
+ public List getGroupnameListNoAdmin (ParentACLFinder parentACLFinder,
ACLResourceInterface aclResource, JahiaAclEntry entry)
throws JahiaACLException {
testProxy ();
return mACL.getGroupnameListNoAdmin (parentACLFinder, aclResource,
entry);
@@ -574,7 +574,7 @@
/**
* Same as the other getPermission method except that it uses the
* current ACL as ParentACLFinder implementation and as the ACLResource
- * @see #getPermission(ParentACLFinder, ACLResourceInterface,
JahiaACLEntry, JahiaUser, int)
+ * @see #getPermission(ParentACLFinder, ACLResourceInterface,
JahiaAclEntry, JahiaUser, int)
*
* @param user Reference to a non-null user object.
* @param permission Bit index of the requested access, this index
should be defined as
@@ -618,7 +618,7 @@
/**
* Same as the other getPermission method except that it uses the
* current ACL as ParentACLFinder implementation and as the ACLResource
- * @see #getPermission(ParentACLFinder, ACLResourceInterface,
JahiaACLEntry, JahiaUser, int, boolean)
+ * @see #getPermission(ParentACLFinder, ACLResourceInterface,
JahiaAclEntry, JahiaUser, int, boolean)
*
* @param user Reference to a non-null user object.
* @param permission Bit index of the requested access, this index
should be defined as
@@ -769,7 +769,7 @@
/**
* Same as the other getPermission method except that it uses the
* current ACL as ParentACLFinder implementation and as the ACLResource
- * @see #getPermission(ParentACLFinder, ACLResourceInterface,
JahiaACLEntry, JahiaGroup, int, boolean)
+ * @see #getPermission(ParentACLFinder, ACLResourceInterface,
JahiaAclEntry, JahiaGroup, int, boolean)
*
* @param group Reference to a non-null group object.
* @param permission Bit index of the requested access, this index
should be defined as
@@ -822,7 +822,7 @@
/**
* Same as the other getUsernameListAlsoGroupUsers method except that it
uses the
* current ACL as ParentACLFinder implementation and as the ACLResource
- * @see #getUsernameListAlsoGroupUsers(ParentACLFinder,
ACLResourceInterface, JahiaACLEntry)
+ * @see #getUsernameListAlsoGroupUsers(ParentACLFinder,
ACLResourceInterface, JahiaAclEntry)
*
* @param entry Access rights bits map. Set this parameter to null to
get all the
* user names regarding their access rights. Only one bit
of the entry
@@ -860,7 +860,7 @@
* @throws JahiaACLException Throws an exception if the current ACL
object was not initialized
* correctly.
*/
- public List getUsernameListAlsoGroupUsers (ParentACLFinder
parentACLFinder, ACLResourceInterface aclResource, JahiaACLEntry entry)
+ public List getUsernameListAlsoGroupUsers (ParentACLFinder
parentACLFinder, ACLResourceInterface aclResource, JahiaAclEntry entry)
throws JahiaACLException {
testProxy ();
return mACL.getUsernameListAlsoGroupUsers (parentACLFinder,
aclResource, entry);
