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 re...@locus.apache.org on 2000/12/04 02:57:10 UTC
cvs commit: jakarta-slide/src/share/org/apache/slide/content ContentImpl.java NodeRevisionDescriptor.java
remm 00/12/03 17:57:10
Modified: src/share/org/apache/slide/content ContentImpl.java
NodeRevisionDescriptor.java
Log:
- Changes the way content length is set in the revision descriptor.
Revision Changes Path
1.13 +26 -27 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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ContentImpl.java 2000/12/04 01:36:26 1.12
+++ ContentImpl.java 2000/12/04 01:57:09 1.13
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/content/ContentImpl.java,v 1.12 2000/12/04 01:36:26 remm Exp $
- * $Revision: 1.12 $
- * $Date: 2000/12/04 01:36:26 $
+ * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/content/ContentImpl.java,v 1.13 2000/12/04 01:57:09 remm Exp $
+ * $Revision: 1.13 $
+ * $Date: 2000/12/04 01:57:09 $
*
* ====================================================================
*
@@ -77,7 +77,7 @@
* Implementation of the content interface.
*
* @author <a href="mailto:remm@apache.org">Remy Maucherat</a>
- * @version $Revision: 1.12 $
+ * @version $Revision: 1.13 $
*/
public final class ContentImpl implements Content {
@@ -415,6 +415,7 @@
// basing on an existing revision, if any.
NodeRevisionNumber newRevisionNumber = null;
if (revisionDescriptors.isVersioned()) {
+
if (revisionDescriptors.hasRevisions()) {
newRevisionNumber = new NodeRevisionNumber
(revisionDescriptors.getLatestRevision());
@@ -436,16 +437,16 @@
if (revisionDescriptor.getCreationDate() == null) {
revisionDescriptor.setCreationDate(new Date());
}
- // Now creating the revision desriptor in the store
- objectUri.getStore()
- .createRevisionDescriptor(objectUri, revisionDescriptor);
-
if (revisionContent != null) {
// Storing the new revision contents
objectUri.getStore()
.createRevisionContent(objectUri, revisionDescriptor,
revisionContent);
}
+ // Now creating the revision desriptor in the store
+ objectUri.getStore()
+ .createRevisionDescriptor(objectUri, revisionDescriptor);
+
} else {
// We don't use versioning for this object.
// Two options :
@@ -459,17 +460,30 @@
revisionDescriptor.setCreationDate(new Date());
}
if (!revisionDescriptors.hasRevisions()) {
- // Now creating the revision desriptor in the store
- objectUri.getStore()
- .createRevisionDescriptor(objectUri, revisionDescriptor);
-
if (revisionContent != null) {
// Storing the new revision contents
objectUri.getStore()
.createRevisionContent(objectUri, revisionDescriptor,
revisionContent);
}
+ // Now creating the revision desriptor in the store
+ objectUri.getStore()
+ .createRevisionDescriptor(objectUri, revisionDescriptor);
} else {
+ if (revisionContent != null) {
+ // Storing the new revision contents
+ try {
+ objectUri.getStore()
+ .storeRevisionContent(objectUri,
+ revisionDescriptor,
+ revisionContent);
+ } catch (RevisionNotFoundException e) {
+ objectUri.getStore()
+ .createRevisionContent(objectUri,
+ revisionDescriptor,
+ revisionContent);
+ }
+ }
try {
// We update the descriptor's properties
NodeRevisionDescriptor oldRevisionDescriptor =
@@ -495,21 +509,6 @@
objectUri.getStore()
.createRevisionDescriptor(objectUri,
revisionDescriptor);
- }
-
- if (revisionContent != null) {
- // Storing the new revision contents
- try {
- objectUri.getStore()
- .storeRevisionContent(objectUri,
- revisionDescriptor,
- revisionContent);
- } catch (RevisionNotFoundException e) {
- objectUri.getStore()
- .createRevisionContent(objectUri,
- revisionDescriptor,
- revisionContent);
- }
}
}
// Updating the descriptors object
1.9 +12 -12 jakarta-slide/src/share/org/apache/slide/content/NodeRevisionDescriptor.java
Index: NodeRevisionDescriptor.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/content/NodeRevisionDescriptor.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- NodeRevisionDescriptor.java 2000/12/01 07:17:28 1.8
+++ NodeRevisionDescriptor.java 2000/12/04 01:57:10 1.9
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/content/NodeRevisionDescriptor.java,v 1.8 2000/12/01 07:17:28 remm Exp $
- * $Revision: 1.8 $
- * $Date: 2000/12/01 07:17:28 $
+ * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/content/NodeRevisionDescriptor.java,v 1.9 2000/12/04 01:57:10 remm Exp $
+ * $Revision: 1.9 $
+ * $Date: 2000/12/04 01:57:10 $
*
* ====================================================================
*
@@ -78,7 +78,7 @@
* Node Revision Descriptor class.
*
* @author <a href="mailto:remm@apache.org">Remy Maucherat</a>
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
*/
public final class NodeRevisionDescriptor implements Serializable, Cloneable {
@@ -159,7 +159,7 @@
/**
* Constructor.
*/
- private NodeRevisionDescriptor() {
+ public NodeRevisionDescriptor() {
this.properties = new Hashtable();
this.labels = new Vector();
this.branchName = NodeRevisionDescriptors.MAIN_BRANCH;
@@ -612,7 +612,7 @@
*
* @param creationDate New creation date
*/
- void setCreationDate(Date creationDate) {
+ public void setCreationDate(Date creationDate) {
setProperty(CREATION_DATE, creationDate, true);
}
@@ -622,7 +622,7 @@
*
* @param creationDate New creation date
*/
- void setCreationDate(String creationDate) {
+ public void setCreationDate(String creationDate) {
setProperty(CREATION_DATE, creationDate, true);
}
@@ -667,7 +667,7 @@
*
* @param lastModified New last modified date
*/
- void setLastModified(Date lastModified) {
+ public void setLastModified(Date lastModified) {
setProperty(LAST_MODIFIED, lastModified, true);
}
@@ -677,7 +677,7 @@
*
* @param lastModified New last modified
*/
- void setLastModified(String lastModified) {
+ public void setLastModified(String lastModified) {
setProperty(LAST_MODIFIED, lastModified, true);
}
@@ -687,7 +687,7 @@
*
* @param creationLength New content length
*/
- void setContentLength(long contentLength) {
+ public void setContentLength(long contentLength) {
setProperty(CONTENT_LENGTH, new Long(contentLength), true);
}
@@ -697,7 +697,7 @@
*
* @param creationLength New content length
*/
- void setContentLength(String contentLength) {
+ public void setContentLength(String contentLength) {
Long contentLengthValue = Long.getLong(contentLength);
if (contentLengthValue == null) {
contentLengthValue = new Long(0);
@@ -739,7 +739,7 @@
// By default, a resource is a collection
setProperty(TYPE, "<collection/>", true);
setProperty(SOURCE, "", true);
- setContentLength(0);
+ setContentLength(-1);
setLastModified(new Date());
}