diff options
| author | Eike Stepper | 2015-01-29 06:23:54 +0000 |
|---|---|---|
| committer | Eike Stepper | 2015-02-18 14:39:34 +0000 |
| commit | 109f40bb0afb1b6adf9a03e47ff37d3f3bd99bf8 (patch) | |
| tree | d24313df4fbc8429e023a811ab7f6349aa5d43aa /plugins/org.eclipse.emf.cdo.common/src/org/eclipse | |
| parent | 579603209ec8450c8099bd48767687cb3229e529 (diff) | |
| download | cdo-109f40bb0afb1b6adf9a03e47ff37d3f3bd99bf8.tar.gz cdo-109f40bb0afb1b6adf9a03e47ff37d3f3bd99bf8.tar.xz cdo-109f40bb0afb1b6adf9a03e47ff37d3f3bd99bf8.zip | |
[458349] Consolidate UI
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=458349
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.common/src/org/eclipse')
2 files changed, 10 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranch.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranch.java index 52ec5f82e0..1477556452 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranch.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranch.java @@ -17,6 +17,8 @@ import org.eclipse.emf.cdo.common.util.CDOTimeProvider; import org.eclipse.net4j.util.container.IContainer; +import org.eclipse.core.runtime.IAdaptable; + /** * Represents a <i>stream of changes</i> that is isolated from other streams of changes. * <p> @@ -36,7 +38,7 @@ import org.eclipse.net4j.util.container.IContainer; * @apiviz.has {@link CDOBranchPoint} oneway - - base * @apiviz.composedOf {@link CDOBranch} - - subBranches */ -public interface CDOBranch extends IContainer<CDOBranch>, Comparable<CDOBranch> +public interface CDOBranch extends IContainer<CDOBranch>, Comparable<CDOBranch>, IAdaptable { /** * The fixed ID of the {@link CDOBranchManager#getMainBranch() main branch}. diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchImpl.java index 2073ef2d14..16038d98da 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchImpl.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchImpl.java @@ -20,6 +20,7 @@ import org.eclipse.emf.cdo.spi.common.branch.InternalCDOBranchManager.BranchLoad import org.eclipse.emf.cdo.spi.common.branch.InternalCDOBranchManager.BranchLoader.BranchInfo; import org.eclipse.emf.cdo.spi.common.branch.InternalCDOBranchManager.BranchLoader.SubBranchInfo; +import org.eclipse.net4j.util.AdapterUtil; import org.eclipse.net4j.util.container.Container; import java.text.MessageFormat; @@ -289,6 +290,12 @@ public class CDOBranchImpl extends Container<CDOBranch> implements InternalCDOBr fireElementAddedEvent(branch); } + @SuppressWarnings({ "unchecked", "rawtypes" }) + public Object getAdapter(Class adapter) + { + return AdapterUtil.adapt(this, adapter); + } + public int compareTo(CDOBranch o) { int otherID = o.getID(); |