remm 01/02/08 11:22:46
Modified: src/share/org/apache/slide/macro MacroImpl.java
Log:
- Will not attempt to delete any revision. Only the struture will be modified by
delete. This is the correct behavior IMO, because :
- If there is nothing in the structure, then the object is considered to not exist.
- The object along with all its revisions can be resurrected by recreating
it in the structure. This is very similar to CVS.
Revision Changes Path
1.8 +4 -14 jakarta-slide/src/share/org/apache/slide/macro/MacroImpl.java
Index: MacroImpl.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/macro/MacroImpl.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- MacroImpl.java 2001/02/01 23:19:12 1.7
+++ MacroImpl.java 2001/02/08 19:22:32 1.8
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/macro/MacroImpl.java,v 1.7
2001/02/01 23:19:12 remm Exp $
- * $Revision: 1.7 $
- * $Date: 2001/02/01 23:19:12 $
+ * $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/macro/MacroImpl.java,v 1.8
2001/02/08 19:22:32 remm Exp $
+ * $Revision: 1.8 $
+ * $Date: 2001/02/08 19:22:32 $
*
* ====================================================================
*
@@ -76,7 +76,7 @@
* Macro helper class.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Remy Maucherat</a>
- * @version $Revision: 1.7 $
+ * @version $Revision: 1.8 $
*/
public final class MacroImpl implements Macro {
@@ -414,16 +414,6 @@
deleteObject(token, (String) children.nextElement(),
e);
}
- }
-
- // Removing all revisions
- NodeRevisionDescriptors revisionDescriptors =
- contentHelper.retrieve(token, targetUri);
-
- // For now, only delete the initial revision
- if (revisionDescriptors.hasRevisions()) {
- contentHelper.remove(token, targetUri,
- revisionDescriptors.getInitialRevision());
}
// Removing object
