xlawrence 2005/07/15 13:36:41 CEST
Modified files:
core/src/java/org/jahia/hibernate/model JahiaAcl.java
Log:
Cleanup and removed wrong dependencies to class
org.jahia.service.acl.JahiaACLEntry
Revision Changes Path
1.7 +11 -13
jahia/core/src/java/org/jahia/hibernate/model/JahiaAcl.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/model/JahiaAcl.java.diff?r1=1.6&r2=1.7&f=h
Index: JahiaAcl.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/model/JahiaAcl.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JahiaAcl.java 15 Jul 2005 10:10:45 -0000 1.6
+++ JahiaAcl.java 15 Jul 2005 11:36:40 -0000 1.7
@@ -24,8 +24,6 @@
import java.util.Map;
import java.util.Set;
import java.util.Vector;
-import org.jahia.services.acl.JahiaACLEntry;
-
/**
* @hibernate.class table="jahia_acl" lazy="false"
@@ -58,7 +56,7 @@
/**
* persistent field
*/
- private org.jahia.hibernate.model.JahiaAcl parent;
+ private JahiaAcl parent;
/**
* persistent field
@@ -180,11 +178,11 @@
* @hibernate.many-to-one not-null="false"
* @hibernate.column name="parent_id_jahia_acl"
*/
- public org.jahia.hibernate.model.JahiaAcl getParent() {
+ public JahiaAcl getParent() {
return this.parent;
}
- public void setParent(org.jahia.hibernate.model.JahiaAcl parent) {
+ public void setParent(JahiaAcl parent) {
this.parent = parent;
}
@@ -633,9 +631,9 @@
* @return a vector of hashtable keys.
*/
protected Vector getKeysFromHashTable(Map hashtable) {
- Vector vect = new Vector();
+ final Vector vect = new Vector();
- Iterator names = hashtable.keySet().iterator();
+ final Iterator names = hashtable.keySet().iterator();
while (names.hasNext()) {
vect.add(names.next());
}
@@ -859,19 +857,19 @@
// return null; //To change body of implemented methods use File |
Settings | File Templates.
}
- public List getUsernameList(ParentACLFinder parentACLFinder,
ACLResourceInterface aclResource, JahiaACLEntry entry) {
+ public List getUsernameList(ParentACLFinder parentACLFinder,
ACLResourceInterface aclResource, JahiaAclEntry entry) {
logger.fatal("Not implemented !");
throw new RuntimeException("Not implemented !");
// return null; //To change body of created methods use File |
Settings | File Templates.
}
- public List getGroupnameList(ParentACLFinder parentACLFinder,
ACLResourceInterface aclResource, JahiaACLEntry entry) {
+ public List getGroupnameList(ParentACLFinder parentACLFinder,
ACLResourceInterface aclResource, JahiaAclEntry entry) {
logger.fatal("Not implemented !");
throw new RuntimeException("Not implemented !");
// return null; //To change body of created methods use File |
Settings | File Templates.
}
- public List getGroupnameListNoAdmin(ParentACLFinder parentACLFinder,
ACLResourceInterface aclResource, JahiaACLEntry entry) {
+ public List getGroupnameListNoAdmin(ParentACLFinder parentACLFinder,
ACLResourceInterface aclResource, JahiaAclEntry entry) {
throw new RuntimeException("Not implemented !");
// return null; //To change body of created methods use File |
Settings | File Templates.
}
@@ -888,10 +886,10 @@
if (group != null) {
Hashtable table = new Hashtable();
recursePermissions(null, table);
- JahiaACLEntry entry = (JahiaACLEntry) table.get(group.getName());
+ JahiaAclEntry entry = (JahiaAclEntry) table.get(group.getName());
if (entry != null) {
result = (entry.getPermission(permission) ==
- JahiaACLEntry.ACL_YES);
+ JahiaAclEntry.ACL_YES);
}
table = null;
entry = null;
@@ -900,7 +898,7 @@
return result;
}
- public List getUsernameListAlsoGroupUsers(ParentACLFinder
parentACLFinder, ACLResourceInterface aclResource, JahiaACLEntry entry) {
+ public List getUsernameListAlsoGroupUsers(ParentACLFinder
parentACLFinder, ACLResourceInterface aclResource, JahiaAclEntry entry) {
logger.fatal("Not implemented !");
throw new RuntimeException("Not implemented !");
// return null; //To change body of created methods use File |
Settings | File Templates.
