Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2015-03-18 07:05:25 +0000
committerEike Stepper2015-03-18 07:05:25 +0000
commit468612c95d76d4f355fdd05eebea6e346a3b665d (patch)
treee6a6c460df8e343295a251a2716622f3acc5037a /plugins/org.eclipse.emf.cdo.ui
parente5a26c533bb3bcef2a8dced57a10ea61a3ada2f3 (diff)
downloadcdo-468612c95d76d4f355fdd05eebea6e346a3b665d.tar.gz
cdo-468612c95d76d4f355fdd05eebea6e346a3b665d.tar.xz
cdo-468612c95d76d4f355fdd05eebea6e346a3b665d.zip
[458349] Consolidate UI
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=458349
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.ui')
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/ComposeBranchPointComposite.java20
1 files changed, 11 insertions, 9 deletions
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/ComposeBranchPointComposite.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/ComposeBranchPointComposite.java
index 2f63457ae6..1d6342561a 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/ComposeBranchPointComposite.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/ComposeBranchPointComposite.java
@@ -268,17 +268,19 @@ public class ComposeBranchPointComposite extends Composite
IStructuredSelection selection = (IStructuredSelection)branchViewer.getSelection();
CDOBranch branch = (CDOBranch)selection.getFirstElement();
-
- long timeStamp = CDOBranchPoint.UNSPECIFIED_DATE;
- if (timeStampComposite != null)
+ if (branch != null)
{
- timeStamp = timeStampComposite.getTimeStamp();
- }
+ long timeStamp = CDOBranchPoint.UNSPECIFIED_DATE;
+ if (timeStampComposite != null)
+ {
+ timeStamp = timeStampComposite.getTimeStamp();
+ }
- branchPoint = branch.getPoint(timeStamp);
- if (!ObjectUtil.equals(branchPoint, oldBranchPoint))
- {
- branchPointChanged(branchPoint);
+ branchPoint = branch.getPoint(timeStamp);
+ if (!ObjectUtil.equals(branchPoint, oldBranchPoint))
+ {
+ branchPointChanged(branchPoint);
+ }
}
}

Back to the top