bug[ats_CW16Q]: Set selection provider based of current active page0.9.8.v201103010909_SR

4 files changed, 52 insertions, 3 deletions

diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditor.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditor.java
index bad6dbc9c0f..65780f58f81 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditor.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditor.java
@@ -21,6 +21,7 @@ import java.util.logging.Level;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.ISelectionProvider;
 import org.eclipse.osee.ats.actions.AccessControlAction;
 import org.eclipse.osee.ats.actions.DirtyReportAction;
 import org.eclipse.osee.ats.actions.ISelectedAtsArtifacts;
@@ -639,4 +640,27 @@ public class SMAEditor extends AbstractArtifactEditor implements ISMAEditorEvent
       return ArtifactImageManager.getImage(sma);
    }
 
+   @Override
+   protected void pageChange(int newPageIndex) {
+      super.pageChange(newPageIndex);
+      if (newPageIndex != -1 && pages.size() > newPageIndex) {
+         Object page = pages.get(newPageIndex);
+         if (page != null) {
+            ISelectionProvider provider = getDefaultSelectionProvider();
+            if (page.equals(workFlowTab)) {
+               provider = getDefaultSelectionProvider();
+            } else if (page.equals(taskTabXWidgetActionPage)) {
+               provider = taskTabXWidgetActionPage.getTaskComposite().getTaskXViewer();
+            } else {
+               String title = getPageText(newPageIndex);
+               if (title.equalsIgnoreCase("metrics")) {
+                  provider = null;
+               } else if (title.equalsIgnoreCase("attributes")) {
+                  provider = attributesComposite.getTableViewer();
+               }
+            }
+            getSite().setSelectionProvider(provider);
+         }
+      }
+   }
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskEditor.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskEditor.java
index f7f6dc1b3b3..2219dd9f7bd 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskEditor.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskEditor.java
@@ -20,6 +20,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.jface.viewers.ISelectionProvider;
 import org.eclipse.osee.ats.artifact.AbstractWorkflowArtifact;
 import org.eclipse.osee.ats.artifact.TaskArtifact;
 import org.eclipse.osee.ats.artifact.VersionArtifact;
@@ -414,4 +415,19 @@ public class TaskEditor extends AbstractArtifactEditor implements IActionable, I
       });
    }
 
+   @Override
+   protected void pageChange(int newPageIndex) {
+      super.pageChange(newPageIndex);
+      if (newPageIndex != -1 && pages.size() > newPageIndex) {
+         Object page = pages.get(newPageIndex);
+         if (page != null) {
+            ISelectionProvider provider = taskActionPage.getTaskComposite().getTaskXViewer();
+            String title = getPageText(newPageIndex);
+            if (title.equalsIgnoreCase("metrics")) {
+               provider = null;
+            }
+            getSite().setSelectionProvider(provider);
+         }
+      }
+   }
 }
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/AttributesComposite.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/AttributesComposite.java
index d7c46097f99..bd98e5f4e49 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/AttributesComposite.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/AttributesComposite.java
@@ -163,6 +163,10 @@ public class AttributesComposite extends Composite {
       });
    }
 
+   public TableViewer getTableViewer() {
+      return tableViewer;
+   }
+
    private void createTableViewer(Composite parent) {
       tableViewer = new TableViewer(table);
 
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/AbstractArtifactEditor.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/AbstractArtifactEditor.java
index aca2ce879b5..c7d66c0b3a1 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/AbstractArtifactEditor.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/AbstractArtifactEditor.java
@@ -31,6 +31,7 @@ import org.eclipse.ui.forms.editor.FormEditor;
 public abstract class AbstractArtifactEditor extends FormEditor implements IDirtiableEditor {
 
    private final static Object[] EMPTY_ARRAY = new Object[0];
+   protected ISelectionProvider defaultSelectionProvider;
 
    @Override
    protected XFormToolkit createToolkit(Display display) {
@@ -71,11 +72,15 @@ public abstract class AbstractArtifactEditor extends FormEditor implements IDirt
    @Override
    public void init(IEditorSite site, IEditorInput input) throws PartInitException {
       super.init(site, input);
-      ISelectionProvider provider = new ArtifactEditorSelectionProvider();
+      defaultSelectionProvider = new ArtifactEditorSelectionProvider();
       Artifact artifact = getArtifactFromEditorInput();
       Object[] selected = artifact != null ? new Object[] {artifact} : EMPTY_ARRAY;
-      provider.setSelection(new StructuredSelection(selected));
-      getSite().setSelectionProvider(provider);
+      defaultSelectionProvider.setSelection(new StructuredSelection(selected));
+      getSite().setSelectionProvider(defaultSelectionProvider);
+   }
+
+   public ISelectionProvider getDefaultSelectionProvider() {
+      return defaultSelectionProvider;
    }
 
    private final class ArtifactEditorSelectionProvider implements ISelectionProvider {