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

ASM #545 Hydrobase IngestFilter GUI fixes

Browse source 
Change-Id: I368113a8ccb0356198a52a9d5c8a39247dce68e8

Former-commit-id: 147d651d5e [formerly ab05520404] [formerly a647b1ddf3] [formerly a647b1ddf3 [formerly c4fc2f169b]] [formerly 147d651d5e [formerly ab05520404] [formerly a647b1ddf3] [formerly a647b1ddf3 [formerly c4fc2f169b]] [formerly 071a1ae06a [formerly a647b1ddf3 [formerly c4fc2f169b] [formerly 071a1ae06a [formerly a8710a68e4aa28861c03c5d988bc36a553704c31]]]]]
Former-commit-id: 071a1ae06a
Former-commit-id: c209d0d72a [formerly 06926b7c25] [formerly f31f39a875] [formerly 2ec6773d90f51808e1d23ee35acf339b7a5bd166 [formerly 9e48bdb73545c966a93dc52009a8423194d23422] [formerly f31f39a875 [formerly 1ce32e2be1]]]
Former-commit-id: 6a1ba7ad87862a2c2775b62f7cf2b71d4ed00fc7 [formerly 875d3ff6127f8752173708987096137934c964fd] [formerly 2bc8a6c5fd [formerly 57a6bcfca6]]
Former-commit-id: 2bc8a6c5fd
Former-commit-id: 597e063345
This commit is contained in:
Xuezhi.Wei 2014-05-02 16:54:38 +00:00
parent 9093de3e95
commit 9ec883643a
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/DataIngestFilterDlg.java
View file

@ -71,10 +71,13 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
* SOFTWARE HISTORY * SOFTWARE HISTORY
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------ ---------- ----------- --------------------------
* Sep 4, 2008 lvenable Initial creation * Sep 4, 2008 lvenable Initial creation
* Dec 11, 2008 1787 askripsk Connect to DB * Dec 11, 2008 1787 askripsk Connect to DB
* Apr 18, 2013 1790 rferrel Make dialog non-blocking. * Apr 18, 2013 1790 rferrel Make dialog non-blocking.
* Mar 31, 2014 #2970 lvenable Put dispose checks in the runAsync calls. * Mar 31, 2014 #2970 lvenable Put dispose checks in the runAsync calls.
* May 1, 2014 17096 xwei By default the first item of the data
* list is selected
*
* *
* </pre> * </pre>
* *
@ -642,7 +645,7 @@ public class DataIngestFilterDlg extends CaveSWTDialog {
typeSrcLbl.setEnabled(false); typeSrcLbl.setEnabled(false);
typeSrcLbl.setLayoutData(gd); typeSrcLbl.setLayoutData(gd);
gd = new GridData(); gd = new GridData(SWT.FILL, SWT.CENTER, false, true);
gd.horizontalSpan = 3; gd.horizontalSpan = 3;
typeSrcFilterCbo = new Combo(filterGroup, SWT.DROP_DOWN | SWT.READ_ONLY); typeSrcFilterCbo = new Combo(filterGroup, SWT.DROP_DOWN | SWT.READ_ONLY);
typeSrcFilterCbo.select(0); typeSrcFilterCbo.select(0);
@ -1045,6 +1048,8 @@ public class DataIngestFilterDlg extends CaveSWTDialog {
if (ingestDataList.getItemCount() > 0) { if (ingestDataList.getItemCount() > 0) {
updateDialogState(DialogStates.DATA_AVAILABLE); updateDialogState(DialogStates.DATA_AVAILABLE);
ingestDataList.select(0);
updateSelectedInformation();
} else { } else {
updateDialogState(DialogStates.NO_DATA); updateDialogState(DialogStates.NO_DATA);
} }

4
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/datamanager/DataIngestFilterDataManager.java
View file

@ -37,6 +37,8 @@ import com.raytheon.viz.hydrocommon.data.DataIngestFilterData;
* ------------ ---------- ----------- -------------------------- * ------------ ---------- ----------- --------------------------
* Dec 11, 2008 1787 askripsky Initial Creation * Dec 11, 2008 1787 askripsky Initial Creation
* Apr 18, 2013 1790 rferrel Code clean up with non-blocking dialogs. * Apr 18, 2013 1790 rferrel Code clean up with non-blocking dialogs.
* May 1, 2014 17096 xwei Updated the filter list SQL statement
*
* *
* </pre> * </pre>
* *
@ -220,7 +222,7 @@ public class DataIngestFilterDataManager {
StringBuffer whereClause = new StringBuffer(); StringBuffer whereClause = new StringBuffer();
if (filterByLocation) { if (filterByLocation) {
whereClause.append("lid like '%" + selectedLocation + "%'"); whereClause.append( "lid='" + selectedLocation + "'" );
} }
if (filterByPE && (selectedPE.size() > 0)) { if (filterByPE && (selectedPE.size() > 0)) {