xlawrence 2005/06/22 11:12:03 CEST
Modified files: (Branch: JAHIA-HIBERNATE-BRANCH)
core/src/java/org/jahia/engines/shared BigText_Field.java
Log:
Corrected compilation problems due to changes in the APIs
Revision Changes Path
1.4.2.5 +4 -4
jahia/core/src/java/org/jahia/engines/shared/BigText_Field.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/engines/shared/BigText_Field.java.diff?r1=1.4.2.4&r2=1.4.2.5&f=h
Index: BigText_Field.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/engines/shared/BigText_Field.java,v
retrieving revision 1.4.2.4
retrieving revision 1.4.2.5
diff -u -r1.4.2.4 -r1.4.2.5
--- BigText_Field.java 21 Jun 2005 14:55:57 -0000 1.4.2.4
+++ BigText_Field.java 22 Jun 2005 09:12:02 -0000 1.4.2.5
@@ -56,7 +56,7 @@
import java.util.HashSet;
import org.jahia.utils.I18n;
-import org.jahia.services.acl.JahiaACLEntry;
+import org.jahia.hibernate.model.JahiaAclEntry;
import org.jahia.data.fields.FieldsEditHelper;
import org.jahia.data.fields.FieldsEditHelperAbstract;
@@ -369,7 +369,7 @@
final ContentFieldKey fieldKey = new
ContentFieldKey(theField.getID());
// first we remove all the existing references for this object.
- final ArrayList references =
ObjectLink.findByTypeAndLeftObjectKey(
+ final List references = ObjectLink.findByTypeAndLeftObjectKey(
"hardcodedLink", fieldKey);
final Iterator refIterator = references.iterator();
while (refIterator.hasNext()) {
@@ -518,8 +518,8 @@
final JahiaBaseACL aclObject = getFieldACLObject(field, jParams,
engineMap);
// Define an ACLEntry for "Read" Rights
- final JahiaACLEntry aclEntry = new JahiaACLEntry();
- aclEntry.setPermission(JahiaBaseACL.READ_RIGHTS,
JahiaACLEntry.ACL_YES);
+ final JahiaAclEntry aclEntry = new JahiaAclEntry();
+ aclEntry.setPermission(JahiaBaseACL.READ_RIGHTS,
JahiaAclEntry.ACL_YES);
// Get all the groups which can see the field
final Vector fieldACLGroups =
aclObject.getGroupnameListNoAdmin(aclEntry);
