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

Issue #1287 changes for non-blocking ISCRequestReplyDlg and SendISCDialog; removal of no longer used classes.

Browse source 
Change-Id: I25b8caa1a1316a63d051fa29d913330355afcc75

Former-commit-id: 7d57a8ae96ff778892438fb41cd84ce1bb1a8dc7
This commit is contained in:
Roger Ferrel 2012-10-26 11:37:29 -05:00
parent 51369fbd50
commit 7a3149dbb3
6 changed files with 32 additions and 185 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
cave/com.raytheon.viz.gfe/plugin.xml
View file

@ -256,11 +256,6 @@
<command id="com.raytheon.viz.gfe.actions.showISCSampleOfficial"
name="showIscSampleOfficial">
</command>
<command id="com.raytheon.viz.gfe.showSendISCDialog" name="showSendISCDialog">
</command>
<command id="com.raytheon.viz.gfe.actions.showISCRequest"
name="showISCRequest">
</command>
<command id="com.raytheon.viz.gfe.actions.SelectGridsWhenStepping"
name="SelectGridsWhenStepping">
</command>
@ -853,20 +848,6 @@
<activeWhen>
<reference definitionId="com.raytheon.viz.gfe.inGFEActionSet">
</reference>
</activeWhen>
</handler>
<handler class="com.raytheon.viz.gfe.actions.ShowSendISCDialog"
commandId="com.raytheon.viz.gfe.showSendISCDialog">
<activeWhen>
<reference definitionId="com.raytheon.viz.gfe.inGFEActionSet">
</reference>
</activeWhen>
</handler>
<handler class="com.raytheon.viz.gfe.actions.ShowISCRequestAction"
commandId="com.raytheon.viz.gfe.actions.showISCRequest">
<activeWhen>
<reference definitionId="com.raytheon.viz.gfe.inGFEActionSet">
</reference>
</activeWhen>
</handler>
<handler class="com.raytheon.viz.gfe.actions.SelectGridsWhenStepping"
@ -1315,20 +1296,6 @@
visible="true">
</separator>
<dynamic class="com.raytheon.viz.gfe.menu.ISCMenuEnabler" id="com.raytheon.viz.gfe.menu.ISCMenuEnabler"/>
<!--<command commandId="com.raytheon.viz.gfe.showSendISCDialog"
label="Send Intersite Grids..." style="push">
</command>
<command commandId="com.raytheon.viz.gfe.actions.showISCRequest"
label="ISC Request/Reply..." style="push">
</command>
<command
commandId="com.raytheon.viz.gfe.iscSendEnable"
label="ISC Send Enable"
style="toggle">
</command>
-->
</menu>
<menu label="Products" mnemonic="P">
<visibleWhen>

59
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowISCRequestAction.java
View file

@ -1,59 +0,0 @@
/**
* This software was developed and / or modified by Raytheon Company,
* pursuant to Contract DG133W-05-CQ-1067 with the US Government.
*
* U.S. EXPORT CONTROLLED TECHNICAL DATA
* This software product contains export-restricted data whose
* export/transfer/disclosure is restricted by U.S. law. Dissemination
* to non-U.S. persons whether in the United States or abroad requires
* an export license or other authorization.
*
* Contractor Name: Raytheon Company
* Contractor Address: 6825 Pine Street, Suite 340
* Mail Stop B8
* Omaha, NE 68106
* 402.291.0100
*
* See the AWIPS II Master Rights File ("Master Rights File.pdf") for
* further licensing information.
**/
package com.raytheon.viz.gfe.actions;
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.PlatformUI;
import com.raytheon.viz.gfe.dialogs.isc.ISCRequestReplyDlg;
/**
* Action to show the ISC Request/Reply Dialog
*
* <pre>
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* 08/18/09 1995 bphillip Initial release
*
* </pre>
*
* @author bphillip
* @version 1
*/
public class ShowISCRequestAction extends AbstractHandler {
@Override
public Object execute(ExecutionEvent event) throws ExecutionException {
Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow()
.getShell();
ISCRequestReplyDlg dialog = new ISCRequestReplyDlg(shell);
dialog.open();
return null;
}
}

66
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowSendISCDialog.java
View file

@ -1,66 +0,0 @@
/**
* This software was developed and / or modified by Raytheon Company,
* pursuant to Contract DG133W-05-CQ-1067 with the US Government.
*
* U.S. EXPORT CONTROLLED TECHNICAL DATA
* This software product contains export-restricted data whose
* export/transfer/disclosure is restricted by U.S. law. Dissemination
* to non-U.S. persons whether in the United States or abroad requires
* an export license or other authorization.
*
* Contractor Name: Raytheon Company
* Contractor Address: 6825 Pine Street, Suite 340
* Mail Stop B8
* Omaha, NE 68106
* 402.291.0100
*
* See the AWIPS II Master Rights File ("Master Rights File.pdf") for
* further licensing information.
**/
package com.raytheon.viz.gfe.actions;
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.PlatformUI;
import com.raytheon.viz.gfe.core.DataManager;
import com.raytheon.viz.gfe.dialogs.isc.SendISCDialog;
/**
* Action to show the Send Intersite Grids dialog
*
* <pre>
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* 08/18/09 1995 bphillip Initial release
*
* </pre>
*
* @author bphillip
* @version 1
*/
public class ShowSendISCDialog extends AbstractHandler {
@Override
public Object execute(ExecutionEvent event) throws ExecutionException {
Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow()
.getShell();
DataManager dm = DataManager.getCurrentInstance();
if (dm != null) {
SendISCDialog dialog = new SendISCDialog(shell, dm);
dialog.setBlockOnOpen(true);
dialog.open();
}
return null;
}
}

