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

Merge "Issue #2413 - Added isDirty check to new config for Data Browser Peer review comments" into development

Browse source 
Former-commit-id: bedacaf43bb65ed3cfbf2aff57cd8839f8df4815
This commit is contained in:
Richard Peter 2013-09-26 15:23:54 -05:00 • committed by Gerrit Code Review
commit 2257278313
1 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/browser/DataBrowserDlg.java
View file

@ -122,6 +122,7 @@ import com.vividsolutions.jts.geom.Coordinate;
* 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.
* Sep 26, 2013 2413 mpduff Added isDirty check to New Configuration menu selection.
*
* </pre>
*
@ -884,18 +885,18 @@ public class DataBrowserDlg extends CaveSWTDialog implements IDataTableUpdate,
* Apply the new configuration selections to the Data Browser dialog.
*/
private void handleNewConfigurationAction() {
if (isDirty()) {
MessageBox mb = new MessageBox(shell, SWT.ICON_QUESTION | SWT.YES
| SWT.NO);
mb.setText("New Configuration");
mb.setMessage("Creating a new configuration will discard any changes you have "
+ "made to Area, Data Types, and Filters.\n\nDo you wish to continue?");
int result = mb.open();
MessageBox mb = new MessageBox(shell, SWT.ICON_QUESTION | SWT.YES
| SWT.NO);
mb.setText("New Configuration");
mb.setMessage("Creating a new configuration will discard any changes you have "
+ "made to Area, Data Types, and Filters.\n\nDo you wish to continue?");
int result = mb.open();
if (result == SWT.NO) {
return;
if (result == SWT.NO) {
return;
}
}
xml = new FilterSettingsXML();
setText(WINDOW_TITLE);
@ -911,11 +912,6 @@ public class DataBrowserDlg extends CaveSWTDialog implements IDataTableUpdate,
// Clear the filters.
updateFilters();
String selection = datatypeList.getItem(datatypeList
.getSelectionIndex());
filterExpandBar.updateFilters(selection, envelope);
// Clear the table and disable the buttons.
resetTableAndControls();
}