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/DefaultExpressionEvaluatorSwingManager.java
| DefaultExpressionEvaluatorSwingManager.java | ||
|---|---|---|
| 19 | 19 |
import org.gvsig.expressionevaluator.swing.Element.ConstantElement; |
| 20 | 20 |
import org.gvsig.expressionevaluator.swing.Element.FunctionElement; |
| 21 | 21 |
import org.gvsig.expressionevaluator.swing.Element.GroupElement; |
| 22 |
import org.gvsig.expressionevaluator.swing.Element.VariableElement; |
|
| 23 | 22 |
import org.gvsig.expressionevaluator.swing.ElementFactory; |
| 24 | 23 |
import org.gvsig.expressionevaluator.swing.ExpressionBuilderConfig; |
| 25 | 24 |
import org.gvsig.expressionevaluator.swing.ExpressionPickerController; |
| ... | ... | |
| 28 | 27 |
import org.gvsig.expressionevaluator.swing.impl.elements.DefaultConstantValueElement; |
| 29 | 28 |
import org.gvsig.expressionevaluator.swing.impl.elements.DefaultFunctionElement; |
| 30 | 29 |
import org.gvsig.expressionevaluator.swing.impl.elements.DefaultGroupElement; |
| 31 |
import org.gvsig.expressionevaluator.swing.impl.elements.DefaultVariableElement; |
|
| 32 | 30 |
import org.gvsig.tools.ToolsLocator; |
| 33 | 31 |
import org.gvsig.tools.i18n.I18nManager; |
| 34 | 32 |
|
| ... | ... | |
| 44 | 42 |
} |
| 45 | 43 |
|
| 46 | 44 |
@Override |
| 47 |
public List<Element> createElements(ExpressionBuilderConfig config, Collection<SymbolTable> symbolTables) {
|
|
| 45 |
public List<Element> createElements(Collection<SymbolTable> symbolTables) {
|
|
| 48 | 46 |
I18nManager i18n = ToolsLocator.getI18nManager(); |
| 49 | 47 |
Map<String, Function> functions = new HashMap<>(); |
| 50 | 48 |
|
| ... | ... | |
| 61 | 59 |
String groupName = function.group(); |
| 62 | 60 |
GroupElement group = operatorGroups.get(groupName); |
| 63 | 61 |
if (group == null) {
|
| 64 |
group = new DefaultGroupElement(config, groupName);
|
|
| 62 |
group = new DefaultGroupElement(groupName); |
|
| 65 | 63 |
operatorGroups.put(groupName, group); |
| 66 | 64 |
} |
| 67 |
group.addElement(new DefaultFunctionElement(config, function));
|
|
| 65 |
group.addElement(new DefaultFunctionElement(function)); |
|
| 68 | 66 |
} else {
|
| 69 | 67 |
String groupName = function.group(); |
| 70 | 68 |
GroupElement group = functionGroups.get(groupName); |
| 71 | 69 |
if (group == null) {
|
| 72 |
group = new DefaultGroupElement(config, groupName);
|
|
| 70 |
group = new DefaultGroupElement(groupName); |
|
| 73 | 71 |
functionGroups.put(groupName, group); |
| 74 | 72 |
} |
| 75 |
group.addElement(new DefaultFunctionElement(config, function));
|
|
| 73 |
group.addElement(new DefaultFunctionElement(function)); |
|
| 76 | 74 |
} |
| 77 | 75 |
} |
| 78 |
GroupElement builtinFunctions = this.createGroupElement(config, i18n.getTranslation("_Functions"));
|
|
| 76 |
GroupElement builtinFunctions = this.createGroupElement(i18n.getTranslation("_Functions"));
|
|
| 79 | 77 |
for (GroupElement group : functionGroups.values()) {
|
| 80 | 78 |
builtinFunctions.addElement(group); |
| 81 | 79 |
} |
| 82 |
GroupElement operatorFunctions = this.createGroupElement(config, i18n.getTranslation("_Operators"));
|
|
| 80 |
GroupElement operatorFunctions = this.createGroupElement(i18n.getTranslation("_Operators"));
|
|
| 83 | 81 |
for (GroupElement group : operatorGroups.values()) {
|
| 84 | 82 |
operatorFunctions.addElement(group); |
| 85 | 83 |
} |
| ... | ... | |
| 126 | 124 |
} |
| 127 | 125 |
|
| 128 | 126 |
@Override |
| 129 |
public GroupElement createGroupElement(ExpressionBuilderConfig config, String name) {
|
|
| 130 |
GroupElement e = new DefaultGroupElement(config, name);
|
|
| 127 |
public GroupElement createGroupElement(String name) {
|
|
| 128 |
GroupElement e = new DefaultGroupElement(name); |
|
| 131 | 129 |
return e; |
| 132 | 130 |
} |
| 133 | 131 |
|
| 134 | 132 |
@Override |
| 135 |
public GroupElement createGroupElement(ExpressionBuilderConfig config, String name, List<Element> elements) {
|
|
| 136 |
GroupElement e = new DefaultGroupElement(this, config, name, elements);
|
|
| 133 |
public GroupElement createGroupElement(String name, List<Element> elements) {
|
|
| 134 |
GroupElement e = new DefaultGroupElement(this, name, elements); |
|
| 137 | 135 |
return e; |
| 138 | 136 |
} |
| 139 | 137 |
|
| 140 | 138 |
@Override |
| 141 |
public FunctionElement createFunctionElement(ExpressionBuilderConfig config, Function function) {
|
|
| 142 |
FunctionElement e = new DefaultFunctionElement(config, function);
|
|
| 139 |
public FunctionElement createFunctionElement(Function function) {
|
|
| 140 |
FunctionElement e = new DefaultFunctionElement(function); |
|
| 143 | 141 |
return e; |
| 144 | 142 |
} |
| 145 | 143 |
|
| 146 | 144 |
@Override |
| 147 |
public ConstantElement createConstantElement(ExpressionBuilderConfig config, Object value) {
|
|
| 148 |
ConstantElement e = new DefaultConstantValueElement(config, value, null); |
|
| 145 |
public ConstantElement createConstantElement(Object value, String label) {
|
|
| 146 |
ConstantElement e = new DefaultConstantValueElement( |
|
| 147 |
value, |
|
| 148 |
label, |
|
| 149 |
null |
|
| 150 |
); |
|
| 149 | 151 |
return e; |
| 150 | 152 |
} |
| 151 | 153 |
|
| 152 | 154 |
@Override |
| 153 |
public ConstantElement createConstantElement(ExpressionBuilderConfig config, Object value, String description) {
|
|
| 154 |
ConstantElement e = new DefaultConstantValueElement(config, value, description); |
|
| 155 |
public ConstantElement createConstantElement(Object value, String label, String description) {
|
|
| 156 |
ConstantElement e = new DefaultConstantValueElement( |
|
| 157 |
value, |
|
| 158 |
StringUtils.defaultIfEmpty(label, ""), |
|
| 159 |
description |
|
| 160 |
); |
|
| 155 | 161 |
return e; |
| 156 | 162 |
} |
| 163 |
// |
|
| 164 |
// @Override |
|
| 165 |
// public VariableElement createVariableElement(ExpressionBuilderConfig config, String label, String source, String name, String typeName, String description) {
|
|
| 166 |
// VariableElement e = new DefaultVariableElement(config, label, source, name, typeName, description); |
|
| 167 |
// return e; |
|
| 168 |
// } |
|
| 157 | 169 |
|
| 158 | 170 |
@Override |
| 159 |
public VariableElement createVariableElement(ExpressionBuilderConfig config, String label, String source, String name, String typeName, String description) {
|
|
| 160 |
VariableElement e = new DefaultVariableElement(config, label, source, name, typeName, description); |
|
| 161 |
return e; |
|
| 162 |
} |
|
| 163 |
|
|
| 164 |
@Override |
|
| 165 | 171 |
public ExpressionPickerController createExpressionPickerController(JTextComponent text, JButton button) {
|
| 166 | 172 |
ExpressionPickerController c = new DefaultExpressionPickerController(this, text, button); |
| 167 | 173 |
return c; |
Also available in: Unified diff