Revision 44263 trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.expressionevaluator/org.gvsig.expressionevaluator.swing/org.gvsig.expressionevaluator.swing.impl/src/main/java/org/gvsig/expressionevaluator/swing/impl/elements/DefaultAggregateElements.java
DefaultAggregateElements.java | ||
---|---|---|
1 | 1 |
package org.gvsig.expressionevaluator.swing.impl.elements; |
2 | 2 |
|
3 | 3 |
import java.util.ArrayList; |
4 |
import java.util.Collection; |
|
4 | 5 |
import java.util.Iterator; |
5 | 6 |
import java.util.List; |
6 | 7 |
import org.gvsig.expressionevaluator.Function; |
7 | 8 |
import org.gvsig.expressionevaluator.swing.Element; |
9 |
import org.gvsig.expressionevaluator.swing.ExpressionBuilderConfig; |
|
8 | 10 |
import org.gvsig.expressionevaluator.swing.ExpressionEvaluatorSwingManager; |
9 | 11 |
import org.gvsig.expressionevaluator.swing.spi.AbstractElement; |
10 | 12 |
|
... | ... | |
44 | 46 |
|
45 | 47 |
@Override |
46 | 48 |
public Iterator<Element> iterator() { |
49 |
return this.elements.iterator(); |
|
50 |
} |
|
51 |
|
|
52 |
@Override |
|
53 |
public Collection<Element> getValues() { |
|
47 | 54 |
if( aggregateds==null ) { |
48 | 55 |
this.aggregateds = buildChilds(null, elements); |
49 | 56 |
} |
50 |
return this.aggregateds.iterator();
|
|
57 |
return this.aggregateds; |
|
51 | 58 |
} |
59 |
|
|
52 | 60 |
private List<Element> buildChilds(List<Element> theAggregateds, List<Element> elements) { |
53 | 61 |
if( theAggregateds==null ) { |
54 | 62 |
theAggregateds = new ArrayList<>(); |
... | ... | |
70 | 78 |
@Override |
71 | 79 |
public void addElement(Function function) { |
72 | 80 |
Element item = this.manager.createConstantElement(function, function.name()); |
81 |
item.setConfig(this.getConfig()); |
|
73 | 82 |
this.addElement(item); |
74 | 83 |
} |
75 | 84 |
|
76 | 85 |
@Override |
77 |
public boolean hasSubgroups() { |
|
78 |
for (Element element : this.getElements()) { |
|
79 |
if( element instanceof Element.GroupElement ) { |
|
80 |
return true; |
|
86 |
public Element setConfig(ExpressionBuilderConfig config) { |
|
87 |
super.setConfig(config); |
|
88 |
if( this.elements!=null ) { |
|
89 |
for (Element element : this.elements) { |
|
90 |
element.setConfig(config); |
|
81 | 91 |
} |
82 | 92 |
} |
83 |
return false;
|
|
93 |
return this;
|
|
84 | 94 |
} |
85 | 95 |
|
86 |
@Override |
|
87 |
public boolean hasMoreElements() { |
|
88 |
return false; |
|
89 |
} |
|
90 |
|
|
91 | 96 |
} |
Also available in: Unified diff