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

Issue #2088 Changes for non-blocking ContactsDlg.

Browse source 
Change-Id: I8e9bd796b6b811cbcbd4159d7b209733fffa23df

Former-commit-id: 3231633fb5 [formerly 11625b6eb3] [formerly 9800f069e9] [formerly 88e0eeb81c [formerly 9800f069e9 [formerly 82e4a0edf2dbe2d2eca430b42adb50f8ec4e8125]]]
Former-commit-id: 88e0eeb81c
Former-commit-id: 9a47b039c83c5069185d5f85810abd6143d5b5a2 [formerly 69d3ccecf4]
Former-commit-id: 52ce08d4f7
This commit is contained in:
Roger Ferrel 2013-07-11 09:54:17 -05:00
parent 0d59700692
commit 2447f8c5c8
3 changed files with 155 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/contacts/ContactsAction.java
View file

@ -22,6 +22,9 @@
*/
package com.raytheon.viz.hydro.contacts;
import java.util.HashMap;
import java.util.Map;
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
@ -30,6 +33,7 @@ import org.eclipse.ui.PlatformUI;
import com.raytheon.viz.hydrocommon.HydroDisplayManager;
import com.raytheon.viz.hydrocommon.contacts.ContactsDlg;
import com.raytheon.viz.ui.dialogs.ICloseCallback;
/**
* Action for unimplemented features. To be used temporarily until final
@ -42,6 +46,7 @@ import com.raytheon.viz.hydrocommon.contacts.ContactsDlg;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* 6/27/06 lvenable Initial Creation.
* 07/10/2013 2088 rferrel Changes for non-blocking ContactsDlg.
*
* </pre>
*
@ -49,33 +54,52 @@ import com.raytheon.viz.hydrocommon.contacts.ContactsDlg;
*
*/
public class ContactsAction extends AbstractHandler {
/**
* Allow only one dialog per station.
*/
private final Map<String, ContactsDlg> contactsDlgMap = new HashMap<String, ContactsDlg>();
@Override
public Object execute(ExecutionEvent arg0) throws ExecutionException {
Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow()
.getShell();
if (HydroDisplayManager.getInstance().isCurrentLidSelected(shell) == false)
{
// Assume when false error message already displayed.
if (HydroDisplayManager.getInstance().isCurrentLidSelected(shell) == false) {
return null;
}
String lid = HydroDisplayManager.getInstance().getCurrentLid();
ContactsDlg contactsDlg = contactsDlgMap.get(lid);
if (contactsDlg == null || contactsDlg.isDisposed()) {
String name = HydroDisplayManager.getInstance().getCurrentData()
.getName();
StringBuilder title = new StringBuilder(" - ");
String title = " - " + lid;
title.append(lid);
if (name != null && name.compareTo("") != 0)
{
title += " - " + name;
if (name != null && name.compareTo("") != 0) {
title.append(" - ").append(name);
}
ContactsDlg contactsDlg = new ContactsDlg(shell, title, false, lid);
contactsDlg.open();
contactsDlg = new ContactsDlg(shell, title.toString(), false, lid);
contactsDlg.setCloseCallback(new ICloseCallback() {
@Override
public void dialogClosed(Object returnValue) {
if (returnValue instanceof String) {
String lid = returnValue.toString();
contactsDlgMap.remove(lid);
}
}
});
contactsDlgMap.put(lid, contactsDlg);
contactsDlg.open();
} else {
contactsDlg.bringToTop();
}
return null;
}
}

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

@ -160,6 +160,7 @@ import com.raytheon.viz.ui.dialogs.ICloseCallback;
* Changes for non-blocking StationFilterOptionsDlg.
* Changes for non-blocking FloodReportDlg.
* Make dialog non-blocking.
* Changes for non-blocking ContactsDlg.
*
* </pre>
*
@ -318,10 +319,15 @@ public class HydroBaseDlg extends CaveSWTDialog implements IGetSortType,
private StationFilterOptionsDlg stationFilterDlg;
/**
* Alllow one instance of the Flood Report Dialog.
* Allow one instance of the Flood Report Dialog.
*/
private FloodReportDlg floodReportDlg;
/**
* Allow one instance per lid.
*/
private final Map<String, ContactsDlg> contactsDlgMap = new HashMap<String, ContactsDlg>();
/**
* Flood category menu item.
*/
@ -639,11 +645,26 @@ public class HydroBaseDlg extends CaveSWTDialog implements IGetSortType,
public void widgetSelected(SelectionEvent event) {
String lid = getSelectedLocation().getStation();
ContactsDlg contactsDlg = contactsDlgMap.get(lid);
if (contactsDlg == null || contactsDlg.isDisposed()) {
String lidLoc = getStationAndName();
ContactsDlg contactsDlg = new ContactsDlg(shell, lidLoc, true,
lid);
contactsDlg = new ContactsDlg(shell, lidLoc, true, lid);
contactsDlg.setCloseCallback(new ICloseCallback() {
@Override
public void dialogClosed(Object returnValue) {
if (returnValue instanceof String) {
String lid = returnValue.toString();
contactsDlgMap.remove(lid);
}
}
});
contactsDlg.open();
contactsDlgMap.put(lid, contactsDlg);
} else {
contactsDlg.bringToTop();
}
}
});

