From: <svn...@os...> - 2011-05-28 12:26:00
|
Author: jive Date: 2011-05-28 05:25:53 -0700 (Sat, 28 May 2011) New Revision: 37342 Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/InterpolateFunction.java trunk/modules/library/main/src/main/java/org/geotools/filter/function/string/ConcatenateFunction.java Log: clean up function name examples Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/InterpolateFunction.java =================================================================== --- trunk/modules/library/main/src/main/java/org/geotools/filter/function/InterpolateFunction.java 2011-05-28 11:34:44 UTC (rev 37341) +++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/InterpolateFunction.java 2011-05-28 12:25:53 UTC (rev 37342) @@ -188,18 +188,18 @@ }) )); Parameter<String> method = new Parameter<String>("method", - String.class, - Text.text("method"), - Text.text("numeric or color"), - false, - 0, - 1, - METHOD_NUMERIC, - new KVP(Parameter.OPTIONS, - Arrays.asList(new String[]{ - METHOD_NUMERIC, METHOD_COLOR - }) - )); + String.class, + Text.text("method"), + Text.text("numeric or color"), + false, + 0, + 1, + METHOD_NUMERIC, + new KVP(Parameter.OPTIONS, + Arrays.asList(new String[]{ + METHOD_NUMERIC, METHOD_COLOR + }) + )); NAME = new FunctionNameImpl("Interpolate", lookup,data1,value1,pairs,mode,method); } Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/string/ConcatenateFunction.java =================================================================== --- trunk/modules/library/main/src/main/java/org/geotools/filter/function/string/ConcatenateFunction.java 2011-05-28 11:34:44 UTC (rev 37341) +++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/string/ConcatenateFunction.java 2011-05-28 12:25:53 UTC (rev 37342) @@ -46,8 +46,7 @@ * Make the instance of FunctionName available in * a consistent spot. */ - public static final FunctionName NAME = new FunctionNameImpl("Concatenate", "text 1", "text 2", - "text 3"); + public static final FunctionName NAME = functionName("Concatenate", "text:String,2,"); public ConcatenateFunction() { this.functionName = NAME; |