refactor: Replace occurances of Branch with IOseeBranch

Change-Id: I0b236c6522cf834e0ace2f272cbb8a42d77b43af

7 files changed, 16 insertions, 14 deletions

diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/branch/AtsBranchManagerCore.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/branch/AtsBranchManagerCore.java
index 1491adf9364..9ca87392612 100644
--- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/branch/AtsBranchManagerCore.java
+++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/branch/AtsBranchManagerCore.java
@@ -540,7 +540,7 @@ public class AtsBranchManagerCore {
       commitMgrInputObjs.addAll(configArtSet);
       //for each tx commit...
       for (TransactionRecord txRecord : commitTxs) {
-         Branch txBranch = txRecord.getBranch();
+         IOseeBranch txBranch = txRecord.getBranch();
          boolean isCommitAlreadyPresent = false;
          // ... compare the branch of the tx commit to all the parent branches in configArtSet and do NOT add the tx
          // commit if it is already represented.
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/XCommitLabelProvider.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/XCommitLabelProvider.java
index 65def814a86..c32d3284372 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/XCommitLabelProvider.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/XCommitLabelProvider.java
@@ -155,7 +155,7 @@ public class XCommitLabelProvider extends XViewerLabelProvider {
       }
    }
 
-   private String handleCommitDateColumn(Branch branch) throws OseeCoreException {
+   private String handleCommitDateColumn(IOseeBranch branch) throws OseeCoreException {
       TransactionRecord transactionRecord =
          AtsBranchManagerCore.getCommitTransactionRecord(commitXManager.getXCommitViewer().getTeamArt(), branch);
       if (transactionRecord != null) {
@@ -165,7 +165,7 @@ public class XCommitLabelProvider extends XViewerLabelProvider {
       return "Not Committed";
    }
 
-   private String handleCommitCommentColumn(Branch branch) throws OseeCoreException {
+   private String handleCommitCommentColumn(IOseeBranch branch) throws OseeCoreException {
       TransactionRecord transactionRecord =
          AtsBranchManagerCore.getCommitTransactionRecord(commitXManager.getXCommitViewer().getTeamArt(), branch);
       if (transactionRecord != null) {
@@ -196,7 +196,7 @@ public class XCommitLabelProvider extends XViewerLabelProvider {
       return "";
    }
 
-   private String handleActionColumn(Branch branch) throws OseeCoreException {
+   private String handleActionColumn(IOseeBranch branch) throws OseeCoreException {
       CommitStatus commitStatus =
          AtsBranchManagerCore.getCommitStatus(commitXManager.getXCommitViewer().getTeamArt(), branch);
       if (commitStatus == CommitStatus.Rebaseline_In_Progress) {
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/httpRequests/BaseArtifactLoopbackCmd.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/httpRequests/BaseArtifactLoopbackCmd.java
index 5dc5f193e7d..6328681dd2a 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/httpRequests/BaseArtifactLoopbackCmd.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/httpRequests/BaseArtifactLoopbackCmd.java
@@ -15,8 +15,8 @@ import static org.eclipse.osee.framework.core.enums.DeletionFlag.INCLUDE_DELETED
 import java.net.HttpURLConnection;
 import java.util.Map;
 import org.eclipse.osee.framework.core.client.server.HttpResponse;
+import org.eclipse.osee.framework.core.data.IOseeBranch;
 import org.eclipse.osee.framework.core.enums.DeletionFlag;
-import org.eclipse.osee.framework.core.model.Branch;
 import org.eclipse.osee.framework.core.model.TransactionRecord;
 import org.eclipse.osee.framework.jdk.core.util.Strings;
 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
@@ -44,7 +44,7 @@ public abstract class BaseArtifactLoopbackCmd implements IClientLoopbackCmd {
       } else {
          try {
             final Artifact artifact;
-            final Branch branch;
+            final IOseeBranch branch;
             if (Strings.isValid(transactionIdStr)) {
                int transactionNumber = Integer.parseInt(transactionIdStr);
                TransactionRecord transactionId = TransactionManager.getTransactionId(transactionNumber);
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/RevisionChangeLoader.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/RevisionChangeLoader.java
index cc75647c909..e04a7682f2e 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/RevisionChangeLoader.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/RevisionChangeLoader.java
@@ -20,6 +20,7 @@ import java.util.Set;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.osee.framework.core.client.ClientSessionManager;
+import org.eclipse.osee.framework.core.data.IOseeBranch;
 import org.eclipse.osee.framework.core.enums.DeletionFlag;
 import org.eclipse.osee.framework.core.model.Branch;
 import org.eclipse.osee.framework.core.model.TransactionRecord;
@@ -156,7 +157,7 @@ public final class RevisionChangeLoader {
       }
       monitor.subTask("Loading Artifacts from the Database");
 
-      Branch branch = isHistorical ? transactionId.getBranch() : sourceBranch;
+      IOseeBranch branch = isHistorical ? transactionId.getBranch() : sourceBranch;
 
       Collection<Change> changesLoaded = getChanges(branch, isHistorical, changeBuilders);
       changes.addAll(changesLoaded);
@@ -164,7 +165,7 @@ public final class RevisionChangeLoader {
       monitor.done();
    }
 
-   private CompositeKeyHashMap<TransactionRecord, Integer, Artifact> getBulkLoadedArtifacts(Branch branch, boolean isHistorical, List<ChangeBuilder> changeBuilders) throws OseeCoreException {
+   private CompositeKeyHashMap<TransactionRecord, Integer, Artifact> getBulkLoadedArtifacts(IOseeBranch branch, boolean isHistorical, List<ChangeBuilder> changeBuilders) throws OseeCoreException {
       HashCollection<TransactionRecord, Integer> loadMap =
          new HashCollection<TransactionRecord, Integer>(false, HashSet.class);
       for (ChangeBuilder builder : changeBuilders) {
@@ -195,7 +196,7 @@ public final class RevisionChangeLoader {
       return loadedMap;
    }
 
-   private Collection<Change> getChanges(Branch branch, boolean isHistorical, List<ChangeBuilder> changeBuilders) throws OseeCoreException {
+   private Collection<Change> getChanges(IOseeBranch branch, boolean isHistorical, List<ChangeBuilder> changeBuilders) throws OseeCoreException {
       CompositeKeyHashMap<TransactionRecord, Integer, Artifact> loadedMap =
          getBulkLoadedArtifacts(branch, isHistorical, changeBuilders);
 
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/acquirer/AttributeChangeAcquirer.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/acquirer/AttributeChangeAcquirer.java
index 086f0fe0a4e..0008bce74ef 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/acquirer/AttributeChangeAcquirer.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/acquirer/AttributeChangeAcquirer.java
@@ -21,6 +21,7 @@ import java.util.Set;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.osee.framework.core.client.ClientSessionManager;
 import org.eclipse.osee.framework.core.data.IArtifactType;
+import org.eclipse.osee.framework.core.data.IOseeBranch;
 import org.eclipse.osee.framework.core.enums.ModificationType;
 import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
 import org.eclipse.osee.framework.core.model.Branch;
@@ -166,7 +167,7 @@ public class AttributeChangeAcquirer extends ChangeAcquirer {
    private void loadAttributeWasValues(Branch sourceBranch, TransactionRecord transactionId, Set<Integer> artIds, IProgressMonitor monitor, Map<Integer, ChangeBuilder> attributesWasValueCache, boolean hasBranch) throws OseeCoreException, OseeDataStoreException {
       if (!artIds.isEmpty()) {
          long sqlParamter; // Will either be a branch uuid or transaction id
-         Branch wasValueBranch;
+         IOseeBranch wasValueBranch;
          String sql;
 
          if (hasBranch) {
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportEditor.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportEditor.java
index 9015f393d54..49fab7db2e6 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportEditor.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportEditor.java
@@ -13,7 +13,7 @@ package org.eclipse.osee.framework.ui.skynet.change.view;
 import java.util.List;
 import java.util.logging.Level;
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.data.IOseeBranch;
 import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
 import org.eclipse.osee.framework.logging.OseeLevel;
 import org.eclipse.osee.framework.logging.OseeLog;
@@ -140,14 +140,14 @@ public class ChangeReportEditor extends FormEditor implements IChangeReportView
       @Override
       public void handleBranchEvent(Sender sender, final BranchEvent branchEvent) {
          ChangeUiData changeUiData = getEditorInput().getChangeData();
-         Branch[] branches = new Branch[2];
+         IOseeBranch[] branches = new IOseeBranch[2];
          try {
             branches[0] = changeUiData.getTxDelta().getStartTx().getBranch();
             branches[1] = changeUiData.getTxDelta().getEndTx().getBranch();
          } catch (OseeCoreException ex) {
             OseeLog.log(Activator.class, Level.SEVERE, "Error obtaining change report branches for branch event", ex);
          }
-         for (Branch branch : branches) {
+         for (IOseeBranch branch : branches) {
             if (branch != null && branch.getUuid() == branchEvent.getBranchUuid()) {
                switch (branchEvent.getEventType()) {
                   case Deleting:
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/BranchCreationHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/BranchCreationHandler.java
index 3a7c7a297b3..fefe8087ed5 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/BranchCreationHandler.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/BranchCreationHandler.java
@@ -65,7 +65,7 @@ public class BranchCreationHandler extends CommandHandler {
          IExceptionableRunnable runnable = new IExceptionableRunnable() {
             @Override
             public IStatus run(IProgressMonitor monitor) throws Exception {
-               Branch branch = parentTransactionId.getBranch();
+               IOseeBranch branch = parentTransactionId.getBranch();
                if (branch.equals(CoreBranches.SYSTEM_ROOT)) {
                   BranchManager.createTopLevelBranch(dialog.getEntry());
                } else {