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/PointMustBeProperlyInsidePolygonRule.java
PointMustBeProperlyInsidePolygonRule.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.dal.feature.FeatureSet; |
... | ... | |
78 | 81 |
|
79 | 82 |
private String geomName; |
80 | 83 |
private Expression expression = null; |
81 |
private ExpressionBuilder expressionBuilder = null; |
|
84 |
private GeometryExpressionBuilder expressionBuilder = null;
|
|
82 | 85 |
|
83 | 86 |
public PointMustBeProperlyInsidePolygonRule( |
84 | 87 |
TopologyPlan plan, |
... | ... | |
98 | 101 |
try { |
99 | 102 |
FeatureStore store2 = this.getDataSet2().getFeatureStore(); |
100 | 103 |
if (this.expression == null) { |
101 |
ExpressionEvaluatorManager manager = ExpressionEvaluatorLocator.getManager(); |
|
102 |
this.expression = manager.createExpression(); |
|
103 |
this.expressionBuilder = manager.createExpressionBuilder(); |
|
104 |
this.expression = ExpressionUtils.createExpression(); |
|
105 |
this.expressionBuilder = GeometryExpressionUtils.createExpressionBuilder(); |
|
104 | 106 |
this.geomName = store2.getDefaultFeatureType().getDefaultGeometryAttributeName(); |
105 | 107 |
} |
106 | 108 |
Geometry point = feature1.getDefaultGeometry(); |
Also available in: Unified diff