From 364c7897a153a12b904932f9118f01d51d8ffefa Mon Sep 17 00:00:00 2001
From: Eike Stepper
Date: Sat, 10 Jan 2009 07:56:55 +0000
Subject: [260613] Cleanup cdo.common plugin
https://bugs.eclipse.org/bugs/show_bug.cgi?id=260613
---
plugins/org.eclipse.emf.cdo.defs/.project | 6 +
.../src/org/eclipse/emf/cdo/defs/ResourceMode.java | 4 +-
.../eclipse/emf/cdo/defs/impl/CDOAuditDefImpl.java | 4 +-
.../defs/impl/CDOEagerPackageRegistryDefImpl.java | 4 +-
.../defs/impl/CDOLazyPackageRegistryDefImpl.java | 4 +-
.../emf/cdo/defs/impl/CDOResourceDefImpl.java | 4 +-
.../emf/cdo/defs/impl/CDOSessionDefImpl.java | 10 +-
.../emf/cdo/defs/impl/CDOTransactionDefImpl.java | 4 +-
.../eclipse/emf/cdo/defs/impl/CDOViewDefImpl.java | 4 +-
.../cdo/examples/StandaloneContainerExample.java | 6 +-
.../emf/cdo/examples/StandaloneManualExample.java | 6 +-
.../hibernate/HbCDOAutomaticPackageRefTest.java | 4 +-
.../cdo/tests/hibernate/HbCDOPackageRefTest.java | 4 +-
plugins/org.eclipse.emf.cdo.tests.model4/.project | 6 +
.../tests/model4/ContainedElementNoOpposite.java | 19 +-
.../cdo/tests/model4/GenRefMapNonContained.java | 17 +-
.../emf/cdo/tests/model4/GenRefMultiContained.java | 13 +-
.../tests/model4/GenRefMultiNUNonContained.java | 13 +-
.../cdo/tests/model4/GenRefMultiNonContained.java | 13 +-
.../cdo/tests/model4/GenRefSingleContained.java | 19 +-
.../cdo/tests/model4/GenRefSingleNonContained.java | 19 +-
.../cdo/tests/model4/ImplContainedElementNPL.java | 5 +-
.../tests/model4/ImplMultiRefContainedElement.java | 19 +-
.../cdo/tests/model4/ImplMultiRefContainer.java | 5 +-
.../cdo/tests/model4/ImplMultiRefContainerNPL.java | 5 +-
.../model4/ImplMultiRefNonContainedElement.java | 19 +-
.../cdo/tests/model4/ImplMultiRefNonContainer.java | 5 +-
.../tests/model4/ImplMultiRefNonContainerNPL.java | 5 +-
.../model4/ImplSingleRefContainedElement.java | 19 +-
.../cdo/tests/model4/ImplSingleRefContainer.java | 5 +-
.../tests/model4/ImplSingleRefContainerNPL.java | 5 +-
.../model4/ImplSingleRefNonContainedElement.java | 19 +-
.../tests/model4/ImplSingleRefNonContainer.java | 5 +-
.../tests/model4/ImplSingleRefNonContainerNPL.java | 5 +-
.../cdo/tests/model4/MultiContainedElement.java | 35 +-
.../cdo/tests/model4/MultiNonContainedElement.java | 35 +-
.../emf/cdo/tests/model4/RefMultiContained.java | 10 +-
.../emf/cdo/tests/model4/RefMultiContainedNPL.java | 13 +-
.../emf/cdo/tests/model4/RefMultiNonContained.java | 15 +-
.../cdo/tests/model4/RefMultiNonContainedNPL.java | 13 +-
.../emf/cdo/tests/model4/RefSingleContained.java | 21 +-
.../cdo/tests/model4/RefSingleContainedNPL.java | 19 +-
.../cdo/tests/model4/RefSingleNonContained.java | 21 +-
.../cdo/tests/model4/RefSingleNonContainedNPL.java | 19 +-
.../cdo/tests/model4/SingleContainedElement.java | 35 +-
.../tests/model4/SingleNonContainedElement.java | 35 +-
.../impl/ContainedElementNoOppositeImpl.java | 11 +-
.../model4/impl/GenRefMapNonContainedImpl.java | 10 +-
.../model4/impl/GenRefMultiContainedImpl.java | 10 +-
.../model4/impl/GenRefMultiNUNonContainedImpl.java | 10 +-
.../model4/impl/GenRefMultiNonContainedImpl.java | 10 +-
.../model4/impl/GenRefSingleContainedImpl.java | 11 +-
.../model4/impl/GenRefSingleNonContainedImpl.java | 11 +-
.../model4/impl/ImplContainedElementNPLImpl.java | 13 +-
.../impl/ImplMultiRefContainedElementImpl.java | 15 +-
.../model4/impl/ImplMultiRefContainerImpl.java | 10 +-
.../model4/impl/ImplMultiRefContainerNPLImpl.java | 10 +-
.../impl/ImplMultiRefNonContainedElementImpl.java | 15 +-
.../model4/impl/ImplMultiRefNonContainerImpl.java | 10 +-
.../impl/ImplMultiRefNonContainerNPLImpl.java | 10 +-
.../impl/ImplSingleRefContainedElementImpl.java | 15 +-
.../model4/impl/ImplSingleRefContainerImpl.java | 11 +-
.../model4/impl/ImplSingleRefContainerNPLImpl.java | 11 +-
.../impl/ImplSingleRefNonContainedElementImpl.java | 15 +-
.../model4/impl/ImplSingleRefNonContainerImpl.java | 11 +-
.../impl/ImplSingleRefNonContainerNPLImpl.java | 11 +-
.../model4/impl/MultiContainedElementImpl.java | 15 +-
.../model4/impl/MultiNonContainedElementImpl.java | 15 +-
.../tests/model4/impl/RefMultiContainedImpl.java | 10 +-
.../model4/impl/RefMultiContainedNPLImpl.java | 10 +-
.../model4/impl/RefMultiNonContainedImpl.java | 10 +-
.../model4/impl/RefMultiNonContainedNPLImpl.java | 10 +-
.../tests/model4/impl/RefSingleContainedImpl.java | 11 +-
.../model4/impl/RefSingleContainedNPLImpl.java | 11 +-
.../model4/impl/RefSingleNonContainedImpl.java | 11 +-
.../model4/impl/RefSingleNonContainedNPLImpl.java | 11 +-
.../model4/impl/SingleContainedElementImpl.java | 15 +-
.../model4/impl/SingleNonContainedElementImpl.java | 15 +-
.../cdo/tests/model4/impl/StringToEObjectImpl.java | 17 +-
.../cdo/tests/model4/impl/model4FactoryImpl.java | 47 +-
.../cdo/tests/model4/impl/model4PackageImpl.java | 140 +-
.../emf/cdo/tests/model4/model4Factory.java | 103 +-
.../emf/cdo/tests/model4/model4Package.java | 1014 +++++----
.../tests/model4/util/model4AdapterFactory.java | 241 ++-
.../emf/cdo/tests/model4/util/model4Switch.java | 50 +-
.../ContainedElementNoOppositeValidator.java | 10 +-
.../validation/GenRefMapNonContainedValidator.java | 10 +-
.../validation/GenRefMultiContainedValidator.java | 10 +-
.../GenRefMultiNUNonContainedValidator.java | 10 +-
.../GenRefMultiNonContainedValidator.java | 10 +-
.../validation/GenRefSingleContainedValidator.java | 10 +-
.../GenRefSingleNonContainedValidator.java | 10 +-
.../ImplContainedElementNPLValidator.java | 10 +-
.../ImplMultiRefContainedElementValidator.java | 10 +-
.../ImplMultiRefContainerNPLValidator.java | 10 +-
.../validation/ImplMultiRefContainerValidator.java | 10 +-
.../ImplMultiRefNonContainedElementValidator.java | 10 +-
.../ImplMultiRefNonContainerNPLValidator.java | 10 +-
.../ImplMultiRefNonContainerValidator.java | 10 +-
.../ImplSingleRefContainedElementValidator.java | 10 +-
.../ImplSingleRefContainerNPLValidator.java | 10 +-
.../ImplSingleRefContainerValidator.java | 10 +-
.../ImplSingleRefNonContainedElementValidator.java | 10 +-
.../ImplSingleRefNonContainerNPLValidator.java | 10 +-
.../ImplSingleRefNonContainerValidator.java | 10 +-
.../validation/MultiContainedElementValidator.java | 10 +-
.../MultiNonContainedElementValidator.java | 10 +-
.../validation/RefMultiContainedNPLValidator.java | 10 +-
.../validation/RefMultiContainedValidator.java | 10 +-
.../RefMultiNonContainedNPLValidator.java | 10 +-
.../validation/RefMultiNonContainedValidator.java | 10 +-
.../validation/RefSingleContainedNPLValidator.java | 10 +-
.../validation/RefSingleContainedValidator.java | 10 +-
.../RefSingleNonContainedNPLValidator.java | 10 +-
.../validation/RefSingleNonContainedValidator.java | 10 +-
.../SingleContainedElementValidator.java | 10 +-
.../SingleNonContainedElementValidator.java | 10 +-
.../validation/StringToEObjectValidator.java | 10 +-
.../.project | 6 +
.../IContainedElementNoParentLink.java | 5 +-
.../IMultiRefContainedElement.java | 15 +-
.../tests/model4interfaces/IMultiRefContainer.java | 7 +-
.../model4interfaces/IMultiRefContainerNPL.java | 13 +-
.../IMultiRefNonContainedElement.java | 15 +-
.../model4interfaces/IMultiRefNonContainer.java | 16 +-
.../model4interfaces/IMultiRefNonContainerNPL.java | 13 +-
.../cdo/tests/model4interfaces/INamedElement.java | 19 +-
.../ISingleRefContainedElement.java | 15 +-
.../model4interfaces/ISingleRefContainer.java | 15 +-
.../model4interfaces/ISingleRefContainerNPL.java | 19 +-
.../ISingleRefNonContainedElement.java | 15 +-
.../model4interfaces/ISingleRefNonContainer.java | 15 +-
.../ISingleRefNonContainerNPL.java | 19 +-
.../impl/model4interfacesFactoryImpl.java | 14 +-
.../impl/model4interfacesPackageImpl.java | 86 +-
.../model4interfaces/model4interfacesFactory.java | 11 +-
.../model4interfaces/model4interfacesPackage.java | 379 ++--
.../util/model4interfacesAdapterFactory.java | 80 +-
.../util/model4interfacesSwitch.java | 28 +-
.../org/eclipse/emf/cdo/tests/AbstractCDOTest.java | 4 +-
.../eclipse/emf/cdo/tests/AdapterManagerTest.java | 6 +-
.../org/eclipse/emf/cdo/tests/AttributeTest.java | 6 +-
.../src/org/eclipse/emf/cdo/tests/AuditTest.java | 6 +-
.../eclipse/emf/cdo/tests/AutoAttacherTest.java | 6 +-
.../emf/cdo/tests/ChangeSubscriptionTest.java | 9 +-
.../org/eclipse/emf/cdo/tests/ChunkingTest.java | 4 +-
.../eclipse/emf/cdo/tests/ChunkingWithMEMTest.java | 4 +-
.../src/org/eclipse/emf/cdo/tests/ComplexTest.java | 4 +-
.../emf/cdo/tests/ConflictResolverTest.java | 6 +-
.../org/eclipse/emf/cdo/tests/ContainmentTest.java | 4 +-
.../eclipse/emf/cdo/tests/ContentAdapterTest.java | 14 +-
.../eclipse/emf/cdo/tests/CrossReferenceTest.java | 6 +-
.../src/org/eclipse/emf/cdo/tests/DBStoreTest.java | 6 +-
.../src/org/eclipse/emf/cdo/tests/DetachTest.java | 8 +-
.../eclipse/emf/cdo/tests/DymamicEcoreTest.java | 4 +-
.../org/eclipse/emf/cdo/tests/DymamicUmlTest.java | 4 +-
.../src/org/eclipse/emf/cdo/tests/EnumTest.java | 4 +-
.../emf/cdo/tests/ExternalReferenceTest.java | 8 +-
.../emf/cdo/tests/FetchRuleAnalyzerTest.java | 10 +-
.../eclipse/emf/cdo/tests/GeneratedEcoreTest.java | 4 +-
.../src/org/eclipse/emf/cdo/tests/ImportXML.java | 6 +-
.../emf/cdo/tests/IndexReconstructionTest.java | 4 +-
.../src/org/eclipse/emf/cdo/tests/InitialTest.java | 8 +-
.../eclipse/emf/cdo/tests/InvalidationTest.java | 10 +-
.../eclipse/emf/cdo/tests/LockingManagerTest.java | 4 +-
.../eclipse/emf/cdo/tests/MEMStoreQueryTest.java | 6 +-
.../src/org/eclipse/emf/cdo/tests/MangoTest.java | 4 +-
.../src/org/eclipse/emf/cdo/tests/MetaTest.java | 4 +-
.../emf/cdo/tests/MultiValuedOfAttributeTest.java | 4 +-
.../eclipse/emf/cdo/tests/PackageRegistryTest.java | 8 +-
.../org/eclipse/emf/cdo/tests/RepositoryTest.java | 6 +-
.../org/eclipse/emf/cdo/tests/ResourceTest.java | 6 +-
.../eclipse/emf/cdo/tests/RevisionDeltaTest.java | 6 +-
.../org/eclipse/emf/cdo/tests/RollbackTest.java | 4 +-
.../org/eclipse/emf/cdo/tests/SavePointTest.java | 6 +-
.../src/org/eclipse/emf/cdo/tests/SessionTest.java | 2 +-
.../eclipse/emf/cdo/tests/StateMachineTest.java | 6 +-
.../emf/cdo/tests/TransactionHandlerTest.java | 10 +-
.../emf/cdo/tests/TransactionMonitoringTest.java | 6 +-
.../org/eclipse/emf/cdo/tests/TransactionTest.java | 4 +-
.../src/org/eclipse/emf/cdo/tests/ViewTest.java | 9 +-
.../eclipse/emf/cdo/tests/XATransactionTest.java | 12 +-
.../cdo/tests/bugzilla/Bugzilla_241464_Test.java | 4 +-
.../cdo/tests/bugzilla/Bugzilla_243310_Test.java | 4 +-
.../cdo/tests/bugzilla/Bugzilla_246442_Test.java | 6 +-
.../cdo/tests/bugzilla/Bugzilla_246456_Test.java | 7 +-
.../cdo/tests/bugzilla/Bugzilla_246622_Test.java | 4 +-
.../cdo/tests/bugzilla/Bugzilla_248052_Test.java | 7 +-
.../cdo/tests/bugzilla/Bugzilla_248124_Test.java | 6 +-
.../cdo/tests/bugzilla/Bugzilla_248915_Test.java | 4 +-
.../cdo/tests/bugzilla/Bugzilla_250036_Test.java | 4 +-
.../cdo/tests/bugzilla/Bugzilla_250757_Test.java | 4 +-
.../cdo/tests/bugzilla/Bugzilla_250910_Test.java | 4 +-
.../cdo/tests/bugzilla/Bugzilla_251087_Test.java | 9 +-
.../cdo/tests/bugzilla/Bugzilla_251263_Test.java | 4 +-
.../cdo/tests/bugzilla/Bugzilla_251544_Test.java | 4 +-
.../cdo/tests/bugzilla/Bugzilla_251752_Test.java | 6 +-
.../cdo/tests/bugzilla/Bugzilla_252214_Test.java | 9 +-
.../cdo/tests/bugzilla/Bugzilla_252909_Test.java | 4 +-
.../cdo/tests/bugzilla/Bugzilla_254489_Test.java | 6 +-
.../cdo/tests/bugzilla/Bugzilla_255662_Test.java | 4 +-
.../cdo/tests/bugzilla/Bugzilla_256141_Test.java | 4 +-
.../cdo/tests/bugzilla/Bugzilla_258278_Test.java | 4 +-
.../cdo/tests/bugzilla/Bugzilla_258850_Test.java | 6 +-
.../cdo/tests/bugzilla/Bugzilla_258933_Test.java | 6 +-
.../cdo/tests/bugzilla/Bugzilla_259695_Test.java | 4 +-
.../cdo/tests/bugzilla/Bugzilla_259869_Test.java | 8 +-
.../cdo/tests/bugzilla/Bugzilla_259949_Test.java | 6 +-
.../emf/cdo/tests/config/ISessionConfig.java | 2 +-
.../emf/cdo/tests/config/impl/ConfigTest.java | 2 +-
.../emf/cdo/tests/config/impl/SessionConfig.java | 6 +-
.../emf/cdo/tests/defs/CDOAuditDefImplTest.java | 4 +-
.../emf/cdo/tests/defs/CDOResourceDefImplTest.java | 2 +-
.../emf/cdo/tests/defs/CDOSessionDefImplTest.java | 2 +-
.../cdo/tests/defs/CDOTransactionDefImplTest.java | 2 +-
.../emf/cdo/tests/defs/CDOViewDefImplTest.java | 4 +-
.../emf/cdo/tests/store/logic/TestLogic.java | 2 +-
plugins/org.eclipse.emf.cdo.ui.defs/.project | 6 +
.../emf/cdo/ui/defs/impl/CDOEditorDefImpl.java | 4 +-
.../emf/cdo/internal/ui/ItemsProcessor.java | 5 +-
.../ui/actions/AbstractLockObjectsAction.java | 4 +-
.../ui/actions/AbstractOpenViewAction.java | 2 +-
.../internal/ui/actions/CloseSessionAction.java | 2 +-
.../cdo/internal/ui/actions/CloseViewAction.java | 2 +-
.../ui/actions/CommitTransactionAction.java | 2 +-
.../internal/ui/actions/CreateResourceAction.java | 2 +-
.../internal/ui/actions/ExportResourceAction.java | 2 +-
.../internal/ui/actions/ImportResourceAction.java | 4 +-
.../cdo/internal/ui/actions/ImportRootsAction.java | 6 +-
.../internal/ui/actions/LoadResourceAction.java | 2 +-
.../internal/ui/actions/ManagePackagesAction.java | 2 +-
.../cdo/internal/ui/actions/OpenAuditAction.java | 2 +-
.../ui/actions/OpenResourceEditorAction.java | 2 +-
.../cdo/internal/ui/actions/OpenSessionAction.java | 4 +-
.../internal/ui/actions/OpenTransactionAction.java | 6 +-
.../cdo/internal/ui/actions/OpenViewAction.java | 2 +-
.../internal/ui/actions/OpenViewEditorAction.java | 2 +-
.../internal/ui/actions/ReadLockObjectsAction.java | 2 +-
.../actions/RegisterFilesystemPackagesAction.java | 2 +-
.../actions/RegisterGeneratedPackagesAction.java | 2 +-
.../ui/actions/RegisterPackagesAction.java | 4 +-
.../ui/actions/RegisterSinglePackageAction.java | 4 +-
.../actions/RegisterWorkspacePackagesAction.java | 2 +-
.../internal/ui/actions/ReloadObjectsAction.java | 5 +-
.../cdo/internal/ui/actions/ReloadViewAction.java | 2 +-
.../ui/actions/RollbackTransactionAction.java | 4 +-
.../emf/cdo/internal/ui/actions/SessionAction.java | 2 +-
.../emf/cdo/internal/ui/actions/ViewAction.java | 8 +-
.../ui/actions/WriteLockObjectsAction.java | 2 +-
.../cdo/internal/ui/dialogs/IPackageProvider.java | 2 +-
.../internal/ui/dialogs/PackageManagerDialog.java | 8 +-
.../ui/dialogs/RollbackTransactionDialog.java | 2 +-
.../internal/ui/dialogs/SelectPackageDialog.java | 4 +-
.../emf/cdo/internal/ui/editor/CDOEditor.java | 10 +-
.../emf/cdo/internal/ui/editor/CDOEditorInput.java | 6 +-
.../internal/ui/preferences/CDOPreferencePage.java | 2 +-
.../emf/cdo/internal/ui/views/CDOSessionsView.java | 2 +-
.../internal/ui/views/CDOSubscriptionsView.java | 2 +-
.../org/eclipse/emf/cdo/ui/CDOEventHandler.java | 16 +-
.../org/eclipse/emf/cdo/ui/CDOItemProvider.java | 12 +-
.../org/eclipse/emf/cdo/ui/CDOLabelDecorator.java | 5 +-
.../org/eclipse/emf/cdo/ui/CDOLabelProvider.java | 4 +-
plugins/org.eclipse.emf.cdo/.settings/.api_filters | 8 +-
plugins/org.eclipse.emf.cdo/META-INF/MANIFEST.MF | 7 +
plugins/org.eclipse.emf.cdo/plugin.xml | 4 +-
.../org.eclipse.emf.cdo/schema/viewProviders.exsd | 2 +-
.../src/org/eclipse/emf/cdo/CDOAdapter.java | 4 +-
.../src/org/eclipse/emf/cdo/CDOAdapterPolicy.java | 103 -
.../src/org/eclipse/emf/cdo/CDOAudit.java | 37 -
.../emf/cdo/CDOCollectionLoadingPolicy.java | 62 -
.../src/org/eclipse/emf/cdo/CDOCommitContext.java | 64 -
.../org/eclipse/emf/cdo/CDOConflictResolver.java | 42 -
.../src/org/eclipse/emf/cdo/CDOEvent.java | 24 -
.../org/eclipse/emf/cdo/CDOFeatureAnalyzer.java | 44 -
.../org/eclipse/emf/cdo/CDOFetchRuleManager.java | 51 -
.../emf/cdo/CDOInvalidationNotification.java | 3 +
.../src/org/eclipse/emf/cdo/CDOObject.java | 4 +-
.../src/org/eclipse/emf/cdo/CDOQuery.java | 75 -
.../org/eclipse/emf/cdo/CDORevisionManager.java | 41 -
.../emf/cdo/CDORevisionPrefetchingPolicy.java | 51 -
.../src/org/eclipse/emf/cdo/CDOSavepoint.java | 34 -
.../src/org/eclipse/emf/cdo/CDOSession.java | 301 ---
.../eclipse/emf/cdo/CDOSessionConfiguration.java | 114 -
.../src/org/eclipse/emf/cdo/CDOSessionEvent.java | 20 -
.../emf/cdo/CDOSessionInvalidationEvent.java | 59 -
.../eclipse/emf/cdo/CDOSessionPackageManager.java | 68 -
.../org/eclipse/emf/cdo/CDOSessionProtocol.java | 24 -
.../org/eclipse/emf/cdo/CDOTimeStampContext.java | 32 -
.../src/org/eclipse/emf/cdo/CDOTransaction.java | 163 --
.../emf/cdo/CDOTransactionConflictEvent.java | 22 -
.../emf/cdo/CDOTransactionFinishedEvent.java | 35 -
.../org/eclipse/emf/cdo/CDOTransactionHandler.java | 71 -
.../emf/cdo/CDOTransactionStartedEvent.java | 19 -
.../org/eclipse/emf/cdo/CDOUserTransaction.java | 42 -
.../src/org/eclipse/emf/cdo/CDOView.java | 455 ----
.../src/org/eclipse/emf/cdo/CDOViewEvent.java | 20 -
.../eclipse/emf/cdo/CDOViewInvalidationEvent.java | 46 -
.../org/eclipse/emf/cdo/CDOViewResourcesEvent.java | 30 -
.../src/org/eclipse/emf/cdo/CDOViewSet.java | 39 -
.../src/org/eclipse/emf/cdo/CDOXATransaction.java | 38 -
.../emf/cdo/eresource/CDOResourceFactory.java | 2 +-
.../emf/cdo/eresource/CDOResourceInputStream.java | 2 +-
.../cdo/eresource/impl/CDOResourceFactoryImpl.java | 11 +-
.../emf/cdo/eresource/impl/CDOResourceImpl.java | 12 +-
.../cdo/eresource/impl/CDOResourceNodeImpl.java | 4 +-
.../cdo/session/CDOCollectionLoadingPolicy.java | 62 +
.../emf/cdo/session/CDOPackageRegistry.java | 41 +
.../eclipse/emf/cdo/session/CDOPackageType.java | 32 +
.../emf/cdo/session/CDOPackageTypeRegistry.java | 32 +
.../emf/cdo/session/CDORevisionManager.java | 41 +
.../org/eclipse/emf/cdo/session/CDOSession.java | 305 +++
.../emf/cdo/session/CDOSessionConfiguration.java | 113 +
.../eclipse/emf/cdo/session/CDOSessionEvent.java | 22 +
.../cdo/session/CDOSessionInvalidationEvent.java | 62 +
.../emf/cdo/session/CDOSessionPackageManager.java | 68 +
.../emf/cdo/session/CDOSessionProtocol.java | 24 +
.../emf/cdo/transaction/CDOAutoAttacher.java | 175 ++
.../emf/cdo/transaction/CDOCommitContext.java | 65 +
.../transaction/CDODefaultTransactionHandler.java | 73 +
.../eclipse/emf/cdo/transaction/CDOSavepoint.java | 34 +
.../emf/cdo/transaction/CDOTimeStampContext.java | 32 +
.../emf/cdo/transaction/CDOTransaction.java | 167 ++
.../transaction/CDOTransactionConflictEvent.java | 25 +
.../transaction/CDOTransactionFinishedEvent.java | 36 +
.../emf/cdo/transaction/CDOTransactionHandler.java | 72 +
.../transaction/CDOTransactionStartedEvent.java | 21 +
.../emf/cdo/transaction/CDOUserTransaction.java | 42 +
.../emf/cdo/transaction/CDOXATransaction.java | 40 +
.../emf/cdo/util/AbstractCDOViewProvider.java | 83 -
.../org/eclipse/emf/cdo/util/CDOAutoAttacher.java | 176 --
.../emf/cdo/util/CDODefaultTransactionHandler.java | 76 -
.../src/org/eclipse/emf/cdo/util/CDOEvent.java | 28 +
.../eclipse/emf/cdo/util/CDOPackageRegistry.java | 42 -
.../org/eclipse/emf/cdo/util/CDOPackageType.java | 32 -
.../emf/cdo/util/CDOPackageTypeRegistry.java | 32 -
.../src/org/eclipse/emf/cdo/util/CDOURIUtil.java | 4 +-
.../src/org/eclipse/emf/cdo/util/CDOUtil.java | 31 +-
.../org/eclipse/emf/cdo/util/CDOViewAdapter.java | 56 -
.../org/eclipse/emf/cdo/util/CDOViewProvider.java | 54 -
.../emf/cdo/util/CDOViewProviderRegistry.java | 51 -
.../emf/cdo/util/InvalidObjectException.java | 2 +-
.../emf/cdo/util/ManagedContainerViewProvider.java | 47 -
.../emf/cdo/view/AbstractCDOViewProvider.java | 83 +
.../org/eclipse/emf/cdo/view/CDOAdapterPolicy.java | 108 +
.../src/org/eclipse/emf/cdo/view/CDOAudit.java | 38 +
.../eclipse/emf/cdo/view/CDOConflictResolver.java | 45 +
.../eclipse/emf/cdo/view/CDOFeatureAnalyzer.java | 45 +
.../eclipse/emf/cdo/view/CDOFetchRuleManager.java | 52 +
.../src/org/eclipse/emf/cdo/view/CDOQuery.java | 75 +
.../emf/cdo/view/CDORevisionPrefetchingPolicy.java | 52 +
.../src/org/eclipse/emf/cdo/view/CDOView.java | 462 ++++
.../org/eclipse/emf/cdo/view/CDOViewAdapter.java | 54 +
.../src/org/eclipse/emf/cdo/view/CDOViewEvent.java | 22 +
.../emf/cdo/view/CDOViewInvalidationEvent.java | 50 +
.../org/eclipse/emf/cdo/view/CDOViewProvider.java | 51 +
.../emf/cdo/view/CDOViewProviderRegistry.java | 48 +
.../emf/cdo/view/CDOViewResourcesEvent.java | 30 +
.../src/org/eclipse/emf/cdo/view/CDOViewSet.java | 39 +
.../emf/cdo/view/ManagedContainerViewProvider.java | 47 +
.../emf/internal/cdo/CDOAbstractSavepoint.java | 87 -
.../org/eclipse/emf/internal/cdo/CDOAuditImpl.java | 113 -
.../cdo/CDOCollectionLoadingPolicyImpl.java | 113 -
.../emf/internal/cdo/CDODeltaNotificationImpl.java | 1 +
.../eclipse/emf/internal/cdo/CDOLegacyWrapper.java | 5 +-
.../eclipse/emf/internal/cdo/CDOMetaWrapper.java | 1 +
.../emf/internal/cdo/CDONotificationBuilder.java | 2 +-
.../eclipse/emf/internal/cdo/CDOObjectImpl.java | 6 +-
.../eclipse/emf/internal/cdo/CDOObjectMerger.java | 2 +
.../eclipse/emf/internal/cdo/CDOObjectWrapper.java | 4 +-
.../emf/internal/cdo/CDORevisionManagerImpl.java | 181 --
.../cdo/CDORevisionPrefetchingPolicyImpl.java | 72 -
.../eclipse/emf/internal/cdo/CDOSavepointImpl.java | 354 ----
.../internal/cdo/CDOSessionConfigurationImpl.java | 198 --
.../emf/internal/cdo/CDOSessionFactory.java | 111 -
.../eclipse/emf/internal/cdo/CDOSessionImpl.java | 1163 ----------
.../internal/cdo/CDOSessionPackageManagerImpl.java | 199 --
.../internal/cdo/CDOSingleTransactionStrategy.java | 92 -
.../eclipse/emf/internal/cdo/CDOStateMachine.java | 8 +-
.../src/org/eclipse/emf/internal/cdo/CDOStore.java | 8 +-
.../emf/internal/cdo/CDOTimeStampContextImpl.java | 64 -
.../emf/internal/cdo/CDOTransactionImpl.java | 1604 --------------
.../emf/internal/cdo/CDOTransactionStrategy.java | 34 -
.../eclipse/emf/internal/cdo/CDOURIHandler.java | 1 +
.../org/eclipse/emf/internal/cdo/CDOViewImpl.java | 2207 -------------------
.../eclipse/emf/internal/cdo/CDOViewSetImpl.java | 288 ---
.../eclipse/emf/internal/cdo/CDOXASavepoint.java | 41 -
.../cdo/CDOXATransactionCommitContext.java | 193 --
.../emf/internal/cdo/CDOXATransactionImpl.java | 605 ------
.../emf/internal/cdo/InternalCDOCommitContext.java | 31 -
.../emf/internal/cdo/InternalCDOLoadable.java | 20 -
.../emf/internal/cdo/InternalCDOObject.java | 65 -
.../emf/internal/cdo/InternalCDOSession.java | 60 -
.../emf/internal/cdo/InternalCDOTransaction.java | 60 -
.../eclipse/emf/internal/cdo/InternalCDOView.java | 99 -
.../emf/internal/cdo/InternalCDOViewSet.java | 28 -
.../analyzer/CDOAbstractFeatureRuleAnalyzer.java | 6 +-
.../analyzer/CDOFetchRuleManagerThreadLocal.java | 4 +-
.../internal/cdo/analyzer/NOOPFeatureAnalyzer.java | 2 +-
.../cdo/analyzer/NOOPFetchRuleManager.java | 4 +-
.../eclipse/emf/internal/cdo/bundle/Activator.java | 4 +-
.../org/eclipse/emf/internal/cdo/bundle/OM.java | 2 +-
.../internal/cdo/protocol/CDOClientIndication.java | 7 +-
.../internal/cdo/protocol/CDOClientProtocol.java | 4 +-
.../internal/cdo/protocol/CDOClientRequest.java | 7 +-
.../emf/internal/cdo/protocol/ChannelInjector.java | 74 +
.../cdo/protocol/CommitNotificationIndication.java | 3 +-
.../protocol/CommitTransactionCancelRequest.java | 4 +-
.../protocol/CommitTransactionPhase1Request.java | 4 +-
.../protocol/CommitTransactionPhase2Request.java | 4 +-
.../protocol/CommitTransactionPhase3Request.java | 4 +-
.../cdo/protocol/CommitTransactionRequest.java | 9 +-
.../cdo/protocol/CommitTransactionResult.java | 3 +-
.../internal/cdo/protocol/LoadRevisionRequest.java | 4 +-
.../internal/cdo/protocol/LockObjectsRequest.java | 2 +-
.../internal/cdo/protocol/ObjectLockedRequest.java | 2 +-
.../internal/cdo/protocol/OpenSessionRequest.java | 7 +-
.../emf/internal/cdo/protocol/SetAuditRequest.java | 3 +-
.../cdo/protocol/SetPassiveUpdateRequest.java | 3 +-
.../internal/cdo/protocol/SyncRevisionRequest.java | 9 +-
.../cdo/protocol/UnlockObjectsRequest.java | 2 +-
.../cdo/query/CDOAbstractQueryIteratorImpl.java | 5 +-
.../eclipse/emf/internal/cdo/query/CDOEList.java | 2 +-
.../cdo/query/CDOQueryCDOIDIteratorImpl.java | 2 +-
.../emf/internal/cdo/query/CDOQueryImpl.java | 8 +-
.../cdo/query/CDOQueryResultIteratorImpl.java | 2 +-
.../emf/internal/cdo/revision/CDOElementProxy.java | 31 -
.../internal/cdo/revision/CDOElementProxyImpl.java | 6 +-
.../revision/CDOListWithElementProxiesImpl.java | 2 +
.../session/CDOCollectionLoadingPolicyImpl.java | 113 +
.../cdo/session/CDOPackageRegistryImpl.java | 446 ++++
.../cdo/session/CDOPackageTypeRegistryImpl.java | 267 +++
.../cdo/session/CDORevisionManagerImpl.java | 183 ++
.../cdo/session/CDOSessionConfigurationImpl.java | 198 ++
.../internal/cdo/session/CDOSessionFactory.java | 110 +
.../emf/internal/cdo/session/CDOSessionImpl.java | 1169 +++++++++++
.../cdo/session/CDOSessionPackageManagerImpl.java | 200 ++
.../emf/internal/cdo/session/SessionUtil.java | 109 +
.../cdo/transaction/CDOAbstractSavepoint.java | 87 +
.../internal/cdo/transaction/CDOSavepointImpl.java | 356 ++++
.../transaction/CDOSingleTransactionStrategy.java | 96 +
.../cdo/transaction/CDOTimeStampContextImpl.java | 64 +
.../cdo/transaction/CDOTransactionImpl.java | 1613 ++++++++++++++
.../internal/cdo/transaction/CDOXASavepoint.java | 41 +
.../transaction/CDOXATransactionCommitContext.java | 196 ++
.../cdo/transaction/CDOXATransactionImpl.java | 608 ++++++
.../internal/cdo/util/CDOPackageRegistryImpl.java | 446 ----
.../cdo/util/CDOPackageTypeRegistryImpl.java | 266 ---
.../cdo/util/CDOViewProviderRegistryImpl.java | 279 ---
.../cdo/util/CDOViewSetPackageRegistryImpl.java | 79 -
.../emf/internal/cdo/util/ChannelInjector.java | 74 -
.../org/eclipse/emf/internal/cdo/util/FSMUtil.java | 6 +-
.../eclipse/emf/internal/cdo/util/ModelUtil.java | 26 +-
.../cdo/util/PluginContainerViewProvider.java | 79 -
.../emf/internal/cdo/util/RevisionAdjuster.java | 2 +-
.../eclipse/emf/internal/cdo/util/SessionUtil.java | 110 -
.../emf/internal/cdo/view/CDOAuditImpl.java | 117 ++
.../cdo/view/CDORevisionPrefetchingPolicyImpl.java | 72 +
.../eclipse/emf/internal/cdo/view/CDOViewImpl.java | 2219 ++++++++++++++++++++
.../cdo/view/CDOViewProviderRegistryImpl.java | 279 +++
.../emf/internal/cdo/view/CDOViewSetImpl.java | 289 +++
.../cdo/view/CDOViewSetPackageRegistryImpl.java | 79 +
.../cdo/view/PluginContainerViewProvider.java | 79 +
.../org/eclipse/emf/spi/cdo/CDOElementProxy.java | 31 +
.../emf/spi/cdo/CDOObjectConflictResolver.java | 370 ++++
.../emf/spi/cdo/CDOTransactionStrategy.java | 36 +
.../emf/spi/cdo/InternalCDOCommitContext.java | 31 +
.../eclipse/emf/spi/cdo/InternalCDOLoadable.java | 20 +
.../org/eclipse/emf/spi/cdo/InternalCDOObject.java | 65 +
.../eclipse/emf/spi/cdo/InternalCDOSession.java | 60 +
.../emf/spi/cdo/InternalCDOTransaction.java | 60 +
.../org/eclipse/emf/spi/cdo/InternalCDOView.java | 101 +
.../eclipse/emf/spi/cdo/InternalCDOViewSet.java | 28 +
.../emf/spi/cdo/ObjectConflictResolver.java | 371 ----
plugins/org.eclipse.net4j.db.postgresql/.project | 6 +
plugins/org.eclipse.net4j.defs/.project | 6 +
plugins/org.eclipse.net4j.ui.defs/.project | 6 +
plugins/org.eclipse.net4j.util.defs/.project | 6 +
477 files changed, 15457 insertions(+), 14639 deletions(-)
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOAdapterPolicy.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOAudit.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOCollectionLoadingPolicy.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOCommitContext.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOConflictResolver.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOEvent.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOFeatureAnalyzer.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOFetchRuleManager.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOQuery.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDORevisionManager.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDORevisionPrefetchingPolicy.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSavepoint.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSession.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSessionConfiguration.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSessionEvent.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSessionInvalidationEvent.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSessionPackageManager.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSessionProtocol.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOTimeStampContext.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOTransaction.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOTransactionConflictEvent.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOTransactionFinishedEvent.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOTransactionHandler.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOTransactionStartedEvent.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOUserTransaction.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOView.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOViewEvent.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOViewInvalidationEvent.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOViewResourcesEvent.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOViewSet.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOXATransaction.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOCollectionLoadingPolicy.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOPackageRegistry.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOPackageType.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOPackageTypeRegistry.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDORevisionManager.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSession.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionConfiguration.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionEvent.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionInvalidationEvent.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionPackageManager.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionProtocol.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOAutoAttacher.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOCommitContext.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOSavepoint.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTimeStampContext.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransaction.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransactionConflictEvent.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransactionFinishedEvent.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransactionHandler.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransactionStartedEvent.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOUserTransaction.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOXATransaction.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/AbstractCDOViewProvider.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOAutoAttacher.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDODefaultTransactionHandler.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOEvent.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOPackageRegistry.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOPackageType.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOPackageTypeRegistry.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOViewAdapter.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOViewProvider.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOViewProviderRegistry.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/ManagedContainerViewProvider.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/AbstractCDOViewProvider.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOAdapterPolicy.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOAudit.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOConflictResolver.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOFeatureAnalyzer.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOFetchRuleManager.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOQuery.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDORevisionPrefetchingPolicy.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOView.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewAdapter.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewEvent.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewInvalidationEvent.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewProvider.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewProviderRegistry.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewResourcesEvent.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewSet.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/ManagedContainerViewProvider.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOAbstractSavepoint.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOAuditImpl.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOCollectionLoadingPolicyImpl.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDORevisionManagerImpl.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDORevisionPrefetchingPolicyImpl.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSavepointImpl.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionConfigurationImpl.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionFactory.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionImpl.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionPackageManagerImpl.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSingleTransactionStrategy.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOTimeStampContextImpl.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOTransactionImpl.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOTransactionStrategy.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewSetImpl.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOXASavepoint.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOXATransactionCommitContext.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOXATransactionImpl.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/InternalCDOCommitContext.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/InternalCDOLoadable.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/InternalCDOObject.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/InternalCDOSession.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/InternalCDOTransaction.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/InternalCDOView.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/InternalCDOViewSet.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/ChannelInjector.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/revision/CDOElementProxy.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOCollectionLoadingPolicyImpl.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOPackageRegistryImpl.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOPackageTypeRegistryImpl.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDORevisionManagerImpl.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionConfigurationImpl.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionFactory.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionImpl.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionPackageManagerImpl.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/SessionUtil.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOAbstractSavepoint.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOSavepointImpl.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOSingleTransactionStrategy.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTimeStampContextImpl.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOXASavepoint.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOXATransactionCommitContext.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOXATransactionImpl.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CDOPackageRegistryImpl.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CDOPackageTypeRegistryImpl.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CDOViewProviderRegistryImpl.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CDOViewSetPackageRegistryImpl.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ChannelInjector.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/PluginContainerViewProvider.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/SessionUtil.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOAuditImpl.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDORevisionPrefetchingPolicyImpl.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewImpl.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewProviderRegistryImpl.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewSetImpl.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewSetPackageRegistryImpl.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/PluginContainerViewProvider.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOElementProxy.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOObjectConflictResolver.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOTransactionStrategy.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/InternalCDOCommitContext.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/InternalCDOLoadable.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/InternalCDOObject.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/InternalCDOSession.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/InternalCDOTransaction.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/InternalCDOView.java
create mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/InternalCDOViewSet.java
delete mode 100644 plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/ObjectConflictResolver.java
diff --git a/plugins/org.eclipse.emf.cdo.defs/.project b/plugins/org.eclipse.emf.cdo.defs/.project
index 494378ebc7..e84998c6f8 100644
--- a/plugins/org.eclipse.emf.cdo.defs/.project
+++ b/plugins/org.eclipse.emf.cdo.defs/.project
@@ -20,9 +20,15 @@
* The following features are supported: *
* If the meaning of the 'Name' attribute isn't clear, there really should be more of a description here... *
* + * * @return the value of the 'Name' attribute. * @see #setName(String) * @see org.eclipse.emf.cdo.tests.model4.model4Package#getContainedElementNoOpposite_Name() @@ -47,9 +46,11 @@ public interface ContainedElementNoOpposite extends EObject String getName(); /** - * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model4.ContainedElementNoOpposite#getName Name}' attribute. - * - * @param value the new value of the 'Name' attribute. + * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model4.ContainedElementNoOpposite#getName Name}' + * attribute. + * + * @param value + * the new value of the 'Name' attribute. * @see #getName() * @generated */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefMapNonContained.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefMapNonContained.java index 4194e8d56d..b8ce941938 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefMapNonContained.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefMapNonContained.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation * - * $Id: GenRefMapNonContained.java,v 1.2 2008-12-28 17:56:41 estepper Exp $ + * $Id: GenRefMapNonContained.java,v 1.3 2009-01-10 07:56:19 estepper Exp $ */ package org.eclipse.emf.cdo.tests.model4; @@ -18,14 +18,13 @@ import org.eclipse.emf.ecore.EObject; /** * A representation of the model object 'Gen Ref Map Non Contained'. - * ** The following features are supported: *
* If the meaning of the 'Elements' containment reference list isn't clear, there really should be more of a * description here... *
* + * * @return the value of the 'Elements' map. * @see org.eclipse.emf.cdo.tests.model4.model4Package#getGenRefMapNonContained_Elements() - * @model mapType="org.eclipse.emf.cdo.tests.model4.StringToEObject* The following features are supported: *
* If the meaning of the 'Elements' containment reference list isn't clear, there really should be more of a * description here... *
* + * * @return the value of the 'Elements' containment reference list. * @see org.eclipse.emf.cdo.tests.model4.model4Package#getGenRefMultiContained_Elements() * @model containment="true" diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefMultiNUNonContained.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefMultiNUNonContained.java index 34b5415237..6665dbf6b9 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefMultiNUNonContained.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefMultiNUNonContained.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation * - * $Id: GenRefMultiNUNonContained.java,v 1.2 2008-12-28 17:56:41 estepper Exp $ + * $Id: GenRefMultiNUNonContained.java,v 1.3 2009-01-10 07:56:19 estepper Exp $ */ package org.eclipse.emf.cdo.tests.model4; @@ -18,14 +18,13 @@ import org.eclipse.emf.ecore.EObject; /** * A representation of the model object 'Gen Ref Multi NU Non Contained'. - * ** The following features are supported: *
* If the meaning of the 'Elements' reference list isn't clear, there really should be more of a description * here... *
* + * * @return the value of the 'Elements' reference list. * @see org.eclipse.emf.cdo.tests.model4.model4Package#getGenRefMultiNUNonContained_Elements() * @model resolveProxies="false" diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefMultiNonContained.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefMultiNonContained.java index 968adca251..8a55006c33 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefMultiNonContained.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefMultiNonContained.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation * - * $Id: GenRefMultiNonContained.java,v 1.4 2008-12-28 17:56:41 estepper Exp $ + * $Id: GenRefMultiNonContained.java,v 1.5 2009-01-10 07:56:19 estepper Exp $ */ package org.eclipse.emf.cdo.tests.model4; @@ -18,14 +18,13 @@ import org.eclipse.emf.ecore.EObject; /** * A representation of the model object 'Gen Ref Multi Non Contained'. - * ** The following features are supported: *
* If the meaning of the 'Elements' reference list isn't clear, there really should be more of a description * here... *
* + * * @return the value of the 'Elements' reference list. * @see org.eclipse.emf.cdo.tests.model4.model4Package#getGenRefMultiNonContained_Elements() * @model diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefSingleContained.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefSingleContained.java index 39d5a5a9e9..14e772f187 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefSingleContained.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefSingleContained.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation * - * $Id: GenRefSingleContained.java,v 1.4 2008-12-28 17:56:41 estepper Exp $ + * $Id: GenRefSingleContained.java,v 1.5 2009-01-10 07:56:19 estepper Exp $ */ package org.eclipse.emf.cdo.tests.model4; @@ -17,14 +17,13 @@ import org.eclipse.emf.ecore.EObject; /** * A representation of the model object 'Gen Ref Single Contained'. - * ** The following features are supported: *
* If the meaning of the 'Element' containment reference isn't clear, there really should be more of a * description here... *
* + * * @return the value of the 'Element' containment reference. * @see #setElement(EObject) * @see org.eclipse.emf.cdo.tests.model4.model4Package#getGenRefSingleContained_Element() @@ -48,9 +47,11 @@ public interface GenRefSingleContained extends EObject EObject getElement(); /** - * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model4.GenRefSingleContained#getElement Element}' containment reference. - * - * @param value the new value of the 'Element' containment reference. + * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model4.GenRefSingleContained#getElement Element}' + * containment reference. + * + * @param value + * the new value of the 'Element' containment reference. * @see #getElement() * @generated */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefSingleNonContained.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefSingleNonContained.java index 2e52db2721..c4e77002e3 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefSingleNonContained.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefSingleNonContained.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation * - * $Id: GenRefSingleNonContained.java,v 1.4 2008-12-28 17:56:41 estepper Exp $ + * $Id: GenRefSingleNonContained.java,v 1.5 2009-01-10 07:56:19 estepper Exp $ */ package org.eclipse.emf.cdo.tests.model4; @@ -17,14 +17,13 @@ import org.eclipse.emf.ecore.EObject; /** * A representation of the model object 'Gen Ref Single Non Contained'. - * ** The following features are supported: *
* If the meaning of the 'Element' reference isn't clear, there really should be more of a description * here... *
* + * * @return the value of the 'Element' reference. * @see #setElement(EObject) * @see org.eclipse.emf.cdo.tests.model4.model4Package#getGenRefSingleNonContained_Element() @@ -48,9 +47,11 @@ public interface GenRefSingleNonContained extends EObject EObject getElement(); /** - * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model4.GenRefSingleNonContained#getElement Element}' reference. - * - * @param value the new value of the 'Element' reference. + * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model4.GenRefSingleNonContained#getElement + * Element}' reference. + * + * @param value + * the new value of the 'Element' reference. * @see #getElement() * @generated */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplContainedElementNPL.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplContainedElementNPL.java index 6c4e11c187..d5c2bfeffc 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplContainedElementNPL.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplContainedElementNPL.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation * - * $Id: ImplContainedElementNPL.java,v 1.4 2008-12-28 17:56:41 estepper Exp $ + * $Id: ImplContainedElementNPL.java,v 1.5 2009-01-10 07:56:19 estepper Exp $ */ package org.eclipse.emf.cdo.tests.model4; @@ -18,8 +18,7 @@ import org.eclipse.emf.cdo.tests.model4interfaces.INamedElement; /** * A representation of the model object 'Impl Contained Element NPL'. - * - * + * * @see org.eclipse.emf.cdo.tests.model4.model4Package#getImplContainedElementNPL() * @model * @generated diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefContainedElement.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefContainedElement.java index 3206a2e273..d736ca3a2f 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefContainedElement.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefContainedElement.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation * - * $Id: ImplMultiRefContainedElement.java,v 1.4 2008-12-28 17:56:41 estepper Exp $ + * $Id: ImplMultiRefContainedElement.java,v 1.5 2009-01-10 07:56:19 estepper Exp $ */ package org.eclipse.emf.cdo.tests.model4; @@ -17,14 +17,13 @@ import org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainedElement; /** * A representation of the model object 'Impl Multi Ref Contained Element'. - * ** The following features are supported: *
* If the meaning of the 'Name' attribute isn't clear, there really should be more of a description here... *
* + * * @return the value of the 'Name' attribute. * @see #setName(String) * @see org.eclipse.emf.cdo.tests.model4.model4Package#getImplMultiRefContainedElement_Name() @@ -47,9 +46,11 @@ public interface ImplMultiRefContainedElement extends IMultiRefContainedElement String getName(); /** - * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model4.ImplMultiRefContainedElement#getName Name}' attribute. - * - * @param value the new value of the 'Name' attribute. + * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model4.ImplMultiRefContainedElement#getName Name}' + * attribute. + * + * @param value + * the new value of the 'Name' attribute. * @see #getName() * @generated */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefContainer.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefContainer.java index 96969a4f5a..350618b481 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefContainer.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefContainer.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation * - * $Id: ImplMultiRefContainer.java,v 1.4 2008-12-28 17:56:41 estepper Exp $ + * $Id: ImplMultiRefContainer.java,v 1.5 2009-01-10 07:56:19 estepper Exp $ */ package org.eclipse.emf.cdo.tests.model4; @@ -17,8 +17,7 @@ import org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainer; /** * A representation of the model object 'Impl Multi Ref Container'. - * - * + * * @see org.eclipse.emf.cdo.tests.model4.model4Package#getImplMultiRefContainer() * @model * @generated diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefContainerNPL.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefContainerNPL.java index 09aec6612a..46dc6ac422 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefContainerNPL.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefContainerNPL.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation * - * $Id: ImplMultiRefContainerNPL.java,v 1.4 2008-12-28 17:56:41 estepper Exp $ + * $Id: ImplMultiRefContainerNPL.java,v 1.5 2009-01-10 07:56:19 estepper Exp $ */ package org.eclipse.emf.cdo.tests.model4; @@ -17,8 +17,7 @@ import org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainerNPL; /** * A representation of the model object 'Impl Multi Ref Container NPL'. - * - * + * * @see org.eclipse.emf.cdo.tests.model4.model4Package#getImplMultiRefContainerNPL() * @model * @generated diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefNonContainedElement.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefNonContainedElement.java index ab81d01f1a..bf7dd085aa 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefNonContainedElement.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefNonContainedElement.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation * - * $Id: ImplMultiRefNonContainedElement.java,v 1.4 2008-12-28 17:56:41 estepper Exp $ + * $Id: ImplMultiRefNonContainedElement.java,v 1.5 2009-01-10 07:56:19 estepper Exp $ */ package org.eclipse.emf.cdo.tests.model4; @@ -17,14 +17,13 @@ import org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainedElement; /** * A representation of the model object 'Impl Multi Ref Non Contained Element'. * - * ** The following features are supported: *
* If the meaning of the 'Name' attribute isn't clear, there really should be more of a description here... *
* + * * @return the value of the 'Name' attribute. * @see #setName(String) * @see org.eclipse.emf.cdo.tests.model4.model4Package#getImplMultiRefNonContainedElement_Name() @@ -47,9 +46,11 @@ public interface ImplMultiRefNonContainedElement extends IMultiRefNonContainedEl String getName(); /** - * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model4.ImplMultiRefNonContainedElement#getName Name}' attribute. - * - * @param value the new value of the 'Name' attribute. + * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model4.ImplMultiRefNonContainedElement#getName + * Name}' attribute. + * + * @param value + * the new value of the 'Name' attribute. * @see #getName() * @generated */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefNonContainer.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefNonContainer.java index a37f4c05d3..325b354e16 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefNonContainer.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefNonContainer.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation * - * $Id: ImplMultiRefNonContainer.java,v 1.4 2008-12-28 17:56:41 estepper Exp $ + * $Id: ImplMultiRefNonContainer.java,v 1.5 2009-01-10 07:56:19 estepper Exp $ */ package org.eclipse.emf.cdo.tests.model4; @@ -17,8 +17,7 @@ import org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainer; /** * A representation of the model object 'Impl Multi Ref Non Container'. - * - * + * * @see org.eclipse.emf.cdo.tests.model4.model4Package#getImplMultiRefNonContainer() * @model * @generated diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefNonContainerNPL.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefNonContainerNPL.java index 6bd408595f..c2095e9e60 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefNonContainerNPL.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefNonContainerNPL.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation * - * $Id: ImplMultiRefNonContainerNPL.java,v 1.4 2008-12-28 17:56:41 estepper Exp $ + * $Id: ImplMultiRefNonContainerNPL.java,v 1.5 2009-01-10 07:56:19 estepper Exp $ */ package org.eclipse.emf.cdo.tests.model4; @@ -17,8 +17,7 @@ import org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainerNPL; /** * A representation of the model object 'Impl Multi Ref Non Container NPL'. - * - * + * * @see org.eclipse.emf.cdo.tests.model4.model4Package#getImplMultiRefNonContainerNPL() * @model * @generated diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefContainedElement.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefContainedElement.java index 617005b156..63ad77f6de 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefContainedElement.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefContainedElement.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation * - * $Id: ImplSingleRefContainedElement.java,v 1.4 2008-12-28 17:56:41 estepper Exp $ + * $Id: ImplSingleRefContainedElement.java,v 1.5 2009-01-10 07:56:19 estepper Exp $ */ package org.eclipse.emf.cdo.tests.model4; @@ -17,14 +17,13 @@ import org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainedElement; /** * A representation of the model object 'Impl Single Ref Contained Element'. * - * ** The following features are supported: *
* If the meaning of the 'Name' attribute isn't clear, there really should be more of a description here... *
* + * * @return the value of the 'Name' attribute. * @see #setName(String) * @see org.eclipse.emf.cdo.tests.model4.model4Package#getImplSingleRefContainedElement_Name() @@ -47,9 +46,11 @@ public interface ImplSingleRefContainedElement extends ISingleRefContainedElemen String getName(); /** - * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model4.ImplSingleRefContainedElement#getName Name}' attribute. - * - * @param value the new value of the 'Name' attribute. + * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model4.ImplSingleRefContainedElement#getName Name} + * ' attribute. + * + * @param value + * the new value of the 'Name' attribute. * @see #getName() * @generated */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefContainer.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefContainer.java index e3ab8feafb..57c3a8d8a4 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefContainer.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefContainer.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation * - * $Id: ImplSingleRefContainer.java,v 1.4 2008-12-28 17:56:40 estepper Exp $ + * $Id: ImplSingleRefContainer.java,v 1.5 2009-01-10 07:56:19 estepper Exp $ */ package org.eclipse.emf.cdo.tests.model4; @@ -17,8 +17,7 @@ import org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainer; /** * A representation of the model object 'Impl Single Ref Container'. - * - * + * * @see org.eclipse.emf.cdo.tests.model4.model4Package#getImplSingleRefContainer() * @model * @generated diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefContainerNPL.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefContainerNPL.java index 7358208325..c03c66d512 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefContainerNPL.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefContainerNPL.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation * - * $Id: ImplSingleRefContainerNPL.java,v 1.4 2008-12-28 17:56:41 estepper Exp $ + * $Id: ImplSingleRefContainerNPL.java,v 1.5 2009-01-10 07:56:19 estepper Exp $ */ package org.eclipse.emf.cdo.tests.model4; @@ -17,8 +17,7 @@ import org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainerNPL; /** * A representation of the model object 'Impl Single Ref Container NPL'. - * - * + * * @see org.eclipse.emf.cdo.tests.model4.model4Package#getImplSingleRefContainerNPL() * @model * @generated diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefNonContainedElement.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefNonContainedElement.java index 11465c94e8..fd42454679 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefNonContainedElement.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefNonContainedElement.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation * - * $Id: ImplSingleRefNonContainedElement.java,v 1.4 2008-12-28 17:56:41 estepper Exp $ + * $Id: ImplSingleRefNonContainedElement.java,v 1.5 2009-01-10 07:56:19 estepper Exp $ */ package org.eclipse.emf.cdo.tests.model4; @@ -17,14 +17,13 @@ import org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainedElement; /** * A representation of the model object 'Impl Single Ref Non Contained Element'. * - * ** The following features are supported: *
* If the meaning of the 'Name' attribute isn't clear, there really should be more of a description here... *
* + * * @return the value of the 'Name' attribute. * @see #setName(String) * @see org.eclipse.emf.cdo.tests.model4.model4Package#getImplSingleRefNonContainedElement_Name() @@ -47,9 +46,11 @@ public interface ImplSingleRefNonContainedElement extends ISingleRefNonContained String getName(); /** - * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model4.ImplSingleRefNonContainedElement#getName Name}' attribute. - * - * @param value the new value of the 'Name' attribute. + * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model4.ImplSingleRefNonContainedElement#getName + * Name}' attribute. + * + * @param value + * the new value of the 'Name' attribute. * @see #getName() * @generated */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefNonContainer.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefNonContainer.java index d7c0867950..b5fd4fbbed 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefNonContainer.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefNonContainer.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation * - * $Id: ImplSingleRefNonContainer.java,v 1.4 2008-12-28 17:56:41 estepper Exp $ + * $Id: ImplSingleRefNonContainer.java,v 1.5 2009-01-10 07:56:19 estepper Exp $ */ package org.eclipse.emf.cdo.tests.model4; @@ -17,8 +17,7 @@ import org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainer; /** * A representation of the model object 'Impl Single Ref Non Container'. - * - * + * * @see org.eclipse.emf.cdo.tests.model4.model4Package#getImplSingleRefNonContainer() * @model * @generated diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefNonContainerNPL.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefNonContainerNPL.java index 1ea9e99ad6..9f74918e15 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefNonContainerNPL.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefNonContainerNPL.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation * - * $Id: ImplSingleRefNonContainerNPL.java,v 1.4 2008-12-28 17:56:41 estepper Exp $ + * $Id: ImplSingleRefNonContainerNPL.java,v 1.5 2009-01-10 07:56:19 estepper Exp $ */ package org.eclipse.emf.cdo.tests.model4; @@ -17,8 +17,7 @@ import org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainerNPL; /** * A representation of the model object 'Impl Single Ref Non Container NPL'. * - * - * + * * @see org.eclipse.emf.cdo.tests.model4.model4Package#getImplSingleRefNonContainerNPL() * @model * @generated diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/MultiContainedElement.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/MultiContainedElement.java index 406a832897..442fc86c21 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/MultiContainedElement.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/MultiContainedElement.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation * - * $Id: MultiContainedElement.java,v 1.4 2008-12-28 17:56:41 estepper Exp $ + * $Id: MultiContainedElement.java,v 1.5 2009-01-10 07:56:19 estepper Exp $ */ package org.eclipse.emf.cdo.tests.model4; @@ -17,15 +17,14 @@ import org.eclipse.emf.ecore.EObject; /** * A representation of the model object 'Multi Contained Element'. - * ** The following features are supported: *
* If the meaning of the 'Name' attribute isn't clear, there really should be more of a description here... *
* + * * @return the value of the 'Name' attribute. * @see #setName(String) * @see org.eclipse.emf.cdo.tests.model4.model4Package#getMultiContainedElement_Name() @@ -48,23 +47,25 @@ public interface MultiContainedElement extends EObject String getName(); /** - * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model4.MultiContainedElement#getName Name}' attribute. - * - * @param value the new value of the 'Name' attribute. + * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model4.MultiContainedElement#getName Name}' + * attribute. + * + * @param value + * the new value of the 'Name' attribute. * @see #getName() * @generated */ void setName(String value); /** - * Returns the value of the 'Parent' container reference. - * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model4.RefMultiContained#getElements Elements}'. - * + * Returns the value of the 'Parent' container reference. It is bidirectional and its opposite is ' + * {@link org.eclipse.emf.cdo.tests.model4.RefMultiContained#getElements Elements}'. ** If the meaning of the 'Parent' container reference isn't clear, there really should be more of a * description here... *
* + * * @return the value of the 'Parent' container reference. * @see #setParent(RefMultiContained) * @see org.eclipse.emf.cdo.tests.model4.model4Package#getMultiContainedElement_Parent() @@ -75,9 +76,11 @@ public interface MultiContainedElement extends EObject RefMultiContained getParent(); /** - * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model4.MultiContainedElement#getParent Parent}' container reference. - * - * @param value the new value of the 'Parent' container reference. + * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model4.MultiContainedElement#getParent Parent}' + * container reference. + * + * @param value + * the new value of the 'Parent' container reference. * @see #getParent() * @generated */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/MultiNonContainedElement.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/MultiNonContainedElement.java index b738a3a8c4..db703950aa 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/MultiNonContainedElement.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/MultiNonContainedElement.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation * - * $Id: MultiNonContainedElement.java,v 1.5 2008-12-28 17:56:41 estepper Exp $ + * $Id: MultiNonContainedElement.java,v 1.6 2009-01-10 07:56:19 estepper Exp $ */ package org.eclipse.emf.cdo.tests.model4; @@ -17,15 +17,14 @@ import org.eclipse.emf.ecore.EObject; /** * A representation of the model object 'Multi Non Contained Element'. - * ** The following features are supported: *
* If the meaning of the 'Name' attribute isn't clear, there really should be more of a description here... *
* + * * @return the value of the 'Name' attribute. * @see #setName(String) * @see org.eclipse.emf.cdo.tests.model4.model4Package#getMultiNonContainedElement_Name() @@ -48,24 +47,26 @@ public interface MultiNonContainedElement extends EObject String getName(); /** - * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model4.MultiNonContainedElement#getName Name}' attribute. - * - * @param value the new value of the 'Name' attribute. + * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model4.MultiNonContainedElement#getName Name}' + * attribute. + * + * @param value + * the new value of the 'Name' attribute. * @see #getName() * @generated */ void setName(String value); /** - * Returns the value of the 'Parent' reference. - * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model4.RefMultiNonContained#getElements Elements}'. - * ** If the meaning of the 'Parent' container reference isn't clear, there really should be more of a * description here... *
* + * * @return the value of the 'Parent' reference. * @see #setParent(RefMultiNonContained) * @see org.eclipse.emf.cdo.tests.model4.model4Package#getMultiNonContainedElement_Parent() @@ -76,9 +77,11 @@ public interface MultiNonContainedElement extends EObject RefMultiNonContained getParent(); /** - * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model4.MultiNonContainedElement#getParent Parent}' reference. - * - * @param value the new value of the 'Parent' reference. + * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model4.MultiNonContainedElement#getParent Parent}' + * reference. + * + * @param value + * the new value of the 'Parent' reference. * @see #getParent() * @generated */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiContained.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiContained.java index fd6aa4a10a..475a87f350 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiContained.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiContained.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation * - * $Id: RefMultiContained.java,v 1.4 2008-12-28 17:56:41 estepper Exp $ + * $Id: RefMultiContained.java,v 1.5 2009-01-10 07:56:19 estepper Exp $ */ package org.eclipse.emf.cdo.tests.model4; @@ -32,15 +32,15 @@ import org.eclipse.emf.ecore.EObject; public interface RefMultiContained extends EObject { /** - * Returns the value of the 'Elements' containment reference list. - * The list contents are of type {@link org.eclipse.emf.cdo.tests.model4.MultiContainedElement}. - * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model4.MultiContainedElement#getParent Parent}'. - * + * Returns the value of the 'Elements' containment reference list. The list contents are of type + * {@link org.eclipse.emf.cdo.tests.model4.MultiContainedElement}. It is bidirectional and its opposite is ' + * {@link org.eclipse.emf.cdo.tests.model4.MultiContainedElement#getParent Parent}'. ** If the meaning of the 'Elements' containment reference list isn't clear, there really should be more of a * description here... *
* + * * @return the value of the 'Elements' containment reference list. * @see org.eclipse.emf.cdo.tests.model4.model4Package#getRefMultiContained_Elements() * @see org.eclipse.emf.cdo.tests.model4.MultiContainedElement#getParent diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiContainedNPL.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiContainedNPL.java index 0911d2853a..31c23be100 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiContainedNPL.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiContainedNPL.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation * - * $Id: RefMultiContainedNPL.java,v 1.4 2008-12-28 17:56:41 estepper Exp $ + * $Id: RefMultiContainedNPL.java,v 1.5 2009-01-10 07:56:19 estepper Exp $ */ package org.eclipse.emf.cdo.tests.model4; @@ -18,14 +18,13 @@ import org.eclipse.emf.ecore.EObject; /** * A representation of the model object 'Ref Multi Contained NPL'. - * ** The following features are supported: *
* If the meaning of the 'Elements' containment reference list isn't clear, there really should be more of a * description here... *
* + * * @return the value of the 'Elements' containment reference list. * @see org.eclipse.emf.cdo.tests.model4.model4Package#getRefMultiContainedNPL_Elements() * @model containment="true" diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiNonContained.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiNonContained.java index 31c84a28ba..8b513e351f 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiNonContained.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiNonContained.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation * - * $Id: RefMultiNonContained.java,v 1.5 2008-12-28 17:56:41 estepper Exp $ + * $Id: RefMultiNonContained.java,v 1.6 2009-01-10 07:56:19 estepper Exp $ */ package org.eclipse.emf.cdo.tests.model4; @@ -18,14 +18,13 @@ import org.eclipse.emf.ecore.EObject; /** * A representation of the model object 'Ref Multi Non Contained'. - * ** The following features are supported: *
* If the meaning of the 'Elements' containment reference list isn't clear, there really should be more of a * description here... *
* + * * @return the value of the 'Elements' reference list. * @see org.eclipse.emf.cdo.tests.model4.model4Package#getRefMultiNonContained_Elements() * @see org.eclipse.emf.cdo.tests.model4.MultiNonContainedElement#getParent diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiNonContainedNPL.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiNonContainedNPL.java index 776f870a3e..25157411c7 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiNonContainedNPL.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiNonContainedNPL.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation * - * $Id: RefMultiNonContainedNPL.java,v 1.4 2008-12-28 17:56:41 estepper Exp $ + * $Id: RefMultiNonContainedNPL.java,v 1.5 2009-01-10 07:56:19 estepper Exp $ */ package org.eclipse.emf.cdo.tests.model4; @@ -18,14 +18,13 @@ import org.eclipse.emf.ecore.EObject; /** * A representation of the model object 'Ref Multi Non Contained NPL'. - * ** The following features are supported: *
* If the meaning of the 'Elements' reference list isn't clear, there really should be more of a description * here... *
* + * * @return the value of the 'Elements' reference list. * @see org.eclipse.emf.cdo.tests.model4.model4Package#getRefMultiNonContainedNPL_Elements() * @model diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefSingleContained.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefSingleContained.java index a81f391a97..2cafd2f727 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefSingleContained.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefSingleContained.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation * - * $Id: RefSingleContained.java,v 1.4 2008-12-28 17:56:41 estepper Exp $ + * $Id: RefSingleContained.java,v 1.5 2009-01-10 07:56:19 estepper Exp $ */ package org.eclipse.emf.cdo.tests.model4; @@ -17,14 +17,13 @@ import org.eclipse.emf.ecore.EObject; /** * A representation of the model object 'Ref Single Contained'. - * ** The following features are supported: *
* If the meaning of the 'Element' containment reference isn't clear, there really should be more of a * description here... *
* + * * @return the value of the 'Element' containment reference. * @see #setElement(SingleContainedElement) * @see org.eclipse.emf.cdo.tests.model4.model4Package#getRefSingleContained_Element() @@ -50,9 +49,11 @@ public interface RefSingleContained extends EObject SingleContainedElement getElement(); /** - * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model4.RefSingleContained#getElement Element}' containment reference. - * - * @param value the new value of the 'Element' containment reference. + * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model4.RefSingleContained#getElement Element}' + * containment reference. + * + * @param value + * the new value of the 'Element' containment reference. * @see #getElement() * @generated */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefSingleContainedNPL.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefSingleContainedNPL.java index 1ac87aa92b..c86937f8bb 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefSingleContainedNPL.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefSingleContainedNPL.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation * - * $Id: RefSingleContainedNPL.java,v 1.4 2008-12-28 17:56:41 estepper Exp $ + * $Id: RefSingleContainedNPL.java,v 1.5 2009-01-10 07:56:19 estepper Exp $ */ package org.eclipse.emf.cdo.tests.model4; @@ -17,14 +17,13 @@ import org.eclipse.emf.ecore.EObject; /** * A representation of the model object 'Ref Single Contained NPL'. - * ** The following features are supported: *
* If the meaning of the 'Element' containment reference isn't clear, there really should be more of a * description here... *
* + * * @return the value of the 'Element' containment reference. * @see #setElement(ContainedElementNoOpposite) * @see org.eclipse.emf.cdo.tests.model4.model4Package#getRefSingleContainedNPL_Element() @@ -48,9 +47,11 @@ public interface RefSingleContainedNPL extends EObject ContainedElementNoOpposite getElement(); /** - * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model4.RefSingleContainedNPL#getElement Element}' containment reference. - * - * @param value the new value of the 'Element' containment reference. + * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model4.RefSingleContainedNPL#getElement Element}' + * containment reference. + * + * @param value + * the new value of the 'Element' containment reference. * @see #getElement() * @generated */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefSingleNonContained.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefSingleNonContained.java index ff5e985d92..7e2e09ae7d 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefSingleNonContained.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefSingleNonContained.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation * - * $Id: RefSingleNonContained.java,v 1.4 2008-12-28 17:56:41 estepper Exp $ + * $Id: RefSingleNonContained.java,v 1.5 2009-01-10 07:56:19 estepper Exp $ */ package org.eclipse.emf.cdo.tests.model4; @@ -17,14 +17,13 @@ import org.eclipse.emf.ecore.EObject; /** * A representation of the model object 'Ref Single Non Contained'. - * ** The following features are supported: *
* If the meaning of the 'Element' reference isn't clear, there really should be more of a description * here... *
* + * * @return the value of the 'Element' reference. * @see #setElement(SingleNonContainedElement) * @see org.eclipse.emf.cdo.tests.model4.model4Package#getRefSingleNonContained_Element() @@ -51,9 +50,11 @@ public interface RefSingleNonContained extends EObject SingleNonContainedElement getElement(); /** - * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model4.RefSingleNonContained#getElement Element}' reference. - * - * @param value the new value of the 'Element' reference. + * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model4.RefSingleNonContained#getElement Element}' + * reference. + * + * @param value + * the new value of the 'Element' reference. * @see #getElement() * @generated */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefSingleNonContainedNPL.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefSingleNonContainedNPL.java index d3b328db91..d27cbd7d9c 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefSingleNonContainedNPL.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefSingleNonContainedNPL.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation * - * $Id: RefSingleNonContainedNPL.java,v 1.4 2008-12-28 17:56:41 estepper Exp $ + * $Id: RefSingleNonContainedNPL.java,v 1.5 2009-01-10 07:56:19 estepper Exp $ */ package org.eclipse.emf.cdo.tests.model4; @@ -17,14 +17,13 @@ import org.eclipse.emf.ecore.EObject; /** * A representation of the model object 'Ref Single Non Contained NPL'. - * ** The following features are supported: *
* If the meaning of the 'Element' reference isn't clear, there really should be more of a description * here... *
* + * * @return the value of the 'Element' reference. * @see #setElement(ContainedElementNoOpposite) * @see org.eclipse.emf.cdo.tests.model4.model4Package#getRefSingleNonContainedNPL_Element() @@ -48,9 +47,11 @@ public interface RefSingleNonContainedNPL extends EObject ContainedElementNoOpposite getElement(); /** - * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model4.RefSingleNonContainedNPL#getElement Element}' reference. - * - * @param value the new value of the 'Element' reference. + * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model4.RefSingleNonContainedNPL#getElement + * Element}' reference. + * + * @param value + * the new value of the 'Element' reference. * @see #getElement() * @generated */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/SingleContainedElement.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/SingleContainedElement.java index 9853cebdfc..c69bc5a5df 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/SingleContainedElement.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/SingleContainedElement.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation * - * $Id: SingleContainedElement.java,v 1.4 2008-12-28 17:56:41 estepper Exp $ + * $Id: SingleContainedElement.java,v 1.5 2009-01-10 07:56:19 estepper Exp $ */ package org.eclipse.emf.cdo.tests.model4; @@ -17,15 +17,14 @@ import org.eclipse.emf.ecore.EObject; /** * A representation of the model object 'Single Contained Element'. - * ** The following features are supported: *
* If the meaning of the 'Name' attribute isn't clear, there really should be more of a description here... *
* + * * @return the value of the 'Name' attribute. * @see #setName(String) * @see org.eclipse.emf.cdo.tests.model4.model4Package#getSingleContainedElement_Name() @@ -48,23 +47,25 @@ public interface SingleContainedElement extends EObject String getName(); /** - * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model4.SingleContainedElement#getName Name}' attribute. - * - * @param value the new value of the 'Name' attribute. + * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model4.SingleContainedElement#getName Name}' + * attribute. + * + * @param value + * the new value of the 'Name' attribute. * @see #getName() * @generated */ void setName(String value); /** - * Returns the value of the 'Parent' container reference. - * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model4.RefSingleContained#getElement Element}'. - * + * Returns the value of the 'Parent' container reference. It is bidirectional and its opposite is ' + * {@link org.eclipse.emf.cdo.tests.model4.RefSingleContained#getElement Element}'. ** If the meaning of the 'Parent' container reference isn't clear, there really should be more of a * description here... *
* + * * @return the value of the 'Parent' container reference. * @see #setParent(RefSingleContained) * @see org.eclipse.emf.cdo.tests.model4.model4Package#getSingleContainedElement_Parent() @@ -75,9 +76,11 @@ public interface SingleContainedElement extends EObject RefSingleContained getParent(); /** - * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model4.SingleContainedElement#getParent Parent}' container reference. - * - * @param value the new value of the 'Parent' container reference. + * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model4.SingleContainedElement#getParent Parent}' + * container reference. + * + * @param value + * the new value of the 'Parent' container reference. * @see #getParent() * @generated */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/SingleNonContainedElement.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/SingleNonContainedElement.java index 59d0b691aa..b667226ca3 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/SingleNonContainedElement.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/SingleNonContainedElement.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation * - * $Id: SingleNonContainedElement.java,v 1.4 2008-12-28 17:56:41 estepper Exp $ + * $Id: SingleNonContainedElement.java,v 1.5 2009-01-10 07:56:19 estepper Exp $ */ package org.eclipse.emf.cdo.tests.model4; @@ -17,15 +17,14 @@ import org.eclipse.emf.ecore.EObject; /** * A representation of the model object 'Single Non Contained Element'. - * ** The following features are supported: *
* If the meaning of the 'Name' attribute isn't clear, there really should be more of a description here... *
* + * * @return the value of the 'Name' attribute. * @see #setName(String) * @see org.eclipse.emf.cdo.tests.model4.model4Package#getSingleNonContainedElement_Name() @@ -48,23 +47,25 @@ public interface SingleNonContainedElement extends EObject String getName(); /** - * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model4.SingleNonContainedElement#getName Name}' attribute. - * - * @param value the new value of the 'Name' attribute. + * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model4.SingleNonContainedElement#getName Name}' + * attribute. + * + * @param value + * the new value of the 'Name' attribute. * @see #getName() * @generated */ void setName(String value); /** - * Returns the value of the 'Parent' reference. - * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model4.RefSingleNonContained#getElement Element}'. - * ** If the meaning of the 'Parent' reference isn't clear, there really should be more of a description here... *
* + * * @return the value of the 'Parent' reference. * @see #setParent(RefSingleNonContained) * @see org.eclipse.emf.cdo.tests.model4.model4Package#getSingleNonContainedElement_Parent() @@ -75,9 +76,11 @@ public interface SingleNonContainedElement extends EObject RefSingleNonContained getParent(); /** - * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model4.SingleNonContainedElement#getParent Parent}' reference. - * - * @param value the new value of the 'Parent' reference. + * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model4.SingleNonContainedElement#getParent Parent} + * ' reference. + * + * @param value + * the new value of the 'Parent' reference. * @see #getParent() * @generated */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ContainedElementNoOppositeImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ContainedElementNoOppositeImpl.java index 82deb24291..d33e9174b2 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ContainedElementNoOppositeImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ContainedElementNoOppositeImpl.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation * - * $Id: ContainedElementNoOppositeImpl.java,v 1.4 2008-12-28 17:56:41 estepper Exp $ + * $Id: ContainedElementNoOppositeImpl.java,v 1.5 2009-01-10 07:56:19 estepper Exp $ */ package org.eclipse.emf.cdo.tests.model4.impl; @@ -25,16 +25,17 @@ import org.eclipse.emf.ecore.EClass; ** The following features are implemented: *
* The following features are implemented: *
* The following features are implemented: *
* The following features are implemented: *
* The following features are implemented: *
* The following features are implemented: *
* The following features are implemented: *
* The following features are implemented: *
* The following features are implemented: *
* The following features are implemented: *
* The following features are implemented: *
* The following features are implemented: *
* The following features are implemented: *
* The following features are implemented: *
* The following features are implemented: *
* The following features are implemented: *
* The following features are implemented: *
* The following features are implemented: *
* The following features are implemented: *
* The following features are implemented: *
* The following features are implemented: *
* The following features are implemented: *
* The following features are implemented: *
* The following features are implemented: *
* The following features are implemented: *
* The following features are implemented: *
* The following features are implemented: *
* The following features are implemented: *
* The following features are implemented: *
* The following features are implemented: *
* The following features are implemented: *
* The following features are implemented: *
Of this package and its interdependencies, all packages which - * have not yet been registered by their URI values are first created - * and registered. The packages are then initialized in two steps: - * meta-model objects for all of the packages are created before any - * are initialized, since one package's meta-model objects may refer to - * those of another. - *
Invocation of this method will not affect any packages that have - * already been initialized. - * + * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. + * Simple dependencies are satisfied by calling this method on all dependent packages before doing anything else. This + * method drives initialization for interdependent packages directly, in parallel with this package, itself. + *
+ * Of this package and its interdependencies, all packages which have not yet been registered by their URI values are + * first created and registered. The packages are then initialized in two steps: meta-model objects for all of the + * packages are created before any are initialized, since one package's meta-model objects may refer to those of + * another. + *
+ * Invocation of this method will not affect any packages that have already been initialized. * + * * @see #eNS_URI * @see #createPackageContents() * @see #initializePackageContents() @@ -335,6 +366,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package /** * + * * @generated */ public EClass getRefSingleContained() @@ -344,6 +376,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package /** * + * * @generated */ public EReference getRefSingleContained_Element() @@ -353,6 +386,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package /** * + * * @generated */ public EClass getSingleContainedElement() @@ -362,6 +396,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package /** * + * * @generated */ public EAttribute getSingleContainedElement_Name() @@ -371,6 +406,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package /** * + * * @generated */ public EReference getSingleContainedElement_Parent() @@ -380,6 +416,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package /** * + * * @generated */ public EClass getRefSingleNonContained() @@ -389,6 +426,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package /** * + * * @generated */ public EReference getRefSingleNonContained_Element() @@ -398,6 +436,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package /** * + * * @generated */ public EClass getSingleNonContainedElement() @@ -407,6 +446,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package /** * + * * @generated */ public EAttribute getSingleNonContainedElement_Name() @@ -416,6 +456,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package /** * + * * @generated */ public EReference getSingleNonContainedElement_Parent() @@ -425,6 +466,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package /** * + * * @generated */ public EClass getRefMultiContained() @@ -434,6 +476,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package /** * + * * @generated */ public EReference getRefMultiContained_Elements() @@ -443,6 +486,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package /** * + * * @generated */ public EClass getMultiContainedElement() @@ -452,6 +496,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package /** * + * * @generated */ public EAttribute getMultiContainedElement_Name() @@ -461,6 +506,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package /** * + * * @generated */ public EReference getMultiContainedElement_Parent() @@ -470,6 +516,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package /** * + * * @generated */ public EClass getRefMultiNonContained() @@ -479,6 +526,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package /** * + * * @generated */ public EReference getRefMultiNonContained_Elements() @@ -488,6 +536,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package /** * + * * @generated */ public EClass getMultiNonContainedElement() @@ -497,6 +546,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package /** * + * * @generated */ public EAttribute getMultiNonContainedElement_Name() @@ -506,6 +556,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package /** * + * * @generated */ public EReference getMultiNonContainedElement_Parent() @@ -515,6 +566,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package /** * + * * @generated */ public EClass getRefSingleContainedNPL() @@ -524,6 +576,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package /** * + * * @generated */ public EReference getRefSingleContainedNPL_Element() @@ -533,6 +586,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package /** * + * * @generated */ public EClass getRefSingleNonContainedNPL() @@ -542,6 +596,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package /** * + * * @generated */ public EReference getRefSingleNonContainedNPL_Element() @@ -551,6 +606,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package /** * + * * @generated */ public EClass getRefMultiContainedNPL() @@ -560,6 +616,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package /** * + * * @generated */ public EReference getRefMultiContainedNPL_Elements() @@ -569,6 +626,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package /** * + * * @generated */ public EClass getRefMultiNonContainedNPL() @@ -578,6 +636,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package /** * + * * @generated */ public EReference getRefMultiNonContainedNPL_Elements() @@ -587,6 +646,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package /** * + * * @generated */ public EClass getContainedElementNoOpposite() @@ -596,6 +656,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package /** * + * * @generated */ public EAttribute getContainedElementNoOpposite_Name() @@ -605,6 +666,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package /** * + * * @generated */ public EClass getGenRefSingleContained() @@ -614,6 +676,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package /** * + * * @generated */ public EReference getGenRefSingleContained_Element() @@ -623,6 +686,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package /** * + * * @generated */ public EClass getGenRefSingleNonContained() @@ -632,6 +696,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package /** * + * * @generated */ public EReference getGenRefSingleNonContained_Element() @@ -641,6 +706,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package /** * + * * @generated */ public EClass getGenRefMultiContained() @@ -650,6 +716,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package /** * + * * @generated */ public EReference getGenRefMultiContained_Elements() @@ -659,6 +726,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package /** * + * * @generated */ public EClass getGenRefMultiNonContained() @@ -668,6 +736,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package /** * + * * @generated */ public EReference getGenRefMultiNonContained_Elements() @@ -677,6 +746,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package /** * + * * @generated */ public EClass getImplSingleRefContainer() @@ -686,6 +756,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package /** * + * * @generated */ public EClass getImplSingleRefContainedElement() @@ -695,6 +766,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package /** * + * * @generated */ public EAttribute getImplSingleRefContainedElement_Name() @@ -704,6 +776,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package /** * + * * @generated */ public EClass getImplSingleRefNonContainer() @@ -713,6 +786,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package /** * + * * @generated */ public EClass getImplSingleRefNonContainedElement() @@ -722,6 +796,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package /** * + * * @generated */ public EAttribute getImplSingleRefNonContainedElement_Name() @@ -731,6 +806,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package /** * + * * @generated */ public EClass getImplMultiRefNonContainer() @@ -740,6 +816,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package /** * + * * @generated */ public EClass getImplMultiRefNonContainedElement() @@ -749,6 +826,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package /** * + * * @generated */ public EAttribute getImplMultiRefNonContainedElement_Name() @@ -758,6 +836,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package /** * + * * @generated */ public EClass getImplMultiRefContainer() @@ -767,6 +846,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package /** * + * * @generated */ public EClass getImplMultiRefContainedElement() @@ -776,6 +856,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package /** * + * * @generated */ public EAttribute getImplMultiRefContainedElement_Name() @@ -785,6 +866,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package /** * + * * @generated */ public EClass getImplSingleRefContainerNPL() @@ -794,6 +876,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package /** * + * * @generated */ public EClass getImplSingleRefNonContainerNPL() @@ -803,6 +886,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package /** * + * * @generated */ public EClass getImplMultiRefContainerNPL() @@ -812,6 +896,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package /** * + * * @generated */ public EClass getImplMultiRefNonContainerNPL() @@ -821,6 +906,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package /** * + * * @generated */ public EClass getImplContainedElementNPL() @@ -830,6 +916,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package /** * + * * @generated */ public EClass getGenRefMultiNUNonContained() @@ -839,6 +926,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package /** * + * * @generated */ public EReference getGenRefMultiNUNonContained_Elements() @@ -848,6 +936,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package /** * + * * @generated */ public EClass getGenRefMapNonContained() @@ -857,6 +946,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package /** * + * * @generated */ public EReference getGenRefMapNonContained_Elements() @@ -866,6 +956,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package /** * + * * @generated */ public EClass getStringToEObject() @@ -875,6 +966,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package /** * + * * @generated */ public EAttribute getStringToEObject_Key() @@ -884,6 +976,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package /** * + * * @generated */ public EReference getStringToEObject_Value() @@ -893,6 +986,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package /** * + * * @generated */ public model4Factory getmodel4Factory() @@ -902,14 +996,15 @@ public class model4PackageImpl extends EPackageImpl implements model4Package /** * + * * @generated */ private boolean isCreated = false; /** - * Creates the meta-model objects for the package. This method is - * guarded to have no affect on any invocation but its first. - * + * Creates the meta-model objects for the package. This method is guarded to have no affect on any invocation but its + * first. + * * @generated */ public void createPackageContents() @@ -1017,14 +1112,15 @@ public class model4PackageImpl extends EPackageImpl implements model4Package /** * + * * @generated */ private boolean isInitialized = false; /** - * Complete the initialization of the package and its meta-model. This - * method is guarded to have no affect on any invocation but its first. - * + * Complete the initialization of the package and its meta-model. This method is guarded to have no affect on any + * invocation but its first. + * * @generated */ public void initializePackageContents() diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/model4Factory.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/model4Factory.java index 6185c65cc4..5517cc07e5 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/model4Factory.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/model4Factory.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation * - * $Id: model4Factory.java,v 1.5 2008-12-28 17:56:41 estepper Exp $ + * $Id: model4Factory.java,v 1.6 2009-01-10 07:56:19 estepper Exp $ */ package org.eclipse.emf.cdo.tests.model4; @@ -17,37 +17,38 @@ import org.eclipse.emf.ecore.EFactory; /** * The Factory for the model. It provides a create method for each non-abstract class of * the model. + * * @see org.eclipse.emf.cdo.tests.model4.model4Package * @generated */ public interface model4Factory extends EFactory { /** - * The singleton instance of the factory. - * + * The singleton instance of the factory. + * * @generated */ model4Factory eINSTANCE = org.eclipse.emf.cdo.tests.model4.impl.model4FactoryImpl.init(); /** - * Returns a new object of class 'Ref Single Contained'. - * + * Returns a new object of class 'Ref Single Contained'. + * * @return a new object of class 'Ref Single Contained'. * @generated */ RefSingleContained createRefSingleContained(); /** - * Returns a new object of class 'Single Contained Element'. - * + * Returns a new object of class 'Single Contained Element'. + * * @return a new object of class 'Single Contained Element'. * @generated */ SingleContainedElement createSingleContainedElement(); /** - * Returns a new object of class 'Ref Single Non Contained'. - * + * Returns a new object of class 'Ref Single Non Contained'. + * * @return a new object of class 'Ref Single Non Contained'. * @generated */ @@ -63,40 +64,40 @@ public interface model4Factory extends EFactory SingleNonContainedElement createSingleNonContainedElement(); /** - * Returns a new object of class 'Ref Multi Contained'. - * + * Returns a new object of class 'Ref Multi Contained'. + * * @return a new object of class 'Ref Multi Contained'. * @generated */ RefMultiContained createRefMultiContained(); /** - * Returns a new object of class 'Multi Contained Element'. - * + * Returns a new object of class 'Multi Contained Element'. + * * @return a new object of class 'Multi Contained Element'. * @generated */ MultiContainedElement createMultiContainedElement(); /** - * Returns a new object of class 'Ref Multi Non Contained'. - * + * Returns a new object of class 'Ref Multi Non Contained'. + * * @return a new object of class 'Ref Multi Non Contained'. * @generated */ RefMultiNonContained createRefMultiNonContained(); /** - * Returns a new object of class 'Multi Non Contained Element'. - * + * Returns a new object of class 'Multi Non Contained Element'. + * * @return a new object of class 'Multi Non Contained Element'. * @generated */ MultiNonContainedElement createMultiNonContainedElement(); /** - * Returns a new object of class 'Ref Single Contained NPL'. - * + * Returns a new object of class 'Ref Single Contained NPL'. + * * @return a new object of class 'Ref Single Contained NPL'. * @generated */ @@ -112,16 +113,16 @@ public interface model4Factory extends EFactory RefSingleNonContainedNPL createRefSingleNonContainedNPL(); /** - * Returns a new object of class 'Ref Multi Contained NPL'. - * + * Returns a new object of class 'Ref Multi Contained NPL'. + * * @return a new object of class 'Ref Multi Contained NPL'. * @generated */ RefMultiContainedNPL createRefMultiContainedNPL(); /** - * Returns a new object of class 'Ref Multi Non Contained NPL'. - * + * Returns a new object of class 'Ref Multi Non Contained NPL'. + * * @return a new object of class 'Ref Multi Non Contained NPL'. * @generated */ @@ -137,8 +138,8 @@ public interface model4Factory extends EFactory ContainedElementNoOpposite createContainedElementNoOpposite(); /** - * Returns a new object of class 'Gen Ref Single Contained'. - * + * Returns a new object of class 'Gen Ref Single Contained'. + * * @return a new object of class 'Gen Ref Single Contained'. * @generated */ @@ -154,33 +155,33 @@ public interface model4Factory extends EFactory GenRefSingleNonContained createGenRefSingleNonContained(); /** - * Returns a new object of class 'Gen Ref Multi Contained'. - * + * Returns a new object of class 'Gen Ref Multi Contained'. + * * @return a new object of class 'Gen Ref Multi Contained'. * @generated */ GenRefMultiContained createGenRefMultiContained(); /** - * Returns a new object of class 'Gen Ref Multi Non Contained'. - * + * Returns a new object of class 'Gen Ref Multi Non Contained'. + * * @return a new object of class 'Gen Ref Multi Non Contained'. * @generated */ GenRefMultiNonContained createGenRefMultiNonContained(); /** - * Returns a new object of class 'Impl Single Ref Container'. - * + * Returns a new object of class 'Impl Single Ref Container'. + * * @return a new object of class 'Impl Single Ref Container'. * @generated */ ImplSingleRefContainer createImplSingleRefContainer(); /** - * Returns a new object of class 'Impl Single Ref Contained Element'. - * + * * @return a new object of class 'Impl Single Ref Contained Element'. * @generated */ @@ -196,9 +197,9 @@ public interface model4Factory extends EFactory ImplSingleRefNonContainer createImplSingleRefNonContainer(); /** - * Returns a new object of class 'Impl Single Ref Non Contained Element'. - * + * * @return a new object of class 'Impl Single Ref Non Contained Element'. * @generated */ @@ -214,26 +215,26 @@ public interface model4Factory extends EFactory ImplMultiRefNonContainer createImplMultiRefNonContainer(); /** - * Returns a new object of class 'Impl Multi Ref Non Contained Element'. - * + * * @return a new object of class 'Impl Multi Ref Non Contained Element'. * @generated */ ImplMultiRefNonContainedElement createImplMultiRefNonContainedElement(); /** - * Returns a new object of class 'Impl Multi Ref Container'. - * + * Returns a new object of class 'Impl Multi Ref Container'. + * * @return a new object of class 'Impl Multi Ref Container'. * @generated */ ImplMultiRefContainer createImplMultiRefContainer(); /** - * Returns a new object of class 'Impl Multi Ref Contained Element'. - * + * * @return a new object of class 'Impl Multi Ref Contained Element'. * @generated */ @@ -249,9 +250,9 @@ public interface model4Factory extends EFactory ImplSingleRefContainerNPL createImplSingleRefContainerNPL(); /** - * Returns a new object of class 'Impl Single Ref Non Container NPL'. - * + * * @return a new object of class 'Impl Single Ref Non Container NPL'. * @generated */ @@ -267,17 +268,17 @@ public interface model4Factory extends EFactory ImplMultiRefContainerNPL createImplMultiRefContainerNPL(); /** - * Returns a new object of class 'Impl Multi Ref Non Container NPL'. - * + * * @return a new object of class 'Impl Multi Ref Non Container NPL'. * @generated */ ImplMultiRefNonContainerNPL createImplMultiRefNonContainerNPL(); /** - * Returns a new object of class 'Impl Contained Element NPL'. - * + * Returns a new object of class 'Impl Contained Element NPL'. + * * @return a new object of class 'Impl Contained Element NPL'. * @generated */ @@ -293,16 +294,16 @@ public interface model4Factory extends EFactory GenRefMultiNUNonContained createGenRefMultiNUNonContained(); /** - * Returns a new object of class 'Gen Ref Map Non Contained'. - * + * Returns a new object of class 'Gen Ref Map Non Contained'. + * * @return a new object of class 'Gen Ref Map Non Contained'. * @generated */ GenRefMapNonContained createGenRefMapNonContained(); /** - * Returns the package supported by this factory. - * + * Returns the package supported by this factory. + * * @return the package supported by this factory. * @generated */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/model4Package.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/model4Package.java index 4fef240e6c..de49c719b2 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/model4Package.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/model4Package.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation * - * $Id: model4Package.java,v 1.6 2008-12-28 17:56:41 estepper Exp $ + * $Id: model4Package.java,v 1.7 2009-01-10 07:56:19 estepper Exp $ */ package org.eclipse.emf.cdo.tests.model4; @@ -28,6 +28,7 @@ import org.eclipse.emf.ecore.EReference; *
createXXX
* method for each class of the model.
+ *
* @see org.eclipse.emf.cdo.tests.model4.model4Package
* @generated
*/
public class model4AdapterFactory extends AdapterFactoryImpl
{
/**
- * The cached model package.
- *
+ * The cached model package.
+ *
* @generated
*/
protected static model4Package modelPackage;
/**
- * Creates an instance of the adapter factory.
- *
+ * Creates an instance of the adapter factory.
+ *
* @generated
*/
public model4AdapterFactory()
@@ -96,10 +97,10 @@ public class model4AdapterFactory extends AdapterFactoryImpl
}
/**
- * Returns whether this factory is applicable for the type of the object.
- * This implementation
+ * Returns whether this factory is applicable for the type of the object. This implementation
* returns true
if the object is either the model's package or is an instance object of the model.
+ *
* @return whether this factory is applicable for the type of the object.
* @generated
*/
@@ -118,8 +119,8 @@ public class model4AdapterFactory extends AdapterFactoryImpl
}
/**
- * The switch that delegates to the createXXX
methods.
- *
+ * The switch that delegates to the createXXX
methods.
+ *
* @generated
*/
protected model4Switchtarget
.
- *
- * @param target the object to adapt.
+ * Creates an adapter for the target
.
+ *
+ * @param target
+ * the object to adapt.
* @return the adapter for the target
.
* @generated
*/
@@ -427,10 +429,11 @@ public class model4AdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4.RefSingleContained Ref Single Contained}'.
- * This default implementation returns null so that we can
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4.RefSingleContained
+ * Ref Single Contained}'. This default implementation returns null so that we can
* easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway.
+ *
* @return the new adapter.
* @see org.eclipse.emf.cdo.tests.model4.RefSingleContained
* @generated
@@ -441,10 +444,11 @@ public class model4AdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4.SingleContainedElement Single Contained Element}'.
- * This default implementation returns null so that we
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4.SingleContainedElement
+ * Single Contained Element}'. This default implementation returns null so that we
* can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway.
+ *
* @return the new adapter.
* @see org.eclipse.emf.cdo.tests.model4.SingleContainedElement
* @generated
@@ -455,10 +459,11 @@ public class model4AdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4.RefSingleNonContained Ref Single Non Contained}'.
- * This default implementation returns null so that we
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4.RefSingleNonContained
+ * Ref Single Non Contained}'. This default implementation returns null so that we
* can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway.
+ *
* @return the new adapter.
* @see org.eclipse.emf.cdo.tests.model4.RefSingleNonContained
* @generated
@@ -469,10 +474,11 @@ public class model4AdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4.SingleNonContainedElement Single Non Contained Element}'.
- * This default implementation returns null so that
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4.SingleNonContainedElement
+ * Single Non Contained Element}'. This default implementation returns null so that
* we can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway.
+ *
* @return the new adapter.
* @see org.eclipse.emf.cdo.tests.model4.SingleNonContainedElement
* @generated
@@ -483,10 +489,11 @@ public class model4AdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4.RefMultiContained Ref Multi Contained}'.
- * This default implementation returns null so that we can
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4.RefMultiContained
+ * Ref Multi Contained}'. This default implementation returns null so that we can
* easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway.
+ *
* @return the new adapter.
* @see org.eclipse.emf.cdo.tests.model4.RefMultiContained
* @generated
@@ -497,10 +504,11 @@ public class model4AdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4.MultiContainedElement Multi Contained Element}'.
- * This default implementation returns null so that we can
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4.MultiContainedElement
+ * Multi Contained Element}'. This default implementation returns null so that we can
* easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway.
+ *
* @return the new adapter.
* @see org.eclipse.emf.cdo.tests.model4.MultiContainedElement
* @generated
@@ -511,10 +519,11 @@ public class model4AdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4.RefMultiNonContained Ref Multi Non Contained}'.
- * This default implementation returns null so that we can
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4.RefMultiNonContained
+ * Ref Multi Non Contained}'. This default implementation returns null so that we can
* easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway.
+ *
* @return the new adapter.
* @see org.eclipse.emf.cdo.tests.model4.RefMultiNonContained
* @generated
@@ -525,10 +534,11 @@ public class model4AdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4.MultiNonContainedElement Multi Non Contained Element}'.
- * This default implementation returns null so that we
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4.MultiNonContainedElement
+ * Multi Non Contained Element}'. This default implementation returns null so that we
* can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway.
+ *
* @return the new adapter.
* @see org.eclipse.emf.cdo.tests.model4.MultiNonContainedElement
* @generated
@@ -539,10 +549,11 @@ public class model4AdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4.RefSingleContainedNPL Ref Single Contained NPL}'.
- * This default implementation returns null so that we
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4.RefSingleContainedNPL
+ * Ref Single Contained NPL}'. This default implementation returns null so that we
* can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway.
+ *
* @return the new adapter.
* @see org.eclipse.emf.cdo.tests.model4.RefSingleContainedNPL
* @generated
@@ -553,10 +564,11 @@ public class model4AdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4.RefSingleNonContainedNPL Ref Single Non Contained NPL}'.
- * This default implementation returns null so that
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4.RefSingleNonContainedNPL
+ * Ref Single Non Contained NPL}'. This default implementation returns null so that
* we can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway.
+ *
* @return the new adapter.
* @see org.eclipse.emf.cdo.tests.model4.RefSingleNonContainedNPL
* @generated
@@ -567,10 +579,11 @@ public class model4AdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4.RefMultiContainedNPL Ref Multi Contained NPL}'.
- * This default implementation returns null so that we can
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4.RefMultiContainedNPL
+ * Ref Multi Contained NPL}'. This default implementation returns null so that we can
* easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway.
+ *
* @return the new adapter.
* @see org.eclipse.emf.cdo.tests.model4.RefMultiContainedNPL
* @generated
@@ -581,10 +594,11 @@ public class model4AdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4.RefMultiNonContainedNPL Ref Multi Non Contained NPL}'.
- * This default implementation returns null so that we
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4.RefMultiNonContainedNPL
+ * Ref Multi Non Contained NPL}'. This default implementation returns null so that we
* can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway.
+ *
* @return the new adapter.
* @see org.eclipse.emf.cdo.tests.model4.RefMultiNonContainedNPL
* @generated
@@ -595,10 +609,11 @@ public class model4AdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4.ContainedElementNoOpposite Contained Element No Opposite}'.
- * This default implementation returns null so that
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4.ContainedElementNoOpposite
+ * Contained Element No Opposite}'. This default implementation returns null so that
* we can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway.
+ *
* @return the new adapter.
* @see org.eclipse.emf.cdo.tests.model4.ContainedElementNoOpposite
* @generated
@@ -609,10 +624,11 @@ public class model4AdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4.GenRefSingleContained Gen Ref Single Contained}'.
- * This default implementation returns null so that we
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4.GenRefSingleContained
+ * Gen Ref Single Contained}'. This default implementation returns null so that we
* can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway.
+ *
* @return the new adapter.
* @see org.eclipse.emf.cdo.tests.model4.GenRefSingleContained
* @generated
@@ -623,10 +639,11 @@ public class model4AdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4.GenRefSingleNonContained Gen Ref Single Non Contained}'.
- * This default implementation returns null so that
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4.GenRefSingleNonContained
+ * Gen Ref Single Non Contained}'. This default implementation returns null so that
* we can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway.
+ *
* @return the new adapter.
* @see org.eclipse.emf.cdo.tests.model4.GenRefSingleNonContained
* @generated
@@ -637,10 +654,11 @@ public class model4AdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4.GenRefMultiContained Gen Ref Multi Contained}'.
- * This default implementation returns null so that we can
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4.GenRefMultiContained
+ * Gen Ref Multi Contained}'. This default implementation returns null so that we can
* easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway.
+ *
* @return the new adapter.
* @see org.eclipse.emf.cdo.tests.model4.GenRefMultiContained
* @generated
@@ -651,10 +669,11 @@ public class model4AdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4.GenRefMultiNonContained Gen Ref Multi Non Contained}'.
- * This default implementation returns null so that we
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4.GenRefMultiNonContained
+ * Gen Ref Multi Non Contained}'. This default implementation returns null so that we
* can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway.
+ *
* @return the new adapter.
* @see org.eclipse.emf.cdo.tests.model4.GenRefMultiNonContained
* @generated
@@ -665,10 +684,11 @@ public class model4AdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4.ImplSingleRefContainer Impl Single Ref Container}'.
- * This default implementation returns null so that we
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4.ImplSingleRefContainer
+ * Impl Single Ref Container}'. This default implementation returns null so that we
* can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway.
+ *
* @return the new adapter.
* @see org.eclipse.emf.cdo.tests.model4.ImplSingleRefContainer
* @generated
@@ -679,9 +699,11 @@ public class model4AdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4.ImplSingleRefContainedElement Impl Single Ref Contained Element}'.
+ * Creates a new adapter for an object of class '
+ * {@link org.eclipse.emf.cdo.tests.model4.ImplSingleRefContainedElement Impl Single Ref Contained Element}'.
* This default implementation returns null so that we can easily ignore cases; it's useful to
* ignore a case when inheritance will catch all the cases anyway.
+ *
* @return the new adapter.
* @see org.eclipse.emf.cdo.tests.model4.ImplSingleRefContainedElement
* @generated
@@ -692,10 +714,11 @@ public class model4AdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4.ImplSingleRefNonContainer Impl Single Ref Non Container}'.
- * This default implementation returns null so that
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4.ImplSingleRefNonContainer
+ * Impl Single Ref Non Container}'. This default implementation returns null so that
* we can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway.
+ *
* @return the new adapter.
* @see org.eclipse.emf.cdo.tests.model4.ImplSingleRefNonContainer
* @generated
@@ -706,10 +729,12 @@ public class model4AdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4.ImplSingleRefNonContainedElement Impl Single Ref Non Contained Element}'.
- * This default implementation returns null
+ * Creates a new adapter for an object of class '
+ * {@link org.eclipse.emf.cdo.tests.model4.ImplSingleRefNonContainedElement
+ * Impl Single Ref Non Contained Element}'. This default implementation returns null
* so that we can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway.
*
+ *
* @return the new adapter.
* @see org.eclipse.emf.cdo.tests.model4.ImplSingleRefNonContainedElement
* @generated
@@ -720,10 +745,11 @@ public class model4AdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4.ImplMultiRefNonContainer Impl Multi Ref Non Container}'.
- * This default implementation returns null so that
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4.ImplMultiRefNonContainer
+ * Impl Multi Ref Non Container}'. This default implementation returns null so that
* we can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway.
+ *
* @return the new adapter.
* @see org.eclipse.emf.cdo.tests.model4.ImplMultiRefNonContainer
* @generated
@@ -734,10 +760,12 @@ public class model4AdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4.ImplMultiRefNonContainedElement Impl Multi Ref Non Contained Element}'.
- * This default implementation returns null
+ * Creates a new adapter for an object of class '
+ * {@link org.eclipse.emf.cdo.tests.model4.ImplMultiRefNonContainedElement
+ * Impl Multi Ref Non Contained Element}'. This default implementation returns null
* so that we can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway.
*
+ *
* @return the new adapter.
* @see org.eclipse.emf.cdo.tests.model4.ImplMultiRefNonContainedElement
* @generated
@@ -748,10 +776,11 @@ public class model4AdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4.ImplMultiRefContainer Impl Multi Ref Container}'.
- * This default implementation returns null so that we
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4.ImplMultiRefContainer
+ * Impl Multi Ref Container}'. This default implementation returns null so that we
* can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway.
+ *
* @return the new adapter.
* @see org.eclipse.emf.cdo.tests.model4.ImplMultiRefContainer
* @generated
@@ -762,10 +791,11 @@ public class model4AdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4.ImplMultiRefContainedElement Impl Multi Ref Contained Element}'.
- * This default implementation returns null so
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4.ImplMultiRefContainedElement
+ * Impl Multi Ref Contained Element}'. This default implementation returns null so
* that we can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway.
*
+ *
* @return the new adapter.
* @see org.eclipse.emf.cdo.tests.model4.ImplMultiRefContainedElement
* @generated
@@ -776,10 +806,11 @@ public class model4AdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4.ImplSingleRefContainerNPL Impl Single Ref Container NPL}'.
- * This default implementation returns null so that
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4.ImplSingleRefContainerNPL
+ * Impl Single Ref Container NPL}'. This default implementation returns null so that
* we can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway.
+ *
* @return the new adapter.
* @see org.eclipse.emf.cdo.tests.model4.ImplSingleRefContainerNPL
* @generated
@@ -790,10 +821,11 @@ public class model4AdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4.ImplSingleRefNonContainerNPL Impl Single Ref Non Container NPL}'.
- * This default implementation returns null so
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4.ImplSingleRefNonContainerNPL
+ * Impl Single Ref Non Container NPL}'. This default implementation returns null so
* that we can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway.
*
+ *
* @return the new adapter.
* @see org.eclipse.emf.cdo.tests.model4.ImplSingleRefNonContainerNPL
* @generated
@@ -804,10 +836,11 @@ public class model4AdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4.ImplMultiRefContainerNPL Impl Multi Ref Container NPL}'.
- * This default implementation returns null so that
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4.ImplMultiRefContainerNPL
+ * Impl Multi Ref Container NPL}'. This default implementation returns null so that
* we can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway.
+ *
* @return the new adapter.
* @see org.eclipse.emf.cdo.tests.model4.ImplMultiRefContainerNPL
* @generated
@@ -818,10 +851,11 @@ public class model4AdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4.ImplMultiRefNonContainerNPL Impl Multi Ref Non Container NPL}'.
- * This default implementation returns null so
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4.ImplMultiRefNonContainerNPL
+ * Impl Multi Ref Non Container NPL}'. This default implementation returns null so
* that we can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway.
*
+ *
* @return the new adapter.
* @see org.eclipse.emf.cdo.tests.model4.ImplMultiRefNonContainerNPL
* @generated
@@ -832,10 +866,11 @@ public class model4AdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4.ImplContainedElementNPL Impl Contained Element NPL}'.
- * This default implementation returns null so that we
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4.ImplContainedElementNPL
+ * Impl Contained Element NPL}'. This default implementation returns null so that we
* can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway.
+ *
* @return the new adapter.
* @see org.eclipse.emf.cdo.tests.model4.ImplContainedElementNPL
* @generated
@@ -846,10 +881,11 @@ public class model4AdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4.GenRefMultiNUNonContained Gen Ref Multi NU Non Contained}'.
- * This default implementation returns null so that
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4.GenRefMultiNUNonContained
+ * Gen Ref Multi NU Non Contained}'. This default implementation returns null so that
* we can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway.
+ *
* @return the new adapter.
* @see org.eclipse.emf.cdo.tests.model4.GenRefMultiNUNonContained
* @generated
@@ -860,10 +896,11 @@ public class model4AdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4.GenRefMapNonContained Gen Ref Map Non Contained}'.
- * This default implementation returns null so that we
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4.GenRefMapNonContained
+ * Gen Ref Map Non Contained}'. This default implementation returns null so that we
* can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway.
+ *
* @return the new adapter.
* @see org.eclipse.emf.cdo.tests.model4.GenRefMapNonContained
* @generated
@@ -903,10 +940,12 @@ public class model4AdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainedElement ISingle Ref Contained Element}'.
- * This default implementation returns null so that
+ * Creates a new adapter for an object of class '
+ * {@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainedElement
+ * ISingle Ref Contained Element}'. This default implementation returns null so that
* we can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway.
+ *
* @return the new adapter.
* @see org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainedElement
* @generated
@@ -932,10 +971,12 @@ public class model4AdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainedElement ISingle Ref Non Contained Element}'.
- * This default implementation returns null so
+ * Creates a new adapter for an object of class '
+ * {@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainedElement
+ * ISingle Ref Non Contained Element}'. This default implementation returns null so
* that we can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway.
*
+ *
* @return the new adapter.
* @see org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainedElement
* @generated
@@ -961,10 +1002,12 @@ public class model4AdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainedElement IMulti Ref Non Contained Element}'.
- * This default implementation returns null so
+ * Creates a new adapter for an object of class '
+ * {@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainedElement
+ * IMulti Ref Non Contained Element}'. This default implementation returns null so
* that we can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway.
*
+ *
* @return the new adapter.
* @see org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainedElement
* @generated
@@ -975,10 +1018,11 @@ public class model4AdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainer IMulti Ref Container}'.
- * This default implementation returns null so that we can
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainer
+ * IMulti Ref Container}'. This default implementation returns null so that we can
* easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway.
+ *
* @return the new adapter.
* @see org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainer
* @generated
@@ -989,9 +1033,11 @@ public class model4AdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainedElement IMulti Ref Contained Element}'.
- * This default implementation returns null so that we can easily ignore cases; it's useful
+ * Creates a new adapter for an object of class '
+ * {@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainedElement IMulti Ref Contained Element}
+ * '. This default implementation returns null so that we can easily ignore cases; it's useful
* to ignore a case when inheritance will catch all the cases anyway.
+ *
* @return the new adapter.
* @see org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainedElement
* @generated
@@ -1017,9 +1063,11 @@ public class model4AdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainerNPL ISingle Ref Non Container NPL}'.
- * This default implementation returns null so that we can easily ignore cases; it's useful
+ * Creates a new adapter for an object of class '
+ * {@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainerNPL ISingle Ref Non Container NPL}
+ * '. This default implementation returns null so that we can easily ignore cases; it's useful
* to ignore a case when inheritance will catch all the cases anyway.
+ *
* @return the new adapter.
* @see org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainerNPL
* @generated
@@ -1045,9 +1093,11 @@ public class model4AdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainerNPL IMulti Ref Non Container NPL}'.
+ * Creates a new adapter for an object of class '
+ * {@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainerNPL IMulti Ref Non Container NPL}'.
* This default implementation returns null so that we can easily ignore cases; it's useful to
* ignore a case when inheritance will catch all the cases anyway.
+ *
* @return the new adapter.
* @see org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainerNPL
* @generated
@@ -1058,10 +1108,12 @@ public class model4AdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4interfaces.IContainedElementNoParentLink IContained Element No Parent Link}'.
- * This default implementation returns null so
+ * Creates a new adapter for an object of class '
+ * {@link org.eclipse.emf.cdo.tests.model4interfaces.IContainedElementNoParentLink
+ * IContained Element No Parent Link}'. This default implementation returns null so
* that we can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway.
*
+ *
* @return the new adapter.
* @see org.eclipse.emf.cdo.tests.model4interfaces.IContainedElementNoParentLink
* @generated
@@ -1072,9 +1124,10 @@ public class model4AdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4interfaces.INamedElement INamed Element}'.
- * This default implementation returns null so that we can easily
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4interfaces.INamedElement
+ * INamed Element}'. This default implementation returns null so that we can easily
* ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway.
+ *
* @return the new adapter.
* @see org.eclipse.emf.cdo.tests.model4interfaces.INamedElement
* @generated
@@ -1085,9 +1138,9 @@ public class model4AdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for the default case.
- * This default implementation returns null. This default implementation returns null.
+ *
* @return the new adapter.
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/util/model4Switch.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/util/model4Switch.java
index 8b7bd2e7bb..4c3386870e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/util/model4Switch.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/util/model4Switch.java
@@ -8,7 +8,7 @@
* Contributors:
* Eike Stepper - initial API and implementation
*
- * $Id: model4Switch.java,v 1.6 2008-12-28 17:56:41 estepper Exp $
+ * $Id: model4Switch.java,v 1.7 2009-01-10 07:56:19 estepper Exp $
*/
package org.eclipse.emf.cdo.tests.model4.util;
@@ -71,21 +71,22 @@ import java.util.Map;
* {@link #doSwitch(EObject) doSwitch(object)} to invoke the caseXXX
method for each class of the model,
* starting with the actual class of the object and proceeding up the inheritance hierarchy until a non-null result is
* returned, which is the result of the switch.
+ *
* @see org.eclipse.emf.cdo.tests.model4.model4Package
* @generated
*/
public class model4SwitchcaseXXX
for each class of the model until one returns a non null result; it yields that result.
*
+ *
* @return the first non-null result returned by a caseXXX
call.
* @generated
*/
@@ -110,6 +112,7 @@ public class model4SwitchcaseXXX
for each class of the model until one returns a non null result; it yields that result.
*
+ *
* @return the first non-null result returned by a caseXXX
call.
* @generated
*/
@@ -129,6 +132,7 @@ public class model4SwitchcaseXXX
for each class of the model until one returns a non null result; it yields that result.
*
+ *
* @return the first non-null result returned by a caseXXX
call.
* @generated
*/
@@ -499,10 +503,11 @@ public class model4Switch* The following features are supported: *
* The following features are supported: *
* The following features are supported: *
* If the meaning of the 'Elements' containment reference list isn't clear, there really should be more of a * description here... *
* + * * @return the value of the 'Elements' containment reference list. * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getIMultiRefContainerNPL_Elements() * @model containment="true" diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefNonContainedElement.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefNonContainedElement.java index 999a1b1abe..bdcdf84188 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefNonContainedElement.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefNonContainedElement.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation * - * $Id: IMultiRefNonContainedElement.java,v 1.4 2008-12-28 17:57:05 estepper Exp $ + * $Id: IMultiRefNonContainedElement.java,v 1.5 2009-01-10 07:56:24 estepper Exp $ */ package org.eclipse.emf.cdo.tests.model4interfaces; @@ -17,14 +17,13 @@ import org.eclipse.emf.ecore.EObject; /** * A representation of the model object 'IMulti Ref Non Contained Element'. - * ** The following features are supported: *
* The following features are supported: *
* If the meaning of the 'Elements' reference isn't clear, there really should be more of a description * here... *
* + * * @return the value of the 'Elements' reference list. * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getIMultiRefNonContainer_Elements() * @see org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainedElement#getParent diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefNonContainerNPL.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefNonContainerNPL.java index 066b0f3b13..db1c345bf5 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefNonContainerNPL.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefNonContainerNPL.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation * - * $Id: IMultiRefNonContainerNPL.java,v 1.4 2008-12-28 17:57:05 estepper Exp $ + * $Id: IMultiRefNonContainerNPL.java,v 1.5 2009-01-10 07:56:24 estepper Exp $ */ package org.eclipse.emf.cdo.tests.model4interfaces; @@ -18,14 +18,13 @@ import org.eclipse.emf.ecore.EObject; /** * A representation of the model object 'IMulti Ref Non Container NPL'. - * ** The following features are supported: *
* If the meaning of the 'Elements' reference list isn't clear, there really should be more of a description * here... *
* + * * @return the value of the 'Elements' reference list. * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getIMultiRefNonContainerNPL_Elements() * @model diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/INamedElement.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/INamedElement.java index ab74577a5c..40395ea6ae 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/INamedElement.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/INamedElement.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation * - * $Id: INamedElement.java,v 1.4 2008-12-28 17:57:05 estepper Exp $ + * $Id: INamedElement.java,v 1.5 2009-01-10 07:56:24 estepper Exp $ */ package org.eclipse.emf.cdo.tests.model4interfaces; @@ -16,14 +16,13 @@ import org.eclipse.emf.ecore.EObject; /** * A representation of the model object 'INamed Element'. - * ** The following features are supported: *
* If the meaning of the 'Name' attribute isn't clear, there really should be more of a description here... *
* + * * @return the value of the 'Name' attribute. * @see #setName(String) * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getINamedElement_Name() @@ -46,9 +45,11 @@ public interface INamedElement extends EObject String getName(); /** - * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model4interfaces.INamedElement#getName Name}' attribute. - * - * @param value the new value of the 'Name' attribute. + * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model4interfaces.INamedElement#getName Name}' + * attribute. + * + * @param value + * the new value of the 'Name' attribute. * @see #getName() * @generated */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefContainedElement.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefContainedElement.java index 3e2e29d127..fb1ac3837c 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefContainedElement.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefContainedElement.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation * - * $Id: ISingleRefContainedElement.java,v 1.4 2008-12-28 17:57:05 estepper Exp $ + * $Id: ISingleRefContainedElement.java,v 1.5 2009-01-10 07:56:24 estepper Exp $ */ package org.eclipse.emf.cdo.tests.model4interfaces; @@ -17,14 +17,13 @@ import org.eclipse.emf.ecore.EObject; /** * A representation of the model object 'ISingle Ref Contained Element'. - * ** The following features are supported: *
* The following features are supported: *
* The following features are supported: *
* If the meaning of the 'Element' containment reference isn't clear, there really should be more of a * description here... *
* + * * @return the value of the 'Element' containment reference. * @see #setElement(IContainedElementNoParentLink) * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getISingleRefContainerNPL_Element() @@ -48,9 +47,11 @@ public interface ISingleRefContainerNPL extends EObject IContainedElementNoParentLink getElement(); /** - * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainerNPL#getElement Element}' containment reference. - * - * @param value the new value of the 'Element' containment reference. + * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainerNPL#getElement + * Element}' containment reference. + * + * @param value + * the new value of the 'Element' containment reference. * @see #getElement() * @generated */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefNonContainedElement.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefNonContainedElement.java index 52640feca4..c90f2a9f69 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefNonContainedElement.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefNonContainedElement.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation * - * $Id: ISingleRefNonContainedElement.java,v 1.4 2008-12-28 17:57:05 estepper Exp $ + * $Id: ISingleRefNonContainedElement.java,v 1.5 2009-01-10 07:56:24 estepper Exp $ */ package org.eclipse.emf.cdo.tests.model4interfaces; @@ -17,14 +17,13 @@ import org.eclipse.emf.ecore.EObject; /** * A representation of the model object 'ISingle Ref Non Contained Element'. * - * ** The following features are supported: *
* The following features are supported: *
* The following features are supported: *
* If the meaning of the 'Element' reference isn't clear, there really should be more of a description * here... *
* + * * @return the value of the 'Element' reference. * @see #setElement(IContainedElementNoParentLink) * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getISingleRefNonContainerNPL_Element() @@ -48,9 +47,11 @@ public interface ISingleRefNonContainerNPL extends EObject IContainedElementNoParentLink getElement(); /** - * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainerNPL#getElement Element}' reference. - * - * @param value the new value of the 'Element' reference. + * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainerNPL#getElement + * Element}' reference. + * + * @param value + * the new value of the 'Element' reference. * @see #getElement() * @generated */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/impl/model4interfacesFactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/impl/model4interfacesFactoryImpl.java index e045c913f3..227fc04ed6 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/impl/model4interfacesFactoryImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/impl/model4interfacesFactoryImpl.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation * - * $Id: model4interfacesFactoryImpl.java,v 1.4 2008-12-28 17:57:05 estepper Exp $ + * $Id: model4interfacesFactoryImpl.java,v 1.5 2009-01-10 07:56:24 estepper Exp $ */ package org.eclipse.emf.cdo.tests.model4interfaces.impl; @@ -23,13 +23,14 @@ import org.eclipse.emf.ecore.plugin.EcorePlugin; /** * An implementation of the model Factory. + * * @generated */ public class model4interfacesFactoryImpl extends EFactoryImpl implements model4interfacesFactory { /** - * Creates the default factory implementation. - * + * Creates the default factory implementation. + * * @generated */ public static model4interfacesFactory init() @@ -51,8 +52,8 @@ public class model4interfacesFactoryImpl extends EFactoryImpl implements model4i } /** - * Creates an instance of the factory. - * + * Creates an instance of the factory. + * * @generated */ public model4interfacesFactoryImpl() @@ -62,6 +63,7 @@ public class model4interfacesFactoryImpl extends EFactoryImpl implements model4i /** * + * * @generated */ @Override @@ -76,6 +78,7 @@ public class model4interfacesFactoryImpl extends EFactoryImpl implements model4i /** * + * * @generated */ public model4interfacesPackage getmodel4interfacesPackage() @@ -85,6 +88,7 @@ public class model4interfacesFactoryImpl extends EFactoryImpl implements model4i /** * + * * @deprecated * @generated */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/impl/model4interfacesPackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/impl/model4interfacesPackageImpl.java index 6fc42010e3..87f2949961 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/impl/model4interfacesPackageImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/impl/model4interfacesPackageImpl.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation * - * $Id: model4interfacesPackageImpl.java,v 1.5 2008-12-28 17:57:05 estepper Exp $ + * $Id: model4interfacesPackageImpl.java,v 1.6 2009-01-10 07:56:24 estepper Exp $ */ package org.eclipse.emf.cdo.tests.model4interfaces.impl; @@ -37,90 +37,105 @@ import org.eclipse.emf.ecore.impl.EPackageImpl; /** * An implementation of the model Package. + * * @generated */ public class model4interfacesPackageImpl extends EPackageImpl implements model4interfacesPackage { /** * + * * @generated */ private EClass iSingleRefContainerEClass = null; /** * + * * @generated */ private EClass iSingleRefContainedElementEClass = null; /** * + * * @generated */ private EClass iSingleRefNonContainerEClass = null; /** * + * * @generated */ private EClass iSingleRefNonContainedElementEClass = null; /** * + * * @generated */ private EClass iMultiRefContainerEClass = null; /** * + * * @generated */ private EClass iMultiRefContainedElementEClass = null; /** * + * * @generated */ private EClass iMultiRefNonContainerEClass = null; /** * + * * @generated */ private EClass iMultiRefNonContainedElementEClass = null; /** * + * * @generated */ private EClass iNamedElementEClass = null; /** * + * * @generated */ private EClass iContainedElementNoParentLinkEClass = null; /** * + * * @generated */ private EClass iSingleRefContainerNPLEClass = null; /** * + * * @generated */ private EClass iSingleRefNonContainerNPLEClass = null; /** * + * * @generated */ private EClass iMultiRefContainerNPLEClass = null; /** * + * * @generated */ private EClass iMultiRefNonContainerNPLEClass = null; @@ -145,27 +160,24 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i /** * + * * @generated */ private static boolean isInited = false; /** - * Creates, registers, and initializes the Package for this - * model, and for any others upon which it depends. Simple - * dependencies are satisfied by calling this method on all - * dependent packages before doing anything else. This method drives - * initialization for interdependent packages directly, in parallel - * with this package, itself. - *Of this package and its interdependencies, all packages which - * have not yet been registered by their URI values are first created - * and registered. The packages are then initialized in two steps: - * meta-model objects for all of the packages are created before any - * are initialized, since one package's meta-model objects may refer to - * those of another. - *
Invocation of this method will not affect any packages that have - * already been initialized. - * + * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. + * Simple dependencies are satisfied by calling this method on all dependent packages before doing anything else. This + * method drives initialization for interdependent packages directly, in parallel with this package, itself. + *
+ * Of this package and its interdependencies, all packages which have not yet been registered by their URI values are + * first created and registered. The packages are then initialized in two steps: meta-model objects for all of the + * packages are created before any are initialized, since one package's meta-model objects may refer to those of + * another. + *
+ * Invocation of this method will not affect any packages that have already been initialized. * + * * @see #eNS_URI * @see #createPackageContents() * @see #initializePackageContents() @@ -197,6 +209,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i /** * + * * @generated */ public EClass getISingleRefContainer() @@ -206,6 +219,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i /** * + * * @generated */ public EReference getISingleRefContainer_Element() @@ -215,6 +229,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i /** * + * * @generated */ public EClass getISingleRefContainedElement() @@ -224,6 +239,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i /** * + * * @generated */ public EReference getISingleRefContainedElement_Parent() @@ -233,6 +249,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i /** * + * * @generated */ public EClass getISingleRefNonContainer() @@ -242,6 +259,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i /** * + * * @generated */ public EReference getISingleRefNonContainer_Element() @@ -251,6 +269,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i /** * + * * @generated */ public EClass getISingleRefNonContainedElement() @@ -260,6 +279,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i /** * + * * @generated */ public EReference getISingleRefNonContainedElement_Parent() @@ -269,6 +289,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i /** * + * * @generated */ public EClass getIMultiRefContainer() @@ -278,6 +299,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i /** * + * * @generated */ public EReference getIMultiRefContainer_Elements() @@ -287,6 +309,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i /** * + * * @generated */ public EClass getIMultiRefContainedElement() @@ -296,6 +319,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i /** * + * * @generated */ public EReference getIMultiRefContainedElement_Parent() @@ -305,6 +329,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i /** * + * * @generated */ public EClass getIMultiRefNonContainer() @@ -314,6 +339,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i /** * + * * @generated */ public EReference getIMultiRefNonContainer_Elements() @@ -323,6 +349,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i /** * + * * @generated */ public EClass getIMultiRefNonContainedElement() @@ -332,6 +359,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i /** * + * * @generated */ public EReference getIMultiRefNonContainedElement_Parent() @@ -341,6 +369,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i /** * + * * @generated */ public EClass getINamedElement() @@ -350,6 +379,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i /** * + * * @generated */ public EAttribute getINamedElement_Name() @@ -359,6 +389,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i /** * + * * @generated */ public EClass getIContainedElementNoParentLink() @@ -368,6 +399,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i /** * + * * @generated */ public EClass getISingleRefContainerNPL() @@ -377,6 +409,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i /** * + * * @generated */ public EReference getISingleRefContainerNPL_Element() @@ -386,6 +419,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i /** * + * * @generated */ public EClass getISingleRefNonContainerNPL() @@ -395,6 +429,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i /** * + * * @generated */ public EReference getISingleRefNonContainerNPL_Element() @@ -404,6 +439,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i /** * + * * @generated */ public EClass getIMultiRefContainerNPL() @@ -413,6 +449,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i /** * + * * @generated */ public EReference getIMultiRefContainerNPL_Elements() @@ -422,6 +459,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i /** * + * * @generated */ public EClass getIMultiRefNonContainerNPL() @@ -431,6 +469,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i /** * + * * @generated */ public EReference getIMultiRefNonContainerNPL_Elements() @@ -440,6 +479,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i /** * + * * @generated */ public model4interfacesFactory getmodel4interfacesFactory() @@ -449,14 +489,15 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i /** * + * * @generated */ private boolean isCreated = false; /** - * Creates the meta-model objects for the package. This method is - * guarded to have no affect on any invocation but its first. - * + * Creates the meta-model objects for the package. This method is guarded to have no affect on any invocation but its + * first. + * * @generated */ public void createPackageContents() @@ -510,14 +551,15 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i /** * + * * @generated */ private boolean isInitialized = false; /** - * Complete the initialization of the package and its meta-model. This - * method is guarded to have no affect on any invocation but its first. - * + * Complete the initialization of the package and its meta-model. This method is guarded to have no affect on any + * invocation but its first. + * * @generated */ public void initializePackageContents() diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/model4interfacesFactory.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/model4interfacesFactory.java index c8771e5cb3..e5b1fc1cc7 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/model4interfacesFactory.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/model4interfacesFactory.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation * - * $Id: model4interfacesFactory.java,v 1.4 2008-12-28 17:57:05 estepper Exp $ + * $Id: model4interfacesFactory.java,v 1.5 2009-01-10 07:56:24 estepper Exp $ */ package org.eclipse.emf.cdo.tests.model4interfaces; @@ -17,22 +17,23 @@ import org.eclipse.emf.ecore.EFactory; /** * The Factory for the model. It provides a create method for each non-abstract class of * the model. + * * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage * @generated */ public interface model4interfacesFactory extends EFactory { /** - * The singleton instance of the factory. - * + * The singleton instance of the factory. + * * @generated */ model4interfacesFactory eINSTANCE = org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesFactoryImpl .init(); /** - * Returns the package supported by this factory. - * + * Returns the package supported by this factory. + * * @return the package supported by this factory. * @generated */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/model4interfacesPackage.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/model4interfacesPackage.java index 593e89cc33..e7203d1316 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/model4interfacesPackage.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/model4interfacesPackage.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation * - * $Id: model4interfacesPackage.java,v 1.4 2008-12-28 17:57:05 estepper Exp $ + * $Id: model4interfacesPackage.java,v 1.5 2009-01-10 07:56:24 estepper Exp $ */ package org.eclipse.emf.cdo.tests.model4interfaces; @@ -26,6 +26,7 @@ import org.eclipse.emf.ecore.EReference; *
createXXX
* method for each class of the model.
+ *
* @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage
* @generated
*/
public class model4interfacesAdapterFactory extends AdapterFactoryImpl
{
/**
- * The cached model package.
- *
+ * The cached model package.
+ *
* @generated
*/
protected static model4interfacesPackage modelPackage;
/**
- * Creates an instance of the adapter factory.
- *
+ * Creates an instance of the adapter factory.
+ *
* @generated
*/
public model4interfacesAdapterFactory()
@@ -62,10 +63,10 @@ public class model4interfacesAdapterFactory extends AdapterFactoryImpl
}
/**
- * Returns whether this factory is applicable for the type of the object.
- * This implementation
+ * Returns whether this factory is applicable for the type of the object. This implementation
* returns true
if the object is either the model's package or is an instance object of the model.
+ *
* @return whether this factory is applicable for the type of the object.
* @generated
*/
@@ -84,8 +85,8 @@ public class model4interfacesAdapterFactory extends AdapterFactoryImpl
}
/**
- * The switch that delegates to the createXXX
methods.
- *
+ * The switch that delegates to the createXXX
methods.
+ *
* @generated
*/
protected model4interfacesSwitchtarget
.
- *
- * @param target the object to adapt.
+ * Creates an adapter for the target
.
+ *
+ * @param target
+ * the object to adapt.
* @return the adapter for the target
.
* @generated
*/
@@ -210,10 +212,12 @@ public class model4interfacesAdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainedElement ISingle Ref Contained Element}'.
- * This default implementation returns null so that
+ * Creates a new adapter for an object of class '
+ * {@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainedElement
+ * ISingle Ref Contained Element}'. This default implementation returns null so that
* we can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway.
+ *
* @return the new adapter.
* @see org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainedElement
* @generated
@@ -239,10 +243,12 @@ public class model4interfacesAdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainedElement ISingle Ref Non Contained Element}'.
- * This default implementation returns null so
+ * Creates a new adapter for an object of class '
+ * {@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainedElement
+ * ISingle Ref Non Contained Element}'. This default implementation returns null so
* that we can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway.
*
+ *
* @return the new adapter.
* @see org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainedElement
* @generated
@@ -253,10 +259,11 @@ public class model4interfacesAdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainer IMulti Ref Container}'.
- * This default implementation returns null so that we can
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainer
+ * IMulti Ref Container}'. This default implementation returns null so that we can
* easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway.
+ *
* @return the new adapter.
* @see org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainer
* @generated
@@ -267,9 +274,11 @@ public class model4interfacesAdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainedElement IMulti Ref Contained Element}'.
- * This default implementation returns null so that we can easily ignore cases; it's useful
+ * Creates a new adapter for an object of class '
+ * {@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainedElement IMulti Ref Contained Element}
+ * '. This default implementation returns null so that we can easily ignore cases; it's useful
* to ignore a case when inheritance will catch all the cases anyway.
+ *
* @return the new adapter.
* @see org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainedElement
* @generated
@@ -295,10 +304,12 @@ public class model4interfacesAdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainedElement IMulti Ref Non Contained Element}'.
- * This default implementation returns null so
+ * Creates a new adapter for an object of class '
+ * {@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainedElement
+ * IMulti Ref Non Contained Element}'. This default implementation returns null so
* that we can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway.
*
+ *
* @return the new adapter.
* @see org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainedElement
* @generated
@@ -309,9 +320,10 @@ public class model4interfacesAdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4interfaces.INamedElement INamed Element}'.
- * This default implementation returns null so that we can easily
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4interfaces.INamedElement
+ * INamed Element}'. This default implementation returns null so that we can easily
* ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway.
+ *
* @return the new adapter.
* @see org.eclipse.emf.cdo.tests.model4interfaces.INamedElement
* @generated
@@ -322,10 +334,12 @@ public class model4interfacesAdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4interfaces.IContainedElementNoParentLink IContained Element No Parent Link}'.
- * This default implementation returns null so
+ * Creates a new adapter for an object of class '
+ * {@link org.eclipse.emf.cdo.tests.model4interfaces.IContainedElementNoParentLink
+ * IContained Element No Parent Link}'. This default implementation returns null so
* that we can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway.
*
+ *
* @return the new adapter.
* @see org.eclipse.emf.cdo.tests.model4interfaces.IContainedElementNoParentLink
* @generated
@@ -351,9 +365,11 @@ public class model4interfacesAdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainerNPL ISingle Ref Non Container NPL}'.
- * This default implementation returns null so that we can easily ignore cases; it's useful
+ * Creates a new adapter for an object of class '
+ * {@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainerNPL ISingle Ref Non Container NPL}
+ * '. This default implementation returns null so that we can easily ignore cases; it's useful
* to ignore a case when inheritance will catch all the cases anyway.
+ *
* @return the new adapter.
* @see org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainerNPL
* @generated
@@ -379,9 +395,11 @@ public class model4interfacesAdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainerNPL IMulti Ref Non Container NPL}'.
+ * Creates a new adapter for an object of class '
+ * {@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainerNPL IMulti Ref Non Container NPL}'.
* This default implementation returns null so that we can easily ignore cases; it's useful to
* ignore a case when inheritance will catch all the cases anyway.
+ *
* @return the new adapter.
* @see org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainerNPL
* @generated
@@ -392,9 +410,9 @@ public class model4interfacesAdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for the default case.
- * This default implementation returns null. This default implementation returns null.
+ *
* @return the new adapter.
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/util/model4interfacesSwitch.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/util/model4interfacesSwitch.java
index 715ee69617..022db0ec69 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/util/model4interfacesSwitch.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/util/model4interfacesSwitch.java
@@ -8,7 +8,7 @@
* Contributors:
* Eike Stepper - initial API and implementation
*
- * $Id: model4interfacesSwitch.java,v 1.5 2008-12-28 17:57:05 estepper Exp $
+ * $Id: model4interfacesSwitch.java,v 1.6 2009-01-10 07:56:24 estepper Exp $
*/
package org.eclipse.emf.cdo.tests.model4interfaces.util;
@@ -38,21 +38,22 @@ import java.util.List;
* {@link #doSwitch(EObject) doSwitch(object)} to invoke the caseXXX
method for each class of the model,
* starting with the actual class of the object and proceeding up the inheritance hierarchy until a non-null result is
* returned, which is the result of the switch.
+ *
* @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage
* @generated
*/
public class model4interfacesSwitchcaseXXX
for each class of the model until one returns a non null result; it yields that result.
*
+ *
* @return the first non-null result returned by a caseXXX
call.
* @generated
*/
@@ -77,6 +79,7 @@ public class model4interfacesSwitchcaseXXX
for each class of the model until one returns a non null result; it yields that result.
*
+ *
* @return the first non-null result returned by a caseXXX
call.
* @generated
*/
@@ -96,6 +99,7 @@ public class model4interfacesSwitchcaseXXX
for each class of the model until one returns a non null result; it yields that result.
*
+ *
* @return the first non-null result returned by a caseXXX
call.
* @generated
*/
@@ -349,10 +353,11 @@ public class model4interfacesSwitch
- * To activate a policy, you must do the following:
- * view.setChangeSubscriptionPolicy(CDOAdapterPolicy.ALL);
- *
- * To register an object, you must add an adapter to the object in which you are interested:
- * eObject.eAdapters().add(myAdapter);
- *
- * By activating this feature, each object having at least one adapter that matches the current policy will be - * registered with the server and will be notified for each change occurring in the scope of any other transaction. - *
- * {@link CDOAdapterPolicy#NONE} - Disabled.
- * {@link CDOAdapterPolicy#ALL} - Enabled for all adapters used.
- * {@link CDOAdapterPolicy#CDO} - Enabled only for adapters that implement {@link CDOAdapter}.
- * Any other class that implement {@link CDOAdapterPolicy} will enable for whatever rules defined in that class.
- *
- * If myAdapter
in the above example matches the current policy, eObject
will be registered
- * with the server and you will receive all changes from other transaction.
- *
- * When the policy is changed all objects in the cache will automatically be recalculated. - *
- * You can subscribe to temporary objects. Even if you cannot receive notifications from other {@link CDOTransaction} - * for these because they are only local to you, at commit time these objects will be registered automatically. - *
- * Note: It can be used with
- * The implementor might want to use/extend {@link ObjectConflictResolver}.
- */
- public void resolveConflicts(Set
- * As opposed to the {@link #getResult(Class)} method, this method asynchronously communicates with the server.
- * In other words, the returned iterator can be used immediately, even if the server is still about to send pending
- * result elements.
- */
- public
- * As opposed to the {@link #getResultAsync(Class)} method, this method synchronously communicates with the
- * server. In other words, the result list is only returned after all result elements have been received by the
- * client.
- */
- public
- * Note: Save points do not flush to disk. Everything is done in memory on the client side.
- *
- * @author Simon McDuff
- * @since 2.0
- */
-public interface CDOSavepoint
-{
- public CDOUserTransaction getUserTransaction();
-
- public CDOSavepoint getNextSavepoint();
-
- public CDOSavepoint getPreviousSavepoint();
-
- public boolean isValid();
-
- public void rollback();
-}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSession.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSession.java
deleted file mode 100644
index d9b9b3804c..0000000000
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSession.java
+++ /dev/null
@@ -1,301 +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
- * Victor Roldan Betancort - maintenance
- **************************************************************************/
-package org.eclipse.emf.cdo;
-
-import org.eclipse.emf.cdo.common.CDOCommonSession;
-import org.eclipse.emf.cdo.common.model.CDOPackage;
-import org.eclipse.emf.cdo.common.revision.CDORevision;
-import org.eclipse.emf.cdo.common.revision.CDORevisionFactory;
-import org.eclipse.emf.cdo.util.CDOPackageRegistry;
-
-import org.eclipse.net4j.util.container.IContainer;
-import org.eclipse.net4j.util.options.IOptionsContainer;
-import org.eclipse.net4j.util.options.IOptionsEvent;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-
-import java.util.Collection;
-
-/**
- * Represents and controls the connection to a model repository.
- *
- * A session has the following responsibilities:
- *
- * Note that, in order to retrieve, access and store {@link EObject objects} a {@link CDOView view} is needed. The
- * various
- * This registry is managed by the {@link CDOSessionPackageManager package manager} of this session. All
- * {@link EPackage packages} that are already persisted in the repository of this session are automatically registered
- * with this registry. New packages can be locally registered with this registry and are committed to the repository
- * through a {@link CDOTransaction transaction} if needed.
- *
- * @see #getPackageManager()
- */
- public CDOPackageRegistry getPackageRegistry();
-
- /**
- * Returns the CDO {@link CDOSessionPackageManager package manager} that represents the CDO {@link CDOPackage
- * packages} currently stored in the repository of this session. The package manager can be used to query information
- * about the packages in the repository as well as convert between the EMF and CDO instances of these packages.
- */
- public CDOSessionPackageManager getPackageManager();
-
- /**
- * Returns the CDO {@link CDORevisionManager revision manager} that manages the {@link CDORevision revisions} of the
- * repository of this session.
- */
- public CDORevisionManager getRevisionManager();
-
- /**
- * Returns an array of all open {@link CDOView views}, {@link CDOTransaction transactions} and {@link CDOAudit audits}
- * of this session.
- *
- * @see #openView()
- * @see #openTransaction()
- * @see #openAudit(long)
- */
- public CDOView[] getViews();
-
- /**
- * Opens and returns a new {@link CDOTransaction transaction} on the given EMF {@link ResourceSet resource set}.
- *
- * @see #openTransaction()
- */
- public CDOTransaction openTransaction(ResourceSet resourceSet);
-
- /**
- * Opens and returns a new {@link CDOTransaction transaction} on a new EMF {@link ResourceSet resource set}.
- *
- * Same as calling
- * Same as calling
- * Same as calling
- * Takes CDOID and version of all objects in the cache and sends it to the server. {@link CDOTimeStampContext}
- * contains informations of which objects changed/detached. The collection is ordered by timestamp. In the case where
- * {@link #isPassiveUpdateEnabled()} is
- * Example:
- *
- *
- * By default this property is enabled. If this property is disabled the latest versions of objects can still be
- * obtained by calling {@link #refresh()}.
- *
- * Passive update can be disabled in cases where more performance is needed and/or more control over when objects
- * will be refreshed.
- *
- * When enabled again, a refresh will be automatically performed to be in sync with the server.
- */
- public void setPassiveUpdateEnabled(boolean enabled);
-
- /**
- * The {@link CDOCollectionLoadingPolicy collection loading policy} of this {@link CDOSession session} controls how
- * a list gets populated. By default, when an object is fetched, all its elements are filled with the proper values.
- *
- * This could be time-consuming, especially if the reference list does not need to be accessed. In CDO it is
- * possible to partially load collections. The default list implementation that is shipped with CDO makes a
- * distinction between the two following situations:
- *
- *
- * The user can also provide its own implementation of the CDOCollectionLoadingPolicy interface.
- */
- public CDOCollectionLoadingPolicy getCollectionLoadingPolicy();
-
- /**
- * Returns the CDOCollectionLoadingPolicy currently being used by this session.
- */
- public void setCollectionLoadingPolicy(CDOCollectionLoadingPolicy policy);
-
- /**
- * Returns the CDORevisionFactory currently being used by this session.
- */
- public CDORevisionFactory getRevisionFactory();
-
- /**
- * Sets the CDORevisionFactory to be used by this session.
- */
- public void setRevisionFactory(CDORevisionFactory factory);
-
- /**
- * @since 2.0
- */
- public interface PassiveUpdateEvent extends IOptionsEvent, CDOEvent
- {
- }
-
- /**
- * @since 2.0
- */
- public interface CollectionLoadingPolicyEvent extends IOptionsEvent, CDOEvent
- {
- }
-
- /**
- * @since 2.0
- */
- public interface RevisionFactoryEvent extends IOptionsEvent, CDOEvent
- {
- }
- }
-
- /**
- * Describes a model repository a {@link CDOSession session} is connected to.
- *
- * @since 2.0
- * @author Eike Stepper
- * @see CDOSession#repository()
- */
- public interface Repository
- {
- /**
- * Returns the name of this repository.
- *
- * @see IRepository#getName()
- */
- public String getName();
-
- /**
- * Returns the UUID of this repository.
- *
- * @see IRepository#getUUID()
- */
- public String getUUID();
-
- /**
- * Returns the creation time of this repository.
- *
- * @see IRepository#getCreationTime()
- */
- public long getCreationTime();
-
- /**
- * Returns the approximate current time of this repository.
- *
- * Same as calling
- * Default value is true.
- */
- public boolean isAutoReleaseLocksEnabled();
-
- /**
- * Specifies whether locks in this view will be removed when {@link CDOTransaction#commit()} or
- * {@link CDOTransaction#rollback()} is called.
- *
- * If false all locks are kept.
- *
- * Default value is true.
- */
- public void setAutoReleaseLocksEnabled(boolean on);
-
- /**
- * @author Eike Stepper
- */
- public interface ConflictResolversEvent extends IOptionsEvent, CDOEvent
- {
- }
-
- /**
- * @author Eike Stepper
- */
- public interface AutoReleaseLockEvent extends IOptionsEvent, CDOEvent
- {
- }
- }
-}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOTransactionConflictEvent.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOTransactionConflictEvent.java
deleted file mode 100644
index 54816c44da..0000000000
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOTransactionConflictEvent.java
+++ /dev/null
@@ -1,22 +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.cdo;
-
-/**
- * @author Eike Stepper
- * @noimplement This interface is not intended to be implemented by clients.
- */
-public interface CDOTransactionConflictEvent extends CDOViewEvent
-{
- public CDOObject getConflictingObject();
-
- public boolean isFirstConflict();
-}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOTransactionFinishedEvent.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOTransactionFinishedEvent.java
deleted file mode 100644
index 464a89fe08..0000000000
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOTransactionFinishedEvent.java
+++ /dev/null
@@ -1,35 +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.cdo;
-
-import org.eclipse.emf.cdo.common.id.CDOID;
-import org.eclipse.emf.cdo.common.id.CDOIDTemp;
-
-import java.util.Map;
-
-/**
- * @author Eike Stepper
- * @noimplement This interface is not intended to be implemented by clients.
- */
-public interface CDOTransactionFinishedEvent extends CDOViewEvent
-{
- public Type getType();
-
- public Map
- * Note: This method will be called at most once per object until the associated transaction is committed.
- */
- public void modifyingObject(CDOTransaction transaction, CDOObject object, CDOFeatureDelta featureDelta);
-
- /**
- * Called by a
- * Save points do not involve the server side, everything is done on the client side.
- *
- */
- public CDOSavepoint setSavepoint();
-
- public CDOSavepoint getLastSavepoint();
-}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOView.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOView.java
deleted file mode 100644
index 920b9d350d..0000000000
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOView.java
+++ /dev/null
@@ -1,455 +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
- * Victor Roldan Betancort - maintenance
- **************************************************************************/
-package org.eclipse.emf.cdo;
-
-import org.eclipse.emf.cdo.common.CDOCommonView;
-import org.eclipse.emf.cdo.common.id.CDOID;
-import org.eclipse.emf.cdo.eresource.CDOResource;
-import org.eclipse.emf.cdo.eresource.CDOResourceFolder;
-import org.eclipse.emf.cdo.eresource.CDOResourceNode;
-import org.eclipse.emf.cdo.util.ReadOnlyException;
-
-import org.eclipse.net4j.util.collection.CloseableIterator;
-import org.eclipse.net4j.util.concurrent.RWLockManager;
-import org.eclipse.net4j.util.event.INotifier;
-import org.eclipse.net4j.util.options.IOptions;
-import org.eclipse.net4j.util.options.IOptionsContainer;
-import org.eclipse.net4j.util.options.IOptionsEvent;
-import org.eclipse.net4j.util.ref.ReferenceType;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.URIHandler;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.concurrent.locks.ReentrantLock;
-
-/**
- * A read-only view to the current (i.e. latest) state of the object graph in the repository of the underlying
- * {@link CDOSession session}.
- *
- * Objects that are accessed through this view are unchangeable for the client. Each attempt to call a mutator on one of
- * these objects or one of their reference collections will result in a {@link ReadOnlyException} being thrown
- * immediately.
- *
- * A view is opened through API of the underlying session like this:
- *
- *
- * Since a CDOObject, in a {@link CDOState#TRANSIENT non-TRANSIENT} state, is only meaningful in combination with its
- * dedicated view they must also not be accessed through concurrent client threads. Please note that at arbitrary times
- * an arbitrary number of framework background threads are allowed to use and modify a CDOview and its CDOObjects.
- * Whenever you are iterating over a number of CDOObjects and need to ensure that they are not modified by the framework
- * at the same time it is strongly recommended to acquire the {@link #getLock() view lock} and protect your code
- * appropriately.
- *
- * @author Eike Stepper
- * @noimplement This interface is not intended to be implemented by clients.
- */
-public interface CDOView extends CDOCommonView, INotifier, IOptionsContainer
-{
- /**
- * Returns the {@link CDOSession session} this view was opened by.
- *
- * @return The session this view was opened by, or
- * Same as calling getViewSet().getResourceSet().
- *
- * @see CDOViewSet#getResourceSet()
- */
- public ResourceSet getResourceSet();
-
- /**
- * @since 2.0
- * @deprecated This API is provisional and subject to change or removal.
- */
- @Deprecated
- public URIHandler getURIHandler();
-
- /**
- * Returns a reentrant lock that can be used to prevent the framework from writing to any object in this view (as it
- * is caused, for example, by passive updates).
- *
- * Acquiring this lock provides a means to safely iterate over multiple model elements without being affected by
- * unanticipated remote updates, like in the following example:
- *
- *
- * This method has a special implementation in {@link CDOTransaction} as well.
- *
- * @see CDOTransaction#isDirty()
- */
- public boolean isDirty();
-
- /**
- * Returns always
- * This method has a special implementation in {@link CDOTransaction} as well.
- *
- * @see CDOTransaction#hasConflict()
- */
- public boolean hasConflict();
-
- /**
- * Returns
- * The root resource is a special resource with only {@link CDOResourceNode CDOResourceNodes} in its contents list.
- * You can use it as the main entry into the new resource and folder structure.
- *
- * @since 2.0
- */
- public CDOResource getRootResource();
-
- /**
- * Returns a list of the resources in the given folder with a name equal to or starting with the value of the name
- * parameter.
- *
- * @param folder
- * The folder to search in, or
- * Same as
- * To activate a policy, you must do the following:
- * To register an object, you must add an adapter to the object in which you are interested:
- * By activating this feature, each object having at least one adapter that matches the current policy will be
- * registered with the server and will be notified for each change occurring in the scope of any other transaction.
- *
- * {@link CDOAdapterPolicy#NONE} - Ignored.
- * If
- * When the policy is changed all objects in the cache will automatically be recalculated.
- *
- * You can subscribe to temporary objects. Even if you cannot receive notifications from other
- * {@link CDOTransaction} for these because they are only local to you, at commit time these objects will be
- * registered automatically.
- *
- * Note: It can be used with
- * When
- * The difference between the CDOCollectionLoadingPolicy feature and the CDORevisionPrefetchingPolicy feature is
- * subtle. The CDOCollectionLoadingPolicy feature determines how and when to fetch CDOIDs, while the
- * CDORevisionPrefetchingPolicy feature determines how and when to resolve CDOIDs (i.e. fetch the target objects).
- *
- *
- * The end-user could provide its own implementation of the CDORevisionPrefetchingPolicy interface.
- */
- public void setRevisionPrefetchingPolicy(CDORevisionPrefetchingPolicy prefetchingPolicy);
-
- /**
- * @since 2.0
- */
- public interface CacheReferenceTypeEvent extends IOptionsEvent, CDOEvent
- {
- }
-
- /**
- * @since 2.0
- */
- public interface ReferencePolicyEvent extends IOptionsEvent, CDOEvent
- {
- }
-
- /**
- * @since 2.0
- */
- public interface ChangeSubscriptionPoliciesEvent extends IOptionsEvent, CDOEvent
- {
- }
-
- /**
- * @since 2.0
- */
- public interface InvalidationNotificationEvent extends IOptionsEvent, CDOEvent
- {
- }
-
- /**
- * @since 2.0
- */
- public interface RevisionPrefetchingPolicyEvent extends IOptionsEvent, CDOEvent
- {
- }
- }
-}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOViewEvent.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOViewEvent.java
deleted file mode 100644
index 312ee61d43..0000000000
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOViewEvent.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:
- * Eike Stepper - initial API and implementation
- **************************************************************************/
-package org.eclipse.emf.cdo;
-
-/**
- * @author Eike Stepper
- * @noimplement This interface is not intended to be implemented by clients.
- */
-public interface CDOViewEvent extends CDOEvent
-{
- public CDOView getView();
-}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOViewInvalidationEvent.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOViewInvalidationEvent.java
deleted file mode 100644
index 2e6c6c4189..0000000000
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOViewInvalidationEvent.java
+++ /dev/null
@@ -1,46 +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.cdo;
-
-import org.eclipse.net4j.util.event.IListener;
-
-import java.util.Set;
-
-/**
- * An event that is emitted to registered {@link IListener listeners} of a {@link CDOView} if
- * {@link CDOSession#setPassiveUpdateEnabled(boolean) passive update} is enabled for the session.
- *
- * @author Simon McDuff
- * @see CDOInvalidationNotification
- * @see CDOAdapterPolicy
- * @noimplement This interface is not intended to be implemented by clients.
- * @since 2.0
- */
-public interface CDOViewInvalidationEvent extends CDOViewEvent
-{
- /**
- * Returns the time stamp of the server transaction if this event was sent as a result of a successfully committed
- * transaction or
- * Note: A view set must have exactly one resource set associated. A resource set can have only one view set
- * associated.
- *
- * @author Simon McDuff
- * @since 2.0
- */
-public interface CDOViewSet extends Notifier
-{
- public CDOView resolveView(String repositoryUUID);
-
- public CDOView[] getViews();
-
- public CDOResourceFactory getResourceFactory();
-
- public EPackage.Registry getPackageRegistry();
-
- public ResourceSet getResourceSet();
-}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOXATransaction.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOXATransaction.java
deleted file mode 100644
index 1daa7b6ceb..0000000000
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOXATransaction.java
+++ /dev/null
@@ -1,38 +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.cdo;
-
-/**
- * @author Simon McDuff
- * @since 2.0
- */
-public interface CDOXATransaction extends CDOUserTransaction
-{
- public void add(CDOViewSet viewSet);
-
- public void remove(CDOViewSet viewSet);
-
- /**
- * see {@link CDOXATransaction#isAllowRequestFromTransactionEnabled()}
- */
- public void setAllowRequestFromTransactionEnabled(boolean allRequest);
-
- /**
- * Allow request that come from contains {@link CDOTransaction}. Default value is true.
- *
- * If the value is true, cdoTransaction.commit() will call xaTransaction.commit and all {@link CDOXATransaction} part
- * of xaTransaction will be committed.
- *
- * If the value is false, the user will receive an exception by calling cdoTransaction.commit(). The user can only
- * commit from {@link CDOXATransaction}.
- */
- public boolean isAllowRequestFromTransactionEnabled();
-}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResourceFactory.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResourceFactory.java
index 68415d566a..8e944e7bc1 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResourceFactory.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResourceFactory.java
@@ -11,7 +11,7 @@
**************************************************************************/
package org.eclipse.emf.cdo.eresource;
-import org.eclipse.emf.cdo.CDOViewSet;
+import org.eclipse.emf.cdo.view.CDOViewSet;
import org.eclipse.emf.ecore.resource.Resource;
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResourceInputStream.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResourceInputStream.java
index b42abbce9e..61069b87c9 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResourceInputStream.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResourceInputStream.java
@@ -10,7 +10,7 @@
**************************************************************************/
package org.eclipse.emf.cdo.eresource;
-import org.eclipse.emf.cdo.CDOView;
+import org.eclipse.emf.cdo.view.CDOView;
import org.eclipse.emf.common.util.URI;
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceFactoryImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceFactoryImpl.java
index 85003a7906..48706a7187 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceFactoryImpl.java
@@ -12,18 +12,17 @@
**************************************************************************/
package org.eclipse.emf.cdo.eresource.impl;
-import org.eclipse.emf.cdo.CDOView;
-import org.eclipse.emf.cdo.CDOViewSet;
import org.eclipse.emf.cdo.eresource.CDOResourceFactory;
import org.eclipse.emf.cdo.util.CDOURIUtil;
-import org.eclipse.emf.cdo.util.CDOViewAdapter;
-import org.eclipse.emf.cdo.util.CDOViewProviderRegistry;
-
-import org.eclipse.emf.internal.cdo.InternalCDOViewSet;
+import org.eclipse.emf.cdo.view.CDOView;
+import org.eclipse.emf.cdo.view.CDOViewAdapter;
+import org.eclipse.emf.cdo.view.CDOViewProviderRegistry;
+import org.eclipse.emf.cdo.view.CDOViewSet;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.emf.spi.cdo.InternalCDOViewSet;
/**
* @author Eike Stepper
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java
index 83b0dcabf9..b59d0a6388 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java
@@ -12,21 +12,18 @@
package org.eclipse.emf.cdo.eresource.impl;
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.CDOIDUtil;
import org.eclipse.emf.cdo.eresource.CDOResource;
import org.eclipse.emf.cdo.eresource.EresourcePackage;
+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.CDOViewAdapter;
import org.eclipse.emf.cdo.util.ObjectNotFoundException;
+import org.eclipse.emf.cdo.view.CDOView;
+import org.eclipse.emf.cdo.view.CDOViewAdapter;
import org.eclipse.emf.internal.cdo.CDOStateMachine;
-import org.eclipse.emf.internal.cdo.InternalCDOObject;
-import org.eclipse.emf.internal.cdo.InternalCDOTransaction;
-import org.eclipse.emf.internal.cdo.InternalCDOView;
import org.eclipse.emf.internal.cdo.util.FSMUtil;
import org.eclipse.emf.common.notify.Adapter;
@@ -50,6 +47,9 @@ import org.eclipse.emf.ecore.resource.URIConverter;
import org.eclipse.emf.ecore.resource.impl.ExtensibleURIConverterImpl;
import org.eclipse.emf.ecore.resource.impl.ResourceImpl;
import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.emf.spi.cdo.InternalCDOObject;
+import org.eclipse.emf.spi.cdo.InternalCDOTransaction;
+import org.eclipse.emf.spi.cdo.InternalCDOView;
import org.eclipse.core.runtime.IProgressMonitor;
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceNodeImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceNodeImpl.java
index e61de4c331..c14ea023db 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceNodeImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceNodeImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* Eike Stepper - initial API and implementation
*
- * $Id: CDOResourceNodeImpl.java,v 1.7 2009-01-10 07:09:05 estepper Exp $
+ * $Id: CDOResourceNodeImpl.java,v 1.8 2009-01-10 07:56:37 estepper Exp $
*/
package org.eclipse.emf.cdo.eresource.impl;
@@ -19,11 +19,11 @@ import org.eclipse.emf.cdo.eresource.EresourcePackage;
import org.eclipse.emf.cdo.util.CDOURIUtil;
import org.eclipse.emf.internal.cdo.CDOObjectImpl;
-import org.eclipse.emf.internal.cdo.InternalCDOTransaction;
import org.eclipse.net4j.util.ObjectUtil;
import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.spi.cdo.InternalCDOTransaction;
import java.util.List;
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOCollectionLoadingPolicy.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOCollectionLoadingPolicy.java
new file mode 100644
index 0000000000..224dad5d58
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOCollectionLoadingPolicy.java
@@ -0,0 +1,62 @@
+/***************************************************************************
+ * 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.cdo.session;
+
+import org.eclipse.emf.cdo.common.id.CDOID;
+import org.eclipse.emf.cdo.common.model.CDOFeature;
+import org.eclipse.emf.cdo.common.revision.CDORevision;
+
+/**
+ * A strategy that specifies which list elememts must be present (loaded) in a {@link CDOID} list of a
+ * {@link CDORevision revision} when a certain list index is accessed. Implementations of this interface can control the
+ * exact characteristics of a certain partial collection loading strategy.
+ *
+ * @author Simon McDuff
+ * @since 2.0
+ */
+public interface CDOCollectionLoadingPolicy
+{
+ /**
+ * A default collection loading strategy that leads to complete loading of {@link CDOID} lists before any of
+ * their elements is accessed.
+ */
+ public static final CDOCollectionLoadingPolicy DEFAULT = new CDOCollectionLoadingPolicy()
+ {
+ /**
+ * Returns {@link CDORevision#UNCHUNKED}.
+ */
+ public int getInitialChunkSize()
+ {
+ return CDORevision.UNCHUNKED;
+ }
+
+ public Object resolveProxy(CDORevisionManager revisionManager, CDORevision revision, CDOFeature feature,
+ int accessIndex, int serverIndex)
+ {
+ return revisionManager.loadChunkByRange(revision, feature, accessIndex, serverIndex, accessIndex, accessIndex);
+ }
+ };
+
+ /**
+ * Returns the maximum number of CDOIDs to be loaded for collections when an object is loaded, i.e. before any
+ * of their elements is accessed.
+ */
+ public int getInitialChunkSize();
+
+ /**
+ * Defines a strategy to be used when the collection needs to resolve one element.
+ * {@link CDORevisionManager#loadChunkByRange(CDORevision, CDOFeature, int, int, int, int)} should be used to resolve
+ * them.
+ */
+ public Object resolveProxy(CDORevisionManager revisionManager, CDORevision revision, CDOFeature feature,
+ int accessIndex, int serverIndex);
+}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOPackageRegistry.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOPackageRegistry.java
new file mode 100644
index 0000000000..c8f9baa1c3
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOPackageRegistry.java
@@ -0,0 +1,41 @@
+/***************************************************************************
+ * 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.cdo.session;
+
+import org.eclipse.emf.cdo.common.model.CDOPackage;
+
+import org.eclipse.emf.ecore.EPackage;
+
+/**
+ * @author Eike Stepper
+ */
+public interface CDOPackageRegistry extends EPackage.Registry
+{
+ /**
+ * Registers a top level {@link EPackage} and its sub packages with this package registry.
+ *
+ * @param ePackage
+ * a top level EPackage (i.e. a package with
+ * A session has the following responsibilities:
+ *
+ * Note that, in order to retrieve, access and store {@link EObject objects} a {@link CDOView view} is needed. The
+ * various
+ * This registry is managed by the {@link CDOSessionPackageManager package manager} of this session. All
+ * {@link EPackage packages} that are already persisted in the repository of this session are automatically registered
+ * with this registry. New packages can be locally registered with this registry and are committed to the repository
+ * through a {@link CDOTransaction transaction} if needed.
+ *
+ * @see #getPackageManager()
+ */
+ public CDOPackageRegistry getPackageRegistry();
+
+ /**
+ * Returns the CDO {@link CDOSessionPackageManager package manager} that represents the CDO {@link CDOPackage
+ * packages} currently stored in the repository of this session. The package manager can be used to query information
+ * about the packages in the repository as well as convert between the EMF and CDO instances of these packages.
+ */
+ public CDOSessionPackageManager getPackageManager();
+
+ /**
+ * Returns the CDO {@link CDORevisionManager revision manager} that manages the {@link CDORevision revisions} of the
+ * repository of this session.
+ */
+ public CDORevisionManager getRevisionManager();
+
+ /**
+ * Returns an array of all open {@link CDOView views}, {@link CDOTransaction transactions} and {@link CDOAudit audits}
+ * of this session.
+ *
+ * @see #openView()
+ * @see #openTransaction()
+ * @see #openAudit(long)
+ */
+ public CDOView[] getViews();
+
+ /**
+ * Opens and returns a new {@link CDOTransaction transaction} on the given EMF {@link ResourceSet resource set}.
+ *
+ * @see #openTransaction()
+ */
+ public CDOTransaction openTransaction(ResourceSet resourceSet);
+
+ /**
+ * Opens and returns a new {@link CDOTransaction transaction} on a new EMF {@link ResourceSet resource set}.
+ *
+ * Same as calling
+ * Same as calling
+ * Same as calling
+ * Takes CDOID and version of all objects in the cache and sends it to the server. {@link CDOTimeStampContext}
+ * contains informations of which objects changed/detached. The collection is ordered by timestamp. In the case where
+ * {@link #isPassiveUpdateEnabled()} is
+ * Example:
+ *
+ *
+ * By default this property is enabled. If this property is disabled the latest versions of objects can still be
+ * obtained by calling {@link #refresh()}.
+ *
+ * Passive update can be disabled in cases where more performance is needed and/or more control over when objects
+ * will be refreshed.
+ *
+ * When enabled again, a refresh will be automatically performed to be in sync with the server.
+ */
+ public void setPassiveUpdateEnabled(boolean enabled);
+
+ /**
+ * The {@link CDOCollectionLoadingPolicy collection loading policy} of this {@link CDOSession session} controls how
+ * a list gets populated. By default, when an object is fetched, all its elements are filled with the proper values.
+ *
+ * This could be time-consuming, especially if the reference list does not need to be accessed. In CDO it is
+ * possible to partially load collections. The default list implementation that is shipped with CDO makes a
+ * distinction between the two following situations:
+ *
+ *
+ * The user can also provide its own implementation of the CDOCollectionLoadingPolicy interface.
+ */
+ public CDOCollectionLoadingPolicy getCollectionLoadingPolicy();
+
+ /**
+ * Returns the CDOCollectionLoadingPolicy currently being used by this session.
+ */
+ public void setCollectionLoadingPolicy(CDOCollectionLoadingPolicy policy);
+
+ /**
+ * Returns the CDORevisionFactory currently being used by this session.
+ */
+ public CDORevisionFactory getRevisionFactory();
+
+ /**
+ * Sets the CDORevisionFactory to be used by this session.
+ */
+ public void setRevisionFactory(CDORevisionFactory factory);
+
+ /**
+ * @since 2.0
+ */
+ public interface PassiveUpdateEvent extends IOptionsEvent, CDOEvent
+ {
+ }
+
+ /**
+ * @since 2.0
+ */
+ public interface CollectionLoadingPolicyEvent extends IOptionsEvent, CDOEvent
+ {
+ }
+
+ /**
+ * @since 2.0
+ */
+ public interface RevisionFactoryEvent extends IOptionsEvent, CDOEvent
+ {
+ }
+ }
+
+ /**
+ * Describes a model repository a {@link CDOSession session} is connected to.
+ *
+ * @since 2.0
+ * @author Eike Stepper
+ * @see CDOSession#repository()
+ */
+ public interface Repository
+ {
+ /**
+ * Returns the name of this repository.
+ *
+ * @see IRepository#getName()
+ */
+ public String getName();
+
+ /**
+ * Returns the UUID of this repository.
+ *
+ * @see IRepository#getUUID()
+ */
+ public String getUUID();
+
+ /**
+ * Returns the creation time of this repository.
+ *
+ * @see IRepository#getCreationTime()
+ */
+ public long getCreationTime();
+
+ /**
+ * Returns the approximate current time of this repository.
+ *
+ * Same as calling
+ * Note: Save points do not flush to disk. Everything is done in memory on the client side.
+ *
+ * @author Simon McDuff
+ * @since 2.0
+ */
+public interface CDOSavepoint
+{
+ public CDOUserTransaction getUserTransaction();
+
+ public CDOSavepoint getNextSavepoint();
+
+ public CDOSavepoint getPreviousSavepoint();
+
+ public boolean isValid();
+
+ public void rollback();
+}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTimeStampContext.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTimeStampContext.java
new file mode 100644
index 0000000000..551cf115c5
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTimeStampContext.java
@@ -0,0 +1,32 @@
+/***************************************************************************
+ * 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.cdo.transaction;
+
+import org.eclipse.emf.cdo.common.id.CDOID;
+import org.eclipse.emf.cdo.common.id.CDOIDAndVersion;
+
+import java.util.Collection;
+import java.util.Set;
+
+/**
+ * @author Simon McDuff
+ * @since 2.0
+ * @noimplement This interface is not intended to be implemented by clients.
+ */
+public interface CDOTimeStampContext
+{
+ public long getTimeStamp();
+
+ public Collection
+ * Default value is true.
+ */
+ public boolean isAutoReleaseLocksEnabled();
+
+ /**
+ * Specifies whether locks in this view will be removed when {@link CDOTransaction#commit()} or
+ * {@link CDOTransaction#rollback()} is called.
+ *
+ * If false all locks are kept.
+ *
+ * Default value is true.
+ */
+ public void setAutoReleaseLocksEnabled(boolean on);
+
+ /**
+ * @author Eike Stepper
+ */
+ public interface ConflictResolversEvent extends IOptionsEvent, CDOEvent
+ {
+ }
+
+ /**
+ * @author Eike Stepper
+ */
+ public interface AutoReleaseLockEvent extends IOptionsEvent, CDOEvent
+ {
+ }
+ }
+}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransactionConflictEvent.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransactionConflictEvent.java
new file mode 100644
index 0000000000..b7409ab198
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransactionConflictEvent.java
@@ -0,0 +1,25 @@
+/***************************************************************************
+ * 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.cdo.transaction;
+
+import org.eclipse.emf.cdo.CDOObject;
+import org.eclipse.emf.cdo.view.CDOViewEvent;
+
+/**
+ * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
+ */
+public interface CDOTransactionConflictEvent extends CDOViewEvent
+{
+ public CDOObject getConflictingObject();
+
+ public boolean isFirstConflict();
+}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransactionFinishedEvent.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransactionFinishedEvent.java
new file mode 100644
index 0000000000..7b68090a54
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransactionFinishedEvent.java
@@ -0,0 +1,36 @@
+/***************************************************************************
+ * 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.cdo.transaction;
+
+import org.eclipse.emf.cdo.common.id.CDOID;
+import org.eclipse.emf.cdo.common.id.CDOIDTemp;
+import org.eclipse.emf.cdo.view.CDOViewEvent;
+
+import java.util.Map;
+
+/**
+ * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
+ */
+public interface CDOTransactionFinishedEvent extends CDOViewEvent
+{
+ public Type getType();
+
+ public Map
+ * Note: This method will be called at most once per object until the associated transaction is committed.
+ */
+ public void modifyingObject(CDOTransaction transaction, CDOObject object, CDOFeatureDelta featureDelta);
+
+ /**
+ * Called by a
+ * Save points do not involve the server side, everything is done on the client side.
+ *
+ */
+ public CDOSavepoint setSavepoint();
+
+ public CDOSavepoint getLastSavepoint();
+}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOXATransaction.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOXATransaction.java
new file mode 100644
index 0000000000..0236d2d3da
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOXATransaction.java
@@ -0,0 +1,40 @@
+/***************************************************************************
+ * 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.cdo.transaction;
+
+import org.eclipse.emf.cdo.view.CDOViewSet;
+
+/**
+ * @author Simon McDuff
+ * @since 2.0
+ */
+public interface CDOXATransaction extends CDOUserTransaction
+{
+ public void add(CDOViewSet viewSet);
+
+ public void remove(CDOViewSet viewSet);
+
+ /**
+ * see {@link CDOXATransaction#isAllowRequestFromTransactionEnabled()}
+ */
+ public void setAllowRequestFromTransactionEnabled(boolean allRequest);
+
+ /**
+ * Allow request that come from contains {@link CDOTransaction}. Default value is true.
+ *
+ * If the value is true, cdoTransaction.commit() will call xaTransaction.commit and all {@link CDOXATransaction} part
+ * of xaTransaction will be committed.
+ *
+ * If the value is false, the user will receive an exception by calling cdoTransaction.commit(). The user can only
+ * commit from {@link CDOXATransaction}.
+ */
+ public boolean isAllowRequestFromTransactionEnabled();
+}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/AbstractCDOViewProvider.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/AbstractCDOViewProvider.java
deleted file mode 100644
index 3ae9f18f24..0000000000
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/AbstractCDOViewProvider.java
+++ /dev/null
@@ -1,83 +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:
- * Victor Roldan Betancort - initial API and implementation
- **************************************************************************/
-package org.eclipse.emf.cdo.util;
-
-import org.eclipse.net4j.util.ReflectUtil.ExcludeFromDump;
-
-import org.eclipse.emf.common.util.URI;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * Base logic to handle CDOViewProvider priority and regular expression.
- *
- * @author Victor Roldan Betancort
- * @since 2.0
- */
-public abstract class AbstractCDOViewProvider implements CDOViewProvider
-{
- private String regex;
-
- private int priority = DEFAULT_PRIORITY;
-
- @ExcludeFromDump
- private transient Pattern pattern;
-
- public AbstractCDOViewProvider()
- {
- }
-
- public AbstractCDOViewProvider(String regex, int priority)
- {
- this.regex = regex;
- this.priority = priority;
- }
-
- public AbstractCDOViewProvider(String regex)
- {
- this(regex, DEFAULT_PRIORITY);
- }
-
- public int getPriority()
- {
- return priority;
- }
-
- public void setPriority(int priority)
- {
- this.priority = priority;
- }
-
- public String getRegex()
- {
- return regex;
- }
-
- public void setRegex(String regex)
- {
- this.regex = regex;
- }
-
- public boolean matchesRegex(URI uri)
- {
- synchronized (regex)
- {
- if (pattern == null)
- {
- pattern = Pattern.compile(regex);
- }
- }
-
- Matcher matcher = pattern.matcher(uri.toString());
- return matcher.matches();
- }
-}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOAutoAttacher.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOAutoAttacher.java
deleted file mode 100644
index 67a94ffb6a..0000000000
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOAutoAttacher.java
+++ /dev/null
@@ -1,176 +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.cdo.util;
-
-import org.eclipse.emf.cdo.CDOObject;
-import org.eclipse.emf.cdo.CDOTransaction;
-import org.eclipse.emf.cdo.common.revision.delta.CDOAddFeatureDelta;
-import org.eclipse.emf.cdo.common.revision.delta.CDOClearFeatureDelta;
-import org.eclipse.emf.cdo.common.revision.delta.CDOContainerFeatureDelta;
-import org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDelta;
-import org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDeltaVisitor;
-import org.eclipse.emf.cdo.common.revision.delta.CDOListFeatureDelta;
-import org.eclipse.emf.cdo.common.revision.delta.CDOMoveFeatureDelta;
-import org.eclipse.emf.cdo.common.revision.delta.CDORemoveFeatureDelta;
-import org.eclipse.emf.cdo.common.revision.delta.CDOSetFeatureDelta;
-import org.eclipse.emf.cdo.common.revision.delta.CDOUnsetFeatureDelta;
-import org.eclipse.emf.cdo.eresource.CDOResource;
-
-import org.eclipse.emf.internal.cdo.InternalCDOObject;
-import org.eclipse.emf.internal.cdo.util.FSMUtil;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-
-import java.util.List;
-
-/**
- * @author Simon McDuff
- * @since 2.0
- */
-public class CDOAutoAttacher extends CDODefaultTransactionHandler
-{
- private CDOTransaction transaction;
-
- public CDOAutoAttacher(CDOTransaction transaction)
- {
- this.transaction = transaction;
- transaction.addHandler(this);
- }
-
- public CDOTransaction getTransaction()
- {
- return transaction;
- }
-
- @Override
- public void attachingObject(CDOTransaction transaction, CDOObject object)
- {
- if (object instanceof CDOResource)
- {
- return;
- }
-
- // Persist the graph as well.
- handle(object, object);
- }
-
- @Override
- public void modifyingObject(CDOTransaction transaction, CDOObject object, CDOFeatureDelta featureChange)
- {
- if (object instanceof CDOResource)
- {
- return;
- }
-
- if (featureChange != null)
- {
- CDOFeatureDeltaVisitorAutoAttach featureChangeVisitor = new CDOFeatureDeltaVisitorAutoAttach(object);
- featureChange.accept(featureChangeVisitor);
- }
- }
-
- protected void persist(EObject res, Object object)
- {
- if (!(object instanceof CDOResource) && object instanceof InternalCDOObject)
- {
- InternalCDOObject cdoObject = (InternalCDOObject)object;
- if (FSMUtil.isTransient(cdoObject))
- {
- res.eResource().getContents().add(cdoObject);
- }
- }
- }
-
- private void check(EObject referrer, EReference reference, EObject element)
- {
- if (element != null && element.eResource() == null)
- {
- if (reference != null && reference.isContainment())
- {
- handle(referrer, element);
- }
- else
- {
- persist(referrer, element);
- }
- }
- }
-
- @SuppressWarnings("unchecked")
- private void handle(EObject referrer, EObject eObject)
- {
- for (EReference reference : eObject.eClass().getEAllReferences())
- {
- if (reference.isMany())
- {
- List
+ * To activate a policy, you must do the following:
+ * To register an object, you must add an adapter to the object in which you are interested:
+ * By activating this feature, each object having at least one adapter that matches the current policy will be
+ * registered with the server and will be notified for each change occurring in the scope of any other transaction.
+ *
+ * {@link CDOAdapterPolicy#NONE} - Disabled.
+ * If
+ * When the policy is changed all objects in the cache will automatically be recalculated.
+ *
+ * You can subscribe to temporary objects. Even if you cannot receive notifications from other {@link CDOTransaction}
+ * for these because they are only local to you, at commit time these objects will be registered automatically.
+ *
+ * Note: It can be used with
+ * The implementor might want to use/extend {@link CDOObjectConflictResolver}.
+ */
+ public void resolveConflicts(Set
+ * As opposed to the {@link #getResult(Class)} method, this method asynchronously communicates with the server.
+ * In other words, the returned iterator can be used immediately, even if the server is still about to send pending
+ * result elements.
+ */
+ public
+ * As opposed to the {@link #getResultAsync(Class)} method, this method synchronously communicates with the
+ * server. In other words, the result list is only returned after all result elements have been received by the
+ * client.
+ */
+ public
+ * Objects that are accessed through this view are unchangeable for the client. Each attempt to call a mutator on one of
+ * these objects or one of their reference collections will result in a {@link ReadOnlyException} being thrown
+ * immediately.
+ *
+ * A view is opened through API of the underlying session like this:
+ *
+ *
+ * Since a CDOObject, in a {@link CDOState#TRANSIENT non-TRANSIENT} state, is only meaningful in combination with its
+ * dedicated view they must also not be accessed through concurrent client threads. Please note that at arbitrary times
+ * an arbitrary number of framework background threads are allowed to use and modify a CDOview and its CDOObjects.
+ * Whenever you are iterating over a number of CDOObjects and need to ensure that they are not modified by the framework
+ * at the same time it is strongly recommended to acquire the {@link #getLock() view lock} and protect your code
+ * appropriately.
+ *
+ * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
+ */
+public interface CDOView extends CDOCommonView, INotifier, IOptionsContainer
+{
+ /**
+ * Returns the {@link CDOSession session} this view was opened by.
+ *
+ * @return The session this view was opened by, or
+ * Same as calling getViewSet().getResourceSet().
+ *
+ * @see CDOViewSet#getResourceSet()
+ */
+ public ResourceSet getResourceSet();
+
+ /**
+ * @since 2.0
+ * @deprecated This API is provisional and subject to change or removal.
+ */
+ @Deprecated
+ public URIHandler getURIHandler();
+
+ /**
+ * Returns a reentrant lock that can be used to prevent the framework from writing to any object in this view (as it
+ * is caused, for example, by passive updates).
+ *
+ * Acquiring this lock provides a means to safely iterate over multiple model elements without being affected by
+ * unanticipated remote updates, like in the following example:
+ *
+ *
+ * This method has a special implementation in {@link CDOTransaction} as well.
+ *
+ * @see CDOTransaction#isDirty()
+ */
+ public boolean isDirty();
+
+ /**
+ * Returns always
+ * This method has a special implementation in {@link CDOTransaction} as well.
+ *
+ * @see CDOTransaction#hasConflict()
+ */
+ public boolean hasConflict();
+
+ /**
+ * Returns
+ * The root resource is a special resource with only {@link CDOResourceNode CDOResourceNodes} in its contents list.
+ * You can use it as the main entry into the new resource and folder structure.
+ *
+ * @since 2.0
+ */
+ public CDOResource getRootResource();
+
+ /**
+ * Returns a list of the resources in the given folder with a name equal to or starting with the value of the name
+ * parameter.
+ *
+ * @param folder
+ * The folder to search in, or
+ * Same as
+ * To activate a policy, you must do the following:
+ * To register an object, you must add an adapter to the object in which you are interested:
+ * By activating this feature, each object having at least one adapter that matches the current policy will be
+ * registered with the server and will be notified for each change occurring in the scope of any other transaction.
+ *
+ * {@link CDOAdapterPolicy#NONE} - Ignored.
+ * If
+ * When the policy is changed all objects in the cache will automatically be recalculated.
+ *
+ * You can subscribe to temporary objects. Even if you cannot receive notifications from other
+ * {@link CDOTransaction} for these because they are only local to you, at commit time these objects will be
+ * registered automatically.
+ *
+ * Note: It can be used with
+ * When
+ * The difference between the CDOCollectionLoadingPolicy feature and the CDORevisionPrefetchingPolicy feature is
+ * subtle. The CDOCollectionLoadingPolicy feature determines how and when to fetch CDOIDs, while the
+ * CDORevisionPrefetchingPolicy feature determines how and when to resolve CDOIDs (i.e. fetch the target objects).
+ *
+ *
+ * The end-user could provide its own implementation of the CDORevisionPrefetchingPolicy interface.
+ */
+ public void setRevisionPrefetchingPolicy(CDORevisionPrefetchingPolicy prefetchingPolicy);
+
+ /**
+ * @since 2.0
+ */
+ public interface CacheReferenceTypeEvent extends IOptionsEvent, CDOEvent
+ {
+ }
+
+ /**
+ * @since 2.0
+ */
+ public interface ReferencePolicyEvent extends IOptionsEvent, CDOEvent
+ {
+ }
+
+ /**
+ * @since 2.0
+ */
+ public interface ChangeSubscriptionPoliciesEvent extends IOptionsEvent, CDOEvent
+ {
+ }
+
+ /**
+ * @since 2.0
+ */
+ public interface InvalidationNotificationEvent extends IOptionsEvent, CDOEvent
+ {
+ }
+
+ /**
+ * @since 2.0
+ */
+ public interface RevisionPrefetchingPolicyEvent extends IOptionsEvent, CDOEvent
+ {
+ }
+ }
+}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewAdapter.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewAdapter.java
new file mode 100644
index 0000000000..c5121add48
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewAdapter.java
@@ -0,0 +1,54 @@
+/***************************************************************************
+ * 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:
+ * Victor Roldan Betancort - initial API and implementation
+ **************************************************************************/
+package org.eclipse.emf.cdo.view;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.Notifier;
+
+/**
+ * Adapter meant to carry a
+ * Note: A view set must have exactly one resource set associated. A resource set can have only one view set
+ * associated.
+ *
+ * @author Simon McDuff
+ * @since 2.0
+ */
+public interface CDOViewSet extends Notifier
+{
+ public CDOView resolveView(String repositoryUUID);
+
+ public CDOView[] getViews();
+
+ public CDOResourceFactory getResourceFactory();
+
+ public EPackage.Registry getPackageRegistry();
+
+ public ResourceSet getResourceSet();
+}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/ManagedContainerViewProvider.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/ManagedContainerViewProvider.java
new file mode 100644
index 0000000000..e05ced8028
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/ManagedContainerViewProvider.java
@@ -0,0 +1,47 @@
+/***************************************************************************
+ * Copyright (c) 2004 - 2008 Eike Stepper and others.
+ * 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:
+ * Victor Roldan Betancort - initial API and implementation
+ **************************************************************************/
+package org.eclipse.emf.cdo.view;
+
+import org.eclipse.net4j.util.container.IManagedContainer;
+import org.eclipse.net4j.util.om.OMPlatform;
+
+/**
+ * Base class for CDOSession.setPassiveUpdate(false)
. In this case, it will receive
- * changes without having the objects changed.
- *
- * @author Simon McDuff
- * @see CDOSessionInvalidationEvent
- * @see CDOInvalidationNotification
- * @since 2.0
- */
-public interface CDOAdapterPolicy
-{
- /**
- * A default adapter policy that never triggers any special behaviour.
- */
- public static final CDOAdapterPolicy NONE = new CDOAdapterPolicy()
- {
- /**
- * Always returns false
.
- */
- public boolean isValid(EObject eObject, Adapter adapter)
- {
- return false;
- }
- };
-
- /**
- * A default adapter policy that only triggers special behaviour if the adapter under test implements
- * {@link CDOAdapter}.
- */
- public static final CDOAdapterPolicy CDO = new CDOAdapterPolicy()
- {
- /**
- * Returns true
if the given adapter implements {@link CDOAdapter}.
- */
- public boolean isValid(EObject eObject, Adapter adapter)
- {
- return adapter instanceof CDOAdapter;
- }
- };
-
- /**
- * A default adapter policy that always triggers special behaviour.
- */
- public static final CDOAdapterPolicy ALL = new CDOAdapterPolicy()
- {
- /**
- * Always returns true
.
- */
- public boolean isValid(EObject eObject, Adapter adapter)
- {
- return true;
- }
- };
-
- /**
- * Returns true
if the given adapter on the given object should trigger a certain operation or behaviour,
- * false
otherwise.
- *
- * @see CDOView.Options#addChangeSubscriptionPolicy(CDOAdapterPolicy)
- * @see CDOView.Options#setStrongReferencePolicy(CDOAdapterPolicy)
- */
- public boolean isValid(EObject eObject, Adapter adapter);
-}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOAudit.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOAudit.java
deleted file mode 100644
index 436a16b105..0000000000
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOAudit.java
+++ /dev/null
@@ -1,37 +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.cdo;
-
-import org.eclipse.emf.cdo.common.revision.CDORevision;
-
-/**
- * A read-only {@link CDOView view} to a historical state of the object graph in the repository specified by a
- * time stamp (i.e. an arbitrary point in the lifetime of the repository).
- *
- * @author Eike Stepper
- * @noimplement This interface is not intended to be implemented by clients.
- */
-public interface CDOAudit extends CDOView
-{
- /**
- * Returns the point in (repository) time this audit view is currently referring to. {@link CDOObject Objects}
- * provided by this view are {@link CDORevision#isValid(long) valid} at this time.
- */
- public long getTimeStamp();
-
- /**
- * Sets the point in (repository) time this audit view should refer to. {@link CDOObject Objects} provided by this
- * view will be {@link CDORevision#isValid(long) valid} at this time.
- *
- * @since 2.0
- */
- public void setTimeStamp(long timeStamp);
-}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOCollectionLoadingPolicy.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOCollectionLoadingPolicy.java
deleted file mode 100644
index 49268d617d..0000000000
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOCollectionLoadingPolicy.java
+++ /dev/null
@@ -1,62 +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.cdo;
-
-import org.eclipse.emf.cdo.common.id.CDOID;
-import org.eclipse.emf.cdo.common.model.CDOFeature;
-import org.eclipse.emf.cdo.common.revision.CDORevision;
-
-/**
- * A strategy that specifies which list elememts must be present (loaded) in a {@link CDOID} list of a
- * {@link CDORevision revision} when a certain list index is accessed. Implementations of this interface can control the
- * exact characteristics of a certain partial collection loading strategy.
- *
- * @author Simon McDuff
- * @since 2.0
- */
-public interface CDOCollectionLoadingPolicy
-{
- /**
- * A default collection loading strategy that leads to complete loading of {@link CDOID} lists before any of
- * their elements is accessed.
- */
- public static final CDOCollectionLoadingPolicy DEFAULT = new CDOCollectionLoadingPolicy()
- {
- /**
- * Returns {@link CDORevision#UNCHUNKED}.
- */
- public int getInitialChunkSize()
- {
- return CDORevision.UNCHUNKED;
- }
-
- public Object resolveProxy(CDORevisionManager revisionManager, CDORevision revision, CDOFeature feature,
- int accessIndex, int serverIndex)
- {
- return revisionManager.loadChunkByRange(revision, feature, accessIndex, serverIndex, accessIndex, accessIndex);
- }
- };
-
- /**
- * Returns the maximum number of CDOIDs to be loaded for collections when an object is loaded, i.e. before any
- * of their elements is accessed.
- */
- public int getInitialChunkSize();
-
- /**
- * Defines a strategy to be used when the collection needs to resolve one element.
- * {@link CDORevisionManager#loadChunkByRange(CDORevision, CDOFeature, int, int, int, int)} should be used to resolve
- * them.
- */
- public Object resolveProxy(CDORevisionManager revisionManager, CDORevision revision, CDOFeature feature,
- int accessIndex, int serverIndex);
-}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOCommitContext.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOCommitContext.java
deleted file mode 100644
index 353dfcf4f6..0000000000
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOCommitContext.java
+++ /dev/null
@@ -1,64 +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.cdo;
-
-import org.eclipse.emf.cdo.common.id.CDOID;
-import org.eclipse.emf.cdo.common.model.CDOPackage;
-import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta;
-import org.eclipse.emf.cdo.eresource.CDOResource;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * Provides a context for commit operations.
- *
- * @author Simon McDuff
- * @since 2.0
- */
-public interface CDOCommitContext
-{
- /**
- * Returns the {@link CDOTransaction transaction} associated with this commit context.
- */
- public CDOTransaction getTransaction();
-
- /**
- * Returns a list of the new {@link CDOPackage packages} that are to be committed with this commit context.
- */
- public Listnull
.
- */
- public CDOView getView();
-
- /**
- * Sends this query to the server and returns a typed {@link CloseableIterator iterator} over the query result.
- *
- *
- * openXYZ
methods are provided for this purpose.
- *
- * @author Eike Stepper
- * @noimplement This interface is not intended to be implemented by clients.
- */
-public interface CDOSession extends CDOCommonSession, IContaineropenTransaction(new ResourceSetImpl())
.
- *
- * @see #openTransaction(ResourceSet)
- */
- public CDOTransaction openTransaction();
-
- /**
- * Opens and returns a new {@link CDOView view} on the given EMF {@link ResourceSet resource set}.
- *
- * @see #openView()
- */
- public CDOView openView(ResourceSet resourceSet);
-
- /**
- * Opens and returns a new {@link CDOView view} on a new EMF {@link ResourceSet resource set}.
- * openView(new ResourceSetImpl())
.
- *
- * @see #openView(ResourceSet)
- */
- public CDOView openView();
-
- /**
- * Opens and returns a new {@link CDOAudit audit} on the given EMF {@link ResourceSet resource set}.
- *
- * @see #openAudit()
- */
- public CDOAudit openAudit(ResourceSet resourceSet, long timeStamp);
-
- /**
- * Opens and returns a new {@link CDOAudit audit} on a new EMF {@link ResourceSet resource set}.
- * openAudit(new ResourceSetImpl(), timeStamp)
.
- *
- * @see #openAudit(ResourceSet, long)
- */
- public CDOAudit openAudit(long timeStamp);
-
- /**
- * Refreshes the objects cache.
- * true
, this method will return immediately without doing anything.
- *
- * @since 2.0
- */
- public Collectionsession.setPassiveUpdateEnabled(false);
- *
- *
- * Example:
- * CDOUtil.createCollectionLoadingPolicy(initialElements, subsequentElements);
- * getCurrentTime(false)
.
- *
- * @see #getCurrentTime(boolean)
- */
- public long getCurrentTime();
-
- /**
- * Returns the approximate current time of this repository by optionally refreshing the approximation from the
- * server.
- */
- public long getCurrentTime(boolean forceRefresh);
-
- /**
- * Returns true
if this repository supports auditing, false
otherwise.
- *
- * @see IRepository#isSupportingAudits()
- */
- public boolean isSupportingAudits();
- }
-}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSessionConfiguration.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSessionConfiguration.java
deleted file mode 100644
index 402aa5d8c4..0000000000
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSessionConfiguration.java
+++ /dev/null
@@ -1,114 +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.cdo;
-
-import org.eclipse.emf.cdo.common.revision.cache.CDORevisionCache;
-import org.eclipse.emf.cdo.util.CDOPackageRegistry;
-
-import org.eclipse.emf.internal.cdo.CDORevisionManagerImpl;
-
-import org.eclipse.net4j.connector.IConnector;
-import org.eclipse.net4j.signal.ISignalProtocol;
-import org.eclipse.net4j.signal.failover.IFailOverStrategy;
-
-/**
- * @author Eike Stepper
- * @noimplement This interface is not intended to be implemented by clients.
- */
-public interface CDOSessionConfiguration
-{
- /**
- * @see CDOSession#open(ISignalProtocol)
- */
- public IConnector getConnector();
-
- /**
- * @see CDOSession#open(ISignalProtocol)
- */
- public void setConnector(IConnector connector);
-
- /**
- * @see CDOSession#getName()
- */
- public String getRepositoryName();
-
- /**
- * @see CDOSession#getName()
- */
- public void setRepositoryName(String repositoryName);
-
- /**
- * @see CDOSession#getFailOverStrategy()
- */
- public IFailOverStrategy getFailOverStrategy();
-
- /**
- * The fail-over strategy must be set before the session is opened and can not be changed thereafter.
- *
- * @see CDOSession#getFailOverStrategy()
- */
- public void setFailOverStrategy(IFailOverStrategy failOverStrategy);
-
- /**
- * @see CDOSession#getPackageRegistry()
- * @since 2.0
- */
- public CDOPackageRegistry getPackageRegistry();
-
- /**
- * The package registry must be set before the session is opened and can not be changed thereafter.
- *
- * @see CDOSession#getPackageRegistry()
- * @since 2.0
- */
- public void setPackageRegistry(CDOPackageRegistry packageRegistry);
-
- /**
- * The package registry must be set before the session is opened and can not be changed thereafter.
- *
- * @see CDOSession#getPackageRegistry()
- * @since 2.0
- */
- public void setEagerPackageRegistry();
-
- /**
- * The package registry must be set before the session is opened and can not be changed thereafter.
- *
- * @see CDOSession#getPackageRegistry()
- * @since 2.0
- */
- public void setLazyPackageRegistry();
-
- /**
- * @see CDORevisionManagerImpl#getCache()
- * @since 2.0
- */
- public CDORevisionCache getRevisionCache();
-
- /**
- * The revision cache must be set before the session is opened and can not be changed thereafter.
- *
- * @see CDORevisionManagerImpl#setCache(CDORevisionCache)
- * @since 2.0
- */
- public void setRevisionCache(CDORevisionCache revisionCache);
-
- /**
- * Opens the session for this configuration. Once the session is openend this method always returns the same session
- * instance. Therefore it is impossible to change this configuration while the session is open.
- */
- public CDOSession openSession();
-
- /**
- * Returns true
if the session for this configuration is currently open, false
otherwise.
- */
- public boolean isSessionOpen();
-}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSessionEvent.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSessionEvent.java
deleted file mode 100644
index 3778c27acc..0000000000
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSessionEvent.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:
- * Eike Stepper - initial API and implementation
- **************************************************************************/
-package org.eclipse.emf.cdo;
-
-/**
- * @author Eike Stepper
- * @noimplement This interface is not intended to be implemented by clients.
- */
-public interface CDOSessionEvent extends CDOEvent
-{
- public CDOSession getSession();
-}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSessionInvalidationEvent.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSessionInvalidationEvent.java
deleted file mode 100644
index beb0640e67..0000000000
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSessionInvalidationEvent.java
+++ /dev/null
@@ -1,59 +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.cdo;
-
-import org.eclipse.emf.cdo.common.id.CDOID;
-import org.eclipse.emf.cdo.common.id.CDOIDAndVersion;
-import org.eclipse.emf.cdo.common.revision.CDORevision;
-
-import org.eclipse.net4j.util.event.IListener;
-
-import java.util.Collection;
-import java.util.Set;
-
-/**
- * An event that is emitted to registered {@link IListener listeners} of a {@link CDOSession} if
- * {@link CDOSession#setPassiveUpdateEnabled(boolean) passive update} is enabled for the session.
- *
- * @author Eike Stepper
- * @see CDOInvalidationNotification
- * @see CDOAdapterPolicy
- * @noimplement This interface is not intended to be implemented by clients.
- */
-public interface CDOSessionInvalidationEvent extends CDOSessionEvent
-{
- public static final long LOCAL_ROLLBACK = CDORevision.UNSPECIFIED_DATE;
-
- /**
- * Returns the transaction that was committed and thereby caused this event to be emitted if this transaction is
- * local, or null
if the transaction was remote.
- */
- public CDOView getView();
-
- /**
- * Returns the time stamp of the server transaction if this event was sent as a result of a successfully committed
- * transaction or LOCAL_ROLLBACK
if this event was sent due to a local rollback.
- */
- public long getTimeStamp();
-
- /**
- * Returns a set of the {@link CDOID CDOIDs} and versions of the modified objects.
- */
- public Settrue
if this transaction is not closed and contains uncommitted changes, false
- * otherwise.
- *
- * @since 2.0
- */
- public boolean isDirty();
-
- /**
- * Returns true
if this transaction contains local modifications that are conflicting with remote
- * modifications, false
otherwise.
- *
- * @since 2.0
- */
- public boolean hasConflict();
-
- /**
- * @since 2.0
- */
- public SetCDOTransaction
before an object is added. The implementor of this method is allowed
- * to throw an unchecked exception that will propagate up to the operation that is about to add the object.
- *
- * @since 2.0
- */
- public void attachingObject(CDOTransaction transaction, CDOObject object);
-
- /**
- * Called by a CDOTransaction
before an object is detached. The implementor of this method is
- * allowed to throw an unchecked exception that will propagate up to the operation that is about to remove the object.
- *
- * @since 2.0
- */
- public void detachingObject(CDOTransaction transaction, CDOObject object);
-
- /**
- * Called by a CDOTransaction
before an object is modified. The implementor of this method is
- * allowed to throw an unchecked exception that will propagate up to the operation that is about to modify the object.
- * CDOTransaction
before it is being committed. The implementor of this method is
- * allowed to throw an unchecked exception that will propagate up to the operation that is about to commit the
- * transaction.
- *
- * @since 2.0
- */
- public void committingTransaction(CDOTransaction transaction, CDOCommitContext commitContext);
-
- /**
- * Called by a CDOTransaction
after it is being committed. The implementor of this method is
- * not allowed to throw an unchecked exception.
- *
- * @since 2.0
- */
- public void committedTransaction(CDOTransaction transaction, CDOCommitContext commitContext);
-
- /**
- * Called by a CDOTransaction
after it is rolled back. If the implementor of this method throws an
- * exception it will be logged as an error and subsequent handlers will be further called.
- *
- * @since 2.0
- */
- public void rolledBackTransaction(CDOTransaction transaction);
-}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOTransactionStartedEvent.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOTransactionStartedEvent.java
deleted file mode 100644
index 92ed5cfc1d..0000000000
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOTransactionStartedEvent.java
+++ /dev/null
@@ -1,19 +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.cdo;
-
-/**
- * @author Eike Stepper
- * @noimplement This interface is not intended to be implemented by clients.
- */
-public interface CDOTransactionStartedEvent extends CDOViewEvent
-{
-}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOUserTransaction.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOUserTransaction.java
deleted file mode 100644
index 28ae080fe7..0000000000
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOUserTransaction.java
+++ /dev/null
@@ -1,42 +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.cdo;
-
-import org.eclipse.net4j.util.transaction.TransactionException;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-
-/**
- * Only deal with transaction process.
- *
- * @author Simon McDuff
- * @since 2.0
- */
-public interface CDOUserTransaction
-{
- public void commit() throws TransactionException;
-
- public void commit(IProgressMonitor progressMonitor) throws TransactionException;
-
- public void rollback();
-
- public void rollback(CDOSavepoint savepoint);
-
- /**
- * Creates a save point in the {@link CDOTransaction} that can be used to roll back a part of the transaction
- *
- * CDOSession session = ...
- * CDOView view = session.openView();
- * ...
- *
- *
- * CDOView instances must not be accessed through concurrent client threads.
- * null
if this view is closed.
- * @see #close()
- * @see #isClosed()
- * @see CDOSession#openView()
- * @see CDOSession#openView(ResourceSet)
- * @see CDOSession#openAudit(long)
- * @see CDOSession#openAudit(ResourceSet, long)
- * @see CDOSession#openTransaction()
- * @see CDOSession#openTransaction(ResourceSet)
- */
- public CDOSession getSession();
-
- /**
- * Returns the {@link CDOViewSet view set} this view is associated with.
- *
- * @return The view set this view is associated with, never null
.
- * @see CDOViewSet#getViews()
- * @since 2.0
- */
- public CDOViewSet getViewSet();
-
- /**
- * Returns the {@link ResourceSet resource set} this view is associated with.
- *
- * CDOResource resource = view.getResource("/orders/order-4711");
- * PurchaseOrder order = (PurchaseOrder)resource.getContents().get(0);
- * ReentrantLock lock = view.getLock();
- * if (!lock.tryLock(5L, TimeUnit.SECONDS))
- * {
- * throw new TimeoutException();
- * }
- *
- * try
- * {
- * float sum = 0;
- * for (OrderDetail detail : order.getOrderDetails())
- * {
- * sum += detail.getPrice();
- * }
- *
- * System.out.println("Sum: " + sum);
- * }
- * finally
- * {
- * lock.unlock();
- * }
- * }
- *
- *
- * Note that this method really just returns the lock instance but does not acquire the lock! The above example
- * acquires the lock with a timeout that expires after five seconds.
- *
- * @since 2.0
- */
- public ReentrantLock getLock();
-
- /**
- * Returns always false
.
- * false
.
- * true
if a resource with the given path exists in the repository, false
.
- *
- * @see #getResource(String, boolean)
- */
- public boolean hasResource(String path);
-
- /**
- * @see ResourceSet#getResource(URI, boolean)
- * @since 2.0
- */
- public CDOResource getResource(String path, boolean loadInDemand);
-
- /**
- * @see ResourceSet#getResource(URI, boolean)
- */
- public CDOResource getResource(String path);
-
- /**
- * Returns the root resource of the repository.
- * null
for top level resource nodes.
- * @param name
- * the name or prefix of the resource nodes to return.
- * @param exactMatch
- * true
if the complete name of the resource must match, false
if only a common
- * prefix of the name must match.
- * @since 2.0
- */
- public Listnull
for top level resource nodes.
- * @param name
- * the name or prefix of the resource nodes to return.
- * @param exactMatch
- * true
if the complete name of the resource must match, false
if only a common
- * prefix of the name must match.
- * @since 2.0
- */
- public CloseableIteratornull
, or null
if there isn't
- * one and loadOnDemand is false
.
- */
- public CDOObject getObject(CDOID id, boolean loadOnDemand);
-
- /**
- * Returns the object for the given CDOID.
- * getObject(id, true)
.
- *
- * @see getObject(CDOID, boolean)
- */
- public CDOObject getObject(CDOID id);
-
- /**
- * Takes an object from a (possibly) different view and contextifies it for the usage with this view.
- *
- *
- *
- * @since 2.0
- */
- public IllegalArgumentException
is
- * thrown.
- * null
is passed null
is returned.
- * true
if an {@link CDOObject object} with the given {@link CDOID id} is currently registered in
- * this view, false
otherwise.
- */
- public boolean isObjectRegistered(CDOID id);
-
- /**
- * Reloads the given {@link CDOObject objects} from the repository.
- */
- public int reload(CDOObject... objects);
-
- /**
- * @since 2.0
- */
- public void lockObjects(Collection extends CDOObject> objects, RWLockManager.LockType lockType, long timeout)
- throws InterruptedException;
-
- /**
- * Unlocks the given locked objects of this view.
- *
- * @since 2.0
- */
- public void unlockObjects(Collection extends CDOObject> objects, RWLockManager.LockType lockType);
-
- /**
- * Unlocks all locked objects of this view.
- *
- * @since 2.0
- */
- public void unlockObjects();
-
- /**
- * @since 2.0
- */
- public CDOQuery createQuery(String language, String queryString);
-
- /**
- * @since 2.0
- */
- public Options options();
-
- /**
- * @author Simon McDuff
- * @since 2.0
- */
- public interface Options extends IOptions
- {
- /**
- */
- public static final int NO_REVISION_PREFETCHING = 1;
-
- /**
- * Returns the reference type to be used in the internal object cache.
- *
- * @return Either {@link ReferenceType#STRONG STRONG}, {@link ReferenceType#SOFT SOFT} or {@link ReferenceType#WEAK
- * WEAK}.
- */
- public ReferenceType getCacheReferenceType();
-
- /**
- * Sets the reference type to be used in the internal object cache to either {@link ReferenceType#STRONG STRONG},
- * {@link ReferenceType#SOFT SOFT} or {@link ReferenceType#WEAK WEAK}. If null
is passed the default
- * reference type {@link ReferenceType#SOFT SOFT} is set. If the given reference type does not differ from the one
- * being currently set the new value is ignored and false
is returned. Otherwise existing object
- * references are converted to the new type and true
is returned.
- */
- public boolean setCacheReferenceType(ReferenceType referenceType);
-
- /**
- * Returns true
if the {@link CDOObject objects} in this view will notify their
- * {@link org.eclipse.emf.common.notify.Adapter adapters} about the fact that they are invalidated (due to
- * remote changes), false
otherwise.
- *
- * @see CDOInvalidationNotification
- */
- public boolean isInvalidationNotificationEnabled();
-
- /**
- * Specifies whether the {@link CDOObject objects} in this view will notify their
- * {@link org.eclipse.emf.common.notify.Adapter adapters} about the fact that they are invalidated (due to
- * remote changes) or not.
- *
- * @see CDOInvalidationNotification
- */
- public void setInvalidationNotificationEnabled(boolean enabled);
-
- /**
- * Returns the current set of {@link CDOAdapterPolicy change subscription policies}.
- *
- * @return The current set of change subscription policies, never null
.
- * @see #setChangeSubscriptionPolicy(CDOAdapterPolicy)
- */
- public CDOAdapterPolicy[] getChangeSubscriptionPolicies();
-
- /**
- * Adds a change subscription policy to this view.
- *
- * view.options().addChangeSubscriptionPolicy(CDOChangeSubscriptionPolicy.ALL);
- *
- * eObject.eAdapters().add(myAdapter);
- *
- * {@link CDOAdapterPolicy#ALL} - Enabled for all adapters used.
- * {@link CDOAdapterPolicy#CDO} - Enabled only for adapters that implement {@link CDOAdapter}.
- * Any other class that implement {@link CDOAdapterPolicy} will enable for whatever rules defined in that class.
- *
- * myAdapter
in the above example matches the current policy, eObject
will be
- * registered with the server and you will receive all changes from other transaction.
- * CDOSession.options().setPassiveUpdate(false)
. In this case, it will
- * receive changes without having the objects changed.
- */
- public void addChangeSubscriptionPolicy(CDOAdapterPolicy policy);
-
- /**
- * Removes a change subscription policy from this view.
- */
- public void removeChangeSubscriptionPolicy(CDOAdapterPolicy policy);
-
- // TODO
- public CDOAdapterPolicy getStrongReferencePolicy();
-
- /**
- * Sets the reference type to be used when an adapter is used to an object.
- * CDOView.setStrongReference(CDOAdapterPolicy.ALL)
is used, it is possible that the target object
- * will be GC. In that case, the adapter will never received notifications. By Default the value is at
- * CDOAdapterPolicy.ALL
- */
- public void setStrongReferencePolicy(CDOAdapterPolicy policy);
-
- /**
- * Returns the CDORevisionPrefetchingPolicy in used.
- */
- public CDORevisionPrefetchingPolicy getRevisionPrefetchingPolicy();
-
- /**
- * The CDORevisionPrefetchingPolicy feature of the CDOView allows CDO users to fetch many objects at a time.
- * view.options().setRevisionPrefetchingPolicy (CDOUtil.createRevisionPrefetchingPolicy(10));
- * LOCAL_ROLLBACK
if this event was sent due to a local rollback.
- */
- public long getTimeStamp();
-
- /**
- * Returns a set of the {@link CDOObject CDOObjects} of the modified objects.
- */
- public Set extends CDOObject> getDirtyObjects();
-
- /**
- * Returns a set of the {@link CDOObject CDOObjects} of the removed objects.
- *
- * @since 2.0
- */
- public Set extends CDOObject> getDetachedObjects();
-}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOViewResourcesEvent.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOViewResourcesEvent.java
deleted file mode 100644
index b95b0b97d7..0000000000
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOViewResourcesEvent.java
+++ /dev/null
@@ -1,30 +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.cdo;
-
-/**
- * @author Eike Stepper
- * @noimplement This interface is not intended to be implemented by clients.
- */
-public interface CDOViewResourcesEvent extends CDOViewEvent
-{
- public String getResourcePath();
-
- public Kind getKind();
-
- /**
- * @author Eike Stepper
- */
- public enum Kind
- {
- ADDED, REMOVED;
- }
-}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOViewSet.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOViewSet.java
deleted file mode 100644
index 030705bad3..0000000000
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOViewSet.java
+++ /dev/null
@@ -1,39 +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.cdo;
-
-import org.eclipse.emf.cdo.eresource.CDOResourceFactory;
-
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-
-/**
- * A {@link ResourceSet} adapter to associate a set of {@link CDOView} instances.
- * eSuperPackage == null
).
+ * @return the package that is registered under the nsURI
of the top level package or null
.
+ * @throws IllegalArgumentException
+ * if the given EPackage is not a top level package.
+ */
+ public EPackage putEPackage(EPackage ePackage) throws IllegalArgumentException;
+
+ public void putPackageDescriptor(CDOPackage proxy);
+
+ /**
+ * @since 2.0
+ */
+ public CDOSession getSession();
+
+ public void setSession(CDOSession session);
+}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOPackageType.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOPackageType.java
new file mode 100644
index 0000000000..ecc3b0b0cc
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOPackageType.java
@@ -0,0 +1,32 @@
+/***************************************************************************
+ * 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.cdo.session;
+
+import org.eclipse.emf.internal.cdo.CDOObjectImpl;
+import org.eclipse.emf.internal.cdo.CDOStateMachine;
+
+/**
+ * @author Eike Stepper
+ */
+public enum CDOPackageType
+{
+ /**
+ * The type of EPackages
that have been dedicatedly generated for CDO. Instances of EClasses
+ * of these packages are represented by {@link CDOObjectImpl} to the {@link CDOStateMachine}.
+ */
+ NATIVE,
+
+ /**
+ * The type of EPackages
that have been normally generated for EMF. Instances of EClasses
of
+ * these packages are represented by {@link CDOAdapterImpl} to the {@link CDOStateMachine}.
+ */
+ LEGACY
+}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOPackageTypeRegistry.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOPackageTypeRegistry.java
new file mode 100644
index 0000000000..e2d96dc56a
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOPackageTypeRegistry.java
@@ -0,0 +1,32 @@
+/***************************************************************************
+ * 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.cdo.session;
+
+import org.eclipse.net4j.util.registry.IRegistry;
+
+import org.eclipse.emf.ecore.EPackage;
+
+/**
+ * Can only be used with Eclipse running!
+ *
+ * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
+ */
+public interface CDOPackageTypeRegistry extends IRegistry
+ *
+ * openXYZ
methods are provided for this purpose.
+ *
+ * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
+ */
+public interface CDOSession extends CDOCommonSession, IContaineropenTransaction(new ResourceSetImpl())
.
+ *
+ * @see #openTransaction(ResourceSet)
+ */
+ public CDOTransaction openTransaction();
+
+ /**
+ * Opens and returns a new {@link CDOView view} on the given EMF {@link ResourceSet resource set}.
+ *
+ * @see #openView()
+ */
+ public CDOView openView(ResourceSet resourceSet);
+
+ /**
+ * Opens and returns a new {@link CDOView view} on a new EMF {@link ResourceSet resource set}.
+ * openView(new ResourceSetImpl())
.
+ *
+ * @see #openView(ResourceSet)
+ */
+ public CDOView openView();
+
+ /**
+ * Opens and returns a new {@link CDOAudit audit} on the given EMF {@link ResourceSet resource set}.
+ *
+ * @see #openAudit()
+ */
+ public CDOAudit openAudit(ResourceSet resourceSet, long timeStamp);
+
+ /**
+ * Opens and returns a new {@link CDOAudit audit} on a new EMF {@link ResourceSet resource set}.
+ * openAudit(new ResourceSetImpl(), timeStamp)
.
+ *
+ * @see #openAudit(ResourceSet, long)
+ */
+ public CDOAudit openAudit(long timeStamp);
+
+ /**
+ * Refreshes the objects cache.
+ * true
, this method will return immediately without doing anything.
+ *
+ * @since 2.0
+ */
+ public Collectionsession.setPassiveUpdateEnabled(false);
+ *
+ *
+ * Example:
+ * CDOUtil.createCollectionLoadingPolicy(initialElements, subsequentElements);
+ * getCurrentTime(false)
.
+ *
+ * @see #getCurrentTime(boolean)
+ */
+ public long getCurrentTime();
+
+ /**
+ * Returns the approximate current time of this repository by optionally refreshing the approximation from the
+ * server.
+ */
+ public long getCurrentTime(boolean forceRefresh);
+
+ /**
+ * Returns true
if this repository supports auditing, false
otherwise.
+ *
+ * @see IRepository#isSupportingAudits()
+ */
+ public boolean isSupportingAudits();
+ }
+}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionConfiguration.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionConfiguration.java
new file mode 100644
index 0000000000..c89f43b1f7
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionConfiguration.java
@@ -0,0 +1,113 @@
+/***************************************************************************
+ * 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.cdo.session;
+
+import org.eclipse.emf.cdo.common.revision.cache.CDORevisionCache;
+
+import org.eclipse.emf.internal.cdo.session.CDORevisionManagerImpl;
+
+import org.eclipse.net4j.connector.IConnector;
+import org.eclipse.net4j.signal.ISignalProtocol;
+import org.eclipse.net4j.signal.failover.IFailOverStrategy;
+
+/**
+ * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
+ */
+public interface CDOSessionConfiguration
+{
+ /**
+ * @see CDOSession#open(ISignalProtocol)
+ */
+ public IConnector getConnector();
+
+ /**
+ * @see CDOSession#open(ISignalProtocol)
+ */
+ public void setConnector(IConnector connector);
+
+ /**
+ * @see CDOSession#getName()
+ */
+ public String getRepositoryName();
+
+ /**
+ * @see CDOSession#getName()
+ */
+ public void setRepositoryName(String repositoryName);
+
+ /**
+ * @see CDOSession#getFailOverStrategy()
+ */
+ public IFailOverStrategy getFailOverStrategy();
+
+ /**
+ * The fail-over strategy must be set before the session is opened and can not be changed thereafter.
+ *
+ * @see CDOSession#getFailOverStrategy()
+ */
+ public void setFailOverStrategy(IFailOverStrategy failOverStrategy);
+
+ /**
+ * @see CDOSession#getPackageRegistry()
+ * @since 2.0
+ */
+ public CDOPackageRegistry getPackageRegistry();
+
+ /**
+ * The package registry must be set before the session is opened and can not be changed thereafter.
+ *
+ * @see CDOSession#getPackageRegistry()
+ * @since 2.0
+ */
+ public void setPackageRegistry(CDOPackageRegistry packageRegistry);
+
+ /**
+ * The package registry must be set before the session is opened and can not be changed thereafter.
+ *
+ * @see CDOSession#getPackageRegistry()
+ * @since 2.0
+ */
+ public void setEagerPackageRegistry();
+
+ /**
+ * The package registry must be set before the session is opened and can not be changed thereafter.
+ *
+ * @see CDOSession#getPackageRegistry()
+ * @since 2.0
+ */
+ public void setLazyPackageRegistry();
+
+ /**
+ * @see CDORevisionManagerImpl#getCache()
+ * @since 2.0
+ */
+ public CDORevisionCache getRevisionCache();
+
+ /**
+ * The revision cache must be set before the session is opened and can not be changed thereafter.
+ *
+ * @see CDORevisionManagerImpl#setCache(CDORevisionCache)
+ * @since 2.0
+ */
+ public void setRevisionCache(CDORevisionCache revisionCache);
+
+ /**
+ * Opens the session for this configuration. Once the session is openend this method always returns the same session
+ * instance. Therefore it is impossible to change this configuration while the session is open.
+ */
+ public CDOSession openSession();
+
+ /**
+ * Returns true
if the session for this configuration is currently open, false
otherwise.
+ */
+ public boolean isSessionOpen();
+}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionEvent.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionEvent.java
new file mode 100644
index 0000000000..9e70f18834
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionEvent.java
@@ -0,0 +1,22 @@
+/***************************************************************************
+ * 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.cdo.session;
+
+import org.eclipse.emf.cdo.util.CDOEvent;
+
+/**
+ * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
+ */
+public interface CDOSessionEvent extends CDOEvent
+{
+ public CDOSession getSession();
+}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionInvalidationEvent.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionInvalidationEvent.java
new file mode 100644
index 0000000000..21604fdd76
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionInvalidationEvent.java
@@ -0,0 +1,62 @@
+/***************************************************************************
+ * 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.cdo.session;
+
+import org.eclipse.emf.cdo.CDOInvalidationNotification;
+import org.eclipse.emf.cdo.common.id.CDOID;
+import org.eclipse.emf.cdo.common.id.CDOIDAndVersion;
+import org.eclipse.emf.cdo.common.revision.CDORevision;
+import org.eclipse.emf.cdo.view.CDOAdapterPolicy;
+import org.eclipse.emf.cdo.view.CDOView;
+
+import org.eclipse.net4j.util.event.IListener;
+
+import java.util.Collection;
+import java.util.Set;
+
+/**
+ * An event that is emitted to registered {@link IListener listeners} of a {@link CDOSession} if
+ * {@link CDOSession#setPassiveUpdateEnabled(boolean) passive update} is enabled for the session.
+ *
+ * @author Eike Stepper
+ * @see CDOInvalidationNotification
+ * @see CDOAdapterPolicy
+ * @noimplement This interface is not intended to be implemented by clients.
+ */
+public interface CDOSessionInvalidationEvent extends CDOSessionEvent
+{
+ public static final long LOCAL_ROLLBACK = CDORevision.UNSPECIFIED_DATE;
+
+ /**
+ * Returns the transaction that was committed and thereby caused this event to be emitted if this transaction is
+ * local, or null
if the transaction was remote.
+ */
+ public CDOView getView();
+
+ /**
+ * Returns the time stamp of the server transaction if this event was sent as a result of a successfully committed
+ * transaction or LOCAL_ROLLBACK
if this event was sent due to a local rollback.
+ */
+ public long getTimeStamp();
+
+ /**
+ * Returns a set of the {@link CDOID CDOIDs} and versions of the modified objects.
+ */
+ public Settrue
if this transaction is not closed and contains uncommitted changes, false
+ * otherwise.
+ *
+ * @since 2.0
+ */
+ public boolean isDirty();
+
+ /**
+ * Returns true
if this transaction contains local modifications that are conflicting with remote
+ * modifications, false
otherwise.
+ *
+ * @since 2.0
+ */
+ public boolean hasConflict();
+
+ /**
+ * @since 2.0
+ */
+ public SetCDOTransaction
before an object is added. The implementor of this method is allowed
+ * to throw an unchecked exception that will propagate up to the operation that is about to add the object.
+ *
+ * @since 2.0
+ */
+ public void attachingObject(CDOTransaction transaction, CDOObject object);
+
+ /**
+ * Called by a CDOTransaction
before an object is detached. The implementor of this method is
+ * allowed to throw an unchecked exception that will propagate up to the operation that is about to remove the object.
+ *
+ * @since 2.0
+ */
+ public void detachingObject(CDOTransaction transaction, CDOObject object);
+
+ /**
+ * Called by a CDOTransaction
before an object is modified. The implementor of this method is
+ * allowed to throw an unchecked exception that will propagate up to the operation that is about to modify the object.
+ * CDOTransaction
before it is being committed. The implementor of this method is
+ * allowed to throw an unchecked exception that will propagate up to the operation that is about to commit the
+ * transaction.
+ *
+ * @since 2.0
+ */
+ public void committingTransaction(CDOTransaction transaction, CDOCommitContext commitContext);
+
+ /**
+ * Called by a CDOTransaction
after it is being committed. The implementor of this method is
+ * not allowed to throw an unchecked exception.
+ *
+ * @since 2.0
+ */
+ public void committedTransaction(CDOTransaction transaction, CDOCommitContext commitContext);
+
+ /**
+ * Called by a CDOTransaction
after it is rolled back. If the implementor of this method throws an
+ * exception it will be logged as an error and subsequent handlers will be further called.
+ *
+ * @since 2.0
+ */
+ public void rolledBackTransaction(CDOTransaction transaction);
+}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransactionStartedEvent.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransactionStartedEvent.java
new file mode 100644
index 0000000000..3e24cfe7bf
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransactionStartedEvent.java
@@ -0,0 +1,21 @@
+/***************************************************************************
+ * 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.cdo.transaction;
+
+import org.eclipse.emf.cdo.view.CDOViewEvent;
+
+/**
+ * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
+ */
+public interface CDOTransactionStartedEvent extends CDOViewEvent
+{
+}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOUserTransaction.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOUserTransaction.java
new file mode 100644
index 0000000000..e370172c51
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOUserTransaction.java
@@ -0,0 +1,42 @@
+/***************************************************************************
+ * 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.cdo.transaction;
+
+import org.eclipse.net4j.util.transaction.TransactionException;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+
+/**
+ * Only deal with transaction process.
+ *
+ * @author Simon McDuff
+ * @since 2.0
+ */
+public interface CDOUserTransaction
+{
+ public void commit() throws TransactionException;
+
+ public void commit(IProgressMonitor progressMonitor) throws TransactionException;
+
+ public void rollback();
+
+ public void rollback(CDOSavepoint savepoint);
+
+ /**
+ * Creates a save point in the {@link CDOTransaction} that can be used to roll back a part of the transaction
+ * eSuperPackage == null
).
- * @return the package that is registered under the nsURI
of the top level package or null
.
- * @throws IllegalArgumentException
- * if the given EPackage is not a top level package.
- */
- public EPackage putEPackage(EPackage ePackage) throws IllegalArgumentException;
-
- public void putPackageDescriptor(CDOPackage proxy);
-
- /**
- * @since 2.0
- */
- public CDOSession getSession();
-
- public void setSession(CDOSession session);
-}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOPackageType.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOPackageType.java
deleted file mode 100644
index 2497f0253b..0000000000
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOPackageType.java
+++ /dev/null
@@ -1,32 +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.cdo.util;
-
-import org.eclipse.emf.internal.cdo.CDOObjectImpl;
-import org.eclipse.emf.internal.cdo.CDOStateMachine;
-
-/**
- * @author Eike Stepper
- */
-public enum CDOPackageType
-{
- /**
- * The type of EPackages
that have been dedicatedly generated for CDO. Instances of EClasses
- * of these packages are represented by {@link CDOObjectImpl} to the {@link CDOStateMachine}.
- */
- NATIVE,
-
- /**
- * The type of EPackages
that have been normally generated for EMF. Instances of EClasses
of
- * these packages are represented by {@link CDOAdapterImpl} to the {@link CDOStateMachine}.
- */
- LEGACY
-}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOPackageTypeRegistry.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOPackageTypeRegistry.java
deleted file mode 100644
index 09faa07fcc..0000000000
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOPackageTypeRegistry.java
+++ /dev/null
@@ -1,32 +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.cdo.util;
-
-import org.eclipse.net4j.util.registry.IRegistry;
-
-import org.eclipse.emf.ecore.EPackage;
-
-/**
- * Can only be used with Eclipse running!
- *
- * @author Eike Stepper
- * @noimplement This interface is not intended to be implemented by clients.
- */
-public interface CDOPackageTypeRegistry extends IRegistryCDOView
associated with (and needed by) certain CDOResource
- *
- * @author Victor Roldan Betancort
- * @since 2.0
- */
-public class CDOViewAdapter implements Adapter
-{
- private CDOView view;
-
- public CDOViewAdapter(CDOView view)
- {
- this.view = view;
- }
-
- public CDOView getView()
- {
- return view;
- }
-
- public Notifier getTarget()
- {
- return null;
- }
-
- public void setTarget(Notifier newTarget)
- {
- }
-
- public boolean isAdapterForType(Object type)
- {
- return false;
- }
-
- public void notifyChanged(Notification notification)
- {
- }
-}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOViewProvider.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOViewProvider.java
deleted file mode 100644
index ceb0302105..0000000000
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOViewProvider.java
+++ /dev/null
@@ -1,54 +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:
- * Victor Roldan Betancort - initial API and implementation
- **************************************************************************/
-package org.eclipse.emf.cdo.util;
-
-import org.eclipse.emf.cdo.CDOView;
-import org.eclipse.emf.cdo.CDOViewSet;
-
-import org.eclipse.emf.common.util.URI;
-
-/**
- * Capable of opening a CDOView
on a target repository, defined by a URI. A regular expression and the
- * priority are used to determine which is the most suitable provider
- *
- * @since 2.0
- * @author Victor Roldan Betancort
- * @see CDOView
- * @see CDOViewProviderRegistry
- */
-public interface CDOViewProvider
-{
- public static final int DEFAULT_PRIORITY = 500;
-
- /**
- * Returns the priority of this provider. Usually used to choose between several CDOViewProvider
that
- * match the same repository URI.
- */
- public int getPriority();
-
- /**
- * Returns the regular expression that determines if the provider can handle certain URI
- */
- public String getRegex();
-
- /**
- * Checks if the URI matches with the regular expression of this provider
- */
- public boolean matchesRegex(URI uri);
-
- /**
- * Receives a URI and returns an opened CDOView
against the repository. The implementer is responsible to
- * do the UUID to physical host map in case necessary.
- *
- * @return a wired-up and opened CDOView
- */
- public CDOView getView(URI uri, CDOViewSet viewSet);
-}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOViewProviderRegistry.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOViewProviderRegistry.java
deleted file mode 100644
index d6a8815310..0000000000
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOViewProviderRegistry.java
+++ /dev/null
@@ -1,51 +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:
- * Victor Roldan Betancort - initial API and implementation
- **************************************************************************/
-package org.eclipse.emf.cdo.util;
-
-import org.eclipse.emf.cdo.CDOView;
-import org.eclipse.emf.cdo.CDOViewSet;
-
-import org.eclipse.net4j.util.container.IContainer;
-
-import org.eclipse.emf.common.util.URI;
-
-/**
- * A global registry of {@link CDOViewProvider view provider} implementations.
- *
- * @author Victor Roldan Betancort
- * @since 2.0
- */
-public interface CDOViewProviderRegistry extends IContainernull
if no {@link CDOViewProvider view provider} in this registry can provide such a view
- */
- public CDOView provideView(URI uri, CDOViewSet viewSet);
-
- /**
- * Returns an array of CDOViewProvider
instances, determined and ordered by certain criteria based on the
- * argument URI.
- */
- public CDOViewProvider[] getViewProviders(URI uri);
-
- /**
- * Registers a new CDOViewProvider
instance
- */
- public void addViewProvider(CDOViewProvider viewProvider);
-
- /**
- * Removes certain CDOViewProvider
instance from the registry
- */
- public void removeViewProvider(CDOViewProvider viewProvider);
-}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/InvalidObjectException.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/InvalidObjectException.java
index eb7ea37a24..add2cf50f1 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/InvalidObjectException.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/InvalidObjectException.java
@@ -10,9 +10,9 @@
**************************************************************************/
package org.eclipse.emf.cdo.util;
-import org.eclipse.emf.cdo.CDOTransaction;
import org.eclipse.emf.cdo.common.id.CDOID;
import org.eclipse.emf.cdo.common.util.CDOException;
+import org.eclipse.emf.cdo.transaction.CDOTransaction;
/**
* Exception occurs when an object isn't valid anymore. It was valid when we create it, but not anymore. The cause could
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/ManagedContainerViewProvider.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/ManagedContainerViewProvider.java
deleted file mode 100644
index b028d5194d..0000000000
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/ManagedContainerViewProvider.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper and others.
- * 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:
- * Victor Roldan Betancort - initial API and implementation
- **************************************************************************/
-package org.eclipse.emf.cdo.util;
-
-import org.eclipse.net4j.util.container.IManagedContainer;
-import org.eclipse.net4j.util.om.OMPlatform;
-
-/**
- * Base class for ManagedContainer
based CDOViewProvider
- *
- * @author Victor Roldan Betancort
- * @since 2.0
- */
-public abstract class ManagedContainerViewProvider extends AbstractCDOViewProvider
-{
- private IManagedContainer container;
-
- public ManagedContainerViewProvider(IManagedContainer container, String regex, int priority)
- {
- super(regex, priority);
- this.container = container;
- }
-
- protected IManagedContainer getContainer()
- {
- return container;
- }
-
- @Override
- public int getPriority()
- {
- if (!OMPlatform.INSTANCE.isOSGiRunning())
- {
- return Integer.MIN_VALUE;
- }
-
- return super.getPriority();
- }
-}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/AbstractCDOViewProvider.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/AbstractCDOViewProvider.java
new file mode 100644
index 0000000000..c324a46117
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/AbstractCDOViewProvider.java
@@ -0,0 +1,83 @@
+/***************************************************************************
+ * 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:
+ * Victor Roldan Betancort - initial API and implementation
+ **************************************************************************/
+package org.eclipse.emf.cdo.view;
+
+import org.eclipse.net4j.util.ReflectUtil.ExcludeFromDump;
+
+import org.eclipse.emf.common.util.URI;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Base logic to handle CDOViewProvider priority and regular expression.
+ *
+ * @author Victor Roldan Betancort
+ * @since 2.0
+ */
+public abstract class AbstractCDOViewProvider implements CDOViewProvider
+{
+ private String regex;
+
+ private int priority = DEFAULT_PRIORITY;
+
+ @ExcludeFromDump
+ private transient Pattern pattern;
+
+ public AbstractCDOViewProvider()
+ {
+ }
+
+ public AbstractCDOViewProvider(String regex, int priority)
+ {
+ this.regex = regex;
+ this.priority = priority;
+ }
+
+ public AbstractCDOViewProvider(String regex)
+ {
+ this(regex, DEFAULT_PRIORITY);
+ }
+
+ public int getPriority()
+ {
+ return priority;
+ }
+
+ public void setPriority(int priority)
+ {
+ this.priority = priority;
+ }
+
+ public String getRegex()
+ {
+ return regex;
+ }
+
+ public void setRegex(String regex)
+ {
+ this.regex = regex;
+ }
+
+ public boolean matchesRegex(URI uri)
+ {
+ synchronized (regex)
+ {
+ if (pattern == null)
+ {
+ pattern = Pattern.compile(regex);
+ }
+ }
+
+ Matcher matcher = pattern.matcher(uri.toString());
+ return matcher.matches();
+ }
+}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOAdapterPolicy.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOAdapterPolicy.java
new file mode 100644
index 0000000000..60d896771f
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOAdapterPolicy.java
@@ -0,0 +1,108 @@
+/***************************************************************************
+ * 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.cdo.view;
+
+import org.eclipse.emf.cdo.CDOAdapter;
+import org.eclipse.emf.cdo.CDOInvalidationNotification;
+import org.eclipse.emf.cdo.session.CDOSessionInvalidationEvent;
+import org.eclipse.emf.cdo.transaction.CDOTransaction;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * Specifies an adapter policy.
+ *
+ * view.setChangeSubscriptionPolicy(CDOAdapterPolicy.ALL);
+ *
+ * eObject.eAdapters().add(myAdapter);
+ *
+ * {@link CDOAdapterPolicy#ALL} - Enabled for all adapters used.
+ * {@link CDOAdapterPolicy#CDO} - Enabled only for adapters that implement {@link CDOAdapter}.
+ * Any other class that implement {@link CDOAdapterPolicy} will enable for whatever rules defined in that class.
+ * myAdapter
in the above example matches the current policy, eObject
will be registered
+ * with the server and you will receive all changes from other transaction.
+ * CDOSession.setPassiveUpdate(false)
. In this case, it will receive
+ * changes without having the objects changed.
+ *
+ * @author Simon McDuff
+ * @see CDOSessionInvalidationEvent
+ * @see CDOInvalidationNotification
+ * @since 2.0
+ */
+public interface CDOAdapterPolicy
+{
+ /**
+ * A default adapter policy that never triggers any special behaviour.
+ */
+ public static final CDOAdapterPolicy NONE = new CDOAdapterPolicy()
+ {
+ /**
+ * Always returns false
.
+ */
+ public boolean isValid(EObject eObject, Adapter adapter)
+ {
+ return false;
+ }
+ };
+
+ /**
+ * A default adapter policy that only triggers special behaviour if the adapter under test implements
+ * {@link CDOAdapter}.
+ */
+ public static final CDOAdapterPolicy CDO = new CDOAdapterPolicy()
+ {
+ /**
+ * Returns true
if the given adapter implements {@link CDOAdapter}.
+ */
+ public boolean isValid(EObject eObject, Adapter adapter)
+ {
+ return adapter instanceof CDOAdapter;
+ }
+ };
+
+ /**
+ * A default adapter policy that always triggers special behaviour.
+ */
+ public static final CDOAdapterPolicy ALL = new CDOAdapterPolicy()
+ {
+ /**
+ * Always returns true
.
+ */
+ public boolean isValid(EObject eObject, Adapter adapter)
+ {
+ return true;
+ }
+ };
+
+ /**
+ * Returns true
if the given adapter on the given object should trigger a certain operation or behaviour,
+ * false
otherwise.
+ *
+ * @see CDOView.Options#addChangeSubscriptionPolicy(CDOAdapterPolicy)
+ * @see CDOView.Options#setStrongReferencePolicy(CDOAdapterPolicy)
+ */
+ public boolean isValid(EObject eObject, Adapter adapter);
+}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOAudit.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOAudit.java
new file mode 100644
index 0000000000..852cccd403
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOAudit.java
@@ -0,0 +1,38 @@
+/***************************************************************************
+ * 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.cdo.view;
+
+import org.eclipse.emf.cdo.CDOObject;
+import org.eclipse.emf.cdo.common.revision.CDORevision;
+
+/**
+ * A read-only {@link CDOView view} to a historical state of the object graph in the repository specified by a
+ * time stamp (i.e. an arbitrary point in the lifetime of the repository).
+ *
+ * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
+ */
+public interface CDOAudit extends CDOView
+{
+ /**
+ * Returns the point in (repository) time this audit view is currently referring to. {@link CDOObject Objects}
+ * provided by this view are {@link CDORevision#isValid(long) valid} at this time.
+ */
+ public long getTimeStamp();
+
+ /**
+ * Sets the point in (repository) time this audit view should refer to. {@link CDOObject Objects} provided by this
+ * view will be {@link CDORevision#isValid(long) valid} at this time.
+ *
+ * @since 2.0
+ */
+ public void setTimeStamp(long timeStamp);
+}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOConflictResolver.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOConflictResolver.java
new file mode 100644
index 0000000000..b987c76c78
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOConflictResolver.java
@@ -0,0 +1,45 @@
+/***************************************************************************
+ * 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.cdo.view;
+
+import org.eclipse.emf.cdo.CDOObject;
+import org.eclipse.emf.cdo.transaction.CDOTransaction;
+
+import org.eclipse.emf.spi.cdo.CDOObjectConflictResolver;
+
+import java.util.Set;
+
+/**
+ * A strategy used to customize the default conflict resolution behaviour of {@link CDOTransaction transactions}.
+ *
+ * @see CDOTransaction.Options#setConflictResolver(CDOConflictResolver)
+ * @author Eike Stepper
+ * @since 2.0
+ */
+public interface CDOConflictResolver
+{
+ /**
+ * Returns the {@link CDOTransaction transaction} this conflict resolver is associated with.
+ */
+ public CDOTransaction getTransaction();
+
+ /**
+ * Sets the {@link CDOTransaction transaction} this conflict resolver is to be associated with.
+ */
+ public void setTransaction(CDOTransaction transaction);
+
+ /**
+ * Resolves conflicts after remote invalidations arrived for objects that are locally dirty or detached.
+ * null
.
+ */
+ public CDOView getView();
+
+ /**
+ * Sends this query to the server and returns a typed {@link CloseableIterator iterator} over the query result.
+ *
+ * CDOSession session = ...
+ * CDOView view = session.openView();
+ * ...
+ *
+ *
+ * CDOView instances must not be accessed through concurrent client threads.
+ * null
if this view is closed.
+ * @see #close()
+ * @see #isClosed()
+ * @see CDOSession#openView()
+ * @see CDOSession#openView(ResourceSet)
+ * @see CDOSession#openAudit(long)
+ * @see CDOSession#openAudit(ResourceSet, long)
+ * @see CDOSession#openTransaction()
+ * @see CDOSession#openTransaction(ResourceSet)
+ */
+ public CDOSession getSession();
+
+ /**
+ * Returns the {@link CDOViewSet view set} this view is associated with.
+ *
+ * @return The view set this view is associated with, never null
.
+ * @see CDOViewSet#getViews()
+ * @since 2.0
+ */
+ public CDOViewSet getViewSet();
+
+ /**
+ * Returns the {@link ResourceSet resource set} this view is associated with.
+ *
+ * CDOResource resource = view.getResource("/orders/order-4711");
+ * PurchaseOrder order = (PurchaseOrder)resource.getContents().get(0);
+ * ReentrantLock lock = view.getLock();
+ * if (!lock.tryLock(5L, TimeUnit.SECONDS))
+ * {
+ * throw new TimeoutException();
+ * }
+ *
+ * try
+ * {
+ * float sum = 0;
+ * for (OrderDetail detail : order.getOrderDetails())
+ * {
+ * sum += detail.getPrice();
+ * }
+ *
+ * System.out.println("Sum: " + sum);
+ * }
+ * finally
+ * {
+ * lock.unlock();
+ * }
+ * }
+ *
+ *
+ * Note that this method really just returns the lock instance but does not acquire the lock! The above example
+ * acquires the lock with a timeout that expires after five seconds.
+ *
+ * @since 2.0
+ */
+ public ReentrantLock getLock();
+
+ /**
+ * Returns always false
.
+ * false
.
+ * true
if a resource with the given path exists in the repository, false
.
+ *
+ * @see #getResource(String, boolean)
+ */
+ public boolean hasResource(String path);
+
+ /**
+ * @see ResourceSet#getResource(URI, boolean)
+ * @since 2.0
+ */
+ public CDOResource getResource(String path, boolean loadInDemand);
+
+ /**
+ * @see ResourceSet#getResource(URI, boolean)
+ */
+ public CDOResource getResource(String path);
+
+ /**
+ * Returns the root resource of the repository.
+ * null
for top level resource nodes.
+ * @param name
+ * the name or prefix of the resource nodes to return.
+ * @param exactMatch
+ * true
if the complete name of the resource must match, false
if only a common
+ * prefix of the name must match.
+ * @since 2.0
+ */
+ public Listnull
for top level resource nodes.
+ * @param name
+ * the name or prefix of the resource nodes to return.
+ * @param exactMatch
+ * true
if the complete name of the resource must match, false
if only a common
+ * prefix of the name must match.
+ * @since 2.0
+ */
+ public CloseableIteratornull
, or null
if there isn't
+ * one and loadOnDemand is false
.
+ */
+ public CDOObject getObject(CDOID id, boolean loadOnDemand);
+
+ /**
+ * Returns the object for the given CDOID.
+ * getObject(id, true)
.
+ *
+ * @see getObject(CDOID, boolean)
+ */
+ public CDOObject getObject(CDOID id);
+
+ /**
+ * Takes an object from a (possibly) different view and contextifies it for the usage with this view.
+ *
+ *
+ *
+ * @since 2.0
+ */
+ public IllegalArgumentException
is
+ * thrown.
+ * null
is passed null
is returned.
+ * true
if an {@link CDOObject object} with the given {@link CDOID id} is currently registered in
+ * this view, false
otherwise.
+ */
+ public boolean isObjectRegistered(CDOID id);
+
+ /**
+ * Reloads the given {@link CDOObject objects} from the repository.
+ */
+ public int reload(CDOObject... objects);
+
+ /**
+ * @since 2.0
+ */
+ public void lockObjects(Collection extends CDOObject> objects, RWLockManager.LockType lockType, long timeout)
+ throws InterruptedException;
+
+ /**
+ * Unlocks the given locked objects of this view.
+ *
+ * @since 2.0
+ */
+ public void unlockObjects(Collection extends CDOObject> objects, RWLockManager.LockType lockType);
+
+ /**
+ * Unlocks all locked objects of this view.
+ *
+ * @since 2.0
+ */
+ public void unlockObjects();
+
+ /**
+ * @since 2.0
+ */
+ public CDOQuery createQuery(String language, String queryString);
+
+ /**
+ * @since 2.0
+ */
+ public Options options();
+
+ /**
+ * @author Simon McDuff
+ * @since 2.0
+ */
+ public interface Options extends IOptions
+ {
+ /**
+ */
+ public static final int NO_REVISION_PREFETCHING = 1;
+
+ /**
+ * Returns the reference type to be used in the internal object cache.
+ *
+ * @return Either {@link ReferenceType#STRONG STRONG}, {@link ReferenceType#SOFT SOFT} or {@link ReferenceType#WEAK
+ * WEAK}.
+ */
+ public ReferenceType getCacheReferenceType();
+
+ /**
+ * Sets the reference type to be used in the internal object cache to either {@link ReferenceType#STRONG STRONG},
+ * {@link ReferenceType#SOFT SOFT} or {@link ReferenceType#WEAK WEAK}. If null
is passed the default
+ * reference type {@link ReferenceType#SOFT SOFT} is set. If the given reference type does not differ from the one
+ * being currently set the new value is ignored and false
is returned. Otherwise existing object
+ * references are converted to the new type and true
is returned.
+ */
+ public boolean setCacheReferenceType(ReferenceType referenceType);
+
+ /**
+ * Returns true
if the {@link CDOObject objects} in this view will notify their
+ * {@link org.eclipse.emf.common.notify.Adapter adapters} about the fact that they are invalidated (due to
+ * remote changes), false
otherwise.
+ *
+ * @see CDOInvalidationNotification
+ */
+ public boolean isInvalidationNotificationEnabled();
+
+ /**
+ * Specifies whether the {@link CDOObject objects} in this view will notify their
+ * {@link org.eclipse.emf.common.notify.Adapter adapters} about the fact that they are invalidated (due to
+ * remote changes) or not.
+ *
+ * @see CDOInvalidationNotification
+ */
+ public void setInvalidationNotificationEnabled(boolean enabled);
+
+ /**
+ * Returns the current set of {@link CDOAdapterPolicy change subscription policies}.
+ *
+ * @return The current set of change subscription policies, never null
.
+ * @see #setChangeSubscriptionPolicy(CDOAdapterPolicy)
+ */
+ public CDOAdapterPolicy[] getChangeSubscriptionPolicies();
+
+ /**
+ * Adds a change subscription policy to this view.
+ *
+ * view.options().addChangeSubscriptionPolicy(CDOChangeSubscriptionPolicy.ALL);
+ *
+ * eObject.eAdapters().add(myAdapter);
+ *
+ * {@link CDOAdapterPolicy#ALL} - Enabled for all adapters used.
+ * {@link CDOAdapterPolicy#CDO} - Enabled only for adapters that implement {@link CDOAdapter}.
+ * Any other class that implement {@link CDOAdapterPolicy} will enable for whatever rules defined in that class.
+ *
+ * myAdapter
in the above example matches the current policy, eObject
will be
+ * registered with the server and you will receive all changes from other transaction.
+ * CDOSession.options().setPassiveUpdate(false)
. In this case, it will
+ * receive changes without having the objects changed.
+ */
+ public void addChangeSubscriptionPolicy(CDOAdapterPolicy policy);
+
+ /**
+ * Removes a change subscription policy from this view.
+ */
+ public void removeChangeSubscriptionPolicy(CDOAdapterPolicy policy);
+
+ // TODO
+ public CDOAdapterPolicy getStrongReferencePolicy();
+
+ /**
+ * Sets the reference type to be used when an adapter is used to an object.
+ * CDOView.setStrongReference(CDOAdapterPolicy.ALL)
is used, it is possible that the target object
+ * will be GC. In that case, the adapter will never received notifications. By Default the value is at
+ * CDOAdapterPolicy.ALL
+ */
+ public void setStrongReferencePolicy(CDOAdapterPolicy policy);
+
+ /**
+ * Returns the CDORevisionPrefetchingPolicy in used.
+ */
+ public CDORevisionPrefetchingPolicy getRevisionPrefetchingPolicy();
+
+ /**
+ * The CDORevisionPrefetchingPolicy feature of the CDOView allows CDO users to fetch many objects at a time.
+ * view.options().setRevisionPrefetchingPolicy (CDOUtil.createRevisionPrefetchingPolicy(10));
+ * CDOView
associated with (and needed by) certain CDOResource
+ *
+ * @author Victor Roldan Betancort
+ * @since 2.0
+ */
+public class CDOViewAdapter implements Adapter
+{
+ private CDOView view;
+
+ public CDOViewAdapter(CDOView view)
+ {
+ this.view = view;
+ }
+
+ public CDOView getView()
+ {
+ return view;
+ }
+
+ public Notifier getTarget()
+ {
+ return null;
+ }
+
+ public void setTarget(Notifier newTarget)
+ {
+ }
+
+ public boolean isAdapterForType(Object type)
+ {
+ return false;
+ }
+
+ public void notifyChanged(Notification notification)
+ {
+ }
+}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewEvent.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewEvent.java
new file mode 100644
index 0000000000..479e0067ff
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewEvent.java
@@ -0,0 +1,22 @@
+/***************************************************************************
+ * 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.cdo.view;
+
+import org.eclipse.emf.cdo.util.CDOEvent;
+
+/**
+ * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
+ */
+public interface CDOViewEvent extends CDOEvent
+{
+ public CDOView getView();
+}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewInvalidationEvent.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewInvalidationEvent.java
new file mode 100644
index 0000000000..e81b06f94a
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewInvalidationEvent.java
@@ -0,0 +1,50 @@
+/***************************************************************************
+ * 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.cdo.view;
+
+import org.eclipse.emf.cdo.CDOInvalidationNotification;
+import org.eclipse.emf.cdo.CDOObject;
+import org.eclipse.emf.cdo.session.CDOSession;
+
+import org.eclipse.net4j.util.event.IListener;
+
+import java.util.Set;
+
+/**
+ * An event that is emitted to registered {@link IListener listeners} of a {@link CDOView} if
+ * {@link CDOSession#setPassiveUpdateEnabled(boolean) passive update} is enabled for the session.
+ *
+ * @author Simon McDuff
+ * @see CDOInvalidationNotification
+ * @see CDOAdapterPolicy
+ * @noimplement This interface is not intended to be implemented by clients.
+ * @since 2.0
+ */
+public interface CDOViewInvalidationEvent extends CDOViewEvent
+{
+ /**
+ * Returns the time stamp of the server transaction if this event was sent as a result of a successfully committed
+ * transaction or LOCAL_ROLLBACK
if this event was sent due to a local rollback.
+ */
+ public long getTimeStamp();
+
+ /**
+ * Returns a set of the {@link CDOObject CDOObjects} of the modified objects.
+ */
+ public Set extends CDOObject> getDirtyObjects();
+
+ /**
+ * Returns a set of the {@link CDOObject CDOObjects} of the removed objects.
+ *
+ * @since 2.0
+ */
+ public Set extends CDOObject> getDetachedObjects();
+}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewProvider.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewProvider.java
new file mode 100644
index 0000000000..412d37d4b2
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewProvider.java
@@ -0,0 +1,51 @@
+/***************************************************************************
+ * 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:
+ * Victor Roldan Betancort - initial API and implementation
+ **************************************************************************/
+package org.eclipse.emf.cdo.view;
+
+import org.eclipse.emf.common.util.URI;
+
+/**
+ * Capable of opening a CDOView
on a target repository, defined by a URI. A regular expression and the
+ * priority are used to determine which is the most suitable provider
+ *
+ * @since 2.0
+ * @author Victor Roldan Betancort
+ * @see CDOView
+ * @see CDOViewProviderRegistry
+ */
+public interface CDOViewProvider
+{
+ public static final int DEFAULT_PRIORITY = 500;
+
+ /**
+ * Returns the priority of this provider. Usually used to choose between several CDOViewProvider
that
+ * match the same repository URI.
+ */
+ public int getPriority();
+
+ /**
+ * Returns the regular expression that determines if the provider can handle certain URI
+ */
+ public String getRegex();
+
+ /**
+ * Checks if the URI matches with the regular expression of this provider
+ */
+ public boolean matchesRegex(URI uri);
+
+ /**
+ * Receives a URI and returns an opened CDOView
against the repository. The implementer is responsible to
+ * do the UUID to physical host map in case necessary.
+ *
+ * @return a wired-up and opened CDOView
+ */
+ public CDOView getView(URI uri, CDOViewSet viewSet);
+}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewProviderRegistry.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewProviderRegistry.java
new file mode 100644
index 0000000000..5c50aab192
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewProviderRegistry.java
@@ -0,0 +1,48 @@
+/***************************************************************************
+ * 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:
+ * Victor Roldan Betancort - initial API and implementation
+ **************************************************************************/
+package org.eclipse.emf.cdo.view;
+
+import org.eclipse.net4j.util.container.IContainer;
+
+import org.eclipse.emf.common.util.URI;
+
+/**
+ * A global registry of {@link CDOViewProvider view provider} implementations.
+ *
+ * @author Victor Roldan Betancort
+ * @since 2.0
+ */
+public interface CDOViewProviderRegistry extends IContainernull
if no {@link CDOViewProvider view provider} in this registry can provide such a view
+ */
+ public CDOView provideView(URI uri, CDOViewSet viewSet);
+
+ /**
+ * Returns an array of CDOViewProvider
instances, determined and ordered by certain criteria based on the
+ * argument URI.
+ */
+ public CDOViewProvider[] getViewProviders(URI uri);
+
+ /**
+ * Registers a new CDOViewProvider
instance
+ */
+ public void addViewProvider(CDOViewProvider viewProvider);
+
+ /**
+ * Removes certain CDOViewProvider
instance from the registry
+ */
+ public void removeViewProvider(CDOViewProvider viewProvider);
+}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewResourcesEvent.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewResourcesEvent.java
new file mode 100644
index 0000000000..9cd9f5b72a
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewResourcesEvent.java
@@ -0,0 +1,30 @@
+/***************************************************************************
+ * 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.cdo.view;
+
+/**
+ * @author Eike Stepper
+ * @noimplement This interface is not intended to be implemented by clients.
+ */
+public interface CDOViewResourcesEvent extends CDOViewEvent
+{
+ public String getResourcePath();
+
+ public Kind getKind();
+
+ /**
+ * @author Eike Stepper
+ */
+ public enum Kind
+ {
+ ADDED, REMOVED;
+ }
+}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewSet.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewSet.java
new file mode 100644
index 0000000000..471a902990
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewSet.java
@@ -0,0 +1,39 @@
+/***************************************************************************
+ * 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.cdo.view;
+
+import org.eclipse.emf.cdo.eresource.CDOResourceFactory;
+
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+
+/**
+ * A {@link ResourceSet} adapter to associate a set of {@link CDOView} instances.
+ * ManagedContainer
based CDOViewProvider
+ *
+ * @author Victor Roldan Betancort
+ * @since 2.0
+ */
+public abstract class ManagedContainerViewProvider extends AbstractCDOViewProvider
+{
+ private IManagedContainer container;
+
+ public ManagedContainerViewProvider(IManagedContainer container, String regex, int priority)
+ {
+ super(regex, priority);
+ this.container = container;
+ }
+
+ protected IManagedContainer getContainer()
+ {
+ return container;
+ }
+
+ @Override
+ public int getPriority()
+ {
+ if (!OMPlatform.INSTANCE.isOSGiRunning())
+ {
+ return Integer.MIN_VALUE;
+ }
+
+ return super.getPriority();
+ }
+}
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/CDOAbstractSavepoint.java
deleted file mode 100644
index 0988d484e7..0000000000
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOAbstractSavepoint.java
+++ /dev/null
@@ -1,87 +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.CDOSavepoint;
-import org.eclipse.emf.cdo.CDOUserTransaction;
-
-/**
- * @author Simon McDuff
- * @since 2.0
- */
-public abstract class CDOAbstractSavepoint implements CDOSavepoint
-{
- private CDOUserTransaction userTransaction;
-
- private CDOAbstractSavepoint previousSavepoint;
-
- private CDOAbstractSavepoint nextSavepoint;
-
- public CDOAbstractSavepoint(CDOUserTransaction transaction, CDOAbstractSavepoint lastSavepoint)
- {
- userTransaction = transaction;
- previousSavepoint = lastSavepoint;
- if (previousSavepoint != null)
- {
- previousSavepoint.setNextSavepoint(this);
- }
- }
-
- public void setPreviousSavepoint(CDOAbstractSavepoint previousSavepoint)
- {
- this.previousSavepoint = previousSavepoint;
- }
-
- public void setNextSavepoint(CDOAbstractSavepoint nextSavepoint)
- {
- this.nextSavepoint = nextSavepoint;
- }
-
- public CDOSavepoint getNextSavepoint()
- {
- return nextSavepoint;
- }
-
- public CDOSavepoint getPreviousSavepoint()
- {
- return previousSavepoint;
- }
-
- public CDOAbstractSavepoint getFirstSavePoint()
- {
- return previousSavepoint != null ? previousSavepoint.getFirstSavePoint() : this;
- }
-
- public CDOUserTransaction getUserTransaction()
- {
- return userTransaction;
- }
-
- public boolean isValid()
- {
- CDOSavepoint lastSavepoint = getUserTransaction().getLastSavepoint();
- for (CDOSavepoint savepoint = lastSavepoint; savepoint != null; savepoint = savepoint.getPreviousSavepoint())
- {
- if (savepoint == this)
- {
- return true;
- }
- }
-
- return false;
- }
-
- public void rollback()
- {
- getUserTransaction().rollback(this);
- }
-}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOAuditImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOAuditImpl.java
deleted file mode 100644
index 9286e06a5a..0000000000
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOAuditImpl.java
+++ /dev/null
@@ -1,113 +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.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.internal.cdo.protocol.CDOClientProtocol;
-import org.eclipse.emf.internal.cdo.protocol.SetAuditRequest;
-
-import org.eclipse.net4j.util.WrappedException;
-
-import java.text.MessageFormat;
-import java.util.List;
-
-/**
- * @author Eike Stepper
- */
-public class CDOAuditImpl extends CDOViewImpl implements CDOAudit
-{
- private long timeStamp;
-
- /**
- * @since 2.0
- */
- public CDOAuditImpl(long timeStamp)
- {
- this.timeStamp = timeStamp;
- }
-
- @Override
- public Type getViewType()
- {
- return Type.AUDIT;
- }
-
- @Override
- public long getTimeStamp()
- {
- return timeStamp;
- }
-
- /**
- * @since 2.0
- */
- public void setTimeStamp(long timeStamp)
- {
- checkActive();
- if (this.timeStamp != timeStamp)
- {
- List