diff options
| author | Simon McDuff | 2008-11-10 19:11:35 +0000 |
|---|---|---|
| committer | Simon McDuff | 2008-11-10 19:11:35 +0000 |
| commit | 6578a33af3fb97a88f8c640ec5c7e9b9ae027c0f (patch) | |
| tree | 3517b4acb216e953efbfcf1730c0a63792ee8963 /plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/revision | |
| parent | 297107b0e1e4ca357b6841b468427863b2e85733 (diff) | |
| download | cdo-6578a33af3fb97a88f8c640ec5c7e9b9ae027c0f.tar.gz cdo-6578a33af3fb97a88f8c640ec5c7e9b9ae027c0f.tar.xz cdo-6578a33af3fb97a88f8c640ec5c7e9b9ae027c0f.zip | |
[249436] Support FeatureMap
https://bugs.eclipse.org/bugs/show_bug.cgi?id=249436
Diffstat (limited to 'plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/revision')
2 files changed, 2 insertions, 4 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/revision/CDOReferenceProxy.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/revision/CDOReferenceProxy.java index 32492e81e7..40d5cd83ab 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/revision/CDOReferenceProxy.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/revision/CDOReferenceProxy.java @@ -12,7 +12,6 @@ package org.eclipse.emf.internal.cdo.revision; import org.eclipse.emf.cdo.CDORevisionManager; -import org.eclipse.emf.cdo.common.id.CDOID; import org.eclipse.emf.cdo.common.model.CDOFeature; import org.eclipse.emf.cdo.common.revision.CDORevision; @@ -27,6 +26,6 @@ public interface CDOReferenceProxy /** * @since 2.0 */ - public CDOID resolve(CDORevisionManager revisionManager, CDORevision revision, CDOFeature feature, int index); + public Object resolve(CDORevisionManager revisionManager, CDORevision revision, CDOFeature feature, int index); } diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/revision/CDOReferenceProxyImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/revision/CDOReferenceProxyImpl.java index 80035b5313..cbeefaeab4 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/revision/CDOReferenceProxyImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/revision/CDOReferenceProxyImpl.java @@ -12,7 +12,6 @@ package org.eclipse.emf.internal.cdo.revision; import org.eclipse.emf.cdo.CDORevisionManager; -import org.eclipse.emf.cdo.common.id.CDOID; import org.eclipse.emf.cdo.common.model.CDOFeature; import org.eclipse.emf.cdo.common.revision.CDORevision; @@ -42,7 +41,7 @@ public final class CDOReferenceProxyImpl implements CDOReferenceProxy this.index = index; } - public CDOID resolve(CDORevisionManager revisionManager, CDORevision revision, CDOFeature feature, int index) + public Object resolve(CDORevisionManager revisionManager, CDORevision revision, CDOFeature feature, int index) { return ((CDORevisionManagerImpl)revisionManager).resolveReferenceProxy(revision, feature, index, getIndex()); } |