diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal')
5 files changed, 32 insertions, 20 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOAuditImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOAuditImpl.java index dfa70ae25e..1d7268f0bc 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOAuditImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOAuditImpl.java @@ -12,7 +12,7 @@ package org.eclipse.emf.internal.cdo; import org.eclipse.emf.cdo.CDOAudit; import org.eclipse.emf.cdo.internal.protocol.revision.InternalCDORevision; -import org.eclipse.emf.cdo.protocol.CDOID; +import org.eclipse.emf.cdo.protocol.id.CDOID; import org.eclipse.emf.cdo.protocol.revision.CDORevisionResolver; import java.text.MessageFormat; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionImpl.java index c251c7adf3..60678cdb5f 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionImpl.java @@ -13,19 +13,19 @@ package org.eclipse.emf.internal.cdo; import org.eclipse.emf.cdo.CDOSession; import org.eclipse.emf.cdo.CDOSessionInvalidationEvent; import org.eclipse.emf.cdo.CDOView; -import org.eclipse.emf.cdo.internal.protocol.CDOIDRangeImpl; import org.eclipse.emf.cdo.internal.protocol.model.CDOClassImpl; import org.eclipse.emf.cdo.internal.protocol.model.CDOPackageImpl; -import org.eclipse.emf.cdo.protocol.CDOID; -import org.eclipse.emf.cdo.protocol.CDOIDRange; -import org.eclipse.emf.cdo.protocol.CDOIDUtil; import org.eclipse.emf.cdo.protocol.CDOProtocolConstants; +import org.eclipse.emf.cdo.protocol.id.CDOID; +import org.eclipse.emf.cdo.protocol.id.CDOIDRange; +import org.eclipse.emf.cdo.protocol.id.CDOIDUtil; import org.eclipse.emf.cdo.protocol.model.CDOClassRef; import org.eclipse.emf.cdo.protocol.revision.CDORevision; import org.eclipse.emf.cdo.protocol.util.TransportException; import org.eclipse.emf.cdo.util.CDOUtil; import org.eclipse.emf.internal.cdo.bundle.OM; +import org.eclipse.emf.internal.cdo.protocol.CDOClientProtocol; import org.eclipse.emf.internal.cdo.protocol.OpenSessionRequest; import org.eclipse.emf.internal.cdo.protocol.OpenSessionResult; import org.eclipse.emf.internal.cdo.protocol.QueryObjectTypesRequest; @@ -203,6 +203,11 @@ public class CDOSessionImpl extends Container<CDOView> implements CDOSession return channel; } + public CDOClientProtocol getProtocol() + { + return (CDOClientProtocol)channel.getReceiveHandler(); + } + public String getRepositoryName() { return repositoryName; @@ -294,6 +299,19 @@ public class CDOSessionImpl extends Container<CDOView> implements CDOSession return openAudit(createResourceSet(), timeStamp); } + public CDOView getView(int viewID) + { + for (CDOViewImpl view : getViews()) + { + if (view.getViewID() == viewID) + { + return view; + } + } + + return null; + } + public CDOViewImpl[] getViews() { Collection<CDOViewImpl> values; @@ -344,7 +362,7 @@ public class CDOSessionImpl extends Container<CDOView> implements CDOSession long id1 = nextTemporaryID; nextTemporaryID -= count + count; long id2 = nextTemporaryID + 2; - return CDOIDRangeImpl.create(id1, id2); + return CDOIDUtil.createRange(id1, id2); } public InternalEObject lookupMetaInstance(CDOID id) @@ -397,7 +415,7 @@ public class CDOSessionImpl extends Container<CDOView> implements CDOSession { long count = registerMetaInstance((InternalEObject)ePackage, nextTemporaryID); long newTempID = nextTemporaryID - 2L * count; - CDOIDRange range = CDOIDRangeImpl.create(nextTemporaryID, newTempID + 2L); + CDOIDRange range = CDOIDUtil.createRange(nextTemporaryID, newTempID + 2L); nextTemporaryID = newTempID; return range; } diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOFeatureAnalyzerModelBased.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOFeatureAnalyzerModelBased.java index fd88398549..1fe8659866 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOFeatureAnalyzerModelBased.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOFeatureAnalyzerModelBased.java @@ -11,8 +11,8 @@ **************************************************************************/ package org.eclipse.emf.internal.cdo.analyzer; -import org.eclipse.emf.cdo.protocol.CDOID; import org.eclipse.emf.cdo.protocol.analyzer.CDOFetchRule; +import org.eclipse.emf.cdo.protocol.id.CDOID; import org.eclipse.emf.cdo.protocol.model.CDOFeature; import org.eclipse.emf.internal.cdo.InternalCDOObject; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CDOClientProtocol.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CDOClientProtocol.java index afe99c339d..061be327c8 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CDOClientProtocol.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CDOClientProtocol.java @@ -10,25 +10,20 @@ **************************************************************************/ package org.eclipse.emf.internal.cdo.protocol; +import org.eclipse.emf.cdo.internal.protocol.CDOProtocolImpl; import org.eclipse.emf.cdo.protocol.CDOProtocolConstants; -import org.eclipse.net4j.signal.SignalProtocol; import org.eclipse.net4j.signal.SignalReactor; /** * @author Eike Stepper */ -public class CDOClientProtocol extends SignalProtocol +public class CDOClientProtocol extends CDOProtocolImpl { public CDOClientProtocol() { } - public String getType() - { - return CDOProtocolConstants.PROTOCOL_NAME; - } - @Override protected SignalReactor doCreateSignalReactor(short signalID) { diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitTransactionRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitTransactionRequest.java index 7188dd58d2..b21358eaa5 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitTransactionRequest.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitTransactionRequest.java @@ -13,13 +13,12 @@ package org.eclipse.emf.internal.cdo.protocol; import org.eclipse.emf.cdo.CDOObject; import org.eclipse.emf.cdo.eresource.CDOResource; -import org.eclipse.emf.cdo.internal.protocol.CDOIDRangeImpl; import org.eclipse.emf.cdo.internal.protocol.model.CDOPackageImpl; import org.eclipse.emf.cdo.internal.protocol.revision.InternalCDORevision; -import org.eclipse.emf.cdo.protocol.CDOID; -import org.eclipse.emf.cdo.protocol.CDOIDRange; -import org.eclipse.emf.cdo.protocol.CDOIDUtil; import org.eclipse.emf.cdo.protocol.CDOProtocolConstants; +import org.eclipse.emf.cdo.protocol.id.CDOID; +import org.eclipse.emf.cdo.protocol.id.CDOIDRange; +import org.eclipse.emf.cdo.protocol.id.CDOIDUtil; import org.eclipse.emf.cdo.protocol.model.CDOPackage; import org.eclipse.emf.cdo.protocol.revision.CDORevision; import org.eclipse.emf.cdo.protocol.revision.delta.CDORevisionDelta; @@ -87,7 +86,7 @@ public class CommitTransactionRequest extends CDOClientRequest<CommitTransaction for (CDOPackage newPackage : newPackages) { CDOIDRange oldRange = newPackage.getMetaIDRange(); - CDOIDRange newRange = CDOIDRangeImpl.read(in); + CDOIDRange newRange = CDOIDUtil.readRange(in); ((CDOPackageImpl)newPackage).setMetaIDRange(newRange); for (long i = 0; i < oldRange.getCount(); i++) { |