Update of /var/cvs/src/org/mmbase/module/builders
In directory james.mmbase.org:/tmp/cvs-serv10252
Modified Files:
Properties.java
Log Message:
just returning NodeList is enough of course
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.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- Properties.java 15 Jan 2009 19:48:13 -0000 1.19
+++ Properties.java 15 Jan 2009 19:59:18 -0000 1.20
@@ -45,7 +45,7 @@
</mm:nodelistfunction>
</pre>
*
- * @version $Id: Properties.java,v 1.19 2009/01/15 19:48:13 andre Exp $
+ * @version $Id: Properties.java,v 1.20 2009/01/15 19:59:18 andre Exp $
*/
public class Properties extends MMObjectBuilder {
@@ -67,7 +67,7 @@
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<Object> DEFAULT = new
Parameter<Object>("default", Object.class);
- protected final static Parameter[] LIST_PARAMETERS = { NODE, DEFAULT };
+ protected final static Parameter[] LIST_PARAMETERS = { NODE };
protected final static Parameter[] GET_PARAMETERS = { NODE, KEY, DEFAULT };
protected final static Parameter[] SET_PARAMETERS = { new
Parameter.Wrapper(GET_PARAMETERS), VALUE };
@@ -117,9 +117,7 @@
{
addFunction(new AbstractFunction<Object>("list", LIST_PARAMETERS) {
public Object getFunctionValue(Parameters parameters) {
- Object v =
Properties.this.getPropertyNodes(parameters.get(NODE));
- if (v == null) return parameters.get(DEFAULT);
- return v;
+ return
Properties.this.getPropertyNodes(parameters.get(NODE));
}
});
addFunction(new AbstractFunction<Object>("get", GET_PARAMETERS) {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
