bug[ats_4LK2H]: ATS Workflow Editor print doesn't respect active editor

2 files changed, 6 insertions, 28 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 0d1e8b43f1a..a0c2f72f9d2 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
@@ -19,7 +19,6 @@ import java.util.List;
 import java.util.Set;
 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;
@@ -84,7 +83,6 @@ import org.eclipse.ui.IEditorReference;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.ActionFactory;
 import org.eclipse.ui.part.MultiPageEditorPart;
 import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
 
@@ -99,7 +97,6 @@ public class SMAEditor extends AbstractArtifactEditor implements IDirtyReportabl
    int attributesPageIndex;
    private AttributesComposite attributesComposite;
    private boolean privilegedEditModeEnabled = false;
-   private Action printAction;
    private TaskTabXWidgetActionPage taskTabXWidgetActionPage;
    private final List<ISMAEditorListener> editorListeners = new ArrayList<ISMAEditorListener>();
    SMAEditorOutlinePage outlinePage;
@@ -147,8 +144,6 @@ public class SMAEditor extends AbstractArtifactEditor implements IDirtyReportabl
       } catch (Exception ex) {
          OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex);
       }
-
-      enableGlobalPrint();
    }
 
    @SuppressWarnings("rawtypes")
@@ -251,11 +246,6 @@ public class SMAEditor extends AbstractArtifactEditor implements IDirtyReportabl
       }
    }
 
-   void enableGlobalPrint() {
-      printAction = new SMAPrint(awa);
-      getEditorSite().getActionBars().setGlobalActionHandler(ActionFactory.PRINT.getId(), printAction);
-   }
-
    @Override
    public boolean isSaveOnCloseNeeded() {
       return isDirty();
@@ -649,10 +639,6 @@ public class SMAEditor extends AbstractArtifactEditor implements IDirtyReportabl
       return Collections.singleton(awa);
    }
 
-   public Action getPrintAction() {
-      return printAction;
-   }
-
    @Override
    public IEditorPart getActiveEditor() {
       return this;
@@ -717,4 +703,5 @@ public class SMAEditor extends AbstractArtifactEditor implements IDirtyReportabl
       }
       return java.util.Collections.emptyList();
    }
+
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditorContributor.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditorContributor.java
index 57aace7da5f..3ce54a0567f 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditorContributor.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditorContributor.java
@@ -21,8 +21,6 @@ import org.eclipse.ui.texteditor.ITextEditor;
  * @author Donald G. Dunne
  */
 public class SMAEditorContributor extends MultiPageEditorActionBarContributor {
-   private IEditorPart activeEditorPart;
-
    public SMAEditorContributor() {
       super();
    }
@@ -33,19 +31,12 @@ public class SMAEditorContributor extends MultiPageEditorActionBarContributor {
 
    @Override
    public void setActivePage(IEditorPart part) {
-      if (part == null || activeEditorPart == null || activeEditorPart.equals(part)) {
-         return;
-      }
-
-      activeEditorPart = part;
-
-      IActionBars actionBars = getActionBars();
-      if (actionBars != null) {
-
-         SMAEditor editor = part instanceof SMAEditor ? (SMAEditor) part : null;
+      if (part != null && part instanceof SMAEditor) {
+         IActionBars actionBars = getActionBars();
+         if (actionBars != null) {
 
-         if (editor != null) {
-            actionBars.setGlobalActionHandler(ActionFactory.PRINT.getId(), editor.getPrintAction());
+            SMAEditor editor = (SMAEditor) part;
+            actionBars.setGlobalActionHandler(ActionFactory.PRINT.getId(), new SMAPrint(editor.getAwa()));
             actionBars.updateActionBars();
          }
       }