Update of /var/cvs/src/org/mmbase/datatypes
In directory james.mmbase.org:/tmp/cvs-serv5236
Modified Files:
BasicDataType.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: BasicDataType.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/datatypes/BasicDataType.java,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -b -r1.97 -r1.98
--- BasicDataType.java 27 Aug 2008 17:09:16 -0000 1.97
+++ BasicDataType.java 8 Sep 2008 08:56:56 -0000 1.98
@@ -40,7 +40,7 @@
* @author Pierre van Rooden
* @author Michiel Meeuwissen
* @since MMBase-1.8
- * @version $Id: BasicDataType.java,v 1.97 2008/08/27 17:09:16 michiel Exp $
+ * @version $Id: BasicDataType.java,v 1.98 2008/09/08 08:56:56 michiel Exp $
*/
public class BasicDataType<C> extends AbstractDescriptor implements
DataType<C>, Comparable<DataType<C>>, Descriptor {
@@ -660,10 +660,11 @@
public void toXml(Element parent) {
parent.setAttribute("id", getName());
- description.toXml("description", XMLNS, parent, "description");
+ guiName.toXml("name", XMLNS, parent, "name");
+ 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());
StringBuilder extend = new StringBuilder();
@@ -684,11 +685,11 @@
- xmlValue(getElement(parent, "default",
"description,class,property,default"), defaultValue);
+ xmlValue(getElement(parent, "default",
"name,description,class,property,default"), defaultValue);
- addRestriction(parent, "unique",
"description,class,property,default,unique", uniqueRestriction);
- addRestriction(parent, "required",
"description,class,property,default,unique,required", requiredRestriction);
- getElement(parent, "enumeration",
"description,class,property,default,unique,required,enumeration");
+ addRestriction(parent, "unique",
"name,description,class,property,default,unique", uniqueRestriction);
+ addRestriction(parent, "required",
"name.description,class,property,default,unique,required", requiredRestriction);
+ getElement(parent, "enumeration",
"name,description,class,property,default,unique,required,enumeration");
/// set this here...
/**
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
