Revision 43970
trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.expressionevaluator/org.gvsig.expressionevaluator.swing/org.gvsig.expressionevaluator.swing.api/src/main/java/org/gvsig/expressionevaluator/swing/JExpressionBuilder.java | ||
---|---|---|
34 | 34 |
|
35 | 35 |
public void addElement(Element element); |
36 | 36 |
public void addElement(Function function); |
37 |
|
|
38 |
public List<Element> getElements(); |
|
37 | 39 |
} |
38 | 40 |
|
39 | 41 |
|
trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.expressionevaluator/org.gvsig.expressionevaluator.swing/org.gvsig.expressionevaluator.swing.api/src/main/java/org/gvsig/expressionevaluator/swing/ExpressionEvaluatorSwingManager.java | ||
---|---|---|
2 | 2 |
package org.gvsig.expressionevaluator.swing; |
3 | 3 |
|
4 | 4 |
import java.util.List; |
5 |
import org.gvsig.expressionevaluator.Function; |
|
5 | 6 |
import org.gvsig.expressionevaluator.swing.JExpressionBuilder.Element; |
7 |
import org.gvsig.expressionevaluator.swing.JExpressionBuilder.GroupElement; |
|
6 | 8 |
|
7 |
|
|
8 | 9 |
public interface ExpressionEvaluatorSwingManager { |
9 | 10 |
|
10 | 11 |
public List<Element> getElements(); |
11 | 12 |
|
12 | 13 |
public JExpressionBuilder createJExpressionBuilder(); |
14 |
|
|
15 |
public GroupElement createGroup(String name); |
|
16 |
|
|
17 |
public GroupElement createGroup(String name, List<Element> elements); |
|
13 | 18 |
|
19 |
public Element createElement(Function function); |
|
20 |
|
|
14 | 21 |
} |
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/DefaultJExpressionBuilder.java | ||
---|---|---|
36 | 36 |
|
37 | 37 |
private class ElementsTreeModel implements TreeModel { |
38 | 38 |
|
39 |
private final DefaultGroupElement root;
|
|
39 |
private final GroupElement root; |
|
40 | 40 |
|
41 |
public ElementsTreeModel(DefaultGroupElement root) {
|
|
41 |
public ElementsTreeModel(GroupElement root) { |
|
42 | 42 |
this.root = root; |
43 | 43 |
} |
44 | 44 |
|
... | ... | |
47 | 47 |
return this.root; |
48 | 48 |
} |
49 | 49 |
|
50 |
private List<Element> getChilds(final DefaultGroupElement node) {
|
|
50 |
private List<Element> getChilds(final GroupElement node) { |
|
51 | 51 |
return node.getElements(); |
52 | 52 |
} |
53 | 53 |
|
... | ... | |
105 | 105 |
toolsSwingManager.setDefaultPopupMenu(this.txtDescription); |
106 | 106 |
toolsSwingManager.addClearButton(this.txtSimpleElementFilter); |
107 | 107 |
|
108 |
TreeModel model = new ElementsTreeModel(new DefaultGroupElement("Elements", this.getElements())); |
|
108 |
TreeModel model = new ElementsTreeModel( |
|
109 |
this.manager.createGroup("Elements", this.getElements()) |
|
110 |
); |
|
109 | 111 |
this.treeElements.setModel(model); |
110 | 112 |
this.treeElements.addTreeSelectionListener(new TreeSelectionListener() { |
111 | 113 |
@Override |
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/DefaultExpressionEvaluatorSwingManager.java | ||
---|---|---|
78 | 78 |
} |
79 | 79 |
|
80 | 80 |
@Override |
81 |
public GroupElement createGroup(String name, List<Element>elements) { |
|
82 |
DefaultGroupElement g = new DefaultGroupElement(name); |
|
83 |
return g; |
|
84 |
} |
|
85 |
|
|
86 |
@Override |
|
81 | 87 |
public Element createElement(Function function) { |
82 | 88 |
Element f = new DefaultFunctionElement(function); |
83 | 89 |
return f; |
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/DefaultGroupElement.java | ||
---|---|---|
8 | 8 |
import java.util.ArrayList; |
9 | 9 |
import java.util.Iterator; |
10 | 10 |
import java.util.List; |
11 |
import org.gvsig.expressionevaluator.Function; |
|
12 |
import org.gvsig.expressionevaluator.swing.ExpressionEvaluatorSwingManager; |
|
11 | 13 |
import org.gvsig.expressionevaluator.swing.JExpressionBuilder; |
12 | 14 |
|
13 | 15 |
/** |
... | ... | |
18 | 20 |
|
19 | 21 |
private final String name; |
20 | 22 |
private final List<JExpressionBuilder.Element> elements; |
23 |
private ExpressionEvaluatorSwingManager manager; |
|
21 | 24 |
|
22 |
public DefaultGroupElement(String name, List<JExpressionBuilder.Element> elements) { |
|
25 |
public DefaultGroupElement(ExpressionEvaluatorSwingManager manager, String name, List<JExpressionBuilder.Element> elements) { |
|
26 |
this.manager = manager; |
|
23 | 27 |
this.name = name; |
24 | 28 |
this.elements = elements; |
25 | 29 |
} |
... | ... | |
62 | 66 |
public String getDescription() { |
63 | 67 |
return null; |
64 | 68 |
} |
69 |
|
|
70 |
@Override |
|
71 |
public void addElement(Function function) { |
|
72 |
JExpressionBuilder.Element item = this.manager.createElement(function); |
|
73 |
this.addElement(item); |
|
74 |
} |
|
65 | 75 |
|
66 | 76 |
} |
Also available in: Unified diff