Revision 1284 org.gvsig.topology/trunk/org.gvsig.topology/org.gvsig.topology.lib/org.gvsig.topology.lib.impl/src/main/java/org/gvsig/topology/rule/MustNotOverlapPolygonRule.java

View differences:

MustNotOverlapPolygonRule.java
27 27
import org.gvsig.expressionevaluator.ExpressionBuilder;
28 28
import org.gvsig.expressionevaluator.ExpressionEvaluatorLocator;
29 29
import org.gvsig.expressionevaluator.ExpressionEvaluatorManager;
30
import org.gvsig.expressionevaluator.ExpressionUtils;
31
import org.gvsig.expressionevaluator.GeometryExpressionBuilder;
32
import org.gvsig.expressionevaluator.GeometryExpressionUtils;
30 33
import org.gvsig.fmap.dal.feature.Feature;
31 34
import org.gvsig.fmap.dal.feature.FeatureReference;
32 35
import org.gvsig.fmap.geom.Geometry;
......
130 133

  
131 134
    private String geomName;
132 135
    private Expression expression = null;
133
    private ExpressionBuilder expressionBuilder = null;
136
    private GeometryExpressionBuilder expressionBuilder = null;
134 137

  
135 138
    public MustNotOverlapPolygonRule(
136 139
            TopologyPlan plan,
......
148 151
    protected void check(SimpleTaskStatus taskStatus, TopologyReport report, Feature feature1) throws Exception {
149 152
        try {
150 153
            if (this.expression == null) {
151
                ExpressionEvaluatorManager manager = ExpressionEvaluatorLocator.getManager();
152
                this.expression = manager.createExpression();
153
                this.expressionBuilder = manager.createExpressionBuilder();
154
                this.expression = ExpressionUtils.createExpression();
155
                this.expressionBuilder = GeometryExpressionUtils.createExpressionBuilder();
154 156
                this.geomName = feature1.getType().getDefaultGeometryAttributeName();
155 157
            }
156 158
            Geometry polygon = feature1.getDefaultGeometry();

Also available in: Unified diff