Update of /var/cvs/src/org/mmbase/module/core
In directory james.mmbase.org:/tmp/cvs-serv4072
Modified Files:
Tag: MMBase-1_8
MMObjectBuilder.java
Log Message:
MMB-1642
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/module/core
See also: http://www.mmbase.org/jira/browse/MMB-1642
Index: MMObjectBuilder.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/module/core/MMObjectBuilder.java,v
retrieving revision 1.391.2.16
retrieving revision 1.391.2.17
diff -u -b -r1.391.2.16 -r1.391.2.17
--- MMObjectBuilder.java 12 Apr 2008 10:43:04 -0000 1.391.2.16
+++ MMObjectBuilder.java 10 Jun 2008 09:19:48 -0000 1.391.2.17
@@ -62,7 +62,7 @@
* @author Rob van Maris
* @author Michiel Meeuwissen
* @author Ernst Bunders
- * @version $Id: MMObjectBuilder.java,v 1.391.2.16 2008/04/12 10:43:04
nklasens Exp $
+ * @version $Id: MMObjectBuilder.java,v 1.391.2.17 2008/06/10 09:19:48 michiel
Exp $
*/
public class MMObjectBuilder extends MMTable implements NodeEventListener,
RelationEventListener {
@@ -840,9 +840,10 @@
if (field.getName().equals(FIELD_NUMBER)) continue;
if (field.getName().equals(FIELD_OWNER)) continue;
if (field.getName().equals(FIELD_OBJECT_TYPE)) continue;
- if (field.getType() == Field.TYPE_NODE) continue;
- Object defaultValue = field.getDataType().getDefaultValue();
+ DataType dt = field.getDataType();
+ //log.info("" + field.getName() + " " + dt);
+ Object defaultValue = dt.getDefaultValue(null, null, field);
if ((defaultValue == null) && field.isNotNull()) {
Class clazz = Fields.typeToClass(field.getType());
if (clazz != null) {
@@ -1400,7 +1401,7 @@
* A complicated default implementation for GUI.
* @since MMBase-1.8
*/
- protected String getGUIIndicator(MMObjectNode node, Parameters pars) {
+ public String getGUIIndicator(MMObjectNode node, Parameters pars) {
Locale locale = (Locale) pars.get(Parameter.LOCALE);
String language = (String) pars.get(Parameter.LANGUAGE);
if (locale == null) {
@@ -1482,6 +1483,7 @@
}
}
rtn = org.mmbase.util.transformers.Xml.XMLEscape(rtn);
+
}
return rtn;
}
@@ -1526,6 +1528,7 @@
* You may want to override [EMAIL PROTECTED] #getNodeGUIIndicator} for
more flexibility.
* @param node The node to display
* @return the display of the node as a <code>String</code>
+ * @deprecated Override getNodeGUIIndicator, use [EMAIL PROTECTED]
MMObjectNode#getFunctionValue} or [EMAIL PROTECTED] #getFunctionValue}.
*/
public String getGUIIndicator(MMObjectNode node) {
return GUI_INDICATOR;
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
