Revision 44750 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
1 1
package org.gvsig.expressionevaluator;
2 2

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

  
......
80 80
    public static final String FUNCTION_TANH = "TANH";
81 81
    public static final String FUNCTION_ZERO = "ZERO";
82 82
    public static final String FUNCTION_CHR = "CHR";
83

  
83 84
    public static final String FUNCTION_DATE = "DATE";
85
    public static final String FUNCTION_TIME = "TIME";
86
    public static final String FUNCTION_TIMESTAMP = "TIMESTAMP";  
87

  
88
    public static final String FUNCTION_TO_DATE = "TO_DATE";
89
    public static final String FUNCTION_TO_TIMESTAMP = "TO_TIMESTAMP";  
84 90
    public static final String FUNCTION_DATEDIFF = "DATEDIFF";
85 91
    public static final String FUNCTION_DATEADD = "DATEADD";
86
    public static final String FUNCTION_NOW = "NOW";
87
    public static final String FUNCTION_TIME = "TIME";
88
    public static final String FUNCTION_TIMESTAMP = "TIMESTAMP";
89

  
92
    public static final String FUNCTION_CURRENT_TIMESTAMP = "CURRENT_TIMESTAMP";
93
    public static final String FUNCTION_CURRENT_TIME = "CURRENT_TIME";
94
    public static final String FUNCTION_CURRENT_DATE = "CURRENT_DATE";
95
    public static final String FUNCTION_EXTRACT = "EXTRACT";
96
    
90 97
    public static final String FUNCTION_CAST = "CAST";
91 98
    public static final String FUNCTION_DECODE = "DECODE";
92 99
    public static final String FUNCTION_TODOUBLE = "TODOUBLE";
......
157 164
    
158 165
    public interface Function extends Value {
159 166
        public String name();
160
        public List<Pair<String,Value>> parameters();
167
        public List<Value> parameters();
161 168
        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);
166 169
    }
167 170

  
168 171
    public interface Method extends Value {
169 172
        public String name();
170 173
        public Value instance();
171
        public List<Pair<String,Value>> parameters();
174
        public List<Value> parameters();
172 175
        public Function parameter(Value parameter);
173
        public Function parameter(String name, Value parameter);
174 176
    }
175 177

  
176 178
    public interface BinaryOperator extends Value {
......
183 185

  
184 186
    public abstract class AbstractValue implements Value {
185 187

  
186
        private PropertiesSupport properties;
188
        protected final PropertiesSupport properties;
187 189
        
188 190
        protected AbstractValue() {
189 191
            this.properties = new PropertiesSupportHelper();
......
470 472
    
471 473
    public Function tuple(Constant... values);
472 474
    
473
    public Function getattr(Value object, String attrname);
475
    public Function getattr(String objectId, String attributeId);
474 476
    
475 477
    public boolean isEmpty();
478

  
479
    public Function date(Value date);
480
    
481
    public Function time(Value date);
482
    
483
    public Function timestamp(Value date);
484

  
485
    public Function to_date(Value date, Value format);
486
    
487
    public Function to_timestamp(Value timestamp, Value format);
488

  
489
    public Function current_date();
490
    
491
    public Function current_time();
492
    
493
    public Function current_timestamp();
494
    
495
    public Function date_add(Value datefield, Value valueToAdd, Value date);
496

  
497
    public Function date_diff(Value datefield, Value valueToSubst, Value date);
498
    
499
    public Function extract(Value datefield, Value source);
476 500
}

Also available in: Unified diff