Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2019-12-13 19:06:44 +0000
committerEike Stepper2019-12-13 19:56:07 +0000
commit3057ec447b4764b8a6a9cc535e5bcc37c3e01479 (patch)
tree8859f70412e9dbc754294ec157b8c6a9f81dc40c /plugins/org.eclipse.emf.cdo.common/src
parent3960a2be32acacca909cdc5868d1a0f018c15827 (diff)
downloadcdo-3057ec447b4764b8a6a9cc535e5bcc37c3e01479.tar.gz
cdo-3057ec447b4764b8a6a9cc535e5bcc37c3e01479.tar.xz
cdo-3057ec447b4764b8a6a9cc535e5bcc37c3e01479.zip
[558310] [Releng] Update Bundle-RequiredExecutionEnvironment to JavaSE-1.8
https://bugs.eclipse.org/bugs/show_bug.cgi?id=558310
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.common/src')
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/CDOCommonSession.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/CDOCommonView.java3
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/admin/CDOAdminRepository.java3
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranch.java1
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranchChangedEvent.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranchCreatedEvent.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranchPoint.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranchTag.java3
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranchVersion.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/CDOCommitHistory.java3
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/handler/AsyncCommitInfoHandler.java3
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/handler/BinaryCommitInfoLog.java3
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/handler/TextCommitInfoLog.java3
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDGenerator.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDProvider.java1
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDReference.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/CDOLobStore.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lock/CDOLockChangeInfo.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackageRegistryPopulator.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackageUnit.java1
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/EMFUtil.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDOIDAndBranch.java1
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevision.java1
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionCache.java1
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionFactory.java3
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionHandler.java3
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionUtil.java1
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionsLoadedEvent.java3
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/security/CDOPermissionProvider.java3
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/CDOCommonUtil.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/CDOQueryQueue.java29
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/CountedTimeProvider.java3
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/CurrentTimeProvider.java3
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/RepositoryStateChangedEvent.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/RepositoryTypeChangedEvent.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/AbstractRepositoryProperties.java22
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/CDOQueryInfoImpl.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchImpl.java31
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchManagerImpl.java22
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchPointImpl.java5
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchPointRangeImpl.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchVersionImpl.java5
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOChangeSetDataImpl.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOChangeSetImpl.java5
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitDataImpl.java3
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitHistoryImpl.java58
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitHistoryProviderImpl.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitInfoImpl.java22
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitInfoManagerImpl.java26
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/DelegatingCommitInfo.java22
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/FailureCommitInfo.java22
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDExternalImpl.java7
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDNilImpl.java7
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDNullImpl.java7
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectLongImpl.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectLongWithClassifierImpl.java9
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectStringImpl.java9
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectStringWithClassifierImpl.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectUUIDImpl.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDTempObjectExternalImpl.java7
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDTempObjectImpl.java7
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/lock/CDOLockAreaImpl.java9
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/lock/CDOLockChangeInfoImpl.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/lock/CDOLockOwnerImpl.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/lock/CDOLockStateImpl.java13
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOClassInfoImpl.java28
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOPackageInfoImpl.java25
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOPackageRegistryImpl.java34
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOPackageUnitImpl.java27
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOPersistenceFilterImpl.java3
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOTypeImpl.java32
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/AbstractCDORevisionCache.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDOElementProxyImpl.java3
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDOFeatureMapEntryImpl.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDOIDAndBranchImpl.java5
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDOIDAndVersionImpl.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDOListImpl.java7
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDOListWithElementProxiesImpl.java3
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisableImpl.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisionCacheAuditing.java11
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisionCacheNonAuditing.java11
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisionImpl.java3
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisionKeyImpl.java3
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisionManagerImpl.java30
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/EvictionEventImpl.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/NOOPRevisionCache.java13
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOAddFeatureDeltaImpl.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOClearFeatureDeltaImpl.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOContainerFeatureDeltaImpl.java9
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDODetachedRevisionDeltaImpl.java16
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOFeatureDeltaImpl.java5
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOListFeatureDeltaImpl.java12
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOMoveFeatureDeltaImpl.java15
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDORemoveFeatureDeltaImpl.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDORevisionDeltaImpl.java52
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOSetFeatureDeltaImpl.java7
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOSingleValueFeatureDeltaImpl.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOUnsetFeatureDeltaImpl.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/AbstractQueryResult.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/CDOLobStoreImpl.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/admin/AbstractCDOAdmin.java9
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/branch/CDOBranchUtil.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/branch/InternalCDOBranch.java7
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/branch/InternalCDOBranchManager.java3
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/commit/CDOChangeKindCache.java3
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/commit/CDOChangeSetDataRevisionProvider.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/commit/CDOChangeSetSegment.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/commit/CDORevisionAvailabilityInfo.java3
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/id/AbstractCDOID.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/model/DelegatingCDOPackageRegistry.java30
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/model/InternalCDOPackageInfo.java3
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/model/InternalCDOPackageRegistry.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/model/InternalCDOPackageUnit.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/protocol/CDODataInputImpl.java38
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/protocol/CDODataOutputImpl.java41
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/AbstractCDORevision.java21
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/BaseCDORevision.java57
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/CDOFeatureDeltaVisitorImpl.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/CDOIDMapper.java3
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/DelegatingCDORevision.java79
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/DelegatingCDORevisionManager.java25
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/InternalCDORevision.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/InternalCDORevisionManager.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/ManagedRevisionProvider.java3
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/StubCDORevision.java60
125 files changed, 1289 insertions, 99 deletions
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/CDOCommonSession.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/CDOCommonSession.java
index 30ea994a00..14405a183b 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/CDOCommonSession.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/CDOCommonSession.java
@@ -38,6 +38,7 @@ public interface CDOCommonSession extends IAdaptable, IUserAware, IOptionsContai
/**
* Returns the {@link Options options} of this session.
*/
+ @Override
public Options options();
/**
@@ -54,6 +55,7 @@ public interface CDOCommonSession extends IAdaptable, IUserAware, IOptionsContai
*
* @since 4.0
*/
+ @Override
public CDOCommonSession getContainer();
public boolean isPassiveUpdateEnabled();
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/CDOCommonView.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/CDOCommonView.java
index e2bdf30486..724b7e9318 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/CDOCommonView.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/CDOCommonView.java
@@ -34,6 +34,7 @@ import org.eclipse.core.runtime.IAdaptable;
*/
public interface CDOCommonView extends CDOLockOwner, CDOBranchPoint, CDORevisionProvider, IOptionsContainer, IPropertiesContainer, IAdaptable, Closeable
{
+ @Override
public int getViewID();
/**
@@ -51,6 +52,7 @@ public interface CDOCommonView extends CDOLockOwner, CDOBranchPoint, CDORevision
/**
* @since 4.0
*/
+ @Override
public String getDurableLockingID();
/**
@@ -58,6 +60,7 @@ public interface CDOCommonView extends CDOLockOwner, CDOBranchPoint, CDORevision
*
* @since 4.1
*/
+ @Override
public Options options();
/**
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/admin/CDOAdminRepository.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/admin/CDOAdminRepository.java
index 9b9970dc68..ab897141be 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/admin/CDOAdminRepository.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/admin/CDOAdminRepository.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2012, 2019 Eike Stepper (Loehne, Germany) 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
@@ -38,5 +38,6 @@ public interface CDOAdminRepository extends CDOCommonRepository, INotifier
/**
* May be unsupported on the client side.
*/
+ @Override
public long getTimeStamp() throws UnsupportedOperationException;
}
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranch.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranch.java
index 1c1260bdf5..0a197fd1d9 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranch.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranch.java
@@ -86,6 +86,7 @@ public interface CDOBranch extends CDOBranchPoint, CDONameProvider, IContainer<C
* createBranch()} or {@link #MAIN_BRANCH_NAME} if this branch is the {@link CDOBranchManager#getMainBranch() main
* branch}.
*/
+ @Override
public String getName();
/**
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranchChangedEvent.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranchChangedEvent.java
index 833e76849b..9b757fd5ed 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranchChangedEvent.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranchChangedEvent.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2016 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2013, 2016, 2019 Eike Stepper (Loehne, Germany) 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
@@ -23,8 +23,10 @@ import org.eclipse.net4j.util.event.IEvent;
*/
public interface CDOBranchChangedEvent extends IEvent, CDOBranchProvider
{
+ @Override
public CDOBranchManager getSource();
+ @Override
public CDOBranch getBranch();
public ChangeKind getChangeKind();
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranchCreatedEvent.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranchCreatedEvent.java
index 56bc5a27af..6f4634dc5e 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranchCreatedEvent.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranchCreatedEvent.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2013 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2010-2013, 2019 Eike Stepper (Loehne, Germany) 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
@@ -25,7 +25,9 @@ import org.eclipse.net4j.util.event.IEvent;
@Deprecated
public interface CDOBranchCreatedEvent extends CDOBranchChangedEvent
{
+ @Override
public CDOBranchManager getSource();
+ @Override
public CDOBranch getBranch();
}
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranchPoint.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranchPoint.java
index 7424bec8ed..8cbf0496ac 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranchPoint.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranchPoint.java
@@ -48,6 +48,7 @@ public interface CDOBranchPoint extends CDOBranchProvider, CDOTimeProvider
* Returns the branch of this branch point, or <code>null</code> if this branch point is the
* {@link CDOBranch#getBase() base} of the {@link CDOBranchManager#getMainBranch() main branch}.
*/
+ @Override
public CDOBranch getBranch();
/**
@@ -55,5 +56,6 @@ public interface CDOBranchPoint extends CDOBranchProvider, CDOTimeProvider
* {@link CDOBranchPoint#UNSPECIFIED_DATE unspecified}</i> if this branch point marks the {@link CDOBranch#getHead()
* head} of a branch.
*/
+ @Override
public long getTimeStamp();
}
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranchTag.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranchTag.java
index cb56fc30d9..1c89ae5f57 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranchTag.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranchTag.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009-2012, 2015 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2009-2012, 2015, 2019 Eike Stepper (Loehne, Germany) 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
@@ -25,5 +25,6 @@ public interface CDOBranchTag extends CDOBranchPoint, CDONameProvider
/**
* Returns the name of this branch tag.
*/
+ @Override
public String getName();
}
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranchVersion.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranchVersion.java
index 7bd9f3fe05..f1dc057af7 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranchVersion.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranchVersion.java
@@ -44,10 +44,12 @@ public interface CDOBranchVersion extends CDOBranchProvider, CDOVersionProvider
/**
* Returns the branch of this branch version.
*/
+ @Override
public CDOBranch getBranch();
/**
* Returns the version number of this branch version.
*/
+ @Override
public int getVersion();
}
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/CDOCommitHistory.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/CDOCommitHistory.java
index 3b18b33eae..ed41d4eb9f 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/CDOCommitHistory.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/CDOCommitHistory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2016, 2018 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2012, 2016, 2018, 2019 Eike Stepper (Loehne, Germany) 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
@@ -32,6 +32,7 @@ public interface CDOCommitHistory extends IContainer<CDOCommitInfo>, CDOBranchPr
public CDOCommitInfoManager getManager();
+ @Override
public CDOBranch getBranch();
public boolean isAppendingTriggerLoadElement();
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/handler/AsyncCommitInfoHandler.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/handler/AsyncCommitInfoHandler.java
index d4afae45c0..ecc9bbd158 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/handler/AsyncCommitInfoHandler.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/handler/AsyncCommitInfoHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, 2015, 2016 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2011, 2012, 2015, 2016, 2019 Eike Stepper (Loehne, Germany) 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
@@ -32,6 +32,7 @@ public class AsyncCommitInfoHandler extends QueueWorker<CDOCommitInfo> implement
this.delegate = delegate;
}
+ @Override
public void handleCommitInfo(CDOCommitInfo commitInfo)
{
addWork(commitInfo);
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/handler/BinaryCommitInfoLog.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/handler/BinaryCommitInfoLog.java
index fd93d5f19a..32f9bd4633 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/handler/BinaryCommitInfoLog.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/handler/BinaryCommitInfoLog.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011-2013, 2015 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2011-2013, 2015, 2019 Eike Stepper (Loehne, Germany) 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
@@ -49,6 +49,7 @@ public class BinaryCommitInfoLog implements CDOCommitInfoHandler
this(stream, packageRegistry, null);
}
+ @Override
public void handleCommitInfo(CDOCommitInfo commitInfo)
{
try
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/handler/TextCommitInfoLog.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/handler/TextCommitInfoLog.java
index 364cfb1f8e..5b8e755e5a 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/handler/TextCommitInfoLog.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/handler/TextCommitInfoLog.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, 2015 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2011, 2012, 2015, 2019 Eike Stepper (Loehne, Germany) 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
@@ -35,6 +35,7 @@ public class TextCommitInfoLog implements CDOCommitInfoHandler
printStream = stream instanceof PrintStream ? (PrintStream)stream : new PrintStream(stream);
}
+ @Override
public void handleCommitInfo(CDOCommitInfo commitInfo)
{
try
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDGenerator.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDGenerator.java
index b70cc84944..1fb33e694b 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDGenerator.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDGenerator.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, 2015 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2011, 2012, 2015, 2019 Eike Stepper (Loehne, Germany) 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
@@ -28,11 +28,13 @@ public interface CDOIDGenerator
*/
public static final CDOIDGenerator NULL = new CDOIDGenerator()
{
+ @Override
public CDOID generateCDOID(EObject object)
{
return CDOID.NULL;
}
+ @Override
public void reset()
{
// Do nothing
@@ -44,6 +46,7 @@ public interface CDOIDGenerator
*/
public static final CDOIDGenerator UUID = new CDOIDGenerator()
{
+ @Override
public CDOID generateCDOID(EObject object)
{
byte[] bytes = new byte[16];
@@ -51,6 +54,7 @@ public interface CDOIDGenerator
return CDOIDUtil.createUUID(bytes);
}
+ @Override
public void reset()
{
// Do nothing
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDProvider.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDProvider.java
index d9e21ff3f1..74df6b3981 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDProvider.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDProvider.java
@@ -22,6 +22,7 @@ public interface CDOIDProvider
*/
public static final CDOIDProvider NOOP = new CDOIDProvider()
{
+ @Override
public CDOID provideCDOID(Object id)
{
return (CDOID)id;
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDReference.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDReference.java
index 78354bc686..4144c518ef 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDReference.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDReference.java
@@ -65,21 +65,25 @@ public class CDOIDReference implements CDOReference<CDOID>
out.writeXInt(sourceIndex);
}
+ @Override
public CDOID getTargetObject()
{
return targetID;
}
+ @Override
public CDOID getSourceObject()
{
return sourceID;
}
+ @Override
public EStructuralFeature getSourceFeature()
{
return sourceFeature;
}
+ @Override
public int getSourceIndex()
{
return sourceIndex;
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/CDOLobStore.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/CDOLobStore.java
index d115272f85..de6a45bc84 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/CDOLobStore.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/CDOLobStore.java
@@ -42,31 +42,37 @@ public interface CDOLobStore
*/
public static abstract class Delegating implements CDOLobStore
{
+ @Override
public File getBinaryFile(byte[] id)
{
return getDelegate().getBinaryFile(id);
}
+ @Override
public InputStream getBinary(CDOLobInfo info) throws IOException
{
return getDelegate().getBinary(info);
}
+ @Override
public CDOLobInfo putBinary(InputStream contents) throws IOException
{
return getDelegate().putBinary(contents);
}
+ @Override
public File getCharacterFile(byte[] id)
{
return getDelegate().getCharacterFile(id);
}
+ @Override
public Reader getCharacter(CDOLobInfo info) throws IOException
{
return getDelegate().getCharacter(info);
}
+ @Override
public CDOLobInfo putCharacter(Reader contents) throws IOException
{
return getDelegate().putCharacter(contents);
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lock/CDOLockChangeInfo.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lock/CDOLockChangeInfo.java
index c610460818..cc0db1b522 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lock/CDOLockChangeInfo.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lock/CDOLockChangeInfo.java
@@ -35,12 +35,14 @@ public interface CDOLockChangeInfo extends CDOBranchPoint
/**
* @return The branch at which the lock changes took place, same as <code>getView().getBranch()</code>.
*/
+ @Override
public CDOBranch getBranch();
/**
* @return The repository time at which the lock changes took place. This is only an informal indication; no formal
* relation (e.g. an ordering) with commit time stamps is guaranteed.
*/
+ @Override
public long getTimeStamp();
/**
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackageRegistryPopulator.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackageRegistryPopulator.java
index dd0e401811..cd1f016af8 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackageRegistryPopulator.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackageRegistryPopulator.java
@@ -149,11 +149,13 @@ public class CDOPackageRegistryPopulator extends Worker
return nsURI;
}
+ @Override
public EFactory getEFactory()
{
return source.getEFactory(nsURI);
}
+ @Override
public EPackage getEPackage()
{
return source.getEPackage(nsURI);
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackageUnit.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackageUnit.java
index 34c3a3e3f0..e9a13cfd6c 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackageUnit.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackageUnit.java
@@ -62,6 +62,7 @@ public interface CDOPackageUnit extends Comparable<CDOPackageUnit>, CDOTimeProvi
/**
* Returns the time this package unit was originally committed.
*/
+ @Override
public long getTimeStamp();
/**
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/EMFUtil.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/EMFUtil.java
index 6b704057e5..c56f8510fe 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/EMFUtil.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/EMFUtil.java
@@ -121,6 +121,7 @@ public final class EMFUtil
*/
public static final Predicate<EStructuralFeature> ATTRIBUTES = new Predicate<EStructuralFeature>()
{
+ @Override
public boolean apply(EStructuralFeature feature)
{
return feature instanceof EAttribute;
@@ -132,6 +133,7 @@ public final class EMFUtil
*/
public static final Predicate<EStructuralFeature> REFERENCES = new Predicate<EStructuralFeature>()
{
+ @Override
public boolean apply(EStructuralFeature feature)
{
return feature instanceof EReference;
@@ -143,6 +145,7 @@ public final class EMFUtil
*/
public static final Predicate<EStructuralFeature> CONTAINER_REFERENCES = new Predicate<EStructuralFeature>()
{
+ @Override
public boolean apply(EStructuralFeature feature)
{
if (feature instanceof EReference)
@@ -160,6 +163,7 @@ public final class EMFUtil
*/
public static final Predicate<EStructuralFeature> CROSS_REFERENCES = new Predicate<EStructuralFeature>()
{
+ @Override
public boolean apply(EStructuralFeature feature)
{
if (feature instanceof EReference)
@@ -177,6 +181,7 @@ public final class EMFUtil
*/
public static final Predicate<EStructuralFeature> CONTAINMENT_REFERENCES = new Predicate<EStructuralFeature>()
{
+ @Override
public boolean apply(EStructuralFeature feature)
{
if (feature instanceof EReference)
@@ -277,6 +282,7 @@ public final class EMFUtil
Map.Entry<String, Object>[] array = entries.toArray(new Entry[entries.size()]);
Arrays.sort(array, new Comparator<Map.Entry<String, Object>>()
{
+ @Override
public int compare(Map.Entry<String, Object> o1, Map.Entry<String, Object> o2)
{
return o1.getKey().compareTo(o2.getKey());
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDOIDAndBranch.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDOIDAndBranch.java
index 8bf9c77c72..8d46b3a729 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDOIDAndBranch.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDOIDAndBranch.java
@@ -25,5 +25,6 @@ import org.eclipse.emf.cdo.common.id.CDOIdentifiable;
*/
public interface CDOIDAndBranch extends CDOIdentifiable, CDOBranchProvider
{
+ @Override
public CDOBranch getBranch();
}
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevision.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevision.java
index fb1d56f8a9..214cc9386c 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevision.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevision.java
@@ -61,6 +61,7 @@ public interface CDORevision extends CDORevisionKey, CDORevisable
*/
public static final CDOPermissionProvider PERMISSION_PROVIDER = new CDOPermissionProvider()
{
+ @Override
public CDOPermission getPermission(CDORevision revision, CDOBranchPoint securityContext)
{
return revision.getPermission();
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionCache.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionCache.java
index dd353a8f4a..6635d4ae39 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionCache.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionCache.java
@@ -70,6 +70,7 @@ public interface CDORevisionCache extends CDORevisionCacheAdder, INotifier
/**
* @since 3.0
*/
+ @Override
public CDORevisionCache getSource();
/**
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionFactory.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionFactory.java
index e8533e2521..3bd5e38ed1 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionFactory.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2009, 2011, 2012, 2015 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2008, 2009, 2011, 2012, 2015, 2019 Eike Stepper (Loehne, Germany) 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
@@ -25,6 +25,7 @@ public interface CDORevisionFactory
*/
public static final CDORevisionFactory DEFAULT = new CDORevisionFactory()
{
+ @Override
public CDORevision createRevision(EClass eClass)
{
return new org.eclipse.emf.cdo.internal.common.revision.CDORevisionImpl(eClass);
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionHandler.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionHandler.java
index 39f72bf28f..b9036b342e 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionHandler.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2012, 2015 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2010-2012, 2015, 2019 Eike Stepper (Loehne, Germany) 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
@@ -45,6 +45,7 @@ public interface CDORevisionHandler
this.delegate = delegate;
}
+ @Override
public final boolean handleRevision(CDORevision revision)
{
if (filter(revision))
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionUtil.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionUtil.java
index 8b98ab3561..c9d7a8052a 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionUtil.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionUtil.java
@@ -827,6 +827,7 @@ public final class CDORevisionUtil
{
}
+ @Override
public int compare(CDORevisionKey rev1, CDORevisionKey rev2)
{
int result = rev1.getID().compareTo(rev2.getID());
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionsLoadedEvent.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionsLoadedEvent.java
index 8530bacba0..80afb720a1 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionsLoadedEvent.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionsLoadedEvent.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2014, 2015, 2019 Eike Stepper (Loehne, Germany) 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
@@ -25,6 +25,7 @@ import java.util.List;
*/
public interface CDORevisionsLoadedEvent extends IEvent
{
+ @Override
public CDORevisionManager getSource();
public List<? extends CDORevision> getPrimaryLoadedRevisions();
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/security/CDOPermissionProvider.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/security/CDOPermissionProvider.java
index 75cda5afb0..8f3be3ce3d 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/security/CDOPermissionProvider.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/security/CDOPermissionProvider.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2012, 2019 Eike Stepper (Loehne, Germany) 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
@@ -43,6 +43,7 @@ public interface CDOPermissionProvider
this.permission = permission;
}
+ @Override
public CDOPermission getPermission(CDORevision revision, CDOBranchPoint securityContext)
{
return permission;
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/CDOCommonUtil.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/CDOCommonUtil.java
index ccf847a9bd..4af6bf6482 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/CDOCommonUtil.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/CDOCommonUtil.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2013, 2015, 2016 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2010-2013, 2015, 2016, 2019 Eike Stepper (Loehne, Germany) 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
@@ -77,6 +77,7 @@ public final class CDOCommonUtil
*/
public static final Comparator<CDONameProvider> NAME_COMPARATOR = new Comparator<CDONameProvider>()
{
+ @Override
public int compare(CDONameProvider o1, CDONameProvider o2)
{
String n1 = StringUtil.safe(o1.getName()).toLowerCase();
@@ -90,6 +91,7 @@ public final class CDOCommonUtil
*/
public static final Comparator<CDOTimeProvider> TIME_COMPARATOR = new Comparator<CDOTimeProvider>()
{
+ @Override
public int compare(CDOTimeProvider o1, CDOTimeProvider o2)
{
return compareTimeStamps(o1.getTimeStamp(), o2.getTimeStamp());
@@ -109,6 +111,7 @@ public final class CDOCommonUtil
{
return new CDODataInputImpl(inputStream)
{
+ @Override
public CDOPackageRegistry getPackageRegistry()
{
return packageRegistry;
@@ -294,6 +297,7 @@ public final class CDOCommonUtil
{
listener = new IListener()
{
+ @Override
public void notifyEvent(IEvent event)
{
synchronized (this)
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/CDOQueryQueue.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/CDOQueryQueue.java
index 3e26906ed8..aba433f968 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/CDOQueryQueue.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/CDOQueryQueue.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008-2013, 2015 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2008-2013, 2015, 2019 Eike Stepper (Loehne, Germany) 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
@@ -50,6 +50,7 @@ public class CDOQueryQueue<E> implements Queue<E>, Closeable
queue.add(new QueueEntry<E>(exception));
}
+ @Override
public void close()
{
synchronized (closeLock)
@@ -61,6 +62,7 @@ public class CDOQueryQueue<E> implements Queue<E>, Closeable
}
}
+ @Override
public boolean isClosed()
{
synchronized (closeLock)
@@ -69,22 +71,26 @@ public class CDOQueryQueue<E> implements Queue<E>, Closeable
}
}
+ @Override
public boolean add(E e)
{
QueueEntry<E> entry = new QueueEntry<E>(e);
return queue.add(entry);
}
+ @Override
public void clear()
{
queue.clear();
}
+ @Override
public boolean contains(Object o)
{
return queue.contains(o);
}
+ @Override
public E element()
{
return checkObject(queue.element());
@@ -102,11 +108,13 @@ public class CDOQueryQueue<E> implements Queue<E>, Closeable
return queue.hashCode();
}
+ @Override
public boolean isEmpty()
{
return queue.isEmpty();
}
+ @Override
public BlockingCloseableIterator<E> iterator()
{
return new BlockingCloseableIteratorImpl();
@@ -117,11 +125,13 @@ public class CDOQueryQueue<E> implements Queue<E>, Closeable
return queue.offer(new QueueEntry<E>(e), timeout, unit);
}
+ @Override
public boolean offer(E e)
{
return queue.offer(new QueueEntry<E>(e));
}
+ @Override
public E peek()
{
return checkObject(queue.peek());
@@ -142,16 +152,19 @@ public class CDOQueryQueue<E> implements Queue<E>, Closeable
return queue.remainingCapacity();
}
+ @Override
public E remove()
{
return checkObject(queue.remove());
}
+ @Override
public boolean remove(Object o)
{
return queue.remove(o);
}
+ @Override
public int size()
{
return queue.size();
@@ -166,11 +179,13 @@ public class CDOQueryQueue<E> implements Queue<E>, Closeable
return checkObject(entry);
}
+ @Override
public Object[] toArray()
{
return queue.toArray();
}
+ @Override
@SuppressWarnings("unchecked")
public Object[] toArray(Object[] a)
{
@@ -183,6 +198,7 @@ public class CDOQueryQueue<E> implements Queue<E>, Closeable
return queue.toString();
}
+ @Override
public E poll()
{
QueueEntry<E> entry = queue.poll();
@@ -194,21 +210,25 @@ public class CDOQueryQueue<E> implements Queue<E>, Closeable
throw new UnsupportedOperationException();
}
+ @Override
public boolean containsAll(Collection<?> c)
{
throw new UnsupportedOperationException();
}
+ @Override
public boolean addAll(Collection<? extends E> c)
{
throw new UnsupportedOperationException();
}
+ @Override
public boolean removeAll(Collection<?> c)
{
throw new UnsupportedOperationException();
}
+ @Override
public boolean retainAll(Collection<?> c)
{
throw new UnsupportedOperationException();
@@ -290,6 +310,7 @@ public class CDOQueryQueue<E> implements Queue<E>, Closeable
return null;
}
+ @Override
public int compareTo(QueueEntry<E> o)
{
if (this == o)
@@ -341,6 +362,7 @@ public class CDOQueryQueue<E> implements Queue<E>, Closeable
{
}
+ @Override
public E peek()
{
if (nextElement == null)
@@ -351,6 +373,7 @@ public class CDOQueryQueue<E> implements Queue<E>, Closeable
return nextElement;
}
+ @Override
public boolean hasNext()
{
privateNext(false);
@@ -385,6 +408,7 @@ public class CDOQueryQueue<E> implements Queue<E>, Closeable
}
}
+ @Override
public E next()
{
try
@@ -398,16 +422,19 @@ public class CDOQueryQueue<E> implements Queue<E>, Closeable
}
}
+ @Override
public void remove()
{
throw new UnsupportedOperationException();
}
+ @Override
public void close()
{
this.closed = true;
}
+ @Override
public boolean isClosed()
{
return this.closed;
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/CountedTimeProvider.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/CountedTimeProvider.java
index 8539b7c016..dbfb8f5fd3 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/CountedTimeProvider.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/CountedTimeProvider.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2016, 2019 Eike Stepper (Loehne, Germany) 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
@@ -30,6 +30,7 @@ public final class CountedTimeProvider implements CDOTimeProvider
counter = new AtomicLong(initialValue);
}
+ @Override
public long getTimeStamp()
{
return counter.getAndIncrement();
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/CurrentTimeProvider.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/CurrentTimeProvider.java
index 1b610b627d..2fc2b10338 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/CurrentTimeProvider.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/CurrentTimeProvider.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2016, 2019 Eike Stepper (Loehne, Germany) 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
@@ -22,6 +22,7 @@ public class CurrentTimeProvider implements CDOTimeProvider
{
}
+ @Override
public long getTimeStamp()
{
return System.currentTimeMillis();
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/RepositoryStateChangedEvent.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/RepositoryStateChangedEvent.java
index dbd010a86c..7f21a47000 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/RepositoryStateChangedEvent.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/RepositoryStateChangedEvent.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2012, 2016 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2010-2012, 2016, 2019 Eike Stepper (Loehne, Germany) 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
@@ -39,11 +39,13 @@ public class RepositoryStateChangedEvent extends Event implements CDOCommonRepos
this.newState = newState;
}
+ @Override
public CDOCommonRepository.State getOldState()
{
return oldState;
}
+ @Override
public CDOCommonRepository.State getNewState()
{
return newState;
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/RepositoryTypeChangedEvent.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/RepositoryTypeChangedEvent.java
index d48bef84b2..20d0e72081 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/RepositoryTypeChangedEvent.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/RepositoryTypeChangedEvent.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2012, 2015, 2016 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2010-2012, 2015, 2016, 2019 Eike Stepper (Loehne, Germany) 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
@@ -39,11 +39,13 @@ public class RepositoryTypeChangedEvent extends Event implements CDOCommonReposi
this.newType = newType;
}
+ @Override
public CDOCommonRepository.Type getOldType()
{
return oldType;
}
+ @Override
public CDOCommonRepository.Type getNewType()
{
return newType;
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/AbstractRepositoryProperties.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/AbstractRepositoryProperties.java
index 844d3416ac..a6d2696baa 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/AbstractRepositoryProperties.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/AbstractRepositoryProperties.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2018, 2019 Eike Stepper (Loehne, Germany) 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
@@ -220,103 +220,123 @@ public abstract class AbstractRepositoryProperties<RECEIVER> extends Properties<
});
}
+ @Override
@SuppressWarnings({ "unchecked", "rawtypes" })
public Object getAdapter(Class adapter)
{
return AdapterUtil.adapt(this, adapter, false);
}
+ @Override
public long getTimeStamp()
{
throw new UnsupportedOperationException();
}
+ @Override
public String getName()
{
throw new UnsupportedOperationException();
}
+ @Override
public String getUUID()
{
throw new UnsupportedOperationException();
}
+ @Override
public Type getType()
{
throw new UnsupportedOperationException();
}
+ @Override
public State getState()
{
throw new UnsupportedOperationException();
}
+ @Override
public long getCreationTime()
{
throw new UnsupportedOperationException();
}
+ @Override
public String getStoreType()
{
throw new UnsupportedOperationException();
}
+ @Override
public Set<ObjectType> getObjectIDTypes()
{
throw new UnsupportedOperationException();
}
+ @Override
public IDGenerationLocation getIDGenerationLocation()
{
throw new UnsupportedOperationException();
}
+ @Override
public CommitInfoStorage getCommitInfoStorage()
{
throw new UnsupportedOperationException();
}
+ @Override
public CDOID getRootResourceID()
{
throw new UnsupportedOperationException();
}
+ @Override
public boolean isAuthenticating()
{
throw new UnsupportedOperationException();
}
+ @Override
public boolean isSupportingAudits()
{
throw new UnsupportedOperationException();
}
+ @Override
public boolean isSupportingBranches()
{
throw new UnsupportedOperationException();
}
+ @Override
public boolean isSupportingUnits()
{
throw new UnsupportedOperationException();
}
+ @Override
@Deprecated
public boolean isSupportingEcore()
{
throw new UnsupportedOperationException();
}
+ @Override
public boolean isSerializingCommits()
{
throw new UnsupportedOperationException();
}
+ @Override
public boolean isEnsuringReferentialIntegrity()
{
throw new UnsupportedOperationException();
}
+ @Override
public boolean waitWhileInitial(IProgressMonitor monitor)
{
throw new UnsupportedOperationException();
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/CDOQueryInfoImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/CDOQueryInfoImpl.java
index c88b7e4a2a..904d42823f 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/CDOQueryInfoImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/CDOQueryInfoImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009-2013, 2015-2017 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2009-2013, 2015-2017, 2019 Eike Stepper (Loehne, Germany) 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
@@ -118,21 +118,25 @@ public class CDOQueryInfoImpl implements CDOQueryInfo
}
}
+ @Override
public String getQueryString()
{
return queryString;
}
+ @Override
public String getQueryLanguage()
{
return queryLanguage;
}
+ @Override
public Map<String, Object> getParameters()
{
return Collections.unmodifiableMap(parameters);
}
+ @Override
public <T> T getParameter(String name)
{
@SuppressWarnings("unchecked")
@@ -140,6 +144,7 @@ public class CDOQueryInfoImpl implements CDOQueryInfo
return value;
}
+ @Override
public Object getContext()
{
return context;
@@ -156,6 +161,7 @@ public class CDOQueryInfoImpl implements CDOQueryInfo
parameters.put(key, value);
}
+ @Override
public int getMaxResults()
{
return maxResults;
@@ -167,12 +173,14 @@ public class CDOQueryInfoImpl implements CDOQueryInfo
return this;
}
+ @Override
@Deprecated
public boolean isLegacyModeEnabled()
{
return true;
}
+ @Override
public CDOChangeSetData getChangeSetData()
{
return changeSetData;
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchImpl.java
index 95d1d1e13b..a80601b5b4 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2016 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2010-2016, 2019 Eike Stepper (Loehne, Germany) 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
@@ -60,26 +60,31 @@ public class CDOBranchImpl extends Container<CDOBranch> implements InternalCDOBr
activate();
}
+ @Override
public boolean isMainBranch()
{
return false;
}
+ @Override
public boolean isLocal()
{
return id < 0;
}
+ @Override
public InternalCDOBranchManager getBranchManager()
{
return branchManager;
}
+ @Override
public int getID()
{
return id;
}
+ @Override
public synchronized String getName()
{
if (name == null)
@@ -90,6 +95,7 @@ public class CDOBranchImpl extends Container<CDOBranch> implements InternalCDOBr
return name;
}
+ @Override
public void setName(String name)
{
checkActive();
@@ -112,27 +118,32 @@ public class CDOBranchImpl extends Container<CDOBranch> implements InternalCDOBr
}
}
+ @Override
public void basicSetName(String name)
{
this.name = name;
branchManager.handleBranchChanged(this, ChangeKind.RENAMED);
}
+ @Override
public CDOBranch getBranch()
{
return base.getBranch();
}
+ @Override
public long getTimeStamp()
{
return base.getTimeStamp();
}
+ @Override
public boolean isProxy()
{
return name == null || base == null;
}
+ @Override
public String getPathName()
{
StringBuilder builder = new StringBuilder();
@@ -153,6 +164,7 @@ public class CDOBranchImpl extends Container<CDOBranch> implements InternalCDOBr
builder.append(branch.getName());
}
+ @Override
public CDOBranchPoint[] getBasePath()
{
List<CDOBranchPoint> path = new ArrayList<CDOBranchPoint>();
@@ -172,6 +184,7 @@ public class CDOBranchImpl extends Container<CDOBranch> implements InternalCDOBr
path.add(base);
}
+ @Override
public synchronized CDOBranchPoint getBase()
{
if (base == null)
@@ -182,21 +195,25 @@ public class CDOBranchImpl extends Container<CDOBranch> implements InternalCDOBr
return base;
}
+ @Override
public CDOBranchPoint getHead()
{
return head;
}
+ @Override
public CDOBranchPoint getPoint(long timeStamp)
{
return new CDOBranchPointImpl(this, timeStamp);
}
+ @Override
public CDOBranchVersion getVersion(int version)
{
return new CDOBranchVersionImpl(this, version);
}
+ @Override
public InternalCDOBranch createBranch(String name, long timeStamp)
{
if (!branchManager.getRepository().isSupportingBranches())
@@ -207,16 +224,19 @@ public class CDOBranchImpl extends Container<CDOBranch> implements InternalCDOBr
return branchManager.createBranch(BranchLoader.NEW_BRANCH, name, this, timeStamp);
}
+ @Override
public InternalCDOBranch createBranch(String name)
{
return createBranch(name, CDOBranchPoint.UNSPECIFIED_DATE);
}
+ @Override
public InternalCDOBranch[] getElements()
{
return getBranches();
}
+ @Override
public InternalCDOBranch[] getBranches(boolean loadOnDemand)
{
if (!branchManager.getRepository().isSupportingBranches())
@@ -232,11 +252,13 @@ public class CDOBranchImpl extends Container<CDOBranch> implements InternalCDOBr
return branches;
}
+ @Override
public synchronized InternalCDOBranch[] getBranches()
{
return getBranches(true);
}
+ @Override
public InternalCDOBranch getBranch(String path)
{
if (!branchManager.getRepository().isSupportingBranches())
@@ -272,6 +294,7 @@ public class CDOBranchImpl extends Container<CDOBranch> implements InternalCDOBr
return child.getBranch(rest);
}
+ @Override
@Deprecated
public void rename(String newName)
{
@@ -292,18 +315,21 @@ public class CDOBranchImpl extends Container<CDOBranch> implements InternalCDOBr
return null;
}
+ @Override
public BranchInfo getBranchInfo()
{
CDOBranchPoint base = getBase();
return new BranchInfo(getName(), base.getBranch().getID(), base.getTimeStamp());
}
+ @Override
public void setBranchInfo(String name, InternalCDOBranch baseBranch, long baseTimeStamp)
{
this.name = name;
base = baseBranch.getPoint(baseTimeStamp);
}
+ @Override
public void addChild(InternalCDOBranch branch)
{
synchronized (this)
@@ -324,6 +350,7 @@ public class CDOBranchImpl extends Container<CDOBranch> implements InternalCDOBr
fireElementAddedEvent(branch);
}
+ @Override
@SuppressWarnings({ "unchecked", "rawtypes" })
public Object getAdapter(Class adapter)
{
@@ -334,6 +361,7 @@ public class CDOBranchImpl extends Container<CDOBranch> implements InternalCDOBr
{
return new CDOBranchCreationContext()
{
+ @Override
public CDOBranchPoint getBase()
{
return getHead();
@@ -345,6 +373,7 @@ public class CDOBranchImpl extends Container<CDOBranch> implements InternalCDOBr
return AdapterUtil.adapt(this, adapter, false);
}
+ @Override
public int compareTo(CDOBranch o)
{
int otherID = o.getID();
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchManagerImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchManagerImpl.java
index a8c03ae0c1..38fcb98861 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchManagerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchManagerImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2013, 2015, 2016 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2010-2013, 2015, 2016, 2019 Eike Stepper (Loehne, Germany) 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
@@ -48,49 +48,58 @@ public class CDOBranchManagerImpl extends Container<CDOBranch> implements Intern
{
}
+ @Override
public CDOCommonRepository getRepository()
{
return repository;
}
+ @Override
public void setRepository(CDOCommonRepository repository)
{
this.repository = repository;
}
+ @Override
public BranchLoader getBranchLoader()
{
return branchLoader;
}
+ @Override
public void setBranchLoader(BranchLoader branchLoader)
{
checkInactive();
this.branchLoader = branchLoader;
}
+ @Override
public CDOTimeProvider getTimeProvider()
{
return repository;
}
+ @Override
@Deprecated
public void setTimeProvider(CDOTimeProvider timeProvider)
{
throw new UnsupportedOperationException();
}
+ @Override
public void initMainBranch(boolean local, long timeStamp)
{
mainBranch = new CDOBranchImpl.Main(this, local, timeStamp);
}
+ @Override
@Deprecated
public void handleBranchCreated(InternalCDOBranch branch)
{
handleBranchChanged(branch, ChangeKind.CREATED);
}
+ @Override
public void handleBranchChanged(InternalCDOBranch branch, ChangeKind changeKind)
{
if (changeKind == ChangeKind.CREATED)
@@ -107,17 +116,20 @@ public class CDOBranchManagerImpl extends Container<CDOBranch> implements Intern
}
}
+ @Override
public CDOBranch[] getElements()
{
return new CDOBranch[] { getMainBranch() };
}
+ @Override
public InternalCDOBranch getMainBranch()
{
checkActive();
return mainBranch;
}
+ @Override
public InternalCDOBranch getBranch(int branchID)
{
checkActive();
@@ -145,6 +157,7 @@ public class CDOBranchManagerImpl extends Container<CDOBranch> implements Intern
return branch;
}
+ @Override
public InternalCDOBranch getBranch(int id, String name, InternalCDOBranch baseBranch, long baseTimeStamp)
{
synchronized (branches)
@@ -164,6 +177,7 @@ public class CDOBranchManagerImpl extends Container<CDOBranch> implements Intern
}
}
+ @Override
public InternalCDOBranch getBranch(int id, BranchInfo branchInfo)
{
String name = branchInfo.getName();
@@ -172,6 +186,7 @@ public class CDOBranchManagerImpl extends Container<CDOBranch> implements Intern
return getBranch(id, name, baseBranch, baseTimeStamp);
}
+ @Override
public InternalCDOBranch getBranch(String path)
{
if (path.startsWith(CDOBranch.PATH_SEPARATOR))
@@ -205,6 +220,7 @@ public class CDOBranchManagerImpl extends Container<CDOBranch> implements Intern
return null;
}
+ @Override
public int getBranches(int startID, int endID, CDOBranchHandler handler)
{
checkActive();
@@ -222,6 +238,7 @@ public class CDOBranchManagerImpl extends Container<CDOBranch> implements Intern
return branchLoader.loadBranches(startID, endID, handler);
}
+ @Override
public InternalCDOBranch createBranch(int branchID, String name, InternalCDOBranch baseBranch, long baseTimeStamp)
{
checkActive();
@@ -247,6 +264,7 @@ public class CDOBranchManagerImpl extends Container<CDOBranch> implements Intern
return new CDOBranchImpl(this, branchID, name, base);
}
+ @Override
@Deprecated
public void renameBranch(CDOBranch branch, String newName)
{
@@ -311,11 +329,13 @@ public class CDOBranchManagerImpl extends Container<CDOBranch> implements Intern
return (CDOBranchManager)super.getSource();
}
+ @Override
public CDOBranch getBranch()
{
return branch;
}
+ @Override
public ChangeKind getChangeKind()
{
return changeKind;
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchPointImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchPointImpl.java
index dd8d52460d..b7b5ca6cbb 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchPointImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchPointImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2013 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2010-2013, 2019 Eike Stepper (Loehne, Germany) 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
@@ -31,16 +31,19 @@ public class CDOBranchPointImpl implements CDOBranchPoint, Comparable<CDOBranchP
this.timeStamp = timeStamp;
}
+ @Override
public CDOBranch getBranch()
{
return branch;
}
+ @Override
public long getTimeStamp()
{
return timeStamp;
}
+ @Override
public int compareTo(CDOBranchPoint o)
{
int result = branch.compareTo(o.getBranch());
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchPointRangeImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchPointRangeImpl.java
index fedc1136fa..413b7c24bd 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchPointRangeImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchPointRangeImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2012 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2010-2012, 2019 Eike Stepper (Loehne, Germany) 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
@@ -30,11 +30,13 @@ public class CDOBranchPointRangeImpl implements CDOBranchPointRange
this.endPoint = endPoint;
}
+ @Override
public CDOBranchPoint getStartPoint()
{
return startPoint;
}
+ @Override
public CDOBranchPoint getEndPoint()
{
return endPoint;
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchVersionImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchVersionImpl.java
index eaec167d78..1e1aa24ddd 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchVersionImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchVersionImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2014 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2010-2014, 2019 Eike Stepper (Loehne, Germany) 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
@@ -32,6 +32,7 @@ public class CDOBranchVersionImpl implements CDOBranchVersion, CDOBranchAdjustab
this.version = version;
}
+ @Override
public void adjustBranches(CDOBranchManager newBranchManager)
{
if (branch != null)
@@ -40,11 +41,13 @@ public class CDOBranchVersionImpl implements CDOBranchVersion, CDOBranchAdjustab
}
}
+ @Override
public CDOBranch getBranch()
{
return branch;
}
+ @Override
public int getVersion()
{
return version;
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOChangeSetDataImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOChangeSetDataImpl.java
index 36432b4a68..5363b05799 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOChangeSetDataImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOChangeSetDataImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2016 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2010-2016, 2019 Eike Stepper (Loehne, Germany) 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
@@ -55,6 +55,7 @@ public class CDOChangeSetDataImpl implements CDOChangeSetData
this(new ArrayList<CDOIDAndVersion>(), new ArrayList<CDORevisionKey>(), new ArrayList<CDOIDAndVersion>());
}
+ @Override
public boolean isEmpty()
{
if (newObjects != null && !newObjects.isEmpty())
@@ -75,6 +76,7 @@ public class CDOChangeSetDataImpl implements CDOChangeSetData
return true;
}
+ @Override
public CDOChangeSetData copy()
{
List<CDOIDAndVersion> newObjectsCopy = new ArrayList<CDOIDAndVersion>(newObjects.size());
@@ -114,6 +116,7 @@ public class CDOChangeSetDataImpl implements CDOChangeSetData
return new CDOChangeSetDataImpl(newObjectsCopy, changedObjectsCopy, detachedObjectsCopy);
}
+ @Override
public void merge(CDOChangeSetData changeSetData)
{
Map<CDOID, CDOIDAndVersion> newMap = CDOIDUtil.createMap();
@@ -177,21 +180,25 @@ public class CDOChangeSetDataImpl implements CDOChangeSetData
changedMap.put(id, key);
}
+ @Override
public List<CDOIDAndVersion> getNewObjects()
{
return newObjects;
}
+ @Override
public List<CDORevisionKey> getChangedObjects()
{
return changedObjects;
}
+ @Override
public List<CDOIDAndVersion> getDetachedObjects()
{
return detachedObjects;
}
+ @Override
public synchronized Map<CDOID, CDOChangeKind> getChangeKinds()
{
if (changeKindCache == null)
@@ -202,6 +209,7 @@ public class CDOChangeSetDataImpl implements CDOChangeSetData
return changeKindCache;
}
+ @Override
public CDOChangeKind getChangeKind(CDOID id)
{
return getChangeKinds().get(id);
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOChangeSetImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOChangeSetImpl.java
index c8f4784ef4..411a51e0e6 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOChangeSetImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOChangeSetImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2012 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2010-2012, 2019 Eike Stepper (Loehne, Germany) 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
@@ -31,16 +31,19 @@ public class CDOChangeSetImpl extends CDOChangeSetDataImpl implements CDOChangeS
this.endPoint = endPoint;
}
+ @Override
public CDOBranchPoint getStartPoint()
{
return startPoint;
}
+ @Override
public CDOBranchPoint getEndPoint()
{
return endPoint;
}
+ @Override
public CDOBranchPoint getAncestorPoint()
{
return CDOBranchUtil.getAncestor(startPoint, endPoint);
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitDataImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitDataImpl.java
index c7e8242988..bbf3357f07 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitDataImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitDataImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2013, 2015, 2016 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2010-2013, 2015, 2016, 2019 Eike Stepper (Loehne, Germany) 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
@@ -32,6 +32,7 @@ public class CDOCommitDataImpl extends CDOChangeSetDataImpl implements CDOCommit
this.newPackageUnits = newPackageUnits;
}
+ @Override
public List<CDOPackageUnit> getNewPackageUnits()
{
return newPackageUnits;
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitHistoryImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitHistoryImpl.java
index dc0983fae4..840a1deb64 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitHistoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitHistoryImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2015, 2016 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2012, 2015, 2016, 2019 Eike Stepper (Loehne, Germany) 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
@@ -70,16 +70,19 @@ public class CDOCommitHistoryImpl extends Container<CDOCommitInfo> implements CD
this.branch = branch;
}
+ @Override
public final CDOCommitInfoManager getManager()
{
return manager;
}
+ @Override
public final CDOBranch getBranch()
{
return branch;
}
+ @Override
public final int getLoadCount()
{
synchronized (loadLock)
@@ -88,6 +91,7 @@ public class CDOCommitHistoryImpl extends Container<CDOCommitInfo> implements CD
}
}
+ @Override
public final void setLoadCount(int loadCount)
{
synchronized (loadLock)
@@ -96,6 +100,7 @@ public class CDOCommitHistoryImpl extends Container<CDOCommitInfo> implements CD
}
}
+ @Override
public final boolean isAppendingTriggerLoadElement()
{
synchronized (loadLock)
@@ -104,6 +109,7 @@ public class CDOCommitHistoryImpl extends Container<CDOCommitInfo> implements CD
}
}
+ @Override
public final void setAppendingTriggerLoadElement(boolean appendingTriggerLoadElement)
{
int event = 0;
@@ -140,6 +146,7 @@ public class CDOCommitHistoryImpl extends Container<CDOCommitInfo> implements CD
}
}
+ @Override
public final CDOCommitInfo getFirstElement()
{
checkActive();
@@ -164,6 +171,7 @@ public class CDOCommitHistoryImpl extends Container<CDOCommitInfo> implements CD
}
}
+ @Override
public final CDOCommitInfo getLastElement()
{
checkActive();
@@ -188,6 +196,7 @@ public class CDOCommitHistoryImpl extends Container<CDOCommitInfo> implements CD
}
}
+ @Override
public final CDOCommitInfo getElement(int index)
{
checkActive();
@@ -207,6 +216,7 @@ public class CDOCommitHistoryImpl extends Container<CDOCommitInfo> implements CD
}
}
+ @Override
public final CDOCommitInfo[] getElements()
{
checkActive();
@@ -241,6 +251,7 @@ public class CDOCommitHistoryImpl extends Container<CDOCommitInfo> implements CD
}
}
+ @Override
public final int size()
{
checkActive();
@@ -291,6 +302,7 @@ public class CDOCommitHistoryImpl extends Container<CDOCommitInfo> implements CD
}
}
+ @Override
public final boolean isFull()
{
synchronized (loadLock)
@@ -299,6 +311,7 @@ public class CDOCommitHistoryImpl extends Container<CDOCommitInfo> implements CD
}
}
+ @Override
public final boolean isLoading()
{
synchronized (loadLock)
@@ -307,6 +320,7 @@ public class CDOCommitHistoryImpl extends Container<CDOCommitInfo> implements CD
}
}
+ @Override
public final void waitWhileLoading(long timeout)
{
long end = System.currentTimeMillis() + timeout;
@@ -333,6 +347,7 @@ public class CDOCommitHistoryImpl extends Container<CDOCommitInfo> implements CD
}
}
+ @Override
public final void handleCommitInfo(CDOCommitInfo commitInfo)
{
synchronized (loadLock)
@@ -355,11 +370,13 @@ public class CDOCommitHistoryImpl extends Container<CDOCommitInfo> implements CD
}
}
+ @Override
public final boolean triggerLoad()
{
return triggerLoad(null);
}
+ @Override
public final boolean triggerLoad(final CDOCommitInfoHandler handler)
{
synchronized (loadLock)
@@ -448,6 +465,7 @@ public class CDOCommitHistoryImpl extends Container<CDOCommitInfo> implements CD
manager.getCommitInfos(branch, timeStamp, null, null, -loadCount, new CDOCommitInfoHandler()
{
+ @Override
public void handleCommitInfo(CDOCommitInfo commitInfo)
{
++loaded[0];
@@ -628,105 +646,126 @@ public class CDOCommitHistoryImpl extends Container<CDOCommitInfo> implements CD
*/
private final class TriggerLoadElementImpl implements TriggerLoadElement
{
+ @Override
public CDOCommitHistory getHistory()
{
return CDOCommitHistoryImpl.this;
}
+ @Override
public CDOCommitInfoManager getCommitInfoManager()
{
return manager;
}
+ @Override
public CDOBranch getBranch()
{
return null;
}
+ @Override
public long getTimeStamp()
{
return CDOBranchPoint.UNSPECIFIED_DATE;
}
+ @Override
public long getPreviousTimeStamp()
{
return CDOBranchPoint.UNSPECIFIED_DATE;
}
+ @Override
public CDOCommitInfo getPreviousCommitInfo()
{
return null;
}
+ @Override
public String getUserID()
{
return null;
}
+ @Override
public String getComment()
{
return "Load more history elements";
}
+ @Override
public CDOBranchPoint getMergeSource()
{
return null;
}
+ @Override
public CDOCommitInfo getMergedCommitInfo()
{
return null;
}
+ @Override
public boolean isEmpty()
{
return true;
}
+ @Override
public boolean isInitialCommit()
{
return false;
}
+ @Override
public boolean isCommitDataLoaded()
{
return true;
}
+ @Override
public List<CDOPackageUnit> getNewPackageUnits()
{
return null;
}
+ @Override
public List<CDOIDAndVersion> getNewObjects()
{
return null;
}
+ @Override
public List<CDORevisionKey> getChangedObjects()
{
return null;
}
+ @Override
public List<CDOIDAndVersion> getDetachedObjects()
{
return null;
}
+ @Override
public Map<CDOID, CDOChangeKind> getChangeKinds()
{
return null;
}
+ @Override
public CDOChangeKind getChangeKind(CDOID id)
{
return null;
}
+ @Override
public void merge(CDOChangeSetData changeSetData)
{
}
+ @Override
public CDOChangeSetData copy()
{
return null;
@@ -738,82 +777,99 @@ public class CDOCommitHistoryImpl extends Container<CDOCommitInfo> implements CD
*/
public static final class Empty extends Container<CDOCommitInfo> implements CDOCommitHistory
{
+ @Override
public CDOCommitInfo[] getElements()
{
return NO_ELEMENTS;
}
+ @Override
public void handleCommitInfo(CDOCommitInfo commitInfo)
{
}
+ @Override
public CDOCommitInfoManager getManager()
{
return null;
}
+ @Override
public CDOBranch getBranch()
{
return null;
}
+ @Override
public boolean isAppendingTriggerLoadElement()
{
return false;
}
+ @Override
public void setAppendingTriggerLoadElement(boolean appendingTriggerLoadElement)
{
}
+ @Override
public CDOCommitInfo getFirstElement()
{
return null;
}
+ @Override
public CDOCommitInfo getLastElement()
{
return null;
}
+ @Override
public CDOCommitInfo getElement(int index)
{
return null;
}
+ @Override
public int size()
{
return 0;
}
+ @Override
public boolean isLoading()
{
return false;
}
+ @Override
public void waitWhileLoading(long timeout)
{
}
+ @Override
public int getLoadCount()
{
return 0;
}
+ @Override
public void setLoadCount(int loadCount)
{
}
+ @Override
public boolean triggerLoad()
{
return false;
}
+ @Override
public boolean triggerLoad(CDOCommitInfoHandler handler)
{
return false;
}
+ @Override
public boolean isFull()
{
return true;
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitHistoryProviderImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitHistoryProviderImpl.java
index 2085f9d761..7ef1336d4c 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitHistoryProviderImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitHistoryProviderImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2015, 2016 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2012, 2015, 2016, 2019 Eike Stepper (Loehne, Germany) 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
@@ -49,11 +49,13 @@ public abstract class CDOCommitHistoryProviderImpl<KEY, HISTORY extends CDOCommi
{
}
+ @Override
public CDOCommitHistory getHistory()
{
return getHistory(null);
}
+ @Override
public HISTORY getHistory(KEY key)
{
synchronized (histories)
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitInfoImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitInfoImpl.java
index d3a094a163..ae07d13592 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitInfoImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitInfoImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2013, 2015, 2016 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2010-2013, 2015, 2016, 2019 Eike Stepper (Loehne, Germany) 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
@@ -72,6 +72,7 @@ public class CDOCommitInfoImpl extends CDOBranchPointImpl implements CDOCommitIn
this.commitData = commitData;
}
+ @Override
public InternalCDOCommitInfoManager getCommitInfoManager()
{
return commitInfoManager;
@@ -95,31 +96,37 @@ public class CDOCommitInfoImpl extends CDOBranchPointImpl implements CDOCommitIn
// return parents;
// }
+ @Override
public long getPreviousTimeStamp()
{
return previousTimeStamp;
}
+ @Override
public CDOCommitInfo getPreviousCommitInfo()
{
return previousTimeStamp == CDOBranchPoint.UNSPECIFIED_DATE ? null : commitInfoManager.getCommitInfo(previousTimeStamp);
}
+ @Override
public String getUserID()
{
return userID;
}
+ @Override
public String getComment()
{
return comment;
}
+ @Override
public CDOBranchPoint getMergeSource()
{
return mergeSource;
}
+ @Override
public CDOCommitInfo getMergedCommitInfo()
{
if (mergeSource == null)
@@ -135,64 +142,75 @@ public class CDOCommitInfoImpl extends CDOBranchPointImpl implements CDOCommitIn
return mergedCommitInfo;
}
+ @Override
public boolean isInitialCommit()
{
return CDOCommonUtil.SYSTEM_USER_ID.equals(userID);
}
+ @Override
public boolean isEmpty()
{
loadCommitDataIfNeeded();
return commitData.isEmpty();
}
+ @Override
public CDOChangeSetData copy()
{
return commitData == null ? null : commitData.copy();
}
+ @Override
public void merge(CDOChangeSetData changeSetData)
{
loadCommitDataIfNeeded();
commitData.merge(changeSetData);
}
+ @Override
public synchronized List<CDOPackageUnit> getNewPackageUnits()
{
loadCommitDataIfNeeded();
return commitData.getNewPackageUnits();
}
+ @Override
public synchronized List<CDOIDAndVersion> getNewObjects()
{
loadCommitDataIfNeeded();
return commitData.getNewObjects();
}
+ @Override
public synchronized List<CDORevisionKey> getChangedObjects()
{
loadCommitDataIfNeeded();
return commitData.getChangedObjects();
}
+ @Override
public synchronized List<CDOIDAndVersion> getDetachedObjects()
{
loadCommitDataIfNeeded();
return commitData.getDetachedObjects();
}
+ @Override
public Map<CDOID, CDOChangeKind> getChangeKinds()
{
loadCommitDataIfNeeded();
return commitData.getChangeKinds();
}
+ @Override
public CDOChangeKind getChangeKind(CDOID id)
{
loadCommitDataIfNeeded();
return commitData.getChangeKind(id);
}
+ @Override
@SuppressWarnings({ "unchecked", "rawtypes" })
public Object getAdapter(Class adapter)
{
@@ -203,6 +221,7 @@ public class CDOCommitInfoImpl extends CDOBranchPointImpl implements CDOCommitIn
{
return new CDOBranchCreationContext()
{
+ @Override
public CDOBranchPoint getBase()
{
return CDOCommitInfoImpl.this;
@@ -274,6 +293,7 @@ public class CDOCommitInfoImpl extends CDOBranchPointImpl implements CDOCommitIn
commitInfo.getUserID(), commitInfo.getComment(), commitInfo.getMergeSource(), data);
}
+ @Override
public synchronized boolean isCommitDataLoaded()
{
return commitData != null;
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitInfoManagerImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitInfoManagerImpl.java
index 62f3b0d25d..f7099f69d8 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitInfoManagerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitInfoManagerImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2013, 2015, 2016 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2010-2013, 2015, 2016, 2019 Eike Stepper (Loehne, Germany) 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
@@ -61,28 +61,33 @@ public class CDOCommitInfoManagerImpl extends CDOCommitHistoryProviderImpl<CDOBr
}
}
+ @Override
public CDOCommonRepository getRepository()
{
return repository;
}
+ @Override
public void setRepository(CDOCommonRepository repository)
{
checkInactive();
this.repository = repository;
}
+ @Override
public CommitInfoLoader getCommitInfoLoader()
{
return loader;
}
+ @Override
public void setCommitInfoLoader(CommitInfoLoader commitInfoLoader)
{
checkInactive();
loader = commitInfoLoader;
}
+ @Override
public CDOCommitInfoHandler[] getCommitInfoHandlers()
{
synchronized (handlers)
@@ -94,6 +99,7 @@ public class CDOCommitInfoManagerImpl extends CDOCommitHistoryProviderImpl<CDOBr
/**
* @since 4.0
*/
+ @Override
public void addCommitInfoHandler(CDOCommitInfoHandler handler)
{
synchronized (handlers)
@@ -105,6 +111,7 @@ public class CDOCommitInfoManagerImpl extends CDOCommitHistoryProviderImpl<CDOBr
/**
* @since 4.0
*/
+ @Override
public void removeCommitInfoHandler(CDOCommitInfoHandler handler)
{
synchronized (handlers)
@@ -113,6 +120,7 @@ public class CDOCommitInfoManagerImpl extends CDOCommitHistoryProviderImpl<CDOBr
}
}
+ @Override
public void notifyCommitInfoHandlers(CDOCommitInfo commitInfo)
{
for (CDOCommitInfoHandler handler : getCommitInfoHandlers())
@@ -128,11 +136,13 @@ public class CDOCommitInfoManagerImpl extends CDOCommitHistoryProviderImpl<CDOBr
}
}
+ @Override
public CDOCommitInfo createCommitInfo(CDOBranch branch, long timeStamp, long previousTimeStamp, String userID, String comment, CDOCommitData commitData)
{
return createCommitInfo(branch, timeStamp, previousTimeStamp, userID, comment, null, commitData);
}
+ @Override
public CDOCommitInfo createCommitInfo(CDOBranch branch, long timeStamp, long previousTimeStamp, String userID, String comment, CDOBranchPoint mergeSource,
CDOCommitData commitData)
{
@@ -141,11 +151,13 @@ public class CDOCommitInfoManagerImpl extends CDOCommitHistoryProviderImpl<CDOBr
return intern(commitInfo);
}
+ @Override
public CDOCommitInfo getCommitInfo(long timeStamp)
{
return getCommitInfo(timeStamp, true);
}
+ @Override
public CDOCommitInfo getCommitInfo(long timeStamp, boolean loadOnDemand)
{
checkActive();
@@ -168,6 +180,7 @@ public class CDOCommitInfoManagerImpl extends CDOCommitHistoryProviderImpl<CDOBr
{
getCommitInfos(null, timeStamp, timeStamp, new CDOCommitInfoHandler()
{
+ @Override
public void handleCommitInfo(CDOCommitInfo commitInfo)
{
result[0] = commitInfo;
@@ -178,6 +191,7 @@ public class CDOCommitInfoManagerImpl extends CDOCommitHistoryProviderImpl<CDOBr
return result[0];
}
+ @Override
public CDOCommitInfo getCommitInfo(CDOBranch branch, long startTime, boolean up)
{
checkActive();
@@ -186,6 +200,7 @@ public class CDOCommitInfoManagerImpl extends CDOCommitHistoryProviderImpl<CDOBr
final CDOCommitInfo[] result = { null };
getCommitInfos(branch, startTime, null, null, count, new CDOCommitInfoHandler()
{
+ @Override
public void handleCommitInfo(CDOCommitInfo commitInfo)
{
result[0] = commitInfo;
@@ -195,6 +210,7 @@ public class CDOCommitInfoManagerImpl extends CDOCommitHistoryProviderImpl<CDOBr
return result[0];
}
+ @Override
public void getCommitInfos(CDOBranch branch, long startTime, long endTime, CDOCommitInfoHandler handler)
{
checkActive();
@@ -203,6 +219,7 @@ public class CDOCommitInfoManagerImpl extends CDOCommitHistoryProviderImpl<CDOBr
final CDOCommitInfoHandler delegate = handler;
handler = new CDOCommitInfoHandler()
{
+ @Override
public void handleCommitInfo(CDOCommitInfo commitInfo)
{
delegate.handleCommitInfo(intern(commitInfo));
@@ -213,6 +230,7 @@ public class CDOCommitInfoManagerImpl extends CDOCommitHistoryProviderImpl<CDOBr
loader.loadCommitInfos(branch, startTime, endTime, handler);
}
+ @Override
public void getCommitInfos(CDOBranch branch, long startTime, String reserved1, String reserved2, int count, CDOCommitInfoHandler handler)
{
if (reserved1 != null || reserved2 != null)
@@ -224,6 +242,7 @@ public class CDOCommitInfoManagerImpl extends CDOCommitHistoryProviderImpl<CDOBr
getCommitInfos(branch, startTime, endTime, handler);
}
+ @Override
public CDOCommitInfo getBaseOfBranch(CDOBranch branch)
{
if (branch.isMainBranch())
@@ -242,6 +261,7 @@ public class CDOCommitInfoManagerImpl extends CDOCommitHistoryProviderImpl<CDOBr
return base;
}
+ @Override
public CDOCommitInfo getFirstOfBranch(CDOBranch branch)
{
BranchInfoCache infoCache = getBranchInfoCache(branch, true);
@@ -255,6 +275,7 @@ public class CDOCommitInfoManagerImpl extends CDOCommitHistoryProviderImpl<CDOBr
return first;
}
+ @Override
public CDOCommitInfo getLastOfBranch(CDOBranch branch)
{
BranchInfoCache infoCache = getBranchInfoCache(branch, true);
@@ -268,6 +289,7 @@ public class CDOCommitInfoManagerImpl extends CDOCommitHistoryProviderImpl<CDOBr
return last;
}
+ @Override
public long getLastCommitOfBranch(CDOBranch branch, boolean loadOnDemand)
{
if (branch == null)
@@ -292,6 +314,7 @@ public class CDOCommitInfoManagerImpl extends CDOCommitHistoryProviderImpl<CDOBr
return CDOBranchPoint.UNSPECIFIED_DATE;
}
+ @Override
public void setLastCommitOfBranch(CDOBranch branch, long lastCommit)
{
if (branch != null)
@@ -303,6 +326,7 @@ public class CDOCommitInfoManagerImpl extends CDOCommitHistoryProviderImpl<CDOBr
setLastCommit(lastCommit);
}
+ @Override
public long getLastCommit()
{
return lastCommit;
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/DelegatingCommitInfo.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/DelegatingCommitInfo.java
index 90405b7798..bbb00e6a32 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/DelegatingCommitInfo.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/DelegatingCommitInfo.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2013, 2016 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2010-2013, 2016, 2019 Eike Stepper (Loehne, Germany) 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
@@ -35,101 +35,121 @@ public abstract class DelegatingCommitInfo implements CDOCommitInfo
protected abstract CDOCommitInfo getDelegate();
+ @Override
public CDOBranch getBranch()
{
return getDelegate().getBranch();
}
+ @Override
public CDOCommitInfoManager getCommitInfoManager()
{
return getDelegate().getCommitInfoManager();
}
+ @Override
public long getPreviousTimeStamp()
{
return getDelegate().getPreviousTimeStamp();
}
+ @Override
public CDOCommitInfo getPreviousCommitInfo()
{
return getDelegate().getPreviousCommitInfo();
}
+ @Override
public long getTimeStamp()
{
return getDelegate().getTimeStamp();
}
+ @Override
public String getUserID()
{
return getDelegate().getUserID();
}
+ @Override
public String getComment()
{
return getDelegate().getComment();
}
+ @Override
public CDOBranchPoint getMergeSource()
{
return getDelegate().getMergeSource();
}
+ @Override
public CDOCommitInfo getMergedCommitInfo()
{
return getDelegate().getMergedCommitInfo();
}
+ @Override
public boolean isEmpty()
{
return getDelegate().isEmpty();
}
+ @Override
public boolean isInitialCommit()
{
return getDelegate().isInitialCommit();
}
+ @Override
public boolean isCommitDataLoaded()
{
return getDelegate().isCommitDataLoaded();
}
+ @Override
public List<CDOPackageUnit> getNewPackageUnits()
{
return getDelegate().getNewPackageUnits();
}
+ @Override
public List<CDOIDAndVersion> getNewObjects()
{
return getDelegate().getNewObjects();
}
+ @Override
public List<CDORevisionKey> getChangedObjects()
{
return getDelegate().getChangedObjects();
}
+ @Override
public List<CDOIDAndVersion> getDetachedObjects()
{
return getDelegate().getDetachedObjects();
}
+ @Override
public Map<CDOID, CDOChangeKind> getChangeKinds()
{
return getDelegate().getChangeKinds();
}
+ @Override
public CDOChangeKind getChangeKind(CDOID id)
{
return getDelegate().getChangeKind(id);
}
+ @Override
public CDOChangeSetData copy()
{
return getDelegate().copy();
}
+ @Override
public void merge(CDOChangeSetData changeSetData)
{
getDelegate().merge(changeSetData);
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/FailureCommitInfo.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/FailureCommitInfo.java
index b40e3c531d..c88fad99b4 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/FailureCommitInfo.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/FailureCommitInfo.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, 2016 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2011, 2012, 2016, 2019 Eike Stepper (Loehne, Germany) 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
@@ -44,101 +44,121 @@ public class FailureCommitInfo implements CDOCommitInfo
this.previousTimeStamp = previousTimeStamp;
}
+ @Override
public CDOCommitInfoManager getCommitInfoManager()
{
return commitInfoManager;
}
+ @Override
public long getTimeStamp()
{
return timeStamp;
}
+ @Override
public long getPreviousTimeStamp()
{
return previousTimeStamp;
}
+ @Override
public CDOCommitInfo getPreviousCommitInfo()
{
return previousTimeStamp == CDOBranchPoint.UNSPECIFIED_DATE ? null : commitInfoManager.getCommitInfo(previousTimeStamp);
}
+ @Override
public CDOBranch getBranch()
{
return null;
}
+ @Override
public String getUserID()
{
return null;
}
+ @Override
public String getComment()
{
return null;
}
+ @Override
public CDOBranchPoint getMergeSource()
{
return null;
}
+ @Override
public CDOCommitInfo getMergedCommitInfo()
{
return null;
}
+ @Override
public boolean isEmpty()
{
return true;
}
+ @Override
public boolean isInitialCommit()
{
return false;
}
+ @Override
public boolean isCommitDataLoaded()
{
return true;
}
+ @Override
public List<CDOPackageUnit> getNewPackageUnits()
{
return Collections.emptyList();
}
+ @Override
public List<CDOIDAndVersion> getNewObjects()
{
return Collections.emptyList();
}
+ @Override
public List<CDORevisionKey> getChangedObjects()
{
return Collections.emptyList();
}
+ @Override
public List<CDOIDAndVersion> getDetachedObjects()
{
return Collections.emptyList();
}
+ @Override
public Map<CDOID, CDOChangeKind> getChangeKinds()
{
return Collections.emptyMap();
}
+ @Override
public CDOChangeKind getChangeKind(CDOID id)
{
return null;
}
+ @Override
public CDOChangeSetData copy()
{
return this;
}
+ @Override
public void merge(CDOChangeSetData changeSetData)
{
throw new UnsupportedOperationException();
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDExternalImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDExternalImpl.java
index 3d21c3005b..fca7443f47 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDExternalImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDExternalImpl.java
@@ -59,36 +59,43 @@ public final class CDOIDExternalImpl extends AbstractCDOID implements CDOIDExter
out.writeString(uri);
}
+ @Override
public String toURIFragment()
{
return uri;
}
+ @Override
public String getURI()
{
return uri;
}
+ @Override
public String getStringValue()
{
return uri;
}
+ @Override
public Type getType()
{
return Type.EXTERNAL_OBJECT;
}
+ @Override
public boolean isExternal()
{
return true;
}
+ @Override
public boolean isObject()
{
return true;
}
+ @Override
public boolean isTemporary()
{
return false;
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDNilImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDNilImpl.java
index 2e939519fe..1ee351d619 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDNilImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDNilImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2018, 2019 Eike Stepper (Loehne, Germany) 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
@@ -48,16 +48,19 @@ public final class CDOIDNilImpl extends AbstractCDOID implements CDOIDTemp, CDOI
// Do nothing
}
+ @Override
public String toURIFragment()
{
return "NIL"; //$NON-NLS-1$
}
+ @Override
public Type getType()
{
return Type.NIL;
}
+ @Override
public boolean isExternal()
{
return false;
@@ -75,11 +78,13 @@ public final class CDOIDNilImpl extends AbstractCDOID implements CDOIDTemp, CDOI
return true;
}
+ @Override
public boolean isObject()
{
return false;
}
+ @Override
public boolean isTemporary()
{
return false;
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDNullImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDNullImpl.java
index 4349c390b4..4a50dba69e 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDNullImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDNullImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008-2013 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2008-2013, 2019 Eike Stepper (Loehne, Germany) 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
@@ -50,16 +50,19 @@ public final class CDOIDNullImpl extends AbstractCDOID implements CDOIDTemp, CDO
// Do nothing
}
+ @Override
public String toURIFragment()
{
return "NULL"; //$NON-NLS-1$
}
+ @Override
public Type getType()
{
return Type.NULL;
}
+ @Override
public boolean isExternal()
{
return false;
@@ -71,11 +74,13 @@ public final class CDOIDNullImpl extends AbstractCDOID implements CDOIDTemp, CDO
return true;
}
+ @Override
public boolean isObject()
{
return false;
}
+ @Override
public boolean isTemporary()
{
return false;
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectLongImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectLongImpl.java
index 987409437c..c0a0b955b6 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectLongImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectLongImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009-2013, 2017 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2009-2013, 2017, 2019 Eike Stepper (Loehne, Germany) 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
@@ -61,26 +61,31 @@ public final class CDOIDObjectLongImpl extends AbstractCDOID implements Internal
out.writeXLong(value);
}
+ @Override
public String toURIFragment()
{
return String.valueOf(value);
}
+ @Override
public Type getType()
{
return Type.OBJECT;
}
+ @Override
public boolean isExternal()
{
return false;
}
+ @Override
public boolean isObject()
{
return true;
}
+ @Override
public boolean isTemporary()
{
return false;
@@ -89,6 +94,7 @@ public final class CDOIDObjectLongImpl extends AbstractCDOID implements Internal
/**
* @since 3.0
*/
+ @Override
public CDOID.ObjectType getSubType()
{
return CDOID.ObjectType.LONG;
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectLongWithClassifierImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectLongWithClassifierImpl.java
index 2293d93e61..3cf9776a00 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectLongWithClassifierImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectLongWithClassifierImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009-2013, 2015-2017 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2009-2013, 2015-2017, 2019 Eike Stepper (Loehne, Germany) 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
@@ -61,6 +61,7 @@ public final class CDOIDObjectLongWithClassifierImpl extends AbstractCDOID imple
return value;
}
+ @Override
public CDOClassifierRef getClassifierRef()
{
return classifierRef;
@@ -73,31 +74,37 @@ public final class CDOIDObjectLongWithClassifierImpl extends AbstractCDOID imple
out.writeCDOClassifierRef(classifierRef);
}
+ @Override
public String toURIFragment()
{
return classifierRef.getPackageURI() + CDOClassifierRef.URI_SEPARATOR + classifierRef.getClassifierName() + CDOClassifierRef.URI_SEPARATOR + value;
}
+ @Override
public Type getType()
{
return Type.OBJECT;
}
+ @Override
public CDOID.ObjectType getSubType()
{
return CDOID.ObjectType.LONG_WITH_CLASSIFIER;
}
+ @Override
public boolean isExternal()
{
return false;
}
+ @Override
public boolean isObject()
{
return true;
}
+ @Override
public boolean isTemporary()
{
return false;
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectStringImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectStringImpl.java
index 2c2be27323..3e78cad52d 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectStringImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectStringImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009-2013 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2009-2013, 2019 Eike Stepper (Loehne, Germany) 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
@@ -56,36 +56,43 @@ public final class CDOIDObjectStringImpl extends AbstractCDOID implements Intern
out.writeString(value);
}
+ @Override
public String toURIFragment()
{
return value;
}
+ @Override
public String getStringValue()
{
return value;
}
+ @Override
public Type getType()
{
return Type.OBJECT;
}
+ @Override
public CDOID.ObjectType getSubType()
{
return CDOID.ObjectType.STRING;
}
+ @Override
public boolean isExternal()
{
return false;
}
+ @Override
public boolean isObject()
{
return true;
}
+ @Override
public boolean isTemporary()
{
return false;
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectStringWithClassifierImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectStringWithClassifierImpl.java
index 2403bec0a4..09e175c213 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectStringWithClassifierImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectStringWithClassifierImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009-2013, 2015, 2016 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2009-2013, 2015, 2016, 2019 Eike Stepper (Loehne, Germany) 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
@@ -56,11 +56,13 @@ public final class CDOIDObjectStringWithClassifierImpl extends AbstractCDOID imp
classifierRef = null;
}
+ @Override
public String getStringValue()
{
return value;
}
+ @Override
public CDOClassifierRef getClassifierRef()
{
return classifierRef;
@@ -73,31 +75,37 @@ public final class CDOIDObjectStringWithClassifierImpl extends AbstractCDOID imp
out.writeCDOClassifierRef(classifierRef);
}
+ @Override
public String toURIFragment()
{
return classifierRef.getPackageURI() + CDOClassifierRef.URI_SEPARATOR + classifierRef.getClassifierName() + CDOClassifierRef.URI_SEPARATOR + value;
}
+ @Override
public Type getType()
{
return Type.OBJECT;
}
+ @Override
public CDOID.ObjectType getSubType()
{
return CDOID.ObjectType.STRING_WITH_CLASSIFIER;
}
+ @Override
public boolean isExternal()
{
return false;
}
+ @Override
public boolean isObject()
{
return true;
}
+ @Override
public boolean isTemporary()
{
return false;
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectUUIDImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectUUIDImpl.java
index 8a52405f76..6a036ce475 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectUUIDImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectUUIDImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2013 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2010-2013, 2019 Eike Stepper (Loehne, Germany) 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
@@ -63,31 +63,37 @@ public final class CDOIDObjectUUIDImpl extends AbstractCDOID implements Internal
out.writeByteArray(value);
}
+ @Override
public String toURIFragment()
{
return CDOIDUtil.encodeUUID(value);
}
+ @Override
public Type getType()
{
return Type.OBJECT;
}
+ @Override
public CDOID.ObjectType getSubType()
{
return CDOID.ObjectType.UUID;
}
+ @Override
public boolean isExternal()
{
return false;
}
+ @Override
public boolean isObject()
{
return true;
}
+ @Override
public boolean isTemporary()
{
return false;
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDTempObjectExternalImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDTempObjectExternalImpl.java
index 9e21650686..d3fa22411b 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDTempObjectExternalImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDTempObjectExternalImpl.java
@@ -56,36 +56,43 @@ public final class CDOIDTempObjectExternalImpl extends AbstractCDOID implements
out.writeString(uri);
}
+ @Override
public String toURIFragment()
{
return uri;
}
+ @Override
public String getURI()
{
return uri;
}
+ @Override
public String getStringValue()
{
return uri;
}
+ @Override
public Type getType()
{
return Type.EXTERNAL_TEMP_OBJECT;
}
+ @Override
public boolean isExternal()
{
return true;
}
+ @Override
public boolean isObject()
{
return true;
}
+ @Override
public boolean isTemporary()
{
return true;
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDTempObjectImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDTempObjectImpl.java
index 00bbfec7a0..1c6b0af494 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDTempObjectImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDTempObjectImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008-2013, 2017 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2008-2013, 2017, 2019 Eike Stepper (Loehne, Germany) 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
@@ -60,26 +60,31 @@ public final class CDOIDTempObjectImpl extends AbstractCDOID implements CDOIDTem
out.writeXInt(value);
}
+ @Override
public String toURIFragment()
{
return String.valueOf(value);
}
+ @Override
public Type getType()
{
return Type.TEMP_OBJECT;
}
+ @Override
public boolean isExternal()
{
return false;
}
+ @Override
public boolean isObject()
{
return true;
}
+ @Override
public boolean isTemporary()
{
return true;
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/lock/CDOLockAreaImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/lock/CDOLockAreaImpl.java
index 15bc0dd4e7..6c1f2faba5 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/lock/CDOLockAreaImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/lock/CDOLockAreaImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, 2015, 2016 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2011, 2012, 2015, 2016, 2019 Eike Stepper (Loehne, Germany) 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
@@ -61,31 +61,37 @@ public class CDOLockAreaImpl implements LockArea
missing = true;
}
+ @Override
public String getDurableLockingID()
{
return durableLockingID;
}
+ @Override
public String getUserID()
{
return userID;
}
+ @Override
public CDOBranch getBranch()
{
return branchPoint.getBranch();
}
+ @Override
public long getTimeStamp()
{
return branchPoint.getTimeStamp();
}
+ @Override
public boolean isReadOnly()
{
return readOnly;
}
+ @Override
public Map<CDOID, LockGrade> getLocks()
{
return locks;
@@ -98,6 +104,7 @@ public class CDOLockAreaImpl implements LockArea
locks);
}
+ @Override
public boolean isMissing()
{
return missing;
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/lock/CDOLockChangeInfoImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/lock/CDOLockChangeInfoImpl.java
index 541b5fec30..eebeaee2fe 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/lock/CDOLockChangeInfoImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/lock/CDOLockChangeInfoImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, 2014, 2016 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2011, 2012, 2014, 2016, 2019 Eike Stepper (Loehne, Germany) 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
@@ -58,6 +58,7 @@ public final class CDOLockChangeInfoImpl implements CDOLockChangeInfo, CDOBranch
isInvalidateAll = true;
}
+ @Override
public void adjustBranches(CDOBranchManager newBranchManager)
{
if (branchPoint != null)
@@ -71,36 +72,43 @@ public final class CDOLockChangeInfoImpl implements CDOLockChangeInfo, CDOBranch
}
}
+ @Override
public CDOBranch getBranch()
{
return branchPoint == null ? null : branchPoint.getBranch();
}
+ @Override
public long getTimeStamp()
{
return branchPoint == null ? CDOBranchPoint.UNSPECIFIED_DATE : branchPoint.getTimeStamp();
}
+ @Override
public Operation getOperation()
{
return operation;
}
+ @Override
public LockType getLockType()
{
return lockType;
}
+ @Override
public CDOLockOwner getLockOwner()
{
return lockOwner;
}
+ @Override
public CDOLockState[] getLockStates()
{
return lockStates;
}
+ @Override
public boolean isInvalidateAll()
{
return isInvalidateAll;
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/lock/CDOLockOwnerImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/lock/CDOLockOwnerImpl.java
index d95c624bfa..e6b7b14cec 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/lock/CDOLockOwnerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/lock/CDOLockOwnerImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, 2015 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2011, 2012, 2015, 2019 Eike Stepper (Loehne, Germany) 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
@@ -35,21 +35,25 @@ public class CDOLockOwnerImpl implements CDOLockOwner
this.isDurableView = isDurableView;
}
+ @Override
public int getSessionID()
{
return sessionID;
}
+ @Override
public int getViewID()
{
return viewID;
}
+ @Override
public String getDurableLockingID()
{
return durableLockingID;
}
+ @Override
public boolean isDurableView()
{
return isDurableView;
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/lock/CDOLockStateImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/lock/CDOLockStateImpl.java
index 12bbe3e6e8..7fa29cbf8f 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/lock/CDOLockStateImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/lock/CDOLockStateImpl.java
@@ -63,12 +63,14 @@ public class CDOLockStateImpl implements InternalCDOLockState
return newLockState;
}
+ @Override
@Deprecated
public void updateFrom(Object object, CDOLockState source)
{
updateFrom(source);
}
+ @Override
public void updateFrom(CDOLockState source)
{
Set<CDOLockOwner> owners = source.getReadLockOwners();
@@ -85,6 +87,7 @@ public class CDOLockStateImpl implements InternalCDOLockState
writeOptionOwner = source.getWriteOptionOwner();
}
+ @Override
public boolean isLocked(LockType lockType, CDOLockOwner lockOwner, boolean others)
{
if (lockedObject == null)
@@ -143,6 +146,7 @@ public class CDOLockStateImpl implements InternalCDOLockState
return writeOptionOwner.equals(by) ^ others;
}
+ @Override
public Set<CDOLockOwner> getReadLockOwners()
{
if (lockedObject == null || readLockOwners == null)
@@ -153,6 +157,7 @@ public class CDOLockStateImpl implements InternalCDOLockState
return Collections.unmodifiableSet(readLockOwners);
}
+ @Override
public void addReadLockOwner(CDOLockOwner lockOwner)
{
checkNotDisposed();
@@ -165,6 +170,7 @@ public class CDOLockStateImpl implements InternalCDOLockState
readLockOwners.add(lockOwner);
}
+ @Override
public boolean removeReadLockOwner(CDOLockOwner lockOwner)
{
checkNotDisposed();
@@ -183,28 +189,33 @@ public class CDOLockStateImpl implements InternalCDOLockState
return changed;
}
+ @Override
public CDOLockOwner getWriteLockOwner()
{
return writeLockOwner;
}
+ @Override
public void setWriteLockOwner(CDOLockOwner lockOwner)
{
checkNotDisposed();
writeLockOwner = lockOwner;
}
+ @Override
public CDOLockOwner getWriteOptionOwner()
{
return writeOptionOwner;
}
+ @Override
public void setWriteOptionOwner(CDOLockOwner lockOwner)
{
checkNotDisposed();
writeOptionOwner = lockOwner;
}
+ @Override
public boolean removeOwner(CDOLockOwner lockOwner)
{
boolean changed = removeReadLockOwner(lockOwner);
@@ -224,6 +235,7 @@ public class CDOLockStateImpl implements InternalCDOLockState
return changed;
}
+ @Override
public Object getLockedObject()
{
return lockedObject;
@@ -329,6 +341,7 @@ public class CDOLockStateImpl implements InternalCDOLockState
return builder.toString();
}
+ @Override
public void dispose()
{
readLockOwners = null;
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOClassInfoImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOClassInfoImpl.java
index 63cb4cbab3..58e8dfaf7d 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOClassInfoImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOClassInfoImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2011-2013, 2016, 2018 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2009, 2011-2013, 2016, 2018, 2019 Eike Stepper (Loehne, Germany) 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
@@ -92,6 +92,7 @@ public final class CDOClassInfoImpl implements InternalCDOClassInfo, Adapter.Int
{
}
+ @Override
public InternalCDORevision getRevisionForID(CDOID id)
{
if (id == null)
@@ -102,25 +103,30 @@ public final class CDOClassInfoImpl implements InternalCDOClassInfo, Adapter.Int
return new RevisionWithID(this, id);
}
+ @Override
public boolean isAdapterForType(Object type)
{
return type == CDOClassInfo.class;
}
+ @Override
public void notifyChanged(Notification notification)
{
}
+ @Override
public EClass getTarget()
{
return eClass;
}
+ @Override
public void setTarget(Notifier newTarget)
{
init((EClass)newTarget);
}
+ @Override
public void unsetTarget(Notifier oldTarget)
{
// pass. In particular, don't forget the EClass because it may still
@@ -128,64 +134,76 @@ public final class CDOClassInfoImpl implements InternalCDOClassInfo, Adapter.Int
// me as a descriptor of their class
}
+ @Override
public EClass getEClass()
{
return eClass;
}
+ @Override
public boolean isResource()
{
return CDOModelUtil.isResource(eClass);
}
+ @Override
public boolean isResourceFolder()
{
return CDOModelUtil.isResourceFolder(eClass);
}
+ @Override
public boolean isResourceNode()
{
return CDOModelUtil.isResourceNode(eClass);
}
+ @Override
public boolean isPersistent(int featureID)
{
return persistentBits.get(featureID);
}
+ @Override
public boolean isPersistent(EStructuralFeature feature)
{
int featureID = eClass.getFeatureID(feature);
return isPersistent(featureID);
}
+ @Override
public boolean hasPersistentOpposite(EStructuralFeature feature)
{
int featureID = eClass.getFeatureID(feature);
return persistentOppositeBits.get(featureID);
}
+ @Override
public EStructuralFeature[] getAllPersistentFeatures()
{
return allPersistentFeatures;
}
+ @Override
public EReference[] getAllPersistentReferences()
{
return allPersistentReferences;
}
+ @Override
public EStructuralFeature[] getAllPersistentContainments()
{
return allPersistentContainments;
}
+ @Override
public int getPersistentFeatureIndex(EStructuralFeature feature) throws IllegalArgumentException
{
int featureID = eClass.getFeatureID(feature);
return getPersistentFeatureIndex(featureID);
}
+ @Override
public int getPersistentFeatureIndex(int featureID) throws IllegalArgumentException
{
int index = persistentFeatureIndices[featureID];
@@ -197,32 +215,38 @@ public final class CDOClassInfoImpl implements InternalCDOClassInfo, Adapter.Int
return index;
}
+ @Override
public int getSettingsFeatureCount()
{
return settingsFeatureCount;
}
+ @Override
public int getSettingsFeatureIndex(int featureID)
{
return settingsFeatureIndices[featureID];
}
+ @Override
public int getTransientFeatureCount()
{
return transientFeatureCount;
}
+ @Override
public int getTransientFeatureIndex(int featureID)
{
return transientFeatureIndices[featureID];
}
+ @Override
public int getTransientFeatureIndex(EStructuralFeature feature)
{
int featureID = eClass.getFeatureID(feature);
return getTransientFeatureIndex(featureID);
}
+ @Override
public PersistenceFilter getPersistenceFilter(EStructuralFeature feature)
{
if (persistenceFilters == NO_FILTERS)
@@ -369,12 +393,14 @@ public final class CDOClassInfoImpl implements InternalCDOClassInfo, Adapter.Int
return false;
}
+ @Override
@Deprecated
public int getFeatureIndex(EStructuralFeature feature)
{
return getPersistentFeatureIndex(feature);
}
+ @Override
@Deprecated
public int getFeatureIndex(int featureID)
{
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOPackageInfoImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOPackageInfoImpl.java
index 902b57b4c3..8acb1a1cea 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOPackageInfoImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOPackageInfoImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009-2013, 2015 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2009-2013, 2015, 2019 Eike Stepper (Loehne, Germany) 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
@@ -48,36 +48,43 @@ public class CDOPackageInfoImpl implements InternalCDOPackageInfo
{
}
+ @Override
public InternalCDOPackageUnit getPackageUnit()
{
return packageUnit;
}
+ @Override
public void setPackageUnit(InternalCDOPackageUnit packageUnit)
{
this.packageUnit = packageUnit;
}
+ @Override
public String getPackageURI()
{
return packageURI;
}
+ @Override
public void setPackageURI(String packageURI)
{
this.packageURI = packageURI;
}
+ @Override
public String getParentURI()
{
return parentURI;
}
+ @Override
public void setParentURI(String parentURI)
{
this.parentURI = parentURI;
}
+ @Override
public void write(CDODataOutput out) throws IOException
{
if (TRACER.isEnabled())
@@ -89,6 +96,7 @@ public class CDOPackageInfoImpl implements InternalCDOPackageInfo
out.writeCDOPackageURI(parentURI);
}
+ @Override
public void read(CDODataInput in) throws IOException
{
packageURI = in.readCDOPackageURI();
@@ -99,6 +107,7 @@ public class CDOPackageInfoImpl implements InternalCDOPackageInfo
}
}
+ @Override
public InternalCDOPackageInfo copy()
{
InternalCDOPackageInfo packageInfo = (InternalCDOPackageInfo)CDOModelUtil.createPackageInfo();
@@ -108,16 +117,19 @@ public class CDOPackageInfoImpl implements InternalCDOPackageInfo
return packageInfo;
}
+ @Override
public EFactory getEFactory()
{
return getEPackage().getEFactoryInstance();
}
+ @Override
public EPackage getEPackage()
{
return getEPackage(true);
}
+ @Override
public EPackage getEPackage(boolean loadOnDemand)
{
if (ePackage == null && loadOnDemand)
@@ -128,31 +140,37 @@ public class CDOPackageInfoImpl implements InternalCDOPackageInfo
return ePackage;
}
+ @Override
public void setEPackage(EPackage ePackage)
{
this.ePackage = ePackage;
}
+ @Override
public boolean isCorePackage()
{
return CDOModelUtil.isCorePackage(getEPackage());
}
+ @Override
public boolean isResourcePackage()
{
return CDOModelUtil.isResourcePackage(getEPackage());
}
+ @Override
public boolean isTypePackage()
{
return CDOModelUtil.isTypesPackage(getEPackage());
}
+ @Override
public boolean isSystemPackage()
{
return CDOModelUtil.isSystemPackage(getEPackage());
}
+ @Override
public int compareTo(CDOPackageInfo o)
{
return getPackageURI().compareTo(o.getPackageURI());
@@ -168,6 +186,7 @@ public class CDOPackageInfoImpl implements InternalCDOPackageInfo
* @deprecated As of 4.2 CDOPackageInfos are no longer mapped through Adapters.
* @see InternalCDOPackageRegistry#registerPackageInfo(EPackage, InternalCDOPackageInfo)
*/
+ @Override
@Deprecated
public void notifyChanged(Notification notification)
{
@@ -178,6 +197,7 @@ public class CDOPackageInfoImpl implements InternalCDOPackageInfo
* @deprecated As of 4.2 CDOPackageInfos are no longer mapped through Adapters.
* @see InternalCDOPackageRegistry#registerPackageInfo(EPackage, InternalCDOPackageInfo)
*/
+ @Override
@Deprecated
public Notifier getTarget()
{
@@ -188,6 +208,7 @@ public class CDOPackageInfoImpl implements InternalCDOPackageInfo
* @deprecated As of 4.2 CDOPackageInfos are no longer mapped through Adapters.
* @see InternalCDOPackageRegistry#registerPackageInfo(EPackage, InternalCDOPackageInfo)
*/
+ @Override
@Deprecated
public void setTarget(Notifier newTarget)
{
@@ -198,6 +219,7 @@ public class CDOPackageInfoImpl implements InternalCDOPackageInfo
* @deprecated As of 4.2 CDOPackageInfos are no longer mapped through Adapters.
* @see InternalCDOPackageRegistry#registerPackageInfo(EPackage, InternalCDOPackageInfo)
*/
+ @Override
@Deprecated
public void unsetTarget(Notifier oldTarget)
{
@@ -208,6 +230,7 @@ public class CDOPackageInfoImpl implements InternalCDOPackageInfo
* @deprecated As of 4.2 CDOPackageInfos are no longer mapped through Adapters.
* @see InternalCDOPackageRegistry#registerPackageInfo(EPackage, InternalCDOPackageInfo)
*/
+ @Override
@Deprecated
public boolean isAdapterForType(Object type)
{
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOPackageRegistryImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOPackageRegistryImpl.java
index e59108fa5d..acecae98ea 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOPackageRegistryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOPackageRegistryImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009-2013, 2016 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2009-2013, 2016, 2019 Eike Stepper (Loehne, Germany) 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
@@ -90,31 +90,37 @@ public class CDOPackageRegistryImpl extends EPackageRegistryImpl implements Inte
{
}
+ @Override
public boolean isReplacingDescriptors()
{
return replacingDescriptors;
}
+ @Override
public void setReplacingDescriptors(boolean replacingDescriptors)
{
this.replacingDescriptors = replacingDescriptors;
}
+ @Override
public PackageProcessor getPackageProcessor()
{
return packageProcessor;
}
+ @Override
public void setPackageProcessor(PackageProcessor packageProcessor)
{
this.packageProcessor = packageProcessor;
}
+ @Override
public PackageLoader getPackageLoader()
{
return packageLoader;
}
+ @Override
public void setPackageLoader(PackageLoader packageLoader)
{
LifecycleUtil.checkInactive(this);
@@ -130,6 +136,7 @@ public class CDOPackageRegistryImpl extends EPackageRegistryImpl implements Inte
return super.get(key);
}
+ @Override
public synchronized Set<String> getAllKeys()
{
LifecycleUtil.checkActive(this);
@@ -150,6 +157,7 @@ public class CDOPackageRegistryImpl extends EPackageRegistryImpl implements Inte
return result;
}
+ @Override
public synchronized Object getWithDelegation(String nsURI, boolean resolve)
{
LifecycleUtil.checkActive(this);
@@ -172,6 +180,7 @@ public class CDOPackageRegistryImpl extends EPackageRegistryImpl implements Inte
return registry.get(nsURI);
}
+ @Override
public synchronized Object basicPut(String nsURI, Object value)
{
LifecycleUtil.checkActive(this);
@@ -240,12 +249,14 @@ public class CDOPackageRegistryImpl extends EPackageRegistryImpl implements Inte
return basicPut(nsURI, value);
}
+ @Override
public synchronized Object putEPackage(EPackage ePackage)
{
LifecycleUtil.checkActive(this);
return put(ePackage.getNsURI(), ePackage);
}
+ @Override
public synchronized void putPackageUnit(InternalCDOPackageUnit packageUnit)
{
LifecycleUtil.checkActive(this);
@@ -267,6 +278,7 @@ public class CDOPackageRegistryImpl extends EPackageRegistryImpl implements Inte
resetInternalCaches();
}
+ @Override
public synchronized void putPackageUnits(InternalCDOPackageUnit[] packageUnits, State state)
{
LifecycleUtil.checkActive(this);
@@ -281,12 +293,14 @@ public class CDOPackageRegistryImpl extends EPackageRegistryImpl implements Inte
}
}
+ @Override
public synchronized void registerPackageInfo(EPackage ePackage, InternalCDOPackageInfo packageInfo)
{
packageInfo.setEPackage(ePackage);
packageInfoMap.put(ePackage, packageInfo);
}
+ @Override
public synchronized InternalCDOPackageInfo getPackageInfo(EPackage ePackage)
{
LifecycleUtil.checkActive(this);
@@ -306,6 +320,7 @@ public class CDOPackageRegistryImpl extends EPackageRegistryImpl implements Inte
return packageInfoMap.get(ePackage);
}
+ @Override
public synchronized InternalCDOPackageInfo[] getPackageInfos()
{
LifecycleUtil.checkActive(this);
@@ -335,6 +350,7 @@ public class CDOPackageRegistryImpl extends EPackageRegistryImpl implements Inte
return packageInfos;
}
+ @Override
public synchronized InternalCDOPackageUnit getPackageUnit(EPackage ePackage)
{
LifecycleUtil.checkActive(this);
@@ -352,6 +368,7 @@ public class CDOPackageRegistryImpl extends EPackageRegistryImpl implements Inte
return (InternalCDOPackageUnit)packageInfo.getPackageUnit();
}
+ @Override
public synchronized InternalCDOPackageUnit getPackageUnit(String id)
{
LifecycleUtil.checkActive(this);
@@ -380,6 +397,7 @@ public class CDOPackageRegistryImpl extends EPackageRegistryImpl implements Inte
return null;
}
+ @Override
public synchronized InternalCDOPackageUnit[] getPackageUnits(long startTime, long endTime)
{
LifecycleUtil.checkActive(this);
@@ -418,12 +436,14 @@ public class CDOPackageRegistryImpl extends EPackageRegistryImpl implements Inte
return result.toArray(new InternalCDOPackageUnit[result.size()]);
}
+ @Override
public synchronized InternalCDOPackageUnit[] getPackageUnits(boolean withSystemPackages)
{
LifecycleUtil.checkActive(this);
return collectPackageUnits(withSystemPackages);
}
+ @Override
public synchronized InternalCDOPackageUnit[] getPackageUnits()
{
LifecycleUtil.checkActive(this);
@@ -471,6 +491,7 @@ public class CDOPackageRegistryImpl extends EPackageRegistryImpl implements Inte
return null;
}
+ @Override
public synchronized EPackage[] getEPackages()
{
LifecycleUtil.checkActive(this);
@@ -487,6 +508,7 @@ public class CDOPackageRegistryImpl extends EPackageRegistryImpl implements Inte
return result.toArray(new EPackage[result.size()]);
}
+ @Override
public synchronized EEnumLiteral getEnumLiteralFor(Enumerator value)
{
LifecycleUtil.checkActive(this);
@@ -537,6 +559,7 @@ public class CDOPackageRegistryImpl extends EPackageRegistryImpl implements Inte
return result;
}
+ @Override
public synchronized Map<EClass, List<EClass>> getSubTypes()
{
LifecycleUtil.checkActive(this);
@@ -554,36 +577,43 @@ public class CDOPackageRegistryImpl extends EPackageRegistryImpl implements Inte
return "PackageRegistry";
}
+ @Override
public void addListener(IListener listener)
{
// Do nothing
}
+ @Override
public void removeListener(IListener listener)
{
// Do nothing
}
+ @Override
public IListener[] getListeners()
{
return EventUtil.NO_LISTENERS;
}
+ @Override
public boolean hasListeners()
{
return false;
}
+ @Override
public synchronized boolean isActive()
{
return active;
}
+ @Override
public synchronized LifecycleState getLifecycleState()
{
return active ? LifecycleState.ACTIVE : LifecycleState.INACTIVE;
}
+ @Override
public synchronized void activate() throws LifecycleException
{
if (!active)
@@ -593,6 +623,7 @@ public class CDOPackageRegistryImpl extends EPackageRegistryImpl implements Inte
}
}
+ @Override
public synchronized Exception deactivate()
{
if (active)
@@ -645,6 +676,7 @@ public class CDOPackageRegistryImpl extends EPackageRegistryImpl implements Inte
}
}
+ @Override
public InternalCDOPackageUnit createPackageUnit()
{
InternalCDOPackageUnit packageUnit = (InternalCDOPackageUnit)CDOModelUtil.createPackageUnit();
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOPackageUnitImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOPackageUnitImpl.java
index f050f41fc7..7521d66150 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOPackageUnitImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOPackageUnitImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009-2013, 2015-2017 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2009-2013, 2015-2017, 2019 Eike Stepper (Loehne, Germany) 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
@@ -59,16 +59,19 @@ public class CDOPackageUnitImpl implements InternalCDOPackageUnit
{
}
+ @Override
public InternalCDOPackageRegistry getPackageRegistry()
{
return packageRegistry;
}
+ @Override
public void setPackageRegistry(InternalCDOPackageRegistry packageRegistry)
{
this.packageRegistry = packageRegistry;
}
+ @Override
public String getID()
{
try
@@ -81,11 +84,13 @@ public class CDOPackageUnitImpl implements InternalCDOPackageUnit
}
}
+ @Override
public State getState()
{
return state;
}
+ @Override
public void setState(State state)
{
this.state = state;
@@ -95,6 +100,7 @@ public class CDOPackageUnitImpl implements InternalCDOPackageUnit
}
}
+ @Override
public Type getType()
{
if (getOriginalType() == Type.DYNAMIC)
@@ -123,26 +129,31 @@ public class CDOPackageUnitImpl implements InternalCDOPackageUnit
return type;
}
+ @Override
public Type getOriginalType()
{
return originalType;
}
+ @Override
public void setOriginalType(Type originalType)
{
this.originalType = originalType;
}
+ @Override
public long getTimeStamp()
{
return timeStamp;
}
+ @Override
public void setTimeStamp(long timeStamp)
{
this.timeStamp = timeStamp;
}
+ @Override
public InternalCDOPackageInfo getTopLevelPackageInfo()
{
if (packageInfos == null || packageInfos.length == 0)
@@ -153,6 +164,7 @@ public class CDOPackageUnitImpl implements InternalCDOPackageUnit
return packageInfos[0];
}
+ @Override
public InternalCDOPackageInfo getPackageInfo(String packageURI)
{
for (InternalCDOPackageInfo packageInfo : packageInfos)
@@ -166,11 +178,13 @@ public class CDOPackageUnitImpl implements InternalCDOPackageUnit
return null;
}
+ @Override
public InternalCDOPackageInfo[] getPackageInfos()
{
return packageInfos;
}
+ @Override
public void setPackageInfos(InternalCDOPackageInfo[] packageInfos)
{
this.packageInfos = packageInfos;
@@ -180,6 +194,7 @@ public class CDOPackageUnitImpl implements InternalCDOPackageUnit
}
}
+ @Override
public EPackage[] getEPackages(boolean loadOnDemand)
{
List<EPackage> result = new ArrayList<EPackage>();
@@ -195,16 +210,19 @@ public class CDOPackageUnitImpl implements InternalCDOPackageUnit
return result.toArray(new EPackage[result.size()]);
}
+ @Override
public boolean isSystem()
{
return getTopLevelPackageInfo().isSystemPackage();
}
+ @Override
public boolean isResource()
{
return getTopLevelPackageInfo().isResourcePackage();
}
+ @Override
public void init(EPackage ePackage)
{
EPackage topLevelPackage = EMFUtil.getTopLevelPackage(ePackage);
@@ -216,18 +234,21 @@ public class CDOPackageUnitImpl implements InternalCDOPackageUnit
setOriginalType(getType());
}
+ @Override
public void dispose()
{
packageInfos = null;
setState(State.DISPOSED);
}
+ @Override
public synchronized void load(boolean resolve)
{
PackageLoader packageLoader = packageRegistry.getPackageLoader();
load(packageLoader, resolve);
}
+ @Override
public synchronized void load(PackageLoader packageLoader, boolean resolve)
{
if (state == State.PROXY)
@@ -257,6 +278,7 @@ public class CDOPackageUnitImpl implements InternalCDOPackageUnit
}
}
+ @Override
public void write(CDODataOutput out, boolean withPackages) throws IOException
{
if (TRACER.isEnabled())
@@ -279,6 +301,7 @@ public class CDOPackageUnitImpl implements InternalCDOPackageUnit
}
}
+ @Override
public void read(CDODataInput in, ResourceSet resourceSet) throws IOException
{
if (packageRegistry == null)
@@ -329,6 +352,7 @@ public class CDOPackageUnitImpl implements InternalCDOPackageUnit
}
}
+ @Override
public InternalCDOPackageUnit copy()
{
InternalCDOPackageUnit packageUnit = (InternalCDOPackageUnit)CDOModelUtil.createPackageUnit();
@@ -348,6 +372,7 @@ public class CDOPackageUnitImpl implements InternalCDOPackageUnit
return packageUnit;
}
+ @Override
public int compareTo(CDOPackageUnit o)
{
return getID().compareTo(o.getID());
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOPersistenceFilterImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOPersistenceFilterImpl.java
index 060b8ec900..12daa4e1b1 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOPersistenceFilterImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOPersistenceFilterImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2012, 2019 Eike Stepper (Loehne, Germany) 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
@@ -40,6 +40,7 @@ public class CDOPersistenceFilterImpl implements PersistenceFilter
this.dependency = dependency;
}
+ @Override
public Object getPersistableValue(EObject owner, Object value)
{
if (value instanceof Collection<?>)
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOTypeImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOTypeImpl.java
index 5e3e5fb43b..87d4c750aa 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOTypeImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOTypeImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008-2014, 2016-2018 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2008-2014, 2016-2019 Eike Stepper (Loehne, Germany) 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
@@ -94,12 +94,14 @@ public abstract class CDOTypeImpl implements CDOType
public static final CDOType BOOLEAN = new CDOTypeImpl("BOOLEAN", EcorePackage.EBOOLEAN, false, BOOLEAN_DEFAULT) //$NON-NLS-1$
{
+ @Override
public void writeValue(CDODataOutput out, Object value) throws IOException
{
boolean v = (Boolean)(value == null ? getDefaultValue() : value);
out.writeBoolean(v);
}
+ @Override
public Boolean readValue(CDODataInput in) throws IOException
{
return in.readBoolean();
@@ -108,11 +110,13 @@ public abstract class CDOTypeImpl implements CDOType
public static final CDOType BYTE = new CDOTypeImpl("BYTE", EcorePackage.EBYTE, false, BYTE_DEFAULT) //$NON-NLS-1$
{
+ @Override
public void writeValue(CDODataOutput out, Object value) throws IOException
{
out.writeByte((Byte)(value == null ? getDefaultValue() : value));
}
+ @Override
public Byte readValue(CDODataInput in) throws IOException
{
return in.readByte();
@@ -121,11 +125,13 @@ public abstract class CDOTypeImpl implements CDOType
public static final CDOType CHAR = new CDOTypeImpl("CHAR", EcorePackage.ECHAR, false, CHARACTER_DEFAULT) //$NON-NLS-1$
{
+ @Override
public void writeValue(CDODataOutput out, Object value) throws IOException
{
out.writeChar(((Character)(value == null ? getDefaultValue() : value)).charValue());
}
+ @Override
public Character readValue(CDODataInput in) throws IOException
{
return in.readChar();
@@ -134,11 +140,13 @@ public abstract class CDOTypeImpl implements CDOType
public static final CDOType DOUBLE = new CDOTypeImpl("DOUBLE", EcorePackage.EDOUBLE, false, DOUBLE_DEFAULT) //$NON-NLS-1$
{
+ @Override
public void writeValue(CDODataOutput out, Object value) throws IOException
{
out.writeDouble((Double)(value == null ? getDefaultValue() : value));
}
+ @Override
public Double readValue(CDODataInput in) throws IOException
{
return in.readDouble();
@@ -147,11 +155,13 @@ public abstract class CDOTypeImpl implements CDOType
public static final CDOType FLOAT = new CDOTypeImpl("FLOAT", EcorePackage.EFLOAT, false, FLOAT_DEFAULT) //$NON-NLS-1$
{
+ @Override
public void writeValue(CDODataOutput out, Object value) throws IOException
{
out.writeFloat((Float)(value == null ? getDefaultValue() : value));
}
+ @Override
public Float readValue(CDODataInput in) throws IOException
{
return in.readFloat();
@@ -160,11 +170,13 @@ public abstract class CDOTypeImpl implements CDOType
public static final CDOType INT = new CDOTypeImpl("INT", EcorePackage.EINT, false, INTEGER_DEFAULT) //$NON-NLS-1$
{
+ @Override
public void writeValue(CDODataOutput out, Object value) throws IOException
{
out.writeXInt((Integer)(value == null ? getDefaultValue() : value));
}
+ @Override
public Integer readValue(CDODataInput in) throws IOException
{
return in.readXInt();
@@ -173,11 +185,13 @@ public abstract class CDOTypeImpl implements CDOType
public static final CDOType LONG = new CDOTypeImpl("LONG", EcorePackage.ELONG, false, LONG_DEFAULT) //$NON-NLS-1$
{
+ @Override
public void writeValue(CDODataOutput out, Object value) throws IOException
{
out.writeXLong((Long)(value == null ? getDefaultValue() : value));
}
+ @Override
public Long readValue(CDODataInput in) throws IOException
{
return in.readXLong();
@@ -186,11 +200,13 @@ public abstract class CDOTypeImpl implements CDOType
public static final CDOType SHORT = new CDOTypeImpl("SHORT", EcorePackage.ESHORT, false, SHORT_DEFAULT) //$NON-NLS-1$
{
+ @Override
public void writeValue(CDODataOutput out, Object value) throws IOException
{
out.writeShort((Short)(value == null ? getDefaultValue() : value));
}
+ @Override
public Short readValue(CDODataInput in) throws IOException
{
return in.readShort();
@@ -235,6 +251,7 @@ public abstract class CDOTypeImpl implements CDOType
public static final CDOType OBJECT = new CDOTypeImpl("OBJECT", EcorePackage.EOBJECT, true, CDOID.NULL) //$NON-NLS-1$
{
+ @Override
public void writeValue(CDODataOutput out, Object value) throws IOException
{
if (value instanceof CDORevision)
@@ -254,6 +271,7 @@ public abstract class CDOTypeImpl implements CDOType
}
}
+ @Override
public Object readValue(CDODataInput in) throws IOException
{
CDOID id = in.readCDOID();
@@ -467,11 +485,13 @@ public abstract class CDOTypeImpl implements CDOType
return CDORevisionUtil.createFeatureMapEntry(innerFeature, innerCopy);
}
+ @Override
public void writeValue(CDODataOutput out, Object value) throws IOException
{
throw new UnsupportedOperationException();
}
+ @Override
public FeatureMap.Entry readValue(CDODataInput in) throws IOException
{
throw new UnsupportedOperationException();
@@ -998,21 +1018,25 @@ public abstract class CDOTypeImpl implements CDOType
this(name, typeID, canBeNull, null);
}
+ @Override
public String getName()
{
return name;
}
+ @Override
public byte getTypeID()
{
return typeID;
}
+ @Override
public boolean canBeNull()
{
return canBeNull;
}
+ @Override
public Object getDefaultValue()
{
return defaultValue;
@@ -1024,6 +1048,7 @@ public abstract class CDOTypeImpl implements CDOType
return name;
}
+ @Override
public final Object copyValue(Object value)
{
if (value == null || value == CDORevisionData.NIL)
@@ -1044,6 +1069,7 @@ public abstract class CDOTypeImpl implements CDOType
out.writeByte(typeID);
}
+ @Override
final public Object adjustReferences(CDOReferenceAdjuster adjuster, Object value, EStructuralFeature feature, int index)
{
return value == null ? null : doAdjustReferences(adjuster, value, feature, index);
@@ -1057,6 +1083,7 @@ public abstract class CDOTypeImpl implements CDOType
/**
* @since 2.0
*/
+ @Override
public Object convertToEMF(EClassifier feature, Object value)
{
return value;
@@ -1065,6 +1092,7 @@ public abstract class CDOTypeImpl implements CDOType
/**
* @since 2.0
*/
+ @Override
public Object convertToCDO(EClassifier feature, Object value)
{
return value;
@@ -1105,6 +1133,7 @@ public abstract class CDOTypeImpl implements CDOType
super(name, typeID, true);
}
+ @Override
public final void writeValue(CDODataOutput out, Object value) throws IOException
{
if (value == null)
@@ -1124,6 +1153,7 @@ public abstract class CDOTypeImpl implements CDOType
protected abstract void doWriteValue(CDODataOutput out, Object value) throws IOException;
+ @Override
public final Object readValue(CDODataInput in) throws IOException
{
byte opcode = in.readByte();
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/AbstractCDORevisionCache.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/AbstractCDORevisionCache.java
index ffeaf8e0be..2687937852 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/AbstractCDORevisionCache.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/AbstractCDORevisionCache.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011-2013, 2015, 2016 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2011-2013, 2015, 2016, 2019 Eike Stepper (Loehne, Germany) 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
@@ -121,6 +121,7 @@ public abstract class AbstractCDORevisionCache extends Lifecycle implements Inte
referenceQueue.setMaxWorkPerPoll(maxWorkPerPoll);
}
+ @Override
public final void addRevision(CDORevision revision)
{
referenceQueue.register((InternalCDORevision)revision);
@@ -129,6 +130,7 @@ public abstract class AbstractCDORevisionCache extends Lifecycle implements Inte
protected abstract void doAddRevision(CDORevision revision);
+ @Override
public final CDORevision removeRevision(CDOID id, CDOBranchVersion branchVersion)
{
referenceQueue.clean();
@@ -219,16 +221,19 @@ public abstract class AbstractCDORevisionCache extends Lifecycle implements Inte
version = revision.getVersion();
}
+ @Override
public CDOID getID()
{
return id;
}
+ @Override
public CDOBranch getBranch()
{
return branch;
}
+ @Override
public int getVersion()
{
return version;
@@ -260,16 +265,19 @@ public abstract class AbstractCDORevisionCache extends Lifecycle implements Inte
version = revision.getVersion();
}
+ @Override
public CDOID getID()
{
return id;
}
+ @Override
public CDOBranch getBranch()
{
return branch;
}
+ @Override
public int getVersion()
{
return version;
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDOElementProxyImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDOElementProxyImpl.java
index fb24be49f4..1b843a0d0a 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDOElementProxyImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDOElementProxyImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2011, 2012, 2019 Eike Stepper (Loehne, Germany) 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
@@ -27,6 +27,7 @@ public final class CDOElementProxyImpl implements CDOElementProxy
this.index = index;
}
+ @Override
public int getIndex()
{
return index;
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDOFeatureMapEntryImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDOFeatureMapEntryImpl.java
index 3f8667ac05..4cbcadd06d 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDOFeatureMapEntryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDOFeatureMapEntryImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2011, 2012 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2009, 2011, 2012, 2019 Eike Stepper (Loehne, Germany) 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
@@ -35,21 +35,25 @@ public class CDOFeatureMapEntryImpl implements CDOFeatureMapEntry
this.value = value;
}
+ @Override
public EStructuralFeature getEStructuralFeature()
{
return feature;
}
+ @Override
public void setEStructuralFeature(EStructuralFeature feature)
{
this.feature = feature;
}
+ @Override
public Object getValue()
{
return value;
}
+ @Override
public void setValue(Object value)
{
this.value = value;
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDOIDAndBranchImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDOIDAndBranchImpl.java
index 932653c063..fb0860a18b 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDOIDAndBranchImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDOIDAndBranchImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011-2014 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2011-2014, 2019 Eike Stepper (Loehne, Germany) 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
@@ -38,16 +38,19 @@ public class CDOIDAndBranchImpl implements CDOIDAndBranch, CDOBranchAdjustable
this.branch = branch;
}
+ @Override
public CDOID getID()
{
return id;
}
+ @Override
public CDOBranch getBranch()
{
return branch;
}
+ @Override
public void adjustBranches(CDOBranchManager newBranchManager)
{
branch = newBranchManager.getBranch(branch.getID());
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDOIDAndVersionImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDOIDAndVersionImpl.java
index 5b1216c5dd..6391af4351 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDOIDAndVersionImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDOIDAndVersionImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011-2013 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2011-2013, 2019 Eike Stepper (Loehne, Germany) 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
@@ -34,11 +34,13 @@ public class CDOIDAndVersionImpl implements CDOIDAndVersion
this.version = version;
}
+ @Override
public CDOID getID()
{
return id;
}
+ @Override
public int getVersion()
{
return version;
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDOListImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDOListImpl.java
index 34b9a47b9f..246a2e4dee 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDOListImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDOListImpl.java
@@ -31,6 +31,7 @@ public class CDOListImpl extends BasicEList<Object> implements InternalCDOList.C
{
public static final CDOListFactory FACTORY = new CDOListFactory()
{
+ @Override
public CDOList createList(int initialCapacity, int size, int initialChunk)
{
return new CDOListImpl(initialCapacity, size);
@@ -54,6 +55,7 @@ public class CDOListImpl extends BasicEList<Object> implements InternalCDOList.C
}
}
+ @Override
public InternalCDOList clone(EClassifier classifier)
{
CDOType type = CDOModelUtil.getType(classifier);
@@ -71,11 +73,13 @@ public class CDOListImpl extends BasicEList<Object> implements InternalCDOList.C
return list;
}
+ @Override
public Object get(int index, boolean resolve)
{
return super.get(index);
}
+ @Override
public boolean adjustReferences(CDOReferenceAdjuster revisionAdjuster, EStructuralFeature feature)
{
boolean changed = false;
@@ -100,6 +104,7 @@ public class CDOListImpl extends BasicEList<Object> implements InternalCDOList.C
{
}
+ @Override
public void freeze()
{
flags |= FROZEN_FLAG;
@@ -183,6 +188,7 @@ public class CDOListImpl extends BasicEList<Object> implements InternalCDOList.C
return super.remove(index);
}
+ @Override
public void setWithoutFrozenCheck(int index, Object element)
{
super.set(index, element);
@@ -194,6 +200,7 @@ public class CDOListImpl extends BasicEList<Object> implements InternalCDOList.C
return (flags & USE_EQUALS_FLAG) != 0;
}
+ @Override
public final void setUseEquals(boolean useEquals)
{
if (useEquals)
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDOListWithElementProxiesImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDOListWithElementProxiesImpl.java
index a0cda44c3c..f415419c25 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDOListWithElementProxiesImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDOListWithElementProxiesImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011-2013 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2011-2013, 2019 Eike Stepper (Loehne, Germany) 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
@@ -27,6 +27,7 @@ public class CDOListWithElementProxiesImpl extends CDOListImpl
{
public static final CDOListFactory FACTORY = new CDOListFactory()
{
+ @Override
public CDOList createList(int initialCapacity, int size, int initialChunk)
{
return new CDOListWithElementProxiesImpl(initialCapacity, size, initialChunk);
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisableImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisableImpl.java
index 71d89f268f..fbd45a78f7 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisableImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisableImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, 2016 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2011, 2012, 2016, 2019 Eike Stepper (Loehne, Germany) 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
@@ -47,11 +47,13 @@ public class CDORevisableImpl extends CDOBranchVersionImpl implements CDORevisab
super(branch, version);
}
+ @Override
public long getTimeStamp()
{
return timeStamp;
}
+ @Override
public long getRevised()
{
return revised;
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisionCacheAuditing.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisionCacheAuditing.java
index d0990fd5c6..e408e20f68 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisionCacheAuditing.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisionCacheAuditing.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011-2015 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2011-2015, 2019 Eike Stepper (Loehne, Germany) 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
@@ -49,11 +49,13 @@ public class CDORevisionCacheAuditing extends AbstractCDORevisionCache
{
}
+ @Override
public InternalCDORevisionCache instantiate(CDORevision revision)
{
return new CDORevisionCacheAuditing();
}
+ @Override
public EClass getObjectType(CDOID id)
{
synchronized (revisionLists)
@@ -73,6 +75,7 @@ public class CDORevisionCacheAuditing extends AbstractCDORevisionCache
}
}
+ @Override
public InternalCDORevision getRevision(CDOID id, CDOBranchPoint branchPoint)
{
checkBranch(branchPoint.getBranch());
@@ -86,6 +89,7 @@ public class CDORevisionCacheAuditing extends AbstractCDORevisionCache
return null;
}
+ @Override
public InternalCDORevision getRevisionByVersion(CDOID id, CDOBranchVersion branchVersion)
{
CDOBranch branch = branchVersion.getBranch();
@@ -100,6 +104,7 @@ public class CDORevisionCacheAuditing extends AbstractCDORevisionCache
return null;
}
+ @Override
public List<CDORevision> getCurrentRevisions()
{
List<CDORevision> currentRevisions = new ArrayList<CDORevision>();
@@ -118,6 +123,7 @@ public class CDORevisionCacheAuditing extends AbstractCDORevisionCache
return currentRevisions;
}
+ @Override
public Map<CDOBranch, List<CDORevision>> getAllRevisions()
{
Map<CDOBranch, List<CDORevision>> result = new HashMap<CDOBranch, List<CDORevision>>();
@@ -132,6 +138,7 @@ public class CDORevisionCacheAuditing extends AbstractCDORevisionCache
return result;
}
+ @Override
public void getAllRevisions(List<InternalCDORevision> result)
{
synchronized (revisionLists)
@@ -143,6 +150,7 @@ public class CDORevisionCacheAuditing extends AbstractCDORevisionCache
}
}
+ @Override
public List<CDORevision> getRevisions(CDOBranchPoint branchPoint)
{
CDOBranch branch = branchPoint.getBranch();
@@ -224,6 +232,7 @@ public class CDORevisionCacheAuditing extends AbstractCDORevisionCache
return null;
}
+ @Override
public void clear()
{
synchronized (revisionLists)
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisionCacheNonAuditing.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisionCacheNonAuditing.java
index e334686dac..ec2cfc4483 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisionCacheNonAuditing.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisionCacheNonAuditing.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011-2013, 2015 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2011-2013, 2015, 2019 Eike Stepper (Loehne, Germany) 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
@@ -42,11 +42,13 @@ public class CDORevisionCacheNonAuditing extends AbstractCDORevisionCache
{
}
+ @Override
public InternalCDORevisionCache instantiate(CDORevision revision)
{
return new CDORevisionCacheNonAuditing();
}
+ @Override
public EClass getObjectType(CDOID id)
{
synchronized (revisions)
@@ -65,6 +67,7 @@ public class CDORevisionCacheNonAuditing extends AbstractCDORevisionCache
}
}
+ @Override
public InternalCDORevision getRevision(CDOID id, CDOBranchPoint branchPoint)
{
checkBranch(branchPoint.getBranch());
@@ -85,6 +88,7 @@ public class CDORevisionCacheNonAuditing extends AbstractCDORevisionCache
}
}
+ @Override
public InternalCDORevision getRevisionByVersion(CDOID id, CDOBranchVersion branchVersion)
{
checkBranch(branchVersion.getBranch());
@@ -105,6 +109,7 @@ public class CDORevisionCacheNonAuditing extends AbstractCDORevisionCache
}
}
+ @Override
public List<CDORevision> getCurrentRevisions()
{
List<CDORevision> currentRevisions = new ArrayList<CDORevision>();
@@ -123,6 +128,7 @@ public class CDORevisionCacheNonAuditing extends AbstractCDORevisionCache
return currentRevisions;
}
+ @Override
public Map<CDOBranch, List<CDORevision>> getAllRevisions()
{
Map<CDOBranch, List<CDORevision>> result = new HashMap<CDOBranch, List<CDORevision>>();
@@ -147,6 +153,7 @@ public class CDORevisionCacheNonAuditing extends AbstractCDORevisionCache
return result;
}
+ @Override
public void getAllRevisions(List<InternalCDORevision> result)
{
for (Reference<InternalCDORevision> ref : revisions.values())
@@ -159,6 +166,7 @@ public class CDORevisionCacheNonAuditing extends AbstractCDORevisionCache
}
}
+ @Override
public List<CDORevision> getRevisions(CDOBranchPoint branchPoint)
{
checkBranch(branchPoint.getBranch());
@@ -237,6 +245,7 @@ public class CDORevisionCacheNonAuditing extends AbstractCDORevisionCache
return null;
}
+ @Override
public void clear()
{
synchronized (revisions)
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisionImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisionImpl.java
index a08fe66933..5206b6aad7 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisionImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisionImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008-2013 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2008-2013, 2019 Eike Stepper (Loehne, Germany) 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
@@ -71,6 +71,7 @@ public class CDORevisionImpl extends BaseCDORevision
}
}
+ @Override
public InternalCDORevision copy()
{
return new CDORevisionImpl(this);
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisionKeyImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisionKeyImpl.java
index 6de1b86195..53299814c3 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisionKeyImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisionKeyImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2013 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2010-2013, 2019 Eike Stepper (Loehne, Germany) 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
@@ -30,6 +30,7 @@ public class CDORevisionKeyImpl extends CDOBranchVersionImpl implements CDORevis
this.id = id;
}
+ @Override
public CDOID getID()
{
return id;
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisionManagerImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisionManagerImpl.java
index 90868ff39c..5f7daa5971 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisionManagerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisionManagerImpl.java
@@ -91,72 +91,85 @@ public class CDORevisionManagerImpl extends Lifecycle implements InternalCDORevi
{
}
+ @Override
public boolean isSupportingAudits()
{
return supportingAudits;
}
+ @Override
public void setSupportingAudits(boolean on)
{
checkInactive();
supportingAudits = on;
}
+ @Override
public boolean isSupportingBranches()
{
return supportingBranches;
}
+ @Override
public void setSupportingBranches(boolean on)
{
checkInactive();
supportingBranches = on;
}
+ @Override
public RevisionLoader getRevisionLoader()
{
return revisionLoader;
}
+ @Override
public void setRevisionLoader(RevisionLoader revisionLoader)
{
checkInactive();
this.revisionLoader = revisionLoader;
}
+ @Override
public RevisionLocker getRevisionLocker()
{
return revisionLocker;
}
+ @Override
public void setRevisionLocker(RevisionLocker revisionLocker)
{
checkInactive();
this.revisionLocker = revisionLocker;
}
+ @Override
public CDORevisionFactory getFactory()
{
return factory;
}
+ @Override
public void setFactory(CDORevisionFactory factory)
{
checkInactive();
this.factory = factory;
}
+ @Override
public InternalCDORevisionCache getCache()
{
return cache;
}
+ @Override
public void setCache(CDORevisionCache cache)
{
checkInactive();
this.cache = (InternalCDORevisionCache)cache;
}
+ @Override
public EClass getObjectType(CDOID id, CDOBranchManager branchManagerForLoadOnDemand)
{
EClass type = cache.getObjectType(id);
@@ -173,11 +186,13 @@ public class CDORevisionManagerImpl extends Lifecycle implements InternalCDORevi
return type;
}
+ @Override
public EClass getObjectType(CDOID id)
{
return getObjectType(id, null);
}
+ @Override
public boolean containsRevision(CDOID id, CDOBranchPoint branchPoint)
{
if (supportingBranches)
@@ -188,11 +203,13 @@ public class CDORevisionManagerImpl extends Lifecycle implements InternalCDORevi
return getCachedRevision(id, branchPoint) != null;
}
+ @Override
public boolean containsRevisionByVersion(CDOID id, CDOBranchVersion branchVersion)
{
return cache.getRevisionByVersion(id, branchVersion) != null;
}
+ @Override
public void reviseLatest(CDOID id, CDOBranch branch)
{
acquireAtomicRequestLock(reviseLock);
@@ -212,6 +229,7 @@ public class CDORevisionManagerImpl extends Lifecycle implements InternalCDORevi
}
}
+ @Override
public void reviseVersion(CDOID id, CDOBranchVersion branchVersion, long timeStamp)
{
acquireAtomicRequestLock(reviseLock);
@@ -235,6 +253,7 @@ public class CDORevisionManagerImpl extends Lifecycle implements InternalCDORevi
}
}
+ @Override
public InternalCDORevision getRevisionByVersion(CDOID id, CDOBranchVersion branchVersion, int referenceChunk, boolean loadOnDemand)
{
checkArg(branchVersion.getVersion() >= CDOBranchVersion.FIRST_VERSION, "Invalid version: " + branchVersion.getVersion());
@@ -265,6 +284,7 @@ public class CDORevisionManagerImpl extends Lifecycle implements InternalCDORevi
}
}
+ @Override
public InternalCDORevision getBaseRevision(CDORevision revision, int referenceChunk, boolean loadOnDemand)
{
CDOID id = revision.getID();
@@ -286,6 +306,7 @@ public class CDORevisionManagerImpl extends Lifecycle implements InternalCDORevi
return getRevisionByVersion(id, baseVersion, referenceChunk, loadOnDemand);
}
+ @Override
public CDOBranchPointRange getObjectLifetime(CDOID id, CDOBranchPoint branchPoint)
{
if (revisionLoader instanceof RevisionLoader2)
@@ -297,11 +318,13 @@ public class CDORevisionManagerImpl extends Lifecycle implements InternalCDORevi
return null;
}
+ @Override
public InternalCDORevision getRevision(CDOID id, CDOBranchPoint branchPoint, int referenceChunk, int prefetchDepth, boolean loadOnDemand)
{
return getRevision(id, branchPoint, referenceChunk, prefetchDepth, loadOnDemand, null);
}
+ @Override
public InternalCDORevision getRevision(CDOID id, CDOBranchPoint branchPoint, int referenceChunk, int prefetchDepth, boolean loadOnDemand,
SyntheticCDORevision[] synthetics)
{
@@ -310,11 +333,13 @@ public class CDORevisionManagerImpl extends Lifecycle implements InternalCDORevi
return (InternalCDORevision)result;
}
+ @Override
public List<CDORevision> getRevisions(List<CDOID> ids, CDOBranchPoint branchPoint, int referenceChunk, int prefetchDepth, boolean loadOnDemand)
{
return getRevisions(ids, branchPoint, referenceChunk, prefetchDepth, loadOnDemand, null);
}
+ @Override
public List<CDORevision> getRevisions(List<CDOID> ids, CDOBranchPoint branchPoint, int referenceChunk, int prefetchDepth, boolean loadOnDemand,
SyntheticCDORevision[] synthetics)
{
@@ -347,6 +372,7 @@ public class CDORevisionManagerImpl extends Lifecycle implements InternalCDORevi
return getResultsAndSynthetics(infos, synthetics);
}
+ @Override
public void handleRevisions(EClass eClass, CDOBranch branch, boolean exactBranch, long timeStamp, boolean exactTime, CDORevisionHandler handler)
{
revisionLoader.handleRevisions(eClass, branch, exactBranch, timeStamp, exactTime, handler);
@@ -472,6 +498,7 @@ public class CDORevisionManagerImpl extends Lifecycle implements InternalCDORevi
return results;
}
+ @Override
public void addRevision(CDORevision revision)
{
if (revision != null)
@@ -636,16 +663,19 @@ public class CDORevisionManagerImpl extends Lifecycle implements InternalCDORevi
return (CDORevisionManager)super.getSource();
}
+ @Override
public List<? extends CDORevision> getPrimaryLoadedRevisions()
{
return primaryLoadedRevisions;
}
+ @Override
public List<? extends CDORevision> getAdditionalLoadedRevisions()
{
return additionalLoadedRevisions;
}
+ @Override
public int getPrefetchDepth()
{
return prefetchDepth;
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/EvictionEventImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/EvictionEventImpl.java
index 145050a69a..934db63b63 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/EvictionEventImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/EvictionEventImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2012 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2010-2012, 2019 Eike Stepper (Loehne, Germany) 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
@@ -40,21 +40,25 @@ public class EvictionEventImpl extends Event implements EvictionEvent
return (CDORevisionCache)super.getSource();
}
+ @Override
public CDOID getID()
{
return key.getID();
}
+ @Override
public CDOBranch getBranch()
{
return key.getBranch();
}
+ @Override
public int getVersion()
{
return key.getVersion();
}
+ @Override
public InternalCDORevision getRevision()
{
if (key instanceof InternalCDORevision)
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/NOOPRevisionCache.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/NOOPRevisionCache.java
index d449821e89..801496c2af 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/NOOPRevisionCache.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/NOOPRevisionCache.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2013 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2010-2013, 2019 Eike Stepper (Loehne, Germany) 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
@@ -39,6 +39,7 @@ public class NOOPRevisionCache extends Lifecycle implements InternalCDORevisionC
{
}
+ @Override
public InternalCDORevisionCache instantiate(CDORevision revision)
{
return this;
@@ -49,11 +50,13 @@ public class NOOPRevisionCache extends Lifecycle implements InternalCDORevisionC
return true;
}
+ @Override
public EClass getObjectType(CDOID id)
{
return null;
}
+ @Override
public List<CDORevision> getCurrentRevisions()
{
return EMPTY;
@@ -64,41 +67,49 @@ public class NOOPRevisionCache extends Lifecycle implements InternalCDORevisionC
return null;
}
+ @Override
public InternalCDORevision getRevision(CDOID id, CDOBranchPoint branchPoint)
{
return null;
}
+ @Override
public InternalCDORevision getRevisionByVersion(CDOID id, CDOBranchVersion branchVersion)
{
return null;
}
+ @Override
public void addRevision(CDORevision revision)
{
// Do nothing
}
+ @Override
public InternalCDORevision removeRevision(CDOID id, CDOBranchVersion branchVersion)
{
return null;
}
+ @Override
public void clear()
{
// Do nothing
}
+ @Override
public Map<CDOBranch, List<CDORevision>> getAllRevisions()
{
return Collections.emptyMap();
}
+ @Override
public void getAllRevisions(List<InternalCDORevision> result)
{
// Do nothing
}
+ @Override
public List<CDORevision> getRevisions(CDOBranchPoint branchPoint)
{
return Collections.emptyList();
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOAddFeatureDeltaImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOAddFeatureDeltaImpl.java
index 94750990ed..05ca812eb8 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOAddFeatureDeltaImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOAddFeatureDeltaImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008-2012, 2014-2018 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2008-2012, 2014-2019 Eike Stepper (Loehne, Germany) 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
@@ -40,11 +40,13 @@ public class CDOAddFeatureDeltaImpl extends CDOSingleValueFeatureDeltaImpl imple
super(in, eClass);
}
+ @Override
public Type getType()
{
return Type.ADD;
}
+ @Override
public Object applyTo(CDORevision revision)
{
EStructuralFeature feature = getFeature();
@@ -71,16 +73,19 @@ public class CDOAddFeatureDeltaImpl extends CDOSingleValueFeatureDeltaImpl imple
return null;
}
+ @Override
public void accept(CDOFeatureDeltaVisitor visitor)
{
visitor.visit(this);
}
+ @Override
public CDOAddFeatureDelta copy()
{
return new CDOAddFeatureDeltaImpl(getFeature(), getIndex(), getValue());
}
+ @Override
public void affectIndices(ListTargetAdding[] source, int[] indices)
{
int index = getIndex();
@@ -98,6 +103,7 @@ public class CDOAddFeatureDeltaImpl extends CDOSingleValueFeatureDeltaImpl imple
}
}
+ @Override
public int projectIndex(int index)
{
if (index >= getIndex())
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOClearFeatureDeltaImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOClearFeatureDeltaImpl.java
index 21ff5838e0..c942921ce2 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOClearFeatureDeltaImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOClearFeatureDeltaImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008-2012, 2014 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2008-2012, 2014, 2019 Eike Stepper (Loehne, Germany) 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
@@ -39,16 +39,19 @@ public class CDOClearFeatureDeltaImpl extends CDOFeatureDeltaImpl implements CDO
super(in, eClass);
}
+ @Override
public Type getType()
{
return Type.CLEAR;
}
+ @Override
public CDOFeatureDelta copy()
{
return new CDOClearFeatureDeltaImpl(getFeature());
}
+ @Override
public Object applyTo(CDORevision revision)
{
EStructuralFeature feature = getFeature();
@@ -58,6 +61,7 @@ public class CDOClearFeatureDeltaImpl extends CDOFeatureDeltaImpl implements CDO
return null;
}
+ @Override
public void accept(CDOFeatureDeltaVisitor visitor)
{
visitor.visit(this);
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOContainerFeatureDeltaImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOContainerFeatureDeltaImpl.java
index 9c07e9b670..e2560d0580 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOContainerFeatureDeltaImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOContainerFeatureDeltaImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008-2012, 2014, 2016, 2017 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2008-2012, 2014, 2016, 2017, 2019 Eike Stepper (Loehne, Germany) 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
@@ -58,31 +58,37 @@ public class CDOContainerFeatureDeltaImpl extends CDOFeatureDeltaImpl implements
newResourceID = in.readCDOID();
}
+ @Override
public Type getType()
{
return Type.CONTAINER;
}
+ @Override
public CDOFeatureDelta copy()
{
return new CDOContainerFeatureDeltaImpl(newResourceID, newContainerID, newContainerFeatureID);
}
+ @Override
public CDOID getResourceID()
{
return newResourceID;
}
+ @Override
public Object getContainerID()
{
return newContainerID;
}
+ @Override
public int getContainerFeatureID()
{
return newContainerFeatureID;
}
+ @Override
public Object applyTo(CDORevision revision)
{
InternalCDORevision internalRevision = (InternalCDORevision)revision;
@@ -123,6 +129,7 @@ public class CDOContainerFeatureDeltaImpl extends CDOFeatureDeltaImpl implements
out.writeCDOID(newResourceID);
}
+ @Override
public void accept(CDOFeatureDeltaVisitor visitor)
{
visitor.visit(this);
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDODetachedRevisionDeltaImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDODetachedRevisionDeltaImpl.java
index 370e0a5ab8..25c462391d 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDODetachedRevisionDeltaImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDODetachedRevisionDeltaImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2014 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2010-2014, 2019 Eike Stepper (Loehne, Germany) 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
@@ -34,36 +34,43 @@ public class CDODetachedRevisionDeltaImpl implements CDORevisionDelta
{
}
+ @Override
public CDOID getID()
{
throw new UnsupportedOperationException();
}
+ @Override
public CDOBranch getBranch()
{
throw new UnsupportedOperationException();
}
+ @Override
public int getVersion()
{
throw new UnsupportedOperationException();
}
+ @Override
public EClass getEClass()
{
throw new UnsupportedOperationException();
}
+ @Override
public CDORevisable getTarget()
{
throw new UnsupportedOperationException();
}
+ @Override
public int size()
{
throw new UnsupportedOperationException();
}
+ @Override
public boolean isEmpty()
{
throw new UnsupportedOperationException();
@@ -74,37 +81,44 @@ public class CDODetachedRevisionDeltaImpl implements CDORevisionDelta
throw new UnsupportedOperationException();
}
+ @Override
public CDORevisionDelta copy()
{
return this;
}
+ @Override
public CDOFeatureDelta getFeatureDelta(EStructuralFeature feature)
{
throw new UnsupportedOperationException();
}
+ @Override
public List<CDOFeatureDelta> getFeatureDeltas()
{
throw new UnsupportedOperationException();
}
+ @Override
@Deprecated
public void apply(CDORevision revision)
{
throw new UnsupportedOperationException();
}
+ @Override
public void applyTo(CDORevision revision)
{
throw new UnsupportedOperationException();
}
+ @Override
public void accept(CDOFeatureDeltaVisitor visitor)
{
throw new UnsupportedOperationException();
}
+ @Override
public void accept(CDOFeatureDeltaVisitor visitor, Predicate<EStructuralFeature> filter)
{
throw new UnsupportedOperationException();
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOFeatureDeltaImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOFeatureDeltaImpl.java
index e074add4ac..84a294cda8 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOFeatureDeltaImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOFeatureDeltaImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008-2012, 2014, 2017 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2008-2012, 2014, 2017, 2019 Eike Stepper (Loehne, Germany) 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
@@ -53,17 +53,20 @@ public abstract class CDOFeatureDeltaImpl implements InternalCDOFeatureDelta
out.writeXInt(eClass.getFeatureID(feature));
}
+ @Override
public EStructuralFeature getFeature()
{
return feature;
}
+ @Override
@Deprecated
public void apply(CDORevision revision)
{
applyTo(revision);
}
+ @Override
public boolean isStructurallyEqual(Object obj)
{
if (obj == this)
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOListFeatureDeltaImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOListFeatureDeltaImpl.java
index 2a75416d0a..c2779b84ef 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOListFeatureDeltaImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOListFeatureDeltaImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008-2018 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2008-2019 Eike Stepper (Loehne, Germany) 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
@@ -74,6 +74,7 @@ public class CDOListFeatureDeltaImpl extends CDOFeatureDeltaImpl implements CDOL
}
}
+ @Override
public CDOListFeatureDelta copy()
{
CDOListFeatureDeltaImpl result = new CDOListFeatureDeltaImpl(getFeature(), getOriginSize());
@@ -143,16 +144,19 @@ public class CDOListFeatureDeltaImpl extends CDOFeatureDeltaImpl implements CDOL
}
}
+ @Override
public Type getType()
{
return Type.LIST;
}
+ @Override
public int getOriginSize()
{
return originSize;
}
+ @Override
public List<CDOFeatureDelta> getListChanges()
{
return listChanges;
@@ -447,11 +451,13 @@ public class CDOListFeatureDeltaImpl extends CDOFeatureDeltaImpl implements CDOL
return indexIntoListChanges;
}
+ @Override
public int getIndex()
{
return index;
}
+ @Override
public void adjustAfterAddition(int index)
{
if (index <= this.index)
@@ -460,6 +466,7 @@ public class CDOListFeatureDeltaImpl extends CDOFeatureDeltaImpl implements CDOL
}
}
+ @Override
public void adjustAfterRemoval(int index)
{
if (index < this.index && this.index > 0)
@@ -468,6 +475,7 @@ public class CDOListFeatureDeltaImpl extends CDOFeatureDeltaImpl implements CDOL
}
}
+ @Override
public void adjustAfterMove(int oldPosition, int newPosition)
{
if (index == oldPosition)
@@ -577,6 +585,7 @@ public class CDOListFeatureDeltaImpl extends CDOFeatureDeltaImpl implements CDOL
}
}
+ @Override
public Object applyTo(CDORevision revision)
{
for (CDOFeatureDelta featureDelta : listChanges)
@@ -599,6 +608,7 @@ public class CDOListFeatureDeltaImpl extends CDOFeatureDeltaImpl implements CDOL
return changed;
}
+ @Override
public void accept(CDOFeatureDeltaVisitor visitor)
{
visitor.visit(this);
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOMoveFeatureDeltaImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOMoveFeatureDeltaImpl.java
index 77528b3a0a..7f4e666517 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOMoveFeatureDeltaImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOMoveFeatureDeltaImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008-2012, 2014-2018 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2008-2012, 2014-2019 Eike Stepper (Loehne, Germany) 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
@@ -68,26 +68,31 @@ public class CDOMoveFeatureDeltaImpl extends CDOFeatureDeltaImpl implements CDOM
out.writeXInt(oldPosition);
}
+ @Override
public int getNewPosition()
{
return newPosition;
}
+ @Override
public int getOldPosition()
{
return oldPosition;
}
+ @Override
public Type getType()
{
return Type.MOVE;
}
+ @Override
public int getIndex()
{
return oldPosition;
}
+ @Override
public Object getValue()
{
return value;
@@ -108,6 +113,7 @@ public class CDOMoveFeatureDeltaImpl extends CDOFeatureDeltaImpl implements CDOM
this.newPosition = newPosition;
}
+ @Override
public CDOFeatureDelta copy()
{
CDOFeatureDelta copy = new CDOMoveFeatureDeltaImpl(getFeature(), newPosition, oldPosition);
@@ -115,6 +121,7 @@ public class CDOMoveFeatureDeltaImpl extends CDOFeatureDeltaImpl implements CDOM
return copy;
}
+ @Override
public Object applyTo(CDORevision revision)
{
EStructuralFeature feature = getFeature();
@@ -145,6 +152,7 @@ public class CDOMoveFeatureDeltaImpl extends CDOFeatureDeltaImpl implements CDOM
return list.move(newPosition, oldPosition);
}
+ @Override
public void affectIndices(ListTargetAdding[] source, int[] indices)
{
if (oldPosition < newPosition)
@@ -205,6 +213,7 @@ public class CDOMoveFeatureDeltaImpl extends CDOFeatureDeltaImpl implements CDOM
System.out.println(index);
}
+ @Override
public int projectIndex(int index)
{
if (oldPosition < newPosition)
@@ -235,11 +244,13 @@ public class CDOMoveFeatureDeltaImpl extends CDOFeatureDeltaImpl implements CDOM
return index;
}
+ @Override
public void accept(CDOFeatureDeltaVisitor visitor)
{
visitor.visit(this);
}
+ @Override
public void adjustAfterAddition(int index)
{
if (index <= oldPosition)
@@ -253,6 +264,7 @@ public class CDOMoveFeatureDeltaImpl extends CDOFeatureDeltaImpl implements CDOM
}
}
+ @Override
public void adjustAfterRemoval(int index)
{
if (index < oldPosition && oldPosition > 0)
@@ -272,6 +284,7 @@ public class CDOMoveFeatureDeltaImpl extends CDOFeatureDeltaImpl implements CDOM
}
}
+ @Override
public void adjustAfterMove(int oldPosition, int newPosition)
{
if (this.oldPosition == oldPosition)
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDORemoveFeatureDeltaImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDORemoveFeatureDeltaImpl.java
index f657a2f0fc..775ad7e884 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDORemoveFeatureDeltaImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDORemoveFeatureDeltaImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008-2012, 2014-2018 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2008-2012, 2014-2019 Eike Stepper (Loehne, Germany) 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
@@ -53,11 +53,13 @@ public class CDORemoveFeatureDeltaImpl extends CDOSingleValueFeatureDeltaImpl im
return UNKNOWN_VALUE;
}
+ @Override
public Type getType()
{
return Type.REMOVE;
}
+ @Override
public CDOFeatureDelta copy()
{
CDORemoveFeatureDeltaImpl delta = new CDORemoveFeatureDeltaImpl(getFeature(), getIndex());
@@ -65,6 +67,7 @@ public class CDORemoveFeatureDeltaImpl extends CDOSingleValueFeatureDeltaImpl im
return delta;
}
+ @Override
public Object applyTo(CDORevision revision)
{
EStructuralFeature feature = getFeature();
@@ -80,11 +83,13 @@ public class CDORemoveFeatureDeltaImpl extends CDOSingleValueFeatureDeltaImpl im
return list.remove(index);
}
+ @Override
public void accept(CDOFeatureDeltaVisitor visitor)
{
visitor.visit(this);
}
+ @Override
public void affectIndices(ListTargetAdding sources[], int[] indices)
{
int index = getIndex();
@@ -107,6 +112,7 @@ public class CDORemoveFeatureDeltaImpl extends CDOSingleValueFeatureDeltaImpl im
}
}
+ @Override
public int projectIndex(int index)
{
if (index >= getIndex())
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDORevisionDeltaImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDORevisionDeltaImpl.java
index c7826ddd98..725c65a29d 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDORevisionDeltaImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDORevisionDeltaImpl.java
@@ -184,82 +184,98 @@ public class CDORevisionDeltaImpl implements InternalCDORevisionDelta, ListCompa
}
}
+ @Override
public EClass getEClass()
{
return eClass;
}
+ @Override
public CDOID getID()
{
return id;
}
+ @Override
public CDOBranch getBranch()
{
return branch;
}
+ @Override
public void setBranch(CDOBranch branch)
{
this.branch = branch;
}
+ @Override
public int getVersion()
{
return version;
}
+ @Override
public void setVersion(int version)
{
this.version = version;
}
+ @Override
public CDORevisable getTarget()
{
return target;
}
+ @Override
public void setTarget(CDORevisable target)
{
this.target = target;
}
+ @Override
public int size()
{
return featureDeltas.size();
}
+ @Override
public boolean isEmpty()
{
return featureDeltas.isEmpty();
}
+ @Override
public CDORevisionDelta copy()
{
return new CDORevisionDeltaImpl(this, true);
}
+ @Override
public Map<EStructuralFeature, CDOFeatureDelta> getFeatureDeltaMap()
{
return featureDeltas;
}
+ @Override
public CDOFeatureDelta getFeatureDelta(EStructuralFeature feature)
{
return featureDeltas.get(feature);
}
+ @Override
public List<CDOFeatureDelta> getFeatureDeltas()
{
return new ArrayList<CDOFeatureDelta>(featureDeltas.values());
}
+ @Override
@Deprecated
public void apply(CDORevision revision)
{
applyTo(revision);
}
+ @Override
public void applyTo(CDORevision revision)
{
for (CDOFeatureDelta featureDelta : featureDeltas.values())
@@ -268,12 +284,14 @@ public class CDORevisionDeltaImpl implements InternalCDORevisionDelta, ListCompa
}
}
+ @Override
@Deprecated
public void addFeatureDelta(CDOFeatureDelta delta)
{
throw new UnsupportedOperationException();
}
+ @Override
public void addFeatureDelta(CDOFeatureDelta delta, CDOOriginSizeProvider originSizeProvider)
{
if (delta instanceof CDOListFeatureDelta)
@@ -323,6 +341,7 @@ public class CDORevisionDeltaImpl implements InternalCDORevisionDelta, ListCompa
}
}
+ @Override
public boolean adjustReferences(CDOReferenceAdjuster referenceAdjuster)
{
boolean changed = false;
@@ -334,6 +353,7 @@ public class CDORevisionDeltaImpl implements InternalCDORevisionDelta, ListCompa
return changed;
}
+ @Override
public void adjustBranches(CDOBranchManager newBranchManager)
{
if (branch != null)
@@ -347,11 +367,13 @@ public class CDORevisionDeltaImpl implements InternalCDORevisionDelta, ListCompa
}
}
+ @Override
public void accept(CDOFeatureDeltaVisitor visitor)
{
accept(visitor, Predicates.<EStructuralFeature> alwaysTrue());
}
+ @Override
public void accept(CDOFeatureDeltaVisitor visitor, Predicate<EStructuralFeature> filter)
{
for (CDOFeatureDelta featureDelta : featureDeltas.values())
@@ -364,11 +386,13 @@ public class CDORevisionDeltaImpl implements InternalCDORevisionDelta, ListCompa
}
}
+ @Override
public void addDelta(CDOListFeatureDelta listFeatureDelta)
{
featureDeltas.put(listFeatureDelta.getFeature(), listFeatureDelta);
}
+ @Override
public void addClearDelta(CDOClearFeatureDelta clearFeatureDelta, CDOOriginSizeProvider originSizeProvider)
{
addFeatureDelta(clearFeatureDelta, originSizeProvider);
@@ -476,6 +500,7 @@ public class CDORevisionDeltaImpl implements InternalCDORevisionDelta, ListCompa
{
handler.addClearDelta(new CDOClearFeatureDeltaImpl(feature), new CDOOriginSizeProvider()
{
+ @Override
public int getOriginSize()
{
return originSize;
@@ -589,11 +614,13 @@ public class CDORevisionDeltaImpl implements InternalCDORevisionDelta, ListCompa
final CDOListFeatureDelta[] result = { null };
compareLists(originRevision, dirtyRevision, feature, new ListComparisonHandler()
{
+ @Override
public void addDelta(CDOListFeatureDelta listFeatureDelta)
{
result[0] = listFeatureDelta;
}
+ @Override
public void addClearDelta(CDOClearFeatureDelta clearFeatureDelta, CDOOriginSizeProvider originSizeProvider)
{
CDOListFeatureDeltaImpl listFeatureDelta = new CDOListFeatureDeltaImpl(feature, originRevision.size(feature));
@@ -622,123 +649,148 @@ public class CDORevisionDeltaImpl implements InternalCDORevisionDelta, ListCompa
{
}
+ @Override
public int size()
{
return 0;
}
+ @Override
public boolean isEmpty()
{
return true;
}
+ @Override
public boolean contains(Object o)
{
return false;
}
+ @Override
public Iterator<ListChange> iterator()
{
return LIST.iterator();
}
+ @Override
public Object[] toArray()
{
return LIST.toArray();
}
+ @Override
public <T> T[] toArray(T[] a)
{
return LIST.toArray(a);
}
+ @Override
public boolean add(ListChange o)
{
return false;
}
+ @Override
public boolean remove(Object o)
{
return false;
}
+ @Override
public boolean containsAll(Collection<?> c)
{
return false;
}
+ @Override
public boolean addAll(Collection<? extends ListChange> c)
{
return false;
}
+ @Override
public boolean addAll(int index, Collection<? extends ListChange> c)
{
return false;
}
+ @Override
public boolean removeAll(Collection<?> c)
{
return false;
}
+ @Override
public boolean retainAll(Collection<?> c)
{
return false;
}
+ @Override
public void clear()
{
}
+ @Override
public ListChange get(int index)
{
return LIST.get(index);
}
+ @Override
public ListChange set(int index, ListChange element)
{
return null;
}
+ @Override
public void add(int index, ListChange element)
{
}
+ @Override
public ListChange remove(int index)
{
return null;
}
+ @Override
public int indexOf(Object o)
{
return LIST.indexOf(o);
}
+ @Override
public int lastIndexOf(Object o)
{
return LIST.lastIndexOf(o);
}
+ @Override
public ListIterator<ListChange> listIterator()
{
return LIST.listIterator();
}
+ @Override
public ListIterator<ListChange> listIterator(int index)
{
return LIST.listIterator(index);
}
+ @Override
public List<ListChange> subList(int fromIndex, int toIndex)
{
return LIST.subList(fromIndex, toIndex);
}
+ @Override
public void move(int newPosition, ListChange object)
{
}
+ @Override
public ListChange move(int newPosition, int oldPosition)
{
return null;
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOSetFeatureDeltaImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOSetFeatureDeltaImpl.java
index 320c1ae372..890801362c 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOSetFeatureDeltaImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOSetFeatureDeltaImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008-2012, 2014-2016 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2008-2012, 2014-2016, 2019 Eike Stepper (Loehne, Germany) 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
@@ -67,16 +67,19 @@ public class CDOSetFeatureDeltaImpl extends CDOSingleValueFeatureDeltaImpl imple
}
}
+ @Override
public Type getType()
{
return Type.SET;
}
+ @Override
public CDOFeatureDelta copy()
{
return new CDOSetFeatureDeltaImpl(getFeature(), getIndex(), getValue(), getOldValue());
}
+ @Override
public Object applyTo(CDORevision revision)
{
EStructuralFeature feature = getFeature();
@@ -87,11 +90,13 @@ public class CDOSetFeatureDeltaImpl extends CDOSingleValueFeatureDeltaImpl imple
return internalRevision.set(feature, index, value);
}
+ @Override
public void accept(CDOFeatureDeltaVisitor visitor)
{
visitor.visit(this);
}
+ @Override
public Object getOldValue()
{
return oldValue;
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOSingleValueFeatureDeltaImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOSingleValueFeatureDeltaImpl.java
index de1e82b335..9a4c8ef6a1 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOSingleValueFeatureDeltaImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOSingleValueFeatureDeltaImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008-2013, 2016-2018 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2008-2013, 2016-2019 Eike Stepper (Loehne, Germany) 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
@@ -108,6 +108,7 @@ public abstract class CDOSingleValueFeatureDeltaImpl extends CDOFeatureDeltaImpl
return in.readCDOFeatureValue(feature);
}
+ @Override
public int getIndex()
{
return index;
@@ -133,6 +134,7 @@ public abstract class CDOSingleValueFeatureDeltaImpl extends CDOFeatureDeltaImpl
setValue(CDOID.NULL);
}
+ @Override
public void adjustAfterAddition(int index)
{
if (index <= this.index)
@@ -141,6 +143,7 @@ public abstract class CDOSingleValueFeatureDeltaImpl extends CDOFeatureDeltaImpl
}
}
+ @Override
public void adjustAfterRemoval(int index)
{
if (index < this.index && this.index > 0)
@@ -149,6 +152,7 @@ public abstract class CDOSingleValueFeatureDeltaImpl extends CDOFeatureDeltaImpl
}
}
+ @Override
public void adjustAfterMove(int oldPosition, int newPosition)
{
if (index == oldPosition)
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOUnsetFeatureDeltaImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOUnsetFeatureDeltaImpl.java
index 6b0a55afae..fe89e73718 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOUnsetFeatureDeltaImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOUnsetFeatureDeltaImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008-2012, 2014 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2008-2012, 2014, 2019 Eike Stepper (Loehne, Germany) 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
@@ -42,16 +42,19 @@ public class CDOUnsetFeatureDeltaImpl extends CDOFeatureDeltaImpl implements CDO
super(in, eClass);
}
+ @Override
public Type getType()
{
return Type.UNSET;
}
+ @Override
public CDOFeatureDelta copy()
{
return new CDOUnsetFeatureDeltaImpl(getFeature());
}
+ @Override
public Object applyTo(CDORevision revision)
{
EStructuralFeature feature = getFeature();
@@ -90,6 +93,7 @@ public class CDOUnsetFeatureDeltaImpl extends CDOFeatureDeltaImpl implements CDO
return null;
}
+ @Override
public void accept(CDOFeatureDeltaVisitor visitor)
{
visitor.visit(this);
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/AbstractQueryResult.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/AbstractQueryResult.java
index ba0783db3a..cf2a181100 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/AbstractQueryResult.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/AbstractQueryResult.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009-2013 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2009-2013, 2019 Eike Stepper (Loehne, Germany) 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
@@ -75,17 +75,20 @@ public class AbstractQueryResult<T> implements BlockingCloseableIterator<T>
this.queryID = queryID;
}
+ @Override
@SuppressWarnings("unchecked")
public T peek()
{
return (T)queueItr.peek();
}
+ @Override
public boolean hasNext()
{
return queueItr.hasNext();
}
+ @Override
@SuppressWarnings("unchecked")
public T next()
{
@@ -103,17 +106,20 @@ public class AbstractQueryResult<T> implements BlockingCloseableIterator<T>
return (T)element;
}
+ @Override
public void remove()
{
throw new UnsupportedOperationException();
}
+ @Override
public void close()
{
queueItr.close();
queue.close();
}
+ @Override
public boolean isClosed()
{
return queueItr.isClosed();
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/CDOLobStoreImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/CDOLobStoreImpl.java
index d43473e6cb..c807e499a6 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/CDOLobStoreImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/CDOLobStoreImpl.java
@@ -89,11 +89,13 @@ public class CDOLobStoreImpl implements CDOLobStore
return folder;
}
+ @Override
public File getBinaryFile(byte[] id)
{
return new File(getFolder(), HexUtil.bytesToHex(id) + ".blob");
}
+ @Override
public InputStream getBinary(CDOLobInfo info) throws IOException
{
File file = getBinaryFile(info.getID());
@@ -103,6 +105,7 @@ public class CDOLobStoreImpl implements CDOLobStore
return inputStream;
}
+ @Override
public CDOLobInfo putBinary(InputStream contents) throws IOException
{
File tempFile = getTempFile();
@@ -128,11 +131,13 @@ public class CDOLobStoreImpl implements CDOLobStore
return new CDOLobInfo(id, size);
}
+ @Override
public File getCharacterFile(byte[] id)
{
return new File(getFolder(), HexUtil.bytesToHex(id) + ".clob");
}
+ @Override
public Reader getCharacter(CDOLobInfo info) throws IOException
{
File file = getCharacterFile(info.getID());
@@ -143,6 +148,7 @@ public class CDOLobStoreImpl implements CDOLobStore
}
+ @Override
public CDOLobInfo putCharacter(Reader contents) throws IOException
{
File tempFile = getTempFile();
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/admin/AbstractCDOAdmin.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/admin/AbstractCDOAdmin.java
index 108bfe1c18..0739bcaac5 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/admin/AbstractCDOAdmin.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/admin/AbstractCDOAdmin.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2015, 2016 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2012, 2015, 2016, 2019 Eike Stepper (Loehne, Germany) 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
@@ -43,21 +43,25 @@ public abstract class AbstractCDOAdmin extends SetContainer<CDOAdminRepository>
return timeout;
}
+ @Override
public boolean isClosed()
{
return !isActive();
}
+ @Override
public void close()
{
deactivate();
}
+ @Override
public CDOAdminRepository[] getRepositories()
{
return getElements();
}
+ @Override
public synchronized CDOAdminRepository getRepository(String name)
{
for (CDOAdminRepository repository : getSet())
@@ -71,6 +75,7 @@ public abstract class AbstractCDOAdmin extends SetContainer<CDOAdminRepository>
return null;
}
+ @Override
public CDOAdminRepository waitForRepository(String name)
{
checkActive();
@@ -99,6 +104,7 @@ public abstract class AbstractCDOAdmin extends SetContainer<CDOAdminRepository>
}
}
+ @Override
public CDOAdminRepository createRepository(String name, String type, Map<String, Object> properties)
{
checkActive();
@@ -152,6 +158,7 @@ public abstract class AbstractCDOAdmin extends SetContainer<CDOAdminRepository>
{
Arrays.sort(array, new Comparator<CDOAdminRepository>()
{
+ @Override
public int compare(CDOAdminRepository r1, CDOAdminRepository r2)
{
return r1.getName().compareTo(r2.getName());
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/branch/CDOBranchUtil.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/branch/CDOBranchUtil.java
index fdc78063f5..2456eb8bae 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/branch/CDOBranchUtil.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/branch/CDOBranchUtil.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2013, 2015, 2016 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2010-2013, 2015, 2016, 2019 Eike Stepper (Loehne, Germany) 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
@@ -277,11 +277,13 @@ public final class CDOBranchUtil
*/
private static final class AutoBranchPoint implements CDOBranchPoint
{
+ @Override
public long getTimeStamp()
{
return Long.MIN_VALUE;
}
+ @Override
public CDOBranch getBranch()
{
return null;
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/branch/InternalCDOBranch.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/branch/InternalCDOBranch.java
index 21f3dc96b1..880fd66cf3 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/branch/InternalCDOBranch.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/branch/InternalCDOBranch.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2013, 2015 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2010-2013, 2015, 2019 Eike Stepper (Loehne, Germany) 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
@@ -25,8 +25,10 @@ public interface InternalCDOBranch extends CDOBranch
{
public boolean isProxy();
+ @Override
public InternalCDOBranchManager getBranchManager();
+ @Override
public InternalCDOBranch[] getBranches();
/**
@@ -34,10 +36,13 @@ public interface InternalCDOBranch extends CDOBranch
*/
public InternalCDOBranch[] getBranches(boolean loadOnDemand);
+ @Override
public InternalCDOBranch getBranch(String path);
+ @Override
public InternalCDOBranch createBranch(String name, long timeStamp);
+ @Override
public InternalCDOBranch createBranch(String name);
public BranchInfo getBranchInfo();
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/branch/InternalCDOBranchManager.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/branch/InternalCDOBranchManager.java
index d11083bb1f..4d1ba43654 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/branch/InternalCDOBranchManager.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/branch/InternalCDOBranchManager.java
@@ -57,14 +57,17 @@ public interface InternalCDOBranchManager extends CDOBranchManager, ILifecycle
*/
public void initMainBranch(boolean local, long timestamp);
+ @Override
public InternalCDOBranch getMainBranch();
+ @Override
public InternalCDOBranch getBranch(int branchID);
public InternalCDOBranch getBranch(int id, String name, InternalCDOBranch baseBranch, long baseTimeStamp);
public InternalCDOBranch getBranch(int id, BranchInfo branchInfo);
+ @Override
public InternalCDOBranch getBranch(String path);
public InternalCDOBranch createBranch(int id, String name, InternalCDOBranch baseBranch, long baseTimeStamp);
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/commit/CDOChangeKindCache.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/commit/CDOChangeKindCache.java
index d7a6762e8f..d5e7c1bfee 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/commit/CDOChangeKindCache.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/commit/CDOChangeKindCache.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2012, 2015, 2016 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2010-2012, 2015, 2016, 2019 Eike Stepper (Loehne, Germany) 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
@@ -60,6 +60,7 @@ public class CDOChangeKindCache extends HashMap<CDOID, CDOChangeKind> implements
}
}
+ @Override
public CDOChangeKind getChangeKind(CDOID id)
{
return get(id);
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/commit/CDOChangeSetDataRevisionProvider.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/commit/CDOChangeSetDataRevisionProvider.java
index 3d54d9509a..0a6b2a7158 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/commit/CDOChangeSetDataRevisionProvider.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/commit/CDOChangeSetDataRevisionProvider.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2014, 2016 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2010-2014, 2016, 2019 Eike Stepper (Loehne, Germany) 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
@@ -33,11 +33,13 @@ public class CDOChangeSetDataRevisionProvider implements CDORevisionProvider, CD
{
private static final CDOIDAndVersion DETACHED = new CDOIDAndVersion()
{
+ @Override
public CDOID getID()
{
return CDOID.NULL;
}
+ @Override
public int getVersion()
{
return Integer.MIN_VALUE;
@@ -74,11 +76,13 @@ public class CDOChangeSetDataRevisionProvider implements CDORevisionProvider, CD
this(delegate, changeSetData, null, null);
}
+ @Override
public CDOChangeSetData getChangeSetData()
{
return changeSetData;
}
+ @Override
public synchronized CDORevision getRevision(CDOID id)
{
if (cachedRevisions == null)
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/commit/CDOChangeSetSegment.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/commit/CDOChangeSetSegment.java
index e8621a0bc8..2635a540a3 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/commit/CDOChangeSetSegment.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/commit/CDOChangeSetSegment.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2013, 2016 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2010-2013, 2016, 2019 Eike Stepper (Loehne, Germany) 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
@@ -36,11 +36,13 @@ public class CDOChangeSetSegment implements CDOBranchPoint
this.endTime = endTime;
}
+ @Override
public CDOBranch getBranch()
{
return branchPoint.getBranch();
}
+ @Override
public long getTimeStamp()
{
return branchPoint.getTimeStamp();
@@ -162,6 +164,7 @@ public class CDOChangeSetSegment implements CDOBranchPoint
handleSegments(startTime, endPoint, new Handler()
{
+ @Override
public boolean handleSegment(CDOChangeSetSegment segment)
{
result.addFirst(segment);
@@ -178,6 +181,7 @@ public class CDOChangeSetSegment implements CDOBranchPoint
handleSegments(startPoint, endPoint, new Handler()
{
+ @Override
public boolean handleSegment(CDOChangeSetSegment segment)
{
result.addFirst(segment);
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/commit/CDORevisionAvailabilityInfo.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/commit/CDORevisionAvailabilityInfo.java
index 27259a4ca4..984823c78a 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/commit/CDORevisionAvailabilityInfo.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/commit/CDORevisionAvailabilityInfo.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2013, 2016 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2010-2013, 2016, 2019 Eike Stepper (Loehne, Germany) 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
@@ -82,6 +82,7 @@ public final class CDORevisionAvailabilityInfo implements CDORevisionProvider
return availableRevisions.containsKey(id);
}
+ @Override
public CDORevision getRevision(CDOID id)
{
CDORevision revision = (CDORevision)availableRevisions.get(id);
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/id/AbstractCDOID.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/id/AbstractCDOID.java
index c97a5541ca..d269ee6e13 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/id/AbstractCDOID.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/id/AbstractCDOID.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009-2013, 2018 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2009-2013, 2018, 2019 Eike Stepper (Loehne, Germany) 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
@@ -37,6 +37,7 @@ public abstract class AbstractCDOID implements CDOID
/**
* @since 4.2
*/
+ @Override
public boolean isNull()
{
return false;
@@ -45,6 +46,7 @@ public abstract class AbstractCDOID implements CDOID
/**
* @since 4.6
*/
+ @Override
public boolean isNil()
{
return false;
@@ -53,6 +55,7 @@ public abstract class AbstractCDOID implements CDOID
/**
* @since 4.2
*/
+ @Override
@Deprecated
public final boolean isDangling()
{
@@ -97,6 +100,7 @@ public abstract class AbstractCDOID implements CDOID
return toURIFragment();
}
+ @Override
public final int compareTo(CDOID o)
{
try
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/model/DelegatingCDOPackageRegistry.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/model/DelegatingCDOPackageRegistry.java
index ff7cfaf56e..9fbcababb0 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/model/DelegatingCDOPackageRegistry.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/model/DelegatingCDOPackageRegistry.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2011, 2012, 2019 Eike Stepper (Loehne, Germany) 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
@@ -34,141 +34,169 @@ public abstract class DelegatingCDOPackageRegistry extends Lifecycle implements
protected abstract InternalCDOPackageRegistry getDelegate();
+ @Override
public Object basicPut(String nsURI, Object value)
{
return getDelegate().basicPut(nsURI, value);
}
+ @Override
public void clear()
{
getDelegate().clear();
}
+ @Override
public boolean containsKey(Object key)
{
return getDelegate().containsKey(key);
}
+ @Override
public boolean containsValue(Object value)
{
return getDelegate().containsValue(value);
}
+ @Override
public Set<java.util.Map.Entry<String, Object>> entrySet()
{
return getDelegate().entrySet();
}
+ @Override
public Object get(Object key)
{
return getDelegate().get(key);
}
+ @Override
public EFactory getEFactory(String nsURI)
{
return getDelegate().getEFactory(nsURI);
}
+ @Override
public EPackage getEPackage(String nsURI)
{
return getDelegate().getEPackage(nsURI);
}
+ @Override
public EPackage[] getEPackages()
{
return getDelegate().getEPackages();
}
+ @Override
public InternalCDOPackageInfo getPackageInfo(EPackage ePackage)
{
return getDelegate().getPackageInfo(ePackage);
}
+ @Override
public InternalCDOPackageInfo[] getPackageInfos()
{
return getDelegate().getPackageInfos();
}
+ @Override
public PackageLoader getPackageLoader()
{
return getDelegate().getPackageLoader();
}
+ @Override
public PackageProcessor getPackageProcessor()
{
return getDelegate().getPackageProcessor();
}
+ @Override
public InternalCDOPackageUnit getPackageUnit(EPackage ePackage)
{
return getDelegate().getPackageUnit(ePackage);
}
+ @Override
public InternalCDOPackageUnit[] getPackageUnits()
{
return getDelegate().getPackageUnits();
}
+ @Override
public boolean isEmpty()
{
return getDelegate().isEmpty();
}
+ @Override
public boolean isReplacingDescriptors()
{
return getDelegate().isReplacingDescriptors();
}
+ @Override
public Set<String> keySet()
{
return getDelegate().keySet();
}
+ @Override
public Object put(String key, Object value)
{
return getDelegate().put(key, value);
}
+ @Override
public void putAll(Map<? extends String, ? extends Object> t)
{
getDelegate().putAll(t);
}
+ @Override
public Object putEPackage(EPackage ePackage)
{
return getDelegate().putEPackage(ePackage);
}
+ @Override
public void putPackageUnit(InternalCDOPackageUnit packageUnit)
{
getDelegate().putPackageUnit(packageUnit);
}
+ @Override
public Object remove(Object key)
{
return getDelegate().remove(key);
}
+ @Override
public void setPackageLoader(PackageLoader packageLoader)
{
getDelegate().setPackageLoader(packageLoader);
}
+ @Override
public void setPackageProcessor(PackageProcessor packageProcessor)
{
getDelegate().setPackageProcessor(packageProcessor);
}
+ @Override
public void setReplacingDescriptors(boolean replacingDescriptors)
{
getDelegate().setReplacingDescriptors(replacingDescriptors);
}
+ @Override
public int size()
{
return getDelegate().size();
}
+ @Override
public Collection<Object> values()
{
return getDelegate().values();
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/model/InternalCDOPackageInfo.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/model/InternalCDOPackageInfo.java
index d9ba7dd8d9..43e511c612 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/model/InternalCDOPackageInfo.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/model/InternalCDOPackageInfo.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009-2013, 2015 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2009-2013, 2015, 2019 Eike Stepper (Loehne, Germany) 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
@@ -29,6 +29,7 @@ import java.io.IOException;
*/
public interface InternalCDOPackageInfo extends CDOPackageInfo, Adapter.Internal
{
+ @Override
public InternalCDOPackageUnit getPackageUnit();
public void setPackageUnit(InternalCDOPackageUnit packageUnit);
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/model/InternalCDOPackageRegistry.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/model/InternalCDOPackageRegistry.java
index 12f22ab541..52e6f90b35 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/model/InternalCDOPackageRegistry.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/model/InternalCDOPackageRegistry.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009-2013 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2009-2013, 2019 Eike Stepper (Loehne, Germany) 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
@@ -62,10 +62,13 @@ public interface InternalCDOPackageRegistry extends CDOPackageRegistry, ILifecyc
/**
* @since 3.0
*/
+ @Override
public InternalCDOPackageUnit getPackageUnit(String id);
+ @Override
public InternalCDOPackageUnit getPackageUnit(EPackage ePackage);
+ @Override
public InternalCDOPackageUnit[] getPackageUnits();
/**
@@ -76,10 +79,13 @@ public interface InternalCDOPackageRegistry extends CDOPackageRegistry, ILifecyc
/**
* @since 3.0
*/
+ @Override
public InternalCDOPackageUnit[] getPackageUnits(long startTime, long endTime);
+ @Override
public InternalCDOPackageInfo getPackageInfo(EPackage ePackage);
+ @Override
public InternalCDOPackageInfo[] getPackageInfos();
public EPackage[] getEPackages();
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/model/InternalCDOPackageUnit.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/model/InternalCDOPackageUnit.java
index 40ffd1bf3f..6fd119c7bc 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/model/InternalCDOPackageUnit.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/model/InternalCDOPackageUnit.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009-2012, 2015 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2009-2012, 2015, 2019 Eike Stepper (Loehne, Germany) 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
@@ -30,6 +30,7 @@ import java.io.IOException;
*/
public interface InternalCDOPackageUnit extends CDOPackageUnit
{
+ @Override
public InternalCDOPackageRegistry getPackageRegistry();
public void setPackageRegistry(InternalCDOPackageRegistry packageRegistry);
@@ -40,10 +41,13 @@ public interface InternalCDOPackageUnit extends CDOPackageUnit
public void setTimeStamp(long timeStamp);
+ @Override
public InternalCDOPackageInfo getTopLevelPackageInfo();
+ @Override
public InternalCDOPackageInfo getPackageInfo(String packageURI);
+ @Override
public InternalCDOPackageInfo[] getPackageInfos();
public void setPackageInfos(InternalCDOPackageInfo[] packageInfos);
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/protocol/CDODataInputImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/protocol/CDODataInputImpl.java
index 97f7a540a5..d9c1f2544e 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/protocol/CDODataInputImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/protocol/CDODataInputImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2017 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2012-2017, 2019 Eike Stepper (Loehne, Germany) 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
@@ -123,6 +123,7 @@ public abstract class CDODataInputImpl extends ExtendedDataInput.Delegating impl
/**
* @since 4.6
*/
+ @Override
public int readXInt() throws IOException
{
if (isXCompression())
@@ -136,6 +137,7 @@ public abstract class CDODataInputImpl extends ExtendedDataInput.Delegating impl
/**
* @since 4.6
*/
+ @Override
public long readXLong() throws IOException
{
if (isXCompression())
@@ -146,6 +148,7 @@ public abstract class CDODataInputImpl extends ExtendedDataInput.Delegating impl
return readLong();
}
+ @Override
public CDOPackageUnit readCDOPackageUnit(ResourceSet resourceSet) throws IOException
{
InternalCDOPackageUnit packageUnit = (InternalCDOPackageUnit)CDOModelUtil.createPackageUnit();
@@ -153,6 +156,7 @@ public abstract class CDODataInputImpl extends ExtendedDataInput.Delegating impl
return packageUnit;
}
+ @Override
public CDOPackageUnit[] readCDOPackageUnits(ResourceSet resourceSet) throws IOException
{
int size = readXInt();
@@ -170,11 +174,13 @@ public abstract class CDODataInputImpl extends ExtendedDataInput.Delegating impl
return packageUnits;
}
+ @Override
public CDOPackageUnit.Type readCDOPackageUnitType() throws IOException
{
return CDOPackageUnit.Type.values()[readByte()];
}
+ @Override
public CDOPackageInfo readCDOPackageInfo() throws IOException
{
InternalCDOPackageInfo packageInfo = (InternalCDOPackageInfo)CDOModelUtil.createPackageInfo();
@@ -182,16 +188,19 @@ public abstract class CDODataInputImpl extends ExtendedDataInput.Delegating impl
return packageInfo;
}
+ @Override
public String readCDOPackageURI() throws IOException
{
return getPackageURICompressor().read(this);
}
+ @Override
public CDOClassifierRef readCDOClassifierRef() throws IOException
{
return new CDOClassifierRef(this);
}
+ @Override
public EClassifier readCDOClassifierRefAndResolve() throws IOException
{
CDOClassifierRef classifierRef = readCDOClassifierRef();
@@ -204,12 +213,14 @@ public abstract class CDODataInputImpl extends ExtendedDataInput.Delegating impl
return classifier;
}
+ @Override
public CDOType readCDOType() throws IOException
{
byte typeID = readByte();
return CDOModelUtil.getType(typeID);
}
+ @Override
public CDOBranch readCDOBranch() throws IOException
{
int branchID = readXInt();
@@ -222,6 +233,7 @@ public abstract class CDODataInputImpl extends ExtendedDataInput.Delegating impl
return branch;
}
+ @Override
public CDOBranchPoint readCDOBranchPoint() throws IOException
{
CDOBranch branch = readCDOBranch();
@@ -229,6 +241,7 @@ public abstract class CDODataInputImpl extends ExtendedDataInput.Delegating impl
return branch.getPoint(timeStamp);
}
+ @Override
public CDOBranchVersion readCDOBranchVersion() throws IOException
{
CDOBranch branch = readCDOBranch();
@@ -236,6 +249,7 @@ public abstract class CDODataInputImpl extends ExtendedDataInput.Delegating impl
return branch.getVersion(version);
}
+ @Override
public CDOChangeSetData readCDOChangeSetData() throws IOException
{
int size1 = readXInt();
@@ -280,6 +294,7 @@ public abstract class CDODataInputImpl extends ExtendedDataInput.Delegating impl
return new CDOChangeSetDataImpl(newObjects, changedObjects, detachedObjects);
}
+ @Override
public CDOCommitData readCDOCommitData() throws IOException
{
InternalCDOPackageRegistry packageRegistry = (InternalCDOPackageRegistry)getPackageRegistry();
@@ -299,6 +314,7 @@ public abstract class CDODataInputImpl extends ExtendedDataInput.Delegating impl
return CDOCommitInfoUtil.createCommitData(newPackageUnits, data.getNewObjects(), data.getChangedObjects(), data.getDetachedObjects());
}
+ @Override
public CDOCommitInfo readCDOCommitInfo() throws IOException
{
InternalCDOCommitInfoManager commitInfoManager = (InternalCDOCommitInfoManager)getCommitInfoManager();
@@ -319,6 +335,7 @@ public abstract class CDODataInputImpl extends ExtendedDataInput.Delegating impl
return new FailureCommitInfo(commitInfoManager, timeStamp, previousTimeStamp);
}
+ @Override
public CDOLockChangeInfo readCDOLockChangeInfo() throws IOException
{
boolean isInvalidateAll = readBoolean();
@@ -342,6 +359,7 @@ public abstract class CDODataInputImpl extends ExtendedDataInput.Delegating impl
return new CDOLockChangeInfoImpl(branchPoint, lockOwner, lockStates, operation, lockType);
}
+ @Override
public LockArea readCDOLockArea() throws IOException
{
String durableLockingID = readString();
@@ -362,6 +380,7 @@ public abstract class CDODataInputImpl extends ExtendedDataInput.Delegating impl
return new CDOLockAreaImpl(durableLockingID, userID, branch.getPoint(timestamp), readOnly, locks);
}
+ @Override
public CDOLockOwner readCDOLockOwner() throws IOException
{
int session = readXInt();
@@ -371,6 +390,7 @@ public abstract class CDODataInputImpl extends ExtendedDataInput.Delegating impl
return new CDOLockOwnerImpl(session, view, lockAreaID, isDurableView);
}
+ @Override
public CDOLockState readCDOLockState() throws IOException
{
Object target;
@@ -410,21 +430,25 @@ public abstract class CDODataInputImpl extends ExtendedDataInput.Delegating impl
return lockState;
}
+ @Override
public LockType readCDOLockType() throws IOException
{
return readEnum(LockType.class);
}
+ @Override
public CDOID readCDOID() throws IOException
{
return CDOIDUtil.read(this);
}
+ @Override
public CDOIDReference readCDOIDReference() throws IOException
{
return new CDOIDReference(this);
}
+ @Override
public CDOIDAndVersion readCDOIDAndVersion() throws IOException
{
CDOID id = readCDOID();
@@ -432,6 +456,7 @@ public abstract class CDODataInputImpl extends ExtendedDataInput.Delegating impl
return new CDOIDAndVersionImpl(id, version);
}
+ @Override
public CDOIDAndBranch readCDOIDAndBranch() throws IOException
{
CDOID id = readCDOID();
@@ -439,6 +464,7 @@ public abstract class CDODataInputImpl extends ExtendedDataInput.Delegating impl
return new CDOIDAndBranchImpl(id, branch);
}
+ @Override
public CDORevisionKey readCDORevisionKey() throws IOException
{
CDOID id = readCDOID();
@@ -447,11 +473,13 @@ public abstract class CDODataInputImpl extends ExtendedDataInput.Delegating impl
return CDORevisionUtil.createRevisionKey(id, branch, version);
}
+ @Override
public CDORevision readCDORevision() throws IOException
{
return readCDORevision(true);
}
+ @Override
public CDORevision readCDORevision(boolean freeze) throws IOException
{
boolean notNull = readBoolean();
@@ -471,6 +499,7 @@ public abstract class CDODataInputImpl extends ExtendedDataInput.Delegating impl
return null;
}
+ @Override
public CDORevisable readCDORevisable() throws IOException
{
CDOBranch branch = readCDOBranch();
@@ -480,6 +509,7 @@ public abstract class CDODataInputImpl extends ExtendedDataInput.Delegating impl
return CDORevisionUtil.createRevisable(branch, version, timeStamp, revised);
}
+ @Override
public CDOList readCDOList(EClass owner, EStructuralFeature feature) throws IOException
{
int referenceChunk;
@@ -585,6 +615,7 @@ public abstract class CDODataInputImpl extends ExtendedDataInput.Delegating impl
return list;
}
+ @Override
public Object readCDOFeatureValue(EStructuralFeature feature) throws IOException
{
CDOType type = CDOModelUtil.getType(feature);
@@ -598,11 +629,13 @@ public abstract class CDODataInputImpl extends ExtendedDataInput.Delegating impl
return value;
}
+ @Override
public CDORevisionDelta readCDORevisionDelta() throws IOException
{
return new CDORevisionDeltaImpl(this);
}
+ @Override
public CDOFeatureDelta readCDOFeatureDelta(EClass owner) throws IOException
{
int typeOrdinal = readXInt();
@@ -638,12 +671,14 @@ public abstract class CDODataInputImpl extends ExtendedDataInput.Delegating impl
}
}
+ @Override
public Object readCDORevisionOrPrimitive() throws IOException
{
CDOType type = readCDOType();
return type.readValue(this);
}
+ @Override
public Object readCDORevisionOrPrimitiveOrClassifier() throws IOException
{
boolean isClassifier = readBoolean();
@@ -696,6 +731,7 @@ public abstract class CDODataInputImpl extends ExtendedDataInput.Delegating impl
throw new UnsupportedOperationException();
}
+ @Override
public CDOPackageRegistry getPackageRegistry()
{
throw new UnsupportedOperationException();
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/protocol/CDODataOutputImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/protocol/CDODataOutputImpl.java
index ed80ebb2ff..8fce04e48e 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/protocol/CDODataOutputImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/protocol/CDODataOutputImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2017 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2012-2017, 2019 Eike Stepper (Loehne, Germany) 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
@@ -91,6 +91,7 @@ public class CDODataOutputImpl extends ExtendedDataOutput.Delegating implements
/**
* @since 4.6
*/
+ @Override
public void writeXInt(int v) throws IOException
{
if (isXCompression())
@@ -106,6 +107,7 @@ public class CDODataOutputImpl extends ExtendedDataOutput.Delegating implements
/**
* @since 4.6
*/
+ @Override
public void writeXLong(long v) throws IOException
{
if (isXCompression())
@@ -118,11 +120,13 @@ public class CDODataOutputImpl extends ExtendedDataOutput.Delegating implements
}
}
+ @Override
public void writeCDOPackageUnit(CDOPackageUnit packageUnit, boolean withPackages) throws IOException
{
((InternalCDOPackageUnit)packageUnit).write(this, withPackages);
}
+ @Override
public void writeCDOPackageUnits(CDOPackageUnit... packageUnits) throws IOException
{
int size = packageUnits.length;
@@ -138,53 +142,63 @@ public class CDODataOutputImpl extends ExtendedDataOutput.Delegating implements
}
}
+ @Override
public void writeCDOPackageUnitType(CDOPackageUnit.Type type) throws IOException
{
writeByte(type.ordinal());
}
+ @Override
public void writeCDOPackageInfo(CDOPackageInfo packageInfo) throws IOException
{
((InternalCDOPackageInfo)packageInfo).write(this);
}
+ @Override
public void writeCDOClassifierRef(CDOClassifierRef eClassifierRef) throws IOException
{
eClassifierRef.write(this);
}
+ @Override
public void writeCDOClassifierRef(EClassifier eClassifier) throws IOException
{
writeCDOClassifierRef(new CDOClassifierRef(eClassifier));
}
+ @Override
public void writeCDOPackageURI(String uri) throws IOException
{
getPackageURICompressor().write(this, uri);
}
+ @Override
public void writeCDOType(CDOType cdoType) throws IOException
{
((CDOTypeImpl)cdoType).write(this);
}
+ @Override
public void writeCDOBranch(CDOBranch branch) throws IOException
{
writeXInt(branch.getID());
}
+ @Override
public void writeCDOBranchPoint(CDOBranchPoint branchPoint) throws IOException
{
writeCDOBranch(branchPoint.getBranch());
writeXLong(branchPoint.getTimeStamp());
}
+ @Override
public void writeCDOBranchVersion(CDOBranchVersion branchVersion) throws IOException
{
writeCDOBranch(branchVersion.getBranch());
writeXInt(branchVersion.getVersion());
}
+ @Override
public void writeCDOChangeSetData(CDOChangeSetData changeSetData) throws IOException
{
Collection<CDOIDAndVersion> newObjects = changeSetData.getNewObjects();
@@ -236,6 +250,7 @@ public class CDODataOutputImpl extends ExtendedDataOutput.Delegating implements
}
}
+ @Override
public void writeCDOCommitData(CDOCommitData commitData) throws IOException
{
Collection<CDOPackageUnit> newPackageUnits = commitData.getNewPackageUnits();
@@ -248,6 +263,7 @@ public class CDODataOutputImpl extends ExtendedDataOutput.Delegating implements
writeCDOChangeSetData(commitData);
}
+ @Override
public void writeCDOCommitInfo(CDOCommitInfo commitInfo) throws IOException
{
writeXLong(commitInfo.getTimeStamp());
@@ -270,6 +286,7 @@ public class CDODataOutputImpl extends ExtendedDataOutput.Delegating implements
}
}
+ @Override
public void writeCDOLockChangeInfo(CDOLockChangeInfo lockChangeInfo) throws IOException
{
if (lockChangeInfo.isInvalidateAll())
@@ -293,6 +310,7 @@ public class CDODataOutputImpl extends ExtendedDataOutput.Delegating implements
}
}
+ @Override
public void writeCDOLockArea(LockArea lockArea) throws IOException
{
writeString(lockArea.getDurableLockingID());
@@ -309,6 +327,7 @@ public class CDODataOutputImpl extends ExtendedDataOutput.Delegating implements
}
}
+ @Override
public void writeCDOLockOwner(CDOLockOwner lockOwner) throws IOException
{
writeXInt(lockOwner.getSessionID());
@@ -317,6 +336,7 @@ public class CDODataOutputImpl extends ExtendedDataOutput.Delegating implements
writeBoolean(lockOwner.isDurableView());
}
+ @Override
public void writeCDOLockState(CDOLockState lockState) throws IOException
{
Object o = lockState.getLockedObject();
@@ -365,33 +385,39 @@ public class CDODataOutputImpl extends ExtendedDataOutput.Delegating implements
}
}
+ @Override
public void writeCDOLockType(LockType lockType) throws IOException
{
writeEnum(lockType);
}
+ @Override
public void writeCDOID(CDOID id) throws IOException
{
CDOIDUtil.write(this, id);
}
+ @Override
public void writeCDOIDReference(CDOIDReference idReference) throws IOException
{
idReference.write(this);
}
+ @Override
public void writeCDOIDAndVersion(CDOIDAndVersion idAndVersion) throws IOException
{
writeCDOID(idAndVersion.getID());
writeXInt(idAndVersion.getVersion());
}
+ @Override
public void writeCDOIDAndBranch(CDOIDAndBranch idAndBranch) throws IOException
{
writeCDOID(idAndBranch.getID());
writeCDOBranch(idAndBranch.getBranch());
}
+ @Override
public void writeCDORevisionKey(CDORevisionKey revisionKey) throws IOException
{
writeCDOID(revisionKey.getID());
@@ -399,11 +425,13 @@ public class CDODataOutputImpl extends ExtendedDataOutput.Delegating implements
writeXInt(revisionKey.getVersion());
}
+ @Override
public void writeCDORevision(CDORevision revision, int referenceChunk) throws IOException
{
writeCDORevision(revision, referenceChunk, null);
}
+ @Override
public void writeCDORevision(CDORevision revision, int referenceChunk, CDOBranchPoint securityContext) throws IOException
{
if (revision != null)
@@ -417,6 +445,7 @@ public class CDODataOutputImpl extends ExtendedDataOutput.Delegating implements
}
}
+ @Override
public void writeCDORevisable(CDORevisable revisable) throws IOException
{
writeCDOBranch(revisable.getBranch());
@@ -425,6 +454,7 @@ public class CDODataOutputImpl extends ExtendedDataOutput.Delegating implements
writeXLong(revisable.getRevised());
}
+ @Override
public void writeCDOList(EClass owner, EStructuralFeature feature, CDOList list, int referenceChunk) throws IOException
{
// TODO Simon: Could most of this stuff be moved into the list?
@@ -515,22 +545,26 @@ public class CDODataOutputImpl extends ExtendedDataOutput.Delegating implements
}
}
+ @Override
public void writeCDOFeatureValue(EStructuralFeature feature, Object value) throws IOException
{
CDOType type = CDOModelUtil.getType(feature);
type.writeValue(this, value);
}
+ @Override
public void writeCDORevisionDelta(CDORevisionDelta revisionDelta) throws IOException
{
((CDORevisionDeltaImpl)revisionDelta).write(this);
}
+ @Override
public void writeCDOFeatureDelta(EClass owner, CDOFeatureDelta featureDelta) throws IOException
{
((CDOFeatureDeltaImpl)featureDelta).write(this, owner);
}
+ @Override
public void writeCDORevisionOrPrimitive(Object value) throws IOException
{
// Value conversions
@@ -570,6 +604,7 @@ public class CDODataOutputImpl extends ExtendedDataOutput.Delegating implements
type.writeValue(this, value);
}
+ @Override
public void writeCDORevisionOrPrimitiveOrClassifier(Object value) throws IOException
{
if (value instanceof EClassifier)
@@ -584,16 +619,19 @@ public class CDODataOutputImpl extends ExtendedDataOutput.Delegating implements
}
}
+ @Override
public CDOPackageRegistry getPackageRegistry()
{
return null;
}
+ @Override
public CDOIDProvider getIDProvider()
{
return null;
}
+ @Override
public CDOPermissionProvider getPermissionProvider()
{
return CDORevision.PERMISSION_PROVIDER;
@@ -602,6 +640,7 @@ public class CDODataOutputImpl extends ExtendedDataOutput.Delegating implements
/**
* @since 4.3
*/
+ @Override
public CDORevisionUnchunker getRevisionUnchunker()
{
return null;
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/AbstractCDORevision.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/AbstractCDORevision.java
index ab02c14604..72af3ac9da 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/AbstractCDORevision.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/AbstractCDORevision.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009-2013, 2015, 2018 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2009-2013, 2015, 2018, 2019 Eike Stepper (Loehne, Germany) 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
@@ -73,11 +73,13 @@ public abstract class AbstractCDORevision implements InternalCDORevision
/**
* @since 4.2
*/
+ @Override
public final InternalCDOClassInfo getClassInfo()
{
return classInfo;
}
+ @Override
public final EClass getEClass()
{
if (classInfo != null)
@@ -91,6 +93,7 @@ public abstract class AbstractCDORevision implements InternalCDORevision
/**
* @since 4.2
*/
+ @Override
public InternalCDORevision getRevisionForID(CDOID id)
{
if (id != null && id.equals(getID()))
@@ -104,31 +107,37 @@ public abstract class AbstractCDORevision implements InternalCDORevision
/**
* @since 4.2
*/
+ @Override
public InternalCDORevision getProperRevision()
{
return this;
}
+ @Override
public boolean isResourceNode()
{
return classInfo.isResourceNode();
}
+ @Override
public boolean isResourceFolder()
{
return classInfo.isResourceFolder();
}
+ @Override
public boolean isResource()
{
return classInfo.isResource();
}
+ @Override
public CDORevisionData data()
{
return this;
}
+ @Override
public CDORevision revision()
{
return this;
@@ -137,11 +146,13 @@ public abstract class AbstractCDORevision implements InternalCDORevision
/**
* @since 3.0
*/
+ @Override
public boolean isHistorical()
{
return getRevised() != UNSPECIFIED_DATE;
}
+ @Override
public boolean isValid(long timeStamp)
{
long startTime = getTimeStamp();
@@ -152,6 +163,7 @@ public abstract class AbstractCDORevision implements InternalCDORevision
/**
* @since 4.0
*/
+ @Override
public boolean isValid(CDOBranchPoint branchPoint)
{
return getBranch() == branchPoint.getBranch() && isValid(branchPoint.getTimeStamp());
@@ -160,6 +172,7 @@ public abstract class AbstractCDORevision implements InternalCDORevision
/**
* @since 4.1
*/
+ @Override
public boolean isReadable()
{
return getPermission().isReadable();
@@ -168,6 +181,7 @@ public abstract class AbstractCDORevision implements InternalCDORevision
/**
* @since 4.1
*/
+ @Override
public boolean isWritable()
{
return getPermission().isWritable();
@@ -176,6 +190,7 @@ public abstract class AbstractCDORevision implements InternalCDORevision
/**
* @since 4.2
*/
+ @Override
public void accept(CDORevisionValueVisitor visitor)
{
accept(visitor, Predicates.<EStructuralFeature> alwaysTrue());
@@ -184,6 +199,7 @@ public abstract class AbstractCDORevision implements InternalCDORevision
/**
* @since 4.2
*/
+ @Override
public void accept(CDORevisionValueVisitor visitor, Predicate<EStructuralFeature> filter)
{
for (EStructuralFeature feature : classInfo.getAllPersistentFeatures())
@@ -214,6 +230,7 @@ public abstract class AbstractCDORevision implements InternalCDORevision
/**
* @since 3.0
*/
+ @Override
public void adjustForCommit(CDOBranch branch, long timeStamp)
{
if (branch == getBranch())
@@ -284,12 +301,14 @@ public abstract class AbstractCDORevision implements InternalCDORevision
return string;
}
+ @Override
@Deprecated
public CDOList getList(EStructuralFeature feature)
{
return getOrCreateList(feature);
}
+ @Override
@Deprecated
public CDOList getList(EStructuralFeature feature, int initialCapacity)
{
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/BaseCDORevision.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/BaseCDORevision.java
index c1771dddc6..a86907bb1c 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/BaseCDORevision.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/BaseCDORevision.java
@@ -157,6 +157,7 @@ public abstract class BaseCDORevision extends AbstractCDORevision
/**
* @since 3.0
*/
+ @Override
public void read(CDODataInput in) throws IOException
{
if (READING.isEnabled())
@@ -236,6 +237,7 @@ public abstract class BaseCDORevision extends AbstractCDORevision
/**
* @since 4.3
*/
+ @Override
public boolean readValues(CDODataInput in) throws IOException
{
EClass owner = getEClass();
@@ -300,6 +302,7 @@ public abstract class BaseCDORevision extends AbstractCDORevision
/**
* @since 4.0
*/
+ @Override
public void write(CDODataOutput out, int referenceChunk) throws IOException
{
write(out, referenceChunk, null);
@@ -308,6 +311,7 @@ public abstract class BaseCDORevision extends AbstractCDORevision
/**
* @since 4.1
*/
+ @Override
public void write(CDODataOutput out, int referenceChunk, CDOBranchPoint securityContext) throws IOException
{
if (WRITING.isEnabled())
@@ -386,6 +390,7 @@ public abstract class BaseCDORevision extends AbstractCDORevision
/**
* @since 4.3
*/
+ @Override
public void writeValues(CDODataOutput out, int referenceChunk) throws IOException
{
EClass owner = getEClass();
@@ -443,6 +448,7 @@ public abstract class BaseCDORevision extends AbstractCDORevision
* @see #write(CDODataOutput, int)
* @since 3.0
*/
+ @Override
public void convertEObjects(CDOIDProvider idProvider)
{
if (!(containerID instanceof CDOID))
@@ -498,11 +504,13 @@ public abstract class BaseCDORevision extends AbstractCDORevision
}
}
+ @Override
public CDOID getID()
{
return id;
}
+ @Override
public void setID(CDOID id)
{
if (CDOIDUtil.isNull(id))
@@ -521,6 +529,7 @@ public abstract class BaseCDORevision extends AbstractCDORevision
/**
* @since 4.2
*/
+ @Override
public InternalCDOBranch getBranch()
{
if (branchPoint == null)
@@ -534,6 +543,7 @@ public abstract class BaseCDORevision extends AbstractCDORevision
/**
* @since 3.0
*/
+ @Override
public long getTimeStamp()
{
if (branchPoint == null)
@@ -547,6 +557,7 @@ public abstract class BaseCDORevision extends AbstractCDORevision
/**
* @since 3.0
*/
+ @Override
public void setBranchPoint(CDOBranchPoint branchPoint)
{
branchPoint = CDOBranchUtil.copyBranchPoint(branchPoint);
@@ -558,11 +569,13 @@ public abstract class BaseCDORevision extends AbstractCDORevision
this.branchPoint = branchPoint;
}
+ @Override
public int getVersion()
{
return version;
}
+ @Override
public void setVersion(int version)
{
if (TRACER.isEnabled())
@@ -573,11 +586,13 @@ public abstract class BaseCDORevision extends AbstractCDORevision
this.version = version;
}
+ @Override
public long getRevised()
{
return revised;
}
+ @Override
public void setRevised(long revised)
{
long created = branchPoint.getTimeStamp();
@@ -595,22 +610,26 @@ public abstract class BaseCDORevision extends AbstractCDORevision
this.revised = revised;
}
+ @Override
public InternalCDORevisionDelta compare(CDORevision origin)
{
return new CDORevisionDeltaImpl(origin, this);
}
+ @Override
public void merge(CDORevisionDelta delta)
{
CDORevisionMerger applier = new CDORevisionMerger();
applier.merge(this, delta);
}
+ @Override
public CDOID getResourceID()
{
return resourceID;
}
+ @Override
public void setResourceID(CDOID resourceID)
{
if (TRACER.isEnabled())
@@ -621,11 +640,13 @@ public abstract class BaseCDORevision extends AbstractCDORevision
this.resourceID = resourceID;
}
+ @Override
public Object getContainerID()
{
return containerID;
}
+ @Override
public void setContainerID(Object containerID)
{
if (TRACER.isEnabled())
@@ -636,11 +657,13 @@ public abstract class BaseCDORevision extends AbstractCDORevision
this.containerID = containerID;
}
+ @Override
public int getContainingFeatureID()
{
return containingFeatureID;
}
+ @Override
public void setContainingFeatureID(int containingFeatureID)
{
if (TRACER.isEnabled())
@@ -651,6 +674,7 @@ public abstract class BaseCDORevision extends AbstractCDORevision
this.containingFeatureID = containingFeatureID;
}
+ @Override
public int hashCode(EStructuralFeature feature)
{
Object value = getValue(feature);
@@ -663,6 +687,7 @@ public abstract class BaseCDORevision extends AbstractCDORevision
return value.hashCode();
}
+ @Override
public Object get(EStructuralFeature feature, int index)
{
if (feature.isMany())
@@ -679,36 +704,42 @@ public abstract class BaseCDORevision extends AbstractCDORevision
return getValue(feature);
}
+ @Override
public boolean contains(EStructuralFeature feature, Object value)
{
CDOList list = getListOrNull(feature);
return list != null && list.contains(value);
}
+ @Override
public int indexOf(EStructuralFeature feature, Object value)
{
CDOList list = getListOrNull(feature);
return list == null ? -1 : list.indexOf(value);
}
+ @Override
public int lastIndexOf(EStructuralFeature feature, Object value)
{
CDOList list = getListOrNull(feature);
return list == null ? -1 : list.lastIndexOf(value);
}
+ @Override
public boolean isEmpty(EStructuralFeature feature)
{
CDOList list = getListOrNull(feature);
return list == null || list.isEmpty();
}
+ @Override
public int size(EStructuralFeature feature)
{
CDOList list = getListOrNull(feature);
return list == null ? 0 : list.size();
}
+ @Override
public Object[] toArray(EStructuralFeature feature)
{
if (!feature.isMany())
@@ -720,6 +751,7 @@ public abstract class BaseCDORevision extends AbstractCDORevision
return list == null ? EMPTY_ARRAY : list.toArray();
}
+ @Override
public <T> T[] toArray(EStructuralFeature feature, T[] array)
{
if (!feature.isMany())
@@ -743,12 +775,14 @@ public abstract class BaseCDORevision extends AbstractCDORevision
return list.toArray(array);
}
+ @Override
public void add(EStructuralFeature feature, int index, Object value)
{
CDOList list = getOrCreateList(feature);
list.add(index, value);
}
+ @Override
public void clear(EStructuralFeature feature)
{
if (feature.isMany() && feature.isUnsettable())
@@ -761,6 +795,7 @@ public abstract class BaseCDORevision extends AbstractCDORevision
}
}
+ @Override
public Object move(EStructuralFeature feature, int targetIndex, int sourceIndex)
{
CDOList list = getListOrNull(feature);
@@ -772,6 +807,7 @@ public abstract class BaseCDORevision extends AbstractCDORevision
return list.move(targetIndex, sourceIndex);
}
+ @Override
public Object remove(EStructuralFeature feature, int index)
{
CDOList list = getListOrNull(feature);
@@ -783,6 +819,7 @@ public abstract class BaseCDORevision extends AbstractCDORevision
return list.remove(index);
}
+ @Override
public Object set(EStructuralFeature feature, int index, Object value)
{
if (feature.isMany())
@@ -794,6 +831,7 @@ public abstract class BaseCDORevision extends AbstractCDORevision
return setValue(feature, value);
}
+ @Override
public void unset(EStructuralFeature feature)
{
// if (feature.isMany() && isListPreserving())
@@ -812,6 +850,7 @@ public abstract class BaseCDORevision extends AbstractCDORevision
/**
* @since 4.0
*/
+ @Override
public boolean adjustReferences(CDOReferenceAdjuster referenceAdjuster)
{
if (TRACER.isEnabled())
@@ -869,6 +908,7 @@ public abstract class BaseCDORevision extends AbstractCDORevision
/**
* @since 4.3
*/
+ @Override
public void adjustBranches(CDOBranchManager newBranchManager)
{
if (branchPoint != null)
@@ -882,6 +922,7 @@ public abstract class BaseCDORevision extends AbstractCDORevision
}
}
+ @Override
public Object getValue(EStructuralFeature feature)
{
checkReadable(feature);
@@ -890,6 +931,7 @@ public abstract class BaseCDORevision extends AbstractCDORevision
return getValue(featureIndex);
}
+ @Override
public Object setValue(EStructuralFeature feature, Object value)
{
int featureIndex = getFeatureIndex(feature);
@@ -909,16 +951,19 @@ public abstract class BaseCDORevision extends AbstractCDORevision
/**
* @since 4.7
*/
+ @Override
public CDOList getListOrNull(EStructuralFeature feature)
{
return getOrCreateList(feature, DO_NOT_CREATE_LIST);
}
+ @Override
public CDOList getOrCreateList(EStructuralFeature feature)
{
return getOrCreateList(feature, 0);
}
+ @Override
public CDOList getOrCreateList(EStructuralFeature feature, int size)
{
checkReadable(feature);
@@ -956,6 +1001,7 @@ public abstract class BaseCDORevision extends AbstractCDORevision
return list;
}
+ @Override
public void setList(EStructuralFeature feature, InternalCDOList list)
{
int featureIndex = getFeatureIndex(feature);
@@ -965,6 +1011,7 @@ public abstract class BaseCDORevision extends AbstractCDORevision
/**
* @since 4.2
*/
+ @Override
public EStructuralFeature[] clearValues()
{
EStructuralFeature[] features = getClassInfo().getAllPersistentFeatures();
@@ -975,6 +1022,7 @@ public abstract class BaseCDORevision extends AbstractCDORevision
/**
* @since 4.3
*/
+ @Override
public String getResourceNodeName()
{
return (String)doGetValue(RESOURCE_NODE_NAME_INDEX);
@@ -983,6 +1031,7 @@ public abstract class BaseCDORevision extends AbstractCDORevision
/**
* @since 4.1
*/
+ @Override
public CDOPermission getPermission()
{
return CDOPermission.get(flags & PERMISSION_MASK);
@@ -991,6 +1040,7 @@ public abstract class BaseCDORevision extends AbstractCDORevision
/**
* @since 4.1
*/
+ @Override
public void setPermission(CDOPermission permission)
{
flags = (byte)(flags & ~PERMISSION_MASK | permission.getBits() & PERMISSION_MASK);
@@ -999,6 +1049,7 @@ public abstract class BaseCDORevision extends AbstractCDORevision
/**
* @since 4.3
*/
+ @Override
public boolean bypassPermissionChecks(boolean on)
{
boolean old = (flags & BYPASS_PERMISSION_CHECKS_FLAG) != 0;
@@ -1018,6 +1069,7 @@ public abstract class BaseCDORevision extends AbstractCDORevision
/**
* @since 4.3
*/
+ @Override
public boolean isListPreserving()
{
return (flags & LIST_PRESERVING_FLAG) != 0;
@@ -1026,6 +1078,7 @@ public abstract class BaseCDORevision extends AbstractCDORevision
/**
* @since 4.3
*/
+ @Override
public void setListPreserving()
{
flags |= LIST_PRESERVING_FLAG;
@@ -1034,6 +1087,7 @@ public abstract class BaseCDORevision extends AbstractCDORevision
/**
* @since 4.1
*/
+ @Override
public void freeze()
{
flags |= FROZEN_FLAG;
@@ -1059,6 +1113,7 @@ public abstract class BaseCDORevision extends AbstractCDORevision
/**
* @since 4.2
*/
+ @Override
public boolean isFrozen()
{
return (flags & FROZEN_FLAG) != 0;
@@ -1067,6 +1122,7 @@ public abstract class BaseCDORevision extends AbstractCDORevision
/**
* @since 4.1
*/
+ @Override
public boolean isUnchunked()
{
return (flags & UNCHUNKED_FLAG) != 0;
@@ -1075,6 +1131,7 @@ public abstract class BaseCDORevision extends AbstractCDORevision
/**
* @since 4.1
*/
+ @Override
public void setUnchunked()
{
flags |= UNCHUNKED_FLAG;
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/CDOFeatureDeltaVisitorImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/CDOFeatureDeltaVisitorImpl.java
index 7dc21409f2..4b365ba665 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/CDOFeatureDeltaVisitorImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/CDOFeatureDeltaVisitorImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2012 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2010-2012, 2019 Eike Stepper (Loehne, Germany) 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
@@ -34,18 +34,22 @@ public class CDOFeatureDeltaVisitorImpl implements CDOFeatureDeltaVisitor
{
}
+ @Override
public void visit(CDOAddFeatureDelta delta)
{
}
+ @Override
public void visit(CDOClearFeatureDelta delta)
{
}
+ @Override
public void visit(CDOContainerFeatureDelta delta)
{
}
+ @Override
public void visit(CDOListFeatureDelta deltas)
{
for (CDOFeatureDelta delta : deltas.getListChanges())
@@ -61,18 +65,22 @@ public class CDOFeatureDeltaVisitorImpl implements CDOFeatureDeltaVisitor
}
}
+ @Override
public void visit(CDOMoveFeatureDelta delta)
{
}
+ @Override
public void visit(CDORemoveFeatureDelta delta)
{
}
+ @Override
public void visit(CDOSetFeatureDelta delta)
{
}
+ @Override
public void visit(CDOUnsetFeatureDelta delta)
{
}
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/CDOIDMapper.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/CDOIDMapper.java
index 2ebf5eebbc..b8732884ab 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/CDOIDMapper.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/CDOIDMapper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009-2012 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2009-2012, 2019 Eike Stepper (Loehne, Germany) 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
@@ -58,6 +58,7 @@ public class CDOIDMapper implements CDOReferenceAdjuster
/**
* @since 4.0
*/
+ @Override
public Object adjustReference(Object value, EStructuralFeature feature, int index)
{
return CDORevisionUtil.remapID(value, idMappings, allowUnmappedTempIDs);
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/DelegatingCDORevision.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/DelegatingCDORevision.java
index 6bfdd3401f..79696e010f 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/DelegatingCDORevision.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/DelegatingCDORevision.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2014, 2018 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2010-2014, 2018, 2019 Eike Stepper (Loehne, Germany) 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
@@ -51,6 +51,7 @@ public abstract class DelegatingCDORevision implements InternalCDORevision
/**
* @since 4.2
*/
+ @Override
public InternalCDORevision getRevisionForID(CDOID id)
{
return getDelegate().getRevisionForID(id);
@@ -59,6 +60,7 @@ public abstract class DelegatingCDORevision implements InternalCDORevision
/**
* @since 4.2
*/
+ @Override
public InternalCDORevision getProperRevision()
{
return getDelegate().getProperRevision();
@@ -67,6 +69,7 @@ public abstract class DelegatingCDORevision implements InternalCDORevision
/**
* @since 4.0
*/
+ @Override
public boolean adjustReferences(CDOReferenceAdjuster referenceAdjuster)
{
return getDelegate().adjustReferences(referenceAdjuster);
@@ -75,11 +78,13 @@ public abstract class DelegatingCDORevision implements InternalCDORevision
/**
* @since 4.3
*/
+ @Override
public void adjustBranches(CDOBranchManager newBranchManager)
{
getDelegate().adjustBranches(newBranchManager);
}
+ @Override
public long getTimeStamp()
{
return getDelegate().getTimeStamp();
@@ -88,71 +93,85 @@ public abstract class DelegatingCDORevision implements InternalCDORevision
/**
* @since 4.2
*/
+ @Override
public InternalCDOBranch getBranch()
{
return getDelegate().getBranch();
}
+ @Override
public boolean isHistorical()
{
return getDelegate().isHistorical();
}
+ @Override
public CDOID getID()
{
return getDelegate().getID();
}
+ @Override
public CDORevision revision()
{
return getDelegate().revision();
}
+ @Override
public CDOID getResourceID()
{
return getDelegate().getResourceID();
}
+ @Override
public Object getContainerID()
{
return getDelegate().getContainerID();
}
+ @Override
public int getContainingFeatureID()
{
return getDelegate().getContainingFeatureID();
}
+ @Override
public Object get(EStructuralFeature feature, int index)
{
return getDelegate().get(feature, index);
}
+ @Override
public EClass getEClass()
{
return getDelegate().getEClass();
}
+ @Override
public int getVersion()
{
return getDelegate().getVersion();
}
+ @Override
public int size(EStructuralFeature feature)
{
return getDelegate().size(feature);
}
+ @Override
public long getRevised()
{
return getDelegate().getRevised();
}
+ @Override
public boolean isEmpty(EStructuralFeature feature)
{
return getDelegate().isEmpty(feature);
}
+ @Override
public boolean isValid(long timeStamp)
{
return getDelegate().isValid(timeStamp);
@@ -161,6 +180,7 @@ public abstract class DelegatingCDORevision implements InternalCDORevision
/**
* @since 4.0
*/
+ @Override
public boolean isValid(CDOBranchPoint branchPoint)
{
return getDelegate().isValid(branchPoint);
@@ -169,6 +189,7 @@ public abstract class DelegatingCDORevision implements InternalCDORevision
/**
* @since 4.0
*/
+ @Override
public InternalCDORevision copy()
{
return null;
@@ -177,183 +198,219 @@ public abstract class DelegatingCDORevision implements InternalCDORevision
/**
* @since 4.2
*/
+ @Override
public InternalCDOClassInfo getClassInfo()
{
return getDelegate().getClassInfo();
}
+ @Override
public void setID(CDOID id)
{
getDelegate().setID(id);
}
+ @Override
public boolean contains(EStructuralFeature feature, Object value)
{
return getDelegate().contains(feature, value);
}
+ @Override
public boolean isResourceNode()
{
return getDelegate().isResourceNode();
}
+ @Override
public void setVersion(int version)
{
getDelegate().setVersion(version);
}
+ @Override
public boolean isResourceFolder()
{
return getDelegate().isResourceFolder();
}
+ @Override
public int indexOf(EStructuralFeature feature, Object value)
{
return getDelegate().indexOf(feature, value);
}
+ @Override
public boolean isResource()
{
return getDelegate().isResource();
}
+ @Override
public void setBranchPoint(CDOBranchPoint branchPoint)
{
getDelegate().setBranchPoint(branchPoint);
}
+ @Override
public void adjustForCommit(CDOBranch branch, long timeStamp)
{
getDelegate().adjustForCommit(branch, timeStamp);
}
+ @Override
public CDORevisionData data()
{
return getDelegate().data();
}
+ @Override
public int lastIndexOf(EStructuralFeature feature, Object value)
{
return getDelegate().lastIndexOf(feature, value);
}
+ @Override
public void setRevised(long revised)
{
getDelegate().setRevised(revised);
}
+ @Override
public InternalCDORevisionDelta compare(CDORevision origin)
{
return getDelegate().compare(origin);
}
+ @Override
public void setResourceID(CDOID resourceID)
{
getDelegate().setResourceID(resourceID);
}
+ @Override
public void merge(CDORevisionDelta delta)
{
getDelegate().merge(delta);
}
+ @Override
public <T> T[] toArray(EStructuralFeature feature, T[] array)
{
return getDelegate().toArray(feature, array);
}
+ @Override
public void setContainerID(Object containerID)
{
getDelegate().setContainerID(containerID);
}
+ @Override
public void setContainingFeatureID(int containingFeatureID)
{
getDelegate().setContainingFeatureID(containingFeatureID);
}
+ @Override
public Object[] toArray(EStructuralFeature feature)
{
return getDelegate().toArray(feature);
}
+ @Override
public void add(EStructuralFeature feature, int index, Object value)
{
getDelegate().add(feature, index, value);
}
+ @Override
public int hashCode(EStructuralFeature feature)
{
return getDelegate().hashCode(feature);
}
+ @Override
public void clear(EStructuralFeature feature)
{
getDelegate().clear(feature);
}
+ @Override
public Object move(EStructuralFeature feature, int targetIndex, int sourceIndex)
{
return getDelegate().move(feature, targetIndex, sourceIndex);
}
+ @Override
public Object remove(EStructuralFeature feature, int index)
{
return getDelegate().remove(feature, index);
}
+ @Override
public Object set(EStructuralFeature feature, int index, Object value)
{
return getDelegate().set(feature, index, value);
}
+ @Override
public void unset(EStructuralFeature feature)
{
getDelegate().unset(feature);
}
+ @Override
public Object getValue(EStructuralFeature feature)
{
return getDelegate().getValue(feature);
}
+ @Override
public Object setValue(EStructuralFeature feature, Object value)
{
return getDelegate().setValue(feature, value);
}
+ @Override
public void setList(EStructuralFeature feature, InternalCDOList list)
{
getDelegate().setList(feature, list);
}
+ @Override
@Deprecated
public CDOList getList(EStructuralFeature feature)
{
return getDelegate().getList(feature);
}
+ @Override
@Deprecated
public CDOList getList(EStructuralFeature feature, int initialCapacity)
{
return getDelegate().getList(feature, initialCapacity);
}
+ @Override
public CDOList getListOrNull(EStructuralFeature feature)
{
return getDelegate().getListOrNull(feature);
}
+ @Override
public CDOList getOrCreateList(EStructuralFeature feature)
{
return getDelegate().getOrCreateList(feature);
}
+ @Override
public CDOList getOrCreateList(EStructuralFeature feature, int size)
{
return getDelegate().getOrCreateList(feature, size);
}
+ @Override
public void read(CDODataInput in) throws IOException
{
getDelegate().read(in);
@@ -362,11 +419,13 @@ public abstract class DelegatingCDORevision implements InternalCDORevision
/**
* @since 4.3
*/
+ @Override
public boolean readValues(CDODataInput in) throws IOException
{
return getDelegate().readValues(in);
}
+ @Override
public void write(CDODataOutput out, int referenceChunk) throws IOException
{
getDelegate().write(out, referenceChunk);
@@ -375,6 +434,7 @@ public abstract class DelegatingCDORevision implements InternalCDORevision
/**
* @since 4.1
*/
+ @Override
public void write(CDODataOutput out, int referenceChunk, CDOBranchPoint securityContext) throws IOException
{
getDelegate().write(out, referenceChunk, securityContext);
@@ -383,11 +443,13 @@ public abstract class DelegatingCDORevision implements InternalCDORevision
/**
* @since 4.3
*/
+ @Override
public void writeValues(CDODataOutput out, int referenceChunk) throws IOException
{
getDelegate().writeValues(out, referenceChunk);
}
+ @Override
public void convertEObjects(CDOIDProvider oidProvider)
{
getDelegate().convertEObjects(oidProvider);
@@ -396,6 +458,7 @@ public abstract class DelegatingCDORevision implements InternalCDORevision
/**
* @since 4.2
*/
+ @Override
public EStructuralFeature[] clearValues()
{
return getDelegate().clearValues();
@@ -404,6 +467,7 @@ public abstract class DelegatingCDORevision implements InternalCDORevision
/**
* @since 4.3
*/
+ @Override
public String getResourceNodeName()
{
return getDelegate().getResourceNodeName();
@@ -412,6 +476,7 @@ public abstract class DelegatingCDORevision implements InternalCDORevision
/**
* @since 4.1
*/
+ @Override
public CDOPermission getPermission()
{
return getDelegate().getPermission();
@@ -420,6 +485,7 @@ public abstract class DelegatingCDORevision implements InternalCDORevision
/**
* @since 4.1
*/
+ @Override
public void setPermission(CDOPermission permission)
{
getDelegate().setPermission(permission);
@@ -428,6 +494,7 @@ public abstract class DelegatingCDORevision implements InternalCDORevision
/**
* @since 4.1
*/
+ @Override
public boolean isReadable()
{
return getDelegate().isReadable();
@@ -436,6 +503,7 @@ public abstract class DelegatingCDORevision implements InternalCDORevision
/**
* @since 4.1
*/
+ @Override
public boolean isWritable()
{
return getDelegate().isWritable();
@@ -444,6 +512,7 @@ public abstract class DelegatingCDORevision implements InternalCDORevision
/**
* @since 4.2
*/
+ @Override
public void accept(CDORevisionValueVisitor visitor)
{
getDelegate().accept(visitor);
@@ -452,6 +521,7 @@ public abstract class DelegatingCDORevision implements InternalCDORevision
/**
* @since 4.2
*/
+ @Override
public void accept(CDORevisionValueVisitor visitor, Predicate<EStructuralFeature> filter)
{
getDelegate().accept(visitor, filter);
@@ -460,6 +530,7 @@ public abstract class DelegatingCDORevision implements InternalCDORevision
/**
* @since 4.3
*/
+ @Override
public boolean bypassPermissionChecks(boolean on)
{
return getDelegate().bypassPermissionChecks(on);
@@ -468,6 +539,7 @@ public abstract class DelegatingCDORevision implements InternalCDORevision
/**
* @since 4.3
*/
+ @Override
public boolean isListPreserving()
{
return getDelegate().isListPreserving();
@@ -476,6 +548,7 @@ public abstract class DelegatingCDORevision implements InternalCDORevision
/**
* @since 4.3
*/
+ @Override
public void setListPreserving()
{
getDelegate().setListPreserving();
@@ -484,6 +557,7 @@ public abstract class DelegatingCDORevision implements InternalCDORevision
/**
* @since 4.0
*/
+ @Override
public void freeze()
{
getDelegate().freeze();
@@ -492,6 +566,7 @@ public abstract class DelegatingCDORevision implements InternalCDORevision
/**
* @since 4.2
*/
+ @Override
public boolean isFrozen()
{
return getDelegate().isFrozen();
@@ -500,6 +575,7 @@ public abstract class DelegatingCDORevision implements InternalCDORevision
/**
* @since 4.1
*/
+ @Override
public boolean isUnchunked()
{
return getDelegate().isUnchunked();
@@ -508,6 +584,7 @@ public abstract class DelegatingCDORevision implements InternalCDORevision
/**
* @since 4.1
*/
+ @Override
public void setUnchunked()
{
getDelegate().setUnchunked();
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/DelegatingCDORevisionManager.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/DelegatingCDORevisionManager.java
index 3e2b8b8d1a..6e27daf078 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/DelegatingCDORevisionManager.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/DelegatingCDORevisionManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2012, 2016 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2010-2012, 2016, 2019 Eike Stepper (Loehne, Germany) 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
@@ -36,6 +36,7 @@ public abstract class DelegatingCDORevisionManager extends Lifecycle implements
{
}
+ @Override
public InternalCDORevisionCache getCache()
{
return getDelegate().getCache();
@@ -44,36 +45,43 @@ public abstract class DelegatingCDORevisionManager extends Lifecycle implements
/**
* @since 4.0
*/
+ @Override
public void setCache(CDORevisionCache cache)
{
getDelegate().setCache(cache);
}
+ @Override
public void setFactory(CDORevisionFactory factory)
{
getDelegate().setFactory(factory);
}
+ @Override
public CDORevisionFactory getFactory()
{
return getDelegate().getFactory();
}
+ @Override
public RevisionLoader getRevisionLoader()
{
return getDelegate().getRevisionLoader();
}
+ @Override
public void setRevisionLoader(RevisionLoader revisionLoader)
{
getDelegate().setRevisionLoader(revisionLoader);
}
+ @Override
public RevisionLocker getRevisionLocker()
{
return getDelegate().getRevisionLocker();
}
+ @Override
public void setRevisionLocker(RevisionLocker revisionLocker)
{
getDelegate().setRevisionLocker(revisionLocker);
@@ -82,6 +90,7 @@ public abstract class DelegatingCDORevisionManager extends Lifecycle implements
/**
* @since 4.0
*/
+ @Override
public boolean isSupportingAudits()
{
return getDelegate().isSupportingAudits();
@@ -90,16 +99,19 @@ public abstract class DelegatingCDORevisionManager extends Lifecycle implements
/**
* @since 4.0
*/
+ @Override
public void setSupportingAudits(boolean on)
{
getDelegate().setSupportingAudits(on);
}
+ @Override
public boolean isSupportingBranches()
{
return getDelegate().isSupportingBranches();
}
+ @Override
public void setSupportingBranches(boolean on)
{
getDelegate().setSupportingBranches(on);
@@ -108,58 +120,69 @@ public abstract class DelegatingCDORevisionManager extends Lifecycle implements
/**
* @since 4.0
*/
+ @Override
public void addRevision(CDORevision revision)
{
getDelegate().addRevision(revision);
}
+ @Override
public boolean containsRevision(CDOID id, CDOBranchPoint branchPoint)
{
return getDelegate().containsRevision(id, branchPoint);
}
+ @Override
public boolean containsRevisionByVersion(CDOID id, CDOBranchVersion branchVersion)
{
return getDelegate().containsRevisionByVersion(id, branchVersion);
}
+ @Override
public EClass getObjectType(CDOID id)
{
return getDelegate().getObjectType(id);
}
+ @Override
public InternalCDORevision getRevisionByVersion(CDOID id, CDOBranchVersion branchVersion, int referenceChunk, boolean loadOnDemand)
{
return getDelegate().getRevisionByVersion(id, branchVersion, referenceChunk, loadOnDemand);
}
+ @Override
public InternalCDORevision getRevision(CDOID id, CDOBranchPoint branchPoint, int referenceChunk, int prefetchDepth, boolean loadOnDemand)
{
return getDelegate().getRevision(id, branchPoint, referenceChunk, prefetchDepth, loadOnDemand);
}
+ @Override
public InternalCDORevision getRevision(CDOID id, CDOBranchPoint branchPoint, int referenceChunk, int prefetchDepth, boolean loadOnDemand,
SyntheticCDORevision[] synthetics)
{
return getDelegate().getRevision(id, branchPoint, referenceChunk, prefetchDepth, loadOnDemand, synthetics);
}
+ @Override
public List<CDORevision> getRevisions(List<CDOID> ids, CDOBranchPoint branchPoint, int referenceChunk, int prefetchDepth, boolean loadOnDemand)
{
return getDelegate().getRevisions(ids, branchPoint, referenceChunk, prefetchDepth, loadOnDemand);
}
+ @Override
public List<CDORevision> getRevisions(List<CDOID> ids, CDOBranchPoint branchPoint, int referenceChunk, int prefetchDepth, boolean loadOnDemand,
SyntheticCDORevision[] synthetics)
{
return getDelegate().getRevisions(ids, branchPoint, referenceChunk, prefetchDepth, loadOnDemand, synthetics);
}
+ @Override
public void reviseLatest(CDOID id, CDOBranch branch)
{
getDelegate().reviseLatest(id, branch);
}
+ @Override
public void reviseVersion(CDOID id, CDOBranchVersion branchVersion, long timeStamp)
{
getDelegate().reviseVersion(id, branchVersion, timeStamp);
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/InternalCDORevision.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/InternalCDORevision.java
index 3a41807eec..3a060ec0c7 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/InternalCDORevision.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/InternalCDORevision.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009-2014, 2018 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2009-2014, 2018, 2019 Eike Stepper (Loehne, Germany) 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
@@ -48,11 +48,13 @@ public interface InternalCDORevision extends CDORevision, CDORevisionData, CDORe
/**
* @since 4.2
*/
+ @Override
public InternalCDOClassInfo getClassInfo();
/**
* @since 4.2
*/
+ @Override
public InternalCDOBranch getBranch();
/**
@@ -183,11 +185,13 @@ public interface InternalCDORevision extends CDORevision, CDORevisionData, CDORe
/**
* @since 3.0
*/
+ @Override
public InternalCDORevisionDelta compare(CDORevision origin);
/**
* @since 3.0
*/
+ @Override
public InternalCDORevision copy();
/**
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/InternalCDORevisionManager.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/InternalCDORevisionManager.java
index 199e1f5e31..64741770d1 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/InternalCDORevisionManager.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/InternalCDORevisionManager.java
@@ -84,8 +84,10 @@ public interface InternalCDORevisionManager extends CDORevisionManager, CDORevis
public List<CDORevision> getRevisions(List<CDOID> ids, CDOBranchPoint branchPoint, int referenceChunk, int prefetchDepth, boolean loadOnDemand,
SyntheticCDORevision[] synthetics);
+ @Override
public InternalCDORevision getRevision(CDOID id, CDOBranchPoint branchPoint, int referenceChunk, int prefetchDepth, boolean loadOnDemand);
+ @Override
public InternalCDORevision getRevisionByVersion(CDOID id, CDOBranchVersion branchVersion, int referenceChunk, boolean loadOnDemand);
/**
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/ManagedRevisionProvider.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/ManagedRevisionProvider.java
index fbbe2b40a0..b57ee09572 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/ManagedRevisionProvider.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/ManagedRevisionProvider.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2012 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2010-2012, 2019 Eike Stepper (Loehne, Germany) 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
@@ -44,6 +44,7 @@ public class ManagedRevisionProvider implements CDORevisionProvider
return branchPoint;
}
+ @Override
public CDORevision getRevision(CDOID id)
{
return revisionManager.getRevision(id, branchPoint, CDORevision.UNCHUNKED, CDORevision.DEPTH_NONE, true);
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/StubCDORevision.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/StubCDORevision.java
index e3ae9f0abe..16fdde87db 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/StubCDORevision.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/StubCDORevision.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2015, 2018 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2010-2015, 2018, 2019 Eike Stepper (Loehne, Germany) 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
@@ -54,101 +54,121 @@ public class StubCDORevision extends AbstractCDORevision
throw new UnsupportedOperationException(getExceptionMessage());
}
+ @Override
public void setID(CDOID id)
{
throw new UnsupportedOperationException(getExceptionMessage());
}
+ @Override
public void setVersion(int version)
{
throw new UnsupportedOperationException(getExceptionMessage());
}
+ @Override
public void setBranchPoint(CDOBranchPoint branchPoint)
{
throw new UnsupportedOperationException(getExceptionMessage());
}
+ @Override
public void setRevised(long revised)
{
throw new UnsupportedOperationException(getExceptionMessage());
}
+ @Override
public void setResourceID(CDOID resourceID)
{
throw new UnsupportedOperationException(getExceptionMessage());
}
+ @Override
public void setContainerID(Object containerID)
{
throw new UnsupportedOperationException(getExceptionMessage());
}
+ @Override
public void setContainingFeatureID(int containingFeatureID)
{
throw new UnsupportedOperationException(getExceptionMessage());
}
+ @Override
public void add(EStructuralFeature feature, int index, Object value)
{
throw new UnsupportedOperationException(getExceptionMessage());
}
+ @Override
public void clear(EStructuralFeature feature)
{
throw new UnsupportedOperationException(getExceptionMessage());
}
+ @Override
public Object move(EStructuralFeature feature, int targetIndex, int sourceIndex)
{
throw new UnsupportedOperationException(getExceptionMessage());
}
+ @Override
public Object remove(EStructuralFeature feature, int index)
{
throw new UnsupportedOperationException(getExceptionMessage());
}
+ @Override
public Object set(EStructuralFeature feature, int index, Object value)
{
throw new UnsupportedOperationException(getExceptionMessage());
}
+ @Override
public void unset(EStructuralFeature feature)
{
throw new UnsupportedOperationException(getExceptionMessage());
}
+ @Override
public Object getValue(EStructuralFeature feature)
{
throw new UnsupportedOperationException(getExceptionMessage());
}
+ @Override
public Object setValue(EStructuralFeature feature, Object value)
{
throw new UnsupportedOperationException(getExceptionMessage());
}
+ @Override
public void setList(EStructuralFeature feature, InternalCDOList list)
{
throw new UnsupportedOperationException(getExceptionMessage());
}
+ @Override
public CDOList getListOrNull(EStructuralFeature feature)
{
throw new UnsupportedOperationException(getExceptionMessage());
}
+ @Override
public CDOList getOrCreateList(EStructuralFeature feature)
{
throw new UnsupportedOperationException(getExceptionMessage());
}
+ @Override
public CDOList getOrCreateList(EStructuralFeature feature, int size)
{
throw new UnsupportedOperationException(getExceptionMessage());
}
+ @Override
public void read(CDODataInput in) throws IOException
{
throw new UnsupportedOperationException(getExceptionMessage());
@@ -157,11 +177,13 @@ public class StubCDORevision extends AbstractCDORevision
/**
* @since 4.3
*/
+ @Override
public boolean readValues(CDODataInput in) throws IOException
{
throw new UnsupportedOperationException(getExceptionMessage());
}
+ @Override
public void write(CDODataOutput out, int referenceChunk) throws IOException
{
throw new UnsupportedOperationException(getExceptionMessage());
@@ -170,6 +192,7 @@ public class StubCDORevision extends AbstractCDORevision
/**
* @since 4.1
*/
+ @Override
public void write(CDODataOutput out, int referenceChunk, CDOBranchPoint securityContext) throws IOException
{
throw new UnsupportedOperationException(getExceptionMessage());
@@ -178,41 +201,49 @@ public class StubCDORevision extends AbstractCDORevision
/**
* @since 4.3
*/
+ @Override
public void writeValues(CDODataOutput out, int referenceChunk) throws IOException
{
throw new UnsupportedOperationException(getExceptionMessage());
}
+ @Override
public void convertEObjects(CDOIDProvider oidProvider)
{
throw new UnsupportedOperationException(getExceptionMessage());
}
+ @Override
public int getVersion()
{
return 0;
}
+ @Override
public long getRevised()
{
throw new UnsupportedOperationException(getExceptionMessage());
}
+ @Override
public InternalCDORevisionDelta compare(CDORevision origin)
{
throw new UnsupportedOperationException(getExceptionMessage());
}
+ @Override
public void merge(CDORevisionDelta delta)
{
throw new UnsupportedOperationException(getExceptionMessage());
}
+ @Override
public InternalCDORevision copy()
{
throw new UnsupportedOperationException(getExceptionMessage());
}
+ @Override
public CDOID getID()
{
throw new UnsupportedOperationException(getExceptionMessage());
@@ -221,71 +252,85 @@ public class StubCDORevision extends AbstractCDORevision
/**
* @since 4.2
*/
+ @Override
public InternalCDOBranch getBranch()
{
return null;
}
+ @Override
public long getTimeStamp()
{
throw new UnsupportedOperationException(getExceptionMessage());
}
+ @Override
public CDOID getResourceID()
{
throw new UnsupportedOperationException(getExceptionMessage());
}
+ @Override
public Object getContainerID()
{
throw new UnsupportedOperationException(getExceptionMessage());
}
+ @Override
public int getContainingFeatureID()
{
throw new UnsupportedOperationException(getExceptionMessage());
}
+ @Override
public Object get(EStructuralFeature feature, int index)
{
throw new UnsupportedOperationException(getExceptionMessage());
}
+ @Override
public int size(EStructuralFeature feature)
{
throw new UnsupportedOperationException(getExceptionMessage());
}
+ @Override
public boolean isEmpty(EStructuralFeature feature)
{
throw new UnsupportedOperationException(getExceptionMessage());
}
+ @Override
public boolean contains(EStructuralFeature feature, Object value)
{
throw new UnsupportedOperationException(getExceptionMessage());
}
+ @Override
public int indexOf(EStructuralFeature feature, Object value)
{
throw new UnsupportedOperationException(getExceptionMessage());
}
+ @Override
public int lastIndexOf(EStructuralFeature feature, Object value)
{
throw new UnsupportedOperationException(getExceptionMessage());
}
+ @Override
public <T> T[] toArray(EStructuralFeature feature, T[] array)
{
throw new UnsupportedOperationException(getExceptionMessage());
}
+ @Override
public Object[] toArray(EStructuralFeature feature)
{
throw new UnsupportedOperationException(getExceptionMessage());
}
+ @Override
public int hashCode(EStructuralFeature feature)
{
throw new UnsupportedOperationException(getExceptionMessage());
@@ -294,6 +339,7 @@ public class StubCDORevision extends AbstractCDORevision
/**
* @since 4.0
*/
+ @Override
public boolean adjustReferences(CDOReferenceAdjuster referenceAdjuster)
{
throw new UnsupportedOperationException(getExceptionMessage());
@@ -302,6 +348,7 @@ public class StubCDORevision extends AbstractCDORevision
/**
* @since 4.3
*/
+ @Override
public void adjustBranches(CDOBranchManager newBranchManager)
{
throw new UnsupportedOperationException(getExceptionMessage());
@@ -310,6 +357,7 @@ public class StubCDORevision extends AbstractCDORevision
/**
* @since 4.2
*/
+ @Override
public EStructuralFeature[] clearValues()
{
throw new UnsupportedOperationException(getExceptionMessage());
@@ -318,6 +366,7 @@ public class StubCDORevision extends AbstractCDORevision
/**
* @since 4.3
*/
+ @Override
public String getResourceNodeName()
{
return "?";
@@ -326,6 +375,7 @@ public class StubCDORevision extends AbstractCDORevision
/**
* @since 4.1
*/
+ @Override
public CDOPermission getPermission()
{
throw new UnsupportedOperationException(getExceptionMessage());
@@ -334,6 +384,7 @@ public class StubCDORevision extends AbstractCDORevision
/**
* @since 4.1
*/
+ @Override
public void setPermission(CDOPermission permission)
{
throw new UnsupportedOperationException(getExceptionMessage());
@@ -342,6 +393,7 @@ public class StubCDORevision extends AbstractCDORevision
/**
* @since 4.3
*/
+ @Override
public boolean bypassPermissionChecks(boolean on)
{
throw new UnsupportedOperationException(getExceptionMessage());
@@ -350,6 +402,7 @@ public class StubCDORevision extends AbstractCDORevision
/**
* @since 4.3
*/
+ @Override
public boolean isListPreserving()
{
throw new UnsupportedOperationException(getExceptionMessage());
@@ -358,6 +411,7 @@ public class StubCDORevision extends AbstractCDORevision
/**
* @since 4.3
*/
+ @Override
public void setListPreserving()
{
throw new UnsupportedOperationException(getExceptionMessage());
@@ -366,6 +420,7 @@ public class StubCDORevision extends AbstractCDORevision
/**
* @since 4.0
*/
+ @Override
public void freeze()
{
throw new UnsupportedOperationException(getExceptionMessage());
@@ -374,6 +429,7 @@ public class StubCDORevision extends AbstractCDORevision
/**
* @since 4.2
*/
+ @Override
public boolean isFrozen()
{
throw new UnsupportedOperationException(getExceptionMessage());
@@ -382,6 +438,7 @@ public class StubCDORevision extends AbstractCDORevision
/**
* @since 4.1
*/
+ @Override
public boolean isUnchunked()
{
return true;
@@ -390,6 +447,7 @@ public class StubCDORevision extends AbstractCDORevision
/**
* @since 4.1
*/
+ @Override
public void setUnchunked()
{
// Do nothing

Back to the top