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

Issue #1196 Changes for RemoteSiteRequestDlg.

Browse source 
Change-Id: I1ba3b9b4239c8d2a4e44912628013cba48471f40

Former-commit-id: 56c28012a5 [formerly 8f892d7f80] [formerly 56c28012a5 [formerly 8f892d7f80] [formerly 4f0ab091a4 [formerly d05224479c8ca8ea9730253785eafb99e64d52da]]]
Former-commit-id: 4f0ab091a4
Former-commit-id: 7b73a0f166 [formerly 5fe74144a9]
Former-commit-id: 4d0ef5a437
This commit is contained in:
Roger Ferrel 2012-09-20 14:45:10 -05:00
parent 7324b572f2
commit 116a5993ec
2 changed files with 27 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/RemoteSiteRequestDlg.java
View file

@ -124,7 +124,8 @@ public class RemoteSiteRequestDlg extends CaveSWTDialog implements
* Parent shell.
*/
public RemoteSiteRequestDlg(Shell parent) {
super(parent, SWT.DIALOG_TRIM, CAVE.PERSPECTIVE_INDEPENDENT);
super(parent, SWT.DIALOG_TRIM, CAVE.PERSPECTIVE_INDEPENDENT
| CAVE.DO_NOT_BLOCK);
setText("Send Request");
}

42
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
View file

@ -180,6 +180,7 @@ import com.raytheon.viz.texteditor.util.TextEditorUtil;
import com.raytheon.viz.texteditor.util.VtecObject;
import com.raytheon.viz.texteditor.util.VtecUtil;
import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
import com.raytheon.viz.ui.dialogs.ICloseCallback;
import com.raytheon.viz.ui.dialogs.SWTMessageBox;
/**
@ -288,6 +289,7 @@ import com.raytheon.viz.ui.dialogs.SWTMessageBox;
* 10Sep2012 15103 M.Gamazaychikov DR15103 -do not clear AFOS command from the text box
* when obs are updated and refactored executeCommand
* 10SEP2012 15401 D.Friedman Fix QC problem caused by DR 15340.
* 20SEP2012 1196 rferrel Refactor dialogs to prevent blocking.
* </pre>
*
* @author lvenable
@ -1447,14 +1449,21 @@ public class TextEditorDialog extends CaveSWTDialog implements VerifyListener,
public void widgetSelected(SelectionEvent event) {
RemoteSiteRequestDlg requestDlg = new RemoteSiteRequestDlg(
shell);
if (lastRemoteRetrievalRequest != null)
if (lastRemoteRetrievalRequest != null) {
requestDlg.setRequest(lastRemoteRetrievalRequest);
RemoteRetrievalRequest req = (RemoteRetrievalRequest) requestDlg
.open();
if (req != null) {
lastRemoteRetrievalRequest = req;
sendRemoteRetrievalRequest(req);
}
requestDlg.setCloseCallback(new ICloseCallback() {
@Override
public void dialogClosed(Object returnValue) {
RemoteRetrievalRequest req = (RemoteRetrievalRequest) returnValue;
if (req != null) {
lastRemoteRetrievalRequest = req;
sendRemoteRetrievalRequest(req);
}
}
});
requestDlg.open();
}
});
@ -5245,9 +5254,9 @@ public class TextEditorDialog extends CaveSWTDialog implements VerifyListener,
public String getAddressee() {
return addressee;
}
public void executeCommand(ICommand command) {
executeCommand(command, false);
executeCommand(command, false);
}
public void executeCommand(ICommand command, boolean isObsUpdated) {
@ -5355,11 +5364,11 @@ public class TextEditorDialog extends CaveSWTDialog implements VerifyListener,
w, siteNode);
}
/*
* DR15103 - do not clear AFOS command from the text box
* when obs are updated
* DR15103 - do not clear AFOS command from the text box when
* obs are updated
*/
if ( !isObsUpdated ) {
clearAfosCmdTF();
if (!isObsUpdated) {
clearAfosCmdTF();
}
clearWmoTF();
clearAwipsIdTF();
@ -6469,11 +6478,10 @@ public class TextEditorDialog extends CaveSWTDialog implements VerifyListener,
@Override
public void run() {
/*
* DR15103 - set the flag to 'true' before executing
* AFOS command so the AFOS command box is not cleared
* when obs are updated
*/
/*
* DR15103 - set the flag to 'true' before executing AFOS command so
* the AFOS command box is not cleared when obs are updated
*/
executeCommand(command, true);
}