diff options
author | Eike Stepper | 2015-07-26 10:54:58 +0000 |
---|---|---|
committer | Eike Stepper | 2015-07-26 10:54:58 +0000 |
commit | 8743379312de89965370af9e8ef9457581dc8845 (patch) | |
tree | 990c79bca75a97709bbe7717b762794d32e73b46 /plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal | |
parent | e983f203a6542e5e35c2e9e3271d33dbd6a6eb7b (diff) | |
download | cdo-8743379312de89965370af9e8ef9457581dc8845.tar.gz cdo-8743379312de89965370af9e8ef9457581dc8845.tar.xz cdo-8743379312de89965370af9e8ef9457581dc8845.zip |
[458349] Consolidate UI - Add SelectClassDialog and make item providers more robust
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=458349
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal')
-rw-r--r-- | plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutImpl.java | 8 |
1 files changed, 5 insertions, 3 deletions
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 fa6635c529..90d59b16c2 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 @@ -622,14 +622,14 @@ public abstract class CDOCheckoutImpl extends AbstractElement implements CDOChec } CDOSession session = view.getSession(); - CDOBranch branch = view.getBranch(); - CDOBranchPoint head = branch.getHead(); if (readOnly) { - return session.openView(head, resourceSet); + return session.openView(view, resourceSet); } + CDOBranch branch = view.getBranch(); + CDOBranchPoint head = branch.getHead(); return session.openTransaction(head, resourceSet); } @@ -638,7 +638,9 @@ public abstract class CDOCheckoutImpl extends AbstractElement implements CDOChec CDOUtil.configureView(view); ((InternalCDOView)view).setRepositoryName(repository.getLabel()); + view.properties().put(CDOView.PROP_TIME_MACHINE_DISABLED, !isReadOnly()); view.properties().put(CHECKOUT_KEY, this); + view.addListener(new IListener() { public void notifyEvent(IEvent event) |