Revision 44748 trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.swing/org.gvsig.fmap.dal.swing.impl/src/main/java/org/gvsig/fmap/dal/swing/impl/searchpanel/SearchConditionPanelSimplified.java

View differences:

SearchConditionPanelSimplified.java
283 283 
    ExpressionBuilder builder = ExpressionUtils.createExpressionBuilder();
284 284 
    String relational = OPERATOR_OR;
285 285 
    for (SearchConditionFieldController searchField : searchFields) {
286 
      if (searchField.getAttribute() != null && searchField.getValue() != null) {
287 
        ExpressionBuilder.BinaryOperator cond = builder.binaryOperator(
288 
                searchField.getRelationalOperator(),
289 
                searchField.isAttributeAnExpression()
290 
                ? builder.custom(searchField.getAttribute())
291 
                : builder.column(searchField.getAttribute()),
292 
                builder.constant(searchField.getValue())
293 
        );
286 
      ExpressionBuilder.Value cond = searchField.getFilter();
287 
      if( cond != null ) {
294 288 
        if (relational.equals(OPERATOR_AND)) {
295 289 
          builder.and(cond);
296 290 
        } else {

Also available in: Unified diff