5 files changed, 8 insertions, 158 deletions
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 74eafb84460..057e94855cc 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
@@ -26,9 +26,8 @@ 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.DeleteWorkingBranch;
 import org.eclipse.osee.ats.editor.service.branch.ShowChangeReportService;
-import org.eclipse.osee.ats.editor.service.branch.ShowChangeReportServiceNew;
 import org.eclipse.osee.ats.editor.service.branch.ShowChangeReportToolbarService;
-import org.eclipse.osee.ats.editor.service.branch.ShowChangeReportToolbarServiceNew;
+import org.eclipse.osee.ats.editor.service.branch.ShowChangeReportToolbarServiceOld;
 import org.eclipse.osee.ats.editor.service.branch.ShowWorkingBranchService;
 import org.eclipse.osee.ats.workflow.AtsWorkPage;
 import org.eclipse.osee.framework.ui.skynet.XFormToolkit;
@@ -82,8 +81,8 @@ public class ServicesArea {
          services.add(new AddPeerToPeerReviewService(smaMgr));
          services.add(new BlockingReview(smaMgr));
          // Toolbar Services
-         services.add(new ShowChangeReportToolbarServiceNew(smaMgr));
          services.add(new ShowChangeReportToolbarService(smaMgr));
+         services.add(new ShowChangeReportToolbarServiceOld(smaMgr));
          services.add(new OpenParent(smaMgr));
          services.add(new EmailActionService(smaMgr));
          services.add(new AddNoteOperation(smaMgr));
@@ -99,7 +98,6 @@ public class ServicesArea {
             if (page.isAllowCreateBranch()) services.add(new CreateWorkingBranchService(smaMgr));
             services.add(new ShowWorkingBranchService(smaMgr));
             services.add(new ShowChangeReportService(smaMgr));
-            services.add(new ShowChangeReportServiceNew(smaMgr));
             if (page.isAllowCommitBranch()) services.add(new CommitWorkingBranchService(smaMgr, false));
             if (AtsPlugin.isAtsAdmin()) services.add(new CommitWorkingBranchService(smaMgr, true));
             services.add(new DeleteWorkingBranch(smaMgr));
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/ShowChangeReportServiceNew.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/ShowChangeReportServiceNew.java
deleted file mode 100644
index 49ac3a5483f..00000000000
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/ShowChangeReportServiceNew.java
+++ /dev/null
@@ -1,148 +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.BranchManager;
-import org.eclipse.osee.ats.workflow.AtsWorkPage;
-import org.eclipse.osee.framework.jdk.core.type.Pair;
-import org.eclipse.osee.framework.skynet.core.event.LocalBranchEvent;
-import org.eclipse.osee.framework.skynet.core.event.LocalBranchToArtifactCacheUpdateEvent;
-import org.eclipse.osee.framework.skynet.core.event.LocalTransactionEvent;
-import org.eclipse.osee.framework.skynet.core.event.RemoteBranchEvent;
-import org.eclipse.osee.framework.skynet.core.event.RemoteTransactionEvent;
-import org.eclipse.osee.framework.skynet.core.event.SkynetEventManager;
-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.event.Event;
-import org.eclipse.osee.framework.ui.plugin.event.IEventReceiver;
-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 ShowChangeReportServiceNew extends WorkPageService implements IEventReceiver {
-   private static final TransactionIdManager transactionIdManager = TransactionIdManager.getInstance();
-
-   private Hyperlink link;
-
-   // Since this service is only going to be added for the Implement state, Location.AllState will
-   // work
-   public ShowChangeReportServiceNew(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) {
-      return isCurrentState(page) || page.getId().contains("Implement");
-   }
-
-   /* (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) {
-      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();
-         }
-      });
-      SkynetEventManager.getInstance().register(LocalTransactionEvent.class, this);
-      SkynetEventManager.getInstance().register(RemoteTransactionEvent.class, this);
-      SkynetEventManager.getInstance().register(LocalBranchEvent.class, this);
-      SkynetEventManager.getInstance().register(RemoteBranchEvent.class, this);
-      SkynetEventManager.getInstance().register(LocalBranchToArtifactCacheUpdateEvent.class, this);
-      refresh();
-   }
-
-   /* (non-Javadoc)
-    * @see org.eclipse.osee.ats.editor.service.WorkPageService#getName()
-    */
-   @Override
-   public String getName() {
-      return "Show Change Report (New)";
-   }
-
-   /* (non-Javadoc)
-    * @see org.eclipse.osee.ats.editor.service.WorkPageService#getSidebarCategory()
-    */
-   @Override
-   public String getSidebarCategory() {
-      return BranchManager.BRANCH_CATEGORY;
-   }
-
-   /*
-    * (non-Javadoc)
-    * 
-    * @see org.eclipse.osee.ats.editor.statistic.WorkPageStatistic#refresh()
-    */
-   @Override
-   public void refresh() {
-      if (link != null && !link.isDisposed()) {
-         boolean enabled = isEnabled();
-         link.setText(enabled ? "Show Change Report (New)" : "Show Change Report (New)\n(no changes)");
-         link.setEnabled(enabled);
-         link.setUnderlined(enabled);
-      }
-   }
-
-   private boolean isEnabled() {
-      boolean enabled = false;
-      try {
-         if (smaMgr.getBranchMgr().isWorkingBranch()) {
-            Pair<TransactionId, TransactionId> transactionToFrom =
-                  transactionIdManager.getStartEndPoint(smaMgr.getBranchMgr().getWorkingBranch());
-            enabled = !transactionToFrom.getKey().equals(transactionToFrom.getValue());
-         } else {
-            enabled = smaMgr.getBranchMgr().getTransactionId() != null;
-         }
-      } catch (Exception ex) {
-         // do nothing
-      }
-      return enabled;
-   }
-
-   public void onEvent(Event event) {
-      refresh();
-   }
-
-   /*
-    * (non-Javadoc)
-    * 
-    * @see org.eclipse.osee.framework.jdk.core.event.IEventReceiver#runOnEventInDisplayThread()
-    */
-   public boolean runOnEventInDisplayThread() {
-      return true;
-   }
-
-   private void performService() {
-      smaMgr.getBranchMgr().showChangeReportNew();
-   }
-
-}
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/ShowChangeReportToolbarService.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/ShowChangeReportToolbarService.java
index dcb08185d14..0ed0900fde3 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/ShowChangeReportToolbarService.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/ShowChangeReportToolbarService.java
@@ -57,7 +57,7 @@ public class ShowChangeReportToolbarService extends WorkPageService implements I
     */
    @Override
    public String getName() {
-      return "Show Change Report";
+      return "Show OLD Change Report";
    }
 
    private boolean isEnabled() {
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/ShowChangeReportToolbarServiceNew.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/ShowChangeReportToolbarServiceOld.java
index 8b933e54f83..20efedf6c7b 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/ShowChangeReportToolbarServiceNew.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/ShowChangeReportToolbarServiceOld.java
@@ -24,12 +24,12 @@ import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
 /**
  * @author Donald G. Dunne
  */
-public class ShowChangeReportToolbarServiceNew extends WorkPageService implements IEventReceiver {
+public class ShowChangeReportToolbarServiceOld extends WorkPageService implements IEventReceiver {
    private Action action;
 
    // Since this service is only going to be added for the Implement state, Location.AllState will
    // work
-   public ShowChangeReportToolbarServiceNew(SMAManager smaMgr) {
+   public ShowChangeReportToolbarServiceOld(SMAManager smaMgr) {
       super(smaMgr);
    }
 
@@ -93,6 +93,6 @@ public class ShowChangeReportToolbarServiceNew extends WorkPageService implement
    }
 
    private void performService() {
-      smaMgr.getBranchMgr().showChangeReportNew();
+      smaMgr.getBranchMgr().showChangeReportOld();
    }
 }
 \ No newline at end of file
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/BranchManager.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/BranchManager.java
index c43ee138dd0..ae26534458a 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/BranchManager.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/BranchManager.java
@@ -148,7 +148,7 @@ public class BranchManager {
    /**
     * Display change report associated with the branch, if exists, or transaction, if branch has been committed.
     */
-   public void showChangeReport() {
+   public void showChangeReportOld() {
       try {
          if (isWorkingBranch()) {
             ChangeReportView.openViewUpon(getWorkingBranch());
@@ -166,7 +166,7 @@ public class BranchManager {
    /**
     * Display change report associated with the branch, if exists, or transaction, if branch has been committed.
     */
-   public void showChangeReportNew() {
+   public void showChangeReport() {
       try {
          if (isWorkingBranch()) {
             ChangeView.open(getWorkingBranch());