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

Issue #1790 Changes for non-blocking AdministrationDlg.

Browse source 
Change-Id: Iec8d71c747ef5167cd49909caba33176519cd07d

Former-commit-id: f24bd5d02b [formerly e8093a3a56] [formerly 0194324742 [formerly aa671a4bcfbd26ade407a8e52c6fe5eac69eb83f]]
Former-commit-id: 0194324742
Former-commit-id: f3da79e406
This commit is contained in:
Roger Ferrel 2013-04-16 16:34:00 -05:00
parent 9c8faa3b5b
commit 66ffbeb3a6
2 changed files with 28 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/HydroBaseDlg.java
View file

@ -131,6 +131,7 @@ import com.raytheon.viz.ui.dialogs.ICloseCallback;
*
* 05/09/2011 9151 lbousaid open Modify Location window on double click
* 04/16/2013 1790 rferrel Changes for non-blocking AddModifyLocationDlg.
* Changes for non-blocking AdministrationDlg.
*
* </pre>
*
@ -153,6 +154,11 @@ public class HydroBaseDlg extends CaveSWTDialog implements IGetSortType,
*/
private final Map<String, AddModifyLocationDlg> modLocDlgMap = new HashMap<String, AddModifyLocationDlg>();
/**
* Administration information dialog.
*/
private AdministrationDlg adminDlg;
/**
* Flood category menu item.
*/
@ -923,8 +929,12 @@ public class HydroBaseDlg extends CaveSWTDialog implements IGetSortType,
adminMI.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent event) {
AdministrationDlg adminDlg = new AdministrationDlg(shell);
adminDlg.open();
if (adminDlg == null || adminDlg.isDisposed()) {
adminDlg = new AdministrationDlg(shell);
adminDlg.open();
} else {
adminDlg.bringToTop();
}
}
});

28
cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/AdministrationDlg.java
View file

@ -54,6 +54,7 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
* ------------ ---------- ----------- --------------------------
* 02 Sep 2008 lvenable Initial creation.
* 14 Nov 2008 1697 askripsky Connect to DB
* 16 Apr 2013 1790 rferrel Made dialog non-blocking.
*
* </pre>
*
@ -135,7 +136,7 @@ public class AdministrationDlg extends CaveSWTDialog {
* Parent shell.
*/
public AdministrationDlg(Shell parent) {
super(parent);
super(parent, SWT.DIALOG_TRIM, CAVE.DO_NOT_BLOCK);
setText("Administration");
adminFormat = new SimpleDateFormat("MM/dd/yyyy");
@ -151,6 +152,13 @@ public class AdministrationDlg extends CaveSWTDialog {
return mainLayout;
}
/*
* (non-Javadoc)
*
* @see
* com.raytheon.viz.ui.dialogs.CaveSWTDialogBase#initializeComponents(org
* .eclipse.swt.widgets.Shell)
*/
@Override
protected void initializeComponents(Shell shell) {
setReturnValue(false);
@ -327,7 +335,7 @@ public class AdministrationDlg extends CaveSWTDialog {
closeBtn.setLayoutData(gd);
closeBtn.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent event) {
shell.dispose();
close();
}
});
}
@ -354,10 +362,8 @@ public class AdministrationDlg extends CaveSWTDialog {
nameTF.setText(adminData.getName());
stationTF.setText(adminData.getStationName());
stationIdTF.setText(adminData.getHsa());
hsaNoTF
.setText((adminData.getHsaNumber() != HydroConstants.MISSING_VALUE) ? Integer
.toString(adminData.getHsaNumber())
: "");
hsaNoTF.setText((adminData.getHsaNumber() != HydroConstants.MISSING_VALUE) ? Integer
.toString(adminData.getHsaNumber()) : "");
regionTF.setText(adminData.getRegion());
noTF.setText(adminData.getRegionNumber());
phoneTF.setText(adminData.getPhoneNumber());
@ -436,9 +442,8 @@ public class AdministrationDlg extends CaveSWTDialog {
currData.setRegionNumber(noTF.getText());
currData.setStationName(stationTF.getText());
try {
currData
.setOneYearDate((oneYearTF.getText().compareTo("") == 0) ? (Date) null
: adminFormat.parse(oneYearTF.getText()));
currData.setOneYearDate((oneYearTF.getText().compareTo("") == 0) ? (Date) null
: adminFormat.parse(oneYearTF.getText()));
} catch (ParseException e) {
MessageBox messageBox = new MessageBox(new Shell(),
SWT.ICON_WARNING | SWT.OK);
@ -450,9 +455,8 @@ public class AdministrationDlg extends CaveSWTDialog {
return currData;
}
try {
currData
.setTenYearDate((tenYearTF.getText().compareTo("") == 0) ? (Date) null
: adminFormat.parse(tenYearTF.getText()));
currData.setTenYearDate((tenYearTF.getText().compareTo("") == 0) ? (Date) null
: adminFormat.parse(tenYearTF.getText()));
} catch (ParseException e) {
MessageBox messageBox = new MessageBox(new Shell(),
SWT.ICON_WARNING | SWT.OK);