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/ContainsPointRule.java
ContainsPointRule.java | ||
---|---|---|
24 | 24 |
package org.gvsig.topology.rule; |
25 | 25 |
|
26 | 26 |
import org.gvsig.expressionevaluator.Expression; |
27 |
import org.gvsig.expressionevaluator.ExpressionBuilder;
|
|
28 |
import org.gvsig.expressionevaluator.ExpressionEvaluatorLocator;
|
|
29 |
import org.gvsig.expressionevaluator.ExpressionEvaluatorManager;
|
|
27 |
import org.gvsig.expressionevaluator.ExpressionUtils;
|
|
28 |
import org.gvsig.expressionevaluator.GeometryExpressionBuilder;
|
|
29 |
import org.gvsig.expressionevaluator.GeometryExpressionUtils;
|
|
30 | 30 |
import org.gvsig.fmap.dal.feature.EditableFeature; |
31 | 31 |
import org.gvsig.fmap.dal.feature.Feature; |
32 | 32 |
import org.gvsig.fmap.dal.feature.FeatureReference; |
... | ... | |
87 | 87 |
|
88 | 88 |
private String geomName; |
89 | 89 |
private Expression expression = null; |
90 |
private ExpressionBuilder expressionBuilder = null; |
|
90 |
private GeometryExpressionBuilder expressionBuilder = null;
|
|
91 | 91 |
|
92 | 92 |
public ContainsPointRule( |
93 | 93 |
TopologyPlan plan, |
... | ... | |
107 | 107 |
try { |
108 | 108 |
FeatureStore store2 = this.getDataSet2().getFeatureStore(); |
109 | 109 |
if (this.expression == null) { |
110 |
ExpressionEvaluatorManager manager = ExpressionEvaluatorLocator.getManager(); |
|
111 |
this.expression = manager.createExpression(); |
|
112 |
this.expressionBuilder = manager.createExpressionBuilder(); |
|
110 |
this.expression = ExpressionUtils.createExpression(); |
|
111 |
this.expressionBuilder = GeometryExpressionUtils.createExpressionBuilder(); |
|
113 | 112 |
this.geomName = store2.getDefaultFeatureType().getDefaultGeometryAttributeName(); |
114 | 113 |
} |
115 | 114 |
Geometry polygon = feature1.getDefaultGeometry(); |
Also available in: Unified diff