cmlenz 02/04/20 10:57:04
Modified: src/share/org/apache/slide/content Tag: SLIDE_1_0
ContentImpl.java
Log:
Fixed ContentImpl so that it compiles (!)
(Sorry guys, I've been a bit in a hurry and obviously didn't check enough)h
Revision Changes Path
No revision
No revision
1.29.2.4 +12 -13
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.3
retrieving revision 1.29.2.4
diff -u -r1.29.2.3 -r1.29.2.4
--- ContentImpl.java 20 Apr 2002 16:06:55 -0000 1.29.2.3
+++ ContentImpl.java 20 Apr 2002 17:57:04 -0000 1.29.2.4
@@ -1,7 +1,7 @@
/*
- * $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 $
+ * $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/content/ContentImpl.java,v 1.29.2.4
2002/04/20 17:57:04 cmlenz Exp $
+ * $Revision: 1.29.2.4 $
+ * $Date: 2002/04/20 17:57:04 $
*
* ====================================================================
*
@@ -79,7 +79,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Remy Maucherat</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Christopher Lenz</a>
* @author Jean-Philippe Courson
- * @version $Revision: 1.29.2.3 $
+ * @version $Revision: 1.29.2.4 $
*/
public final class ContentImpl implements Content {
@@ -966,7 +966,7 @@
RevisionDescriptorNotFoundException, ObjectLockedException {
// Invoke interceptors
- invokeInterceptors(token, revisionDescriptors, null, PRE_REMOVE);
+ invokeInterceptors(token, revisionDescriptors, null, null, PRE_REMOVE);
// Retrieve the associated object
ObjectNode associatedObject = structureHelper.retrieve
@@ -990,7 +990,8 @@
objectUri.getStore().removeRevisionDescriptors(objectUri);
// Invoke interceptors
- invokeInterceptors(token, revisionDescriptors, null, POST_REMOVE);
+ invokeInterceptors(token, revisionDescriptors, null, null,
+ POST_REMOVE);
}
@@ -1047,7 +1048,7 @@
(objectUri, revisionNumber);
// Invoke interceptors
- invokeInterceptors(token, null, revisionDescriptor, PRE_REMOVE);
+ invokeInterceptors(token, null, revisionDescriptor, null, PRE_REMOVE);
objectUri.getStore().removeRevisionContent
(objectUri, revisionDescriptor);
@@ -1055,7 +1056,7 @@
.removeRevisionDescriptor(objectUri, revisionNumber);
// Invoke interceptors
- invokeInterceptors(token, null, revisionDescriptor, POST_REMOVE);
+ invokeInterceptors(token, null, revisionDescriptor, null, POST_REMOVE);
}
@@ -1224,15 +1225,13 @@
(token, revisionDescriptors,
revisionDescriptor, revisionContent);
break;
- case PRE_RETRIEVE:
+ case PRE_REMOVE:
contentInterceptors[i].preRemoveContent
- (token, revisionDescriptors,
- revisionDescriptor, revisionContent);
+ (token, revisionDescriptors, revisionDescriptor);
break;
case POST_REMOVE:
contentInterceptors[i].postRemoveContent
- (token, revisionDescriptors,
- revisionDescriptor, revisionContent);
+ (token, revisionDescriptors, revisionDescriptor);
break;
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
