[MMBASE CVS] applications/richtext/src/org/mmbase/versioning VersioningCommitProcessor.java

[Michiel Meeuwissen]

Update of /var/cvs/applications/richtext/src/org/mmbase/versioning
In directory james.mmbase.org:/tmp/cvs-serv6256

Modified Files:
        VersioningCommitProcessor.java 
Log Message:
Take a default value for the versioning builder


See also: 
http://cvs.mmbase.org/viewcvs/applications/richtext/src/org/mmbase/versioning


Index: VersioningCommitProcessor.java
===================================================================
RCS file: 
/var/cvs/applications/richtext/src/org/mmbase/versioning/VersioningCommitProcessor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- VersioningCommitProcessor.java      11 Mar 2008 17:55:54 -0000      1.2
+++ VersioningCommitProcessor.java      12 Mar 2008 10:24:52 -0000      1.3
@@ -9,7 +9,7 @@
  * This commitprocessor copies on every commit the complete node to a 
'versioning' table.
  * @author Sander de Boer
  * @author Michiel Meeuwissen
- * @version $Id: VersioningCommitProcessor.java,v 1.2 2008/03/11 17:55:54 
michiel Exp $
+ * @version $Id: VersioningCommitProcessor.java,v 1.3 2008/03/12 10:24:52 
michiel Exp $
  * @since
  */
 
@@ -23,10 +23,13 @@
     public static final String OBJECT_FIELD    = "object";
     public static final String TIMESTAMP_FIELD = "timestamp";
 
-    public void commit(Node node, Field arg) {
+    public void commit(Node node, Field field) {
         NodeManager wo = node.getNodeManager();
         String versionBuilder = wo.getProperty("versionbuilder");
-        if (versionBuilder != null && !"".equals(versionBuilder)) {
+
+        if (versionBuilder == null || "".equals(versionBuilder)) {
+            versionBuilder = wo.getName() + "_versions";
+        }
             NodeManager wv = node.getCloud().getNodeManager(versionBuilder);
             log.debug("Found the version builder: '" + wv.getName() + "'");
 
@@ -35,8 +38,8 @@
             Node version = wv.createNode();
 
             //increase the version of the current node
-            int newVersionNo = node.getIntValue(VERSION_FIELD) + 1;
-            node.setIntValue(VERSION_FIELD, newVersionNo);
+        int newVersionNo = node.getIntValue(field.getName()) + 1;
+        node.setIntValue(field.getName(), newVersionNo);
 
             cloneNode(node, version);
 
@@ -53,11 +56,8 @@
                 //  http://www.mmbase.org/jira/browse/MMB-1522.
                 //  http://www.mmbase.org/jira/browse/MMB-1621 // This would 
also give a way to get  the 'old values'.
             }
-        } else {
-            log.error("No versionbuilder property");
         }
 
-    }
 
 
     private void cloneNode(Node source, Node dest) {
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs