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/DefaultExpressionPickerController.java
| DefaultExpressionPickerController.java | ||
|---|---|---|
| 14 | 14 |
import org.gvsig.expressionevaluator.DataTypes; |
| 15 | 15 |
import org.gvsig.expressionevaluator.Expression; |
| 16 | 16 |
import org.gvsig.expressionevaluator.ExpressionEvaluatorLocator; |
| 17 |
import org.gvsig.expressionevaluator.ExpressionEvaluatorManager; |
|
| 17 | 18 |
import org.gvsig.expressionevaluator.ExpressionUtils; |
| 18 | 19 |
import org.gvsig.expressionevaluator.SymbolTable; |
| 19 | 20 |
import org.gvsig.expressionevaluator.swing.Element; |
| ... | ... | |
| 91 | 92 |
this.automaticExpressionChecker = new AbstractAutomaticExpressionChecker(config, text) {
|
| 92 | 93 |
@Override |
| 93 | 94 |
protected Expression getExpression() {
|
| 94 |
return get(); |
|
| 95 |
return getWithOutHistory();
|
|
| 95 | 96 |
} |
| 96 | 97 |
}; |
| 97 | 98 |
} |
| ... | ... | |
| 117 | 118 |
|
| 118 | 119 |
@Override |
| 119 | 120 |
public Expression get() {
|
| 121 |
Expression expression = this.getWithOutHistory(); |
|
| 122 |
ExpressionEvaluatorManager theManager = ExpressionEvaluatorLocator.getManager(); |
|
| 123 |
theManager.getHistory().add(expression); |
|
| 124 |
return expression; |
|
| 125 |
} |
|
| 126 |
|
|
| 127 |
@Override |
|
| 128 |
public Expression getWithOutHistory() {
|
|
| 120 | 129 |
String s = this.text.getText(); |
| 121 | 130 |
if( this.returnNullWhenEmptyExpression ) {
|
| 122 | 131 |
if( ExpressionUtils.isEmpty(this.value) && StringUtils.isBlank(s) ) {
|
Also available in: Unified diff