cmlenz 02/04/20 09:06:55
Modified: src/share/org/apache/slide/content Tag: SLIDE_1_0
ContentImpl.java
Log:
- Add interceptor invocation on preRemove and postRemove
- Based on patches by Jean-Philippe Courson <courson at noos.fr>
Revision Changes Path
No revision
No revision
1.29.2.3 +28 -4
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.29.2.2
retrieving revision 1.29.2.3
diff -u -r1.29.2.2 -r1.29.2.3
--- ContentImpl.java 20 Apr 2002 15:27:15 -0000 1.29.2.2
+++ ContentImpl.java 20 Apr 2002 16:06:55 -0000 1.29.2.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/content/ContentImpl.java,v 1.29.2.2
2002/04/20 15:27:15 cmlenz Exp $
- * $Revision: 1.29.2.2 $
- * $Date: 2002/04/20 15:27:15 $
+ * $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/content/ContentImpl.java,v 1.29.2.3
2002/04/20 16:06:55 cmlenz Exp $
+ * $Revision: 1.29.2.3 $
+ * $Date: 2002/04/20 16:06:55 $
*
* ====================================================================
*
@@ -77,7 +77,9 @@
* Implementation of the content interface.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Remy Maucherat</a>
- * @version $Revision: 1.29.2.2 $
+ * @author <a href="mailto:[EMAIL PROTECTED]";>Christopher Lenz</a>
+ * @author Jean-Philippe Courson
+ * @version $Revision: 1.29.2.3 $
*/
public final class ContentImpl implements Content {
@@ -88,6 +90,8 @@
protected static final int PRE_STORE = 0;
protected static final int POST_STORE = 1;
protected static final int POST_RETRIEVE = 2;
+ protected static final int PRE_REMOVE = 3;
+ protected static final int POST_REMOVE = 4;
// ----------------------------------------------------------- Constructors
@@ -961,6 +965,9 @@
LinkedObjectNotFoundException, ServiceAccessException,
RevisionDescriptorNotFoundException, ObjectLockedException {
+ // Invoke interceptors
+ invokeInterceptors(token, revisionDescriptors, null, PRE_REMOVE);
+
// Retrieve the associated object
ObjectNode associatedObject = structureHelper.retrieve
(token, revisionDescriptors.getUri(), false);
@@ -982,6 +989,8 @@
objectUri.getStore().removeRevisionDescriptors(objectUri);
+ // Invoke interceptors
+ invokeInterceptors(token, revisionDescriptors, null, POST_REMOVE);
}
@@ -1037,11 +1046,16 @@
objectUri.getStore().retrieveRevisionDescriptor
(objectUri, revisionNumber);
+ // Invoke interceptors
+ invokeInterceptors(token, null, revisionDescriptor, PRE_REMOVE);
+
objectUri.getStore().removeRevisionContent
(objectUri, revisionDescriptor);
objectUri.getStore()
.removeRevisionDescriptor(objectUri, revisionNumber);
+ // Invoke interceptors
+ invokeInterceptors(token, null, revisionDescriptor, POST_REMOVE);
}
@@ -1207,6 +1221,16 @@
break;
case POST_RETRIEVE:
contentInterceptors[i].postRetrieveContent
+ (token, revisionDescriptors,
+ revisionDescriptor, revisionContent);
+ break;
+ case PRE_RETRIEVE:
+ contentInterceptors[i].preRemoveContent
+ (token, revisionDescriptors,
+ revisionDescriptor, revisionContent);
+ break;
+ case POST_REMOVE:
+ contentInterceptors[i].postRemoveContent
(token, revisionDescriptors,
revisionDescriptor, revisionContent);
break;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
