Revision 46055

View differences:

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/function/programming/ListFunction.java
11 11
import org.gvsig.expressionevaluator.Function;
12 12
import org.gvsig.expressionevaluator.Interpreter;
13 13
import org.gvsig.expressionevaluator.spi.AbstractFunction;
14
import org.gvsig.tools.util.ListWithGetItemSizeIsEmptyAndIterator;
14 15

  
15 16
public class ListFunction extends AbstractFunction {
16 17
    
......
33 34
    
34 35
    @Override
35 36
    public Object call(Interpreter interpreter, Object[] args) throws Exception {
36
        List<Object> list = new ArrayList<>();
37
        List<Object> list = new ListWithGetItemSizeIsEmptyAndIterator<>();
37 38
        list.addAll(Arrays.asList(args));
38 39
        return list;
39 40
    }
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/function/programming/DictFunction.java
10 10
import org.gvsig.expressionevaluator.spi.AbstractFunction;
11 11
import static org.gvsig.expressionevaluator.ExpressionBuilder.FUNCTION_DICT;
12 12
import org.gvsig.expressionevaluator.Formatter;
13
import org.gvsig.tools.util.MapWithGetItemByKeySizeGetKeysContainsKeyAndSetItem;
13 14

  
14 15
public class DictFunction extends AbstractFunction {
15 16
    
......
35 36
      if( args.length==1 && args[0] instanceof Map) {
36 37
          return args[0];
37 38
      }
38
      Map<Object,Object> map = new HashMap<>();
39
      Map<Object,Object> map = new MapWithGetItemByKeySizeGetKeysContainsKeyAndSetItem<>();
39 40
      for (int i = 0; i < args.length; i+=2) {
40 41
        Object key = args[i];
41 42
        Object value = args[i+1];

Also available in: Unified diff