Update of /var/cvs/src/org/mmbase/datatypes
In directory james.mmbase.org:/tmp/cvs-serv5485
Modified Files:
Tag: MMBase-1_8
AbstractLengthDataType.java BasicDataType.java
ComparableDataType.java StringDataType.java
Log Message:
MMB-1716
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/datatypes
See also: http://www.mmbase.org/jira/browse/MMB-1716
Index: AbstractLengthDataType.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/datatypes/AbstractLengthDataType.java,v
retrieving revision 1.16.2.4
retrieving revision 1.16.2.5
diff -u -b -r1.16.2.4 -r1.16.2.5
--- AbstractLengthDataType.java 20 Sep 2007 13:23:06 -0000 1.16.2.4
+++ AbstractLengthDataType.java 8 Sep 2008 09:01:10 -0000 1.16.2.5
@@ -22,7 +22,7 @@
*
* @author Pierre van Rooden
* @author Michiel Meeuwissen
- * @version $Id: AbstractLengthDataType.java,v 1.16.2.4 2007/09/20 13:23:06
michiel Exp $
+ * @version $Id: AbstractLengthDataType.java,v 1.16.2.5 2008/09/08 09:01:10
michiel Exp $
* @since MMBase-1.8
*/
abstract public class AbstractLengthDataType extends BasicDataType implements
LengthDataType {
@@ -125,8 +125,8 @@
public void toXml(Element parent) {
super.toXml(parent);
- addRestriction(parent, "minLength",
"description,class,property,default,unique,required,(minInclusive|minExclusive),(maxInclusive|maxExclusive),minLength",
minLengthRestriction);
- addRestriction(parent, "maxLength",
"description,class,property,default,unique,required,(minInclusive|minExclusive),(maxInclusive|maxExclusive),minLength,maxLength",
maxLengthRestriction);
+ addRestriction(parent, "minLength",
"name,description,class,property,default,unique,required,(minInclusive|minExclusive),(maxInclusive|maxExclusive),minLength",
minLengthRestriction);
+ addRestriction(parent, "maxLength",
"name,description,class,property,default,unique,required,(minInclusive|minExclusive),(maxInclusive|maxExclusive),minLength,maxLength",
maxLengthRestriction);
}
Index: BasicDataType.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/datatypes/BasicDataType.java,v
retrieving revision 1.61.2.9
retrieving revision 1.61.2.10
diff -u -b -r1.61.2.9 -r1.61.2.10
--- BasicDataType.java 8 Sep 2008 08:51:44 -0000 1.61.2.9
+++ BasicDataType.java 8 Sep 2008 09:01:10 -0000 1.61.2.10
@@ -38,7 +38,7 @@
* @author Pierre van Rooden
* @author Michiel Meeuwissen
* @since MMBase-1.8
- * @version $Id: BasicDataType.java,v 1.61.2.9 2008/09/08 08:51:44 michiel Exp
$
+ * @version $Id: BasicDataType.java,v 1.61.2.10 2008/09/08 09:01:10 michiel
Exp $
*/
public class BasicDataType extends AbstractDescriptor implements DataType,
Cloneable, Comparable, Descriptor {
@@ -437,7 +437,7 @@
description.toXml("description", XMLNS, parent, "name,description");
{
- Element classElement = getElement(parent, "class",
"description,class");
+ Element classElement = getElement(parent, "class",
"name,description,class");
classElement.setAttribute("name", getClass().getName());
StringBuffer extend = new StringBuffer();
Index: ComparableDataType.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/datatypes/ComparableDataType.java,v
retrieving revision 1.21.2.4
retrieving revision 1.21.2.5
diff -u -b -r1.21.2.4 -r1.21.2.5
--- ComparableDataType.java 9 Jun 2008 10:18:40 -0000 1.21.2.4
+++ ComparableDataType.java 8 Sep 2008 09:01:10 -0000 1.21.2.5
@@ -22,7 +22,7 @@
* therefore can have a minimum and a maximum value.
*
* @author Michiel Meeuwissen
- * @version $Id: ComparableDataType.java,v 1.21.2.4 2008/06/09 10:18:40
michiel Exp $
+ * @version $Id: ComparableDataType.java,v 1.21.2.5 2008/09/08 09:01:10
michiel Exp $
* @since MMBase-1.8
*/
public abstract class ComparableDataType extends BasicDataType {
@@ -120,17 +120,17 @@
if (minRestriction.getValue() != null) {
if (minRestriction.isInclusive()) {
- addRestriction(parent, "(minInclusive|minExclusive)",
"minInclusive",
"description,class,property,default,unique,required,(minInclusive|minExclusive)",
minRestriction);
+ addRestriction(parent, "(minInclusive|minExclusive)",
"minInclusive",
"name,description,class,property,default,unique,required,(minInclusive|minExclusive)",
minRestriction);
} else {
- addRestriction(parent, "(minExclusive|minInclusive)",
"minExclusive",
"description,class,property,default,unique,required,(minInclusive|minExclusive)",
minRestriction);
+ addRestriction(parent, "(minExclusive|minInclusive)",
"minExclusive",
"name,description,class,property,default,unique,required,(minInclusive|minExclusive)",
minRestriction);
}
}
if (maxRestriction.getValue() != null) {
if (maxRestriction.isInclusive()) {
- addRestriction(parent, "(maxInclusive|maxExclusive)",
"maxInclusive",
"description,class,property,default,unique,required,(minInclusive|minExclusive),(maxInclusive|maxExclusive)",
maxRestriction);
+ addRestriction(parent, "(maxInclusive|maxExclusive)",
"maxInclusive",
"name,description,class,property,default,unique,required,(minInclusive|minExclusive),(maxInclusive|maxExclusive)",
maxRestriction);
} else {
- addRestriction(parent, "(maxExclusive|maxInclusive)",
"maxInclusive",
"description,class,property,default,unique,required,(minInclusive|minExclusive),(maxInclusive|maxExclusive)",
maxRestriction);
+ addRestriction(parent, "(maxExclusive|maxInclusive)",
"maxInclusive",
"name,description,class,property,default,unique,required,(minInclusive|minExclusive),(maxInclusive|maxExclusive)",
maxRestriction);
}
}
Index: StringDataType.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/datatypes/StringDataType.java,v
retrieving revision 1.35.2.4
retrieving revision 1.35.2.5
diff -u -b -r1.35.2.4 -r1.35.2.5
--- StringDataType.java 20 Sep 2007 13:23:06 -0000 1.35.2.4
+++ StringDataType.java 8 Sep 2008 09:01:10 -0000 1.35.2.5
@@ -22,7 +22,7 @@
*
* @author Pierre van Rooden
* @author Michiel Meeuwissen
- * @version $Id: StringDataType.java,v 1.35.2.4 2007/09/20 13:23:06 michiel
Exp $
+ * @version $Id: StringDataType.java,v 1.35.2.5 2008/09/08 09:01:10 michiel
Exp $
* @since MMBase-1.8
*/
public class StringDataType extends ComparableDataType implements
LengthDataType {
@@ -231,9 +231,9 @@
public void toXml(org.w3c.dom.Element parent) {
super.toXml(parent);
- addRestriction(parent, "minLength",
"description,class,property,default,unique,required,(minInclusive|minExclusive),(maxInclusive|maxExclusive),minLength",
minLengthRestriction);
- addRestriction(parent, "maxLength",
"description,class,property,default,unique,required,(minInclusive|minExclusive),(maxInclusive|maxExclusive),minLength,maxLength",
maxLengthRestriction);
- addRestriction(parent, "pattern",
"description,class,property,default,unique,required,(minInclusive|minExclusive),(maxInclusive|maxExclusive),minLength,maxLength,length,pattern",
patternRestriction);
+ addRestriction(parent, "minLength",
"name,description,class,property,default,unique,required,(minInclusive|minExclusive),(maxInclusive|maxExclusive),minLength",
minLengthRestriction);
+ addRestriction(parent, "maxLength",
"name,description,class,property,default,unique,required,(minInclusive|minExclusive),(maxInclusive|maxExclusive),minLength,maxLength",
maxLengthRestriction);
+ addRestriction(parent, "pattern",
"name,description,class,property,default,unique,required,(minInclusive|minExclusive),(maxInclusive|maxExclusive),minLength,maxLength,length,pattern",
patternRestriction);
}
protected Collection validateCastValueOrNull(Collection errors, Object
castValue, Object value, Node node, Field field) {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
