From e8fc88fe89fdedd7665dea483abd0e8f21dc0d09 Mon Sep 17 00:00:00 2001
From: Ron Anderson <ron.anderson@raytheon.com>
Date: Thu, 4 Oct 2012 08:57:02 -0500
Subject: [PATCH] Issue #1242 Fix wierd GFE behavior when Grid Manager is
 maximized.

Change-Id: I2e6d6929a8a8af8dab3320bdf8cda3466fe05fa8

Former-commit-id: cf62687a6aca52f0143ace28a78153ce337c35b3 [formerly 8136beddc7796c576680c4511cb879e8a1c1c563] [formerly b041ccf099435e301a56684003b687f9bdc78bb7] [formerly 8e8c713884bcf950ac2aadb6cad3e099746063f6 [formerly b041ccf099435e301a56684003b687f9bdc78bb7 [formerly 4fb21077aba1dd9cfafc7f046b02f24f750c6384]]]
Former-commit-id: 8e8c713884bcf950ac2aadb6cad3e099746063f6
Former-commit-id: 4f69b16583e431bc4dc6d51faceef73068d0c3dd [formerly 60171b46a21b8d7714c274435546abee019bc7c7]
Former-commit-id: 436284848cd95784c7b6b03776a4a3429899982a
---
 cave/com.raytheon.viz.gfe/plugin.xml          | 11 ++++++---
 .../gfe/gridmanager/action/GFEFrameTool.java  | 24 +++++++------------
 ...AbstractWorkbenchPartContextActivator.java |  4 ++--
 3 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/cave/com.raytheon.viz.gfe/plugin.xml b/cave/com.raytheon.viz.gfe/plugin.xml
index d92419afd9..4b69ce4890 100644
--- a/cave/com.raytheon.viz.gfe/plugin.xml
+++ b/cave/com.raytheon.viz.gfe/plugin.xml
@@ -34,9 +34,14 @@
 						</equals>
 					</iterate>
 				</with>
-          	  	<with variable="activeEditor">
-       				<instanceof value="com.raytheon.uf.viz.core.IDisplayPaneContainer"/>
-    	      	</with>
+				<or>
+				    <with variable="activePart">
+				       <instanceof value="com.raytheon.viz.gfe.GridManagerView"/>
+				    </with>
+	          	  	<with variable="activeEditor">
+	       				<instanceof value="com.raytheon.uf.viz.core.IDisplayPaneContainer"/>
+	    	      	</with>
+    	      	</or>
     		</and>
 		</definition>
 	</extension>
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/gridmanager/action/GFEFrameTool.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/gridmanager/action/GFEFrameTool.java
index 9510ef10c3..da1b8157a8 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/gridmanager/action/GFEFrameTool.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/gridmanager/action/GFEFrameTool.java
@@ -22,9 +22,9 @@ package com.raytheon.viz.gfe.gridmanager.action;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
 
-import com.raytheon.uf.viz.core.drawables.IDescriptor.FrameChangeOperation;
+import com.raytheon.uf.viz.core.drawables.IFrameCoordinator.FrameChangeOperation;
 import com.raytheon.viz.gfe.core.DataManager;
-import com.raytheon.viz.ui.EditorUtil;
+import com.raytheon.viz.gfe.gridmanager.IGridManager;
 import com.raytheon.viz.ui.tools.AbstractTool;
 
 /**
@@ -56,36 +56,28 @@ public class GFEFrameTool extends AbstractTool {
     @Override
     public Object execute(ExecutionEvent arg0) throws ExecutionException {
 
-        this.editor = EditorUtil.getActiveVizContainer();
-        if (this.editor == null) {
-            return null;
-        }
-
-        this.editor.getLoopProperties().setLooping(false);
-
         String operationStr = arg0.getParameter("operation");
         FrameChangeOperation operation = FrameChangeOperation
                 .valueOf(operationStr);
 
-        DataManager dm = DataManager.getCurrentInstance();
+        IGridManager gm = DataManager.getCurrentInstance().getGridManager();
 
         switch (operation) {
         case PREVIOUS:
-            dm.getGridManager().previousSelectedGrid();
+            gm.previousSelectedGrid();
             break;
         case NEXT:
-            dm.getGridManager().nextSelectedGrid();
+            gm.nextSelectedGrid();
             break;
         case FIRST:
-            dm.getGridManager().firstSelectedGrid();
+            gm.firstSelectedGrid();
             break;
         case LAST:
-            dm.getGridManager().lastSelectedGrid();
+            gm.lastSelectedGrid();
             break;
         }
 
-        editor.refresh();
-        dm.getGridManager().redraw();
+        gm.redraw();
 
         return null;
 
diff --git a/cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/AbstractWorkbenchPartContextActivator.java b/cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/AbstractWorkbenchPartContextActivator.java
index b3a8baaaf2..50e8cc7fca 100644
--- a/cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/AbstractWorkbenchPartContextActivator.java
+++ b/cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/AbstractWorkbenchPartContextActivator.java
@@ -69,13 +69,13 @@ public abstract class AbstractWorkbenchPartContextActivator implements
     protected abstract boolean isPerspectivePart(IWorkbenchPartReference partRef);
 
     private void deactivate(IWorkbenchPartReference partRef) {
-        if (isPerspectivePart(partRef)) {
+        if ((partRef != null) && isPerspectivePart(partRef)) {
             contextManager.deactivateContexts(this);
         }
     }
 
     private void activate(IWorkbenchPartReference partRef) {
-        if (isPerspectivePart(partRef)) {
+        if ((partRef != null) && isPerspectivePart(partRef)) {
             contextManager.activateContexts(this);
         } else {
             contextManager.deactivateContexts(this);