From 6ecac172246ebc58a3eb6bb05fd35aed74ddb66d Mon Sep 17 00:00:00 2001 From: Ben Steffensmeier Date: Thu, 9 Jan 2014 15:14:29 -0600 Subject: [PATCH] Issue #2647 Fix window focus problems. Former-commit-id: eebab1d33f61628804ef94271876a49fd93a8765 [formerly 13da8899dea2c22bed34ac80e9df566f17c7a0ec] [formerly 2b9e9a41dbacb980186ea8e941b7f257cb635300] [formerly eebab1d33f61628804ef94271876a49fd93a8765 [formerly 13da8899dea2c22bed34ac80e9df566f17c7a0ec] [formerly 2b9e9a41dbacb980186ea8e941b7f257cb635300] [formerly 488d5e45b1283eb3486ae7dabbcd2fda041bb8fe [formerly 2b9e9a41dbacb980186ea8e941b7f257cb635300 [formerly 4b0053b20060ead87b34895ee7d03a4b6317c8fc]]]] Former-commit-id: 488d5e45b1283eb3486ae7dabbcd2fda041bb8fe Former-commit-id: 05ebc3eece62d67156e72d4c6ce5a1d0e55826f4 [formerly 1aa018e5b70d9f3b340bb9e1850e0fc9b887ea98] [formerly 7b56714a7309f567fe16d1c7a70ee9741297c5dc [formerly 0ada0c6d3f79d9b0ce54e2c2b1c9effa367dcf1d]] Former-commit-id: 42bc099c9fb87b30553f56de2a8b6d43a953df1f [formerly 403ba78a1599e82095cb79958624dfca930c425b] Former-commit-id: 4bc9ead26999c47c05422da40501479ee4d18590 --- .../viz/d2d/ui/actions/BlinkToggleAction.java | 25 ++++++++----------- .../raytheon/viz/ui/panes/PaneManager.java | 16 +++++------- 2 files changed, 16 insertions(+), 25 deletions(-) diff --git a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/BlinkToggleAction.java b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/BlinkToggleAction.java index 52116612f6..ab132ff1d3 100644 --- a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/BlinkToggleAction.java +++ b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/BlinkToggleAction.java @@ -32,7 +32,6 @@ import org.eclipse.swt.widgets.Menu; import com.raytheon.uf.viz.core.IDisplayPane; import com.raytheon.uf.viz.core.IDisplayPaneContainer; import com.raytheon.uf.viz.core.drawables.ResourcePair; -import com.raytheon.uf.viz.core.localization.HierarchicalPreferenceStore; import com.raytheon.uf.viz.core.rsc.AbstractVizResource; import com.raytheon.uf.viz.core.rsc.ResourceList; import com.raytheon.uf.viz.core.rsc.ResourceProperties; @@ -44,18 +43,17 @@ import com.raytheon.uf.viz.d2d.ui.dialogs.ImageBlinkDialog; import com.raytheon.viz.ui.cmenu.AbstractRightClickAction; /** - * - * BlinkToggleAction * * Enable blinking on a resource * *
  * 
- *    SOFTWARE HISTORY
+ * SOFTWARE HISTORY
  *   
- *    Date         Ticket#     Engineer    Description
- *    ------------ ----------  ----------- --------------------------
- *    Oct 15, 2007             chammack    Initial Creation.
+ * Date          Ticket#   Engineer    Description
+ * ------------- --------  ----------- --------------------------
+ * Oct 15, 2007            chammack    Initial Creation.
+ * Jan 09, 2014  2647      bsteffen    Get properties directly from resource.
  * 
  * 
* @@ -82,8 +80,8 @@ public class BlinkToggleAction extends AbstractRightClickAction implements private static float[] blinkRates; static { - blinkRates = ((HierarchicalPreferenceStore) Activator.getDefault() - .getPreferenceStore()).getFloatArray("blinkRate"); + blinkRates = Activator.getDefault().getPreferenceStore() + .getFloatArray("blinkRate"); Arrays.sort(blinkRates); } @@ -119,11 +117,10 @@ public class BlinkToggleAction extends AbstractRightClickAction implements */ @Override public void run() { - System.out.println("TODO: Handle mode = " + mode); switch (mode) { case OTHER: { - ResourceProperties props = getDescriptor().getResourceList() - .getProperties(getTopMostSelectedResource()); + ResourceProperties props = getTopMostSelectedResource() + .getProperties(); boolean isEnabled = props.isBlinking(); props.setBlinking(!isEnabled); this.setChecked(!isEnabled); @@ -154,8 +151,7 @@ public class BlinkToggleAction extends AbstractRightClickAction implements } else { mode = InternalMode.OTHER; - ResourceProperties topMostProps = getDescriptor().getResourceList() - .getProperties(topMost); + ResourceProperties topMostProps = topMost.getProperties(); boolean isEnabled = topMostProps.isBlinking(); this.setChecked(isEnabled); } @@ -314,7 +310,6 @@ public class BlinkToggleAction extends AbstractRightClickAction implements } private class BlinkRateAction extends Action { - boolean preSelected; private float rate; diff --git a/cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/panes/PaneManager.java b/cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/panes/PaneManager.java index bab3b5b57b..5b419318e6 100644 --- a/cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/panes/PaneManager.java +++ b/cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/panes/PaneManager.java @@ -68,9 +68,12 @@ import com.vividsolutions.jts.geom.Coordinate; * * SOFTWARE HISTORY * - * Date Ticket# Engineer Description - * ------------ ---------- ----------- -------------------------- - * 07/07/09 bgonzale Initial Creation. + * Date Ticket# Engineer Description + * ------------- -------- ----------- ----------------------------------------- + * Jul 07, 2009 bgonzale Initial Creation. + * Jan 09, 2014 2647 bsteffen Do not change active editor on focus + * because that causes problems when + * switching windows. * * * @author bgonzale @@ -166,13 +169,6 @@ public class PaneManager extends InputAdapter implements IMultiPaneEditor { pane.addListener(SWT.MouseExit, inputManager); pane.addListener(SWT.MouseEnter, inputManager); - pane.addListener(SWT.FocusIn, new Listener() { - @Override - public void handleEvent(Event event) { - activatedPane = pane; - } - }); - pane.addListener(SWT.MouseEnter, new Listener() { @Override public void handleEvent(Event event) {