juergen 01/03/21 08:47:35
Modified: src/share/org/apache/slide/content ContentImpl.java
Log:
set the display name newly in case of a copy and a move command.
Revision Changes Path
1.23 +45 -45
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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ContentImpl.java 2001/03/08 15:20:22 1.22
+++ ContentImpl.java 2001/03/21 16:47:27 1.23
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/content/ContentImpl.java,v 1.22
2001/03/08 15:20:22 juergen Exp $
- * $Revision: 1.22 $
- * $Date: 2001/03/08 15:20:22 $
+ * $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/content/ContentImpl.java,v 1.23
2001/03/21 16:47:27 juergen Exp $
+ * $Revision: 1.23 $
+ * $Date: 2001/03/21 16:47:27 $
*
* ====================================================================
*
@@ -77,7 +77,7 @@
* Implementation of the content interface.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Remy Maucherat</a>
- * @version $Revision: 1.22 $
+ * @version $Revision: 1.23 $
*/
public final class ContentImpl implements Content {
@@ -419,6 +419,12 @@
}
setDefaultProperties(associatedObject, revisionDescriptor);
+ // set the creation date if not already set
+ if (revisionDescriptor.getCreationDate() == null) {
+ revisionDescriptor.setCreationDate(new Date());
+ }
+ // set the display name (in case of copy)
+ revisionDescriptor.setProperty("displayname", strUri);
Uri objectUri = namespace.getUri(strUri);
@@ -445,7 +451,7 @@
(revisionDescriptors.getLatestRevision());
revisionDescriptors
.addSuccessor(revisionDescriptors.getLatestRevision(),
- newRevisionNumber);
+ newRevisionNumber);
revisionDescriptors
.setSuccessors(newRevisionNumber, new Vector());
} else {
@@ -458,10 +464,7 @@
// We update the descriptor
revisionDescriptor.setRevisionNumber(newRevisionNumber);
- if (revisionDescriptor.getCreationDate() == null) {
- revisionDescriptor.setCreationDate(new Date());
- }
-
+
// Invoke interceptors
invokeInterceptors(token, revisionDescriptors, revisionDescriptor,
revisionContent, PRE_STORE);
@@ -485,9 +488,6 @@
// the initial revision
newRevisionNumber = new NodeRevisionNumber();
revisionDescriptor.setRevisionNumber(newRevisionNumber);
- if (revisionDescriptor.getCreationDate() == null) {
- revisionDescriptor.setCreationDate(new Date());
- }
if (!revisionDescriptors.hasRevisions()) {
@@ -509,21 +509,21 @@
} else {
try {
- { // merge the new received properties into the
revisionDescriptor
- // We update the descriptor's properties
- NodeRevisionDescriptor oldRevisionDescriptor =
- objectUri.getStore()
- .retrieveRevisionDescriptor(objectUri,
newRevisionNumber);
- Enumeration newPropertiesList =
- revisionDescriptor.enumerateProperties();
- while (newPropertiesList.hasMoreElements()) {
- oldRevisionDescriptor
- .setProperty( (NodeProperty)
newPropertiesList.nextElement() );
- }
-
- // now use the merged revision descriptor
- revisionDescriptor = oldRevisionDescriptor;
- } // end of merge
+ { // merge the new received properties into the
revisionDescriptor
+ // We update the descriptor's properties
+ NodeRevisionDescriptor oldRevisionDescriptor =
+ objectUri.getStore()
+ .retrieveRevisionDescriptor(objectUri,
newRevisionNumber);
+ Enumeration newPropertiesList =
+ revisionDescriptor.enumerateProperties();
+ while (newPropertiesList.hasMoreElements()) {
+ oldRevisionDescriptor
+ .setProperty( (NodeProperty)
newPropertiesList.nextElement() );
+ }
+
+ // now use the merged revision descriptor
+ revisionDescriptor = oldRevisionDescriptor;
+ } // end of merge
// Invoke interceptors
invokeInterceptors(token, revisionDescriptors,
@@ -905,7 +905,7 @@
// Invoke interceptors
invokeInterceptors(token, revisionDescriptors, revisionDescriptor,
revisionContent, PRE_STORE);
-
+
if (revisionContent != null) {
try {
objectUri.getStore().retrieveRevisionContent
@@ -928,7 +928,7 @@
// Invoke interceptors
invokeInterceptors(token, revisionDescriptors, revisionDescriptor,
revisionContent, POST_STORE);
-
+
}
@@ -1094,7 +1094,7 @@
.equals(latestNumberInBranch)) {
throw new RevisionAlreadyExistException
(objectUri.toString(), new NodeRevisionNumber
- (basedOnRevisionNumber));
+ (basedOnRevisionNumber));
}
// Next, generate the new revision's number
@@ -1172,21 +1172,21 @@
namespace.getContentInterceptors();
for (int i = 0; i < contentInterceptors.length; i++) {
switch (type) {
- case PRE_STORE:
- contentInterceptors[i].preStoreContent
- (token, revisionDescriptors,
- revisionDescriptor, revisionContent);
- break;
- case POST_STORE:
- contentInterceptors[i].postStoreContent
- (token, revisionDescriptors,
- revisionDescriptor, revisionContent);
- break;
- case POST_RETRIEVE:
- contentInterceptors[i].postRetrieveContent
- (token, revisionDescriptors,
- revisionDescriptor, revisionContent);
- break;
+ case PRE_STORE:
+ contentInterceptors[i].preStoreContent
+ (token, revisionDescriptors,
+ revisionDescriptor, revisionContent);
+ break;
+ case POST_STORE:
+ contentInterceptors[i].postStoreContent
+ (token, revisionDescriptors,
+ revisionDescriptor, revisionContent);
+ break;
+ case POST_RETRIEVE:
+ contentInterceptors[i].postRetrieveContent
+ (token, revisionDescriptors,
+ revisionDescriptor, revisionContent);
+ break;
}
}
}
