[MMBASE SCM] r42420 - in mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/datatypes: processors util/xml

[michiel]

Author: michiel
Date: 2010-06-07 17:15:45 +0200 (Mon, 07 Jun 2010)
New Revision: 42420

Added:
   
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/datatypes/processors/DefaultOwner.java
Modified:
   
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/datatypes/util/xml/DataTypeDefinition.java
Log:
default processor for the owner field plus lowerd log

Added: 
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/datatypes/processors/DefaultOwner.java
===================================================================
--- 
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/datatypes/processors/DefaultOwner.java
                             (rev 0)
+++ 
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/datatypes/processors/DefaultOwner.java
     2010-06-07 15:15:45 UTC (rev 42420)
@@ -0,0 +1,45 @@
+/*
+
+This software is OSI Certified Open Source Software.
+OSI Certified is a certification mark of the Open Source Initiative.
+
+The license (Mozilla version 1.0) can be read at the MMBase site.
+See http://www.MMBase.org/license
+
+*/
+package org.mmbase.datatypes.processors;
+
+import org.mmbase.bridge.*;
+import org.mmbase.bridge.util.*;
+import org.mmbase.util.logging.*;
+
+
+/**
+
+ * @author Michiel Meeuwissen
+ * @version $Id$
+ * @since MMBase-1.9.4
+ */
+
+public class DefaultOwner  implements Processor {
+    private static final Logger LOG = 
Logging.getLoggerInstance(DefaultOwner.class);
+
+    public Object process(Node node, Field field, Object value) {
+        LOG.debug("Getting default value for " + field);
+        final Cloud cloud;
+        if (node == null) {
+            cloud = CloudThreadLocal.currentCloud();
+        } else {
+            cloud = node.getCloud();
+        }
+        if (cloud == null) {
+            LOG.debug("No cloud  using " + value);
+            return value;
+        } else {
+            return cloud.getUser().getOwnerField();
+        }
+    }
+
+}
+
+


Property changes on: 
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/datatypes/processors/DefaultOwner.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: 
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/datatypes/util/xml/DataTypeDefinition.java
===================================================================
--- 
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/datatypes/util/xml/DataTypeDefinition.java
 2010-06-07 14:24:14 UTC (rev 42419)
+++ 
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/datatypes/util/xml/DataTypeDefinition.java
 2010-06-07 15:15:45 UTC (rev 42420)
@@ -393,7 +393,7 @@
         Processor newProcessor = DataTypeXml.createProcessor(processorElement);
         Processor oldProcessor = dataType.getDefaultProcessor();
         newProcessor = DataTypeXml.chainProcessors(oldProcessor, newProcessor);
-        log.info("Setting default processor " + newProcessor);
+        log.debug("Setting default processor " + newProcessor);
         dataType.setDefaultProcessor(newProcessor);
     }
 
@@ -403,18 +403,9 @@
             restriction.setFixed(isFixed);
         }
         String enforce = DataTypeXml.getAttribute(element, 
"enforce").toLowerCase();
-        if (enforce.equals("absolute")) {
-            restriction.setEnforceStrength(DataType.ENFORCE_ABSOLUTE);
-        } else if (enforce.equals("always") || enforce.equals("")) {
-            restriction.setEnforceStrength(DataType.ENFORCE_ALWAYS);
-        } else if (enforce.equals("onchange")) {
-            restriction.setEnforceStrength(DataType.ENFORCE_ONCHANGE);
-        } else if (enforce.equals("oncreate")) {
-            restriction.setEnforceStrength(DataType.ENFORCE_ONCREATE);
-        } else if (enforce.equals("onvalidate")) {
-            restriction.setEnforceStrength(DataType.ENFORCE_ONVALIDATE);
-        } else if (enforce.equals("never")) {
-            restriction.setEnforceStrength(DataType.ENFORCE_NEVER);
+        int strength = DataTypes.getEnforceStrength(enforce);
+        if (strength != -1) {
+            restriction.setEnforceStrength(strength);
         } else {
             log.warn("Unrecognised value for 'enforce' attribute '" + enforce 
+ "' in " + XMLWriter.write(element, true, true));
         }

_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs