Merge "Issue #2412 - Fix problem loading config in dataset discovery browser" into development

Former-commit-id: 97e67fe192e23cc11a05f9db69455b88c7a6fa5d
This commit is contained in:
Richard Peter 2013-09-26 14:56:11 -05:00 committed by Gerrit Code Review
commit 15866b434c
2 changed files with 6 additions and 1 deletions

View file

@ -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.
*
* </pre>
*
@ -1077,6 +1078,7 @@ public class DataBrowserDlg extends CaveSWTDialog implements IDataTableUpdate,
}
}
datatypeList.select(i);
handleDataTypeSelection();
}
}

View file

@ -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.
*
* </pre>
*
@ -595,7 +596,9 @@ public class FilterExpandBar extends Composite implements IFilterUpdate,
this.dataType = dataType;
setEnvelope(envelope);
disposeExpandItemsAndControls();
createExpandItems();
if (!dataType.isEmpty()) {
createExpandItems();
}
}
/**