bug[ats_12LYT]: Make Merge Manager UI consistent

Change-Id: I725413ae9732066acf0bf18e85b9347f43c81d91

1 files changed, 30 insertions, 0 deletions

diff --git a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/BranchCache.java b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/BranchCache.java
index 26e86ececff..b6822f6f974 100644
--- a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/BranchCache.java
+++ b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/BranchCache.java
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.eclipse.osee.framework.core.model.cache;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
@@ -54,6 +55,35 @@ public class BranchCache extends AbstractOseeCache<String, Branch> {
       return toReturn;
    }
 
+   public MergeBranch findFirstMergeBranch(Branch sourceBranch) throws OseeCoreException {
+      Conditions.checkNotNull(sourceBranch, "source branch");
+      MergeBranch toReturn = null;
+      for (Branch branch : getAll()) {
+         if (branch instanceof MergeBranch) {
+            MergeBranch mergeBranch = (MergeBranch) branch;
+            if (sourceBranch.equals(mergeBranch.getSourceBranch())) {
+               toReturn = mergeBranch;
+               break;
+            }
+         }
+      }
+      return toReturn;
+   }
+
+   public List<MergeBranch> findAllMergeBranches(Branch sourceBranch) throws OseeCoreException {
+      Conditions.checkNotNull(sourceBranch, "source branch");
+      List<MergeBranch> toReturn = new ArrayList<MergeBranch>();
+      for (Branch branch : getAll()) {
+         if (branch instanceof MergeBranch) {
+            MergeBranch mergeBranch = (MergeBranch) branch;
+            if (sourceBranch.equals(mergeBranch.getSourceBranch())) {
+               toReturn.add(mergeBranch);
+            }
+         }
+      }
+      return toReturn;
+   }
+
    public synchronized List<Branch> getBranches(BranchFilter branchFilter) throws OseeCoreException {
       Collection<Branch> allBranches = getRawValues();
       List<Branch> branches = new LinkedList<Branch>();