Revision 41348 trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.mapcontext/org.gvsig.fmap.mapcontext.api/src/main/java/org/gvsig/fmap/mapcontext/layers/vectorial/ContainsGeometryEvaluator.java

View differences:

ContainsGeometryEvaluator.java
77 77

  
78 78
	public Object evaluate(EvaluatorData data) throws EvaluatorException {
79 79
		try {
80
			Geometry geom = null;
81
			if (isDefault) {
82
				Feature feature = (Feature) data.getContextValue("feature");
83
				geom = feature.getDefaultGeometry();
80
                    Geometry geom = null;
81
                    if ( isDefault ) {
82
                        Feature feature = (Feature) data.getContextValue("feature");
83
                        geom = feature.getDefaultGeometry();
84 84

  
85
			} else {
86
				geom = (Geometry) data.getDataValue(geomName);
87
			}
88
			return new Boolean(geometryTrans.contains(geom));
85
                    } else {
86
                        geom = (Geometry) data.getDataValue(geomName);
87
                    }
88
                    if ( geom == null ) {
89
                        return Boolean.FALSE;
90
                    }
91
                    return new Boolean(geometryTrans.contains(geom));
89 92

  
90 93
		} catch (Exception e) {
91 94
			throw new EvaluatorException(e);

Also available in: Unified diff