From 408b7ae03137b7a1f4075857e81d114598908f11 Mon Sep 17 00:00:00 2001 From: Roger Ferrel Date: Thu, 20 Sep 2012 16:28:01 -0500 Subject: [PATCH] Issue #1196 Changes for HelpRequestDlg. Change-Id: I676a49fc36f88426fd5c2b2b42d0551c2d6e4e6d Former-commit-id: 496cb65adfaa93b44b1068535e95d4dc7ecd2797 [formerly 8463663d1c1bb569dc091f2886633832bdf45ffa] Former-commit-id: c77ed46ddc6cf592550a7e767e2e91f381b2a21a --- .../scripting/dialogs/HelpRequestDlg.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/scripting/dialogs/HelpRequestDlg.java b/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/scripting/dialogs/HelpRequestDlg.java index 7136f6e6f6..1d52607a57 100644 --- a/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/scripting/dialogs/HelpRequestDlg.java +++ b/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/scripting/dialogs/HelpRequestDlg.java @@ -40,8 +40,6 @@ import com.raytheon.uf.common.localization.PathManagerFactory; 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.status.StatusConstants; -import com.raytheon.viz.texteditor.Activator; import com.raytheon.viz.ui.dialogs.CaveSWTDialog; /** @@ -53,6 +51,7 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * Jun 30, 2009 mfegan Initial creation + * Sep 20, 2012 1196 rferrel Added DO_NOT_BLOCK to constructor * * * @@ -61,7 +60,9 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog; */ public class HelpRequestDlg extends CaveSWTDialog implements SelectionListener { - private static final transient IUFStatusHandler statusHandler = UFStatus.getHandler(HelpRequestDlg.class); + private static final transient IUFStatusHandler statusHandler = UFStatus + .getHandler(HelpRequestDlg.class); + private static final String DLG_TITLE = "Command Help"; /** the selection list */ @@ -104,7 +105,7 @@ public class HelpRequestDlg extends CaveSWTDialog implements SelectionListener { */ public HelpRequestDlg(Shell parent, EnumHelpTypes type, String token) { super(parent, SWT.DIALOG_TRIM | SWT.RESIZE | SWT.FILL, - CAVE.PERSPECTIVE_INDEPENDENT); + CAVE.PERSPECTIVE_INDEPENDENT | CAVE.DO_NOT_BLOCK); setText(DLG_TITLE); this.type = type; @@ -126,6 +127,7 @@ public class HelpRequestDlg extends CaveSWTDialog implements SelectionListener { shell.setSize(size); createClientArea(); + // TODO Move to preOpened and limit the height of the dialog. loadCommandList(); } @@ -146,8 +148,9 @@ public class HelpRequestDlg extends CaveSWTDialog implements SelectionListener { selections.add(command); } } catch (Exception e) { - statusHandler.handle(Priority.PROBLEM, "Unable to load commands file " - + this.type.getFileName(), e); + statusHandler.handle(Priority.PROBLEM, + "Unable to load commands file " + this.type.getFileName(), + e); } }