97
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/contacts/ContactsDlg.java
View file

@ -40,6 +40,9 @@ import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Spinner;
import org.eclipse.swt.widgets.Text;
import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.viz.hydrocommon.data.ContactsData;
import com.raytheon.viz.hydrocommon.datamanager.ContactsDataManager;
@ -55,6 +58,7 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
* ------------ ---------- ----------- --------------------------
* Sep 10, 2008 lvenable Initial creation
* Feb 13, 2013 15794 wkwock Make Sequence number goes up to 99
* Jul 10, 2013 2088 rferrel Make dialog non-blocking.
*
* </pre>
*
@ -62,6 +66,8 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
* @version 1.0
*/
public class ContactsDlg extends CaveSWTDialog {
private final IUFStatusHandler statusHandler = UFStatus
.getHandler(ContactsDlg.class);
/**
* control font.
@ -102,6 +108,7 @@ public class ContactsDlg extends CaveSWTDialog {
* Concerns text control.
*/
private Text concernsTF;
/**
* text from the remark text box
*/
@ -156,13 +163,19 @@ public class ContactsDlg extends CaveSWTDialog {
*/
public ContactsDlg(Shell parent, String titleInfo, boolean fullControls,
String lid) {
super(parent);
super(parent, SWT.DIALOG_TRIM, CAVE.DO_NOT_BLOCK);
setText("Contacts" + titleInfo);
this.fullControls = fullControls;
this.locationId = lid;
setReturnValue(lid);
}
/*
* (non-Javadoc)
*
* @see com.raytheon.viz.ui.dialogs.CaveSWTDialogBase#constructShellLayout()
*/
@Override
protected Layout constructShellLayout() {
GridLayout mainLayout = new GridLayout(1, false);
@ -172,14 +185,25 @@ public class ContactsDlg extends CaveSWTDialog {
return mainLayout;
}
/*
* (non-Javadoc)
*
* @see com.raytheon.viz.ui.dialogs.CaveSWTDialogBase#disposed()
*/
@Override
protected void disposed() {
controlFont.dispose();
}
/*
* (non-Javadoc)
*
* @see
* com.raytheon.viz.ui.dialogs.CaveSWTDialogBase#initializeComponents(org
* .eclipse.swt.widgets.Shell)
*/
@Override
protected void initializeComponents(Shell shell) {
setReturnValue(false);
contactArray = new ArrayList<ContactsData>();
controlFont = new Font(shell.getDisplay(), "Monospace", 10, SWT.NORMAL);
@ -301,10 +325,10 @@ public class ContactsDlg extends CaveSWTDialog {
if (concernsTF.getText().length() > 255) {
concernsTF.setText(currentConcernsText);
shell.getDisplay().beep();
}
else
} else {
currentConcernsText = concernsTF.getText();
}
}
};
concernsTF.addModifyListener(listener);
@ -331,7 +355,7 @@ public class ContactsDlg extends CaveSWTDialog {
okBtn.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent event) {
if (updateInsertContactData() == true) {
shell.dispose();
close();
}
}
});
@ -355,7 +379,7 @@ public class ContactsDlg extends CaveSWTDialog {
closeBtn.setLayoutData(gd);
closeBtn.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent event) {
shell.dispose();
close();
}
});
@ -367,6 +391,7 @@ public class ContactsDlg extends CaveSWTDialog {
newBtn.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent event) {
newContactFlag = true;
updateInsertContactData();
clearInformationFields();
}
});
@ -413,46 +438,55 @@ public class ContactsDlg extends CaveSWTDialog {
return false;
}
boolean state = true;
if (newContactFlag == true) {
boolean contactExits = false;
try {
contactExits = ContactsDataManager.getInstance().recordExists(
locationId, contactNameTF.getText().trim());
} catch (VizException e) {
statusHandler.handle(Priority.ERROR,
"Unable to determine if contact exits: ", e);
return false;
}
/*
* Check if the contact already exists.
*/
if (ContactsDataManager.getInstance().recordExists(locationId,
contactNameTF.getText().trim()) == true) {
if (contactExits == true) {
MessageBox mb = new MessageBox(shell, SWT.ICON_QUESTION
| SWT.OK | SWT.CANCEL);
mb.setText("Insert");
mb
.setMessage("The contact you want to insert already exists.\n"
mb.setMessage("The contact you want to insert already exists.\n"
+ "Do you wish to update the existing data?");
int result = mb.open();
if (result == SWT.CANCEL) {
return false;
}
updateContact();
state = false;
} else {
insertNewContact();
}
} catch (VizException ve) {
ve.printStackTrace();
state = updateContact();
}
} else {
updateContact();
state = insertNewContact();
}
} else {
state = updateContact();
}
if (state == true) {
updateContactListControl();
}
return true;
return state;
}
/**
* Insert a new contact into the database.
*
* @return true when insert successful
*/
private void insertNewContact() {
private boolean insertNewContact() {
try {
ContactsData data = new ContactsData();
data.setLid(locationId);
@ -464,14 +498,19 @@ public class ContactsDlg extends CaveSWTDialog {
ContactsDataManager.getInstance().insertContactData(data);
} catch (VizException ve) {
ve.printStackTrace();
statusHandler.handle(Priority.ERROR,
"Unable to insert new contact: ", ve);
return false;
}
return true;
}
/**
* Update the edited contact data.
*
* @return true when update successful
*/
private void updateContact() {
private boolean updateContact() {
try {
ContactsData data = new ContactsData();
data.setLid(locationId);
@ -484,8 +523,11 @@ public class ContactsDlg extends CaveSWTDialog {
ContactsDataManager.getInstance().updateContactData(data,
originalContactName);
} catch (VizException ve) {
ve.printStackTrace();
statusHandler.handle(Priority.ERROR, "Unable to update contact: ",
ve);
return false;
}
return true;
}
/**
@ -554,7 +596,8 @@ public class ContactsDlg extends CaveSWTDialog {
try {
ContactsDataManager.getInstance().deleteRecord(data);
} catch (VizException ve) {
ve.printStackTrace();
statusHandler.handle(Priority.ERROR, "Unable to delete contact: ",
ve);
}
updateContactListControl();
@ -585,7 +628,7 @@ public class ContactsDlg extends CaveSWTDialog {
contactArray = ContactsDataManager.getInstance().getContactData(
locationId);
} catch (VizException e) {
e.printStackTrace();
statusHandler.handle(Priority.ERROR, "Unable to get contacts: ", e);
}
}