[MMBASE CVS] src/org/mmbase/util/functions NodeFunction.java

[Michiel Meeuwissen]

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

Modified Files:
NodeFunction.java 
Log Message:
generics


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


Index: NodeFunction.java
===
RCS file: /var/cvs/src/org/mmbase/util/functions/NodeFunction.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- NodeFunction.java   11 Jul 2008 14:49:36 -  1.32
+++ NodeFunction.java   18 Sep 2008 09:48:29 -  1.33
@@ -23,7 +23,7 @@
  * the Parameter array of the constructor.
  *
  * @author Michiel Meeuwissen
- * @version $Id: NodeFunction.java,v 1.32 2008/07/11 14:49:36 michiel Exp $
+ * @version $Id: NodeFunction.java,v 1.33 2008/09/18 09:48:29 michiel Exp $
  * @see org.mmbase.module.core.MMObjectBuilder#executeFunction
  * @see org.mmbase.bridge.Node#getFunctionValue
  * @see org.mmbase.util.functions.BeanFunction
@@ -56,7 +56,7 @@
 log.warn(Tried to execute node-function on null!);
 return null;
 }
-List? args = new ArrayList();
+ListString args = new ArrayListString();
 String functionName = getFunctionNameAndFillArgs(function, args);
 if (log.isDebugEnabled()) {
 log.debug(Executing  + functionName +   + args +  on  + 
node.getNumber());
@@ -65,14 +65,14 @@
 return node.getFunctionValue(functionName, args);
 }
 
-public static String getFunctionNameAndFillArgs(String function, 
java.util.List args) {
+public static String getFunctionNameAndFillArgs(String function, 
java.util.ListString args) {
 String functionName = function;
 int pos1 = function.indexOf('(');
 if (pos1 != -1) {
 int pos2 = function.lastIndexOf(')');
 if (pos2 != -1) {
 functionName = function.substring(0, pos1);
-java.util.List args2 = 
org.mmbase.util.StringSplitter.splitFunctions(function.subSequence(pos1 + 1, 
pos2));
+java.util.ListString args2 = 
org.mmbase.util.StringSplitter.splitFunctions(function.subSequence(pos1 + 1, 
pos2));
 args.addAll(args2);
 }
 }
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] src/org/mmbase/util/functions NodeFunction.java

[Michiel Meeuwissen]

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

Modified Files:
NodeFunction.java 
Log Message:
foreach


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


Index: NodeFunction.java
===
RCS file: /var/cvs/src/org/mmbase/util/functions/NodeFunction.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- NodeFunction.java   25 Nov 2007 18:25:49 -  1.31
+++ NodeFunction.java   11 Jul 2008 14:49:36 -  1.32
@@ -23,7 +23,7 @@
  * the Parameter array of the constructor.
  *
  * @author Michiel Meeuwissen
- * @version $Id: NodeFunction.java,v 1.31 2007/11/25 18:25:49 nklasens Exp $
+ * @version $Id: NodeFunction.java,v 1.32 2008/07/11 14:49:36 michiel Exp $
  * @see org.mmbase.module.core.MMObjectBuilder#executeFunction
  * @see org.mmbase.bridge.Node#getFunctionValue
  * @see org.mmbase.util.functions.BeanFunction
@@ -144,9 +144,7 @@
 // This happens when calling gui() in transaction.
 // Perhaps we need something like a public new 
BasicNode(MMobjectNode, Cloud). Abusing VirtualNode for similar purpose now.
 org.mmbase.module.core.VirtualNode virtual = new 
org.mmbase.module.core.VirtualNode(coreNode.getBuilder());
-IteratorMap.EntryString, Object i = 
coreNode.getValues().entrySet().iterator();
-while (i.hasNext()) {
-Map.EntryString, Object entry =  i.next();
+for (Map.EntryString, Object entry : 
coreNode.getValues().entrySet()) {
 virtual.storeValue(entry.getKey(), 
entry.getValue());
 }
 node = new 
org.mmbase.bridge.implementation.VirtualNode(virtual, cloud);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs