11 files changed, 38 insertions, 720 deletions

diff --git a/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/PopulateDemoActions.java b/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/PopulateDemoActions.java
index 0a0b6e8116f..775b008ed7f 100644
--- a/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/PopulateDemoActions.java
+++ b/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/PopulateDemoActions.java
@@ -261,7 +261,8 @@ public class PopulateDemoActions extends XNavigateItemAction {
 

       DemoDbUtil.sleep(2000L);

       OseeLog.log(OseeAtsConfigDemoPlugin.class, Level.INFO, "Committing branch");

-      reqTeam.getSmaMgr().getBranchMgr().commitWorkingBranch(false, true);

+      reqTeam.getSmaMgr().getBranchMgr().commitWorkingBranch(false, true,

+            reqTeam.getSmaMgr().getTargetedForVersion().getParentBranch(), true);

 

       DemoDbUtil.sleep(5000);

 

@@ -292,8 +293,7 @@ public class PopulateDemoActions extends XNavigateItemAction {
       branchArtifact.setSoleAttributeValue(ProgramAttributes.Safety_Criticality.toString(), "D");

       branchArtifact.setSoleAttributeValue(ProgramAttributes.Subsystem.name(), Subsystems.Communications.name());

       Artifact comArt =

-            ArtifactQuery.getArtifactFromTypeAndName(Requirements.COMPONENT, "Robot API",

-                  DemoDbUtil.getDefaultBranch());

+            ArtifactQuery.getArtifactFromTypeAndName(Requirements.COMPONENT, "Robot API", DemoDbUtil.getDefaultBranch());

       branchArtifact.addRelation(CoreRelationEnumeration.ALLOCATION__COMPONENT, comArt);

       branchArtifact.persistAttributesAndRelations();

 

@@ -501,8 +501,7 @@ public class PopulateDemoActions extends XNavigateItemAction {
          // Create Test Script Artifacts

          Set<Artifact> verificationTests = new HashSet<Artifact>();

          Artifact verificationHeader =

-               ArtifactQuery.getArtifactFromTypeAndName("Folder", "Verification Tests",

-                     DemoDbUtil.getDefaultBranch());

+               ArtifactQuery.getArtifactFromTypeAndName("Folder", "Verification Tests", DemoDbUtil.getDefaultBranch());

          if (verificationHeader == null) throw new IllegalStateException("Could not find Verification Tests header");

          for (String str : new String[] {"A", "B", "C"}) {

             Artifact newArt =

diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/ServicesArea.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/ServicesArea.java
index 3e546679eb7..e4e44516a9f 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/ServicesArea.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/ServicesArea.java
@@ -23,12 +23,8 @@ import org.eclipse.osee.ats.editor.AtsStateItems;
 import org.eclipse.osee.ats.editor.IAtsStateItem;

 import org.eclipse.osee.ats.editor.SMAManager;

 import org.eclipse.osee.ats.editor.SMAWorkFlowSection;

-import org.eclipse.osee.ats.editor.service.branch.CommitWorkingBranchService;

-import org.eclipse.osee.ats.editor.service.branch.CreateWorkingBranchService;

-import org.eclipse.osee.ats.editor.service.branch.DeleteWorkingBranchService;

 import org.eclipse.osee.ats.editor.service.branch.ShowChangeReportService;

 import org.eclipse.osee.ats.editor.service.branch.ShowMergeManagerService;

-import org.eclipse.osee.ats.editor.service.branch.ShowWorkingBranchService;

 import org.eclipse.osee.ats.workflow.AtsWorkPage;

 import org.eclipse.osee.framework.db.connection.exception.OseeCoreException;

 import org.eclipse.osee.framework.logging.OseeLevel;

@@ -85,20 +81,6 @@ public class ServicesArea {
          sideBarServices.add(new AddDecisionReviewService(smaMgr));

          sideBarServices.add(new AddPeerToPeerReviewService(smaMgr));

          sideBarServices.add(new BlockingReview(smaMgr));

-         // Add page configured branchable state items

-         if (page != null && (page.isAllowCommitBranch() || page.isAllowCreateBranch())) {

-            if (page.isAllowCreateBranch()) sideBarServices.add(new CreateWorkingBranchService(smaMgr));

-            sideBarServices.add(new ShowWorkingBranchService(smaMgr));

-            sideBarServices.add(new ShowChangeReportService(smaMgr));

-            sideBarServices.add(new ShowMergeManagerService(smaMgr));

-            if (page.isAllowCommitBranch()) {

-               sideBarServices.add(new CommitWorkingBranchService(smaMgr, false));

-            }

-            if (AtsPlugin.isAtsAdmin()) {

-               sideBarServices.add(new CommitWorkingBranchService(smaMgr, true));

-            }

-            sideBarServices.add(new DeleteWorkingBranchService(smaMgr));

-         }

          // Add state specific items (these can also contain branch items through extending BranchableStateItem class

          for (IAtsStateItem item : smaMgr.getStateItems().getStateItems(page.getId())) {

             sideBarServices.addAll(item.getSidebarServices(smaMgr));

diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/CommitWorkingBranchService.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/CommitWorkingBranchService.java
deleted file mode 100644
index 8dee8e9b1f1..00000000000
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/CommitWorkingBranchService.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.osee.ats.editor.service.branch;
-
-import org.eclipse.osee.ats.editor.SMAManager;
-import org.eclipse.osee.ats.editor.SMAWorkFlowSection;
-import org.eclipse.osee.ats.editor.service.WorkPageService;
-import org.eclipse.osee.ats.util.AtsBranchManager;
-import org.eclipse.osee.ats.workflow.AtsWorkPage;
-import org.eclipse.osee.framework.db.connection.exception.OseeCoreException;
-import org.eclipse.osee.framework.skynet.core.event.BranchEventType;
-import org.eclipse.osee.framework.skynet.core.event.IBranchEventListener;
-import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
-import org.eclipse.osee.framework.skynet.core.event.Sender;
-import org.eclipse.osee.framework.ui.plugin.util.Displays;
-import org.eclipse.osee.framework.ui.skynet.XFormToolkit;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.ui.forms.events.HyperlinkEvent;
-import org.eclipse.ui.forms.events.IHyperlinkListener;
-import org.eclipse.ui.forms.widgets.Hyperlink;
-
-/**
- * @author Donald G. Dunne
- */
-public class CommitWorkingBranchService extends WorkPageService implements IBranchEventListener {
-
-   private Hyperlink link;
-   private final boolean overrideStateValidation;
-
-   public CommitWorkingBranchService(SMAManager smaMgr, boolean overrideStateValidation) {
-      super(smaMgr);
-      this.overrideStateValidation = overrideStateValidation;
-   }
-
-   /* (non-Javadoc)
-    * @see org.eclipse.osee.ats.editor.service.WorkPageService#isShowSidebarService(org.eclipse.osee.ats.workflow.AtsWorkPage)
-    */
-   @Override
-   public boolean isShowSidebarService(AtsWorkPage page) throws OseeCoreException {
-      return isCurrentState(page);
-   }
-
-   /* (non-Javadoc)
-    * @see org.eclipse.osee.ats.editor.service.WorkPageService#createSidebarService(org.eclipse.swt.widgets.Group, org.eclipse.osee.ats.workflow.AtsWorkPage, org.eclipse.osee.framework.ui.skynet.XFormToolkit, org.eclipse.osee.ats.editor.SMAWorkFlowSection)
-    */
-   @Override
-   public void createSidebarService(Group workGroup, AtsWorkPage page, XFormToolkit toolkit, SMAWorkFlowSection section) throws OseeCoreException {
-      if (smaMgr.getStateMgr().getCurrentStateName().equals(page.getName())) {
-         link =
-               toolkit.createHyperlink(workGroup,
-                     getName() + (overrideStateValidation ? "\nOverride State Validation" : ""), SWT.NONE);
-         if (smaMgr.getSma().isReadOnly())
-            link.addHyperlinkListener(readOnlyHyperlinkListener);
-         else
-            link.addHyperlinkListener(new IHyperlinkListener() {
-
-               public void linkEntered(HyperlinkEvent e) {
-               }
-
-               public void linkExited(HyperlinkEvent e) {
-               }
-
-               public void linkActivated(HyperlinkEvent e) {
-                  System.err.println("Not working...remove or implement");
-                  //                  try {
-                  //                     smaMgr.getBranchMgr().commitWorkingBranch(true, overrideStateValidation);
-                  //                  } catch (OseeCoreException ex) {
-                  //                     OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);
-                  //                  }
-               }
-            });
-      }
-      OseeEventManager.addListener(this);
-      refresh();
-   }
-
-   /* (non-Javadoc)
-    * @see org.eclipse.osee.ats.editor.service.WorkPageService#getName()
-    */
-   @Override
-   public String getName() {
-      return "Commit Working Branch";
-   }
-
-   /* (non-Javadoc)
-    * @see org.eclipse.osee.ats.editor.service.WorkPageService#getSidebarCategory()
-    */
-   @Override
-   public String getSidebarCategory() {
-      return AtsBranchManager.BRANCH_CATEGORY;
-   }
-
-   /*
-    * (non-Javadoc)
-    * 
-    * @see org.eclipse.osee.ats.editor.statistic.WorkPageStatistic#refresh()
-    */
-   @Override
-   public void refresh() {
-      if (link != null && !link.isDisposed()) {
-         boolean enabled = false;
-         try {
-            enabled = smaMgr.getBranchMgr().isWorkingBranch() && !smaMgr.getBranchMgr().isBranchesAllCommitted();
-         } catch (Exception ex) {
-            // do nothing
-         }
-         link.setEnabled(enabled);
-         link.setUnderlined(enabled);
-      }
-   }
-
-   /*
-    * (non-Javadoc)
-    * 
-    * @see org.eclipse.osee.ats.editor.service.WorkPageService#dispose()
-    */
-   @Override
-   public void dispose() {
-      OseeEventManager.removeListener(this);
-   }
-
-   /* (non-Javadoc)
-    * @see org.eclipse.osee.framework.skynet.core.eventx.IBranchEventListener#handleBranchEvent(org.eclipse.osee.framework.ui.plugin.event.Sender, org.eclipse.osee.framework.skynet.core.artifact.BranchModType, int)
-    */
-   @Override
-   public void handleBranchEvent(Sender sender, BranchEventType branchModType, int branchId) {
-      Displays.ensureInDisplayThread(new Runnable() {
-         /* (non-Javadoc)
-          * @see java.lang.Runnable#run()
-          */
-         @Override
-         public void run() {
-            refresh();
-         }
-      });
-
-   }
-
-   /* (non-Javadoc)
-    * @see org.eclipse.osee.framework.skynet.core.eventx.IBranchEventListener#handleLocalBranchToArtifactCacheUpdateEvent(org.eclipse.osee.framework.ui.plugin.event.Sender)
-    */
-   @Override
-   public void handleLocalBranchToArtifactCacheUpdateEvent(Sender sender) {
-      Displays.ensureInDisplayThread(new Runnable() {
-         /* (non-Javadoc)
-          * @see java.lang.Runnable#run()
-          */
-         @Override
-         public void run() {
-            refresh();
-         }
-      });
-
-   }
-}
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/CreateWorkingBranchService.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/CreateWorkingBranchService.java
deleted file mode 100644
index 842dce2a35e..00000000000
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/CreateWorkingBranchService.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.osee.ats.editor.service.branch;
-
-import org.eclipse.osee.ats.editor.SMAManager;
-import org.eclipse.osee.ats.editor.SMAWorkFlowSection;
-import org.eclipse.osee.ats.editor.service.WorkPageService;
-import org.eclipse.osee.ats.util.AtsBranchManager;
-import org.eclipse.osee.ats.workflow.AtsWorkPage;
-import org.eclipse.osee.framework.db.connection.exception.OseeCoreException;
-import org.eclipse.osee.framework.skynet.core.event.BranchEventType;
-import org.eclipse.osee.framework.skynet.core.event.IBranchEventListener;
-import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
-import org.eclipse.osee.framework.skynet.core.event.Sender;
-import org.eclipse.osee.framework.ui.plugin.util.Displays;
-import org.eclipse.osee.framework.ui.plugin.util.Result;
-import org.eclipse.osee.framework.ui.skynet.XFormToolkit;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.ui.forms.events.HyperlinkEvent;
-import org.eclipse.ui.forms.events.IHyperlinkListener;
-import org.eclipse.ui.forms.widgets.Hyperlink;
-
-/**
- * @author Donald G. Dunne
- */
-public class CreateWorkingBranchService extends WorkPageService implements IBranchEventListener {
-
-   private Hyperlink link;
-
-   public CreateWorkingBranchService(SMAManager smaMgr) {
-      super(smaMgr);
-   }
-
-   /* (non-Javadoc)
-    * @see org.eclipse.osee.ats.editor.service.WorkPageService#isShowSidebarService(org.eclipse.osee.ats.workflow.AtsWorkPage)
-    */
-   @Override
-   public boolean isShowSidebarService(AtsWorkPage page) throws OseeCoreException {
-      return isCurrentState(page);
-   }
-
-   /* (non-Javadoc)
-    * @see org.eclipse.osee.ats.editor.service.WorkPageService#createSidebarService(org.eclipse.swt.widgets.Group, org.eclipse.osee.ats.workflow.AtsWorkPage, org.eclipse.osee.framework.ui.skynet.XFormToolkit, org.eclipse.osee.ats.editor.SMAWorkFlowSection)
-    */
-   @Override
-   public void createSidebarService(Group workGroup, final AtsWorkPage page, XFormToolkit toolkit, SMAWorkFlowSection section) throws OseeCoreException {
-      link = toolkit.createHyperlink(workGroup, getName(), SWT.NONE);
-      if (smaMgr.getSma().isReadOnly())
-         link.addHyperlinkListener(readOnlyHyperlinkListener);
-      else
-         link.addHyperlinkListener(new IHyperlinkListener() {
-
-            public void linkEntered(HyperlinkEvent e) {
-            }
-
-            public void linkExited(HyperlinkEvent e) {
-            }
-
-            public void linkActivated(HyperlinkEvent e) {
-               Result result = smaMgr.getBranchMgr().createWorkingBranch(page.getId(), true);
-               if (result.isFalse()) result.popup();
-            }
-         });
-
-      OseeEventManager.addListener(this);
-      refresh();
-   }
-
-   /* (non-Javadoc)
-    * @see org.eclipse.osee.ats.editor.service.WorkPageService#getName()
-    */
-   @Override
-   public String getName() {
-      return "Create Working Branch";
-   }
-
-   /* (non-Javadoc)
-    * @see org.eclipse.osee.ats.editor.service.WorkPageService#getSidebarCategory()
-    */
-   @Override
-   public String getSidebarCategory() {
-      return AtsBranchManager.BRANCH_CATEGORY;
-   }
-
-   /*
-    * (non-Javadoc)
-    * 
-    * @see org.eclipse.osee.ats.editor.statistic.WorkPageStatistic#refresh()
-    */
-   @Override
-   public void refresh() {
-      if (link != null && !link.isDisposed()) {
-         boolean enabled = false;
-         try {
-            enabled = !smaMgr.getBranchMgr().isWorkingBranch() && !smaMgr.getBranchMgr().isCommittedBranchExists();
-         } catch (Exception ex) {
-            // do nothing
-         }
-         link.setEnabled(enabled);
-         link.setUnderlined(enabled);
-      }
-   }
-
-   /* (non-Javadoc)
-    * @see org.eclipse.osee.framework.skynet.core.eventx.IBranchEventListener#handleBranchEvent(org.eclipse.osee.framework.ui.plugin.event.Sender, org.eclipse.osee.framework.skynet.core.artifact.BranchModType, int)
-    */
-   @Override
-   public void handleBranchEvent(Sender sender, BranchEventType branchModType, int branchId) {
-      Displays.ensureInDisplayThread(new Runnable() {
-         /* (non-Javadoc)
-          * @see java.lang.Runnable#run()
-          */
-         @Override
-         public void run() {
-            refresh();
-         }
-      });
-
-   }
-
-   /* (non-Javadoc)
-    * @see org.eclipse.osee.framework.skynet.core.eventx.IBranchEventListener#handleLocalBranchToArtifactCacheUpdateEvent(org.eclipse.osee.framework.ui.plugin.event.Sender)
-    */
-   @Override
-   public void handleLocalBranchToArtifactCacheUpdateEvent(Sender sender) {
-      Displays.ensureInDisplayThread(new Runnable() {
-         /* (non-Javadoc)
-          * @see java.lang.Runnable#run()
-          */
-         @Override
-         public void run() {
-            refresh();
-         }
-      });
-
-   }
-
-   /*
-    * (non-Javadoc)
-    * 
-    * @see org.eclipse.osee.ats.editor.service.WorkPageService#dispose()
-    */
-   @Override
-   public void dispose() {
-      OseeEventManager.removeListener(this);
-   }
-}
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/DeleteWorkingBranchService.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/DeleteWorkingBranchService.java
deleted file mode 100644
index d5da8ae596c..00000000000
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/DeleteWorkingBranchService.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.osee.ats.editor.service.branch;
-
-import org.eclipse.osee.ats.editor.SMAManager;
-import org.eclipse.osee.ats.editor.SMAWorkFlowSection;
-import org.eclipse.osee.ats.editor.service.WorkPageService;
-import org.eclipse.osee.ats.util.AtsBranchManager;
-import org.eclipse.osee.ats.workflow.AtsWorkPage;
-import org.eclipse.osee.framework.db.connection.exception.OseeCoreException;
-import org.eclipse.osee.framework.skynet.core.event.BranchEventType;
-import org.eclipse.osee.framework.skynet.core.event.IBranchEventListener;
-import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
-import org.eclipse.osee.framework.skynet.core.event.Sender;
-import org.eclipse.osee.framework.ui.plugin.util.Displays;
-import org.eclipse.osee.framework.ui.skynet.XFormToolkit;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.ui.forms.events.HyperlinkEvent;
-import org.eclipse.ui.forms.events.IHyperlinkListener;
-import org.eclipse.ui.forms.widgets.Hyperlink;
-
-/**
- * @author Donald G. Dunne
- */
-public class DeleteWorkingBranchService extends WorkPageService implements IBranchEventListener {
-
-   private Hyperlink link;
-
-   public DeleteWorkingBranchService(SMAManager smaMgr) {
-      super(smaMgr);
-   }
-
-   /* (non-Javadoc)
-    * @see org.eclipse.osee.ats.editor.service.WorkPageService#isShowSidebarService(org.eclipse.osee.ats.workflow.AtsWorkPage)
-    */
-   @Override
-   public boolean isShowSidebarService(AtsWorkPage page) throws OseeCoreException {
-      return isCurrentState(page);
-   }
-
-   /* (non-Javadoc)
-    * @see org.eclipse.osee.ats.editor.service.WorkPageService#createSidebarService(org.eclipse.swt.widgets.Group, org.eclipse.osee.ats.workflow.AtsWorkPage, org.eclipse.osee.framework.ui.skynet.XFormToolkit, org.eclipse.osee.ats.editor.SMAWorkFlowSection)
-    */
-   @Override
-   public void createSidebarService(Group workGroup, AtsWorkPage page, XFormToolkit toolkit, SMAWorkFlowSection section) throws OseeCoreException {
-      link = toolkit.createHyperlink(workGroup, getName(), SWT.NONE);
-      if (smaMgr.getSma().isReadOnly())
-         link.addHyperlinkListener(readOnlyHyperlinkListener);
-      else
-         link.addHyperlinkListener(new IHyperlinkListener() {
-
-            public void linkEntered(HyperlinkEvent e) {
-            }
-
-            public void linkExited(HyperlinkEvent e) {
-            }
-
-            public void linkActivated(HyperlinkEvent e) {
-               smaMgr.getBranchMgr().deleteEmptyWorkingBranch();
-            }
-         });
-      OseeEventManager.addListener(this);
-      refresh();
-   }
-
-   /* (non-Javadoc)
-    * @see org.eclipse.osee.ats.editor.service.WorkPageService#getName()
-    */
-   @Override
-   public String getName() {
-      return "Delete Working Branch";
-   }
-
-   /* (non-Javadoc)
-    * @see org.eclipse.osee.ats.editor.service.WorkPageService#getSidebarCategory()
-    */
-   @Override
-   public String getSidebarCategory() {
-      return AtsBranchManager.BRANCH_CATEGORY;
-   }
-
-   @Override
-   public void refresh() {
-      if (link != null && !link.isDisposed()) {
-         boolean enabled = false;
-         try {
-            enabled = smaMgr.getBranchMgr().isWorkingBranch();
-         } catch (Exception ex) {
-            // do nothing
-         }
-         link.setEnabled(enabled);
-         link.setUnderlined(enabled);
-      }
-   }
-
-   /* (non-Javadoc)
-    * @see org.eclipse.osee.framework.skynet.core.eventx.IBranchEventListener#handleBranchEvent(org.eclipse.osee.framework.ui.plugin.event.Sender, org.eclipse.osee.framework.skynet.core.artifact.BranchModType, int)
-    */
-   @Override
-   public void handleBranchEvent(Sender sender, BranchEventType branchModType, int branchId) {
-      Displays.ensureInDisplayThread(new Runnable() {
-         /* (non-Javadoc)
-          * @see java.lang.Runnable#run()
-          */
-         @Override
-         public void run() {
-            refresh();
-         }
-      });
-
-   }
-
-   /* (non-Javadoc)
-    * @see org.eclipse.osee.framework.skynet.core.eventx.IBranchEventListener#handleLocalBranchToArtifactCacheUpdateEvent(org.eclipse.osee.framework.ui.plugin.event.Sender)
-    */
-   @Override
-   public void handleLocalBranchToArtifactCacheUpdateEvent(Sender sender) {
-      Displays.ensureInDisplayThread(new Runnable() {
-         /* (non-Javadoc)
-          * @see java.lang.Runnable#run()
-          */
-         @Override
-         public void run() {
-            refresh();
-         }
-      });
-
-   }
-
-   /*
-    * (non-Javadoc)
-    * 
-    * @see org.eclipse.osee.ats.editor.service.WorkPageService#dispose()
-    */
-   @Override
-   public void dispose() {
-      OseeEventManager.removeListener(this);
-   }
-}
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/ShowChangeReportService.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/ShowChangeReportService.java
index 0393917be45..813788085dc 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/ShowChangeReportService.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/ShowChangeReportService.java
@@ -12,7 +12,6 @@ package org.eclipse.osee.ats.editor.service.branch;
 
 import org.eclipse.jface.action.Action;
 import org.eclipse.osee.ats.editor.SMAManager;
-import org.eclipse.osee.ats.editor.SMAWorkFlowSection;
 import org.eclipse.osee.ats.editor.service.WorkPageService;
 import org.eclipse.osee.ats.util.AtsBranchManager;
 import org.eclipse.osee.ats.workflow.AtsWorkPage;
@@ -23,11 +22,6 @@ import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
 import org.eclipse.osee.framework.skynet.core.event.Sender;
 import org.eclipse.osee.framework.ui.plugin.util.Displays;
 import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
-import org.eclipse.osee.framework.ui.skynet.XFormToolkit;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.ui.forms.events.HyperlinkEvent;
-import org.eclipse.ui.forms.events.IHyperlinkListener;
 import org.eclipse.ui.forms.widgets.Hyperlink;
 
 /**
@@ -48,29 +42,7 @@ public class ShowChangeReportService extends WorkPageService implements IBranchE
     */
    @Override
    public boolean isShowSidebarService(AtsWorkPage page) throws OseeCoreException {
-      return isCurrentState(page);
-   }
-
-   /* (non-Javadoc)
-    * @see org.eclipse.osee.ats.editor.service.WorkPageService#createSidebarService(org.eclipse.swt.widgets.Group, org.eclipse.osee.ats.workflow.AtsWorkPage, org.eclipse.osee.framework.ui.skynet.XFormToolkit, org.eclipse.osee.ats.editor.SMAWorkFlowSection)
-    */
-   @Override
-   public void createSidebarService(Group workGroup, AtsWorkPage page, XFormToolkit toolkit, SMAWorkFlowSection section) throws OseeCoreException {
-      link = toolkit.createHyperlink(workGroup, getName(), SWT.NONE);
-      link.addHyperlinkListener(new IHyperlinkListener() {
-
-         public void linkEntered(HyperlinkEvent e) {
-         }
-
-         public void linkExited(HyperlinkEvent e) {
-         }
-
-         public void linkActivated(HyperlinkEvent e) {
-            performService();
-         }
-      });
-      OseeEventManager.addListener(this);
-      refresh();
+      return false;
    }
 
    private Action toolBarAction;
@@ -122,11 +94,6 @@ public class ShowChangeReportService extends WorkPageService implements IBranchE
     */
    @Override
    public void refresh() {
-      if (link != null && !link.isDisposed()) {
-         boolean enabled = isEnabled();
-         link.setEnabled(enabled);
-         link.setUnderlined(enabled);
-      }
       if (toolBarAction != null) {
          toolBarAction.setEnabled(isEnabled());
       }
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/ShowMergeManagerService.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/ShowMergeManagerService.java
index 394f989feb7..63fd12237ce 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/ShowMergeManagerService.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/ShowMergeManagerService.java
@@ -12,7 +12,6 @@ package org.eclipse.osee.ats.editor.service.branch;
 
 import org.eclipse.jface.action.Action;
 import org.eclipse.osee.ats.editor.SMAManager;
-import org.eclipse.osee.ats.editor.SMAWorkFlowSection;
 import org.eclipse.osee.ats.editor.service.WorkPageService;
 import org.eclipse.osee.ats.util.AtsBranchManager;
 import org.eclipse.osee.ats.workflow.AtsWorkPage;
@@ -23,11 +22,6 @@ import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
 import org.eclipse.osee.framework.skynet.core.event.Sender;
 import org.eclipse.osee.framework.ui.plugin.util.Displays;
 import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
-import org.eclipse.osee.framework.ui.skynet.XFormToolkit;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.ui.forms.events.HyperlinkEvent;
-import org.eclipse.ui.forms.events.IHyperlinkListener;
 import org.eclipse.ui.forms.widgets.Hyperlink;
 
 /**
@@ -43,37 +37,6 @@ public class ShowMergeManagerService extends WorkPageService implements IBranchE
       super(smaMgr);
    }
 
-   /* (non-Javadoc)
-    * @see org.eclipse.osee.ats.editor.service.WorkPageService#isShowSidebarService(org.eclipse.osee.ats.workflow.AtsWorkPage)
-    */
-   @Override
-   public boolean isShowSidebarService(AtsWorkPage page) throws OseeCoreException {
-      return isCurrentState(page);
-   }
-
-   /* (non-Javadoc)
-    * @see org.eclipse.osee.ats.editor.service.WorkPageService#createSidebarService(org.eclipse.swt.widgets.Group, org.eclipse.osee.ats.workflow.AtsWorkPage, org.eclipse.osee.framework.ui.skynet.XFormToolkit, org.eclipse.osee.ats.editor.SMAWorkFlowSection)
-    */
-   @Override
-   public void createSidebarService(Group workGroup, AtsWorkPage page, XFormToolkit toolkit, SMAWorkFlowSection section) throws OseeCoreException {
-      link = toolkit.createHyperlink(workGroup, getName(), SWT.NONE);
-      link.addHyperlinkListener(new IHyperlinkListener() {
-
-         public void linkEntered(HyperlinkEvent e) {
-         }
-
-         public void linkExited(HyperlinkEvent e) {
-         }
-
-         public void linkActivated(HyperlinkEvent e) {
-            performService();
-         }
-      });
-
-      OseeEventManager.addListener(this);
-      refresh();
-   }
-
    private Action toolBarAction;
 
    @Override
@@ -183,4 +146,12 @@ public class ShowMergeManagerService extends WorkPageService implements IBranchE
       smaMgr.getBranchMgr().showMergeManager();
    }
 
+   /* (non-Javadoc)
+    * @see org.eclipse.osee.ats.editor.service.WorkPageService#isShowSidebarService(org.eclipse.osee.ats.workflow.AtsWorkPage)
+    */
+   @Override
+   public boolean isShowSidebarService(AtsWorkPage page) throws OseeCoreException {
+      return false;
+   }
+
 }
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/ShowWorkingBranchService.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/ShowWorkingBranchService.java
deleted file mode 100644
index 060b46701bc..00000000000
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/ShowWorkingBranchService.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.editor.service.branch;
-
-import org.eclipse.osee.ats.editor.SMAManager;
-import org.eclipse.osee.ats.editor.SMAWorkFlowSection;
-import org.eclipse.osee.ats.editor.service.WorkPageService;
-import org.eclipse.osee.ats.util.AtsBranchManager;
-import org.eclipse.osee.ats.workflow.AtsWorkPage;
-import org.eclipse.osee.framework.db.connection.exception.OseeCoreException;
-import org.eclipse.osee.framework.skynet.core.event.BranchEventType;
-import org.eclipse.osee.framework.skynet.core.event.IBranchEventListener;
-import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
-import org.eclipse.osee.framework.skynet.core.event.Sender;
-import org.eclipse.osee.framework.ui.plugin.util.Displays;
-import org.eclipse.osee.framework.ui.skynet.XFormToolkit;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.ui.forms.events.HyperlinkEvent;
-import org.eclipse.ui.forms.events.IHyperlinkListener;
-import org.eclipse.ui.forms.widgets.Hyperlink;
-
-/**
- * @author Donald G. Dunne
- */
-public class ShowWorkingBranchService extends WorkPageService implements IBranchEventListener {
-
-   private Hyperlink link;
-
-   public ShowWorkingBranchService(SMAManager smaMgr) {
-      super(smaMgr);
-   }
-
-   /* (non-Javadoc)
-    * @see org.eclipse.osee.ats.editor.service.WorkPageService#isShowSidebarService(org.eclipse.osee.ats.workflow.AtsWorkPage)
-    */
-   @Override
-   public boolean isShowSidebarService(AtsWorkPage page) throws OseeCoreException {
-      return isCurrentState(page);
-   }
-
-   /* (non-Javadoc)
-    * @see org.eclipse.osee.ats.editor.service.WorkPageService#createSidebarService(org.eclipse.swt.widgets.Group, org.eclipse.osee.ats.workflow.AtsWorkPage, org.eclipse.osee.framework.ui.skynet.XFormToolkit, org.eclipse.osee.ats.editor.SMAWorkFlowSection)
-    */
-   @Override
-   public void createSidebarService(Group workGroup, AtsWorkPage page, XFormToolkit toolkit, SMAWorkFlowSection section) throws OseeCoreException {
-      link = toolkit.createHyperlink(workGroup, "Show Working Branch", SWT.NONE);
-      link.addHyperlinkListener(new IHyperlinkListener() {
-
-         public void linkEntered(HyperlinkEvent e) {
-         }
-
-         public void linkExited(HyperlinkEvent e) {
-         }
-
-         public void linkActivated(HyperlinkEvent e) {
-            smaMgr.getBranchMgr().showWorkingBranch();
-         }
-      });
-
-      OseeEventManager.addListener(this);
-      refresh();
-   }
-
-   /* (non-Javadoc)
-    * @see org.eclipse.osee.ats.editor.service.WorkPageService#getName()
-    */
-   @Override
-   public String getName() {
-      return "";
-   }
-
-   /* (non-Javadoc)
-    * @see org.eclipse.osee.ats.editor.service.WorkPageService#getSidebarCategory()
-    */
-   @Override
-   public String getSidebarCategory() {
-      return AtsBranchManager.BRANCH_CATEGORY;
-   }
-
-   @Override
-   public void refresh() {
-      if (link != null && !link.isDisposed()) {
-         boolean enabled = false;
-         try {
-            enabled = smaMgr.getBranchMgr().isWorkingBranch();
-         } catch (Exception ex) {
-            // do nothing
-         }
-         link.setEnabled(enabled);
-         link.setUnderlined(enabled);
-      }
-   }
-
-   /*
-    * (non-Javadoc)
-    * 
-    * @see org.eclipse.osee.ats.editor.service.WorkPageService#dispose()
-    */
-   @Override
-   public void dispose() {
-      OseeEventManager.removeListener(this);
-   }
-
-   /* (non-Javadoc)
-    * @see org.eclipse.osee.framework.skynet.core.eventx.IBranchEventListener#handleBranchEvent(org.eclipse.osee.framework.ui.plugin.event.Sender, org.eclipse.osee.framework.skynet.core.artifact.BranchModType, int)
-    */
-   @Override
-   public void handleBranchEvent(Sender sender, BranchEventType branchModType, int branchId) {
-      Displays.ensureInDisplayThread(new Runnable() {
-         /* (non-Javadoc)
-          * @see java.lang.Runnable#run()
-          */
-         @Override
-         public void run() {
-            refresh();
-         }
-      });
-
-   }
-
-   /* (non-Javadoc)
-    * @see org.eclipse.osee.framework.skynet.core.eventx.IBranchEventListener#handleLocalBranchToArtifactCacheUpdateEvent(org.eclipse.osee.framework.ui.plugin.event.Sender)
-    */
-   @Override
-   public void handleLocalBranchToArtifactCacheUpdateEvent(Sender sender) {
-      Displays.ensureInDisplayThread(new Runnable() {
-         /* (non-Javadoc)
-          * @see java.lang.Runnable#run()
-          */
-         @Override
-         public void run() {
-            refresh();
-         }
-      });
-
-   }
-
-}
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchManager.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchManager.java
index 17a95e0e895..667024b8517 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchManager.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchManager.java
@@ -65,6 +65,7 @@ import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
 import org.eclipse.osee.framework.skynet.core.transaction.TransactionId;

 import org.eclipse.osee.framework.skynet.core.transaction.TransactionIdManager;

 import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;

+import org.eclipse.osee.framework.ui.plugin.util.Displays;

 import org.eclipse.osee.framework.ui.plugin.util.IExceptionableRunnable;

 import org.eclipse.osee.framework.ui.plugin.util.Jobs;

 import org.eclipse.osee.framework.ui.plugin.util.Result;

@@ -496,13 +497,15 @@ public class AtsBranchManager {
          this.archiveWorkingBranch = archiveWorkingBranch;

       }

 

+      private boolean adminOverride;

+

       /* (non-Javadoc)

        * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor)

        */

       @Override

       protected IStatus run(IProgressMonitor monitor) {

          try {

-            Branch workflowWorkingBranch = getWorkingBranch();

+            Branch workflowWorkingBranch = getWorkingBranch(true);

             if (workflowWorkingBranch == null) {

                return new Status(Status.ERROR, AtsPlugin.PLUGIN_ID,

                      "Commit Branch Failed: Can not locate branch for workflow " + smaMgr.getSma().getHumanReadableId());

@@ -520,11 +523,28 @@ public class AtsBranchManager {
             }

 

             if (!overrideStateValidation) {

-               // Check extenstion points for valid commit

+               adminOverride = false;

+               // Check extension points for valid commit

                for (IAtsStateItem item : smaMgr.getStateItems().getStateItems(smaMgr.getWorkPageDefinition().getId())) {

-                  Result tempResult = item.committing(smaMgr);

+                  final Result tempResult = item.committing(smaMgr);

                   if (tempResult.isFalse()) {

-                     return new Status(Status.ERROR, AtsPlugin.PLUGIN_ID, tempResult.getText());

+                     // Allow Admin to override state validation

+                     if (AtsPlugin.isAtsAdmin()) {

+                        Displays.ensureInDisplayThread(new Runnable() {

+                           /* (non-Javadoc)

+                            * @see java.lang.Runnable#run()

+                            */

+                           @Override

+                           public void run() {

+                              if (MessageDialog.openConfirm(Display.getCurrent().getActiveShell(),

+                                    "Override State Validation",

+                                    tempResult.getText() + "\n\nYou are set as Admin, OVERRIDE this?")) {

+                                 adminOverride = true;

+                              }

+                           }

+                        }, true);

+                     }

+                     if (!adminOverride) return new Status(Status.ERROR, AtsPlugin.PLUGIN_ID, tempResult.getText());

                   }

                }

             }

@@ -535,7 +555,6 @@ public class AtsBranchManager {
          }

          return Status.OK_STATUS;

       }

-

    }

 

    public void commit(boolean commitPopup, Branch sourceBranch, Branch destinationBranch, boolean archiveWorkingBranch) throws OseeCoreException {

diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/CommitXManager.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/CommitXManager.java
index 27fc7a48b13..cb4ecbfd897 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/CommitXManager.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/CommitXManager.java
@@ -91,7 +91,6 @@ public class CommitXManager extends XViewer {
                   "Talk to project lead or admin to configure branch for version [" + verArt + "]");
          } else if (commitStatus == CommitStatus.Commit_Needed) {
             Branch destBranch = verArt.getParentBranch();
-            Branch workingBranch = xCommitManager.getTeamArt().getSmaMgr().getBranchMgr().getWorkingBranch();
             xCommitManager.getTeamArt().getSmaMgr().getBranchMgr().commitWorkingBranch(true, false, destBranch, true);
          } else if (commitStatus == CommitStatus.Merge_Needed) {
             Branch destBranch = verArt.getParentBranch();
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/XCommitManager.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/XCommitManager.java
index f2663011102..6f6e6dd1b3a 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/XCommitManager.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/XCommitManager.java
@@ -199,7 +199,7 @@ public class XCommitManager extends XWidget implements IArtifactWidget, IFramewo
 
    public void loadTable() {
       try {
-         if (xCommitManager != null && teamArt != null && (teamArt instanceof TeamWorkFlowArtifact)) {
+         if (xCommitManager != null && teamArt != null && (teamArt instanceof TeamWorkFlowArtifact) && xCommitManager.getContentProvider() != null) {
             Collection<VersionArtifact> versionSet = teamArt.getSmaMgr().getBranchMgr().getVersionsToCommitTo();
             xCommitManager.setInput(versionSet);
          }
@@ -369,7 +369,6 @@ public class XCommitManager extends XWidget implements IArtifactWidget, IFramewo
     */
    @Override
    public void handleBranchEvent(Sender sender, BranchEventType branchModType, int branchId) throws OseeCoreException {
-      if (branchId != AtsPlugin.getAtsBranch().getBranchId()) return;
       Displays.ensureInDisplayThread(new Runnable() {
          @Override
          public void run() {