You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by ju...@apache.org on 2001/05/16 14:05:20 UTC
cvs commit: jakarta-slide/src/share/org/apache/slide/macro MacroImpl.java
juergen 01/05/16 05:05:20
Modified: src/share/org/apache/slide/macro MacroImpl.java
Log:
removed the NRD from the API, to be put in NodePermission, see e-mails.
Revision Changes Path
1.16 +6 -12 jakarta-slide/src/share/org/apache/slide/macro/MacroImpl.java
Index: MacroImpl.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/macro/MacroImpl.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- MacroImpl.java 2001/05/10 18:36:02 1.15
+++ MacroImpl.java 2001/05/16 12:05:15 1.16
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/macro/MacroImpl.java,v 1.15 2001/05/10 18:36:02 juergen Exp $
- * $Revision: 1.15 $
- * $Date: 2001/05/10 18:36:02 $
+ * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/macro/MacroImpl.java,v 1.16 2001/05/16 12:05:15 juergen Exp $
+ * $Revision: 1.16 $
+ * $Date: 2001/05/16 12:05:15 $
*
* ====================================================================
*
@@ -77,17 +77,11 @@
* Macro helper class.
*
* @author <a href="mailto:remm@apache.org">Remy Maucherat</a>
- * @version $Revision: 1.15 $
+ * @version $Revision: 1.16 $
*/
public final class MacroImpl implements Macro {
-
- /** private field to indicate, that the versionNumber is not correctly supported yet
- **/
- private static final NodeRevisionDescriptor dummyNodeRevisionDescriptor = null;
-
-
// ----------------------------------------------------------- Constructors
@@ -333,7 +327,7 @@
try {
Enumeration permissions = securityHelper
- .enumeratePermissions(token, object, dummyNodeRevisionDescriptor);
+ .enumeratePermissions(token, object);
while (permissions.hasMoreElements()) {
NodePermission permission =
@@ -343,7 +337,7 @@
permission.getSubjectUri(),
permission.getActionUri(),
permission.isInheritable());
- securityHelper.grantPermission(token, dummyNodeRevisionDescriptor, newPermission);
+ securityHelper.grantPermission(token, newPermission);
}
} catch (AccessDeniedException ex) {
@@ -451,15 +445,15 @@
// from it's associated stores
if (!revisionDescriptors.isVersioned()) {
// remove the associated locks
- Enumeration locks = lockHelper.enumerateLocks(token, targetUri, dummyNodeRevisionDescriptor);
+ Enumeration locks = lockHelper.enumerateLocks(token, targetUri);
while (locks.hasMoreElements()) {
- lockHelper.unlock(token, dummyNodeRevisionDescriptor, (NodeLock) locks.nextElement());
+ lockHelper.unlock(token, (NodeLock) locks.nextElement());
}
// remove the associated security
- Enumeration permissions = securityHelper.enumeratePermissions(token, targetUri, dummyNodeRevisionDescriptor);
+ Enumeration permissions = securityHelper.enumeratePermissions(token, targetUri);
while (permissions.hasMoreElements()) {
NodePermission permission = (NodePermission) permissions.nextElement();
- securityHelper.revokePermission(token, dummyNodeRevisionDescriptor, permission);
+ securityHelper.revokePermission(token, permission);
}
// remove the NodeRevisionDescriptor and associated content
if (revisionDescriptors.hasRevisions()) {