Revision 44750 trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.db/org.gvsig.fmap.dal.db.h2/src/main/java/org/gvsig/fmap/dal/store/h2/expressionbuilderformatter/IsNotNull.java

View differences:

IsNotNull.java
3 3 
import java.text.MessageFormat;
4 4 
import java.util.List;
5 5 
import org.apache.commons.lang3.StringUtils;
6 
import org.apache.commons.lang3.tuple.Pair;
7 6 
import org.gvsig.expressionevaluator.Code.Constant;
8 7 
import org.gvsig.expressionevaluator.ExpressionBuilder.Function;
9 8 
import static org.gvsig.expressionevaluator.ExpressionBuilder.OPERATOR_IS;
......
31 30 
        if (value_not instanceof Function) {
32 31 
            // NOT( IS( p1, NULL) )
33 32 
            if( StringUtils.equalsIgnoreCase(OPERATOR_NOT, ((Function) value_not).name()) ) {
34 
                List<Pair<String,Value>> parameters = ((Function) value_not).parameters();
35 
                Value value_is = parameters.get(0).getValue();
33 
                List<Value> parameters = ((Function) value_not).parameters();
34 
                Value value_is = parameters.get(0);
36 35 
                if( value_is instanceof Function && StringUtils.equalsIgnoreCase(OPERATOR_IS, ((Function)value_is).name()) ) {
37 
                    List<Pair<String,Value>> parameters_is = ((Function) value_is).parameters();
38 
                    Value is_p2 = parameters_is.get(1).getValue();
36 
                    List<Value> parameters_is = ((Function) value_is).parameters();
37 
                    Value is_p2 = parameters_is.get(1);
39 38 
                    if( is_p2 instanceof Constant && ((Constant)is_p2).value()==null ) {
40 39 
                        return true;
41 40 
                    }
......
49 48 
    public String format(Value value_not) {
50 49 
        // NOT( IS( p1, NULL) )
51 50 

  		




  52
  
  
    
        List<Pair<String,Value>> parameters = ((Function) value_not).parameters();


  		




  53
  
  
    
        Value value_is = parameters.get(0).getValue();


  		




  54
  
  
    
        List<Pair<String,Value>> parameters_is = ((Function)value_is).parameters();


  		




  55
  
  
    
        Value is_p1 = parameters_is.get(0).getValue();


  		




  
  51
  
    
        List<Value> parameters = ((Function) value_not).parameters();


  		




  
  52
  
    
        Value value_is = parameters.get(0);


  		




  
  53
  
    
        List<Value> parameters_is = ((Function)value_is).parameters();


  		




  
  54
  
    
        Value is_p1 = parameters_is.get(0);


  		




  56
  55
  
    
        String r = MessageFormat.format(


  		




  57
  56
  
    
                "( ({0}) IS NOT NULL )", 


  		




  58
  57
  
    
                is_p1.toString(formatter)


  		












Also available in:  Unified diff