8
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/isc/ISCRequestReplyDlg.java
View file

@ -54,6 +54,7 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* 08/20/09 1995 lvenable Initial port
* 10/24/2008 1287 rferrel Made dialog non-blocking.
*
* </pre>
*
@ -61,7 +62,7 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
* @version 1
*/
public class ISCRequestReplyDlg extends CaveSWTDialog {
private static final transient IUFStatusHandler statusHandler = UFStatus
private final transient IUFStatusHandler statusHandler = UFStatus
.getHandler(ISCRequestReplyDlg.class);
private ListManager domainList;
@ -78,8 +79,6 @@ public class ISCRequestReplyDlg extends CaveSWTDialog {
private Map<String, Map<String, List<Map<String, String>>>> domainDict;
private Map<String, String> serverDictS2T;
private Map<String, Map<String, String>> serverDictT2S;
private String xml;
@ -93,7 +92,7 @@ public class ISCRequestReplyDlg extends CaveSWTDialog {
* Parent shell.
*/
public ISCRequestReplyDlg(Shell parent) {
super(parent, SWT.DIALOG_TRIM | SWT.RESIZE);
super(parent, SWT.DIALOG_TRIM | SWT.RESIZE, CAVE.DO_NOT_BLOCK);
setText("ISC Request/Reply");
dataMgr = DataManager.getCurrentInstance();
@ -228,7 +227,6 @@ public class ISCRequestReplyDlg extends CaveSWTDialog {
this.weList = (List<String>) response[1];
Collections.sort(this.weList);
domainDict = (Map<String, Map<String, List<Map<String, String>>>>) response[2];
serverDictS2T = (Map<String, String>) response[3];
serverDictT2S = (Map<String, Map<String, String>>) response[4];
// output the list of servers and their priority

15
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/isc/SendISCDialog.java
View file

@ -65,6 +65,7 @@ import com.raytheon.viz.ui.widgets.ToggleSelectList;
* ------------ ---------- ----------- --------------------------
* 08/20/09 1995 lvenable Initial creation
* 09/02/09 #1370 randerso Make the same as PublishDialog
* 10/26/2012 1287 rferrel Code cleanup for non-blocking dialog.
*
* </pre>
*
@ -73,9 +74,9 @@ import com.raytheon.viz.ui.widgets.ToggleSelectList;
*/
public class SendISCDialog extends CaveJFACEDialog {
private static final int MAX_LIST_HEIGHT = 10;
private final int MAX_LIST_HEIGHT = 10;
private static final PythonPreferenceStore prefs = Activator.getDefault()
private final PythonPreferenceStore prefs = Activator.getDefault()
.getPreferenceStore();
private DataManager dataManager;
@ -284,16 +285,6 @@ public class SendISCDialog extends CaveJFACEDialog {
}
}
// Sort the user defined WEList in the GFEConfig file if it
// exists
String[] weGroupList = prefs.getStringArray("WEList");
if (weGroupList != null) {
// orderedSort = OrderedSort.OrderedSort(weGroupList);
// filtGroupInv.sort(orderedSort.compare);
//
// Collections.sort
}
Menu menu = new Menu(getShell(), SWT.POP_UP);
for (String group : filtGroupInv) {
MenuItem item = new MenuItem(menu, SWT.PUSH);

36
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/menu/ISCMenuEnabler.java
View file

@ -44,6 +44,8 @@ import com.raytheon.viz.gfe.dialogs.isc.SendISCDialog;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Jun 20, 2011 bphillip Initial creation
* Oct 25, 2012 1287 rferrel Changes for non-blocking SendISCDialog
* and ISCRequestReplyDlg.
*
* </pre>
*
@ -52,6 +54,9 @@ import com.raytheon.viz.gfe.dialogs.isc.SendISCDialog;
*/
public class ISCMenuEnabler extends CompoundContributionItem {
private SendISCDialog sendISCDlg;
private ISCRequestReplyDlg iscRequestDlg;
/*
* (non-Javadoc)
@ -61,7 +66,6 @@ public class ISCMenuEnabler extends CompoundContributionItem {
*/
@Override
protected IContributionItem[] getContributionItems() {
ActionContributionItem sendIntersiteItem = new ActionContributionItem(
new Action("Send Intersite Grids") {
public void run() {
@ -69,10 +73,17 @@ public class ISCMenuEnabler extends CompoundContributionItem {
.getActiveWorkbenchWindow().getShell();
DataManager dm = DataManager.getCurrentInstance();
if (dm != null) {
SendISCDialog dialog = new SendISCDialog(shell, dm);
dialog.setBlockOnOpen(true);
dialog.open();
if (dm == null) {
return;
}
if (sendISCDlg == null || sendISCDlg.getShell() == null
|| sendISCDlg.isDisposed()) {
sendISCDlg = new SendISCDialog(shell, dm);
sendISCDlg.setBlockOnOpen(false);
sendISCDlg.open();
} else {
sendISCDlg.bringToTop();
}
}
@ -108,11 +119,16 @@ public class ISCMenuEnabler extends CompoundContributionItem {
@Override
public void run() {
Shell shell = PlatformUI.getWorkbench()
.getActiveWorkbenchWindow().getShell();
ISCRequestReplyDlg dialog = new ISCRequestReplyDlg(
shell);
dialog.open();
if (iscRequestDlg == null
|| iscRequestDlg.getShell() == null
|| iscRequestDlg.isDisposed()) {
Shell shell = PlatformUI.getWorkbench()
.getActiveWorkbenchWindow().getShell();
iscRequestDlg = new ISCRequestReplyDlg(shell);
iscRequestDlg.open();
} else {
iscRequestDlg.bringToTop();
}
}
});