Revision 46517 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
67 67
                return false;
68 68
            }
69 69
            ExpressionBuilder.Variable variable = (ExpressionBuilder.Variable) value;
70
			FeatureAttributeDescriptor attr = featureType.getAttributeDescriptor(variable.name());
71
			if (attr == null) {
72
				FeatureQuery query = (FeatureQuery) value.getProperty(PROP_QUERY);
73
				if (query == null) {
74
					return false;
75
				}
76
				FeatureExtraColumns extraColumn = query.getExtraColumn();
77
				if (extraColumn == null) {
78
					return false;
79
				}
80
				attr = extraColumn.get(variable.name());
81
				if (attr == null ) {
82
					return false;
83
				}
84
			}
70
            FeatureAttributeDescriptor attr = featureType.getAttributeDescriptor(variable.name());
71
            if (attr == null) {
72
                    FeatureQuery query = (FeatureQuery) value.getProperty(PROP_QUERY);
73
                    if (query == null) {
74
                            return false;
75
                    }
76
                    FeatureExtraColumns extraColumn = query.getExtraColumn();
77
                    if (extraColumn == null) {
78
                            return false;
79
                    }
80
                    attr = extraColumn.get(variable.name());
81
                    if (attr == null ) {
82
                            return false;
83
                    }
84
            }
85 85

  
86 86
            if (!attr.isComputed()) {
87 87
                return false;

Also available in: Unified diff