From 95711528adcbcb470a630a49263ffeec3bcaee14 Mon Sep 17 00:00:00 2001 From: Roger Ferrel Date: Wed, 14 Nov 2012 16:33:27 -0600 Subject: [PATCH] Issue #1298 Changes for non-blocking MoveWeatherElementDialog. Change-Id: I5f41c52d45146a0e9cdfbf613ec3918382f6a455 Former-commit-id: 8cce309a6e2cf7aa0fda79bb1a09e5a9bf15a36e [formerly fc87eccb77619fe1a2e5fff48f96ee3313f735f7] [formerly a6fdc7b58040140d482a2318abb1a623506e86fa] [formerly 8cce309a6e2cf7aa0fda79bb1a09e5a9bf15a36e [formerly fc87eccb77619fe1a2e5fff48f96ee3313f735f7] [formerly a6fdc7b58040140d482a2318abb1a623506e86fa] [formerly acf1881cb785e7c22eef078fc1ec81098bcce98a [formerly a6fdc7b58040140d482a2318abb1a623506e86fa [formerly dd80807a0469e7c677f8e0d214fcdec715c67518]]]] Former-commit-id: acf1881cb785e7c22eef078fc1ec81098bcce98a Former-commit-id: 4b6c5bc2d3c2adfd737697400b4098f9fdd6d889 [formerly 8881e4d3ecfc5a0d98f4824d810a2befecd06bbd] [formerly 092e0c8e86fd9af48cdabc168fe255b8d961546d [formerly d6c5839e0eba3c484a82572d8437893e8d67545c]] Former-commit-id: 8753a2bf60a5a6a69df5eac63b7ac9f764b8df27 [formerly 265adb9b1c82901faa5f0718e453b9d94b2e8245] Former-commit-id: aeb27b3c88e2d18afca1d83a1ea631fb6b3c4aa9 --- .../gfe/temporaleditor/TemporalEditor.java | 34 +++++-------------- .../dialogs/MoveWeatherElementDialog.java | 3 +- .../mousehandler/TitleBarMouseHandler.java | 6 +++- 3 files changed, 15 insertions(+), 28 deletions(-) diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/temporaleditor/TemporalEditor.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/temporaleditor/TemporalEditor.java index 1b5607f455..0c670d497a 100644 --- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/temporaleditor/TemporalEditor.java +++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/temporaleditor/TemporalEditor.java @@ -37,11 +37,9 @@ import org.eclipse.swt.graphics.Rectangle; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.ui.PlatformUI; -import com.raytheon.uf.common.dataplugin.gfe.db.objects.ParmID; import com.raytheon.uf.common.dataplugin.gfe.db.objects.GFERecord.GridType; +import com.raytheon.uf.common.dataplugin.gfe.db.objects.ParmID; import com.raytheon.uf.viz.core.VizApp; import com.raytheon.viz.gfe.GFEPreference; import com.raytheon.viz.gfe.PreferenceConstants; @@ -53,12 +51,11 @@ import com.raytheon.viz.gfe.core.msgs.IDisplayedParmListChangedListener; import com.raytheon.viz.gfe.core.msgs.IGridVisibilityChangedListener; import com.raytheon.viz.gfe.core.msgs.IParmIDChangedListener; import com.raytheon.viz.gfe.core.msgs.Message; +import com.raytheon.viz.gfe.core.msgs.Message.IMessageClient; import com.raytheon.viz.gfe.core.msgs.TEOverlayModeChangedMsg; import com.raytheon.viz.gfe.core.msgs.TEweModeChangedMsg; -import com.raytheon.viz.gfe.core.msgs.Message.IMessageClient; import com.raytheon.viz.gfe.core.parm.Parm; import com.raytheon.viz.gfe.gridmanager.GridManager; -import com.raytheon.viz.gfe.temporaleditor.dialogs.MoveWeatherElementDialog; /** * TemporalEditor widget containing a TemporalEditorBar for each displayed @@ -70,6 +67,7 @@ import com.raytheon.viz.gfe.temporaleditor.dialogs.MoveWeatherElementDialog; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * Apr 30, 2009 2159 rjpeter Initial creation + * Nov 14, 2012 1298 rferrel Remove no longer used reference to MoveWeatherElementDialog. * * * @author rjpeter @@ -439,21 +437,6 @@ public class TemporalEditor extends Composite implements IMessageClient { return barList; } - /** - * - * @param parm - * @param sourceBar - */ - public void createMoveParmDialog(Parm parm, - AbstractTemporalEditorBar sourceBar) { - Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow() - .getShell(); - MoveWeatherElementDialog dialog = new MoveWeatherElementDialog(shell, - this, parm, sourceBar, getCombinableBars(parm, sourceBar)); - dialog.setBlockOnOpen(true); - dialog.open(); - } - public StatisticsMode getMode() { return statMode; } @@ -530,8 +513,8 @@ public class TemporalEditor extends Composite implements IMessageClient { break; } - final ArrayList parmsToRemove = new ArrayList(parmToTEBar - .keySet()); + final ArrayList parmsToRemove = new ArrayList( + parmToTEBar.keySet()); parmsToRemove.removeAll(parmsToAdd); VizApp.runAsync(new Runnable() { @@ -651,8 +634,8 @@ public class TemporalEditor extends Composite implements IMessageClient { break; case ALL_NOISC: for (Parm parmAdd : additions) { - if (!parmAdd.getParmID().getDbId().getModelName().equals( - "ISC")) { + if (!parmAdd.getParmID().getDbId().getModelName() + .equals("ISC")) { addParm(parmAdd); } } @@ -680,8 +663,7 @@ public class TemporalEditor extends Composite implements IMessageClient { @Override public void propertyChange(PropertyChangeEvent event) { String id = event.getProperty(); - if (id - .equals(PreferenceConstants.GFE_TEMPORAL_EDITOR_STATISTICS_MODE)) { + if (id.equals(PreferenceConstants.GFE_TEMPORAL_EDITOR_STATISTICS_MODE)) { statMode = StatisticsMode .valueOf(GFEPreference .getPreference(PreferenceConstants.GFE_TEMPORAL_EDITOR_STATISTICS_MODE)); diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/temporaleditor/dialogs/MoveWeatherElementDialog.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/temporaleditor/dialogs/MoveWeatherElementDialog.java index 6f71e3acd3..8c4237f334 100644 --- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/temporaleditor/dialogs/MoveWeatherElementDialog.java +++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/temporaleditor/dialogs/MoveWeatherElementDialog.java @@ -47,6 +47,7 @@ import com.raytheon.viz.ui.dialogs.CaveJFACEDialog; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * 05/19/09 #2159 rjpeter Initial creation. + * 11/14/2012 #1298 rferrel Changes for non-blocking dialog. * * * @author rjpeter @@ -70,7 +71,7 @@ public class MoveWeatherElementDialog extends CaveJFACEDialog { AbstractTemporalEditorBar sourceBar, List destBars) { super(parent); - this.setShellStyle(SWT.TITLE | SWT.MODELESS | SWT.CLOSE); + this.setShellStyle(SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL); this.temporalEditor = temporalEditor; this.parm = parm; this.sourceBar = sourceBar; diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/temporaleditor/mousehandler/TitleBarMouseHandler.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/temporaleditor/mousehandler/TitleBarMouseHandler.java index 81f0ff1aa0..df07c3a40a 100644 --- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/temporaleditor/mousehandler/TitleBarMouseHandler.java +++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/temporaleditor/mousehandler/TitleBarMouseHandler.java @@ -49,6 +49,7 @@ import com.raytheon.viz.ui.dialogs.ICloseCallback; * ------------ ---------- ------------- -------------------------- * May 28, 2009 #2159 Richard Peter Initial Creation. * Nov 14, 2012 #1298 rferrel Changes for non-blocking DisplayAttributesDialog. + * Changes for non-blocking MoveWeatherElementDialog. * * * @author rjpeter @@ -151,10 +152,13 @@ public class TitleBarMouseHandler extends MouseHandler { public void run() { Shell shell = PlatformUI.getWorkbench() .getActiveWorkbenchWindow().getShell(); + // The dialog being opened is modal to the parent + // dialog. This will prevent the launching of another + // dialog until the modal dialog is closed. MoveWeatherElementDialog dialog = new MoveWeatherElementDialog( shell, teBar.getTemporalEditor(), parm, teBar, barList); - dialog.setBlockOnOpen(true); + dialog.setBlockOnOpen(false); dialog.open(); } });