Update of /var/cvs/src/org/mmbase/datatypes
In directory james.mmbase.org:/tmp/cvs-serv5412
Modified Files:
AbstractLengthDataType.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.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- AbstractLengthDataType.java 16 Sep 2007 17:55:28 -0000 1.24
+++ AbstractLengthDataType.java 8 Sep 2008 08:59:56 -0000 1.25
@@ -22,7 +22,7 @@
*
* @author Pierre van Rooden
* @author Michiel Meeuwissen
- * @version $Id: AbstractLengthDataType.java,v 1.24 2007/09/16 17:55:28
michiel Exp $
+ * @version $Id: AbstractLengthDataType.java,v 1.25 2008/09/08 08:59:56
michiel Exp $
* @since MMBase-1.8
*/
abstract public class AbstractLengthDataType<E> extends BasicDataType<E>
implements LengthDataType<E> {
@@ -130,8 +130,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: ComparableDataType.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/datatypes/ComparableDataType.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- ComparableDataType.java 1 Sep 2008 17:39:44 -0000 1.39
+++ ComparableDataType.java 8 Sep 2008 08:59:56 -0000 1.40
@@ -21,7 +21,7 @@
* therefore can have a minimum and a maximum value.
*
* @author Michiel Meeuwissen
- * @version $Id: ComparableDataType.java,v 1.39 2008/09/01 17:39:44 michiel
Exp $
+ * @version $Id: ComparableDataType.java,v 1.40 2008/09/08 08:59:56 michiel
Exp $
* @since MMBase-1.8
*/
public abstract class ComparableDataType<E extends java.io.Serializable &
Comparable<E>> extends BasicDataType<E> {
@@ -119,17 +119,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.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- StringDataType.java 16 Sep 2007 17:55:28 -0000 1.46
+++ StringDataType.java 8 Sep 2008 08:59:56 -0000 1.47
@@ -23,7 +23,7 @@
*
* @author Pierre van Rooden
* @author Michiel Meeuwissen
- * @version $Id: StringDataType.java,v 1.46 2007/09/16 17:55:28 michiel Exp $
+ * @version $Id: StringDataType.java,v 1.47 2008/09/08 08:59:56 michiel Exp $
* @since MMBase-1.8
*/
public class StringDataType extends ComparableDataType<String> implements
LengthDataType<String> {
@@ -232,9 +232,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);
}
public int getEnforceStrength() {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
