refactor: Replace occurances of Branch with IOseeBranch

3 files changed, 13 insertions, 13 deletions

diff --git a/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/jobs/CommitTestRunJob.java b/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/jobs/CommitTestRunJob.java
index 2239ccde48f..78191f95a0c 100644
--- a/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/jobs/CommitTestRunJob.java
+++ b/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/jobs/CommitTestRunJob.java
@@ -19,8 +19,8 @@ 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.osee.framework.core.data.IOseeBranch;
 import org.eclipse.osee.framework.core.exception.OseeArgumentException;
-import org.eclipse.osee.framework.core.model.Branch;
 import org.eclipse.osee.framework.logging.OseeLog;
 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
 import org.eclipse.osee.ote.define.artifacts.TestRunOperator;
@@ -80,8 +80,8 @@ public class CommitTestRunJob extends Job {
    }
 
    private void commitSelectedArtifacts(IProgressMonitor monitor, String comment, Object[] items) throws Exception {
-      Map<Branch, List<Artifact>> commitMap = getArtifactsByBranch(items);
-      for (Branch branch : commitMap.keySet()) {
+      Map<IOseeBranch, List<Artifact>> commitMap = getArtifactsByBranch(items);
+      for (IOseeBranch branch : commitMap.keySet()) {
          monitor.setTaskName(String.format("Committing Artifacts into Branch: [%s]", branch.getName()));
          List<Artifact> artList = commitMap.get(branch);
          ImportOutfileOperation.commitTestRunTx(monitor, comment, branch, artList.toArray(new Artifact[artList.size()]));
@@ -101,11 +101,11 @@ public class CommitTestRunJob extends Job {
       return committedList.toArray(new Artifact[committedList.size()]);
    }
 
-   private Map<Branch, List<Artifact>> getArtifactsByBranch(Object[] items) {
-      Map<Branch, List<Artifact>> branchMap = new HashMap<Branch, List<Artifact>>();
+   private Map<IOseeBranch, List<Artifact>> getArtifactsByBranch(Object[] items) {
+      Map<IOseeBranch, List<Artifact>> branchMap = new HashMap<IOseeBranch, List<Artifact>>();
       for (Object object : items) {
          Artifact testRun = (Artifact) object;
-         Branch branch = testRun.getBranch();
+         IOseeBranch branch = testRun.getBranch();
          List<Artifact> artList = branchMap.get(branch);
          if (artList == null) {
             artList = new ArrayList<Artifact>();
diff --git a/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/XViewerDataManager.java b/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/XViewerDataManager.java
index bfef27a3d2d..313062c9d20 100644
--- a/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/XViewerDataManager.java
+++ b/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/XViewerDataManager.java
@@ -19,9 +19,9 @@ import java.util.List;
 import java.util.Map;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.nebula.widgets.xviewer.XViewer;
+import org.eclipse.osee.framework.core.data.IOseeBranch;
 import org.eclipse.osee.framework.core.exception.AttributeDoesNotExist;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.model.Branch;
 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
 import org.eclipse.osee.framework.ui.skynet.artifact.massEditor.MassXViewerFactory;
 import org.eclipse.osee.framework.ui.swt.Displays;
@@ -41,7 +41,7 @@ public class XViewerDataManager {
    private final XViewer xViewer;
    private final List<DataItem> commitableItems;
    private final List<DataItem> uncommitableItems;
-   private final Map<Branch, DataItem> branchMap;
+   private final Map<IOseeBranch, DataItem> branchMap;
    private final List<DataItem> backingData;
    private final Collection<IDataChangedListener> listeners;
    private boolean isInitialized;
@@ -51,7 +51,7 @@ public class XViewerDataManager {
       this.backingData = new ArrayList<DataItem>();
       this.isInitialized = false;
       this.xViewer = xViewer;
-      this.branchMap = new HashMap<Branch, DataItem>();
+      this.branchMap = new HashMap<IOseeBranch, DataItem>();
       this.commitableItems = new ArrayList<DataItem>();
       this.uncommitableItems = new ArrayList<DataItem>();
       this.listeners = Collections.synchronizedSet(new HashSet<IDataChangedListener>());
@@ -129,7 +129,7 @@ public class XViewerDataManager {
    }
 
    private DataItem getBranchItem(Artifact artifact) {
-      Branch branch = artifact.getBranch();
+      IOseeBranch branch = artifact.getBranch();
       DataItem toReturn = branchMap.get(branch);
       if (toReturn == null) {
          toReturn = new BranchItem(branch, null);
diff --git a/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/data/BranchItem.java b/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/data/BranchItem.java
index 162635fde72..02cf9845b00 100644
--- a/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/data/BranchItem.java
+++ b/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/data/BranchItem.java
@@ -12,7 +12,7 @@ package org.eclipse.osee.ote.ui.define.viewers.data;
 
 import java.util.ArrayList;
 import java.util.List;
-import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.data.IOseeBranch;
 import org.eclipse.osee.framework.ui.swt.ImageManager;
 import org.eclipse.osee.ote.ui.define.OteDefineImage;
 import org.eclipse.swt.graphics.Image;
@@ -22,10 +22,10 @@ import org.eclipse.swt.graphics.Image;
  */
 public class BranchItem extends DataItem implements IXViewerItem {
 
-   private final Branch branch;
+   private final IOseeBranch branch;
    private static boolean isScriptItemGrouped = true;
 
-   public BranchItem(Branch branch, DataItem parentItem) {
+   public BranchItem(IOseeBranch branch, DataItem parentItem) {
       super(parentItem);
       this.branch = branch;
    }