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

Omaha #3801 Fix closing cave with new/edit dialogs open, description menu when nothing is selected, and when edit/delete buttons are enabled

Browse source 
Change-Id: I982e959f2c4ebe7b26ee1aa615953228b9781474

Former-commit-id: d7cb0b4b0f [formerly 907425cb04] [formerly 59f4baa5fe] [formerly 18e1ede6a1 [formerly 59f4baa5fe [formerly 32621b600176a3afff5ee42228eb8cee2417c9c6]]]
Former-commit-id: 18e1ede6a1
Former-commit-id: 0adc225e8f28e7b8d65568f3c0a1549c6f9c3cd2 [formerly 1fa26e89c6]
Former-commit-id: 28a002c7ee
This commit is contained in:
Nathan Bowler 2014-12-05 15:30:15 -05:00
parent b245a21603
commit 1e7caee5e1
1 changed files with 76 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

126
cave/com.raytheon.uf.viz.useradmin/src/com/raytheon/uf/viz/useradmin/ui/UserAdminSelectDlg.java
View file

@ -54,20 +54,25 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
/**
* Main User Administration Dialog.
*
*
* <pre>
*
*
* SOFTWARE HISTORY
*
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* May 23, 2012 mpduff Initial creation.
* Nov 26, 2012 1347 mpduff Make resizable.
* Jan 09, 2013 1412 djohnson Listen for user authentication data changes.
* Aug 12, 2013 2247 mpduff Dialog cleanup and consistency.
*
* Dec 05, 2014 3801 nabowle Check if widgets are disposed in populate
* lists. Hide Description menu when nothing
* is selected. Better enable/disable edit
* and delete buttons. Give delete dialogs
* a title.
*
* </pre>
*
*
* @author mpduff
* @version 1.0
*/
@ -104,7 +109,7 @@ public class UserAdminSelectDlg extends CaveSWTDialog implements
/**
* Constructor.
*
*
* @param parent
* The parent shell
*/
@ -227,7 +232,7 @@ public class UserAdminSelectDlg extends CaveSWTDialog implements
/*
* (non-Javadoc)
*
*
* @see com.raytheon.viz.ui.dialogs.CaveSWTDialog#preOpened()
*/
@Override
@ -473,6 +478,11 @@ public class UserAdminSelectDlg extends CaveSWTDialog implements
private void populateLists() {
NwsRoleDataManager man = NwsRoleDataManager.getInstance();
if (appCombo.isDisposed() || userList.isDisposed()
|| userTab.isDisposed() || roleTab.isDisposed()
|| roleList.isDisposed()) {
return;
}
String app = appCombo.getItem(appCombo.getSelectionIndex());
userTab.setText(app + " Users");
@ -486,6 +496,11 @@ public class UserAdminSelectDlg extends CaveSWTDialog implements
userList.setItems(man.getRoleData(app).getUsers());
if (selection < userList.getItemCount()) {
userList.select(selection);
editUserBtn.setEnabled(true);
deleteUserBtn.setEnabled(true);
} else {
editUserBtn.setEnabled(false);
deleteUserBtn.setEnabled(false);
}
populateUserRoleList();
@ -498,12 +513,21 @@ public class UserAdminSelectDlg extends CaveSWTDialog implements
roleList.setItems(man.getRoleData(app).getRoles());
if (selection < roleList.getItemCount()) {
roleList.select(selection);
editRoleBtn.setEnabled(true);
deleteRoleBtn.setEnabled(true);
} else {
editRoleBtn.setEnabled(false);
deleteRoleBtn.setEnabled(false);
}
populatePermissionList();
}
private void populateUserRoleList() {
NwsRoleDataManager man = NwsRoleDataManager.getInstance();
if (appCombo.isDisposed() || userList.isDisposed()
|| userPermList.isDisposed()) {
return;
}
String app = appCombo.getItem(appCombo.getSelectionIndex());
if (userList.getSelectionIndex() != -1) {
@ -547,7 +571,7 @@ public class UserAdminSelectDlg extends CaveSWTDialog implements
String user = userList.getItem(userList.getSelectionIndex());
MessageBox messageDialog = new MessageBox(this.shell, SWT.YES | SWT.NO);
messageDialog.setText("Title");
messageDialog.setText("Delete user - " + user);
messageDialog
.setMessage("Are you sure you wish to delete user " + user);
int response = messageDialog.open();
@ -576,7 +600,7 @@ public class UserAdminSelectDlg extends CaveSWTDialog implements
String role = roleList.getItem(roleList.getSelectionIndex());
MessageBox messageDialog = new MessageBox(this.shell, SWT.YES | SWT.NO);
messageDialog.setText("Title");
messageDialog.setText("Delete role - " + role);
messageDialog
.setMessage("Are you sure you wish to delete role " + role);
int response = messageDialog.open();
@ -615,51 +639,53 @@ public class UserAdminSelectDlg extends CaveSWTDialog implements
}
private void showPermissionMenu(final List list) {
Menu menu = new Menu(shell, SWT.POP_UP);
MenuItem item1 = new MenuItem(menu, SWT.PUSH);
item1.setText("Description...");
item1.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent arg0) {
String selection = list.getItem(list.getSelectionIndex());
StringBuilder messageText = new StringBuilder();
boolean roleFlag = false;
NwsRoleDataManager man = NwsRoleDataManager.getInstance();
for (RoleXML role : man.getRoleData(selectedApplication)
.getRoleList()) {
if (selection.equals(role.getRoleId())) {
messageText.append(getRoleDetails(role));
roleFlag = true;
break;
}
}
if (!roleFlag) {
for (PermissionXML perm : man.getRoleData(
selectedApplication).getPermissionList()) {
if (perm.getId().equals(selection)) {
messageText.append(getPermissionDetails(perm));
if (list.getSelectionCount() > 0) {
Menu menu = new Menu(shell, SWT.POP_UP);
MenuItem item1 = new MenuItem(menu, SWT.PUSH);
item1.setText("Description...");
item1.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent arg0) {
String selection = list.getItem(list.getSelectionIndex());
StringBuilder messageText = new StringBuilder();
boolean roleFlag = false;
NwsRoleDataManager man = NwsRoleDataManager.getInstance();
for (RoleXML role : man.getRoleData(selectedApplication)
.getRoleList()) {
if (selection.equals(role.getRoleId())) {
messageText.append(getRoleDetails(role));
roleFlag = true;
break;
}
}
}
if (messageText.length() == 0) {
messageText.append("No Description");
}
MessageBox messageDialog = new MessageBox(shell,
SWT.ICON_INFORMATION);
if (roleFlag) {
messageDialog.setText("Role Description");
} else {
messageDialog.setText("Permission Description");
}
messageDialog.setMessage(messageText.toString());
messageDialog.open();
}
});
shell.setMenu(menu);
menu.setVisible(true);
if (!roleFlag) {
for (PermissionXML perm : man.getRoleData(
selectedApplication).getPermissionList()) {
if (perm.getId().equals(selection)) {
messageText.append(getPermissionDetails(perm));
break;
}
}
}
if (messageText.length() == 0) {
messageText.append("No Description");
}
MessageBox messageDialog = new MessageBox(shell,
SWT.ICON_INFORMATION);
if (roleFlag) {
messageDialog.setText("Role Description");
} else {
messageDialog.setText("Permission Description");
}
messageDialog.setMessage(messageText.toString());
messageDialog.open();
}
});
shell.setMenu(menu);
menu.setVisible(true);
}
}
private String getRoleDetails(RoleXML role) {