Revision 45206

View differences:

trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.impl/src/main/java/org/gvsig/expressionevaluator/impl/DefaultDALExpressionBuilder.java
3 3 
import java.util.UUID;
4 4 
import org.gvsig.expressionevaluator.ExpressionBuilder;
5 5 
import org.gvsig.expressionevaluator.ExpressionBuilder.Value;
6 
import org.gvsig.expressionevaluator.ExpressionUtils;
7 6 
import org.gvsig.expressionevaluator.Formatter;
7 
import org.gvsig.expressionevaluator.GeometryExpressionBuilder;
8 
import org.gvsig.expressionevaluator.GeometryExpressionUtils;
8 9 
import org.gvsig.expressionevaluator.impl.expressionbuilder.formatters.DALFormatter;
9 10 
import static org.gvsig.fmap.dal.DataManager.FUNCTION_CURRENT_ROW;
10 11 
import static org.gvsig.fmap.dal.DataManager.FUNCTION_CURRENT_STORE;
11 12 
import static org.gvsig.fmap.dal.DataManager.FUNCTION_EXISTS;
12 13 
import static org.gvsig.fmap.dal.DataManager.FUNCTION_FOREING_VALUE;
14 
import static org.gvsig.fmap.dal.DataManager.FUNCTION_GEOMETRY;
13 15 
import static org.gvsig.fmap.dal.DataManager.FUNCTION_ISSELECTED_CURRENT_ROW;
14 16 
import static org.gvsig.fmap.dal.DataManager.FUNCTION_SELECT;
15 17 
import static org.gvsig.fmap.dal.DataManager.FUNCTION_SELECT_COUNT;
......
140 142
141 143 
  }
142 144 

  		




  143
  
  
    
  private ExpressionBuilder expressionBuilder;


  		




  
  145
  
    
  private GeometryExpressionBuilder expressionBuilder;


  		




  144
  146
  
    
  


  		




  145
  147
  
    
  @Override


  		




  146
  
  
    
  public ExpressionBuilder expression() {


  		




  
  148
  
    
  public GeometryExpressionBuilder expression() {


  		




  147
  149
  
    
    if( this.expressionBuilder == null ) {


  		




  148
  
  
    
      this.expressionBuilder = ExpressionUtils.createExpressionBuilder();


  		




  
  150
  
    
      this.expressionBuilder = GeometryExpressionUtils.createExpressionBuilder();


  		




  149
  151
  
    
    }


  		




  150
  152
  
    
    return this.expressionBuilder;


  		




  151
  153
  
    
  }


  		




  ......




  212
  214
  
    
    return expression().function(FUNCTION_ISSELECTED_CURRENT_ROW);


  		




  213
  215
  
    
  }


  		




  214
  216
  
    
  


  		




  
  217
  
    
  public ExpressionBuilder.Function geometry() {


  		




  
  218
  
    
      return this.expression().function(FUNCTION_GEOMETRY);


  		




  
  219
  
    
  }


  		




  
  220
  
    
  


  		




  215
  221
  
    
}


  		












  

    
      trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.api/src/main/java/org/gvsig/fmap/dal/expressionevaluator/DALExpressionBuilder.java
    
  





  4
  4
  
    
import org.gvsig.expressionevaluator.ExpressionBuilder.Function;


  		




  5
  5
  
    
import org.gvsig.expressionevaluator.ExpressionBuilder.Value;


  		




  6
  6
  
    
import org.gvsig.expressionevaluator.Formatter;


  		




  
  7
  
    
import org.gvsig.expressionevaluator.GeometryExpressionBuilder;


  		




  7
  8
  
    

  		




  8
  9
  
    
/**


  		




  9
  10
  
    
 *


  		




  ......




  46
  47
  
    
    public String toString();


  		




  47
  48
  
    
  }


  		




  48
  49
  
    

  		




  49
  
  
    
  public ExpressionBuilder expression();


  		




  
  50
  
    
  public GeometryExpressionBuilder expression();


  		




  50
  51
  
    
  


  		




  51
  52
  
    
  public Formatter<Value> formatter();


  		




  52
  53
  
    
  


  		




  ......




  68
  69
  
    
  


  		




  69
  70
  
    
  public Function isselected_current_row();


  		




  70
  71
  
    
  


  		




  
  72
  
    
  public Function geometry();


  		




  
  73
  
    
  


  		




  71
  74
  
    
}


  		












Also available in:  Unified diff