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 2002/06/10 08:15:42 UTC
cvs commit: jakarta-slide/src/webdav/server/org/apache/slide/webdav/method CopyMethod.java
juergen 2002/06/09 23:15:42
Modified: src/webdav/server/org/apache/slide/webdav/method
CopyMethod.java
Log:
Removed code to create a temporary NodeRevisionDescriptor(s) for the MacroHelper in case a Version is to be copied. This code is no longer needed (and does no longer work correctly) due to the changes in the Content helper (which can now retrieve the appropriate NodeRevisionDescriptor(s) for a Version).
(ralf)
Revision Changes Path
1.40 +3 -61 jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/CopyMethod.java
Index: CopyMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/CopyMethod.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- CopyMethod.java 28 May 2002 12:39:40 -0000 1.39
+++ CopyMethod.java 10 Jun 2002 06:15:42 -0000 1.40
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/CopyMethod.java,v 1.39 2002/05/28 12:39:40 juergen Exp $
- * $Revision: 1.39 $
- * $Date: 2002/05/28 12:39:40 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/CopyMethod.java,v 1.40 2002/06/10 06:15:42 juergen Exp $
+ * $Revision: 1.40 $
+ * $Date: 2002/06/10 06:15:42 $
*
* ====================================================================
*
@@ -308,20 +308,6 @@
sourceUri);
}
- if (uriHandler.isVersionUri()) {
-
- // create a temporary NodeRevisionDescriptor(s) to be copied
- // by the Macro helper (will be deleted in afterCopy())
- NodeRevisionDescriptors historyDescriptors = content.retrieve( slideToken, sourceUri);
- NodeRevisionDescriptor vrDescriptor = content.retrieve( slideToken, historyDescriptors);
- NodeRevisionContent vrContent = content.retrieve(slideToken, historyDescriptors, vrDescriptor);
-
- NodeRevisionDescriptor newRevisionDescriptor = cloneRevisionDescriptor(vrDescriptor, new NodeRevisionNumber(0, 0));
- NodeRevisionContent newRevisionContent = new NodeRevisionContent();
- newRevisionContent.setContent(vrContent.getContentBytes());
- content.create(slideToken, sourceUri, newRevisionDescriptor, newRevisionContent);
- }
-
}
}
@@ -400,15 +386,6 @@
versioningHelper.versionControl(destinationUri);
}
- // if the source was a VR, we have to remove the NodeRevisionDescriptor(s)
- // which has been created temporarily for the Macro helper
- // (see beforeCopy())
- UriHandler uriHandler = UriHandler.getUriHandler(sourceUri);
- if ( uriHandler.isVersionUri() ) {
- NodeRevisionDescriptors vrRevisionDescriptors = content.retrieve(slideToken, sourceUri);
- content.remove(slideToken, vrRevisionDescriptors);
- }
-
}
}
@@ -518,41 +495,6 @@
}
-
- /**
- * Returns a clone of the given <code>revisionDescriptor</code> with
- * the given <code>revisionNumber</code>.
- *
- * @param revisionDescriptor the NodeRevisionDescriptor to clone.
- * @param revisionNumber the NodeRevsionNumber to use for the clone.
- *
- * @return the cloned NodeRevisionDescriptor.
- */
- protected static NodeRevisionDescriptor cloneRevisionDescriptor(NodeRevisionDescriptor revisionDescriptor, NodeRevisionNumber revisionNumber) {
-
- String branchName = revisionDescriptor.getBranchName();
- Enumeration labelEnum = revisionDescriptor.enumerateLabels();
- Vector labels = new Vector();
- while (labelEnum.hasMoreElements()) {
- labels.add(labelEnum.nextElement());
- }
- Hashtable properties = new Hashtable();
- Enumeration propertiesEnum = revisionDescriptor.enumerateProperties();
- NodeProperty property = null;
- String name = null;
- String namespace = null;
- while (propertiesEnum.hasMoreElements()) {
- property = (NodeProperty)propertiesEnum.nextElement();
- name = property.getName();
- namespace = property.getNamespace();
- if (namespace != null) {
- name = namespace + name;
- }
- properties.put(name, property);
- }
- NodeRevisionDescriptor clone = new NodeRevisionDescriptor(revisionNumber, branchName, labels, properties);
- return clone;
- }
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>