Revision 44729

View differences:

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/DefaultSearchPanel.java
313 313
        public Expression getFilterForSelecteds() {
314 314
            return this.panel.getFilterForSelectedFeature();
315 315
        }
316
        
317
        @Override
318
        public FeatureQuery getQuery() {
319
            return this.panel.getQuery();
320
        }
316 321
    }
317 322
    
318 323
    private final FeatureStore store;
......
333 338
        this.acctionListeners = ToolsSwingLocator.getToolsSwingManager().createActionListenerSupport();
334 339
        this.actions = new HashMap<>();        
335 340
        this.parameters = new SearchParameters();
336
        this.parameters.setQuery(this.store.createFeatureQuery());
341
        FeatureQuery featureQuery = this.store.createFeatureQuery();
342
        featureQuery.retrievesAllAttributes();
343
        this.parameters.setQuery(featureQuery);
337 344
        
338 345
        Search search = (Search) ToolsLocator.getComplementsManager().get(
339 346
                Search.COMPLEMENT_MANE, getFeatureType()
......
465 472
        );
466 473
        for (SearchConditionPanelFactory factory : DALSwingLocator.getManager().getSearchConditionPanels()) {
467 474
          if( factory.isApplicable(store) ) {
468
            this.conditionPanels.add(factory.create(this));
475
            SearchConditionPanel panel = factory.create(this);
476
            this.conditionPanels.add(panel);
477
            this.tabSearchMode.add(factory.getName(), panel.asJComponent());
469 478
          }
470 479
        }
471 480
        
......
539 548
              return query;
540 549
          }
541 550
          query.setFilter(filter);
551
          query.retrievesAllAttributes();
542 552
          return query;
543 553
        } catch (Exception ex) {
544 554
          LOGGER.warn("Can't build query.",ex);
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/SearchConditionPanelAdvanced.java
1 1
package org.gvsig.fmap.dal.swing.impl.searchpanel;
2 2

  
3 3
import javax.swing.JButton;
4
import javax.swing.JComponent;
4 5
import javax.swing.text.JTextComponent;
5 6
import org.gvsig.expressionevaluator.Expression;
6 7
import org.gvsig.expressionevaluator.swing.ExpressionEvaluatorSwingLocator;
......
16 17
 */
17 18
public class SearchConditionPanelAdvanced implements SearchConditionPanel {
18 19

  
20
    @Override
21
    public JComponent asJComponent() {
22
        return null;
23
    }
24

  
19 25
  private static class SearchConditionPanelAdvancedFactory 
20 26
     implements SearchConditionPanelFactory
21 27
  {
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
5 5
import java.util.List;
6 6
import javax.swing.JButton;
7 7
import javax.swing.JComboBox;
8
import javax.swing.JComponent;
8 9
import javax.swing.JLabel;
9 10
import org.apache.commons.lang3.StringUtils;
10 11
import org.gvsig.expressionevaluator.Code;
......
37 38

  
38 39
  private static final Logger LOGGER = LoggerFactory.getLogger(SearchConditionPanelSimplified.class);
39 40

  
41
    @Override
42
    public JComponent asJComponent() {
43
        return null;
44
    }
45

  
40 46
  private static class SearchConditionPanelAdvancedFactory 
41 47
     implements SearchConditionPanelFactory
42 48
  {

Also available in: Unified diff