Menu
▾
▴
[Geotools-commits] svn - r38827 - trunk/modules/library/main/src/main/java/org/geotools/filter/function
|
From: <svn...@os...> - 2012-06-23 20:25:41
|
Author: aaime
Date: 2012-06-23 13:25:33 -0700 (Sat, 23 Jun 2012)
New Revision: 38827
Modified:
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_int2bbool.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_int2ddouble.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_interiorPoint.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_interiorRingN.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_intersection.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_intersects.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isClosed.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isEmpty.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isLike.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isNull.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isRing.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isSimple.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isValid.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isWithinDistance.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isometric.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_lessEqualThan.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_lessThan.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_minimumCircle.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_minimumDiameter.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_minimumRectangle.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_not.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_notEqualTo.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_numGeometries.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_numInteriorRing.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_numPoints.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_numberFormat.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_numberFormat2.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_octagonalEnvelope.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_offset.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_overlaps.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_parseBoolean.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_parseDouble.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_parseInt.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_parseLong.java
Log:
Giving function name QA a good kick (but not done)
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_int2bbool.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_int2bbool.java 2012-06-22 04:06:50 UTC (rev 38826)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_int2bbool.java 2012-06-23 20:25:33 UTC (rev 38827)
@@ -18,6 +18,8 @@
*/
//this code is autogenerated - you shouldnt be modifying it!
+import static org.geotools.filter.capability.FunctionNameImpl.parameter;
+
import org.geotools.filter.FunctionExpressionImpl;
import org.geotools.filter.capability.FunctionNameImpl;
import org.opengis.filter.capability.FunctionName;
@@ -29,17 +31,12 @@
*/
public class FilterFunction_int2bbool extends FunctionExpressionImpl {
- public static FunctionName NAME = new FunctionNameImpl("int2bbool","int");
+ public static FunctionName NAME = new FunctionNameImpl("int2bbool", Boolean.class, parameter("int", Integer.class));
public FilterFunction_int2bbool() {
- super("int2bbool");
- functionName = NAME;
+ super(NAME);
}
- public int getArgCount() {
- return 1;
- }
-
public Object evaluate(Object feature) {
int arg0;
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_int2ddouble.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_int2ddouble.java 2012-06-22 04:06:50 UTC (rev 38826)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_int2ddouble.java 2012-06-23 20:25:33 UTC (rev 38827)
@@ -18,6 +18,9 @@
*/
//this code is autogenerated - you shouldnt be modifying it!
+
+import static org.geotools.filter.capability.FunctionNameImpl.parameter;
+
import org.geotools.filter.FunctionExpressionImpl;
import org.geotools.filter.capability.FunctionNameImpl;
import org.opengis.filter.capability.FunctionName;
@@ -29,17 +32,12 @@
*/
public class FilterFunction_int2ddouble extends FunctionExpressionImpl {
- public static FunctionName NAME = new FunctionNameImpl("int2ddouble","int");
+ public static FunctionName NAME = new FunctionNameImpl("int2ddouble", Double.class, parameter("int", Integer.class));
public FilterFunction_int2ddouble() {
- super("int2ddouble");
- functionName = NAME;
+ super(NAME);
}
- public int getArgCount() {
- return 1;
- }
-
public Object evaluate(Object feature) {
int arg0;
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_interiorPoint.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_interiorPoint.java 2012-06-22 04:06:50 UTC (rev 38826)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_interiorPoint.java 2012-06-23 20:25:33 UTC (rev 38827)
@@ -18,11 +18,14 @@
*/
//this code is autogenerated - you shouldnt be modifying it!
+import static org.geotools.filter.capability.FunctionNameImpl.*;
+
import org.geotools.filter.FunctionExpressionImpl;
import org.geotools.filter.capability.FunctionNameImpl;
import org.opengis.filter.capability.FunctionName;
import com.vividsolutions.jts.geom.Geometry;
+import com.vividsolutions.jts.geom.Point;
/**
*
@@ -31,17 +34,12 @@
*/
public class FilterFunction_interiorPoint extends FunctionExpressionImpl {
- public static FunctionName NAME = new FunctionNameImpl("interiorPoint","geometry");
+ public static FunctionName NAME = new FunctionNameImpl("interiorPoint", Point.class, parameter("geometry", Geometry.class));
public FilterFunction_interiorPoint() {
- super("interiorPoint");
- functionName = NAME;
+ super(NAME);
}
- public int getArgCount() {
- return 1;
- }
-
public Object evaluate(Object feature) {
Geometry arg0;
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_interiorRingN.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_interiorRingN.java 2012-06-22 04:06:50 UTC (rev 38826)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_interiorRingN.java 2012-06-23 20:25:33 UTC (rev 38827)
@@ -18,11 +18,14 @@
*/
//this code is autogenerated - you shouldnt be modifying it!
+import static org.geotools.filter.capability.FunctionNameImpl.*;
+
import org.geotools.filter.FunctionExpressionImpl;
import org.geotools.filter.capability.FunctionNameImpl;
import org.opengis.filter.capability.FunctionName;
import com.vividsolutions.jts.geom.Geometry;
+import com.vividsolutions.jts.geom.LinearRing;
/**
*
@@ -31,17 +34,14 @@
*/
public class FilterFunction_interiorRingN extends FunctionExpressionImpl {
- public static FunctionName NAME = new FunctionNameImpl("interiorRingN","geometry","geometry");
+ public static FunctionName NAME = new FunctionNameImpl("interiorRingN", LinearRing.class,
+ parameter("geometry", Geometry.class),
+ parameter("n", Integer.class));
public FilterFunction_interiorRingN() {
- super("interiorRingN");
- functionName = NAME;
+ super(NAME);
}
- public int getArgCount() {
- return 2;
- }
-
public Object evaluate(Object feature) {
Geometry arg0;
int arg1;
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_intersection.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_intersection.java 2012-06-22 04:06:50 UTC (rev 38826)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_intersection.java 2012-06-23 20:25:33 UTC (rev 38827)
@@ -18,6 +18,8 @@
*/
//this code is autogenerated - you shouldnt be modifying it!
+import static org.geotools.filter.capability.FunctionNameImpl.parameter;
+
import org.geotools.filter.FunctionExpressionImpl;
import org.geotools.filter.capability.FunctionNameImpl;
import org.opengis.filter.capability.FunctionName;
@@ -30,17 +32,14 @@
* @source $URL$
*/
public class FilterFunction_intersection extends FunctionExpressionImpl {
- public static FunctionName NAME = new FunctionNameImpl("intersection","geometry","geometry");
+ public static FunctionName NAME = new FunctionNameImpl("intersection", Geometry.class,
+ parameter("geometry1", Geometry.class),
+ parameter("geometry2", Geometry.class));
public FilterFunction_intersection() {
- super("intersection");
- functionName = NAME;
+ super(NAME);
}
- public int getArgCount() {
- return 2;
- }
-
public Object evaluate(Object feature) {
Geometry arg0;
Geometry arg1;
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_intersects.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_intersects.java 2012-06-22 04:06:50 UTC (rev 38826)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_intersects.java 2012-06-23 20:25:33 UTC (rev 38827)
@@ -18,6 +18,8 @@
*/
//this code is autogenerated - you shouldnt be modifying it!
+import static org.geotools.filter.capability.FunctionNameImpl.parameter;
+
import org.geotools.filter.FunctionExpressionImpl;
import org.geotools.filter.capability.FunctionNameImpl;
import org.opengis.filter.capability.FunctionName;
@@ -31,17 +33,14 @@
*/
public class FilterFunction_intersects extends FunctionExpressionImpl {
- public static FunctionName NAME = new FunctionNameImpl("intersects","geometry","geometry");
+ public static FunctionName NAME = new FunctionNameImpl("intersects", Boolean.class,
+ parameter("geometry1", Geometry.class),
+ parameter("geometry2", Geometry.class));
public FilterFunction_intersects() {
- super("intersects");
- functionName = NAME;
+ super(NAME);
}
- public int getArgCount() {
- return 2;
- }
-
public Object evaluate(Object feature) {
Geometry arg0;
Geometry arg1;
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isClosed.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isClosed.java 2012-06-22 04:06:50 UTC (rev 38826)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isClosed.java 2012-06-23 20:25:33 UTC (rev 38827)
@@ -18,6 +18,8 @@
*/
//this code is autogenerated - you shouldnt be modifying it!
+import static org.geotools.filter.capability.FunctionNameImpl.parameter;
+
import org.geotools.filter.FunctionExpressionImpl;
import org.geotools.filter.capability.FunctionNameImpl;
import org.opengis.filter.capability.FunctionName;
@@ -31,17 +33,13 @@
*/
public class FilterFunction_isClosed extends FunctionExpressionImpl {
- public static FunctionName NAME = new FunctionNameImpl("isClosed","geometry");
+ public static FunctionName NAME = new FunctionNameImpl("isClosed", Boolean.class,
+ parameter("geometry", Geometry.class));
public FilterFunction_isClosed() {
- super("isClosed");
- functionName = NAME;
+ super(NAME);
}
- public int getArgCount() {
- return 1;
- }
-
public Object evaluate(Object feature) {
Geometry arg0;
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isEmpty.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isEmpty.java 2012-06-22 04:06:50 UTC (rev 38826)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isEmpty.java 2012-06-23 20:25:33 UTC (rev 38827)
@@ -18,6 +18,8 @@
*/
//this code is autogenerated - you shouldnt be modifying it!
+import static org.geotools.filter.capability.FunctionNameImpl.*;
+
import org.geotools.filter.FunctionExpressionImpl;
import org.geotools.filter.capability.FunctionNameImpl;
import org.opengis.filter.capability.FunctionName;
@@ -31,17 +33,13 @@
*/
public class FilterFunction_isEmpty extends FunctionExpressionImpl {
- public static FunctionName NAME = new FunctionNameImpl("isEmpty","geometry");
-
+ public static FunctionName NAME = new FunctionNameImpl("isEmpty", Boolean.class,
+ parameter("geometry", Geometry.class));
+
public FilterFunction_isEmpty() {
- super("isEmpty");
- functionName = NAME;
+ super(NAME);
}
- public int getArgCount() {
- return 1;
- }
-
public Object evaluate(Object feature) {
Geometry arg0;
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isLike.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isLike.java 2012-06-22 04:06:50 UTC (rev 38826)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isLike.java 2012-06-23 20:25:33 UTC (rev 38827)
@@ -18,6 +18,8 @@
*/
//this code is autogenerated - you shouldnt be modifying it!
+import static org.geotools.filter.capability.FunctionNameImpl.parameter;
+
import org.geotools.filter.FunctionExpressionImpl;
import org.geotools.filter.capability.FunctionNameImpl;
import org.opengis.filter.capability.FunctionName;
@@ -29,17 +31,14 @@
*/
public class FilterFunction_isLike extends FunctionExpressionImpl {
- public static FunctionName NAME = new FunctionNameImpl("isLike","string","regex");
+ public static FunctionName NAME = new FunctionNameImpl("isLike", Boolean.class,
+ parameter("string", String.class),
+ parameter("regex", String.class));
public FilterFunction_isLike() {
- super("isLike");
- functionName = NAME;
+ super(NAME);
}
- public int getArgCount() {
- return 2;
- }
-
public Object evaluate(Object feature) {
String arg0;
String arg1;
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isNull.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isNull.java 2012-06-22 04:06:50 UTC (rev 38826)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isNull.java 2012-06-23 20:25:33 UTC (rev 38827)
@@ -18,7 +18,11 @@
*/
//this code is autogenerated - you shouldnt be modifying it!
+import static org.geotools.filter.capability.FunctionNameImpl.*;
+
import org.geotools.filter.FunctionExpressionImpl;
+import org.geotools.filter.capability.FunctionNameImpl;
+import org.opengis.filter.capability.FunctionName;
/**
*
@@ -27,14 +31,14 @@
*/
public class FilterFunction_isNull extends FunctionExpressionImpl {
+ public static FunctionName NAME = new FunctionNameImpl("isNull", Boolean.class,
+ parameter("object", Object.class),
+ parameter("regex", String.class));
+
public FilterFunction_isNull() {
- super("isNull");
+ super(NAME);
}
- public int getArgCount() {
- return 1;
- }
-
public Object evaluate(Object feature) {
Object arg0;
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isRing.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isRing.java 2012-06-22 04:06:50 UTC (rev 38826)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isRing.java 2012-06-23 20:25:33 UTC (rev 38827)
@@ -18,6 +18,8 @@
*/
//this code is autogenerated - you shouldnt be modifying it!
+import static org.geotools.filter.capability.FunctionNameImpl.*;
+
import org.geotools.filter.FunctionExpressionImpl;
import org.geotools.filter.capability.FunctionNameImpl;
import org.opengis.filter.capability.FunctionName;
@@ -31,17 +33,13 @@
*/
public class FilterFunction_isRing extends FunctionExpressionImpl {
- public static FunctionName NAME = new FunctionNameImpl("isRing", "geometry");
+ public static FunctionName NAME = new FunctionNameImpl("isRing", Boolean.class,
+ parameter("geometry", Geometry.class));
public FilterFunction_isRing() {
- super("isRing");
- functionName = NAME;
+ super(NAME);
}
- public int getArgCount() {
- return 1;
- }
-
public Object evaluate(Object feature) {
Geometry arg0;
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isSimple.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isSimple.java 2012-06-22 04:06:50 UTC (rev 38826)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isSimple.java 2012-06-23 20:25:33 UTC (rev 38827)
@@ -18,6 +18,8 @@
*/
//this code is autogenerated - you shouldnt be modifying it!
+import static org.geotools.filter.capability.FunctionNameImpl.*;
+
import org.geotools.filter.FunctionExpressionImpl;
import org.geotools.filter.capability.FunctionNameImpl;
import org.opengis.filter.capability.FunctionName;
@@ -31,17 +33,13 @@
*/
public class FilterFunction_isSimple extends FunctionExpressionImpl {
- public static FunctionName NAME = new FunctionNameImpl("isSimple", "geometry");
+ public static FunctionName NAME = new FunctionNameImpl("isSimple", Boolean.class,
+ parameter("geometry", Geometry.class));
public FilterFunction_isSimple() {
- super("isSimple");
- functionName = NAME;
+ super(NAME);
}
- public int getArgCount() {
- return 1;
- }
-
public Object evaluate(Object feature) {
Geometry arg0;
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isValid.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isValid.java 2012-06-22 04:06:50 UTC (rev 38826)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isValid.java 2012-06-23 20:25:33 UTC (rev 38827)
@@ -18,6 +18,8 @@
*/
//this code is autogenerated - you shouldnt be modifying it!
+import static org.geotools.filter.capability.FunctionNameImpl.*;
+
import org.geotools.filter.FunctionExpressionImpl;
import org.geotools.filter.capability.FunctionNameImpl;
import org.opengis.filter.capability.FunctionName;
@@ -31,17 +33,13 @@
*/
public class FilterFunction_isValid extends FunctionExpressionImpl {
- public static FunctionName NAME = new FunctionNameImpl("isValid", "geometry");
+ public static FunctionName NAME = new FunctionNameImpl("isValid", Boolean.class,
+ parameter("geometry", Geometry.class));
public FilterFunction_isValid() {
- super("isValid");
- functionName = NAME;
+ super(NAME);
}
- public int getArgCount() {
- return 1;
- }
-
public Object evaluate(Object feature) {
Geometry arg0;
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isWithinDistance.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isWithinDistance.java 2012-06-22 04:06:50 UTC (rev 38826)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isWithinDistance.java 2012-06-23 20:25:33 UTC (rev 38827)
@@ -18,6 +18,8 @@
*/
//this code is autogenerated - you shouldnt be modifying it!
+import static org.geotools.filter.capability.FunctionNameImpl.parameter;
+
import org.geotools.filter.FunctionExpressionImpl;
import org.geotools.filter.capability.FunctionNameImpl;
import org.opengis.filter.capability.FunctionName;
@@ -31,17 +33,15 @@
*/
public class FilterFunction_isWithinDistance extends FunctionExpressionImpl {
- public static FunctionName NAME = new FunctionNameImpl("isWithinDistance", "geometry","geometry","distance");
+ public static FunctionName NAME = new FunctionNameImpl("isWithinDistance", Boolean.class,
+ parameter("geometry1", Geometry.class),
+ parameter("geometry2", Geometry.class),
+ parameter("distance", Double.class));
public FilterFunction_isWithinDistance() {
- super("isWithinDistance");
- functionName = NAME;
+ super(NAME);
}
- public int getArgCount() {
- return 3;
- }
-
public Object evaluate(Object feature) {
Geometry arg0;
Geometry arg1;
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isometric.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isometric.java 2012-06-22 04:06:50 UTC (rev 38826)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_isometric.java 2012-06-23 20:25:33 UTC (rev 38827)
@@ -19,6 +19,8 @@
//this was autogenerated and then hand modified to implement better support for geometry
// transformations in SLD
+import static org.geotools.filter.capability.FunctionNameImpl.parameter;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -45,17 +47,14 @@
public class FilterFunction_isometric extends FunctionExpressionImpl implements
GeometryTransformation {
- public static FunctionName NAME = new FunctionNameImpl("isometric", "geometry","extrusion");
+ public static FunctionName NAME = new FunctionNameImpl("isometric", Geometry.class,
+ parameter("geometry", Geometry.class),
+ parameter("extrusion", Double.class));
public FilterFunction_isometric() {
- super("isometric");
- functionName = NAME;
+ super(NAME);
}
- public int getArgCount() {
- return 2;
- }
-
public Object evaluate(Object feature) {
Geometry geom = getExpression(0).evaluate(feature, Geometry.class);
Double extrusion = getExpression(1).evaluate(feature, Double.class);
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_lessEqualThan.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_lessEqualThan.java 2012-06-22 04:06:50 UTC (rev 38826)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_lessEqualThan.java 2012-06-23 20:25:33 UTC (rev 38827)
@@ -18,22 +18,29 @@
*/
//this code is autogenerated - you shouldnt be modifying it!
+import static org.geotools.filter.capability.FunctionNameImpl.*;
+
import org.geotools.filter.FunctionExpressionImpl;
+import org.geotools.filter.capability.FunctionNameImpl;
+import org.opengis.filter.capability.FunctionName;
+import com.vividsolutions.jts.geom.Geometry;
+
/**
*
*
* @source $URL$
*/
public class FilterFunction_lessEqualThan extends FunctionExpressionImpl {
+
+ public static FunctionName NAME = new FunctionNameImpl("lessEqualThan", Boolean.class,
+ parameter("a", Number.class),
+ parameter("b", Number.class));
+
public FilterFunction_lessEqualThan() {
- super("lessEqualThan");
+ super(NAME);
}
- public int getArgCount() {
- return 2;
- }
-
public Object evaluate(Object feature) {
Object arg0;
Object arg1;
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_lessThan.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_lessThan.java 2012-06-22 04:06:50 UTC (rev 38826)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_lessThan.java 2012-06-23 20:25:33 UTC (rev 38827)
@@ -18,7 +18,11 @@
*/
//this code is autogenerated - you shouldnt be modifying it!
+import static org.geotools.filter.capability.FunctionNameImpl.*;
+
import org.geotools.filter.FunctionExpressionImpl;
+import org.geotools.filter.capability.FunctionNameImpl;
+import org.opengis.filter.capability.FunctionName;
/**
*
@@ -27,14 +31,14 @@
*/
public class FilterFunction_lessThan extends FunctionExpressionImpl {
+ public static FunctionName NAME = new FunctionNameImpl("lessThan", Boolean.class,
+ parameter("a", Number.class),
+ parameter("b", Number.class));
+
public FilterFunction_lessThan() {
- super("lessThan");
+ super(NAME);
}
- public int getArgCount() {
- return 2;
- }
-
public Object evaluate(Object feature) {
Object arg0;
Object arg1;
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_minimumCircle.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_minimumCircle.java 2012-06-22 04:06:50 UTC (rev 38826)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_minimumCircle.java 2012-06-23 20:25:33 UTC (rev 38827)
@@ -16,8 +16,12 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*/
+import static org.geotools.filter.capability.FunctionNameImpl.*;
+
import org.geotools.filter.FunctionExpression;
import org.geotools.filter.FunctionExpressionImpl;
+import org.geotools.filter.capability.FunctionNameImpl;
+import org.opengis.filter.capability.FunctionName;
import com.vividsolutions.jts.geom.Geometry;
@@ -27,23 +31,18 @@
*/
public class FilterFunction_minimumCircle extends FunctionExpressionImpl implements
FunctionExpression {
+
+ public static FunctionName NAME = new FunctionNameImpl("mincircle", Geometry.class,
+ parameter("geometry", Geometry.class));
/**
* Create a new FilterFunction_minimumCircle instance
*/
public FilterFunction_minimumCircle() {
- super("mincircle");
+ super(NAME);
}
/**
- * Get the number of arguments
- * @return The number of arguments
- */
- public int getArgCount() {
- return 1;
- }
-
- /**
* Calculate the Geometry's minimum bounding circle.
* @param feature The feature should be a Geometry
* @return The minimum bounding circle Geometry
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_minimumDiameter.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_minimumDiameter.java 2012-06-22 04:06:50 UTC (rev 38826)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_minimumDiameter.java 2012-06-23 20:25:33 UTC (rev 38827)
@@ -16,6 +16,8 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*/
+import static org.geotools.filter.capability.FunctionNameImpl.*;
+
import com.vividsolutions.jts.geom.Geometry;
import org.geotools.filter.FunctionExpressionImpl;
import org.geotools.filter.capability.FunctionNameImpl;
@@ -29,12 +31,10 @@
*/
public class FilterFunction_minimumDiameter extends FunctionExpressionImpl {
+ public static FunctionName NAME = new FunctionNameImpl("minimumdiameter", Geometry.class,
+ parameter("geometry", Geometry.class));
+
/**
- * The FunctionName
- */
- public static FunctionName NAME = new FunctionNameImpl("minimumdiameter","geometry");
-
- /**
* Create a new FilterFunction_minimumDiameter instance
*/
public FilterFunction_minimumDiameter() {
@@ -42,15 +42,6 @@
}
/**
- * Get the number of arguments
- * @return The number of arguments
- */
- @Override
- public int getArgCount() {
- return 1;
- }
-
- /**
* Calculate the Geometry's minimum diameter.
* @param feature The feature should be a Geometry
* @return The minimum diameter Geometry
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_minimumRectangle.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_minimumRectangle.java 2012-06-22 04:06:50 UTC (rev 38826)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_minimumRectangle.java 2012-06-23 20:25:33 UTC (rev 38827)
@@ -16,8 +16,12 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*/
+import static org.geotools.filter.capability.FunctionNameImpl.*;
+
import org.geotools.filter.FunctionExpression;
import org.geotools.filter.FunctionExpressionImpl;
+import org.geotools.filter.capability.FunctionNameImpl;
+import org.opengis.filter.capability.FunctionName;
import com.vividsolutions.jts.geom.Geometry;
@@ -29,21 +33,19 @@
FunctionExpression {
/**
+ * The FunctionName
+ */
+ public static FunctionName NAME = new FunctionNameImpl("minrectangle", Geometry.class,
+ parameter("geometry", Geometry.class));
+
+ /**
* Create a new FilterFunction_minimumRectangle instance
*/
public FilterFunction_minimumRectangle() {
- super("minrectangle");
+ super(NAME);
}
/**
- * Get the number of arguments
- * @return The number of arguments
- */
- public int getArgCount() {
- return 1;
- }
-
- /**
* Calculate the Geometry's minimum rectangle.
* @param feature The feature should be a Geometry
* @return The minimum rectangle Geometry
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_not.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_not.java 2012-06-22 04:06:50 UTC (rev 38826)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_not.java 2012-06-23 20:25:33 UTC (rev 38827)
@@ -18,8 +18,14 @@
*/
//this code is autogenerated - you shouldnt be modifying it!
+import static org.geotools.filter.capability.FunctionNameImpl.*;
+
import org.geotools.filter.FunctionExpressionImpl;
+import org.geotools.filter.capability.FunctionNameImpl;
+import org.opengis.filter.capability.FunctionName;
+import com.vividsolutions.jts.geom.Geometry;
+
/**
*
*
@@ -27,14 +33,13 @@
*/
public class FilterFunction_not extends FunctionExpressionImpl {
+ public static FunctionName NAME = new FunctionNameImpl("not", Boolean.class,
+ parameter("logicValue", Boolean.class));
+
public FilterFunction_not() {
- super("not");
+ super(NAME);
}
- public int getArgCount() {
- return 1;
- }
-
public Object evaluate(Object feature) {
boolean arg0;
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_notEqualTo.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_notEqualTo.java 2012-06-22 04:06:50 UTC (rev 38826)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_notEqualTo.java 2012-06-23 20:25:33 UTC (rev 38827)
@@ -18,7 +18,11 @@
*/
//this code is autogenerated - you shouldnt be modifying it!
+import static org.geotools.filter.capability.FunctionNameImpl.*;
+
import org.geotools.filter.FunctionExpressionImpl;
+import org.geotools.filter.capability.FunctionNameImpl;
+import org.opengis.filter.capability.FunctionName;
/**
*
@@ -26,14 +30,15 @@
* @source $URL$
*/
public class FilterFunction_notEqualTo extends FunctionExpressionImpl {
+
+ public static FunctionName NAME = new FunctionNameImpl("notEqualTo", Boolean.class,
+ parameter("a", Object.class),
+ parameter("b", Object.class));
+
public FilterFunction_notEqualTo() {
- super("notEqualTo");
+ super(NAME);
}
- public int getArgCount() {
- return 2;
- }
-
public Object evaluate(Object feature) {
Object arg0;
Object arg1;
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_numGeometries.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_numGeometries.java 2012-06-22 04:06:50 UTC (rev 38826)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_numGeometries.java 2012-06-23 20:25:33 UTC (rev 38827)
@@ -18,6 +18,8 @@
*/
//this code is autogenerated - you shouldnt be modifying it!
+import static org.geotools.filter.capability.FunctionNameImpl.*;
+
import org.geotools.filter.FunctionExpressionImpl;
import org.geotools.filter.capability.FunctionNameImpl;
import org.opengis.filter.capability.FunctionName;
@@ -30,10 +32,12 @@
* @source $URL$
*/
public class FilterFunction_numGeometries extends FunctionExpressionImpl {
- public static FunctionName NAME = new FunctionNameImpl("numGeometries","geometry");
+
+ public static FunctionName NAME = new FunctionNameImpl("numGeometries", Integer.class,
+ parameter("geometry", Geometry.class));
+
public FilterFunction_numGeometries() {
- super("numGeometries");
- functionName = NAME;
+ super(NAME);
}
public int getArgCount() {
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_numInteriorRing.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_numInteriorRing.java 2012-06-22 04:06:50 UTC (rev 38826)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_numInteriorRing.java 2012-06-23 20:25:33 UTC (rev 38827)
@@ -18,6 +18,8 @@
*/
//this code is autogenerated - you shouldnt be modifying it!
+import static org.geotools.filter.capability.FunctionNameImpl.*;
+
import org.geotools.filter.FunctionExpressionImpl;
import org.geotools.filter.capability.FunctionNameImpl;
import org.opengis.filter.capability.FunctionName;
@@ -30,17 +32,14 @@
* @source $URL$
*/
public class FilterFunction_numInteriorRing extends FunctionExpressionImpl {
- public static FunctionName NAME = new FunctionNameImpl("numInteriorRing","polygon");
+
+ public static FunctionName NAME = new FunctionNameImpl("numInteriorRing", Integer.class,
+ parameter("geometry", Geometry.class));
public FilterFunction_numInteriorRing() {
- super("numInteriorRing");
- functionName = NAME;
+ super(NAME);
}
- public int getArgCount() {
- return 1;
- }
-
public Object evaluate(Object feature) {
Geometry arg0;
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_numPoints.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_numPoints.java 2012-06-22 04:06:50 UTC (rev 38826)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_numPoints.java 2012-06-23 20:25:33 UTC (rev 38827)
@@ -18,6 +18,8 @@
*/
//this code is autogenerated - you shouldnt be modifying it!
+import static org.geotools.filter.capability.FunctionNameImpl.*;
+
import org.geotools.filter.FunctionExpressionImpl;
import org.geotools.filter.capability.FunctionNameImpl;
import org.opengis.filter.capability.FunctionName;
@@ -30,11 +32,12 @@
* @source $URL$
*/
public class FilterFunction_numPoints extends FunctionExpressionImpl {
- public static FunctionName NAME = new FunctionNameImpl("numPoints","geometry");
+
+ public static FunctionName NAME = new FunctionNameImpl("numInteriorRing", Integer.class,
+ parameter("geometry", Geometry.class));
public FilterFunction_numPoints() {
- super("numPoints");
- functionName = NAME;
+ super(NAME);
}
public int getArgCount() {
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_numberFormat.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_numberFormat.java 2012-06-22 04:06:50 UTC (rev 38826)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_numberFormat.java 2012-06-23 20:25:33 UTC (rev 38827)
@@ -17,6 +17,8 @@
package org.geotools.filter.function;
+import static org.geotools.filter.capability.FunctionNameImpl.*;
+
import java.text.DecimalFormat;
import org.geotools.filter.FunctionExpressionImpl;
@@ -34,18 +36,15 @@
* @source $URL$
*/
public class FilterFunction_numberFormat extends FunctionExpressionImpl {
- public static FunctionName NAME = new FunctionNameImpl("numberFormat","string","number");
+ public static FunctionName NAME = new FunctionNameImpl("numberFormat", String.class,
+ parameter("format", String.class),
+ parameter("number", Number.class));
+
public FilterFunction_numberFormat() {
- super("numberFormat");
- functionName = NAME;
+ super(NAME);
}
- @Override
- public int getArgCount() {
- return 2;
- }
-
public Object evaluate(Object feature) {
String format;
Double number;
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_numberFormat2.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_numberFormat2.java 2012-06-22 04:06:50 UTC (rev 38826)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_numberFormat2.java 2012-06-23 20:25:33 UTC (rev 38827)
@@ -16,6 +16,8 @@
*/
package org.geotools.filter.function;
+import static org.geotools.filter.capability.FunctionNameImpl.*;
+
import java.text.DecimalFormat;
import java.text.DecimalFormatSymbols;
@@ -38,17 +40,18 @@
* @source $URL$
*/
public class FilterFunction_numberFormat2 extends FunctionExpressionImpl {
- public static FunctionName NAME = new FunctionNameImpl("numberFormat2","format","number","minus","decimal","seperator");
+
+ public static FunctionName NAME = new FunctionNameImpl("numberFormat2", String.class,
+ parameter("format", String.class),
+ parameter("number", Number.class),
+ parameter("minus", String.class),
+ parameter("decimal", String.class),
+ parameter("separator", String.class));
+
public FilterFunction_numberFormat2() {
- super("numberFormat2");
- functionName = NAME;
+ super(NAME);
}
- @Override
- public int getArgCount() {
- return 5;
- }
-
public Object evaluate(Object feature) {
String format;
Double number;
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_octagonalEnvelope.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_octagonalEnvelope.java 2012-06-22 04:06:50 UTC (rev 38826)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_octagonalEnvelope.java 2012-06-23 20:25:33 UTC (rev 38827)
@@ -16,6 +16,8 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*/
+import static org.geotools.filter.capability.FunctionNameImpl.*;
+
import com.vividsolutions.jts.geom.Geometry;
import org.geotools.filter.FunctionExpressionImpl;
import org.geotools.filter.capability.FunctionNameImpl;
@@ -29,10 +31,8 @@
*/
public class FilterFunction_octagonalEnvelope extends FunctionExpressionImpl {
- /**
- * The FunctionName
- */
- public static FunctionName NAME = new FunctionNameImpl("octagonalenvelope","geometry");
+ public static FunctionName NAME = new FunctionNameImpl("octagonalenvelope", Geometry.class,
+ parameter("geometry", Geometry.class));
/**
* Create a new FilterFunction_octagonalEnvelope instance
@@ -42,15 +42,6 @@
}
/**
- * Get the number of arguments
- * @return The number of arguments
- */
- @Override
- public int getArgCount() {
- return 1;
- }
-
- /**
* Calculate the Geometry's octagonal envelope.
* @param feature The feature should be a Geometry
* @return The octagonal envelope Geometry
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_offset.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_offset.java 2012-06-22 04:06:50 UTC (rev 38826)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_offset.java 2012-06-23 20:25:33 UTC (rev 38827)
@@ -19,6 +19,8 @@
//this was autogenerated and then hand modified to implement better support for geometry
// transformations in SLD
+import static org.geotools.filter.capability.FunctionNameImpl.*;
+
import org.geotools.filter.FunctionExpressionImpl;
import org.geotools.filter.capability.FunctionNameImpl;
import org.geotools.geometry.jts.ReferencedEnvelope;
@@ -36,11 +38,13 @@
public class FilterFunction_offset extends FunctionExpressionImpl implements
GeometryTransformation {
- public static FunctionName NAME = new FunctionNameImpl("offset","geometry","offsetX","offsetY");
+ public static FunctionName NAME = new FunctionNameImpl("offset", Geometry.class,
+ parameter("geometry", Geometry.class),
+ parameter("offsetX", Double.class),
+ parameter("offsetY", Double.class));
public FilterFunction_offset() {
- super("offset");
- functionName = NAME;
+ super(NAME);
}
public int getArgCount() {
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_overlaps.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_overlaps.java 2012-06-22 04:06:50 UTC (rev 38826)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_overlaps.java 2012-06-23 20:25:33 UTC (rev 38827)
@@ -18,6 +18,8 @@
*/
//this code is autogenerated - you shouldnt be modifying it!
+import static org.geotools.filter.capability.FunctionNameImpl.*;
+
import org.geotools.filter.FunctionExpressionImpl;
import org.geotools.filter.capability.FunctionNameImpl;
import org.opengis.filter.capability.FunctionName;
@@ -31,17 +33,14 @@
*/
public class FilterFunction_overlaps extends FunctionExpressionImpl {
- public static FunctionName NAME = new FunctionNameImpl("overlaps","geometry","geometr");
+ public static FunctionName NAME = new FunctionNameImpl("overlaps", Geometry.class,
+ parameter("geometry1", Geometry.class),
+ parameter("geometry2", Geometry.class));
public FilterFunction_overlaps() {
- super("overlaps");
- functionName = NAME;
+ super(NAME);
}
- public int getArgCount() {
- return 2;
- }
-
public Object evaluate(Object feature) {
Geometry arg0;
Geometry arg1;
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_parseBoolean.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_parseBoolean.java 2012-06-22 04:06:50 UTC (rev 38826)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_parseBoolean.java 2012-06-23 20:25:33 UTC (rev 38827)
@@ -18,6 +18,8 @@
*/
//this code is autogenerated - you shouldnt be modifying it!
+import static org.geotools.filter.capability.FunctionNameImpl.*;
+
import org.geotools.filter.FunctionExpressionImpl;
import org.geotools.filter.capability.FunctionNameImpl;
import org.opengis.filter.capability.FunctionName;
@@ -28,17 +30,14 @@
* @source $URL$
*/
public class FilterFunction_parseBoolean extends FunctionExpressionImpl {
- public static FunctionName NAME = new FunctionNameImpl("parseBoolean", "string");
+
+ public static FunctionName NAME = new FunctionNameImpl("parseBoolean", Boolean.class,
+ parameter("string", String.class));
public FilterFunction_parseBoolean() {
- super("parseBoolean");
- functionName = NAME;
+ super(NAME);
}
- public int getArgCount() {
- return 1;
- }
-
public Object evaluate(Object feature) {
String arg0;
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_parseDouble.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_parseDouble.java 2012-06-22 04:06:50 UTC (rev 38826)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_parseDouble.java 2012-06-23 20:25:33 UTC (rev 38827)
@@ -18,6 +18,8 @@
*/
//this code is autogenerated - you shouldnt be modifying it!
+import static org.geotools.filter.capability.FunctionNameImpl.*;
+
import org.geotools.filter.FunctionExpressionImpl;
import org.geotools.filter.capability.FunctionNameImpl;
import org.opengis.filter.capability.FunctionName;
@@ -28,17 +30,14 @@
* @source $URL$
*/
public class FilterFunction_parseDouble extends FunctionExpressionImpl {
- public static FunctionName NAME = new FunctionNameImpl("parseDouble", "string");
+
+ public static FunctionName NAME = new FunctionNameImpl("parseDouble", Double.class,
+ parameter("string", String.class));
public FilterFunction_parseDouble() {
- super("parseDouble");
- functionName = NAME;
+ super(NAME);
}
- public int getArgCount() {
- return 1;
- }
-
public Object evaluate(Object feature) {
String arg0;
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_parseInt.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_parseInt.java 2012-06-22 04:06:50 UTC (rev 38826)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_parseInt.java 2012-06-23 20:25:33 UTC (rev 38827)
@@ -18,6 +18,8 @@
*/
//this code is autogenerated - you shouldnt be modifying it!
+import static org.geotools.filter.capability.FunctionNameImpl.*;
+
import org.geotools.filter.FunctionExpressionImpl;
import org.geotools.filter.capability.FunctionNameImpl;
import org.opengis.filter.capability.FunctionName;
@@ -29,17 +31,13 @@
*/
public class FilterFunction_parseInt extends FunctionExpressionImpl {
- public static FunctionName NAME = new FunctionNameImpl("parseInt", "string");
+ public static FunctionName NAME = new FunctionNameImpl("parseInt", Integer.class,
+ parameter("string", String.class));
public FilterFunction_parseInt() {
- super("parseInt");
- functionName = NAME;
+ super(NAME);
}
- public int getArgCount() {
- return 1;
- }
-
public Object evaluate(Object feature) {
String arg0;
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_parseLong.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_parseLong.java 2012-06-22 04:06:50 UTC (rev 38826)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_parseLong.java 2012-06-23 20:25:33 UTC (rev 38827)
@@ -18,6 +18,8 @@
*/
//this code is autogenerated - you shouldnt be modifying it!
+import static org.geotools.filter.capability.FunctionNameImpl.*;
+
import org.geotools.filter.FunctionExpressionImpl;
import org.geotools.filter.capability.FunctionNameImpl;
import org.opengis.filter.capability.FunctionName;
@@ -28,17 +30,14 @@
* @source $URL$
*/
public class FilterFunction_parseLong extends FunctionExpressionImpl {
- public static FunctionName NAME = new FunctionNameImpl("parseLong", "string");
+
+ public static FunctionName NAME = new FunctionNameImpl("parseLong", Long.class,
+ parameter("string", String.class));
public FilterFunction_parseLong() {
- super("parseLong");
- functionName = NAME;
+ super(NAME);
}
- public int getArgCount() {
- return 1;
- }
-
public Object evaluate(Object feature) {
String arg0;
|
