diff options
| author | Eike Stepper | 2009-01-10 07:56:55 +0000 |
|---|---|---|
| committer | Eike Stepper | 2009-01-10 07:56:55 +0000 |
| commit | 364c7897a153a12b904932f9118f01d51d8ffefa (patch) | |
| tree | 99077dd93e0c8dc7f58a7dd36ffde1ca9bca9d29 /plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo | |
| parent | 9e9b95c59cb1e3f4be543c7551079a3153176ad1 (diff) | |
| download | cdo-364c7897a153a12b904932f9118f01d51d8ffefa.tar.gz cdo-364c7897a153a12b904932f9118f01d51d8ffefa.tar.xz cdo-364c7897a153a12b904932f9118f01d51d8ffefa.zip | |
[260613] Cleanup cdo.common plugin
https://bugs.eclipse.org/bugs/show_bug.cgi?id=260613
Diffstat (limited to 'plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo')
78 files changed, 278 insertions, 624 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDODeltaNotificationImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDODeltaNotificationImpl.java index ceb94e358d..e3095bde60 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDODeltaNotificationImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDODeltaNotificationImpl.java @@ -18,6 +18,7 @@ import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; +import org.eclipse.emf.spi.cdo.InternalCDOObject; /** * @author Simon McDuff diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOLegacyWrapper.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOLegacyWrapper.java index 97d5eb0b9b..cb24bf9e0c 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOLegacyWrapper.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOLegacyWrapper.java @@ -20,10 +20,11 @@ import org.eclipse.emf.cdo.common.protocol.CDOProtocolConstants; import org.eclipse.emf.cdo.common.revision.CDORevision; import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta; import org.eclipse.emf.cdo.eresource.CDOResource; +import org.eclipse.emf.cdo.session.CDOPackageRegistry; import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision; -import org.eclipse.emf.cdo.util.CDOPackageRegistry; import org.eclipse.emf.internal.cdo.bundle.OM; +import org.eclipse.emf.internal.cdo.session.CDORevisionManagerImpl; import org.eclipse.emf.internal.cdo.util.FSMUtil; import org.eclipse.emf.internal.cdo.util.GenUtil; import org.eclipse.emf.internal.cdo.util.ModelUtil; @@ -48,6 +49,8 @@ import org.eclipse.emf.ecore.impl.EStructuralFeatureImpl; import org.eclipse.emf.ecore.impl.ETypedElementImpl; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.util.InternalEList; +import org.eclipse.emf.spi.cdo.InternalCDOObject; +import org.eclipse.emf.spi.cdo.InternalCDOView; import java.lang.reflect.Field; import java.lang.reflect.InvocationHandler; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOMetaWrapper.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOMetaWrapper.java index 37ebcfcb95..1d3c7e3fe5 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOMetaWrapper.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOMetaWrapper.java @@ -18,6 +18,7 @@ import org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl; import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision; import org.eclipse.emf.ecore.InternalEObject; +import org.eclipse.emf.spi.cdo.InternalCDOView; /** * @author Eike Stepper diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDONotificationBuilder.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDONotificationBuilder.java index 75d315c118..adfd71fa2c 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDONotificationBuilder.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDONotificationBuilder.java @@ -22,7 +22,7 @@ import org.eclipse.emf.cdo.common.revision.delta.CDORemoveFeatureDelta; import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta; import org.eclipse.emf.cdo.common.revision.delta.CDOSetFeatureDelta; import org.eclipse.emf.cdo.common.revision.delta.CDOUnsetFeatureDelta; -import org.eclipse.emf.cdo.util.CDOPackageRegistry; +import org.eclipse.emf.cdo.session.CDOPackageRegistry; import org.eclipse.emf.internal.cdo.util.ModelUtil; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java index dcaffa7e68..727f249dfd 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java @@ -13,7 +13,6 @@ package org.eclipse.emf.internal.cdo; import org.eclipse.emf.cdo.CDOLock; import org.eclipse.emf.cdo.CDOState; -import org.eclipse.emf.cdo.CDOView; import org.eclipse.emf.cdo.common.id.CDOID; import org.eclipse.emf.cdo.common.model.CDOClass; import org.eclipse.emf.cdo.common.model.CDOFeature; @@ -22,8 +21,10 @@ import org.eclipse.emf.cdo.eresource.CDOResource; import org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl; import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision; import org.eclipse.emf.cdo.util.CDOUtil; +import org.eclipse.emf.cdo.view.CDOView; import org.eclipse.emf.internal.cdo.bundle.OM; +import org.eclipse.emf.internal.cdo.session.CDOSessionPackageManagerImpl; import org.eclipse.emf.internal.cdo.util.FSMUtil; import org.eclipse.emf.internal.cdo.util.ModelUtil; @@ -56,6 +57,9 @@ import org.eclipse.emf.ecore.util.EcoreEList; import org.eclipse.emf.ecore.util.EcoreEMap; import org.eclipse.emf.ecore.util.FeatureMap; import org.eclipse.emf.ecore.util.InternalEList; +import org.eclipse.emf.spi.cdo.InternalCDOLoadable; +import org.eclipse.emf.spi.cdo.InternalCDOObject; +import org.eclipse.emf.spi.cdo.InternalCDOView; import java.util.Collection; import java.util.Collections; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectMerger.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectMerger.java index 16c5edbabb..f756a67c56 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectMerger.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectMerger.java @@ -16,6 +16,8 @@ import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta; import org.eclipse.emf.cdo.internal.common.revision.delta.CDORevisionMerger; import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision; +import org.eclipse.emf.spi.cdo.InternalCDOObject; + /** * @author Simon McDuff */ diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectWrapper.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectWrapper.java index 8369adf478..ad4a57965a 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectWrapper.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectWrapper.java @@ -11,9 +11,9 @@ package org.eclipse.emf.internal.cdo; import org.eclipse.emf.cdo.CDOLock; -import org.eclipse.emf.cdo.CDOView; import org.eclipse.emf.cdo.common.id.CDOID; import org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl; +import org.eclipse.emf.cdo.view.CDOView; import org.eclipse.emf.internal.cdo.bundle.OM; import org.eclipse.emf.internal.cdo.util.FSMUtil; @@ -33,6 +33,8 @@ import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.EStructuralFeature.Setting; import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.emf.spi.cdo.InternalCDOObject; +import org.eclipse.emf.spi.cdo.InternalCDOView; /** * @author Eike Stepper diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java index b867f717a9..0811eacb15 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java @@ -12,8 +12,6 @@ package org.eclipse.emf.internal.cdo; import org.eclipse.emf.cdo.CDOState; -import org.eclipse.emf.cdo.CDOTransaction; -import org.eclipse.emf.cdo.CDOView; import org.eclipse.emf.cdo.common.id.CDOID; import org.eclipse.emf.cdo.common.id.CDOIDTemp; import org.eclipse.emf.cdo.common.model.CDOClass; @@ -22,12 +20,15 @@ import org.eclipse.emf.cdo.common.revision.CDORevisionFactory; import org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDelta; import org.eclipse.emf.cdo.common.util.TransportException; import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision; +import org.eclipse.emf.cdo.transaction.CDOTransaction; import org.eclipse.emf.cdo.util.InvalidObjectException; +import org.eclipse.emf.cdo.view.CDOView; import org.eclipse.emf.internal.cdo.bundle.OM; import org.eclipse.emf.internal.cdo.protocol.CDOClientProtocol; import org.eclipse.emf.internal.cdo.protocol.CommitTransactionResult; import org.eclipse.emf.internal.cdo.protocol.VerifyRevisionRequest; +import org.eclipse.emf.internal.cdo.session.CDORevisionManagerImpl; import org.eclipse.emf.internal.cdo.util.FSMUtil; import org.eclipse.net4j.util.collection.Pair; @@ -39,6 +40,9 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.EStoreEObjectImpl; import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.emf.spi.cdo.InternalCDOObject; +import org.eclipse.emf.spi.cdo.InternalCDOTransaction; +import org.eclipse.emf.spi.cdo.InternalCDOView; import java.util.ArrayList; import java.util.HashMap; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStore.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStore.java index 98afef0b97..c9733d552f 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStore.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStore.java @@ -14,7 +14,6 @@ **************************************************************************/ package org.eclipse.emf.internal.cdo; -import org.eclipse.emf.cdo.CDORevisionPrefetchingPolicy; import org.eclipse.emf.cdo.common.id.CDOID; import org.eclipse.emf.cdo.common.model.CDOFeature; import org.eclipse.emf.cdo.common.model.CDOType; @@ -31,9 +30,11 @@ import org.eclipse.emf.cdo.internal.common.revision.delta.CDORemoveFeatureDeltaI import org.eclipse.emf.cdo.internal.common.revision.delta.CDOSetFeatureDeltaImpl; import org.eclipse.emf.cdo.internal.common.revision.delta.CDOUnsetFeatureDeltaImpl; import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision; +import org.eclipse.emf.cdo.view.CDORevisionPrefetchingPolicy; import org.eclipse.emf.internal.cdo.bundle.OM; -import org.eclipse.emf.internal.cdo.revision.CDOElementProxy; +import org.eclipse.emf.internal.cdo.session.CDORevisionManagerImpl; +import org.eclipse.emf.internal.cdo.session.CDOSessionPackageManagerImpl; import org.eclipse.emf.internal.cdo.util.FSMUtil; import org.eclipse.net4j.util.ImplementationError; @@ -50,6 +51,9 @@ import org.eclipse.emf.ecore.impl.EStoreEObjectImpl; import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.ecore.util.FeatureMap; import org.eclipse.emf.ecore.util.FeatureMapUtil; +import org.eclipse.emf.spi.cdo.CDOElementProxy; +import org.eclipse.emf.spi.cdo.InternalCDOObject; +import org.eclipse.emf.spi.cdo.InternalCDOView; import java.text.MessageFormat; import java.util.Collection; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOTransactionStrategy.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOTransactionStrategy.java deleted file mode 100644 index 0bbc6aa52a..0000000000 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOTransactionStrategy.java +++ /dev/null @@ -1,34 +0,0 @@ -/*************************************************************************** - * Copyright (c) 2004 - 2008 Eike Stepper, Germany. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Simon McDuff - initial API and implementation - **************************************************************************/ -package org.eclipse.emf.internal.cdo; - -import org.eclipse.emf.cdo.CDOSavepoint; - -import org.eclipse.core.runtime.IProgressMonitor; - -/** - * @author Simon McDuff - * @since 2.0 - */ -public interface CDOTransactionStrategy -{ - public static final CDOTransactionStrategy DEFAULT = CDOSingleTransactionStrategy.INSTANCE; - - public void setTarget(InternalCDOTransaction transaction); - - public void unsetTarget(InternalCDOTransaction transaction); - - public void commit(InternalCDOTransaction transaction, IProgressMonitor progressMonitor) throws Exception; - - public void rollback(InternalCDOTransaction transaction, CDOSavepoint savepoint); - - public CDOSavepoint setSavepoint(InternalCDOTransaction transaction); -} diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOURIHandler.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOURIHandler.java index 725fd163bc..685c9b0bbf 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOURIHandler.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOURIHandler.java @@ -14,6 +14,7 @@ import org.eclipse.emf.cdo.eresource.CDOResourceInputStream; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.resource.URIHandler; +import org.eclipse.emf.spi.cdo.InternalCDOView; import java.io.IOException; import java.io.InputStream; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/InternalCDOCommitContext.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/InternalCDOCommitContext.java deleted file mode 100644 index 1b95625f49..0000000000 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/InternalCDOCommitContext.java +++ /dev/null @@ -1,31 +0,0 @@ -/*************************************************************************** - * Copyright (c) 2004 - 2008 Eike Stepper, Germany. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Simon McDuff - initial API and implementation - * Eike Stepper - maintenance - **************************************************************************/ -package org.eclipse.emf.internal.cdo; - -import org.eclipse.emf.cdo.CDOCommitContext; - -import org.eclipse.emf.internal.cdo.protocol.CommitTransactionResult; - -/** - * Provides a context for a commit operation. - * - * @author Simon McDuff - * @since 2.0 - */ -public interface InternalCDOCommitContext extends CDOCommitContext -{ - public InternalCDOTransaction getTransaction(); - - public void preCommit(); - - public void postCommit(CommitTransactionResult result); -} diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/InternalCDOLoadable.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/InternalCDOLoadable.java deleted file mode 100644 index bbefac9fe0..0000000000 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/InternalCDOLoadable.java +++ /dev/null @@ -1,20 +0,0 @@ -/*************************************************************************** - * Copyright (c) 2004 - 2008 Eike Stepper, Germany. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Simon McDuff - initial API and implementation - **************************************************************************/ -package org.eclipse.emf.internal.cdo; - -/** - * @author Simon McDuff - * @since 2.0 - */ -public interface InternalCDOLoadable -{ - public void cdoInternalPostLoad(); -} diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/InternalCDOObject.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/InternalCDOObject.java deleted file mode 100644 index f8f87552bb..0000000000 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/InternalCDOObject.java +++ /dev/null @@ -1,65 +0,0 @@ -/*************************************************************************** - * Copyright (c) 2004 - 2008 Eike Stepper, Germany. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Eike Stepper - initial API and implementation - **************************************************************************/ -package org.eclipse.emf.internal.cdo; - -import org.eclipse.emf.cdo.CDOObject; -import org.eclipse.emf.cdo.CDOState; -import org.eclipse.emf.cdo.CDOView; -import org.eclipse.emf.cdo.common.id.CDOID; -import org.eclipse.emf.cdo.common.revision.CDORevision; -import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision; - -import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.emf.ecore.InternalEObject; - -/** - * @author Eike Stepper - */ -public interface InternalCDOObject extends CDOObject, InternalEObject, InternalCDOLoadable -{ - /** - * @since 2.0 - */ - public InternalCDOView cdoView(); - - /** - * @since 2.0 - */ - public InternalCDORevision cdoRevision(); - - /** - * @since 2.0 - */ - public void cdoInternalCleanup(); - - public void cdoInternalPostAttach(); - - public void cdoInternalPostDetach(); - - /** - * @since 2.0 - */ - public void cdoInternalPostInvalid(); - - public void cdoInternalPreCommit(); - - public void cdoInternalSetID(CDOID id); - - public void cdoInternalSetView(CDOView view); - - public void cdoInternalSetRevision(CDORevision revision); - - public CDOState cdoInternalSetState(CDOState state); - - public InternalEObject cdoInternalInstance(); - - public EStructuralFeature cdoInternalDynamicFeature(int dynamicFeatureID); -} diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/InternalCDOSession.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/InternalCDOSession.java deleted file mode 100644 index 4749541a9f..0000000000 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/InternalCDOSession.java +++ /dev/null @@ -1,60 +0,0 @@ -/*************************************************************************** - * Copyright (c) 2004 - 2008 Eike Stepper, Germany. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Eike Stepper - initial API and implementation - **************************************************************************/ -package org.eclipse.emf.internal.cdo; - -import org.eclipse.emf.cdo.CDOSession; -import org.eclipse.emf.cdo.CDOSessionProtocol; -import org.eclipse.emf.cdo.common.id.CDOID; -import org.eclipse.emf.cdo.common.id.CDOIDAndVersion; -import org.eclipse.emf.cdo.common.id.CDOIDMetaRange; -import org.eclipse.emf.cdo.common.id.CDOIDObjectFactory; -import org.eclipse.emf.cdo.common.model.CDOPackageURICompressor; -import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta; -import org.eclipse.emf.cdo.util.CDOPackageRegistry; - -import org.eclipse.net4j.util.lifecycle.ILifecycle; - -import org.eclipse.emf.ecore.EPackage; -import org.eclipse.emf.ecore.InternalEObject; - -import java.util.Collection; -import java.util.Set; - -/** - * @author Eike Stepper - * @since 2.0 - */ -public interface InternalCDOSession extends CDOSession, CDOIDObjectFactory, CDOPackageURICompressor, - ILifecycle.Introspection -{ - public CDOSessionProtocol getProtocol(); - - public void setRepositoryName(String repositoryName); - - public void setPackageRegistry(CDOPackageRegistry packageRegistry); - - public void registerEPackage(EPackage ePackage, CDOIDMetaRange metaIDRange); - - public CDOIDMetaRange registerEPackage(EPackage ePackage); - - public InternalEObject lookupMetaInstance(CDOID id); - - public CDOID lookupMetaInstanceID(InternalEObject metaInstance); - - public void remapMetaInstance(CDOID oldID, CDOID newID); - - public void viewDetached(InternalCDOView view); - - public void handleCommitNotification(long timeStamp, Set<CDOIDAndVersion> dirtyOIDs, - Collection<CDOID> detachedObjects, Collection<CDORevisionDelta> deltas, InternalCDOView excludedView); - - public void handleSyncResponse(long timestamp, Set<CDOIDAndVersion> dirtyOIDs, Collection<CDOID> detachedObjects); -} diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/InternalCDOTransaction.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/InternalCDOTransaction.java deleted file mode 100644 index 8ca761af70..0000000000 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/InternalCDOTransaction.java +++ /dev/null @@ -1,60 +0,0 @@ -/*************************************************************************** - * Copyright (c) 2004 - 2008 Eike Stepper, Germany. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Simon McDuff - initial API and implementation - **************************************************************************/ -package org.eclipse.emf.internal.cdo; - -import org.eclipse.emf.cdo.CDOObject; -import org.eclipse.emf.cdo.CDOSavepoint; -import org.eclipse.emf.cdo.CDOTransaction; -import org.eclipse.emf.cdo.common.id.CDOIDTemp; -import org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDelta; -import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta; -import org.eclipse.emf.cdo.eresource.CDOResourceFolder; - -import java.util.List; -import java.util.Set; - -/** - * @author Simon McDuff - * @since 2.0 - */ -public interface InternalCDOTransaction extends CDOTransaction, InternalCDOView -{ - public InternalCDOCommitContext createCommitContext(); - - public void handleRollback(CDOSavepoint savepoint); - - public CDOSavepoint handleSetSavepoint(); - - public CDOTransactionStrategy getTransactionStrategy(); - - public void setTransactionStrategy(CDOTransactionStrategy transactionStrategy); - - /** - * @return never <code>null</code>; - */ - public CDOResourceFolder getOrCreateResourceFolder(List<String> names); - - public void detachObject(InternalCDOObject object); - - public CDOIDTemp getNextTemporaryID(); - - public void registerNew(InternalCDOObject object); - - public void registerDirty(InternalCDOObject object, CDOFeatureDelta featureDelta); - - public void registerFeatureDelta(InternalCDOObject object, CDOFeatureDelta featureDelta); - - public void registerRevisionDelta(CDORevisionDelta revisionDelta); - - public void setConflict(InternalCDOObject object); - - public void handleConflicts(Set<CDOObject> conflicts); -} diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/InternalCDOView.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/InternalCDOView.java deleted file mode 100644 index 57e357dd82..0000000000 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/InternalCDOView.java +++ /dev/null @@ -1,99 +0,0 @@ -/*************************************************************************** - * Copyright (c) 2004 - 2008 Eike Stepper, Germany. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Eike Stepper - initial API and implementation - **************************************************************************/ -package org.eclipse.emf.internal.cdo; - -import org.eclipse.emf.cdo.CDOFeatureAnalyzer; -import org.eclipse.emf.cdo.CDOObject; -import org.eclipse.emf.cdo.CDOView; -import org.eclipse.emf.cdo.common.id.CDOID; -import org.eclipse.emf.cdo.common.id.CDOIDAndVersion; -import org.eclipse.emf.cdo.common.id.CDOIDProvider; -import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta; -import org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl; -import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision; - -import org.eclipse.net4j.util.concurrent.RWLockManager; -import org.eclipse.net4j.util.lifecycle.ILifecycle; - -import org.eclipse.emf.common.notify.Adapter; -import org.eclipse.emf.ecore.EObject; - -import java.util.Collection; -import java.util.Set; - -/** - * @author Eike Stepper - * @since 2.0 - */ -public interface InternalCDOView extends CDOView, CDOIDProvider, ILifecycle.Introspection -{ - public void setViewID(int viewId); - - public InternalCDOSession getSession(); - - public void setSession(InternalCDOSession session); - - public InternalCDOViewSet getViewSet(); - - public void setViewSet(InternalCDOViewSet viewSet); - - public CDOFeatureAnalyzer getFeatureAnalyzer(); - - public void setFeatureAnalyzer(CDOFeatureAnalyzer featureAnalyzer); - - public CDOStore getStore(); - - public InternalCDOTransaction toTransaction(); - - public void attachResource(CDOResourceImpl resource); - - /** - * Returns the conflicting objects. - */ - public Set<CDOObject> handleInvalidation(long timeStamp, Set<CDOIDAndVersion> dirtyOIDs, - Collection<CDOID> detachedOIDs); - - public void handleChangeSubscription(Collection<CDORevisionDelta> deltas, Collection<CDOID> detachedObjects); - - public InternalCDOObject[] getObjectsArray(); - - public void remapObject(CDOID oldID); - - public CDOID getResourceID(String path); - - public void registerProxyResource(CDOResourceImpl resource); - - public void registerObject(InternalCDOObject object); - - public void deregisterObject(InternalCDOObject object); - - public InternalCDOObject removeObject(CDOID id); - - public InternalCDORevision getRevision(CDOID id, boolean loadOnDemand); - - public Object convertObjectToID(Object potentialObject); - - public Object convertObjectToID(Object potentialObject, boolean onlyPersistedID); - - public Object convertIDToObject(Object potentialID); - - public boolean isObjectLocked(CDOObject object, RWLockManager.LockType lockType); - - public void handleAddAdapter(InternalCDOObject eObject, Adapter adapter); - - public void handleRemoveAdapter(InternalCDOObject eObject, Adapter adapter); - - public void subscribe(EObject eObject, Adapter adapter); - - public void unsubscribe(EObject eObject, Adapter adapter); - - public boolean hasSubscription(CDOID id); -} diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/InternalCDOViewSet.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/InternalCDOViewSet.java deleted file mode 100644 index 9c945cb8c6..0000000000 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/InternalCDOViewSet.java +++ /dev/null @@ -1,28 +0,0 @@ -/*************************************************************************** - * Copyright (c) 2004 - 2008 Eike Stepper, Germany. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Eike Stepper - initial API and implementation - **************************************************************************/ -package org.eclipse.emf.internal.cdo; - -import org.eclipse.emf.cdo.CDOViewSet; - -import org.eclipse.emf.common.notify.Adapter; - -/** - * @author Eike Stepper - * @since 2.0 - */ -public interface InternalCDOViewSet extends CDOViewSet, Adapter -{ - public void add(InternalCDOView view); - - public void remove(InternalCDOView view); - - public InternalCDOView resolveView(String repositoryUUID); -} diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOAbstractFeatureRuleAnalyzer.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOAbstractFeatureRuleAnalyzer.java index 5c442318bd..83cf22f479 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOAbstractFeatureRuleAnalyzer.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOAbstractFeatureRuleAnalyzer.java @@ -11,11 +11,11 @@ **************************************************************************/ package org.eclipse.emf.internal.cdo.analyzer; -import org.eclipse.emf.cdo.CDOCollectionLoadingPolicy; -import org.eclipse.emf.cdo.CDOFeatureAnalyzer; -import org.eclipse.emf.cdo.CDOFetchRuleManager; import org.eclipse.emf.cdo.CDOObject; import org.eclipse.emf.cdo.common.model.CDOFeature; +import org.eclipse.emf.cdo.session.CDOCollectionLoadingPolicy; +import org.eclipse.emf.cdo.view.CDOFeatureAnalyzer; +import org.eclipse.emf.cdo.view.CDOFetchRuleManager; import org.eclipse.emf.internal.cdo.bundle.OM; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOFetchRuleManagerThreadLocal.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOFetchRuleManagerThreadLocal.java index 8129492508..5aeaa2e4d3 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOFetchRuleManagerThreadLocal.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOFetchRuleManagerThreadLocal.java @@ -11,10 +11,10 @@ **************************************************************************/ package org.eclipse.emf.internal.cdo.analyzer; -import org.eclipse.emf.cdo.CDOCollectionLoadingPolicy; -import org.eclipse.emf.cdo.CDOFetchRuleManager; import org.eclipse.emf.cdo.common.CDOFetchRule; import org.eclipse.emf.cdo.common.id.CDOID; +import org.eclipse.emf.cdo.session.CDOCollectionLoadingPolicy; +import org.eclipse.emf.cdo.view.CDOFetchRuleManager; import java.util.Collection; import java.util.List; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/NOOPFeatureAnalyzer.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/NOOPFeatureAnalyzer.java index 75bde9179a..d14e724596 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/NOOPFeatureAnalyzer.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/NOOPFeatureAnalyzer.java @@ -11,9 +11,9 @@ **************************************************************************/ package org.eclipse.emf.internal.cdo.analyzer; -import org.eclipse.emf.cdo.CDOFeatureAnalyzer; import org.eclipse.emf.cdo.CDOObject; import org.eclipse.emf.cdo.common.model.CDOFeature; +import org.eclipse.emf.cdo.view.CDOFeatureAnalyzer; /** * @author Simon McDuff diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/NOOPFetchRuleManager.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/NOOPFetchRuleManager.java index ff430f272c..44ae0b6561 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/NOOPFetchRuleManager.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/NOOPFetchRuleManager.java @@ -11,10 +11,10 @@ **************************************************************************/ package org.eclipse.emf.internal.cdo.analyzer; -import org.eclipse.emf.cdo.CDOCollectionLoadingPolicy; -import org.eclipse.emf.cdo.CDOFetchRuleManager; import org.eclipse.emf.cdo.common.CDOFetchRule; import org.eclipse.emf.cdo.common.id.CDOID; +import org.eclipse.emf.cdo.session.CDOCollectionLoadingPolicy; +import org.eclipse.emf.cdo.view.CDOFetchRuleManager; import java.util.Collection; import java.util.List; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/bundle/Activator.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/bundle/Activator.java index edab83414b..3f74db256a 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/bundle/Activator.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/bundle/Activator.java @@ -10,8 +10,8 @@ **************************************************************************/ package org.eclipse.emf.internal.cdo.bundle; -import org.eclipse.emf.internal.cdo.util.CDOPackageTypeRegistryImpl; -import org.eclipse.emf.internal.cdo.util.CDOViewProviderRegistryImpl; +import org.eclipse.emf.internal.cdo.session.CDOPackageTypeRegistryImpl; +import org.eclipse.emf.internal.cdo.view.CDOViewProviderRegistryImpl; import org.eclipse.net4j.util.om.OSGiActivator; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/bundle/OM.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/bundle/OM.java index e66e12d851..55c41af962 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/bundle/OM.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/bundle/OM.java @@ -10,8 +10,8 @@ **************************************************************************/ package org.eclipse.emf.internal.cdo.bundle; -import org.eclipse.emf.cdo.CDOView; import org.eclipse.emf.cdo.common.revision.CDORevision; +import org.eclipse.emf.cdo.view.CDOView; import org.eclipse.net4j.util.om.OMBundle; import org.eclipse.net4j.util.om.OMPlatform; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CDOClientIndication.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CDOClientIndication.java index 270fad2034..7482238de8 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CDOClientIndication.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CDOClientIndication.java @@ -11,8 +11,6 @@ **************************************************************************/ package org.eclipse.emf.internal.cdo.protocol; -import org.eclipse.emf.cdo.CDORevisionManager; -import org.eclipse.emf.cdo.CDOSessionPackageManager; import org.eclipse.emf.cdo.common.id.CDOIDObjectFactory; import org.eclipse.emf.cdo.common.io.CDODataInput; import org.eclipse.emf.cdo.common.model.CDOPackageManager; @@ -22,13 +20,16 @@ import org.eclipse.emf.cdo.common.revision.CDORevision; import org.eclipse.emf.cdo.common.revision.CDORevisionFactory; import org.eclipse.emf.cdo.common.revision.CDORevisionResolver; import org.eclipse.emf.cdo.internal.common.io.CDODataInputImpl; +import org.eclipse.emf.cdo.session.CDORevisionManager; +import org.eclipse.emf.cdo.session.CDOSessionPackageManager; -import org.eclipse.emf.internal.cdo.InternalCDOSession; import org.eclipse.emf.internal.cdo.revision.CDOListWithElementProxiesImpl; import org.eclipse.net4j.signal.Indication; import org.eclipse.net4j.util.io.ExtendedDataInputStream; +import org.eclipse.emf.spi.cdo.InternalCDOSession; + import java.io.IOException; /** 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 3eb492e090..99af108246 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,10 +10,10 @@ **************************************************************************/ package org.eclipse.emf.internal.cdo.protocol; -import org.eclipse.emf.cdo.CDOSession; -import org.eclipse.emf.cdo.CDOSessionProtocol; import org.eclipse.emf.cdo.common.protocol.CDOProtocolConstants; import org.eclipse.emf.cdo.internal.common.protocol.CDOProtocolImpl; +import org.eclipse.emf.cdo.session.CDOSession; +import org.eclipse.emf.cdo.session.CDOSessionProtocol; import org.eclipse.net4j.signal.SignalReactor; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CDOClientRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CDOClientRequest.java index b01e757301..b373182526 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CDOClientRequest.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CDOClientRequest.java @@ -11,8 +11,6 @@ **************************************************************************/ package org.eclipse.emf.internal.cdo.protocol; -import org.eclipse.emf.cdo.CDORevisionManager; -import org.eclipse.emf.cdo.CDOSessionPackageManager; import org.eclipse.emf.cdo.common.id.CDOIDObjectFactory; import org.eclipse.emf.cdo.common.id.CDOIDProvider; import org.eclipse.emf.cdo.common.io.CDODataInput; @@ -23,14 +21,17 @@ import org.eclipse.emf.cdo.common.revision.CDOListFactory; import org.eclipse.emf.cdo.common.revision.CDORevisionResolver; import org.eclipse.emf.cdo.internal.common.io.CDODataInputImpl; import org.eclipse.emf.cdo.internal.common.io.CDODataOutputImpl; +import org.eclipse.emf.cdo.session.CDORevisionManager; +import org.eclipse.emf.cdo.session.CDOSessionPackageManager; -import org.eclipse.emf.internal.cdo.InternalCDOSession; import org.eclipse.emf.internal.cdo.revision.CDOListWithElementProxiesImpl; import org.eclipse.net4j.signal.RequestWithConfirmation; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; +import org.eclipse.emf.spi.cdo.InternalCDOSession; + import java.io.IOException; /** diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ChannelInjector.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/ChannelInjector.java index 947e8e2b5f..d75b843cd7 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ChannelInjector.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/ChannelInjector.java @@ -8,9 +8,9 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.emf.internal.cdo.util; +package org.eclipse.emf.internal.cdo.protocol; -import org.eclipse.emf.cdo.CDOSession; +import org.eclipse.emf.cdo.session.CDOSession; import org.eclipse.net4j.connector.IConnector; import org.eclipse.net4j.signal.failover.NOOPFailOverStrategy; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitNotificationIndication.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitNotificationIndication.java index 81a3ee3c59..03aa819dca 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitNotificationIndication.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitNotificationIndication.java @@ -17,11 +17,12 @@ import org.eclipse.emf.cdo.common.io.CDODataInput; import org.eclipse.emf.cdo.common.protocol.CDOProtocolConstants; import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta; -import org.eclipse.emf.internal.cdo.InternalCDOSession; import org.eclipse.emf.internal.cdo.bundle.OM; import org.eclipse.net4j.util.om.trace.ContextTracer; +import org.eclipse.emf.spi.cdo.InternalCDOSession; + import java.io.IOException; import java.util.ArrayList; import java.util.HashSet; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitTransactionCancelRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitTransactionCancelRequest.java index a6f39a826c..00e5a87c3a 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitTransactionCancelRequest.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitTransactionCancelRequest.java @@ -10,12 +10,12 @@ **************************************************************************/ package org.eclipse.emf.internal.cdo.protocol; -import org.eclipse.emf.cdo.CDOTransaction; import org.eclipse.emf.cdo.common.io.CDODataInput; import org.eclipse.emf.cdo.common.io.CDODataOutput; import org.eclipse.emf.cdo.common.protocol.CDOProtocolConstants; +import org.eclipse.emf.cdo.transaction.CDOTransaction; -import org.eclipse.emf.internal.cdo.CDOXATransactionCommitContext; +import org.eclipse.emf.internal.cdo.transaction.CDOXATransactionCommitContext; import org.eclipse.net4j.util.om.monitor.OMMonitor; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitTransactionPhase1Request.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitTransactionPhase1Request.java index 7ff5e6de0b..a2eed7624d 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitTransactionPhase1Request.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitTransactionPhase1Request.java @@ -10,12 +10,12 @@ **************************************************************************/ package org.eclipse.emf.internal.cdo.protocol; -import org.eclipse.emf.cdo.CDOTransaction; import org.eclipse.emf.cdo.common.id.CDOIDProvider; import org.eclipse.emf.cdo.common.io.CDODataInput; import org.eclipse.emf.cdo.common.protocol.CDOProtocolConstants; +import org.eclipse.emf.cdo.transaction.CDOTransaction; -import org.eclipse.emf.internal.cdo.CDOXATransactionCommitContext; +import org.eclipse.emf.internal.cdo.transaction.CDOXATransactionCommitContext; import org.eclipse.net4j.util.om.monitor.OMMonitor; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitTransactionPhase2Request.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitTransactionPhase2Request.java index c27886d05a..5889ab1ab2 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitTransactionPhase2Request.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitTransactionPhase2Request.java @@ -18,14 +18,14 @@ import org.eclipse.emf.cdo.common.protocol.CDOProtocolConstants; import org.eclipse.emf.cdo.internal.common.id.CDOIDExternalTempImpl; import org.eclipse.emf.cdo.util.CDOURIUtil; -import org.eclipse.emf.internal.cdo.CDOXATransactionCommitContext; -import org.eclipse.emf.internal.cdo.InternalCDOTransaction; import org.eclipse.emf.internal.cdo.bundle.OM; +import org.eclipse.emf.internal.cdo.transaction.CDOXATransactionCommitContext; import org.eclipse.net4j.util.om.monitor.OMMonitor; import org.eclipse.net4j.util.om.trace.ContextTracer; import org.eclipse.emf.common.util.URI; +import org.eclipse.emf.spi.cdo.InternalCDOTransaction; import java.io.IOException; import java.util.Map; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitTransactionPhase3Request.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitTransactionPhase3Request.java index 3ee6fdb145..cf8b4a33a9 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitTransactionPhase3Request.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitTransactionPhase3Request.java @@ -10,12 +10,12 @@ **************************************************************************/ package org.eclipse.emf.internal.cdo.protocol; -import org.eclipse.emf.cdo.CDOTransaction; import org.eclipse.emf.cdo.common.io.CDODataInput; import org.eclipse.emf.cdo.common.io.CDODataOutput; import org.eclipse.emf.cdo.common.protocol.CDOProtocolConstants; +import org.eclipse.emf.cdo.transaction.CDOTransaction; -import org.eclipse.emf.internal.cdo.CDOXATransactionCommitContext; +import org.eclipse.emf.internal.cdo.transaction.CDOXATransactionCommitContext; import org.eclipse.net4j.util.om.monitor.OMMonitor; 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 254884e980..a01cc81c09 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 @@ -14,8 +14,6 @@ package org.eclipse.emf.internal.cdo.protocol; import org.eclipse.emf.cdo.CDOObject; -import org.eclipse.emf.cdo.CDORevisionManager; -import org.eclipse.emf.cdo.CDOSessionPackageManager; import org.eclipse.emf.cdo.common.id.CDOID; import org.eclipse.emf.cdo.common.id.CDOIDMetaRange; import org.eclipse.emf.cdo.common.id.CDOIDObjectFactory; @@ -35,10 +33,10 @@ import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta; import org.eclipse.emf.cdo.eresource.CDOResource; import org.eclipse.emf.cdo.internal.common.io.CDODataInputImpl; import org.eclipse.emf.cdo.internal.common.io.CDODataOutputImpl; +import org.eclipse.emf.cdo.session.CDORevisionManager; +import org.eclipse.emf.cdo.session.CDOSessionPackageManager; import org.eclipse.emf.cdo.spi.common.model.InternalCDOPackage; -import org.eclipse.emf.internal.cdo.InternalCDOCommitContext; -import org.eclipse.emf.internal.cdo.InternalCDOSession; import org.eclipse.emf.internal.cdo.bundle.OM; import org.eclipse.emf.internal.cdo.revision.CDOListWithElementProxiesImpl; @@ -48,6 +46,9 @@ import org.eclipse.net4j.util.io.ExtendedDataOutputStream; import org.eclipse.net4j.util.om.monitor.OMMonitor; import org.eclipse.net4j.util.om.trace.ContextTracer; +import org.eclipse.emf.spi.cdo.InternalCDOCommitContext; +import org.eclipse.emf.spi.cdo.InternalCDOSession; + import java.io.IOException; import java.util.Collection; import java.util.Iterator; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitTransactionResult.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitTransactionResult.java index a6e61d1a67..0aed64edb5 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitTransactionResult.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitTransactionResult.java @@ -15,9 +15,10 @@ import org.eclipse.emf.cdo.common.id.CDOIDTemp; import org.eclipse.emf.cdo.common.revision.CDOReferenceAdjuster; import org.eclipse.emf.cdo.internal.common.revision.CDOIDMapper; -import org.eclipse.emf.internal.cdo.InternalCDOCommitContext; import org.eclipse.emf.internal.cdo.revision.CDOPostCommitReferenceAdjuster; +import org.eclipse.emf.spi.cdo.InternalCDOCommitContext; + import java.util.HashMap; import java.util.Map; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadRevisionRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadRevisionRequest.java index a6f1ec3530..c1e9d0a5dc 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadRevisionRequest.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadRevisionRequest.java @@ -10,16 +10,16 @@ **************************************************************************/ package org.eclipse.emf.internal.cdo.protocol; -import org.eclipse.emf.cdo.CDOFetchRuleManager; import org.eclipse.emf.cdo.common.CDOFetchRule; import org.eclipse.emf.cdo.common.id.CDOID; import org.eclipse.emf.cdo.common.io.CDODataInput; import org.eclipse.emf.cdo.common.io.CDODataOutput; import org.eclipse.emf.cdo.common.protocol.CDOProtocolConstants; import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision; +import org.eclipse.emf.cdo.view.CDOFetchRuleManager; -import org.eclipse.emf.internal.cdo.CDORevisionManagerImpl; import org.eclipse.emf.internal.cdo.bundle.OM; +import org.eclipse.emf.internal.cdo.session.CDORevisionManagerImpl; import org.eclipse.net4j.util.om.trace.ContextTracer; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LockObjectsRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LockObjectsRequest.java index 91e200dfb0..5c7fc08972 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LockObjectsRequest.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LockObjectsRequest.java @@ -11,10 +11,10 @@ package org.eclipse.emf.internal.cdo.protocol; import org.eclipse.emf.cdo.CDOObject; -import org.eclipse.emf.cdo.CDOView; import org.eclipse.emf.cdo.common.io.CDODataInput; import org.eclipse.emf.cdo.common.io.CDODataOutput; import org.eclipse.emf.cdo.common.protocol.CDOProtocolConstants; +import org.eclipse.emf.cdo.view.CDOView; import org.eclipse.emf.internal.cdo.bundle.OM; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/ObjectLockedRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/ObjectLockedRequest.java index c50ef88da1..71e2d92d1b 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/ObjectLockedRequest.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/ObjectLockedRequest.java @@ -11,10 +11,10 @@ package org.eclipse.emf.internal.cdo.protocol; import org.eclipse.emf.cdo.CDOObject; -import org.eclipse.emf.cdo.CDOView; import org.eclipse.emf.cdo.common.io.CDODataInput; import org.eclipse.emf.cdo.common.io.CDODataOutput; import org.eclipse.emf.cdo.common.protocol.CDOProtocolConstants; +import org.eclipse.emf.cdo.view.CDOView; import org.eclipse.emf.internal.cdo.bundle.OM; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/OpenSessionRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/OpenSessionRequest.java index 09b1db2bb5..861a66f1b0 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/OpenSessionRequest.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/OpenSessionRequest.java @@ -21,13 +21,14 @@ import org.eclipse.emf.cdo.common.model.CDOPackageURICompressor; import org.eclipse.emf.cdo.common.protocol.CDOProtocolConstants; import org.eclipse.emf.cdo.util.ServerException; -import org.eclipse.emf.internal.cdo.CDORevisionManagerImpl; -import org.eclipse.emf.internal.cdo.CDOSessionPackageManagerImpl; -import org.eclipse.emf.internal.cdo.InternalCDOSession; import org.eclipse.emf.internal.cdo.bundle.OM; +import org.eclipse.emf.internal.cdo.session.CDORevisionManagerImpl; +import org.eclipse.emf.internal.cdo.session.CDOSessionPackageManagerImpl; import org.eclipse.net4j.util.om.trace.ContextTracer; +import org.eclipse.emf.spi.cdo.InternalCDOSession; + import java.io.IOException; import java.text.MessageFormat; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/SetAuditRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/SetAuditRequest.java index 60a7909974..1ed6d8a824 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/SetAuditRequest.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/SetAuditRequest.java @@ -14,11 +14,12 @@ import org.eclipse.emf.cdo.common.io.CDODataInput; import org.eclipse.emf.cdo.common.io.CDODataOutput; import org.eclipse.emf.cdo.common.protocol.CDOProtocolConstants; -import org.eclipse.emf.internal.cdo.InternalCDOObject; import org.eclipse.emf.internal.cdo.bundle.OM; import org.eclipse.net4j.util.om.trace.ContextTracer; +import org.eclipse.emf.spi.cdo.InternalCDOObject; + import java.io.IOException; import java.util.List; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/SetPassiveUpdateRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/SetPassiveUpdateRequest.java index 4655809076..4ac7c1f886 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/SetPassiveUpdateRequest.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/SetPassiveUpdateRequest.java @@ -16,11 +16,12 @@ import org.eclipse.emf.cdo.common.io.CDODataOutput; import org.eclipse.emf.cdo.common.protocol.CDOProtocolConstants; import org.eclipse.emf.cdo.common.revision.CDORevision; -import org.eclipse.emf.internal.cdo.InternalCDOSession; import org.eclipse.emf.internal.cdo.bundle.OM; import org.eclipse.net4j.util.om.trace.ContextTracer; +import org.eclipse.emf.spi.cdo.InternalCDOSession; + import java.io.IOException; import java.util.Map; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/SyncRevisionRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/SyncRevisionRequest.java index ca0d121e6a..f61e6acf7a 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/SyncRevisionRequest.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/SyncRevisionRequest.java @@ -11,7 +11,6 @@ **************************************************************************/ package org.eclipse.emf.internal.cdo.protocol; -import org.eclipse.emf.cdo.CDOTimeStampContext; import org.eclipse.emf.cdo.common.id.CDOID; import org.eclipse.emf.cdo.common.id.CDOIDAndVersion; import org.eclipse.emf.cdo.common.id.CDOIDUtil; @@ -20,14 +19,16 @@ import org.eclipse.emf.cdo.common.io.CDODataOutput; import org.eclipse.emf.cdo.common.protocol.CDOProtocolConstants; import org.eclipse.emf.cdo.common.revision.CDORevision; import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision; +import org.eclipse.emf.cdo.transaction.CDOTimeStampContext; -import org.eclipse.emf.internal.cdo.CDORevisionManagerImpl; -import org.eclipse.emf.internal.cdo.CDOTimeStampContextImpl; -import org.eclipse.emf.internal.cdo.InternalCDOSession; import org.eclipse.emf.internal.cdo.bundle.OM; +import org.eclipse.emf.internal.cdo.session.CDORevisionManagerImpl; +import org.eclipse.emf.internal.cdo.transaction.CDOTimeStampContextImpl; import org.eclipse.net4j.util.om.trace.ContextTracer; +import org.eclipse.emf.spi.cdo.InternalCDOSession; + import java.io.IOException; import java.util.Collection; import java.util.Collections; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/UnlockObjectsRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/UnlockObjectsRequest.java index 6e23296752..5a73164159 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/UnlockObjectsRequest.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/UnlockObjectsRequest.java @@ -11,10 +11,10 @@ package org.eclipse.emf.internal.cdo.protocol; import org.eclipse.emf.cdo.CDOObject; -import org.eclipse.emf.cdo.CDOView; import org.eclipse.emf.cdo.common.io.CDODataInput; import org.eclipse.emf.cdo.common.io.CDODataOutput; import org.eclipse.emf.cdo.common.protocol.CDOProtocolConstants; +import org.eclipse.emf.cdo.view.CDOView; import org.eclipse.emf.internal.cdo.bundle.OM; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/query/CDOAbstractQueryIteratorImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/query/CDOAbstractQueryIteratorImpl.java index df36633946..066c926209 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/query/CDOAbstractQueryIteratorImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/query/CDOAbstractQueryIteratorImpl.java @@ -10,16 +10,17 @@ **************************************************************************/ package org.eclipse.emf.internal.cdo.query; -import org.eclipse.emf.cdo.CDOView; import org.eclipse.emf.cdo.common.CDOQueryInfo; import org.eclipse.emf.cdo.spi.common.AbstractQueryResult; +import org.eclipse.emf.cdo.view.CDOView; -import org.eclipse.emf.internal.cdo.InternalCDOSession; import org.eclipse.emf.internal.cdo.protocol.CDOClientProtocol; import org.eclipse.emf.internal.cdo.protocol.QueryCancelRequest; import org.eclipse.net4j.util.concurrent.ConcurrentValue; +import org.eclipse.emf.spi.cdo.InternalCDOSession; + import java.util.List; /** diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/query/CDOEList.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/query/CDOEList.java index cdaa2f1cf5..c478dee529 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/query/CDOEList.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/query/CDOEList.java @@ -11,9 +11,9 @@ **************************************************************************/ package org.eclipse.emf.internal.cdo.query; -import org.eclipse.emf.cdo.CDOView; import org.eclipse.emf.cdo.common.id.CDOID; import org.eclipse.emf.cdo.common.id.CDOIDUtil; +import org.eclipse.emf.cdo.view.CDOView; import org.eclipse.emf.common.util.EList; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/query/CDOQueryCDOIDIteratorImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/query/CDOQueryCDOIDIteratorImpl.java index e0d265946f..e305c5ae19 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/query/CDOQueryCDOIDIteratorImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/query/CDOQueryCDOIDIteratorImpl.java @@ -10,8 +10,8 @@ **************************************************************************/ package org.eclipse.emf.internal.cdo.query; -import org.eclipse.emf.cdo.CDOView; import org.eclipse.emf.cdo.common.CDOQueryInfo; +import org.eclipse.emf.cdo.view.CDOView; import java.util.ArrayList; import java.util.List; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/query/CDOQueryImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/query/CDOQueryImpl.java index 580ae5395e..9ae66eb014 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/query/CDOQueryImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/query/CDOQueryImpl.java @@ -11,22 +11,22 @@ **************************************************************************/ package org.eclipse.emf.internal.cdo.query; -import org.eclipse.emf.cdo.CDOQuery; import org.eclipse.emf.cdo.common.id.CDOID; import org.eclipse.emf.cdo.common.util.BlockingCloseableIterator; import org.eclipse.emf.cdo.internal.common.CDOQueryInfoImpl; +import org.eclipse.emf.cdo.view.CDOQuery; -import org.eclipse.emf.internal.cdo.CDOSessionPackageManagerImpl; -import org.eclipse.emf.internal.cdo.InternalCDOObject; -import org.eclipse.emf.internal.cdo.InternalCDOView; import org.eclipse.emf.internal.cdo.protocol.CDOClientProtocol; import org.eclipse.emf.internal.cdo.protocol.QueryRequest; +import org.eclipse.emf.internal.cdo.session.CDOSessionPackageManagerImpl; import org.eclipse.emf.internal.cdo.util.FSMUtil; import org.eclipse.emf.internal.cdo.util.ModelUtil; import org.eclipse.net4j.util.WrappedException; import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.spi.cdo.InternalCDOObject; +import org.eclipse.emf.spi.cdo.InternalCDOView; import java.util.List; import java.util.Map.Entry; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/query/CDOQueryResultIteratorImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/query/CDOQueryResultIteratorImpl.java index 0f84f25f24..5fff69f0cb 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/query/CDOQueryResultIteratorImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/query/CDOQueryResultIteratorImpl.java @@ -11,9 +11,9 @@ **************************************************************************/ package org.eclipse.emf.internal.cdo.query; -import org.eclipse.emf.cdo.CDOView; import org.eclipse.emf.cdo.common.CDOQueryInfo; import org.eclipse.emf.cdo.common.id.CDOID; +import org.eclipse.emf.cdo.view.CDOView; import java.util.ArrayList; import java.util.List; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/revision/CDOElementProxy.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/revision/CDOElementProxy.java deleted file mode 100644 index ae3a50f428..0000000000 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/revision/CDOElementProxy.java +++ /dev/null @@ -1,31 +0,0 @@ -/*************************************************************************** - * Copyright (c) 2004 - 2008 Eike Stepper, Germany. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Eike Stepper - initial API and implementation - * Simon McDuff - maintenance - **************************************************************************/ -package org.eclipse.emf.internal.cdo.revision; - -import org.eclipse.emf.cdo.CDORevisionManager; -import org.eclipse.emf.cdo.common.model.CDOFeature; -import org.eclipse.emf.cdo.common.revision.CDORevision; - -/** - * @author Eike Stepper - * @noimplement This interface is not intended to be implemented by clients. - */ -public interface CDOElementProxy -{ - public int getIndex(); - - /** - * @since 2.0 - */ - 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/CDOElementProxyImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/revision/CDOElementProxyImpl.java index 187a0d6715..6bdf93ec4e 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/revision/CDOElementProxyImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/revision/CDOElementProxyImpl.java @@ -11,11 +11,13 @@ **************************************************************************/ package org.eclipse.emf.internal.cdo.revision; -import org.eclipse.emf.cdo.CDORevisionManager; import org.eclipse.emf.cdo.common.model.CDOFeature; import org.eclipse.emf.cdo.common.revision.CDORevision; +import org.eclipse.emf.cdo.session.CDORevisionManager; -import org.eclipse.emf.internal.cdo.CDORevisionManagerImpl; +import org.eclipse.emf.internal.cdo.session.CDORevisionManagerImpl; + +import org.eclipse.emf.spi.cdo.CDOElementProxy; import java.text.MessageFormat; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/revision/CDOListWithElementProxiesImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/revision/CDOListWithElementProxiesImpl.java index 36867fed7f..486495bc78 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/revision/CDOListWithElementProxiesImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/revision/CDOListWithElementProxiesImpl.java @@ -17,6 +17,8 @@ import org.eclipse.emf.cdo.internal.common.revision.CDOListImpl; import org.eclipse.emf.cdo.spi.common.revision.InternalCDOList; import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision; +import org.eclipse.emf.spi.cdo.CDOElementProxy; + /** * @author Simon McDuff */ diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOCollectionLoadingPolicyImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOCollectionLoadingPolicyImpl.java index 26beb66ebf..c519aa839a 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOCollectionLoadingPolicyImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOCollectionLoadingPolicyImpl.java @@ -8,18 +8,18 @@ * Contributors: * Simon McDuff - initial API and implementation **************************************************************************/ -package org.eclipse.emf.internal.cdo; +package org.eclipse.emf.internal.cdo.session; -import org.eclipse.emf.cdo.CDOCollectionLoadingPolicy; -import org.eclipse.emf.cdo.CDORevisionManager; import org.eclipse.emf.cdo.common.model.CDOFeature; import org.eclipse.emf.cdo.common.revision.CDORevision; +import org.eclipse.emf.cdo.session.CDOCollectionLoadingPolicy; +import org.eclipse.emf.cdo.session.CDORevisionManager; import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision; -import org.eclipse.emf.internal.cdo.revision.CDOElementProxy; - import org.eclipse.net4j.util.collection.MoveableList; +import org.eclipse.emf.spi.cdo.CDOElementProxy; + /** * @author Simon McDuff * @since 2.0 diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CDOPackageRegistryImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOPackageRegistryImpl.java index 6047687e4e..39f4d78f90 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CDOPackageRegistryImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOPackageRegistryImpl.java @@ -9,26 +9,25 @@ * Eike Stepper - initial API and implementation * Eike Stepper - maintenance **************************************************************************/ -package org.eclipse.emf.internal.cdo.util; +package org.eclipse.emf.internal.cdo.session; -import org.eclipse.emf.cdo.CDOCommitContext; import org.eclipse.emf.cdo.CDOObject; -import org.eclipse.emf.cdo.CDOSession; -import org.eclipse.emf.cdo.CDOTransaction; -import org.eclipse.emf.cdo.CDOTransactionHandler; -import org.eclipse.emf.cdo.CDOView; import org.eclipse.emf.cdo.common.id.CDOIDMetaRange; import org.eclipse.emf.cdo.common.model.CDOPackage; import org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDelta; +import org.eclipse.emf.cdo.session.CDOPackageRegistry; +import org.eclipse.emf.cdo.session.CDOPackageType; +import org.eclipse.emf.cdo.session.CDOPackageTypeRegistry; +import org.eclipse.emf.cdo.session.CDOSession; import org.eclipse.emf.cdo.spi.common.model.InternalCDOPackage; -import org.eclipse.emf.cdo.util.CDOPackageRegistry; -import org.eclipse.emf.cdo.util.CDOPackageType; -import org.eclipse.emf.cdo.util.CDOPackageTypeRegistry; +import org.eclipse.emf.cdo.transaction.CDOCommitContext; +import org.eclipse.emf.cdo.transaction.CDOTransaction; +import org.eclipse.emf.cdo.transaction.CDOTransactionHandler; import org.eclipse.emf.cdo.util.EMFUtil; +import org.eclipse.emf.cdo.view.CDOView; -import org.eclipse.emf.internal.cdo.CDOSessionPackageManagerImpl; -import org.eclipse.emf.internal.cdo.InternalCDOSession; import org.eclipse.emf.internal.cdo.bundle.OM; +import org.eclipse.emf.internal.cdo.util.ModelUtil; import org.eclipse.net4j.util.container.ContainerEventAdapter; import org.eclipse.net4j.util.container.IContainer; @@ -42,6 +41,7 @@ import org.eclipse.emf.ecore.EFactory; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EReference; import org.eclipse.emf.ecore.impl.EPackageRegistryImpl; +import org.eclipse.emf.spi.cdo.InternalCDOSession; import java.text.MessageFormat; import java.util.ArrayList; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CDOPackageTypeRegistryImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOPackageTypeRegistryImpl.java index dd2629cad2..912754d479 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CDOPackageTypeRegistryImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOPackageTypeRegistryImpl.java @@ -8,15 +8,16 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.emf.internal.cdo.util; +package org.eclipse.emf.internal.cdo.session; import org.eclipse.emf.cdo.CDOObject; import org.eclipse.emf.cdo.eresource.EresourcePackage; +import org.eclipse.emf.cdo.session.CDOPackageType; +import org.eclipse.emf.cdo.session.CDOPackageTypeRegistry; import org.eclipse.emf.cdo.util.CDOFactory; -import org.eclipse.emf.cdo.util.CDOPackageType; -import org.eclipse.emf.cdo.util.CDOPackageTypeRegistry; import org.eclipse.emf.internal.cdo.bundle.OM; +import org.eclipse.emf.internal.cdo.util.ModelUtil; import org.eclipse.net4j.util.StringUtil; import org.eclipse.net4j.util.om.OMPlatform; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDORevisionManagerImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDORevisionManagerImpl.java index a63672b057..c08aba02ca 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDORevisionManagerImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDORevisionManagerImpl.java @@ -9,10 +9,8 @@ * Eike Stepper - initial API and implementation * Simon McDuff - maintenance **************************************************************************/ -package org.eclipse.emf.internal.cdo; +package org.eclipse.emf.internal.cdo.session; -import org.eclipse.emf.cdo.CDOFetchRuleManager; -import org.eclipse.emf.cdo.CDORevisionManager; import org.eclipse.emf.cdo.common.id.CDOID; import org.eclipse.emf.cdo.common.id.CDOIDObjectFactory; import org.eclipse.emf.cdo.common.model.CDOFeature; @@ -20,7 +18,9 @@ import org.eclipse.emf.cdo.common.model.CDOPackageManager; import org.eclipse.emf.cdo.common.revision.CDORevision; import org.eclipse.emf.cdo.common.util.TransportException; import org.eclipse.emf.cdo.internal.common.revision.CDORevisionResolverImpl; +import org.eclipse.emf.cdo.session.CDORevisionManager; import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision; +import org.eclipse.emf.cdo.view.CDOFetchRuleManager; import org.eclipse.emf.internal.cdo.bundle.OM; import org.eclipse.emf.internal.cdo.protocol.CDOClientProtocol; @@ -31,6 +31,8 @@ import org.eclipse.emf.internal.cdo.protocol.LoadRevisionRequest; import org.eclipse.net4j.util.om.trace.PerfTracer; +import org.eclipse.emf.spi.cdo.InternalCDOSession; + import java.util.Collection; import java.util.Collections; import java.util.List; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionConfigurationImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionConfigurationImpl.java index d146a48bbf..714f1db1b0 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionConfigurationImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionConfigurationImpl.java @@ -8,20 +8,20 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.emf.internal.cdo; +package org.eclipse.emf.internal.cdo.session; -import org.eclipse.emf.cdo.CDOSessionConfiguration; import org.eclipse.emf.cdo.common.revision.cache.CDORevisionCache; -import org.eclipse.emf.cdo.util.CDOPackageRegistry; +import org.eclipse.emf.cdo.session.CDOPackageRegistry; +import org.eclipse.emf.cdo.session.CDOSessionConfiguration; import org.eclipse.emf.cdo.util.CDOUtil; -import org.eclipse.emf.internal.cdo.util.SessionUtil; - import org.eclipse.net4j.connector.IConnector; import org.eclipse.net4j.signal.failover.IFailOverStrategy; import org.eclipse.net4j.signal.failover.NOOPFailOverStrategy; import org.eclipse.net4j.util.CheckUtil; +import org.eclipse.emf.spi.cdo.InternalCDOSession; + /** * @author Eike Stepper */ diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionFactory.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionFactory.java index 726d35f45f..ebbbb9fc31 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionFactory.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionFactory.java @@ -8,18 +8,17 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.emf.internal.cdo; +package org.eclipse.emf.internal.cdo.session; -import org.eclipse.emf.cdo.CDOSession; - -import org.eclipse.emf.internal.cdo.util.CDOPackageRegistryImpl; -import org.eclipse.emf.internal.cdo.util.SessionUtil; +import org.eclipse.emf.cdo.session.CDOSession; import org.eclipse.net4j.signal.failover.IFailOverStrategy; import org.eclipse.net4j.util.StringUtil; import org.eclipse.net4j.util.container.IManagedContainer; import org.eclipse.net4j.util.factory.Factory; +import org.eclipse.emf.spi.cdo.InternalCDOSession; + import java.net.URI; import java.net.URISyntaxException; import java.util.HashMap; 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/session/CDOSessionImpl.java index 38909fcd72..3fb781b7de 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/session/CDOSessionImpl.java @@ -13,15 +13,9 @@ * Simon McDuff - http://bugs.eclipse.org/213402 * Victor Roldan Betancort - maintenance **************************************************************************/ -package org.eclipse.emf.internal.cdo; +package org.eclipse.emf.internal.cdo.session; -import org.eclipse.emf.cdo.CDOCollectionLoadingPolicy; import org.eclipse.emf.cdo.CDOObject; -import org.eclipse.emf.cdo.CDOSession; -import org.eclipse.emf.cdo.CDOSessionInvalidationEvent; -import org.eclipse.emf.cdo.CDOTimeStampContext; -import org.eclipse.emf.cdo.CDOView; -import org.eclipse.emf.cdo.CDOSession.Repository; import org.eclipse.emf.cdo.common.id.CDOID; import org.eclipse.emf.cdo.common.id.CDOIDAndVersion; import org.eclipse.emf.cdo.common.id.CDOIDLibraryDescriptor; @@ -38,9 +32,15 @@ import org.eclipse.emf.cdo.common.revision.CDORevision; import org.eclipse.emf.cdo.common.revision.CDORevisionFactory; import org.eclipse.emf.cdo.common.revision.CDORevisionUtil; import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta; +import org.eclipse.emf.cdo.session.CDOCollectionLoadingPolicy; +import org.eclipse.emf.cdo.session.CDOPackageRegistry; +import org.eclipse.emf.cdo.session.CDOSession; +import org.eclipse.emf.cdo.session.CDOSessionInvalidationEvent; +import org.eclipse.emf.cdo.session.CDOSession.Repository; import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision; -import org.eclipse.emf.cdo.util.CDOPackageRegistry; +import org.eclipse.emf.cdo.transaction.CDOTimeStampContext; import org.eclipse.emf.cdo.util.CDOUtil; +import org.eclipse.emf.cdo.view.CDOView; import org.eclipse.emf.internal.cdo.bundle.OM; import org.eclipse.emf.internal.cdo.protocol.CDOClientProtocol; @@ -51,9 +51,10 @@ import org.eclipse.emf.internal.cdo.protocol.RepositoryTimeRequest; import org.eclipse.emf.internal.cdo.protocol.RepositoryTimeResult; import org.eclipse.emf.internal.cdo.protocol.SetPassiveUpdateRequest; import org.eclipse.emf.internal.cdo.protocol.SyncRevisionRequest; -import org.eclipse.emf.internal.cdo.util.CDOPackageRegistryImpl; +import org.eclipse.emf.internal.cdo.transaction.CDOTransactionImpl; import org.eclipse.emf.internal.cdo.util.ModelUtil; -import org.eclipse.emf.internal.cdo.util.SessionUtil; +import org.eclipse.emf.internal.cdo.view.CDOAuditImpl; +import org.eclipse.emf.internal.cdo.view.CDOViewImpl; import org.eclipse.net4j.channel.IChannel; import org.eclipse.net4j.util.WrappedException; @@ -80,6 +81,11 @@ import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; +import org.eclipse.emf.spi.cdo.InternalCDOObject; +import org.eclipse.emf.spi.cdo.InternalCDOSession; +import org.eclipse.emf.spi.cdo.InternalCDOTransaction; +import org.eclipse.emf.spi.cdo.InternalCDOView; +import org.eclipse.emf.spi.cdo.InternalCDOViewSet; import java.io.File; import java.io.IOException; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionPackageManagerImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionPackageManagerImpl.java index a3e7693e1c..183a989673 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionPackageManagerImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionPackageManagerImpl.java @@ -9,9 +9,8 @@ * Eike Stepper - initial API and implementation * Simon McDuff - maintenance **************************************************************************/ -package org.eclipse.emf.internal.cdo; +package org.eclipse.emf.internal.cdo.session; -import org.eclipse.emf.cdo.CDOSessionPackageManager; import org.eclipse.emf.cdo.common.id.CDOIDMetaRange; import org.eclipse.emf.cdo.common.id.CDOIDObjectFactory; import org.eclipse.emf.cdo.common.model.CDOClass; @@ -21,6 +20,7 @@ import org.eclipse.emf.cdo.common.model.CDOPackage; import org.eclipse.emf.cdo.common.model.CDOPackageInfo; import org.eclipse.emf.cdo.common.util.TransportException; import org.eclipse.emf.cdo.internal.common.model.CDOPackageManagerImpl; +import org.eclipse.emf.cdo.session.CDOSessionPackageManager; import org.eclipse.emf.cdo.spi.common.model.InternalCDOPackage; import org.eclipse.emf.internal.cdo.bundle.OM; @@ -31,6 +31,7 @@ import org.eclipse.emf.internal.cdo.util.ModelUtil; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EStructuralFeature; +import org.eclipse.emf.spi.cdo.InternalCDOSession; import java.util.Collection; import java.util.Map; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/SessionUtil.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/SessionUtil.java index a29ebd08ac..923da7a032 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/SessionUtil.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/SessionUtil.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.emf.internal.cdo.util; +package org.eclipse.emf.internal.cdo.session; import org.eclipse.emf.cdo.common.id.CDOID; import org.eclipse.emf.cdo.common.id.CDOIDMetaRange; @@ -16,10 +16,8 @@ import org.eclipse.emf.cdo.common.id.CDOIDTemp; import org.eclipse.emf.cdo.common.id.CDOIDUtil; import org.eclipse.emf.cdo.util.CDOUtil; -import org.eclipse.emf.internal.cdo.CDOSessionImpl; -import org.eclipse.emf.internal.cdo.CDOViewSetImpl; -import org.eclipse.emf.internal.cdo.InternalCDOViewSet; import org.eclipse.emf.internal.cdo.bundle.OM; +import org.eclipse.emf.internal.cdo.view.CDOViewSetImpl; import org.eclipse.net4j.util.om.trace.ContextTracer; @@ -27,6 +25,7 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.resource.ResourceSet; +import org.eclipse.emf.spi.cdo.InternalCDOViewSet; import java.util.Map; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOAbstractSavepoint.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOAbstractSavepoint.java index 0988d484e7..da1bb7e5c3 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOAbstractSavepoint.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOAbstractSavepoint.java @@ -9,10 +9,10 @@ * Simon McDuff - initial API and implementation * Eike Stepper - maintenance **************************************************************************/ -package org.eclipse.emf.internal.cdo; +package org.eclipse.emf.internal.cdo.transaction; -import org.eclipse.emf.cdo.CDOSavepoint; -import org.eclipse.emf.cdo.CDOUserTransaction; +import org.eclipse.emf.cdo.transaction.CDOSavepoint; +import org.eclipse.emf.cdo.transaction.CDOUserTransaction; /** * @author Simon McDuff diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSavepointImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOSavepointImpl.java index b7143ce57c..f1edf03e9f 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSavepointImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOSavepointImpl.java @@ -10,7 +10,7 @@ * Eike Stepper - maintenance * Simon McDuff - http://bugs.eclipse.org/204890 **************************************************************************/ -package org.eclipse.emf.internal.cdo; +package org.eclipse.emf.internal.cdo.transaction; import org.eclipse.emf.cdo.CDOObject; import org.eclipse.emf.cdo.common.id.CDOID; @@ -24,6 +24,8 @@ import org.eclipse.emf.cdo.internal.common.revision.delta.InternalCDOFeatureDelt import org.eclipse.net4j.util.collection.MultiMap; +import org.eclipse.emf.spi.cdo.InternalCDOTransaction; + import java.util.Collections; import java.util.HashMap; import java.util.HashSet; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSingleTransactionStrategy.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOSingleTransactionStrategy.java index 8f1d5e36e2..5f31a51ca1 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSingleTransactionStrategy.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOSingleTransactionStrategy.java @@ -8,9 +8,9 @@ * Contributors: * Simon McDuff - initial API and implementation **************************************************************************/ -package org.eclipse.emf.internal.cdo; +package org.eclipse.emf.internal.cdo.transaction; -import org.eclipse.emf.cdo.CDOSavepoint; +import org.eclipse.emf.cdo.transaction.CDOSavepoint; import org.eclipse.emf.internal.cdo.bundle.OM; import org.eclipse.emf.internal.cdo.protocol.CDOClientProtocol; @@ -21,6 +21,10 @@ import org.eclipse.net4j.util.om.monitor.EclipseMonitor; import org.eclipse.net4j.util.om.trace.ContextTracer; import org.eclipse.net4j.util.transaction.TransactionException; +import org.eclipse.emf.spi.cdo.CDOTransactionStrategy; +import org.eclipse.emf.spi.cdo.InternalCDOCommitContext; +import org.eclipse.emf.spi.cdo.InternalCDOTransaction; + import org.eclipse.core.runtime.IProgressMonitor; /** diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOTimeStampContextImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTimeStampContextImpl.java index 63c76a3fd9..ee2568606e 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOTimeStampContextImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTimeStampContextImpl.java @@ -9,11 +9,11 @@ * Simon McDuff - initial API and implementation * Eike Stepper - maintenance **************************************************************************/ -package org.eclipse.emf.internal.cdo; +package org.eclipse.emf.internal.cdo.transaction; -import org.eclipse.emf.cdo.CDOTimeStampContext; import org.eclipse.emf.cdo.common.id.CDOID; import org.eclipse.emf.cdo.common.id.CDOIDAndVersion; +import org.eclipse.emf.cdo.transaction.CDOTimeStampContext; import java.util.ArrayList; import java.util.Collection; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOTransactionImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java index 430a8a7a20..3ba95c7a30 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOTransactionImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java @@ -10,18 +10,10 @@ * Simon McDuff - maintenance * Victor Roldan Betancort - maintenance **************************************************************************/ -package org.eclipse.emf.internal.cdo; +package org.eclipse.emf.internal.cdo.transaction; -import org.eclipse.emf.cdo.CDOConflictResolver; import org.eclipse.emf.cdo.CDOObject; -import org.eclipse.emf.cdo.CDOSavepoint; import org.eclipse.emf.cdo.CDOState; -import org.eclipse.emf.cdo.CDOTransaction; -import org.eclipse.emf.cdo.CDOTransactionConflictEvent; -import org.eclipse.emf.cdo.CDOTransactionFinishedEvent; -import org.eclipse.emf.cdo.CDOTransactionHandler; -import org.eclipse.emf.cdo.CDOTransactionStartedEvent; -import org.eclipse.emf.cdo.CDOViewResourcesEvent; import org.eclipse.emf.cdo.common.id.CDOID; import org.eclipse.emf.cdo.common.id.CDOIDAndVersion; import org.eclipse.emf.cdo.common.id.CDOIDTemp; @@ -40,14 +32,26 @@ import org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl; import org.eclipse.emf.cdo.eresource.impl.CDOResourceNodeImpl; import org.eclipse.emf.cdo.spi.common.model.InternalCDOPackage; import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionDelta; +import org.eclipse.emf.cdo.transaction.CDOSavepoint; +import org.eclipse.emf.cdo.transaction.CDOTransaction; +import org.eclipse.emf.cdo.transaction.CDOTransactionConflictEvent; +import org.eclipse.emf.cdo.transaction.CDOTransactionFinishedEvent; +import org.eclipse.emf.cdo.transaction.CDOTransactionHandler; +import org.eclipse.emf.cdo.transaction.CDOTransactionStartedEvent; import org.eclipse.emf.cdo.util.CDOURIUtil; +import org.eclipse.emf.cdo.view.CDOConflictResolver; +import org.eclipse.emf.cdo.view.CDOViewResourcesEvent; +import org.eclipse.emf.internal.cdo.CDOObjectMerger; +import org.eclipse.emf.internal.cdo.CDOStateMachine; import org.eclipse.emf.internal.cdo.bundle.OM; import org.eclipse.emf.internal.cdo.protocol.CommitTransactionResult; +import org.eclipse.emf.internal.cdo.session.CDOSessionPackageManagerImpl; import org.eclipse.emf.internal.cdo.util.CompletePackageClosure; import org.eclipse.emf.internal.cdo.util.FSMUtil; import org.eclipse.emf.internal.cdo.util.IPackageClosure; import org.eclipse.emf.internal.cdo.util.ModelUtil; +import org.eclipse.emf.internal.cdo.view.CDOViewImpl; import org.eclipse.net4j.util.ImplementationError; import org.eclipse.net4j.util.ObjectUtil; @@ -59,6 +63,11 @@ import org.eclipse.net4j.util.transaction.TransactionException; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EPackage; +import org.eclipse.emf.spi.cdo.CDOTransactionStrategy; +import org.eclipse.emf.spi.cdo.InternalCDOCommitContext; +import org.eclipse.emf.spi.cdo.InternalCDOObject; +import org.eclipse.emf.spi.cdo.InternalCDOSession; +import org.eclipse.emf.spi.cdo.InternalCDOTransaction; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOXASavepoint.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOXASavepoint.java index 8f87a249bd..8d8d319ac3 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOXASavepoint.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOXASavepoint.java @@ -8,10 +8,10 @@ * Contributors: * Simon McDuff - initial API and implementation **************************************************************************/ -package org.eclipse.emf.internal.cdo; +package org.eclipse.emf.internal.cdo.transaction; -import org.eclipse.emf.cdo.CDOSavepoint; -import org.eclipse.emf.cdo.CDOUserTransaction; +import org.eclipse.emf.cdo.transaction.CDOSavepoint; +import org.eclipse.emf.cdo.transaction.CDOUserTransaction; import java.util.List; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOXATransactionCommitContext.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOXATransactionCommitContext.java index f15ac43a28..c397c4bb60 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOXATransactionCommitContext.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOXATransactionCommitContext.java @@ -8,7 +8,7 @@ * Contributors: * Simon McDuff - initial API and implementation **************************************************************************/ -package org.eclipse.emf.internal.cdo; +package org.eclipse.emf.internal.cdo.transaction; import org.eclipse.emf.cdo.CDOObject; import org.eclipse.emf.cdo.common.id.CDOID; @@ -20,12 +20,15 @@ import org.eclipse.emf.cdo.eresource.CDOResource; import org.eclipse.emf.cdo.internal.common.id.CDOIDExternalTempImpl; import org.eclipse.emf.cdo.util.CDOUtil; -import org.eclipse.emf.internal.cdo.CDOXATransactionImpl.CDOXAState; import org.eclipse.emf.internal.cdo.protocol.CommitTransactionResult; +import org.eclipse.emf.internal.cdo.transaction.CDOXATransactionImpl.CDOXAState; import org.eclipse.net4j.util.ImplementationError; import org.eclipse.emf.ecore.InternalEObject; +import org.eclipse.emf.spi.cdo.InternalCDOCommitContext; +import org.eclipse.emf.spi.cdo.InternalCDOObject; +import org.eclipse.emf.spi.cdo.InternalCDOTransaction; import org.eclipse.core.runtime.IProgressMonitor; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOXATransactionImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOXATransactionImpl.java index d6250d64c0..c8fbb2e709 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOXATransactionImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOXATransactionImpl.java @@ -8,15 +8,15 @@ * Contributors: * Simon McDuff - initial API and implementation **************************************************************************/ -package org.eclipse.emf.internal.cdo; +package org.eclipse.emf.internal.cdo.transaction; -import org.eclipse.emf.cdo.CDOSavepoint; -import org.eclipse.emf.cdo.CDOTransaction; -import org.eclipse.emf.cdo.CDOView; -import org.eclipse.emf.cdo.CDOViewSet; -import org.eclipse.emf.cdo.CDOXATransaction; import org.eclipse.emf.cdo.common.id.CDOID; +import org.eclipse.emf.cdo.transaction.CDOSavepoint; +import org.eclipse.emf.cdo.transaction.CDOTransaction; +import org.eclipse.emf.cdo.transaction.CDOXATransaction; import org.eclipse.emf.cdo.util.CDOUtil; +import org.eclipse.emf.cdo.view.CDOView; +import org.eclipse.emf.cdo.view.CDOViewSet; import org.eclipse.emf.internal.cdo.protocol.CDOClientProtocol; import org.eclipse.emf.internal.cdo.protocol.CommitTransactionCancelRequest; @@ -33,6 +33,9 @@ import org.eclipse.net4j.util.transaction.TransactionException; import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.Notifier; +import org.eclipse.emf.spi.cdo.CDOTransactionStrategy; +import org.eclipse.emf.spi.cdo.InternalCDOCommitContext; +import org.eclipse.emf.spi.cdo.InternalCDOTransaction; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/FSMUtil.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/FSMUtil.java index 1e30fb82e4..69dc63ce6a 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/FSMUtil.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/FSMUtil.java @@ -13,17 +13,15 @@ package org.eclipse.emf.internal.cdo.util; import org.eclipse.emf.cdo.CDOObject; import org.eclipse.emf.cdo.CDOState; -import org.eclipse.emf.cdo.CDOView; import org.eclipse.emf.cdo.common.id.CDOID; import org.eclipse.emf.cdo.common.revision.CDORevision; import org.eclipse.emf.cdo.util.InvalidObjectException; import org.eclipse.emf.cdo.util.ObjectNotFoundException; +import org.eclipse.emf.cdo.view.CDOView; import org.eclipse.emf.internal.cdo.CDOLegacyWrapper; import org.eclipse.emf.internal.cdo.CDOMetaWrapper; import org.eclipse.emf.internal.cdo.CDOStateMachine; -import org.eclipse.emf.internal.cdo.InternalCDOObject; -import org.eclipse.emf.internal.cdo.InternalCDOView; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EGenericType; @@ -32,6 +30,8 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.util.EcoreUtil; +import org.eclipse.emf.spi.cdo.InternalCDOObject; +import org.eclipse.emf.spi.cdo.InternalCDOView; import java.util.Collection; import java.util.Iterator; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ModelUtil.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ModelUtil.java index a6032d53e4..81b3d3df17 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ModelUtil.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ModelUtil.java @@ -27,15 +27,14 @@ import org.eclipse.emf.cdo.common.model.resource.CDOResourceNodeClass; import org.eclipse.emf.cdo.common.model.resource.CDOResourcePackage; import org.eclipse.emf.cdo.common.util.CDOException; import org.eclipse.emf.cdo.eresource.EresourcePackage; +import org.eclipse.emf.cdo.session.CDOPackageRegistry; import org.eclipse.emf.cdo.spi.common.model.InternalCDOClass; import org.eclipse.emf.cdo.spi.common.model.InternalCDOFeature; import org.eclipse.emf.cdo.spi.common.model.InternalCDOPackage; -import org.eclipse.emf.cdo.util.CDOPackageRegistry; import org.eclipse.emf.cdo.util.EMFUtil; -import org.eclipse.emf.internal.cdo.CDOSessionPackageManagerImpl; -import org.eclipse.emf.internal.cdo.InternalCDOSession; import org.eclipse.emf.internal.cdo.bundle.OM; +import org.eclipse.emf.internal.cdo.session.CDOSessionPackageManagerImpl; import org.eclipse.net4j.util.ImplementationError; import org.eclipse.net4j.util.ObjectUtil; @@ -51,6 +50,7 @@ import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.EcorePackage; import org.eclipse.emf.ecore.impl.EPackageImpl; import org.eclipse.emf.ecore.util.EcoreUtil; +import org.eclipse.emf.spi.cdo.InternalCDOSession; /** * @author Eike Stepper @@ -172,7 +172,7 @@ public final class ModelUtil return cdoClass.lookupFeature(eFeature.getFeatureID()); } - static CDOPackage addCDOPackage(EPackage ePackage, CDOSessionPackageManagerImpl packageManager) + public static CDOPackage addCDOPackage(EPackage ePackage, CDOSessionPackageManagerImpl packageManager) { CDOPackage cdoPackage = createCDOPackage(ePackage, packageManager); packageManager.addPackage(cdoPackage); @@ -189,7 +189,7 @@ public final class ModelUtil * @see EMFUtil#getPersistentFeatures(org.eclipse.emf.common.util.EList) * @see http://www.eclipse.org/newsportal/article.php?id=26780&group=eclipse.tools.emf#26780 */ - static CDOPackage createCDOPackage(EPackage ePackage, CDOSessionPackageManagerImpl packageManager) + public static CDOPackage createCDOPackage(EPackage ePackage, CDOSessionPackageManagerImpl packageManager) { InternalCDOSession session = packageManager.getSession(); String uri = ePackage.getNsURI(); @@ -214,7 +214,7 @@ public final class ModelUtil return cdoPackage; } - static CDOClass createCDOClass(EClass eClass, CDOPackage containingPackage) + public static CDOClass createCDOClass(EClass eClass, CDOPackage containingPackage) { InternalCDOClass cdoClass = (InternalCDOClass)CDOModelUtil.createClass(containingPackage, eClass.getClassifierID(), eClass.getName(), eClass.isAbstract()); @@ -238,7 +238,7 @@ public final class ModelUtil return cdoClass; } - static CDOFeature createCDOFeature(EStructuralFeature eFeature, CDOClass containingClass) + public static CDOFeature createCDOFeature(EStructuralFeature eFeature, CDOClass containingClass) { InternalCDOFeature cdoFeature = (InternalCDOFeature)(EMFUtil.isReference(eFeature) ? createCDOReference( (EReference)eFeature, containingClass) : createCDOAttribute((EAttribute)eFeature, containingClass)); @@ -246,7 +246,7 @@ public final class ModelUtil return cdoFeature; } - static CDOFeature createCDOReference(EReference eFeature, CDOClass containingClass) + public static CDOFeature createCDOReference(EReference eFeature, CDOClass containingClass) { CDOPackageManager packageManager = containingClass.getPackageManager(); int featureID = eFeature.getFeatureID(); @@ -267,7 +267,7 @@ public final class ModelUtil return cdoFeature; } - static CDOFeature createCDOAttribute(EAttribute eFeature, CDOClass containingClass) + public static CDOFeature createCDOAttribute(EAttribute eFeature, CDOClass containingClass) { int featureID = eFeature.getFeatureID(); String name = eFeature.getName(); @@ -327,7 +327,7 @@ public final class ModelUtil return eFeature; } - static EPackage createEPackage(CDOPackage cdoPackage) + public static EPackage createEPackage(CDOPackage cdoPackage) { if (cdoPackage.isDynamic()) { @@ -343,7 +343,7 @@ public final class ModelUtil return ePackage; } - static EPackage getGeneratedEPackage(CDOPackage cdoPackage) + public static EPackage getGeneratedEPackage(CDOPackage cdoPackage) { String packageURI = cdoPackage.getPackageURI(); if (packageURI.equals(EcorePackage.eINSTANCE.getNsURI())) @@ -355,7 +355,7 @@ public final class ModelUtil return registry.getEPackage(packageURI); } - static EPackage createDynamicEPackage(CDOPackage cdoPackage) + public static EPackage createDynamicEPackage(CDOPackage cdoPackage) { CDOPackage topLevelPackage = cdoPackage.getTopLevelPackage(); String ecore = topLevelPackage.getEcore(); @@ -364,7 +364,7 @@ public final class ModelUtil return ePackage; } - static EPackageImpl prepareDynamicEPackage(EPackageImpl ePackage, String nsURI) + public static EPackageImpl prepareDynamicEPackage(EPackageImpl ePackage, String nsURI) { EMFUtil.prepareDynamicEPackage(ePackage); EPackageImpl result = ObjectUtil.equals(ePackage.getNsURI(), nsURI) ? ePackage : null; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/RevisionAdjuster.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/RevisionAdjuster.java index 224e4123cb..8b687eae0b 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/RevisionAdjuster.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/RevisionAdjuster.java @@ -25,7 +25,7 @@ import org.eclipse.emf.cdo.internal.common.revision.delta.CDOListFeatureDeltaImp import org.eclipse.emf.cdo.spi.common.revision.InternalCDOList; import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision; -import org.eclipse.emf.internal.cdo.revision.CDOElementProxy; +import org.eclipse.emf.spi.cdo.CDOElementProxy; /** * @author Simon McDuff 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/view/CDOAuditImpl.java index 9286e06a5a..38f7fbbb4a 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/view/CDOAuditImpl.java @@ -8,19 +8,23 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.emf.internal.cdo; +package org.eclipse.emf.internal.cdo.view; -import org.eclipse.emf.cdo.CDOAudit; import org.eclipse.emf.cdo.common.id.CDOID; import org.eclipse.emf.cdo.common.revision.CDORevision; import org.eclipse.emf.cdo.common.revision.CDORevisionResolver; import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision; +import org.eclipse.emf.cdo.view.CDOAudit; +import org.eclipse.emf.internal.cdo.CDOStateMachine; import org.eclipse.emf.internal.cdo.protocol.CDOClientProtocol; import org.eclipse.emf.internal.cdo.protocol.SetAuditRequest; import org.eclipse.net4j.util.WrappedException; +import org.eclipse.emf.spi.cdo.InternalCDOObject; +import org.eclipse.emf.spi.cdo.InternalCDOSession; + import java.text.MessageFormat; import java.util.List; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDORevisionPrefetchingPolicyImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDORevisionPrefetchingPolicyImpl.java index 4b26b5012f..f0a1e797b3 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDORevisionPrefetchingPolicyImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDORevisionPrefetchingPolicyImpl.java @@ -8,12 +8,12 @@ * Contributors: * Simon McDuff - initial API and implementation **************************************************************************/ -package org.eclipse.emf.internal.cdo; +package org.eclipse.emf.internal.cdo.view; -import org.eclipse.emf.cdo.CDORevisionManager; -import org.eclipse.emf.cdo.CDORevisionPrefetchingPolicy; import org.eclipse.emf.cdo.common.id.CDOID; import org.eclipse.emf.cdo.common.revision.CDOList; +import org.eclipse.emf.cdo.session.CDORevisionManager; +import org.eclipse.emf.cdo.view.CDORevisionPrefetchingPolicy; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EStructuralFeature; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewImpl.java index 1ab443f9b5..fe217709e6 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewImpl.java @@ -10,20 +10,11 @@ * Simon McDuff - maintenance * Victor Roldan Betancort - maintenance **************************************************************************/ -package org.eclipse.emf.internal.cdo; +package org.eclipse.emf.internal.cdo.view; -import org.eclipse.emf.cdo.CDOAdapterPolicy; -import org.eclipse.emf.cdo.CDOCommitContext; -import org.eclipse.emf.cdo.CDOFeatureAnalyzer; import org.eclipse.emf.cdo.CDONotification; import org.eclipse.emf.cdo.CDOObject; -import org.eclipse.emf.cdo.CDOQuery; -import org.eclipse.emf.cdo.CDORevisionPrefetchingPolicy; import org.eclipse.emf.cdo.CDOState; -import org.eclipse.emf.cdo.CDOTransaction; -import org.eclipse.emf.cdo.CDOView; -import org.eclipse.emf.cdo.CDOViewEvent; -import org.eclipse.emf.cdo.CDOViewInvalidationEvent; import org.eclipse.emf.cdo.common.id.CDOID; import org.eclipse.emf.cdo.common.id.CDOIDAndVersion; import org.eclipse.emf.cdo.common.id.CDOIDMeta; @@ -44,12 +35,28 @@ import org.eclipse.emf.cdo.eresource.CDOResourceFolder; import org.eclipse.emf.cdo.eresource.CDOResourceNode; import org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl; import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision; +import org.eclipse.emf.cdo.transaction.CDOCommitContext; +import org.eclipse.emf.cdo.transaction.CDOTransaction; import org.eclipse.emf.cdo.util.CDOURIUtil; import org.eclipse.emf.cdo.util.CDOUtil; import org.eclipse.emf.cdo.util.DanglingReferenceException; import org.eclipse.emf.cdo.util.InvalidURIException; import org.eclipse.emf.cdo.util.ReadOnlyException; - +import org.eclipse.emf.cdo.view.CDOAdapterPolicy; +import org.eclipse.emf.cdo.view.CDOFeatureAnalyzer; +import org.eclipse.emf.cdo.view.CDOQuery; +import org.eclipse.emf.cdo.view.CDORevisionPrefetchingPolicy; +import org.eclipse.emf.cdo.view.CDOView; +import org.eclipse.emf.cdo.view.CDOViewEvent; +import org.eclipse.emf.cdo.view.CDOViewInvalidationEvent; + +import org.eclipse.emf.internal.cdo.CDODeltaNotificationImpl; +import org.eclipse.emf.internal.cdo.CDOInvalidationNotificationImpl; +import org.eclipse.emf.internal.cdo.CDOMetaWrapper; +import org.eclipse.emf.internal.cdo.CDONotificationBuilder; +import org.eclipse.emf.internal.cdo.CDOStateMachine; +import org.eclipse.emf.internal.cdo.CDOStore; +import org.eclipse.emf.internal.cdo.CDOURIHandler; import org.eclipse.emf.internal.cdo.bundle.OM; import org.eclipse.emf.internal.cdo.protocol.CDOClientProtocol; import org.eclipse.emf.internal.cdo.protocol.ChangeSubscriptionRequest; @@ -86,6 +93,11 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.ecore.util.EcoreUtil; +import org.eclipse.emf.spi.cdo.InternalCDOObject; +import org.eclipse.emf.spi.cdo.InternalCDOSession; +import org.eclipse.emf.spi.cdo.InternalCDOTransaction; +import org.eclipse.emf.spi.cdo.InternalCDOView; +import org.eclipse.emf.spi.cdo.InternalCDOViewSet; import java.text.MessageFormat; import java.util.ArrayList; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CDOViewProviderRegistryImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewProviderRegistryImpl.java index 33c3d1355e..675dfd24df 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CDOViewProviderRegistryImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewProviderRegistryImpl.java @@ -8,14 +8,14 @@ * Contributors: * Victor Roldan Betancort - initial API and implementation **************************************************************************/ -package org.eclipse.emf.internal.cdo.util; +package org.eclipse.emf.internal.cdo.view; -import org.eclipse.emf.cdo.CDOView; -import org.eclipse.emf.cdo.CDOViewSet; -import org.eclipse.emf.cdo.util.AbstractCDOViewProvider; import org.eclipse.emf.cdo.util.CDOURIUtil; -import org.eclipse.emf.cdo.util.CDOViewProvider; -import org.eclipse.emf.cdo.util.CDOViewProviderRegistry; +import org.eclipse.emf.cdo.view.AbstractCDOViewProvider; +import org.eclipse.emf.cdo.view.CDOView; +import org.eclipse.emf.cdo.view.CDOViewProvider; +import org.eclipse.emf.cdo.view.CDOViewProviderRegistry; +import org.eclipse.emf.cdo.view.CDOViewSet; import org.eclipse.emf.internal.cdo.bundle.OM; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewSetImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewSetImpl.java index 2a0b1b7598..78ec22627c 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewSetImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewSetImpl.java @@ -9,17 +9,16 @@ * Simon McDuff - initial API and implementation * Simon McDuff - http://bugs.eclipse.org/246619 **************************************************************************/ -package org.eclipse.emf.internal.cdo; +package org.eclipse.emf.internal.cdo.view; -import org.eclipse.emf.cdo.CDOView; import org.eclipse.emf.cdo.common.protocol.CDOProtocolConstants; import org.eclipse.emf.cdo.eresource.CDOResource; import org.eclipse.emf.cdo.eresource.impl.CDOResourceFactoryImpl; import org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl; import org.eclipse.emf.cdo.util.CDOURIUtil; +import org.eclipse.emf.cdo.view.CDOView; import org.eclipse.emf.internal.cdo.bundle.OM; -import org.eclipse.emf.internal.cdo.util.CDOViewSetPackageRegistryImpl; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.Notifier; @@ -30,6 +29,8 @@ import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.ecore.resource.Resource.Factory.Registry; +import org.eclipse.emf.spi.cdo.InternalCDOView; +import org.eclipse.emf.spi.cdo.InternalCDOViewSet; import java.util.ArrayList; import java.util.HashMap; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CDOViewSetPackageRegistryImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewSetPackageRegistryImpl.java index b000f25016..a0d6da411a 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CDOViewSetPackageRegistryImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewSetPackageRegistryImpl.java @@ -8,10 +8,10 @@ * Contributors: * Simon McDuff - initial API and implementation **************************************************************************/ -package org.eclipse.emf.internal.cdo.util; +package org.eclipse.emf.internal.cdo.view; -import org.eclipse.emf.cdo.CDOView; -import org.eclipse.emf.cdo.CDOViewSet; +import org.eclipse.emf.cdo.view.CDOView; +import org.eclipse.emf.cdo.view.CDOViewSet; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.impl.EPackageRegistryImpl; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/PluginContainerViewProvider.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/PluginContainerViewProvider.java index 19762a77bc..f43a4cf47d 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/PluginContainerViewProvider.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/PluginContainerViewProvider.java @@ -8,16 +8,16 @@ * Contributors: * Victor Roldan Betancort - initial API and implementation **************************************************************************/ -package org.eclipse.emf.internal.cdo.util; +package org.eclipse.emf.internal.cdo.view; -import org.eclipse.emf.cdo.CDOSession; -import org.eclipse.emf.cdo.CDOView; -import org.eclipse.emf.cdo.CDOViewSet; +import org.eclipse.emf.cdo.session.CDOSession; import org.eclipse.emf.cdo.util.CDOURIUtil; -import org.eclipse.emf.cdo.util.CDOViewProvider; -import org.eclipse.emf.cdo.util.ManagedContainerViewProvider; +import org.eclipse.emf.cdo.view.CDOView; +import org.eclipse.emf.cdo.view.CDOViewProvider; +import org.eclipse.emf.cdo.view.CDOViewSet; +import org.eclipse.emf.cdo.view.ManagedContainerViewProvider; -import org.eclipse.emf.internal.cdo.CDOSessionFactory; +import org.eclipse.emf.internal.cdo.session.CDOSessionFactory; import org.eclipse.net4j.util.container.IManagedContainer; import org.eclipse.net4j.util.container.IPluginContainer; |