Revision 44259 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/DefaultGroupElement.java
DefaultGroupElement.java | ||
---|---|---|
11 | 11 |
import org.gvsig.expressionevaluator.Function; |
12 | 12 |
import org.gvsig.expressionevaluator.swing.Element; |
13 | 13 |
import org.gvsig.expressionevaluator.swing.Element.GroupElement; |
14 |
import org.gvsig.expressionevaluator.swing.ExpressionBuilderConfig; |
|
15 | 14 |
import org.gvsig.expressionevaluator.swing.spi.AbstractElement; |
16 | 15 |
import org.gvsig.expressionevaluator.swing.ExpressionEvaluatorSwingManager; |
17 | 16 |
|
... | ... | |
25 | 24 |
{ |
26 | 25 |
|
27 | 26 |
final private List<Element> elements; |
28 |
final private ExpressionBuilderConfig config; |
|
29 | 27 |
private ExpressionEvaluatorSwingManager manager; |
30 | 28 |
|
31 |
public DefaultGroupElement(ExpressionEvaluatorSwingManager manager, ExpressionBuilderConfig config, String name, List<Element> elements) {
|
|
32 |
super(name, "expressionbuilder-element-group"); |
|
29 |
public DefaultGroupElement(ExpressionEvaluatorSwingManager manager, String name, List<Element> elements) { |
|
30 |
super(name, name, "expressionbuilder-element-group");
|
|
33 | 31 |
this.manager = manager; |
34 | 32 |
this.elements = elements; |
35 |
this.config = config; |
|
36 | 33 |
} |
37 | 34 |
|
38 |
public DefaultGroupElement(ExpressionBuilderConfig config, String name) { |
|
39 |
super(name, "expressionbuilder-element-group"); |
|
40 |
this.config = config; |
|
35 |
public DefaultGroupElement(String name) { |
|
36 |
super(name, name, "expressionbuilder-element-group"); |
|
41 | 37 |
this.elements = new ArrayList<>(); |
42 | 38 |
} |
43 | 39 |
|
... | ... | |
68 | 64 |
|
69 | 65 |
@Override |
70 | 66 |
public void addElement(Function function) { |
71 |
Element item = this.manager.createConstantElement(this.config, function);
|
|
67 |
Element item = this.manager.createConstantElement(function, function.name());
|
|
72 | 68 |
this.addElement(item); |
73 | 69 |
} |
74 | 70 |
|
Also available in: Unified diff