[MMBASE CVS] src/org/mmbase/bridge/util AbstractNode.java

[Michiel Meeuwissen]

Update of /var/cvs/src/org/mmbase/bridge/util
In directory james.mmbase.org:/tmp/cvs-serv17739/util

Modified Files:
        AbstractNode.java 
Log Message:
generics


See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/bridge/util


Index: AbstractNode.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/bridge/util/AbstractNode.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- AbstractNode.java   12 Sep 2008 11:15:26 -0000      1.23
+++ AbstractNode.java   16 Sep 2008 16:43:32 -0000      1.24
@@ -31,7 +31,7 @@
  * here, to minimalize the implementation effort of fully implemented Nodes.
  *
  * @author Michiel Meeuwissen
- * @version $Id: AbstractNode.java,v 1.23 2008/09/12 11:15:26 michiel Exp $
+ * @version $Id: AbstractNode.java,v 1.24 2008/09/16 16:43:32 michiel Exp $
  * @see org.mmbase.bridge.Node
  * @since MMBase-1.8
  */
@@ -732,17 +732,21 @@
 
     protected FieldValue createFunctionValue(final Object result) {
         return new AbstractFieldValue(this, getCloud()) {
-            @Override
-            public Object get() {
+            @Override public Object get() {
                 return result;
             }
         };
     }
 
-    public FieldValue getFunctionValue(String functionName, List parameters) {
+    public FieldValue getFunctionValue(String functionName, List<?> 
parameters) {
         Function function = getFunction(functionName);
-        Parameters params = function.createParameters();
+        Parameters params;
+        if (parameters instanceof Parameters) {
+            params = (Parameters) parameters;
+        } else {
+            params = function.createParameters();
         params.setAll(parameters);
+        }
         return createFunctionValue(function.getFunctionValue(params));
     }
 
@@ -756,8 +760,7 @@
             throw new NotFoundException("Function with name " + functionName + 
" does not exist on node " + getNumber() + " of type " + 
getNodeManager().getName() + "(known are " + getFunctions() + ")");
         }
         return new WrappedFunction(function) {
-                @Override
-                public final Object getFunctionValue(Parameters params) {
+                @Override public final Object getFunctionValue(Parameters 
params) {
                     if (params == null) params = createParameters();
                     params.setIfDefined(Parameter.NODE, AbstractNode.this);
                     params.setIfDefined(Parameter.CLOUD, 
AbstractNode.this.getCloud());
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs