Revision 44267 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

View differences:

DefaultSearchPanel.java
8 8
import java.net.URL;
9 9
import java.util.ArrayList;
10 10
import java.util.Collection;
11
import java.util.LinkedHashMap;
12 11
import java.util.List;
13
import java.util.Map;
14 12
import javax.swing.Action;
15 13
import javax.swing.ImageIcon;
16 14
import javax.swing.JButton;
......
37 35
import org.gvsig.fmap.dal.feature.FeatureStore;
38 36
import org.gvsig.fmap.dal.feature.FeatureType;
39 37
import org.gvsig.fmap.dal.swing.DALSwingLocator;
40
import org.gvsig.fmap.dal.swing.impl.searchpanel.actions.SelectionAddAction;
41
import org.gvsig.fmap.dal.swing.impl.searchpanel.actions.SelectionFilterAction;
42
import org.gvsig.fmap.dal.swing.impl.searchpanel.actions.SelectionSetAction;
43
import org.gvsig.fmap.dal.swing.impl.searchpanel.actions.ShowFormAction;
44 38
import org.gvsig.fmap.dal.swing.searchpanel.FeatureStoreSearchPanel;
45 39
import org.gvsig.tools.ToolsLocator;
46 40
import org.gvsig.tools.swing.api.ActionListenerSupport;
......
160 154
    private final ActionListenerSupport acctionListeners;
161 155
    private final List<SearchFieldController> searchFields;
162 156
    private ExpressionPickerController advancedExpression;
163
    private List<Action> actions;
157
    private final List<Action> actions;
164 158

  
165 159
    public DefaultSearchPanel(FeatureStore store) {
166 160
        this.store = store;
......
279 273
        }
280 274

  
281 275
        ExpressionEvaluatorSwingManager expressionSwingManager = ExpressionEvaluatorSwingLocator.getManager();
282
        this.advancedExpression = expressionSwingManager.createExpressionPickerController(txtAdvancedExpression, btnAdvancedExpression);
276
        this.advancedExpression = expressionSwingManager.createExpressionPickerController(
277
                txtAdvancedExpression, 
278
                btnAdvancedExpression,
279
                btnAdvancedExpressionHistory,
280
                btnAdvancedExpressionBookmarks
281
        );
283 282

  
284 283
        this.btnSearch.addActionListener(new ActionListener() {
285 284
            @Override
......
441 440
        }
442 441
    }
443 442

  
443
    @Override
444 444
    public FeatureStore getStore() {
445 445
        return store;
446 446
    }

Also available in: Unified diff