Revision 46104 trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.db/org.gvsig.fmap.dal.db.jdbc/src/main/java/org/gvsig/fmap/dal/store/jdbc2/spi/expressionbuilder/formatters/ComputedAttribute.java

View differences:

ComputedAttribute.java
37 37
import org.gvsig.fmap.dal.feature.FeatureQuery;
38 38
import org.gvsig.fmap.dal.feature.FeatureType;
39 39
import org.gvsig.fmap.dal.store.jdbc2.JDBCHelper;
40
import org.gvsig.fmap.dal.store.jdbc2.spi.JDBCSQLBuilderBase;
41 40
import static org.gvsig.fmap.dal.store.jdbc2.spi.JDBCSQLBuilderBase.PROP_FEATURE_TYPE;
42 41
import static org.gvsig.fmap.dal.store.jdbc2.spi.JDBCSQLBuilderBase.PROP_JDBCHELPER;
43 42
import static org.gvsig.fmap.dal.store.jdbc2.spi.JDBCSQLBuilderBase.PROP_QUERY;
......
97 96
        }
98 97
        return false;
99 98
    }
99
	
100
	@Override
101
    public String format(Value value) {
102
        Value valueExpr = this.expandedValue(value);
103
        return "("+ this.formatter.format(valueExpr)+")";
104
	}
100 105

  
101
    @Override
102
    public String format(Value value) {
106
    
107
    public Value expandedValue(Value value) {
103 108
        FeatureType featureType = (FeatureType) value.getProperty(PROP_FEATURE_TYPE);
104 109
        ExpressionBuilder.Variable variable = (ExpressionBuilder.Variable) value;
105 110
        FeatureAttributeDescriptor attr = featureType.getAttributeDescriptor(variable.name());
......
112 117
        Code code = expr.getCode();
113 118
        GeometryExpressionBuilder builder = this.sqlbuilder.expression();
114 119
        Value valueExpr = code.toValue(builder);
115
        return "("+ this.formatter.format(valueExpr)+")";
120
        return valueExpr;
116 121
    }
117 122
    
118 123
}

Also available in: Unified diff