Revision 1284
| org.gvsig.topology/trunk/org.gvsig.topology/org.gvsig.topology.lib/org.gvsig.topology.lib.impl/src/main/java/org/gvsig/topology/lib/impl/DefaultTopologyDataSet.java | ||
|---|---|---|
| 32 | 32 |
import org.gvsig.expressionevaluator.ExpressionBuilder; |
| 33 | 33 |
import org.gvsig.expressionevaluator.ExpressionEvaluatorLocator; |
| 34 | 34 |
import org.gvsig.expressionevaluator.ExpressionEvaluatorManager; |
| 35 |
import org.gvsig.expressionevaluator.ExpressionUtils; |
|
| 36 |
import org.gvsig.expressionevaluator.GeometryExpressionBuilder; |
|
| 37 |
import org.gvsig.expressionevaluator.GeometryExpressionUtils; |
|
| 35 | 38 |
import org.gvsig.fmap.dal.DataStore; |
| 36 | 39 |
import org.gvsig.fmap.dal.EditingNotification; |
| 37 | 40 |
import org.gvsig.fmap.dal.EditingNotificationManager; |
| ... | ... | |
| 404 | 407 |
if( index == null ) {
|
| 405 | 408 |
try {
|
| 406 | 409 |
FeatureStore theStore = (FeatureStore) this.getStore(); |
| 407 |
ExpressionEvaluatorManager manager = ExpressionEvaluatorLocator.getManager(); |
|
| 408 |
Expression expression = manager.createExpression(); |
|
| 409 |
ExpressionBuilder expressionBuilder = manager.createExpressionBuilder(); |
|
| 410 |
Expression expression = ExpressionUtils.createExpression(); |
|
| 411 |
GeometryExpressionBuilder expressionBuilder = GeometryExpressionUtils.createExpressionBuilder(); |
|
| 410 | 412 |
String geomName = theStore.getDefaultFeatureType().getDefaultGeometryAttributeName(); |
| 411 | 413 |
if( GeometryUtils.isSubtype(Geometry.TYPES.POINT, geom.getType()) ) {
|
| 412 | 414 |
expression.setPhrase( |
| ... | ... | |
| 473 | 475 |
if( index == null ) {
|
| 474 | 476 |
try {
|
| 475 | 477 |
FeatureStore theStore = (FeatureStore) this.getStore(); |
| 476 |
ExpressionEvaluatorManager manager = ExpressionEvaluatorLocator.getManager(); |
|
| 477 |
Expression expression = manager.createExpression(); |
|
| 478 |
ExpressionBuilder expressionBuilder = manager.createExpressionBuilder(); |
|
| 478 |
Expression expression = ExpressionUtils.createExpression(); |
|
| 479 |
GeometryExpressionBuilder expressionBuilder = GeometryExpressionUtils.createExpressionBuilder(); |
|
| 479 | 480 |
String geomName = theStore.getDefaultFeatureType().getDefaultGeometryAttributeName(); |
| 480 | 481 |
if( GeometryUtils.isSubtype(Geometry.TYPES.POINT, geom.getType()) ) {
|
| 481 | 482 |
expression.setPhrase( |
| 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 | ||
|---|---|---|
| 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(); |
| 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 | ||
|---|---|---|
| 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(); |
| 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 | ||
|---|---|---|
| 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(); |
| org.gvsig.topology/trunk/org.gvsig.topology/org.gvsig.topology.swing/org.gvsig.topology.swing.impl/src/main/java/org/gvsig/topology/swing/impl/DefaultJTopologyReport.java | ||
|---|---|---|
| 31 | 31 |
import org.apache.commons.lang3.StringUtils; |
| 32 | 32 |
import org.gvsig.expressionevaluator.ExpressionBuilder; |
| 33 | 33 |
import org.gvsig.expressionevaluator.ExpressionEvaluatorLocator; |
| 34 |
import org.gvsig.expressionevaluator.GeometryExpressionBuilder; |
|
| 35 |
import org.gvsig.expressionevaluator.GeometryExpressionUtils; |
|
| 34 | 36 |
import org.gvsig.fmap.dal.feature.FeatureSelection; |
| 35 | 37 |
import org.gvsig.fmap.geom.Geometry; |
| 36 | 38 |
import org.gvsig.fmap.geom.primitive.Envelope; |
| ... | ... | |
| 334 | 336 |
} |
| 335 | 337 |
|
| 336 | 338 |
private String getFilter() {
|
| 337 |
ExpressionBuilder builder = ExpressionEvaluatorLocator.getManager().createExpressionBuilder();
|
|
| 339 |
GeometryExpressionBuilder builder = GeometryExpressionUtils.createExpressionBuilder();
|
|
| 338 | 340 |
TopologyRuleFactory ruleFactory = (TopologyRuleFactory) ListElement.getSelected(cboRules); |
| 339 | 341 |
if (ruleFactory != null) {
|
| 340 | 342 |
builder.set( |
| org.gvsig.topology/trunk/org.gvsig.topology/pom.xml | ||
|---|---|---|
| 3 | 3 |
<parent> |
| 4 | 4 |
<groupId>org.gvsig</groupId> |
| 5 | 5 |
<artifactId>org.gvsig.desktop</artifactId> |
| 6 |
<version>2.0.259</version>
|
|
| 6 |
<version>2.0.261</version>
|
|
| 7 | 7 |
</parent> |
| 8 | 8 |
<artifactId>org.gvsig.topology</artifactId> |
| 9 | 9 |
<version>1.0.15-SNAPSHOT</version> |
Also available in: Unified diff