dflorey 2004/02/25 07:14:43
Modified: src/share/org/apache/slide/content ContentImpl.java
Log:
ContentEvent will not be fired for HIDDEN_0_0-Revisions anymore, because they
confuse the collections.
Revision Changes Path
1.55 +7 -7
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.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- ContentImpl.java 24 Feb 2004 16:47:07 -0000 1.54
+++ ContentImpl.java 25 Feb 2004 15:14:43 -0000 1.55
@@ -1002,7 +1002,7 @@
(objectUri, revisionDescriptor.getRevisionNumber());
// Fire event
- if ( ContentEvent.STORE.isEnabled() )
EventDispatcher.getInstance().fireVetoableEvent(ContentEvent.STORE, new
ContentEvent(this, token, namespace, objectUri.toString(), revisionDescriptors,
revisionDescriptor, revisionContent));
+ if ( revisionDescriptor.getRevisionNumber() !=
NodeRevisionNumber.HIDDEN_0_0 && ContentEvent.STORE.isEnabled() )
EventDispatcher.getInstance().fireVetoableEvent(ContentEvent.STORE, new
ContentEvent(this, token, namespace, objectUri.toString(), revisionDescriptors,
revisionDescriptor, revisionContent));
// Invoke interceptors
invokeInterceptors(token, revisionDescriptors, revisionDescriptor,
@@ -1141,7 +1141,7 @@
(objectUri, revisionNumber);
// Fire event
- if ( ContentEvent.REMOVE.isEnabled() )
EventDispatcher.getInstance().fireVetoableEvent(ContentEvent.REMOVE, new
ContentEvent(this, token, namespace, objectUri.toString(), revisionDescriptor));
+ if ( revisionNumber != NodeRevisionNumber.HIDDEN_0_0 &&
ContentEvent.REMOVE.isEnabled() )
EventDispatcher.getInstance().fireVetoableEvent(ContentEvent.REMOVE, new
ContentEvent(this, token, namespace, objectUri.toString(), revisionDescriptor));
// Invoke interceptors
invokeInterceptors(token, null, revisionDescriptor, null, PRE_REMOVE);
@@ -1339,7 +1339,7 @@
revisionDescriptor.setBranchName(branchName);
// Fire event
- if ( ContentEvent.CREATE.isEnabled() )
EventDispatcher.getInstance().fireVetoableEvent(ContentEvent.CREATE, new
ContentEvent(this, token, namespace, objectUri.toString(), revisionDescriptors,
revisionDescriptor));
+ if ( revisionDescriptor.getRevisionNumber() !=
NodeRevisionNumber.HIDDEN_0_0 && ContentEvent.CREATE.isEnabled() )
EventDispatcher.getInstance().fireVetoableEvent(ContentEvent.CREATE, new
ContentEvent(this, token, namespace, objectUri.toString(), revisionDescriptors,
revisionDescriptor));
// Invoke interceptors
invokeInterceptors(token, revisionDescriptors, revisionDescriptor,
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
