Revision 46016
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 | ||
---|---|---|
133 | 133 |
private BookmarksController bookmarksController; |
134 | 134 |
private HistoryController historyController; |
135 | 135 |
private FeatureQuery lastQuery; |
136 |
private Feature lastSelectedFeature; |
|
137 |
private MutableSymbolTable symbolTable; |
|
138 |
|
|
136 |
private Feature lastSelectedFeature; |
|
139 | 137 |
private final PropertiesSupportHelper propertiesHelper; |
140 | 138 |
|
141 | 139 |
public static class UseLabelsYesAction extends AbstractAction { |
... | ... | |
935 | 933 |
// myQuery = this.getQuery().getCopy(); |
936 | 934 |
this.tabResults.setSelectedIndex(0); |
937 | 935 |
List<String> resultColumnNames = searchParams.getResultColumnNames(); |
938 |
// this.symbolTable.setVar("SearchPanel", this); |
|
939 |
this.symbolTable.setVar("SearchParameters", searchParams); |
|
940 | 936 |
myQuery = searchParams.getQuery().getCopy(); |
941 |
myQuery.setSymbolTable(this.symbolTable); |
|
942 | 937 |
features = store.getFeatures(myQuery, 50); |
943 | 938 |
FacadeOfAFeaturePagingHelper facade = (FacadeOfAFeaturePagingHelper) features; |
944 | 939 |
FeatureType ftype = facade.getFeaturePagingHelper().getFeatureSet().getDefaultFeatureType(); |
... | ... | |
1422 | 1417 |
|
1423 | 1418 |
@Override |
1424 | 1419 |
public void put(SearchParameters inParams) { |
1425 |
this.symbolTable.setVar("SearchParameters", inParams); |
|
1426 | 1420 |
this.parameters = (DefaultSearchParameters) inParams; |
1427 | 1421 |
for (SearchConditionPanel conditionPanel : this.conditionPanels) { |
1428 | 1422 |
try { |
... | ... | |
1479 | 1473 |
} |
1480 | 1474 |
this.parameters.setSearchMode(searchMode); |
1481 | 1475 |
FeatureQuery query = (FeatureQuery) this.parameters.getQuery(); |
1482 |
query.setSymbolTable(symbolTable); |
|
1483 | 1476 |
this.lastQuery = query.getCopy(); |
1484 | 1477 |
query.retrievesAllAttributes(); |
1485 | 1478 |
query.clearFilter(); |
Also available in: Unified diff