Revision 44148 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/DefaultCalculatorController.java
| DefaultCalculatorController.java | ||
|---|---|---|
| 182 | 182 |
} |
| 183 | 183 |
|
| 184 | 184 |
private Object doCalculate(boolean updateText) {
|
| 185 |
if( !this.text.isEditable() ) {
|
|
| 185 |
if( !this.text.isEditable() ||!this.text.isEnabled() ) {
|
|
| 186 | 186 |
return null; |
| 187 | 187 |
} |
| 188 | 188 |
String source = this.text.getText(); |
| ... | ... | |
| 231 | 231 |
|
| 232 | 232 |
@Override |
| 233 | 233 |
public T get() {
|
| 234 |
Object value = doCalculate(false); |
|
| 234 |
Object value; |
|
| 235 |
if( !this.text.isEditable() ||!this.text.isEnabled() ) {
|
|
| 236 |
value = this.text.getText(); |
|
| 237 |
} else {
|
|
| 238 |
value = doCalculate(false); |
|
| 239 |
} |
|
| 235 | 240 |
try {
|
| 236 | 241 |
DataTypesManager dataManager = ToolsLocator.getDataTypesManager(); |
| 237 | 242 |
value = dataManager.coerce(this.dataType, value); |
Also available in: Unified diff