xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Issue #2138 - Fixed to not use filter if filter is disabled." into development

Browse source 
Former-commit-id: b8800c0616 [formerly b8800c0616 [formerly 35a2a6d54af2aa62cc3a256869e409cdb7868cb0]]
Former-commit-id: e2ffbd9b27
Former-commit-id: 56d1806f22
This commit is contained in:
Dustin Johnson 2013-07-08 08:39:14 -05:00 • committed by Gerrit Code Review
commit aae6466381
1 changed files with 13 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/filter/FilterExpandBar.java
View file

@ -82,6 +82,7 @@ import com.raytheon.viz.ui.widgets.duallist.DualListConfig;
* Feb 24, 2013 1620 mpduff Fixed set clean issue when loading configurations. Set clean
* needs to be called after the data load job is complete.
* May 15, 2013 1040 mpduff Called markNotBusyInUIThread.
* Jul 05, 2013 2138 mpduff Fixed to not use filter if filter is disabled.
*
* </pre>
*
@ -101,18 +102,11 @@ public class FilterExpandBar extends Composite implements IFilterUpdate,
*/
private FilterImages filterImgs;
// private String dataType;
/**
* Dialog that will enable or disable a filter.
*/
private EnableFilterDlg enableFilterDlg = null;
/**
* Controls for the expand bar.
*/
// private ExpandBarControls expandBarControls;
private DataTypeFilterXML dataTypeFilterXml;
private FilterXML filterXml;
@ -676,17 +670,19 @@ public class FilterExpandBar extends Composite implements IFilterUpdate,
Control control = item.getControl();
if (control instanceof FilterComp) {
FilterComp fc = (FilterComp) control;
String[] selectedItems = fc.getSelectedListItems();
ArrayList<String> values = new ArrayList<String>();
for (String selectedItem : selectedItems) {
values.add(selectedItem);
}
String type = item.getText();
FilterTypeXML ftx = new FilterTypeXML();
ftx.setFilterType(type);
ftx.setValues(values);
if (fc.isEnabled()) {
String[] selectedItems = fc.getSelectedListItems();
ArrayList<String> values = new ArrayList<String>();
for (String selectedItem : selectedItems) {
values.add(selectedItem);
}
String type = item.getText();
FilterTypeXML ftx = new FilterTypeXML();
ftx.setFilterType(type);
ftx.setValues(values);
filterSettingsXml.addFilterType(ftx);
filterSettingsXml.addFilterType(ftx);
}
}
}
// return filterSettingsXml;