Update of /var/cvs/src/org/mmbase/datatypes
In directory james.mmbase.org:/tmp/cvs-serv1556
Modified Files:
Tag: MMBase-1_8
BasicDataType.java DataType.java
Log Message:
MMB-1794
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/datatypes
See also: http://www.mmbase.org/jira/browse/MMB-1794
Index: BasicDataType.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/datatypes/BasicDataType.java,v
retrieving revision 1.61.2.10
retrieving revision 1.61.2.11
diff -u -b -r1.61.2.10 -r1.61.2.11
--- BasicDataType.java 8 Sep 2008 09:01:10 -0000 1.61.2.10
+++ BasicDataType.java 17 Mar 2009 14:45:55 -0000 1.61.2.11
@@ -38,7 +38,7 @@
* @author Pierre van Rooden
* @author Michiel Meeuwissen
* @since MMBase-1.8
- * @version $Id: BasicDataType.java,v 1.61.2.10 2008/09/08 09:01:10 michiel
Exp $
+ * @version $Id: BasicDataType.java,v 1.61.2.11 2009/03/17 14:45:55 michiel
Exp $
*/
public class BasicDataType extends AbstractDescriptor implements DataType,
Cloneable, Comparable, Descriptor {
@@ -405,6 +405,7 @@
case DataType.ENFORCE_ALWAYS: return "always";
case DataType.ENFORCE_ONCHANGE: return "onchange";
case DataType.ENFORCE_ONCREATE: return "oncreate";
+ case DataType.ENFORCE_ONVALIDATE: return "onvalidate";
case DataType.ENFORCE_NEVER: return "never";
default: return "???";
}
@@ -997,6 +998,7 @@
case DataType.ENFORCE_ALWAYS: return true;
case DataType.ENFORCE_ONCHANGE: if (node == null || field == null
|| node.isChanged(field.getName())) return true;
case DataType.ENFORCE_ONCREATE: if (node == null || node.isNew())
return true;
+ case DataType.ENFORCE_ONVALIDATE: return true;
case DataType.ENFORCE_NEVER: return false;
default: return true;
}
Index: DataType.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/datatypes/DataType.java,v
retrieving revision 1.54.2.1
retrieving revision 1.54.2.2
diff -u -b -r1.54.2.1 -r1.54.2.2
--- DataType.java 24 Apr 2008 11:41:58 -0000 1.54.2.1
+++ DataType.java 17 Mar 2009 14:45:55 -0000 1.54.2.2
@@ -38,7 +38,7 @@
* @author Pierre van Rooden
* @author Michiel Meeuwissen
* @since MMBase-1.8
- * @version $Id: DataType.java,v 1.54.2.1 2008/04/24 11:41:58 michiel Exp $
+ * @version $Id: DataType.java,v 1.54.2.2 2009/03/17 14:45:55 michiel Exp $
*/
public interface DataType extends Descriptor, Cloneable, Comparable,
Serializable {
@@ -76,6 +76,17 @@
static final int ENFORCE_ONCREATE = 1000;
/**
+ * Return value for {...@link DataType.Restriction#getEnforceStrength}.
This means that ta
+ * restriction on a value must be enforced only on validation of the
value. This means that it
+ * has no influence of the validity of the <em>node</em>.
+ * @todo No difference made between always/change/create for this. We
could also add
+ * ENfORCE_ONVALIDATE_CHANGE, ENFORMCE_ONVALIDATE_CREATE
+ * @since MMBase-1.9.1
+ */
+
+ static final int ENFORCE_ONVALIDATE = 500;
+
+ /**
* Return value for {...@link DataType.Restriction#getEnforceStrength}.
This means that the
* value must be enforced never, so the restriction serves only as UI
indication.
*/
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
