From c80b96570503b7517c74cda676e152286296e185 Mon Sep 17 00:00:00 2001 From: Mike Duff Date: Thu, 26 Sep 2013 09:02:41 -0500 Subject: [PATCH] Issue #2412 - Fix problem loading config in dataset discovery browser Change-Id: I765ec92e587aa4772af1ac170be32395e698beef Former-commit-id: b3bdf87b9084b13fdb9b23ec8c1001808982028f [formerly 4745867a1871c7006b1d2f29f7e75aa34a7147eb] [formerly b20e7e3386b0b2bd597aa36efb36a8a698a4a8d0] [formerly d66d30ba323545caea6e4867d807d5de6d60f5bf [formerly b20e7e3386b0b2bd597aa36efb36a8a698a4a8d0 [formerly c478a13d2740e7ad97e02be81233bd8a2fd0dd3e]]] Former-commit-id: d66d30ba323545caea6e4867d807d5de6d60f5bf Former-commit-id: 0de47fd52aa147ebecde98f2eb3801a47e59542b [formerly 7045c5f10c835cadf67356ceaf87a944469e5325] Former-commit-id: 275c48fa11b7ae33f2bdf64000d22443b993db5c --- .../raytheon/uf/viz/datadelivery/browser/DataBrowserDlg.java | 2 ++ .../raytheon/uf/viz/datadelivery/filter/FilterExpandBar.java | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/browser/DataBrowserDlg.java b/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/browser/DataBrowserDlg.java index cee7a2c7b1..821c27adde 100644 --- a/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/browser/DataBrowserDlg.java +++ b/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/browser/DataBrowserDlg.java @@ -121,6 +121,7 @@ import com.vividsolutions.jts.geom.Coordinate; * Jul 05, 2013 2137 mpduff Changed data type to a single select list, changed layout. * Jul 26, 2031 2232 mpduff Refactored Data Delivery permissions. * Sep 04, 2013 2314 mpduff Load/save config dialog now non-blocking. + * Sep 26, 2013 2412 mpduff Handle auto selecting data type. * * * @@ -1077,6 +1078,7 @@ public class DataBrowserDlg extends CaveSWTDialog implements IDataTableUpdate, } } datatypeList.select(i); + handleDataTypeSelection(); } } diff --git a/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/filter/FilterExpandBar.java b/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/filter/FilterExpandBar.java index d3d32967ca..3caecb0620 100644 --- a/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/filter/FilterExpandBar.java +++ b/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/filter/FilterExpandBar.java @@ -84,6 +84,7 @@ import com.raytheon.viz.ui.widgets.duallist.DualListConfig; * May 15, 2013 1040 mpduff Called markNotBusyInUIThread. * Jul 05, 2013 2137 mpduff Only a single data type can be selected. * Jul 05, 2013 2138 mpduff Fixed to not use filter if filter is disabled. + * Sep 26, 2013 2412 mpduff Don't create expand items if no data type is selected. * * * @@ -595,7 +596,9 @@ public class FilterExpandBar extends Composite implements IFilterUpdate, this.dataType = dataType; setEnvelope(envelope); disposeExpandItemsAndControls(); - createExpandItems(); + if (!dataType.isEmpty()) { + createExpandItems(); + } } /**