Revision 44769 trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.impl/src/main/java/org/gvsig/expressionevaluator/impl/DefaultDALExpressionBuilder.java

View differences:

DefaultDALExpressionBuilder.java
4 4
import org.gvsig.expressionevaluator.ExpressionBuilder;
5 5
import org.gvsig.expressionevaluator.ExpressionBuilder.Value;
6 6
import org.gvsig.expressionevaluator.ExpressionUtils;
7
import org.gvsig.expressionevaluator.Formatter;
8
import org.gvsig.expressionevaluator.impl.expressionbuilder.formatters.DALFormatter;
7 9
import static org.gvsig.fmap.dal.DataManager.FUNCTION_CURRENT_ROW;
8 10
import static org.gvsig.fmap.dal.DataManager.FUNCTION_CURRENT_STORE;
9 11
import static org.gvsig.fmap.dal.DataManager.FUNCTION_EXISTS;
......
49 51
    }
50 52

  
51 53
    @Override
52
    public SelectBuilder table(String tableName) {
54
    public SelectBuilder from(String tableName) {
53 55
      this.tableName = tableName;
54 56
      return this;
55 57
    }
......
89 91

  
90 92
    @Override
91 93
    public String toString() {
92
      return this.toValue().toString();
94
      return this.toString(formatter());
93 95
    }
94 96
    
97
    @Override
98
    public String toString(Formatter<Value> formatter) {
99
      return this.toValue().toString(formatter);
100
    }
101
    
95 102
  }
96 103
  
104
  
97 105
  private class DefaultSelectCountBuilder implements SelectCountBuilder {
98 106
    
99 107
    private String tableName;
......
143 151
  }
144 152
  
145 153
  @Override
154
  public Formatter<Value> formatter() {
155
    return this.formatter(null);
156
  }
157
  
158
  @Override
159
  public Formatter<Value> formatter(Formatter<Value> formatter) {
160
    return new DALFormatter(formatter);
161
  }
162
  
163
  @Override
146 164
  public SelectBuilder select() {
147 165
    return new DefaultSelectBuilder();
148 166
  }

Also available in: Unified diff