ASM #17332 AvnFPS: Error message is displayed when cancel the TAF from 'Restore From....' option

Change-Id: I9ae9bf9b725db77e025b1b1bb508ddcc163a6c06

Former-commit-id: f44e6c7deb [formerly d7d664dce1959257676755bb0632e904c05593a6]
Former-commit-id: 64044b1320
This commit is contained in:
Zhidong.Hao 2015-04-07 14:37:56 -04:00
parent adf70ee1c5
commit aec5351938

View file

@ -241,6 +241,7 @@ import com.raytheon.viz.ui.dialogs.ICloseCallback;
* May 15, 2014 3002 bgonzale Moved common taf code to com.raytheon.uf.common.dataplugin.taf.
* 08/13/2014 3497 njensen Refactored syntax checking to prevent potential infinite loop
* 12/02/2014 #15007 zhao Added restoreFrom() for the "Restore From..." menu option
* 04/07/2015 17332 zhao Added code to handle case of "Cancel" in "Restore From..."
*
* </pre>
*
@ -2519,6 +2520,9 @@ public class TafViewerEditorDlg extends CaveSWTDialog implements ITafSettable,
FileDialog dlg = new FileDialog(shell, SWT.OPEN);
dlg.setFilterPath(path);
String filepath = dlg.open();
if ( filepath == null ) { // if "Cancel"; do nothing
return;
}
String errorMsg = null;