Update of /var/cvs/src/org/mmbase/util/functions In directory james.mmbase.org:/tmp/cvs-serv16037
Modified Files: FunctionSet.java FunctionSets.java Functions.java Log Message: details only. See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util/functions Index: FunctionSet.java =================================================================== RCS file: /var/cvs/src/org/mmbase/util/functions/FunctionSet.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -b -r1.9 -r1.10 --- FunctionSet.java 14 Oct 2006 14:35:39 -0000 1.9 +++ FunctionSet.java 6 Jan 2009 15:16:49 -0000 1.10 @@ -15,12 +15,12 @@ * @see FunctionSets * @author Daniel Ockeloen * @author Michiel Meeuwissen - * @version $Id: FunctionSet.java,v 1.9 2006/10/14 14:35:39 nklasens Exp $ + * @version $Id: FunctionSet.java,v 1.10 2009/01/06 15:16:49 michiel Exp $ * @since MMBase-1.8 */ public class FunctionSet extends FunctionProvider { - private String name; + private final String name; private String description; public FunctionSet(String name, String description) { Index: FunctionSets.java =================================================================== RCS file: /var/cvs/src/org/mmbase/util/functions/FunctionSets.java,v retrieving revision 1.34 retrieving revision 1.35 diff -u -b -r1.34 -r1.35 --- FunctionSets.java 4 Sep 2008 05:56:23 -0000 1.34 +++ FunctionSets.java 6 Jan 2009 15:16:49 -0000 1.35 @@ -13,6 +13,7 @@ import org.mmbase.util.logging.Logging; import org.mmbase.util.xml.DocumentReader; import org.mmbase.util.*; +import org.mmbase.util.xml.XMLWriter; import java.io.*; import java.util.*; @@ -36,7 +37,7 @@ * @author Daniël Ockeloen * @author Michiel Meeuwissen * @since MMBase-1.8 - * @version $Id: FunctionSets.java,v 1.34 2008/09/04 05:56:23 michiel Exp $ + * @version $Id: FunctionSets.java,v 1.35 2009/01/06 15:16:49 michiel Exp $ */ public class FunctionSets { @@ -48,7 +49,7 @@ private static final Logger log = Logging.getLoggerInstance(FunctionSets.class); - private static final Map<String, FunctionSet> functionSets = new HashMap<String, FunctionSet>(); + private static final Map<String, FunctionSet> functionSets = new TreeMap<String, FunctionSet>(); static { org.mmbase.util.xml.EntityResolver.registerPublicID(PUBLIC_ID_FUNCTIONSET_1_0, DTD_FUNCTIONSET_1_0, FunctionSets.class); @@ -148,7 +149,7 @@ watcher.add(setResource); decodeFunctionSet(watcher.getResourceLoader(), setResource, setName); } catch (Throwable t) { - log.error(t.getMessage()); + log.error(t.getClass() + " " + t.getMessage(), t); } } } @@ -241,10 +242,14 @@ Function prev = functionSet.addFunction(fun); if (prev != null && ! (prev.equals(fun))) { log.warn("Replaced " + prev + " with " + fun + " in function set " + functionSet); + } else { + log.service("Found " + fun); } } catch (Exception e) { log.error(e.getMessage(), e); } + } else { + log.warn("No function name specified on " + XMLWriter.write(element)); } } } Index: Functions.java =================================================================== RCS file: /var/cvs/src/org/mmbase/util/functions/Functions.java,v retrieving revision 1.19 retrieving revision 1.20 diff -u -b -r1.19 -r1.20 --- Functions.java 20 Aug 2008 21:12:29 -0000 1.19 +++ Functions.java 6 Jan 2009 15:16:49 -0000 1.20 @@ -25,7 +25,7 @@ * @author Pierre van Rooden * @author Daniel Ockeloen * @author Michiel Meeuwissen - * @version $Id: Functions.java,v 1.19 2008/08/20 21:12:29 michiel Exp $ + * @version $Id: Functions.java,v 1.20 2009/01/06 15:16:49 michiel Exp $ */ public class Functions { @@ -63,7 +63,8 @@ patterns = true; } else { if (patterns) throw new IllegalArgumentException("PatternParameter's must be last in the definition"); - list.add(firstPattern, d); firstPattern++; + list.add(firstPattern, d); + firstPattern++; } } return list; _______________________________________________ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs