Revision 44713 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
61 61 
  private static final SearchConditionPanelFactory FACTORY = new SearchConditionPanelAdvancedFactory();
62 62
63 63 
  private final FeatureStore store;
64 
  private final List<SearchFieldController> searchFields;
64 
  private final List<SearchConditionFieldController> searchFields;
65 65 
  private int maxSearhFields = 4;
66 66 
  private String accumulatedFilter;
67 67 
  private final JButton btnAddAccumulatedFilter;
......
98 98 
  ) {
99 99 
    this.store = store;
100 100 
    this.searchFields = new ArrayList<>();
101 
    SearchFieldController controller = new SearchFieldController(
101 
    SearchConditionFieldController controller = new SearchConditionFieldController(
102 102 
            store,
103 103 
            lblField1,
104 104 
            lblExtraFields1,
......
107 107 
            lblLogicalOperators1
108 108 
    );
109 109 
    this.searchFields.add(controller);
110 
    controller = new SearchFieldController(
110 
    controller = new SearchConditionFieldController(
111 111 
            store,
112 112 
            lblField2,
113 113 
            lblExtraFields2,
......
116 116 
            lblLogicalOperators2
117 117 
    );
118 118 
    this.searchFields.add(controller);
119 
    controller = new SearchFieldController(
119 
    controller = new SearchConditionFieldController(
120 120 
            store,
121 121 
            lblField3,
122 122 
            lblExtraFields3,
......
125 125 
            lblLogicalOperators3
126 126 
    );
127 127 
    this.searchFields.add(controller);
128 
    controller = new SearchFieldController(
128 
    controller = new SearchConditionFieldController(
129 129 
            store,
130 130 
            lblField4,
131 131 
            lblExtraFields4,
......
159 159 
      );
160 160 
      this.maxSearhFields = Integer.min(orderedAttributes.size(), 4);
161 161 
      int n = 0;
162 
      for (SearchFieldController searchField : searchFields) {
162 
      for (SearchConditionFieldController searchField : searchFields) {
163 163 
        if (n < this.maxSearhFields) {
164 164 
          searchField.setAttribute(orderedAttributes.get(n++).getDescriptor().getName());
165 165 
        } else {
......
232 232 
      initComponents();
233 233 
    }
234 234 
    int n = 0;
235 
    for (SearchFieldController searchField : searchFields) {
235 
    for (SearchConditionFieldController searchField : searchFields) {
236 236 
      if (n < this.maxSearhFields) {
237 237 
        searchField.setEnabled(enabled);
238 238 
      } else {
......
247 247 
    if (this.searchFields == null) {
248 248 
      return;
249 249 
    }
250 
    for (SearchFieldController searchField : searchFields) {
250 
    for (SearchConditionFieldController searchField : searchFields) {
251 251 
      searchField.clear();
252 252 
    }
253 253 
    this.clearAccumulatedFilter();
......
275 275 
  public String getCurrentFilter() {
276 276 
    ExpressionBuilder builder = ExpressionUtils.createExpressionBuilder();
277 277 
    String relational = OPERATOR_OR;
278 
    for (SearchFieldController searchField : searchFields) {
278 
    for (SearchConditionFieldController searchField : searchFields) {
279 279 
      if (searchField.getAttribute() != null && searchField.getValue() != null) {
280 280 
        ExpressionBuilder.BinaryOperator cond = builder.binaryOperator(
281 281 
                searchField.getRelationalOperator(),
......
302 302 
  public boolean set(Expression filter) {
303 303 
    Code code = filter.getCode();
304 304 
    if (code.code() == Code.CALLER) {
305 
      SearchFieldController searchField = this.searchFields.get(0);
305 
      SearchConditionFieldController searchField = this.searchFields.get(0);
306 306 
      Code.Caller caller = (Code.Caller) code;
307 307 
      if (searchField.isAValidRelationOperator(caller.name())) {
308 308 
        Code op1 = caller.parameters().get(0);

Also available in: Unified diff