[MMBASE CVS] src/org/mmbase/module/builders Properties.java

[Michiel Meeuwissen]

Update of /var/cvs/src/org/mmbase/module/builders
In directory james.mmbase.org:/tmp/cvs-serv12886

Modified Files:
        Properties.java 
Log Message:
support for default value


See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/module/builders


Index: Properties.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/module/builders/Properties.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- Properties.java     12 Jun 2008 11:23:50 -0000      1.17
+++ Properties.java     12 Jun 2008 12:06:48 -0000      1.18
@@ -41,7 +41,7 @@
       </mm:cloud>
   </pre>
  *
- * @version $Id: Properties.java,v 1.17 2008/06/12 11:23:50 michiel Exp $
+ * @version $Id: Properties.java,v 1.18 2008/06/12 12:06:48 michiel Exp $
  */
 public class Properties extends MMObjectBuilder {
 
@@ -56,22 +56,29 @@
         }
     }
 
+    /**
+     * @since MMBase-1.8.6
+     */
     protected final static Parameter<Node>  NODE   = new 
Parameter<Node>("node", Node.class, true);
     protected final static Parameter<String> KEY   = new 
Parameter<String>("key", String.class, true);
     protected final static Parameter<Object> VALUE = new 
Parameter<Object>("value", Object.class);
-    protected final static Parameter[] GET_PARAMETERS = { NODE, KEY };
-    protected final static Parameter[] SET_PARAMETERS = {
-        new Parameter.Wrapper(GET_PARAMETERS),
-        new Parameter<Object>("value", Object.class)
-    };
+    protected final static Parameter<Object>  DEFAULT = new 
Parameter<Object>("default", Object.class);
+    protected final static Parameter[] GET_PARAMETERS = { NODE, KEY, DEFAULT };
+    protected final static Parameter[] SET_PARAMETERS = { new 
Parameter.Wrapper(GET_PARAMETERS), VALUE };
 
 
+    /**
+     * @since MMBase-1.8.6
+     */
     protected List<Node> getValueNode(Node node, String key) {
         NodeQuery q = 
node.getCloud().getNodeManager(Properties.this.getTableName()).createQuery();
         Queries.addConstraint(q, Queries.createConstraint(q, "parent", 
FieldCompareConstraint.EQUAL, node));
         Queries.addConstraint(q, Queries.createConstraint(q, "key", 
FieldCompareConstraint.EQUAL, key));
         return q.getNodeManager().getList(q);
     }
+    /**
+     * @since MMBase-1.8.6
+     */
     protected Object getValue(List<Node> prop) {
         if (prop.size() == 0) {
             return null;
@@ -85,6 +92,9 @@
             return result;
         }
     }
+    /**
+     * @since MMBase-1.8.6
+     */
     protected Object getValue(Node node, String key) {
         return getValue(getValueNode(node, key));
 
@@ -93,7 +103,9 @@
     {
         addFunction(new AbstractFunction<Object>("get", GET_PARAMETERS) {
                 public Object getFunctionValue(Parameters parameters) {
-                    return Properties.this.getValue(parameters.get(NODE), 
parameters.get(KEY));
+                    Object v = Properties.this.getValue(parameters.get(NODE), 
parameters.get(KEY));
+                    if (v == null) return parameters.get(DEFAULT);
+                    return v;
                 }
             });
         addFunction(new AbstractFunction<Object>("set", SET_PARAMETERS) {
@@ -139,6 +151,7 @@
                         n.setValue("value", newValue);
                         n.commit();
                     }
+                    if (orgValue == null) return parameters.get(DEFAULT);
                     return orgValue;
                 }
             });
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs