Revision 47697

View differences:

trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.impl/src/main/java/org/gvsig/expressionevaluator/impl/symboltable/FeatureSymbolTableImpl.java
23 23
 */
24 24
package org.gvsig.expressionevaluator.impl.symboltable;
25 25

  
26
import java.util.ArrayList;
27
import java.util.Collection;
28
import java.util.Collections;
29
import java.util.List;
26 30
import org.gvsig.fmap.dal.expressionevaluator.TableAttributeHandler;
27 31
import org.apache.commons.lang3.Range;
28 32
import org.apache.commons.lang3.StringUtils;
......
98 102
    };
99 103
  }
100 104

  
105
    @Override
106
    public Collection<String> localvariables() {
107
        List<String> v = new ArrayList<>();
108
        v.add(SYMBOL_CURRENT_TABLE);
109
        v.add(SYMBOL_CURRENT_ROW);
110
        try {
111
            if( feature != null ) {
112
                for (FeatureAttributeDescriptor attr : feature.getType()) {
113
                    v.add(attr.getName());
114
                }
115
            }
116
        } catch(Throwable t) {
117

  
118
        }
119
        v.addAll(super.localvariables());
120
        return Collections.unmodifiableCollection(v);        
121
    }
122
  
101 123
  @Override
102 124
  public FeatureSymbolTableImpl clone() throws CloneNotSupportedException {
103 125
    FeatureSymbolTableImpl other = (FeatureSymbolTableImpl) super.clone();

Also available in: Unified diff