Revision 44748 trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.expressionevaluator/org.gvsig.expressionevaluator.lib/org.gvsig.expressionevaluator.lib.api/src/main/java/org/gvsig/expressionevaluator/ExpressionBuilder.java

View differences:

ExpressionBuilder.java
2 2

  
3 3
import java.util.List;
4 4
import java.util.Map;
5
import org.apache.commons.lang3.tuple.Pair;
5 6
import org.gvsig.tools.util.PropertiesSupport;
6 7
import org.gvsig.tools.util.PropertiesSupportHelper;
7 8

  
......
102 103
    public static final String FUNCTION_LIST = "LIST";
103 104
    public static final String FUNCTION_TUPLE = "TUPLE";
104 105
    
106
    public static final String FUNCTION_GETATTR = "GETATTR";
107
    
105 108
    public static final int PARAMETER_TYPE_CONSTANT = 0;
106 109
    public static final int PARAMETER_TYPE_VARIABLE = 1;
107 110
    
......
154 157
    
155 158
    public interface Function extends Value {
156 159
        public String name();
157
        public List<Value> parameters();
160
        public List<Pair<String,Value>> parameters();
158 161
        public Function parameter(Value parameter);
162
        public Function parameter(String name, Value parameter);
163
        public Value getParameter(String name);
164
        public Value getParameter(String name, int index);
165
        public boolean containsParameter(String name, int index);
159 166
    }
160 167

  
161 168
    public interface Method extends Value {
162 169
        public String name();
163 170
        public Value instance();
164
        public List<Value> parameters();
171
        public List<Pair<String,Value>> parameters();
165 172
        public Function parameter(Value parameter);
173
        public Function parameter(String name, Value parameter);
166 174
    }
167 175

  
168 176
    public interface BinaryOperator extends Value {
......
462 470
    
463 471
    public Function tuple(Constant... values);
464 472
    
473
    public Function getattr(Value object, String attrname);
474
    
465 475
    public boolean isEmpty();
466 476
}

Also available in: Unified diff