diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/ComposeBranchPointComposite.java')
-rw-r--r-- | plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/ComposeBranchPointComposite.java | 19 |
1 files changed, 14 insertions, 5 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 f8d09046c2..23de4a5d6b 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 @@ -191,14 +191,23 @@ public class ComposeBranchPointComposite extends Composite public void selectionChanged(SelectionChangedEvent event) { IStructuredSelection selection = (IStructuredSelection)event.getSelection(); - CDOBranch branch = (CDOBranch)selection.getFirstElement(); - - if (timeStampComposite != null) + Object element = selection.getFirstElement(); + if (element == null) { - timeStampComposite.setBranch(branch); + return; } - composeBranchPoint(); + if (element instanceof CDOBranch) + { + CDOBranch branch = (CDOBranch)element; + + if (timeStampComposite != null) + { + timeStampComposite.setBranch(branch); + } + + composeBranchPoint(); + } } }); |