[MMBASE SCM] r39841 - in mmbase/trunk/core/src/main/java/org/mmbase: module/core util/functions

[michiel]

Author: michiel
Date: 2009-11-23 11:37:23 +0100 (Mon, 23 Nov 2009)
New Revision: 39841

Modified:
   
mmbase/trunk/core/src/main/java/org/mmbase/module/core/MMObjectNodeFunction.java
   mmbase/trunk/core/src/main/java/org/mmbase/util/functions/NodeFunction.java
Log:
for basckwards compatibility made NodeFunction itself still accept CORENODE 
parameter

Modified: 
mmbase/trunk/core/src/main/java/org/mmbase/module/core/MMObjectNodeFunction.java
===================================================================
--- 
mmbase/trunk/core/src/main/java/org/mmbase/module/core/MMObjectNodeFunction.java
    2009-11-23 10:18:14 UTC (rev 39840)
+++ 
mmbase/trunk/core/src/main/java/org/mmbase/module/core/MMObjectNodeFunction.java
    2009-11-23 10:37:23 UTC (rev 39841)
@@ -55,15 +55,6 @@
     }
 
 
-    protected static Parameter[] getNodeParameterDef(Parameter... def) {
-        List<Parameter> defList = new ArrayList(Arrays.asList(def));
-        if (! defList.contains(Parameter.NODE)) defList.add(Parameter.NODE);
-        if (! defList.contains(Parameter.CLOUD)) defList.add(Parameter.CLOUD);
-        if (! defList.contains(Parameter.CORENODE)) 
defList.add(Parameter.CORENODE);
-        return defList.toArray(Parameter.emptyArray());
-    }
-
-
     protected static Node getNode(final MMObjectNode coreNode, final 
Parameters parameters) {
         if (coreNode == null) throw new RuntimeException("No node argument 
given for (" + parameters + ")!");
         Node node = parameters.get(Parameter.NODE);
@@ -183,6 +174,7 @@
                 if (log.isDebugEnabled()) {
                     log.debug("Now calling on " + wrappedFunction.getClass() + 
" " + wrappedFunction + " " + parameters);
                 }
+                parameters.set(Parameter.CORENODE, node); // hmm
                 return ((NodeFunction<Q>) 
wrappedFunction).getFunctionValueForNode(n, parameters);
             }
 

Modified: 
mmbase/trunk/core/src/main/java/org/mmbase/util/functions/NodeFunction.java
===================================================================
--- mmbase/trunk/core/src/main/java/org/mmbase/util/functions/NodeFunction.java 
2009-11-23 10:18:14 UTC (rev 39840)
+++ mmbase/trunk/core/src/main/java/org/mmbase/util/functions/NodeFunction.java 
2009-11-23 10:37:23 UTC (rev 39841)
@@ -94,6 +94,7 @@
         List<Parameter> defList = new ArrayList(Arrays.asList(def));
         if (! defList.contains(Parameter.NODE)) defList.add(Parameter.NODE);
         if (! defList.contains(Parameter.CLOUD)) defList.add(Parameter.CLOUD);
+        if (! defList.contains(Parameter.CORENODE)) 
defList.add(Parameter.CORENODE); // I bit silly, but added for backwards 
compatibility
         return defList.toArray(Parameter.emptyArray());
     }
 

_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs