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

View differences:

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(

Also available in: Unified diff