[458349] Consolidate UI

Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=458349

2 files changed, 15 insertions, 0 deletions

diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/checkouts/CDOCheckout.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/checkouts/CDOCheckout.java
index 4124ff8b9d..223c5b6798 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/checkouts/CDOCheckout.java
+++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/checkouts/CDOCheckout.java
@@ -57,6 +57,8 @@ public interface CDOCheckout extends CDOExplorerElement, CDOTimeProvider, StateP
 
   public void setBranchPoint(int branchID, long timeStamp);
 
+  public CDOBranchPoint getBranchPoint(CDOCheckout fromCheckout);
+
   public CDOBranchPoint[] getBranchPoints();
 
   public boolean addBranchPoint(CDOBranchPoint branchPoint);
diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutImpl.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutImpl.java
index 4ad799a93d..76e36c36a5 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutImpl.java
+++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutImpl.java
@@ -178,6 +178,19 @@ public abstract class CDOCheckoutImpl extends AbstractElement implements CDOChec
     }
   }
 
+  public final CDOBranchPoint getBranchPoint(CDOCheckout fromCheckout)
+  {
+    if (repository == fromCheckout.getRepository() && repository.isConnected())
+    {
+
+      CDOBranchManager branchManager = repository.getSession().getBranchManager();
+      CDOBranch branch = branchManager.getBranch(fromCheckout.getBranchID());
+      return branch.getPoint(fromCheckout.getTimeStamp());
+    }
+
+    return null;
+  }
+
   protected String doSetBranchPoint(int branchID, long timeStamp)
   {
     CDOBranch branch = view.getSession().getBranchManager().getBranch(branchID);