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:04:30 UTC
cvs commit: jakarta-slide/src/share/org/apache/slide/content ContentImpl.java
juergen 01/05/16 05:04:30
Modified: src/share/org/apache/slide/content ContentImpl.java
Log:
removed the NRD from the API, to be put in NodePermission, see e-mails.
Revision Changes Path
1.27 +42 -47 jakarta-slide/src/share/org/apache/slide/content/ContentImpl.java
Index: ContentImpl.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/content/ContentImpl.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ContentImpl.java 2001/05/10 18:32:57 1.26
+++ ContentImpl.java 2001/05/16 12:04:24 1.27
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/content/ContentImpl.java,v 1.26 2001/05/10 18:32:57 juergen Exp $
- * $Revision: 1.26 $
- * $Date: 2001/05/10 18:32:57 $
+ * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/content/ContentImpl.java,v 1.27 2001/05/16 12:04:24 juergen Exp $
+ * $Revision: 1.27 $
+ * $Date: 2001/05/16 12:04:24 $
*
* ====================================================================
*
@@ -77,17 +77,11 @@
* Implementation of the content interface.
*
* @author <a href="mailto:remm@apache.org">Remy Maucherat</a>
- * @version $Revision: 1.26 $
+ * @version $Revision: 1.27 $
*/
public final class ContentImpl implements Content {
- /** private field to indicate, that the versionNumber is not correctly supported yet
- **/
- private static final NodeRevisionDescriptor dummyNodeRevisionDescriptor = null;
-
-
-
// -------------------------------------------------------------- Constants
@@ -170,9 +164,9 @@
// Checking security and locking
securityHelper.checkCredentials
- (token, associatedObject, dummyNodeRevisionDescriptor,
+ (token, associatedObject,
namespaceConfig.getReadRevisionMetadataAction());
- lockHelper.checkLock(token, associatedObject, dummyNodeRevisionDescriptor,
+ lockHelper.checkLock(token, associatedObject,
namespaceConfig.getReadRevisionMetadataAction());
Uri objectUri = namespace.getUri(token, strUri);
@@ -245,13 +239,14 @@
LinkedObjectNotFoundException, ServiceAccessException,
RevisionDescriptorNotFoundException, ObjectLockedException {
- ObjectNode associatedObject = structureHelper.retrieve(token, revisionDescriptors.getUri());
+ ObjectNode associatedObject = structureHelper
+ .retrieve(token, revisionDescriptors.getUri());
// Checking security and locking
securityHelper.checkCredentials
- (token, associatedObject, dummyNodeRevisionDescriptor,
+ (token, associatedObject,
namespaceConfig.getReadRevisionMetadataAction());
- lockHelper.checkLock(token, associatedObject, dummyNodeRevisionDescriptor,
+ lockHelper.checkLock(token, associatedObject,
namespaceConfig.getReadRevisionMetadataAction());
Uri objectUri = namespace.getUri(token, revisionDescriptors.getUri());
@@ -328,9 +323,9 @@
// Checking security and locking
securityHelper.checkCredentials
- (token, associatedObject, dummyNodeRevisionDescriptor,
+ (token, associatedObject,
namespaceConfig.getReadRevisionContentAction());
- lockHelper.checkLock(token, associatedObject, dummyNodeRevisionDescriptor,
+ lockHelper.checkLock(token, associatedObject,
namespaceConfig.getReadRevisionContentAction());
Uri objectUri = namespace.getUri(token, strUri);
@@ -363,18 +358,18 @@
// Next we do a security check and a locking check for modifyRevisions
securityHelper.checkCredentials
- (token, associatedObject, dummyNodeRevisionDescriptor,
+ (token, associatedObject,
namespaceConfig.getCreateRevisionMetadataAction());
lockHelper.checkLock
- (token, associatedObject, dummyNodeRevisionDescriptor,
+ (token, associatedObject,
namespaceConfig.getCreateRevisionMetadataAction());
if (namespaceConfig.getCreateRevisionMetadataAction() !=
namespaceConfig.getCreateRevisionContentAction()) {
securityHelper.checkCredentials
- (token, associatedObject, dummyNodeRevisionDescriptor,
+ (token, associatedObject,
namespaceConfig.getCreateRevisionContentAction());
lockHelper.checkLock
- (token, associatedObject, dummyNodeRevisionDescriptor,
+ (token, associatedObject,
namespaceConfig.getCreateRevisionContentAction());
}
@@ -408,18 +403,18 @@
// Next we do a security check and a locking check for modifyRevisions
securityHelper.checkCredentials
- (token, associatedObject, dummyNodeRevisionDescriptor,
+ (token, associatedObject,
namespaceConfig.getCreateRevisionMetadataAction());
lockHelper.checkLock
- (token, associatedObject, dummyNodeRevisionDescriptor,
+ (token, associatedObject,
namespaceConfig.getCreateRevisionMetadataAction());
if (namespaceConfig.getCreateRevisionMetadataAction() !=
namespaceConfig.getCreateRevisionContentAction()) {
securityHelper.checkCredentials
- (token, associatedObject, dummyNodeRevisionDescriptor,
+ (token, associatedObject,
namespaceConfig.getCreateRevisionContentAction());
lockHelper.checkLock
- (token, associatedObject, dummyNodeRevisionDescriptor,
+ (token, associatedObject,
namespaceConfig.getCreateRevisionContentAction());
}
@@ -518,8 +513,8 @@
} else {
try {
- {
- // merge the new received properties into the
+ {
+ // merge the new received properties into the
// revisionDescriptor
// We update the descriptor's properties
@@ -681,15 +676,15 @@
// Next we do a security check and a locking check for modifyRevisions
securityHelper.checkCredentials
- (token, associatedObject, dummyNodeRevisionDescriptor,
+ (token, associatedObject,
namespaceConfig.getCreateRevisionMetadataAction());
lockHelper.checkLock
- (token, associatedObject, dummyNodeRevisionDescriptor,
+ (token, associatedObject,
namespaceConfig.getCreateRevisionMetadataAction());
securityHelper.checkCredentials
- (token, associatedObject, dummyNodeRevisionDescriptor,
+ (token, associatedObject,
namespaceConfig.getCreateRevisionContentAction());
- lockHelper.checkLock(token, associatedObject, dummyNodeRevisionDescriptor,
+ lockHelper.checkLock(token, associatedObject,
namespaceConfig.getCreateRevisionContentAction());
Uri objectUri = namespace.getUri(token, strUri);
@@ -804,15 +799,15 @@
// Next we do a security check and a locking check for modifyRevisions
securityHelper.checkCredentials
- (token, associatedObject, dummyNodeRevisionDescriptor,
+ (token, associatedObject,
namespaceConfig.getCreateRevisionMetadataAction());
lockHelper.checkLock
- (token, associatedObject, dummyNodeRevisionDescriptor,
+ (token, associatedObject,
namespaceConfig.getCreateRevisionMetadataAction());
securityHelper.checkCredentials
- (token, associatedObject, dummyNodeRevisionDescriptor,
+ (token, associatedObject,
namespaceConfig.getCreateRevisionContentAction());
- lockHelper.checkLock(token, associatedObject, dummyNodeRevisionDescriptor,
+ lockHelper.checkLock(token, associatedObject,
namespaceConfig.getCreateRevisionContentAction());
setDefaultProperties(associatedObject, newRevisionDescriptor);
@@ -895,15 +890,15 @@
// Next we do a security check and a locking check for modifyRevisions
securityHelper.checkCredentials
- (token, associatedObject, dummyNodeRevisionDescriptor,
+ (token, associatedObject,
namespaceConfig.getModifyRevisionMetadataAction());
lockHelper.checkLock
- (token, associatedObject, dummyNodeRevisionDescriptor,
+ (token, associatedObject,
namespaceConfig.getModifyRevisionMetadataAction());
securityHelper.checkCredentials
- (token, associatedObject, dummyNodeRevisionDescriptor,
+ (token, associatedObject,
namespaceConfig.getModifyRevisionContentAction());
- lockHelper.checkLock(token, associatedObject, dummyNodeRevisionDescriptor,
+ lockHelper.checkLock(token, associatedObject,
namespaceConfig.getModifyRevisionContentAction());
setDefaultProperties(associatedObject, revisionDescriptor);
@@ -964,15 +959,15 @@
// Next we do a security check and a locking check for modifyRevisions
securityHelper.checkCredentials
- (token, associatedObject, dummyNodeRevisionDescriptor,
+ (token, associatedObject,
namespaceConfig.getRemoveRevisionMetadataAction());
lockHelper.checkLock
- (token, associatedObject, dummyNodeRevisionDescriptor,
+ (token, associatedObject,
namespaceConfig.getRemoveRevisionMetadataAction());
securityHelper.checkCredentials
- (token, associatedObject, dummyNodeRevisionDescriptor,
+ (token, associatedObject,
namespaceConfig.getRemoveRevisionContentAction());
- lockHelper.checkLock(token, associatedObject, dummyNodeRevisionDescriptor,
+ lockHelper.checkLock(token, associatedObject,
namespaceConfig.getRemoveRevisionContentAction());
Uri objectUri = namespace.getUri(token, revisionDescriptors.getUri());
@@ -1016,15 +1011,15 @@
// Next we do a security check and a locking check for modifyRevisions
securityHelper.checkCredentials
- (token, associatedObject, dummyNodeRevisionDescriptor,
+ (token, associatedObject,
namespaceConfig.getRemoveRevisionMetadataAction());
lockHelper.checkLock
- (token, associatedObject, dummyNodeRevisionDescriptor,
+ (token, associatedObject,
namespaceConfig.getRemoveRevisionMetadataAction());
securityHelper.checkCredentials
- (token, associatedObject, dummyNodeRevisionDescriptor,
+ (token, associatedObject,
namespaceConfig.getRemoveRevisionContentAction());
- lockHelper.checkLock(token, associatedObject, dummyNodeRevisionDescriptor,
+ lockHelper.checkLock(token, associatedObject,
namespaceConfig.getRemoveRevisionContentAction());
Uri objectUri = namespace.getUri(token, strUri);
@@ -1067,15 +1062,15 @@
// Next we do a security check and a locking check for modifyRevisions
securityHelper.checkCredentials
- (token, associatedObject, dummyNodeRevisionDescriptor,
+ (token, associatedObject,
namespaceConfig.getCreateRevisionMetadataAction());
lockHelper.checkLock
- (token, associatedObject, dummyNodeRevisionDescriptor,
+ (token, associatedObject,
namespaceConfig.getCreateRevisionMetadataAction());
securityHelper.checkCredentials
- (token, associatedObject, dummyNodeRevisionDescriptor,
+ (token, associatedObject,
namespaceConfig.getCreateRevisionContentAction());
- lockHelper.checkLock(token, associatedObject, dummyNodeRevisionDescriptor,
+ lockHelper.checkLock(token, associatedObject,
namespaceConfig.getCreateRevisionContentAction());
setDefaultProperties(associatedObject, newRevisionDescriptor);