Revision 44390 trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.expressionevaluator/org.gvsig.expressionevaluator.lib/org.gvsig.expressionevaluator.lib.impl/src/main/java/org/gvsig/expressionevaluator/impl/DefaultExpression.java

View differences:

DefaultExpression.java
5 5 
import java.util.ArrayList;
6 6 
import java.util.Iterator;
7 7 
import java.util.List;
8 
import java.util.Objects;
8 9 
import org.apache.commons.lang3.StringUtils;
9 10 
import org.gvsig.expressionevaluator.Code;
10 11 
import org.gvsig.expressionevaluator.Compiler;
......
22 23 
import org.gvsig.tools.persistence.exception.PersistenceException;
23 24 
import org.gvsig.tools.script.Script;
24 25 
import org.gvsig.tools.script.ScriptManager;
26 
import org.gvsig.tools.util.LabeledValue;
25 27 
import org.gvsig.tools.util.UnmodifiableBasicList;
26 28 
import org.gvsig.tools.util.UnmodifiableBasicListAdapter;
27 29 
import org.json.JSONArray;
......
31 33 
 *
32 34 
 * @author jjdelcerro
33 35 
 */
34 
public class DefaultExpression implements Expression {
36 
public class DefaultExpression implements Expression, LabeledValue<Expression> {
35 37 

  		




  36
  38
  
    
    private String phrase = null;


  		




  37
  39
  
    
    private Script userScript = null;


  		




  ......




  47
  49
  
    
    public DefaultExpression() {


  		




  48
  50
  
    

  		




  49
  51
  
    
    }


  		




  
  52
  
    

  		




  
  53
  
    
    @Override


  		




  
  54
  
    
    public String getLabel() {


  		




  
  55
  
    
        return StringUtils.abbreviate(


  		




  
  56
  
    
                StringUtils.normalizeSpace(this.getPhrase()),


  		




  
  57
  
    
                35


  		




  
  58
  
    
        );


  		




  
  59
  
    
    }


  		




  
  60
  
    

  		




  
  61
  
    
    @Override


  		




  
  62
  
    
    public Expression getValue() {


  		




  
  63
  
    
        return this;


  		




  
  64
  
    
    }


  		




  
  65
  
    

  		




  
  66
  
    
    @Override


  		




  
  67
  
    
    public boolean equals(Object obj) {


  		




  
  68
  
    
        if( obj == null || !(obj instanceof Expression) ) {


  		




  
  69
  
    
            return false;


  		




  
  70
  
    
        }


  		




  
  71
  
    
        String this_s = this.toJSON();


  		




  
  72
  
    
        String other_s = ((Expression)obj).toJSON();


  		




  
  73
  
    
        return this_s.equals(other_s);


  		




  
  74
  
    
    }


  		




  
  75
  
    

  		




  
  76
  
    
    @Override


  		




  
  77
  
    
    public int hashCode() {


  		




  
  78
  
    
        String this_s = this.toJSON();


  		




  
  79
  
    
        return Objects.hashCode(this_s);


  		




  
  80
  
    
    }


  		




  50
  81
  
    
    


  		




  51
  82
  
    
    @Override


  		




  52
  83
  
    
    public SymbolTable getSymbolTable() {


  		












Also available in:  Unified diff