Download
Getting Started
Members
Projects
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
More
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
Toggle navigation
Bugzilla – Attachment 195711 Details for
Bug 345905
Add @noextends, @noimplements and @noinstantiates wherever possible
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
Terms of Use
|
Copyright Agent
[patch]
Patch v1 - for future reference
clipboard.txt (text/plain), 248.04 KB, created by
Eike Stepper
on 2011-05-16 06:11:23 EDT
(
hide
)
Description:
Patch v1 - for future reference
Filename:
MIME Type:
Creator:
Eike Stepper
Created:
2011-05-16 06:11:23 EDT
Size:
248.04 KB
patch
obsolete
>### Eclipse Workspace Patch 1.0 >#P org.eclipse.emf.cdo.workspace >Index: .settings/.api_filters >=================================================================== >--- .settings/.api_filters (revision 0) >+++ .settings/.api_filters (revision 0) >@@ -0,0 +1,11 @@ >+<?xml version="1.0" encoding="UTF-8" standalone="no"?> >+<component id="org.eclipse.emf.cdo.workspace" version="2"> >+ <resource path="src/org/eclipse/emf/cdo/internal/workspace/CDOWorkspaceImpl.java" type="org.eclipse.emf.cdo.internal.workspace.CDOWorkspaceImpl"> >+ <filter id="572522506"> >+ <message_arguments> >+ <message_argument value="ReadOnlyException"/> >+ <message_argument value="CDOWorkspaceImpl"/> >+ </message_arguments> >+ </filter> >+ </resource> >+</component> >#P org.eclipse.emf.cdo.server.net4j >Index: .settings/.api_filters >=================================================================== >--- .settings/.api_filters (revision 0) >+++ .settings/.api_filters (revision 0) >@@ -0,0 +1,11 @@ >+<?xml version="1.0" encoding="UTF-8" standalone="no"?> >+<component id="org.eclipse.emf.cdo.server.net4j" version="2"> >+ <resource path="src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerProtocol.java" type="org.eclipse.emf.cdo.server.internal.net4j.protocol.CDOServerProtocol"> >+ <filter id="574619656"> >+ <message_arguments> >+ <message_argument value="ISessionProtocol"/> >+ <message_argument value="CDOServerProtocol"/> >+ </message_arguments> >+ </filter> >+ </resource> >+</component> >Index: src/org/eclipse/emf/cdo/server/internal/net4j/protocol/AuthenticationRequest.java >=================================================================== >--- src/org/eclipse/emf/cdo/server/internal/net4j/protocol/AuthenticationRequest.java (revision 7723) >+++ src/org/eclipse/emf/cdo/server/internal/net4j/protocol/AuthenticationRequest.java (working copy) >@@ -10,8 +10,8 @@ > */ > package org.eclipse.emf.cdo.server.internal.net4j.protocol; > >-import org.eclipse.emf.cdo.common.protocol.CDOAuthenticationResult; > import org.eclipse.emf.cdo.common.protocol.CDOProtocolConstants; >+import org.eclipse.emf.cdo.spi.common.CDOAuthenticationResult; > > import org.eclipse.net4j.signal.RequestWithMonitoring; > import org.eclipse.net4j.util.io.ExtendedDataInputStream; >Index: src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerProtocol.java >=================================================================== >--- src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerProtocol.java (revision 7670) >+++ src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerProtocol.java (working copy) >@@ -16,11 +16,11 @@ > > import org.eclipse.emf.cdo.common.CDOCommonRepository; > import org.eclipse.emf.cdo.common.commit.CDOCommitInfo; >-import org.eclipse.emf.cdo.common.protocol.CDOAuthenticationResult; > import org.eclipse.emf.cdo.common.protocol.CDOProtocolConstants; > import org.eclipse.emf.cdo.server.IRepositoryProvider; > import org.eclipse.emf.cdo.server.internal.net4j.bundle.OM; > import org.eclipse.emf.cdo.session.remote.CDORemoteSessionMessage; >+import org.eclipse.emf.cdo.spi.common.CDOAuthenticationResult; > import org.eclipse.emf.cdo.spi.common.branch.InternalCDOBranch; > import org.eclipse.emf.cdo.spi.server.ISessionProtocol; > import org.eclipse.emf.cdo.spi.server.InternalSession; >#P org.eclipse.emf.cdo.server.db4o >Index: src/org/eclipse/emf/cdo/server/db4o/IDB4OStore.java >=================================================================== >--- src/org/eclipse/emf/cdo/server/db4o/IDB4OStore.java (revision 7585) >+++ src/org/eclipse/emf/cdo/server/db4o/IDB4OStore.java (working copy) >@@ -15,6 +15,8 @@ > > /** > * @author Victor Roldan Betancort >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface IDB4OStore extends IStore > { >Index: src/org/eclipse/emf/cdo/server/db4o/IDB4OIdentifiableObject.java >=================================================================== >--- src/org/eclipse/emf/cdo/server/db4o/IDB4OIdentifiableObject.java (revision 7585) >+++ src/org/eclipse/emf/cdo/server/db4o/IDB4OIdentifiableObject.java (working copy) >@@ -12,6 +12,8 @@ > > /** > * @author Victor Roldan Betancort >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface IDB4OIdentifiableObject > { >#P org.eclipse.emf.cdo.common >Index: src/org/eclipse/emf/cdo/spi/common/revision/BaseCDORevision.java >=================================================================== >--- src/org/eclipse/emf/cdo/spi/common/revision/BaseCDORevision.java (revision 7692) >+++ src/org/eclipse/emf/cdo/spi/common/revision/BaseCDORevision.java (working copy) >@@ -27,7 +27,6 @@ > import org.eclipse.emf.cdo.common.protocol.CDODataOutput; > import org.eclipse.emf.cdo.common.revision.CDOList; > import org.eclipse.emf.cdo.common.revision.CDOListFactory; >-import org.eclipse.emf.cdo.common.revision.CDOReferenceAdjuster; > import org.eclipse.emf.cdo.common.revision.CDORevision; > import org.eclipse.emf.cdo.common.revision.CDORevisionData; > import org.eclipse.emf.cdo.common.revision.delta.CDOContainerFeatureDelta; >Index: src/org/eclipse/emf/cdo/common/revision/CDOIDAndVersion.java >=================================================================== >--- src/org/eclipse/emf/cdo/common/revision/CDOIDAndVersion.java (revision 7692) >+++ src/org/eclipse/emf/cdo/common/revision/CDOIDAndVersion.java (working copy) >@@ -15,6 +15,8 @@ > /** > * @author Eike Stepper > * @since 4.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDOIDAndVersion > { >Index: src/org/eclipse/emf/cdo/spi/common/CDOAuthenticationResult.java >=================================================================== >--- src/org/eclipse/emf/cdo/spi/common/CDOAuthenticationResult.java (revision 7692) >+++ src/org/eclipse/emf/cdo/spi/common/CDOAuthenticationResult.java (working copy) >@@ -8,7 +8,7 @@ > * Contributors: > * Eike Stepper - initial API and implementation > */ >-package org.eclipse.emf.cdo.common.protocol; >+package org.eclipse.emf.cdo.spi.common; > > import org.eclipse.net4j.util.io.ExtendedDataInput; > import org.eclipse.net4j.util.io.ExtendedDataOutput; >@@ -20,7 +20,7 @@ > * The result of an authentication operation. Carries a userID and a crypted token. > * > * @author Eike Stepper >- * @since 2.0 >+ * @since 4.0 > */ > public final class CDOAuthenticationResult implements Serializable > { >Index: src/org/eclipse/emf/cdo/spi/common/revision/StubCDORevision.java >=================================================================== >--- src/org/eclipse/emf/cdo/spi/common/revision/StubCDORevision.java (revision 7692) >+++ src/org/eclipse/emf/cdo/spi/common/revision/StubCDORevision.java (working copy) >@@ -17,7 +17,6 @@ > import org.eclipse.emf.cdo.common.protocol.CDODataInput; > import org.eclipse.emf.cdo.common.protocol.CDODataOutput; > import org.eclipse.emf.cdo.common.revision.CDOList; >-import org.eclipse.emf.cdo.common.revision.CDOReferenceAdjuster; > import org.eclipse.emf.cdo.common.revision.CDORevision; > import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta; > >Index: src/org/eclipse/emf/cdo/common/id/CDOID.java >=================================================================== >--- src/org/eclipse/emf/cdo/common/id/CDOID.java (revision 7692) >+++ src/org/eclipse/emf/cdo/common/id/CDOID.java (working copy) >@@ -19,6 +19,7 @@ > > /** > * @author Eike Stepper >+ * @noextend This interface is not intended to be extended by clients. > * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDOID extends Serializable, Comparable<CDOID> >Index: src/org/eclipse/emf/cdo/spi/common/branch/InternalCDOBranch.java >=================================================================== >--- src/org/eclipse/emf/cdo/spi/common/branch/InternalCDOBranch.java (revision 7692) >+++ src/org/eclipse/emf/cdo/spi/common/branch/InternalCDOBranch.java (working copy) >@@ -16,6 +16,8 @@ > /** > * @author Eike Stepper > * @since 3.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface InternalCDOBranch extends CDOBranch > { >Index: src/org/eclipse/emf/cdo/common/id/CDOIDExternal.java >=================================================================== >--- src/org/eclipse/emf/cdo/common/id/CDOIDExternal.java (revision 7692) >+++ src/org/eclipse/emf/cdo/common/id/CDOIDExternal.java (working copy) >@@ -13,8 +13,9 @@ > > /** > * @author Simon McDuff >- * @noimplement This interface is not intended to be implemented by clients. > * @since 2.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDOIDExternal extends CDOID > { >Index: src/org/eclipse/emf/cdo/common/revision/CDORevisionCacheFactory.java >=================================================================== >--- src/org/eclipse/emf/cdo/common/revision/CDORevisionCacheFactory.java (revision 7692) >+++ src/org/eclipse/emf/cdo/common/revision/CDORevisionCacheFactory.java (working copy) >@@ -1,51 +0,0 @@ >-/** >- * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, 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 >- * http://www.eclipse.org/legal/epl-v10.html >- * >- * Contributors: >- * Eike Stepper - initial API and implementation >- */ >-package org.eclipse.emf.cdo.common.revision; >- >-import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionCache; >- >-/** >- * @author Eike Stepper >- * @since 4.0 >- */ >-public interface CDORevisionCacheFactory >-{ >- public CDORevisionCache createRevisionCache(CDORevision revision); >- >- /** >- * @author Eike Stepper >- * @since 3.0 >- */ >- public static class PrototypeInstantiator implements CDORevisionCacheFactory >- { >- private CDORevisionCache prototype; >- >- public PrototypeInstantiator(CDORevisionCache prototype) >- { >- this.prototype = prototype; >- } >- >- public CDORevisionCache getPrototype() >- { >- return prototype; >- } >- >- public CDORevisionCache createRevisionCache(CDORevision revision) >- { >- if (revision.getBranch().isMainBranch()) >- { >- return prototype; >- } >- >- return ((InternalCDORevisionCache)prototype).instantiate(revision); >- } >- } >-} >Index: src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOListFeatureDeltaImpl.java >=================================================================== >--- src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOListFeatureDeltaImpl.java (revision 7692) >+++ src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOListFeatureDeltaImpl.java (working copy) >@@ -14,7 +14,6 @@ > > import org.eclipse.emf.cdo.common.protocol.CDODataInput; > import org.eclipse.emf.cdo.common.protocol.CDODataOutput; >-import org.eclipse.emf.cdo.common.revision.CDOReferenceAdjuster; > import org.eclipse.emf.cdo.common.revision.CDORevision; > import org.eclipse.emf.cdo.common.revision.delta.CDOAddFeatureDelta; > import org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDelta; >@@ -23,6 +22,7 @@ > import org.eclipse.emf.cdo.common.revision.delta.CDOMoveFeatureDelta; > import org.eclipse.emf.cdo.common.revision.delta.CDORemoveFeatureDelta; > import org.eclipse.emf.cdo.common.revision.delta.CDOSetFeatureDelta; >+import org.eclipse.emf.cdo.spi.common.revision.CDOReferenceAdjuster; > > import org.eclipse.net4j.util.ObjectUtil; > import org.eclipse.net4j.util.collection.Pair; >Index: src/org/eclipse/emf/cdo/internal/common/revision/CDOListImpl.java >=================================================================== >--- src/org/eclipse/emf/cdo/internal/common/revision/CDOListImpl.java (revision 7692) >+++ src/org/eclipse/emf/cdo/internal/common/revision/CDOListImpl.java (working copy) >@@ -15,7 +15,7 @@ > import org.eclipse.emf.cdo.common.model.CDOType; > import org.eclipse.emf.cdo.common.revision.CDOList; > import org.eclipse.emf.cdo.common.revision.CDOListFactory; >-import org.eclipse.emf.cdo.common.revision.CDOReferenceAdjuster; >+import org.eclipse.emf.cdo.spi.common.revision.CDOReferenceAdjuster; > import org.eclipse.emf.cdo.spi.common.revision.InternalCDOList; > > import org.eclipse.net4j.util.collection.MoveableArrayList; >Index: src/org/eclipse/emf/cdo/common/commit/CDOChangeSetData.java >=================================================================== >--- src/org/eclipse/emf/cdo/common/commit/CDOChangeSetData.java (revision 7692) >+++ src/org/eclipse/emf/cdo/common/commit/CDOChangeSetData.java (working copy) >@@ -21,8 +21,8 @@ > /** > * @author Eike Stepper > * @since 3.0 >- * @noimplement This interface is not intended to be implemented by clients. > * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDOChangeSetData extends CDOChangeKindProvider > { >Index: src/org/eclipse/emf/cdo/common/CDOCommonView.java >=================================================================== >--- src/org/eclipse/emf/cdo/common/CDOCommonView.java (revision 7692) >+++ src/org/eclipse/emf/cdo/common/CDOCommonView.java (working copy) >@@ -18,6 +18,8 @@ > /** > * @author Eike Stepper > * @since 2.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDOCommonView extends CDOBranchPoint, CDORevisionProvider, Closeable > { >Index: src/org/eclipse/emf/cdo/spi/common/commit/TextCommitInfoLog.java >=================================================================== >--- src/org/eclipse/emf/cdo/spi/common/commit/TextCommitInfoLog.java (revision 7692) >+++ src/org/eclipse/emf/cdo/spi/common/commit/TextCommitInfoLog.java (working copy) >@@ -1,61 +0,0 @@ >-/** >- * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, 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 >- * http://www.eclipse.org/legal/epl-v10.html >- * >- * Contributors: >- * Eike Stepper - initial API and implementation >- */ >-package org.eclipse.emf.cdo.spi.common.commit; >- >-import org.eclipse.emf.cdo.common.commit.CDOCommitInfo; >-import org.eclipse.emf.cdo.common.commit.CDOCommitInfoHandler; >-import org.eclipse.emf.cdo.common.model.CDOPackageUnit; >-import org.eclipse.emf.cdo.internal.common.bundle.OM; >- >-import java.io.OutputStream; >-import java.io.PrintStream; >- >-/** >- * @author Eike Stepper >- * @since 4.0 >- */ >-public class TextCommitInfoLog implements CDOCommitInfoHandler >-{ >- private PrintStream printStream; >- >- public TextCommitInfoLog(OutputStream stream) >- { >- printStream = stream instanceof PrintStream ? (PrintStream)stream : new PrintStream(stream); >- } >- >- public void handleCommitInfo(CDOCommitInfo commitInfo) >- { >- try >- { >- if (printStream != null) >- { >- printStream.println(commitInfo); >- >- for (CDOPackageUnit packageUnit : commitInfo.getNewPackageUnits()) >- { >- printStream.println(" P " + packageUnit.getID()); >- } >- >- CDOCommitInfoUtil.dump(printStream, commitInfo); >- printStream.flush(); >- } >- } >- catch (Exception ex) >- { >- handleException(ex); >- } >- } >- >- protected void handleException(Exception ex) >- { >- OM.LOG.error(ex); >- } >-} >Index: src/org/eclipse/emf/cdo/common/revision/delta/CDORemoveFeatureDelta.java >=================================================================== >--- src/org/eclipse/emf/cdo/common/revision/delta/CDORemoveFeatureDelta.java (revision 7692) >+++ src/org/eclipse/emf/cdo/common/revision/delta/CDORemoveFeatureDelta.java (working copy) >@@ -13,6 +13,7 @@ > > /** > * @author Simon McDuff >+ * @noextend This interface is not intended to be extended by clients. > * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDORemoveFeatureDelta extends CDOFeatureDelta >Index: src/org/eclipse/emf/cdo/spi/common/revision/CDOReferenceAdjustable.java >=================================================================== >--- src/org/eclipse/emf/cdo/spi/common/revision/CDOReferenceAdjustable.java (revision 7692) >+++ src/org/eclipse/emf/cdo/spi/common/revision/CDOReferenceAdjustable.java (working copy) >@@ -9,16 +9,14 @@ > * Simon McDuff - initial API and implementation > * Eike Stepper - maintenance > */ >-package org.eclipse.emf.cdo.common.revision; >+package org.eclipse.emf.cdo.spi.common.revision; >+ > > /** > * @author Simon McDuff >- * @since 2.0 >+ * @since 4.0 > */ > public interface CDOReferenceAdjustable > { >- /** >- * @since 4.0 >- */ > public boolean adjustReferences(CDOReferenceAdjuster referenceAdjuster); > } >Index: src/org/eclipse/emf/cdo/common/revision/CDORevisionCacheAdder.java >=================================================================== >--- src/org/eclipse/emf/cdo/common/revision/CDORevisionCacheAdder.java (revision 7692) >+++ src/org/eclipse/emf/cdo/common/revision/CDORevisionCacheAdder.java (working copy) >@@ -13,6 +13,8 @@ > /** > * @author Eike Stepper > * @since 4.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDORevisionCacheAdder > { >Index: src/org/eclipse/emf/cdo/spi/common/id/AbstractCDOIDInteger.java >=================================================================== >--- src/org/eclipse/emf/cdo/spi/common/id/AbstractCDOIDInteger.java (revision 7692) >+++ src/org/eclipse/emf/cdo/spi/common/id/AbstractCDOIDInteger.java (working copy) >@@ -19,6 +19,7 @@ > /** > * @author Eike Stepper > * @since 2.0 >+ * @noextend This interface is not intended to be extended by clients. > */ > public abstract class AbstractCDOIDInteger extends AbstractCDOID > { >Index: src/org/eclipse/emf/cdo/common/util/RepositoryStateChangedEvent.java >=================================================================== >--- src/org/eclipse/emf/cdo/common/util/RepositoryStateChangedEvent.java (revision 7692) >+++ src/org/eclipse/emf/cdo/common/util/RepositoryStateChangedEvent.java (working copy) >@@ -18,6 +18,7 @@ > /** > * @author Eike Stepper > * @since 3.0 >+ * @noextend This interface is not intended to be extended by clients. > */ > public class RepositoryStateChangedEvent extends Event implements CDOCommonRepository.StateChangedEvent > { >Index: src/org/eclipse/emf/cdo/common/protocol/CDOAuthenticationResult.java >=================================================================== >--- src/org/eclipse/emf/cdo/common/protocol/CDOAuthenticationResult.java (revision 7692) >+++ src/org/eclipse/emf/cdo/common/protocol/CDOAuthenticationResult.java (working copy) >@@ -1,60 +0,0 @@ >-/** >- * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, 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 >- * http://www.eclipse.org/legal/epl-v10.html >- * >- * Contributors: >- * Eike Stepper - initial API and implementation >- */ >-package org.eclipse.emf.cdo.common.protocol; >- >-import org.eclipse.net4j.util.io.ExtendedDataInput; >-import org.eclipse.net4j.util.io.ExtendedDataOutput; >- >-import java.io.IOException; >-import java.io.Serializable; >- >-/** >- * The result of an authentication operation. Carries a userID and a crypted token. >- * >- * @author Eike Stepper >- * @since 2.0 >- */ >-public final class CDOAuthenticationResult implements Serializable >-{ >- private static final long serialVersionUID = 1L; >- >- private String userID; >- >- private byte[] cryptedToken; >- >- public CDOAuthenticationResult(String userID, byte[] cryptedToken) >- { >- this.userID = userID; >- this.cryptedToken = cryptedToken; >- } >- >- public CDOAuthenticationResult(ExtendedDataInput in) throws IOException >- { >- userID = in.readString(); >- cryptedToken = in.readByteArray(); >- } >- >- public void write(ExtendedDataOutput out) throws IOException >- { >- out.writeString(userID); >- out.writeByteArray(cryptedToken); >- } >- >- public String getUserID() >- { >- return userID; >- } >- >- public byte[] getCryptedToken() >- { >- return cryptedToken; >- } >-} >Index: src/org/eclipse/emf/cdo/common/id/CDOIDObject.java >=================================================================== >--- src/org/eclipse/emf/cdo/common/id/CDOIDObject.java (revision 7692) >+++ src/org/eclipse/emf/cdo/common/id/CDOIDObject.java (working copy) >@@ -12,6 +12,8 @@ > > /** > * @author Eike Stepper >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDOIDObject extends CDOID > { >Index: src/org/eclipse/emf/cdo/common/model/CDOType.java >=================================================================== >--- src/org/eclipse/emf/cdo/common/model/CDOType.java (revision 7692) >+++ src/org/eclipse/emf/cdo/common/model/CDOType.java (working copy) >@@ -13,7 +13,7 @@ > > import org.eclipse.emf.cdo.common.protocol.CDODataInput; > import org.eclipse.emf.cdo.common.protocol.CDODataOutput; >-import org.eclipse.emf.cdo.common.revision.CDOReferenceAdjuster; >+import org.eclipse.emf.cdo.spi.common.revision.CDOReferenceAdjuster; > > import org.eclipse.emf.ecore.EClassifier; > import org.eclipse.emf.ecore.EStructuralFeature; >Index: src/org/eclipse/emf/cdo/common/util/TransportException.java >=================================================================== >--- src/org/eclipse/emf/cdo/common/util/TransportException.java (revision 7692) >+++ src/org/eclipse/emf/cdo/common/util/TransportException.java (working copy) >@@ -12,6 +12,7 @@ > > /** > * @author Eike Stepper >+ * @noextend This interface is not intended to be extended by clients. > */ > public class TransportException extends CDOException > { >Index: src/org/eclipse/emf/cdo/common/protocol/CDODataOutput.java >=================================================================== >--- src/org/eclipse/emf/cdo/common/protocol/CDODataOutput.java (revision 7692) >+++ src/org/eclipse/emf/cdo/common/protocol/CDODataOutput.java (working copy) >@@ -46,6 +46,8 @@ > /** > * @author Eike Stepper > * @since 3.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDODataOutput extends ExtendedDataOutput > { >Index: src/org/eclipse/emf/cdo/spi/common/id/AbstractCDOIDLong.java >=================================================================== >--- src/org/eclipse/emf/cdo/spi/common/id/AbstractCDOIDLong.java (revision 7692) >+++ src/org/eclipse/emf/cdo/spi/common/id/AbstractCDOIDLong.java (working copy) >@@ -20,6 +20,7 @@ > /** > * @author Eike Stepper > * @since 2.0 >+ * @noextend This interface is not intended to be extended by clients. > */ > public abstract class AbstractCDOIDLong extends AbstractCDOID > { >Index: src/org/eclipse/emf/cdo/common/revision/CDORevisable.java >=================================================================== >--- src/org/eclipse/emf/cdo/common/revision/CDORevisable.java (revision 7692) >+++ src/org/eclipse/emf/cdo/common/revision/CDORevisable.java (working copy) >@@ -16,6 +16,8 @@ > /** > * @author Eike Stepper > * @since 4.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDORevisable extends CDOBranchPoint, CDOBranchVersion > { >Index: src/org/eclipse/emf/cdo/spi/common/revision/InternalCDOList.java >=================================================================== >--- src/org/eclipse/emf/cdo/spi/common/revision/InternalCDOList.java (revision 7692) >+++ src/org/eclipse/emf/cdo/spi/common/revision/InternalCDOList.java (working copy) >@@ -12,7 +12,6 @@ > package org.eclipse.emf.cdo.spi.common.revision; > > import org.eclipse.emf.cdo.common.revision.CDOList; >-import org.eclipse.emf.cdo.common.revision.CDOReferenceAdjuster; > import org.eclipse.emf.cdo.common.revision.CDORevisionUtil; > > import org.eclipse.emf.ecore.EClassifier; >Index: src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOClearFeatureDeltaImpl.java >=================================================================== >--- src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOClearFeatureDeltaImpl.java (revision 7692) >+++ src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOClearFeatureDeltaImpl.java (working copy) >@@ -12,11 +12,11 @@ > package org.eclipse.emf.cdo.internal.common.revision.delta; > > import org.eclipse.emf.cdo.common.protocol.CDODataInput; >-import org.eclipse.emf.cdo.common.revision.CDOReferenceAdjuster; > import org.eclipse.emf.cdo.common.revision.CDORevision; > import org.eclipse.emf.cdo.common.revision.delta.CDOClearFeatureDelta; > import org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDelta; > import org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDeltaVisitor; >+import org.eclipse.emf.cdo.spi.common.revision.CDOReferenceAdjuster; > import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision; > > import org.eclipse.emf.ecore.EClass; >Index: src/org/eclipse/emf/cdo/common/id/CDOIDReference.java >=================================================================== >--- src/org/eclipse/emf/cdo/common/id/CDOIDReference.java (revision 7692) >+++ src/org/eclipse/emf/cdo/common/id/CDOIDReference.java (working copy) >@@ -21,6 +21,8 @@ > /** > * @author Eike Stepper > * @since 4.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noinstantiate This class is not intended to be instantiated by clients. > */ > public class CDOIDReference implements CDOReference<CDOID> > { >Index: src/org/eclipse/emf/cdo/common/util/CDOQueryInfo.java >=================================================================== >--- src/org/eclipse/emf/cdo/common/util/CDOQueryInfo.java (revision 7692) >+++ src/org/eclipse/emf/cdo/common/util/CDOQueryInfo.java (working copy) >@@ -18,6 +18,8 @@ > /** > * @author Simon McDuff > * @since 3.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDOQueryInfo > { >Index: src/org/eclipse/emf/cdo/common/revision/CDORevision.java >=================================================================== >--- src/org/eclipse/emf/cdo/common/revision/CDORevision.java (revision 7692) >+++ src/org/eclipse/emf/cdo/common/revision/CDORevision.java (working copy) >@@ -20,6 +20,8 @@ > > /** > * @author Eike Stepper >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDORevision extends CDORevisionKey, CDORevisable > { >Index: src/org/eclipse/emf/cdo/common/protocol/CDODataInput.java >=================================================================== >--- src/org/eclipse/emf/cdo/common/protocol/CDODataInput.java (revision 7692) >+++ src/org/eclipse/emf/cdo/common/protocol/CDODataInput.java (working copy) >@@ -45,6 +45,8 @@ > /** > * @author Eike Stepper > * @since 3.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDODataInput extends ExtendedDataInput > { >Index: src/org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDelta.java >=================================================================== >--- src/org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDelta.java (revision 7692) >+++ src/org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDelta.java (working copy) >@@ -18,6 +18,7 @@ > > /** > * @author Simon McDuff >+ * @noextend This interface is not intended to be extended by clients. > * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDOFeatureDelta >Index: src/org/eclipse/emf/cdo/spi/common/revision/CDOReferenceAdjuster.java >=================================================================== >--- src/org/eclipse/emf/cdo/spi/common/revision/CDOReferenceAdjuster.java (revision 7692) >+++ src/org/eclipse/emf/cdo/spi/common/revision/CDOReferenceAdjuster.java (working copy) >@@ -9,16 +9,18 @@ > * Simon McDuff - initial API and implementation > * Eike Stepper - maintenance > */ >-package org.eclipse.emf.cdo.common.revision; >+package org.eclipse.emf.cdo.spi.common.revision; > > import org.eclipse.emf.cdo.common.id.CDOID; > import org.eclipse.emf.cdo.common.id.CDOIDTemp; >+import org.eclipse.emf.cdo.common.revision.CDOList; >+import org.eclipse.emf.cdo.common.revision.CDORevision; > > import org.eclipse.emf.ecore.EStructuralFeature; > > /** > * @author Simon McDuff >- * @since 2.0 >+ * @since 4.0 > */ > public interface CDOReferenceAdjuster > { >@@ -27,8 +29,6 @@ > * transaction. {@link CDORevision} must replace {@link CDOIDTemp} for non-temporary {@link CDOID} with a mapped ID. > * Only the internal structure knows how to do these modifications. This is important to consider using different > * implementation of {@link CDOList}. >- * >- * @since 4.0 > */ > public Object adjustReference(Object id, EStructuralFeature feature, int index); > } >Index: src/org/eclipse/emf/cdo/common/model/CDOPackageUnit.java >=================================================================== >--- src/org/eclipse/emf/cdo/common/model/CDOPackageUnit.java (revision 7692) >+++ src/org/eclipse/emf/cdo/common/model/CDOPackageUnit.java (working copy) >@@ -26,6 +26,8 @@ > * > * @author Eike Stepper > * @since 2.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDOPackageUnit extends Comparable<CDOPackageUnit> > { >Index: src/org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDeltaHandler.java >=================================================================== >--- src/org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDeltaHandler.java (revision 7692) >+++ src/org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDeltaHandler.java (working copy) >@@ -1,20 +0,0 @@ >-/** >- * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, 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 >- * http://www.eclipse.org/legal/epl-v10.html >- * >- * Contributors: >- * Eike Stepper - initial API and implementation >- */ >-package org.eclipse.emf.cdo.common.revision.delta; >- >-/** >- * @author Eike Stepper >- * @noimplement This interface is not intended to be implemented by clients. >- */ >-public interface CDOFeatureDeltaHandler >-{ >- public void handleFeatureDelta(CDOFeatureDelta featureDelta); >-} >Index: src/org/eclipse/emf/cdo/spi/common/branch/InternalCDOBranchManager.java >=================================================================== >--- src/org/eclipse/emf/cdo/spi/common/branch/InternalCDOBranchManager.java (revision 7692) >+++ src/org/eclipse/emf/cdo/spi/common/branch/InternalCDOBranchManager.java (working copy) >@@ -25,6 +25,8 @@ > /** > * @author Eike Stepper > * @since 3.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface InternalCDOBranchManager extends CDOBranchManager, ILifecycle > { >Index: src/org/eclipse/emf/cdo/common/commit/CDOCommitInfo.java >=================================================================== >--- src/org/eclipse/emf/cdo/common/commit/CDOCommitInfo.java (revision 7692) >+++ src/org/eclipse/emf/cdo/common/commit/CDOCommitInfo.java (working copy) >@@ -15,6 +15,8 @@ > /** > * @author Eike Stepper > * @since 3.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDOCommitInfo extends CDOBranchPoint, CDOCommitData > { >Index: src/org/eclipse/emf/cdo/common/model/CDOPackageTypeRegistry.java >=================================================================== >--- src/org/eclipse/emf/cdo/common/model/CDOPackageTypeRegistry.java (revision 7692) >+++ src/org/eclipse/emf/cdo/common/model/CDOPackageTypeRegistry.java (working copy) >@@ -212,6 +212,8 @@ > * TODO Remove me when client and common are unified! > * > * @author Eike Stepper >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public static interface CDOObjectMarker > { >Index: src/org/eclipse/emf/cdo/spi/common/revision/DelegatingCDORevision.java >=================================================================== >--- src/org/eclipse/emf/cdo/spi/common/revision/DelegatingCDORevision.java (revision 7692) >+++ src/org/eclipse/emf/cdo/spi/common/revision/DelegatingCDORevision.java (working copy) >@@ -19,7 +19,6 @@ > import org.eclipse.emf.cdo.common.protocol.CDODataInput; > import org.eclipse.emf.cdo.common.protocol.CDODataOutput; > import org.eclipse.emf.cdo.common.revision.CDOList; >-import org.eclipse.emf.cdo.common.revision.CDOReferenceAdjuster; > import org.eclipse.emf.cdo.common.revision.CDORevision; > import org.eclipse.emf.cdo.common.revision.CDORevisionData; > import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta; >Index: src/org/eclipse/emf/cdo/common/revision/delta/CDOAddFeatureDelta.java >=================================================================== >--- src/org/eclipse/emf/cdo/common/revision/delta/CDOAddFeatureDelta.java (revision 7692) >+++ src/org/eclipse/emf/cdo/common/revision/delta/CDOAddFeatureDelta.java (working copy) >@@ -13,6 +13,7 @@ > > /** > * @author Simon McDuff >+ * @noextend This interface is not intended to be extended by clients. > * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDOAddFeatureDelta extends CDOFeatureDelta >Index: src/org/eclipse/emf/cdo/spi/common/revision/InternalCDORevision.java >=================================================================== >--- src/org/eclipse/emf/cdo/spi/common/revision/InternalCDORevision.java (revision 7692) >+++ src/org/eclipse/emf/cdo/spi/common/revision/InternalCDORevision.java (working copy) >@@ -19,7 +19,6 @@ > import org.eclipse.emf.cdo.common.protocol.CDODataInput; > import org.eclipse.emf.cdo.common.protocol.CDODataOutput; > import org.eclipse.emf.cdo.common.revision.CDOList; >-import org.eclipse.emf.cdo.common.revision.CDOReferenceAdjustable; > import org.eclipse.emf.cdo.common.revision.CDORevision; > import org.eclipse.emf.cdo.common.revision.CDORevisionData; > >Index: src/org/eclipse/emf/cdo/common/protocol/CDOProtocolConstants.java >=================================================================== >--- src/org/eclipse/emf/cdo/common/protocol/CDOProtocolConstants.java (revision 7692) >+++ src/org/eclipse/emf/cdo/common/protocol/CDOProtocolConstants.java (working copy) >@@ -15,8 +15,9 @@ > > /** > * @author Eike Stepper >- * @noimplement This interface is not intended to be implemented by clients. > * @since 2.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDOProtocolConstants > { >Index: src/org/eclipse/emf/cdo/internal/common/model/CDOTypeImpl.java >=================================================================== >--- src/org/eclipse/emf/cdo/internal/common/model/CDOTypeImpl.java (revision 7692) >+++ src/org/eclipse/emf/cdo/internal/common/model/CDOTypeImpl.java (working copy) >@@ -20,12 +20,12 @@ > import org.eclipse.emf.cdo.common.model.CDOType; > import org.eclipse.emf.cdo.common.protocol.CDODataInput; > import org.eclipse.emf.cdo.common.protocol.CDODataOutput; >-import org.eclipse.emf.cdo.common.revision.CDOReferenceAdjuster; > import org.eclipse.emf.cdo.common.revision.CDORevision; > import org.eclipse.emf.cdo.common.revision.CDORevisionData; > import org.eclipse.emf.cdo.common.revision.CDORevisionUtil; > import org.eclipse.emf.cdo.internal.common.messages.Messages; > import org.eclipse.emf.cdo.spi.common.model.InternalCDOPackageRegistry; >+import org.eclipse.emf.cdo.spi.common.revision.CDOReferenceAdjuster; > > import org.eclipse.emf.common.util.Enumerator; > import org.eclipse.emf.ecore.EClassifier; >Index: src/org/eclipse/emf/cdo/common/model/CDOModelUtil.java >=================================================================== >--- src/org/eclipse/emf/cdo/common/model/CDOModelUtil.java (revision 7692) >+++ src/org/eclipse/emf/cdo/common/model/CDOModelUtil.java (working copy) >@@ -58,53 +58,8 @@ > * @author Eike Stepper > * @since 2.0 > */ >-public final class CDOModelUtil >+public final class CDOModelUtil implements CDOModelConstants > { >- /** >- * @since 2.0 >- */ >- public static final String CORE_PACKAGE_URI = "http://www.eclipse.org/emf/2002/Ecore"; //$NON-NLS-1$ >- >- /** >- * @since 2.0 >- */ >- public static final String ROOT_CLASS_NAME = "EObject"; //$NON-NLS-1$ >- >- /** >- * @since 2.0 >- */ >- public static final String RESOURCE_PACKAGE_URI = "http://www.eclipse.org/emf/CDO/Eresource/4.0.0"; //$NON-NLS-1$ >- >- /** >- * @since 2.0 >- */ >- public static final String RESOURCE_NODE_CLASS_NAME = "CDOResourceNode"; //$NON-NLS-1$ >- >- /** >- * @since 2.0 >- */ >- public static final String RESOURCE_FOLDER_CLASS_NAME = "CDOResourceFolder"; //$NON-NLS-1$ >- >- /** >- * @since 2.0 >- */ >- public static final String RESOURCE_CLASS_NAME = "CDOResource"; //$NON-NLS-1$ >- >- /** >- * @since 4.0 >- */ >- public static final String TYPES_PACKAGE_URI = "http://www.eclipse.org/emf/CDO/Etypes/4.0.0"; //$NON-NLS-1$ >- >- /** >- * @since 4.0 >- */ >- public static final String BLOB_CLASS_NAME = "Blob"; //$NON-NLS-1$ >- >- /** >- * @since 4.0 >- */ >- public static final String CLOB_CLASS_NAME = "Clob"; //$NON-NLS-1$ >- > private static CDOType[] coreTypes; > > static >@@ -156,7 +111,7 @@ > */ > public static boolean isCorePackage(EPackage ePackage) > { >- return CORE_PACKAGE_URI.equals(ePackage.getNsURI()); >+ return CDOModelConstants.CORE_PACKAGE_URI.equals(ePackage.getNsURI()); > } > > /** >@@ -164,7 +119,7 @@ > */ > public static boolean isRoot(EClass eClass) > { >- return isCorePackage(eClass.getEPackage()) && ROOT_CLASS_NAME.equals(eClass.getName()); >+ return isCorePackage(eClass.getEPackage()) && CDOModelConstants.ROOT_CLASS_NAME.equals(eClass.getName()); > } > > /** >@@ -172,7 +127,7 @@ > */ > public static boolean isResourcePackage(EPackage ePackage) > { >- return RESOURCE_PACKAGE_URI.equals(ePackage.getNsURI()); >+ return CDOModelConstants.RESOURCE_PACKAGE_URI.equals(ePackage.getNsURI()); > } > > /** >@@ -180,7 +135,7 @@ > */ > public static boolean isResource(EClass eClass) > { >- return isResourcePackage(eClass.getEPackage()) && RESOURCE_CLASS_NAME.equals(eClass.getName()); >+ return isResourcePackage(eClass.getEPackage()) && CDOModelConstants.RESOURCE_CLASS_NAME.equals(eClass.getName()); > } > > /** >@@ -188,7 +143,7 @@ > */ > public static boolean isResourceFolder(EClass eClass) > { >- return isResourcePackage(eClass.getEPackage()) && RESOURCE_FOLDER_CLASS_NAME.equals(eClass.getName()); >+ return isResourcePackage(eClass.getEPackage()) && CDOModelConstants.RESOURCE_FOLDER_CLASS_NAME.equals(eClass.getName()); > } > > /** >@@ -197,7 +152,7 @@ > public static boolean isResourceNode(EClass eClass) > { > return isResourcePackage(eClass.getEPackage()) >- && (RESOURCE_NODE_CLASS_NAME.equals(eClass.getName()) || RESOURCE_CLASS_NAME.equals(eClass.getName()) || RESOURCE_FOLDER_CLASS_NAME >+ && (CDOModelConstants.RESOURCE_NODE_CLASS_NAME.equals(eClass.getName()) || CDOModelConstants.RESOURCE_CLASS_NAME.equals(eClass.getName()) || CDOModelConstants.RESOURCE_FOLDER_CLASS_NAME > .equals(eClass.getName())); > } > >@@ -206,7 +161,7 @@ > */ > public static boolean isTypesPackage(EPackage ePackage) > { >- return TYPES_PACKAGE_URI.equals(ePackage.getNsURI()); >+ return CDOModelConstants.TYPES_PACKAGE_URI.equals(ePackage.getNsURI()); > } > > /** >@@ -223,7 +178,7 @@ > public static boolean isLob(EClassifier eClassifier) > { > return isTypesPackage(eClassifier.getEPackage()) >- && (BLOB_CLASS_NAME.equals(eClassifier.getName()) || CLOB_CLASS_NAME.equals(eClassifier.getName())); >+ && (CDOModelConstants.BLOB_CLASS_NAME.equals(eClassifier.getName()) || CDOModelConstants.CLOB_CLASS_NAME.equals(eClassifier.getName())); > } > > /** >@@ -276,12 +231,12 @@ > else if (isTypesPackage(ePackage)) > { > String name = eDataType.getName(); >- if (BLOB_CLASS_NAME.equals(name)) >+ if (CDOModelConstants.BLOB_CLASS_NAME.equals(name)) > { > return CDOType.BLOB; > } > >- if (CLOB_CLASS_NAME.equals(name)) >+ if (CDOModelConstants.CLOB_CLASS_NAME.equals(name)) > { > return CDOType.CLOB; > } >Index: src/org/eclipse/emf/cdo/spi/common/id/InternalCDOIDObject.java >=================================================================== >--- src/org/eclipse/emf/cdo/spi/common/id/InternalCDOIDObject.java (revision 7692) >+++ src/org/eclipse/emf/cdo/spi/common/id/InternalCDOIDObject.java (working copy) >@@ -15,6 +15,8 @@ > /** > * @author Eike Stepper > * @since 3.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface InternalCDOIDObject extends CDOIDObject > { >Index: src/org/eclipse/emf/cdo/common/CDOCommonSession.java >=================================================================== >--- src/org/eclipse/emf/cdo/common/CDOCommonSession.java (revision 7692) >+++ src/org/eclipse/emf/cdo/common/CDOCommonSession.java (working copy) >@@ -19,6 +19,8 @@ > /** > * @author Eike Stepper > * @since 2.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDOCommonSession extends IUserAware, IOptionsContainer, Closeable > { >Index: src/org/eclipse/emf/cdo/spi/common/model/DelegatingCDOPackageRegistry.java >=================================================================== >--- src/org/eclipse/emf/cdo/spi/common/model/DelegatingCDOPackageRegistry.java (revision 7692) >+++ src/org/eclipse/emf/cdo/spi/common/model/DelegatingCDOPackageRegistry.java (working copy) >@@ -8,11 +8,7 @@ > * Contributors: > * Eike Stepper - initial API and implementation > */ >-package org.eclipse.emf.cdo.internal.server.embedded; >- >-import org.eclipse.emf.cdo.spi.common.model.InternalCDOPackageInfo; >-import org.eclipse.emf.cdo.spi.common.model.InternalCDOPackageRegistry; >-import org.eclipse.emf.cdo.spi.common.model.InternalCDOPackageUnit; >+package org.eclipse.emf.cdo.spi.common.model; > > import org.eclipse.net4j.util.lifecycle.Lifecycle; > >@@ -25,6 +21,7 @@ > > /** > * @author Eike Stepper >+ * @since 4.0 > */ > @Deprecated > public abstract class DelegatingCDOPackageRegistry extends Lifecycle implements InternalCDOPackageRegistry >Index: src/org/eclipse/emf/cdo/common/revision/delta/CDOUnsetFeatureDelta.java >=================================================================== >--- src/org/eclipse/emf/cdo/common/revision/delta/CDOUnsetFeatureDelta.java (revision 7692) >+++ src/org/eclipse/emf/cdo/common/revision/delta/CDOUnsetFeatureDelta.java (working copy) >@@ -13,6 +13,7 @@ > > /** > * @author Simon McDuff >+ * @noextend This interface is not intended to be extended by clients. > * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDOUnsetFeatureDelta extends CDOFeatureDelta >Index: src/org/eclipse/emf/cdo/spi/common/id/AbstractCDOID.java >=================================================================== >--- src/org/eclipse/emf/cdo/spi/common/id/AbstractCDOID.java (revision 7692) >+++ src/org/eclipse/emf/cdo/spi/common/id/AbstractCDOID.java (working copy) >@@ -21,6 +21,7 @@ > /** > * @author Eike Stepper > * @since 2.0 >+ * @noextend This interface is not intended to be extended by clients. > */ > public abstract class AbstractCDOID implements CDOID > { >Index: src/org/eclipse/emf/cdo/common/CDOCommonRepository.java >=================================================================== >--- src/org/eclipse/emf/cdo/common/CDOCommonRepository.java (revision 7692) >+++ src/org/eclipse/emf/cdo/common/CDOCommonRepository.java (working copy) >@@ -20,6 +20,8 @@ > /** > * @author Eike Stepper > * @since 3.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDOCommonRepository extends CDOTimeProvider > { >Index: src/org/eclipse/emf/cdo/common/revision/CDOElementProxy.java >=================================================================== >--- src/org/eclipse/emf/cdo/common/revision/CDOElementProxy.java (revision 7692) >+++ src/org/eclipse/emf/cdo/common/revision/CDOElementProxy.java (working copy) >@@ -13,8 +13,9 @@ > > /** > * @author Eike Stepper >- * @noimplement This interface is not intended to be implemented by clients. > * @since 4.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDOElementProxy > { >Index: META-INF/MANIFEST.MF >=================================================================== >--- META-INF/MANIFEST.MF (revision 7692) >+++ META-INF/MANIFEST.MF (working copy) >@@ -18,9 +18,10 @@ > Export-Package: org.eclipse.emf.cdo.common;version="4.0.0", > org.eclipse.emf.cdo.common.branch;version="4.0.0", > org.eclipse.emf.cdo.common.commit;version="4.0.0", >+ org.eclipse.emf.cdo.common.commit.handler;version="4.0.0", > org.eclipse.emf.cdo.common.id;version="4.0.0", >- org.eclipse.emf.cdo.common.model;version="4.0.0", > org.eclipse.emf.cdo.common.lob;version="4.0.0", >+ org.eclipse.emf.cdo.common.model;version="4.0.0", > org.eclipse.emf.cdo.common.protocol;version="4.0.0", > org.eclipse.emf.cdo.common.revision;version="4.0.0", > org.eclipse.emf.cdo.common.revision.delta;version="4.0.0", >Index: src/org/eclipse/emf/cdo/common/model/CDOPackageRegistry.java >=================================================================== >--- src/org/eclipse/emf/cdo/common/model/CDOPackageRegistry.java (revision 7692) >+++ src/org/eclipse/emf/cdo/common/model/CDOPackageRegistry.java (working copy) >@@ -22,6 +22,8 @@ > /** > * @author Eike Stepper > * @since 2.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDOPackageRegistry extends EPackage.Registry > { >Index: src/org/eclipse/emf/cdo/common/commit/CDOChangeSet.java >=================================================================== >--- src/org/eclipse/emf/cdo/common/commit/CDOChangeSet.java (revision 7692) >+++ src/org/eclipse/emf/cdo/common/commit/CDOChangeSet.java (working copy) >@@ -16,6 +16,8 @@ > /** > * @author Eike Stepper > * @since 3.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDOChangeSet extends CDOBranchPointRange, CDOChangeSetData > { >Index: src/org/eclipse/emf/cdo/common/id/CDOReference.java >=================================================================== >--- src/org/eclipse/emf/cdo/common/id/CDOReference.java (revision 7692) >+++ src/org/eclipse/emf/cdo/common/id/CDOReference.java (working copy) >@@ -19,6 +19,8 @@ > /** > * @author Eike Stepper > * @since 4.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDOReference<OBJECT> > { >Index: src/org/eclipse/emf/cdo/common/protocol/CDOAuthenticator.java >=================================================================== >--- src/org/eclipse/emf/cdo/common/protocol/CDOAuthenticator.java (revision 7692) >+++ src/org/eclipse/emf/cdo/common/protocol/CDOAuthenticator.java (working copy) >@@ -10,6 +10,8 @@ > */ > package org.eclipse.emf.cdo.common.protocol; > >+import org.eclipse.emf.cdo.spi.common.CDOAuthenticationResult; >+ > import org.eclipse.net4j.util.security.IPasswordCredentialsProvider; > > /** >@@ -36,5 +38,8 @@ > > public void setCredentialsProvider(IPasswordCredentialsProvider credentialsProvider); > >+ /** >+ * @since 4.0 >+ */ > public CDOAuthenticationResult authenticate(byte[] randomToken); > } >Index: src/org/eclipse/emf/cdo/common/revision/CDORevisionData.java >=================================================================== >--- src/org/eclipse/emf/cdo/common/revision/CDORevisionData.java (revision 7692) >+++ src/org/eclipse/emf/cdo/common/revision/CDORevisionData.java (working copy) >@@ -17,6 +17,7 @@ > > /** > * @author Eike Stepper >+ * @noextend This interface is not intended to be extended by clients. > * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDORevisionData >Index: src/org/eclipse/emf/cdo/common/util/CDOQueryQueue.java >=================================================================== >--- src/org/eclipse/emf/cdo/common/util/CDOQueryQueue.java (revision 7692) >+++ src/org/eclipse/emf/cdo/common/util/CDOQueryQueue.java (working copy) >@@ -25,6 +25,8 @@ > /** > * @author Simon McDuff > * @since 2.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public class CDOQueryQueue<E> implements Queue<E>, Closeable > { >Index: src/org/eclipse/emf/cdo/common/revision/CDORevisionKey.java >=================================================================== >--- src/org/eclipse/emf/cdo/common/revision/CDORevisionKey.java (revision 7692) >+++ src/org/eclipse/emf/cdo/common/revision/CDORevisionKey.java (working copy) >@@ -15,6 +15,8 @@ > /** > * @author Eike Stepper > * @since 3.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDORevisionKey extends CDOBranchVersion, CDOIDAndVersion > { >Index: src/org/eclipse/emf/cdo/spi/common/commit/BinaryCommitInfoLog.java >=================================================================== >--- src/org/eclipse/emf/cdo/spi/common/commit/BinaryCommitInfoLog.java (revision 7692) >+++ src/org/eclipse/emf/cdo/spi/common/commit/BinaryCommitInfoLog.java (working copy) >@@ -1,56 +0,0 @@ >-/** >- * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, 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 >- * http://www.eclipse.org/legal/epl-v10.html >- * >- * Contributors: >- * Eike Stepper - initial API and implementation >- */ >-package org.eclipse.emf.cdo.spi.common.commit; >- >-import org.eclipse.emf.cdo.common.commit.CDOCommitInfo; >-import org.eclipse.emf.cdo.common.commit.CDOCommitInfoHandler; >-import org.eclipse.emf.cdo.common.id.CDOIDProvider; >-import org.eclipse.emf.cdo.common.model.CDOPackageRegistry; >-import org.eclipse.emf.cdo.common.protocol.CDODataOutput; >-import org.eclipse.emf.cdo.common.util.CDOCommonUtil; >-import org.eclipse.emf.cdo.internal.common.bundle.OM; >- >-import org.eclipse.net4j.util.io.ExtendedDataOutput; >-import org.eclipse.net4j.util.io.ExtendedDataOutputStream; >- >-import java.io.OutputStream; >- >-/** >- * @author Eike Stepper >- * @since 4.0 >- */ >-public class BinaryCommitInfoLog implements CDOCommitInfoHandler >-{ >- private CDODataOutput out; >- >- public BinaryCommitInfoLog(OutputStream stream, CDOPackageRegistry packageRegistry) >- { >- ExtendedDataOutput eod = ExtendedDataOutputStream.wrap(stream); >- out = CDOCommonUtil.createCDODataOutput(eod, packageRegistry, CDOIDProvider.NOOP); >- } >- >- public void handleCommitInfo(CDOCommitInfo commitInfo) >- { >- try >- { >- out.writeCDOCommitInfo(commitInfo); >- } >- catch (Exception ex) >- { >- handleException(ex); >- } >- } >- >- protected void handleException(Exception ex) >- { >- OM.LOG.error(ex); >- } >-} >Index: src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOSingleValueFeatureDeltaImpl.java >=================================================================== >--- src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOSingleValueFeatureDeltaImpl.java (revision 7692) >+++ src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOSingleValueFeatureDeltaImpl.java (working copy) >@@ -14,8 +14,8 @@ > import org.eclipse.emf.cdo.common.id.CDOID; > import org.eclipse.emf.cdo.common.protocol.CDODataInput; > import org.eclipse.emf.cdo.common.protocol.CDODataOutput; >-import org.eclipse.emf.cdo.common.revision.CDOReferenceAdjuster; > import org.eclipse.emf.cdo.common.revision.CDORevisionUtil; >+import org.eclipse.emf.cdo.spi.common.revision.CDOReferenceAdjuster; > import org.eclipse.emf.cdo.spi.common.revision.InternalCDOFeatureDelta.WithIndex; > > import org.eclipse.net4j.util.ObjectUtil; >Index: src/org/eclipse/emf/cdo/common/util/RepositoryTypeChangedEvent.java >=================================================================== >--- src/org/eclipse/emf/cdo/common/util/RepositoryTypeChangedEvent.java (revision 7692) >+++ src/org/eclipse/emf/cdo/common/util/RepositoryTypeChangedEvent.java (working copy) >@@ -18,6 +18,7 @@ > /** > * @author Eike Stepper > * @since 3.0 >+ * @noextend This interface is not intended to be extended by clients. > */ > public class RepositoryTypeChangedEvent extends Event implements CDOCommonRepository.TypeChangedEvent > { >Index: src/org/eclipse/emf/cdo/spi/common/revision/InternalCDORevisionDelta.java >=================================================================== >--- src/org/eclipse/emf/cdo/spi/common/revision/InternalCDORevisionDelta.java (revision 7692) >+++ src/org/eclipse/emf/cdo/spi/common/revision/InternalCDORevisionDelta.java (working copy) >@@ -11,7 +11,6 @@ > package org.eclipse.emf.cdo.spi.common.revision; > > import org.eclipse.emf.cdo.common.branch.CDOBranch; >-import org.eclipse.emf.cdo.common.revision.CDOReferenceAdjuster; > import org.eclipse.emf.cdo.common.revision.CDORevisable; > import org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDelta; > import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta; >Index: src/org/eclipse/emf/cdo/common/id/CDOIDTemp.java >=================================================================== >--- src/org/eclipse/emf/cdo/common/id/CDOIDTemp.java (revision 7692) >+++ src/org/eclipse/emf/cdo/common/id/CDOIDTemp.java (working copy) >@@ -13,6 +13,7 @@ > > /** > * @author Eike Stepper >+ * @noextend This interface is not intended to be extended by clients. > * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDOIDTemp extends CDOID >Index: src/org/eclipse/emf/cdo/spi/common/commit/InternalCDOCommitInfoManager.java >=================================================================== >--- src/org/eclipse/emf/cdo/spi/common/commit/InternalCDOCommitInfoManager.java (revision 7692) >+++ src/org/eclipse/emf/cdo/spi/common/commit/InternalCDOCommitInfoManager.java (working copy) >@@ -21,6 +21,8 @@ > /** > * @author Eike Stepper > * @since 3.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface InternalCDOCommitInfoManager extends CDOCommitInfoManager, ILifecycle > { >Index: src/org/eclipse/emf/cdo/common/revision/CDOReferenceAdjustable.java >=================================================================== >--- src/org/eclipse/emf/cdo/common/revision/CDOReferenceAdjustable.java (revision 7692) >+++ src/org/eclipse/emf/cdo/common/revision/CDOReferenceAdjustable.java (working copy) >@@ -1,24 +0,0 @@ >-/** >- * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, 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 >- * http://www.eclipse.org/legal/epl-v10.html >- * >- * Contributors: >- * Simon McDuff - initial API and implementation >- * Eike Stepper - maintenance >- */ >-package org.eclipse.emf.cdo.common.revision; >- >-/** >- * @author Simon McDuff >- * @since 2.0 >- */ >-public interface CDOReferenceAdjustable >-{ >- /** >- * @since 4.0 >- */ >- public boolean adjustReferences(CDOReferenceAdjuster referenceAdjuster); >-} >Index: src/org/eclipse/emf/cdo/common/commit/CDOCommitInfoManager.java >=================================================================== >--- src/org/eclipse/emf/cdo/common/commit/CDOCommitInfoManager.java (revision 7692) >+++ src/org/eclipse/emf/cdo/common/commit/CDOCommitInfoManager.java (working copy) >@@ -15,6 +15,8 @@ > /** > * @author Andre Dietisheim > * @since 3.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDOCommitInfoManager > { >Index: src/org/eclipse/emf/cdo/common/revision/CDORevisionManager.java >=================================================================== >--- src/org/eclipse/emf/cdo/common/revision/CDORevisionManager.java (revision 7692) >+++ src/org/eclipse/emf/cdo/common/revision/CDORevisionManager.java (working copy) >@@ -21,6 +21,8 @@ > /** > * @author Eike Stepper > * @since 3.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDORevisionManager > { >Index: src/org/eclipse/emf/cdo/common/model/CDOClassInfo.java >=================================================================== >--- src/org/eclipse/emf/cdo/common/model/CDOClassInfo.java (revision 7692) >+++ src/org/eclipse/emf/cdo/common/model/CDOClassInfo.java (working copy) >@@ -17,6 +17,8 @@ > /** > * @author Eike Stepper > * @since 2.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDOClassInfo extends Adapter > { >Index: src/org/eclipse/emf/cdo/spi/common/commit/CDOChangeSetSegment.java >=================================================================== >--- src/org/eclipse/emf/cdo/spi/common/commit/CDOChangeSetSegment.java (revision 7692) >+++ src/org/eclipse/emf/cdo/spi/common/commit/CDOChangeSetSegment.java (working copy) >@@ -22,6 +22,7 @@ > /** > * @author Eike Stepper > * @since 3.0 >+ * @noextend This interface is not intended to be extended by clients. > */ > public class CDOChangeSetSegment implements CDOBranchPoint > { >Index: src/org/eclipse/emf/cdo/common/commit/handler/TextCommitInfoLog.java >=================================================================== >--- src/org/eclipse/emf/cdo/common/commit/handler/TextCommitInfoLog.java (revision 7692) >+++ src/org/eclipse/emf/cdo/common/commit/handler/TextCommitInfoLog.java (working copy) >@@ -8,12 +8,13 @@ > * Contributors: > * Eike Stepper - initial API and implementation > */ >-package org.eclipse.emf.cdo.spi.common.commit; >+package org.eclipse.emf.cdo.common.commit.handler; > > import org.eclipse.emf.cdo.common.commit.CDOCommitInfo; > import org.eclipse.emf.cdo.common.commit.CDOCommitInfoHandler; > import org.eclipse.emf.cdo.common.model.CDOPackageUnit; > import org.eclipse.emf.cdo.internal.common.bundle.OM; >+import org.eclipse.emf.cdo.spi.common.commit.CDOCommitInfoUtil; > > import java.io.OutputStream; > import java.io.PrintStream; >Index: src/org/eclipse/emf/cdo/common/commit/handler/AsyncCommitInfoHandler.java >=================================================================== >--- src/org/eclipse/emf/cdo/common/commit/handler/AsyncCommitInfoHandler.java (revision 7692) >+++ src/org/eclipse/emf/cdo/common/commit/handler/AsyncCommitInfoHandler.java (working copy) >@@ -8,7 +8,7 @@ > * Contributors: > * Eike Stepper - initial API and implementation > */ >-package org.eclipse.emf.cdo.spi.common.commit; >+package org.eclipse.emf.cdo.common.commit.handler; > > import org.eclipse.emf.cdo.common.commit.CDOCommitInfo; > import org.eclipse.emf.cdo.common.commit.CDOCommitInfoHandler; >Index: src/org/eclipse/emf/cdo/common/commit/handler/BinaryCommitInfoLog.java >=================================================================== >--- src/org/eclipse/emf/cdo/common/commit/handler/BinaryCommitInfoLog.java (revision 7692) >+++ src/org/eclipse/emf/cdo/common/commit/handler/BinaryCommitInfoLog.java (working copy) >@@ -8,7 +8,7 @@ > * Contributors: > * Eike Stepper - initial API and implementation > */ >-package org.eclipse.emf.cdo.spi.common.commit; >+package org.eclipse.emf.cdo.common.commit.handler; > > import org.eclipse.emf.cdo.common.commit.CDOCommitInfo; > import org.eclipse.emf.cdo.common.commit.CDOCommitInfoHandler; >Index: src/org/eclipse/emf/cdo/common/revision/CDOIDAndBranch.java >=================================================================== >--- src/org/eclipse/emf/cdo/common/revision/CDOIDAndBranch.java (revision 7692) >+++ src/org/eclipse/emf/cdo/common/revision/CDOIDAndBranch.java (working copy) >@@ -16,6 +16,8 @@ > /** > * @author Eike Stepper > * @since 4.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDOIDAndBranch > { >Index: src/org/eclipse/emf/cdo/common/revision/CDOList.java >=================================================================== >--- src/org/eclipse/emf/cdo/common/revision/CDOList.java (revision 7692) >+++ src/org/eclipse/emf/cdo/common/revision/CDOList.java (working copy) >@@ -18,6 +18,8 @@ > /** > * @author Simon McDuff > * @since 2.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDOList extends MoveableList<Object>, EList<Object> > { >Index: src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOContainerFeatureDeltaImpl.java >=================================================================== >--- src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOContainerFeatureDeltaImpl.java (revision 7692) >+++ src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOContainerFeatureDeltaImpl.java (working copy) >@@ -16,11 +16,11 @@ > import org.eclipse.emf.cdo.common.id.CDOID; > import org.eclipse.emf.cdo.common.protocol.CDODataInput; > import org.eclipse.emf.cdo.common.protocol.CDODataOutput; >-import org.eclipse.emf.cdo.common.revision.CDOReferenceAdjuster; > import org.eclipse.emf.cdo.common.revision.CDORevision; > import org.eclipse.emf.cdo.common.revision.delta.CDOContainerFeatureDelta; > import org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDelta; > import org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDeltaVisitor; >+import org.eclipse.emf.cdo.spi.common.revision.CDOReferenceAdjuster; > import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision; > > import org.eclipse.net4j.util.ObjectUtil; >Index: src/org/eclipse/emf/cdo/common/lob/CDOLob.java >=================================================================== >--- src/org/eclipse/emf/cdo/common/lob/CDOLob.java (revision 7692) >+++ src/org/eclipse/emf/cdo/common/lob/CDOLob.java (working copy) >@@ -18,6 +18,8 @@ > /** > * @author Eike Stepper > * @since 4.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public abstract class CDOLob<IO> extends CDOLobInfo > { >Index: src/org/eclipse/emf/cdo/spi/common/id/AbstractCDOIDString.java >=================================================================== >--- src/org/eclipse/emf/cdo/spi/common/id/AbstractCDOIDString.java (revision 7692) >+++ src/org/eclipse/emf/cdo/spi/common/id/AbstractCDOIDString.java (working copy) >@@ -20,6 +20,7 @@ > /** > * @author Martin Taal > * @since 3.0 >+ * @noextend This interface is not intended to be extended by clients. > */ > public abstract class AbstractCDOIDString extends AbstractCDOID > { >Index: src/org/eclipse/emf/cdo/common/revision/delta/CDOClearFeatureDelta.java >=================================================================== >--- src/org/eclipse/emf/cdo/common/revision/delta/CDOClearFeatureDelta.java (revision 7692) >+++ src/org/eclipse/emf/cdo/common/revision/delta/CDOClearFeatureDelta.java (working copy) >@@ -13,6 +13,7 @@ > > /** > * @author Simon McDuff >+ * @noextend This interface is not intended to be extended by clients. > * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDOClearFeatureDelta extends CDOFeatureDelta >Index: src/org/eclipse/emf/cdo/common/protocol/CDOProtocol.java >=================================================================== >--- src/org/eclipse/emf/cdo/common/protocol/CDOProtocol.java (revision 7692) >+++ src/org/eclipse/emf/cdo/common/protocol/CDOProtocol.java (working copy) >@@ -15,6 +15,8 @@ > /** > * @author Eike Stepper > * @since 2.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDOProtocol > { >Index: src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOFeatureDeltaImpl.java >=================================================================== >--- src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOFeatureDeltaImpl.java (revision 7692) >+++ src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOFeatureDeltaImpl.java (working copy) >@@ -13,8 +13,8 @@ > > import org.eclipse.emf.cdo.common.protocol.CDODataInput; > import org.eclipse.emf.cdo.common.protocol.CDODataOutput; >-import org.eclipse.emf.cdo.common.revision.CDOReferenceAdjuster; > import org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDelta; >+import org.eclipse.emf.cdo.spi.common.revision.CDOReferenceAdjuster; > import org.eclipse.emf.cdo.spi.common.revision.InternalCDOFeatureDelta; > > import org.eclipse.net4j.util.CheckUtil; >Index: src/org/eclipse/emf/cdo/common/lob/CDOLobInfo.java >=================================================================== >--- src/org/eclipse/emf/cdo/common/lob/CDOLobInfo.java (revision 7692) >+++ src/org/eclipse/emf/cdo/common/lob/CDOLobInfo.java (working copy) >@@ -17,6 +17,8 @@ > /** > * @author Eike Stepper > * @since 4.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noinstantiate This class is not intended to be instantiated by clients. > */ > public class CDOLobInfo > { >Index: src/org/eclipse/emf/cdo/common/revision/CDOReferenceAdjuster.java >=================================================================== >--- src/org/eclipse/emf/cdo/common/revision/CDOReferenceAdjuster.java (revision 7692) >+++ src/org/eclipse/emf/cdo/common/revision/CDOReferenceAdjuster.java (working copy) >@@ -1,34 +0,0 @@ >-/** >- * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, 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 >- * http://www.eclipse.org/legal/epl-v10.html >- * >- * Contributors: >- * Simon McDuff - initial API and implementation >- * Eike Stepper - maintenance >- */ >-package org.eclipse.emf.cdo.common.revision; >- >-import org.eclipse.emf.cdo.common.id.CDOID; >-import org.eclipse.emf.cdo.common.id.CDOIDTemp; >- >-import org.eclipse.emf.ecore.EStructuralFeature; >- >-/** >- * @author Simon McDuff >- * @since 2.0 >- */ >-public interface CDOReferenceAdjuster >-{ >- /** >- * Adjusts the internal structure of an object (e.g: {@link CDORevision}). This is mainly used after committing a >- * transaction. {@link CDORevision} must replace {@link CDOIDTemp} for non-temporary {@link CDOID} with a mapped ID. >- * Only the internal structure knows how to do these modifications. This is important to consider using different >- * implementation of {@link CDOList}. >- * >- * @since 4.0 >- */ >- public Object adjustReference(Object id, EStructuralFeature feature, int index); >-} >Index: src/org/eclipse/emf/cdo/common/revision/CDORevisionCache.java >=================================================================== >--- src/org/eclipse/emf/cdo/common/revision/CDORevisionCache.java (revision 7692) >+++ src/org/eclipse/emf/cdo/common/revision/CDORevisionCache.java (working copy) >@@ -25,6 +25,8 @@ > /** > * @author Eike Stepper > * @since 4.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDORevisionCache extends CDORevisionCacheAdder, INotifier > { >Index: src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOMoveFeatureDeltaImpl.java >=================================================================== >--- src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOMoveFeatureDeltaImpl.java (revision 7692) >+++ src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOMoveFeatureDeltaImpl.java (working copy) >@@ -13,13 +13,13 @@ > > import org.eclipse.emf.cdo.common.protocol.CDODataInput; > import org.eclipse.emf.cdo.common.protocol.CDODataOutput; >-import org.eclipse.emf.cdo.common.revision.CDOReferenceAdjuster; > import org.eclipse.emf.cdo.common.revision.CDORevision; > import org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDelta; > import org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDeltaVisitor; > import org.eclipse.emf.cdo.common.revision.delta.CDOMoveFeatureDelta; > import org.eclipse.emf.cdo.spi.common.revision.InternalCDOFeatureDelta.ListIndexAffecting; > import org.eclipse.emf.cdo.spi.common.revision.InternalCDOFeatureDelta.WithIndex; >+import org.eclipse.emf.cdo.spi.common.revision.CDOReferenceAdjuster; > import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision; > > import org.eclipse.emf.ecore.EClass; >Index: src/org/eclipse/emf/cdo/common/revision/delta/CDOContainerFeatureDelta.java >=================================================================== >--- src/org/eclipse/emf/cdo/common/revision/delta/CDOContainerFeatureDelta.java (revision 7692) >+++ src/org/eclipse/emf/cdo/common/revision/delta/CDOContainerFeatureDelta.java (working copy) >@@ -18,6 +18,7 @@ > > /** > * @author Simon McDuff >+ * @noextend This interface is not intended to be extended by clients. > * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDOContainerFeatureDelta extends CDOFeatureDelta >Index: src/org/eclipse/emf/cdo/spi/common/commit/AsyncCommitInfoHandler.java >=================================================================== >--- src/org/eclipse/emf/cdo/spi/common/commit/AsyncCommitInfoHandler.java (revision 7692) >+++ src/org/eclipse/emf/cdo/spi/common/commit/AsyncCommitInfoHandler.java (working copy) >@@ -1,55 +0,0 @@ >-/** >- * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, 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 >- * http://www.eclipse.org/legal/epl-v10.html >- * >- * Contributors: >- * Eike Stepper - initial API and implementation >- */ >-package org.eclipse.emf.cdo.spi.common.commit; >- >-import org.eclipse.emf.cdo.common.commit.CDOCommitInfo; >-import org.eclipse.emf.cdo.common.commit.CDOCommitInfoHandler; >-import org.eclipse.emf.cdo.internal.common.bundle.OM; >- >-import org.eclipse.net4j.util.concurrent.QueueWorker; >- >-/** >- * @author Eike Stepper >- * @since 4.0 >- */ >-public class AsyncCommitInfoHandler extends QueueWorker<CDOCommitInfo> implements CDOCommitInfoHandler >-{ >- private CDOCommitInfoHandler delegate; >- >- public AsyncCommitInfoHandler(CDOCommitInfoHandler delegate) >- { >- this.delegate = delegate; >- } >- >- public void handleCommitInfo(CDOCommitInfo commitInfo) >- { >- addWork(commitInfo); >- } >- >- @Override >- protected void work(WorkContext context, CDOCommitInfo commitInfo) >- { >- try >- { >- delegate.handleCommitInfo(commitInfo); >- } >- catch (Exception ex) >- { >- OM.LOG.error(ex); >- } >- } >- >- @Override >- protected boolean doRemainingWorkBeforeDeactivate() >- { >- return true; >- } >-} >Index: src/org/eclipse/emf/cdo/internal/common/revision/delta/CDORevisionDeltaImpl.java >=================================================================== >--- src/org/eclipse/emf/cdo/internal/common/revision/delta/CDORevisionDeltaImpl.java (revision 7692) >+++ src/org/eclipse/emf/cdo/internal/common/revision/delta/CDORevisionDeltaImpl.java (working copy) >@@ -20,7 +20,6 @@ > import org.eclipse.emf.cdo.common.protocol.CDODataOutput; > import org.eclipse.emf.cdo.common.revision.CDOElementProxy; > import org.eclipse.emf.cdo.common.revision.CDOList; >-import org.eclipse.emf.cdo.common.revision.CDOReferenceAdjuster; > import org.eclipse.emf.cdo.common.revision.CDORevisable; > import org.eclipse.emf.cdo.common.revision.CDORevision; > import org.eclipse.emf.cdo.common.revision.CDORevisionData; >@@ -31,6 +30,7 @@ > import org.eclipse.emf.cdo.common.revision.delta.CDOListFeatureDelta; > import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta; > import org.eclipse.emf.cdo.common.revision.delta.CDOUnsetFeatureDelta; >+import org.eclipse.emf.cdo.spi.common.revision.CDOReferenceAdjuster; > import org.eclipse.emf.cdo.spi.common.revision.InternalCDOFeatureDelta; > import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision; > import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionDelta; >Index: src/org/eclipse/emf/cdo/common/revision/delta/CDOListFeatureDelta.java >=================================================================== >--- src/org/eclipse/emf/cdo/common/revision/delta/CDOListFeatureDelta.java (revision 7692) >+++ src/org/eclipse/emf/cdo/common/revision/delta/CDOListFeatureDelta.java (working copy) >@@ -15,6 +15,7 @@ > > /** > * @author Simon McDuff >+ * @noextend This interface is not intended to be extended by clients. > * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDOListFeatureDelta extends CDOFeatureDelta >Index: src/org/eclipse/emf/cdo/common/revision/delta/CDOMoveFeatureDelta.java >=================================================================== >--- src/org/eclipse/emf/cdo/common/revision/delta/CDOMoveFeatureDelta.java (revision 7692) >+++ src/org/eclipse/emf/cdo/common/revision/delta/CDOMoveFeatureDelta.java (working copy) >@@ -13,6 +13,7 @@ > > /** > * @author Simon McDuff >+ * @noextend This interface is not intended to be extended by clients. > * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDOMoveFeatureDelta extends CDOFeatureDelta >Index: src/org/eclipse/emf/cdo/common/model/CDOModelConstants.java >=================================================================== >--- src/org/eclipse/emf/cdo/common/model/CDOModelConstants.java (revision 7692) >+++ src/org/eclipse/emf/cdo/common/model/CDOModelConstants.java (working copy) >@@ -12,10 +12,56 @@ > > /** > * @author Eike Stepper >+ * @since 4.0 >+ * @noextend This interface is not intended to be extended by clients. > * @noimplement This interface is not intended to be implemented by clients. >- * @since 2.0 > */ > public interface CDOModelConstants > { > public static final String RESOURCE_NODE_NAME_ATTRIBUTE = "name"; //$NON-NLS-1$ >+ >+ /** >+ * @since 4.0 >+ */ >+ public static final String CORE_PACKAGE_URI = "http://www.eclipse.org/emf/2002/Ecore"; //$NON-NLS-1$ >+ >+ /** >+ * @since 4.0 >+ */ >+ public static final String ROOT_CLASS_NAME = "EObject"; //$NON-NLS-1$ >+ >+ /** >+ * @since 4.0 >+ */ >+ public static final String RESOURCE_PACKAGE_URI = "http://www.eclipse.org/emf/CDO/Eresource/4.0.0"; //$NON-NLS-1$ >+ >+ /** >+ * @since 4.0 >+ */ >+ public static final String RESOURCE_NODE_CLASS_NAME = "CDOResourceNode"; //$NON-NLS-1$ >+ >+ /** >+ * @since 4.0 >+ */ >+ public static final String RESOURCE_FOLDER_CLASS_NAME = "CDOResourceFolder"; //$NON-NLS-1$ >+ >+ /** >+ * @since 4.0 >+ */ >+ public static final String RESOURCE_CLASS_NAME = "CDOResource"; //$NON-NLS-1$ >+ >+ /** >+ * @since 4.0 >+ */ >+ public static final String TYPES_PACKAGE_URI = "http://www.eclipse.org/emf/CDO/Etypes/4.0.0"; //$NON-NLS-1$ >+ >+ /** >+ * @since 4.0 >+ */ >+ public static final String BLOB_CLASS_NAME = "Blob"; //$NON-NLS-1$ >+ >+ /** >+ * @since 4.0 >+ */ >+ public static final String CLOB_CLASS_NAME = "Clob"; //$NON-NLS-1$ > } >Index: src/org/eclipse/emf/cdo/common/model/CDOPackageInfo.java >=================================================================== >--- src/org/eclipse/emf/cdo/common/model/CDOPackageInfo.java (revision 7692) >+++ src/org/eclipse/emf/cdo/common/model/CDOPackageInfo.java (working copy) >@@ -27,6 +27,8 @@ > * descriptive information is available before and after loading the packages. > * > * @author Eike Stepper >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDOPackageInfo extends Adapter, EPackage.Descriptor, Comparable<CDOPackageInfo> > { >Index: src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOUnsetFeatureDeltaImpl.java >=================================================================== >--- src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOUnsetFeatureDeltaImpl.java (revision 7692) >+++ src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOUnsetFeatureDeltaImpl.java (working copy) >@@ -12,11 +12,11 @@ > package org.eclipse.emf.cdo.internal.common.revision.delta; > > import org.eclipse.emf.cdo.common.protocol.CDODataInput; >-import org.eclipse.emf.cdo.common.revision.CDOReferenceAdjuster; > import org.eclipse.emf.cdo.common.revision.CDORevision; > import org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDelta; > import org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDeltaVisitor; > import org.eclipse.emf.cdo.common.revision.delta.CDOUnsetFeatureDelta; >+import org.eclipse.emf.cdo.spi.common.revision.CDOReferenceAdjuster; > import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision; > > import org.eclipse.emf.ecore.EClass; >Index: src/org/eclipse/emf/cdo/common/revision/delta/CDORevisionDelta.java >=================================================================== >--- src/org/eclipse/emf/cdo/common/revision/delta/CDORevisionDelta.java (revision 7692) >+++ src/org/eclipse/emf/cdo/common/revision/delta/CDORevisionDelta.java (working copy) >@@ -27,8 +27,8 @@ > /** > * @author Eike Stepper > * @since 2.0 >- * @noimplement This interface is not intended to be implemented by clients. > * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDORevisionDelta extends CDORevisionKey > { >Index: src/org/eclipse/emf/cdo/common/commit/CDOChangeKind.java >=================================================================== >--- src/org/eclipse/emf/cdo/common/commit/CDOChangeKind.java (revision 7692) >+++ src/org/eclipse/emf/cdo/common/commit/CDOChangeKind.java (working copy) >@@ -13,6 +13,7 @@ > /** > * @author Eike Stepper > * @since 4.0 >+ * @noextend This interface is not intended to be extended by clients. > */ > public enum CDOChangeKind > { >Index: src/org/eclipse/emf/cdo/common/revision/delta/CDOSetFeatureDelta.java >=================================================================== >--- src/org/eclipse/emf/cdo/common/revision/delta/CDOSetFeatureDelta.java (revision 7692) >+++ src/org/eclipse/emf/cdo/common/revision/delta/CDOSetFeatureDelta.java (working copy) >@@ -13,6 +13,7 @@ > > /** > * @author Simon McDuff >+ * @noextend This interface is not intended to be extended by clients. > * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDOSetFeatureDelta extends CDOFeatureDelta >Index: src/org/eclipse/emf/cdo/common/commit/CDOCommitData.java >=================================================================== >--- src/org/eclipse/emf/cdo/common/commit/CDOCommitData.java (revision 7692) >+++ src/org/eclipse/emf/cdo/common/commit/CDOCommitData.java (working copy) >@@ -17,6 +17,8 @@ > /** > * @author Eike Stepper > * @since 3.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDOCommitData extends CDOChangeSetData > { >Index: src/org/eclipse/emf/cdo/spi/common/revision/CDOIDMapper.java >=================================================================== >--- src/org/eclipse/emf/cdo/spi/common/revision/CDOIDMapper.java (revision 7692) >+++ src/org/eclipse/emf/cdo/spi/common/revision/CDOIDMapper.java (working copy) >@@ -11,7 +11,6 @@ > package org.eclipse.emf.cdo.spi.common.revision; > > import org.eclipse.emf.cdo.common.id.CDOID; >-import org.eclipse.emf.cdo.common.revision.CDOReferenceAdjuster; > import org.eclipse.emf.cdo.common.revision.CDORevisionUtil; > > import org.eclipse.emf.ecore.EStructuralFeature; >Index: src/org/eclipse/emf/cdo/common/CDOCommonTransaction.java >=================================================================== >--- src/org/eclipse/emf/cdo/common/CDOCommonTransaction.java (revision 7692) >+++ src/org/eclipse/emf/cdo/common/CDOCommonTransaction.java (working copy) >@@ -13,6 +13,8 @@ > /** > * @author Eike Stepper > * @since 4.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDOCommonTransaction extends CDOCommonView > { >#P org.eclipse.emf.cdo.server.mongodb >Index: src/org/eclipse/emf/cdo/server/mongodb/IMongoDBStore.java >=================================================================== >--- src/org/eclipse/emf/cdo/server/mongodb/IMongoDBStore.java (revision 7600) >+++ src/org/eclipse/emf/cdo/server/mongodb/IMongoDBStore.java (working copy) >@@ -16,6 +16,8 @@ > > /** > * @author Eike Stepper >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface IMongoDBStore extends IStore > { >Index: src/org/eclipse/emf/cdo/server/mongodb/IMongoDBStoreAccessor.java >=================================================================== >--- src/org/eclipse/emf/cdo/server/mongodb/IMongoDBStoreAccessor.java (revision 7585) >+++ src/org/eclipse/emf/cdo/server/mongodb/IMongoDBStoreAccessor.java (working copy) >@@ -14,6 +14,8 @@ > > /** > * @author Eike Stepper >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface IMongoDBStoreAccessor extends IStoreAccessor > { >#P org.eclipse.net4j.util >Index: src/org/eclipse/net4j/util/container/FactoryNotFoundException.java >=================================================================== >--- src/org/eclipse/net4j/util/container/FactoryNotFoundException.java (revision 7588) >+++ src/org/eclipse/net4j/util/container/FactoryNotFoundException.java (working copy) >@@ -12,6 +12,7 @@ > > /** > * @author Eike Stepper >+ * @noextend This class is not intended to be subclassed by clients. > */ > public class FactoryNotFoundException extends RuntimeException > { >Index: src/org/eclipse/net4j/util/container/SingleDeltaContainerEvent.java >=================================================================== >--- src/org/eclipse/net4j/util/container/SingleDeltaContainerEvent.java (revision 7588) >+++ src/org/eclipse/net4j/util/container/SingleDeltaContainerEvent.java (working copy) >@@ -17,6 +17,7 @@ > > /** > * @author Eike Stepper >+ * @noextend This class is not intended to be subclassed by clients. > */ > public class SingleDeltaContainerEvent<E> extends Event implements IContainerEvent<E> > { >Index: src/org/eclipse/net4j/util/om/pref/OMPreference.java >=================================================================== >--- src/org/eclipse/net4j/util/om/pref/OMPreference.java (revision 7588) >+++ src/org/eclipse/net4j/util/om/pref/OMPreference.java (working copy) >@@ -12,6 +12,8 @@ > > /** > * @author Eike Stepper >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface OMPreference<T> > { >Index: src/org/eclipse/net4j/util/ImplementationError.java >=================================================================== >--- src/org/eclipse/net4j/util/ImplementationError.java (revision 7588) >+++ src/org/eclipse/net4j/util/ImplementationError.java (working copy) >@@ -12,6 +12,7 @@ > > /** > * @author Eike Stepper >+ * @noextend This class is not intended to be subclassed by clients. > */ > public class ImplementationError extends Error > { >Index: src/org/eclipse/net4j/util/factory/ProductCreationException.java >=================================================================== >--- src/org/eclipse/net4j/util/factory/ProductCreationException.java (revision 7588) >+++ src/org/eclipse/net4j/util/factory/ProductCreationException.java (working copy) >@@ -12,6 +12,7 @@ > > /** > * @author Eike Stepper >+ * @noextend This class is not intended to be subclassed by clients. > */ > public class ProductCreationException extends RuntimeException > { >Index: src/org/eclipse/net4j/util/container/IContainerEvent.java >=================================================================== >--- src/org/eclipse/net4j/util/container/IContainerEvent.java (revision 7588) >+++ src/org/eclipse/net4j/util/container/IContainerEvent.java (working copy) >@@ -15,6 +15,8 @@ > > /** > * @author Eike Stepper >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface IContainerEvent<E> extends IEvent > { >Index: src/org/eclipse/net4j/util/ref/ReferenceType.java >=================================================================== >--- src/org/eclipse/net4j/util/ref/ReferenceType.java (revision 7588) >+++ src/org/eclipse/net4j/util/ref/ReferenceType.java (working copy) >@@ -12,6 +12,7 @@ > > /** > * @author Eike Stepper >+ * @noextend This interface is not intended to be extended by clients. > */ > public enum ReferenceType > { >Index: src/org/eclipse/net4j/util/factory/IFactoryKey.java >=================================================================== >--- src/org/eclipse/net4j/util/factory/IFactoryKey.java (revision 7588) >+++ src/org/eclipse/net4j/util/factory/IFactoryKey.java (working copy) >@@ -12,6 +12,8 @@ > > /** > * @author Eike Stepper >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface IFactoryKey > { >Index: src/org/eclipse/net4j/util/om/OMBundle.java >=================================================================== >--- src/org/eclipse/net4j/util/om/OMBundle.java (revision 7588) >+++ src/org/eclipse/net4j/util/om/OMBundle.java (working copy) >@@ -22,6 +22,8 @@ > > /** > * @author Eike Stepper >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface OMBundle > { >Index: src/org/eclipse/net4j/util/om/pref/OMPreferences.java >=================================================================== >--- src/org/eclipse/net4j/util/om/pref/OMPreferences.java (revision 7588) >+++ src/org/eclipse/net4j/util/om/pref/OMPreferences.java (working copy) >@@ -15,6 +15,8 @@ > > /** > * @author Eike Stepper >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface OMPreferences extends INotifier > { >Index: src/org/eclipse/net4j/util/om/trace/TraceHandlerEvent.java >=================================================================== >--- src/org/eclipse/net4j/util/om/trace/TraceHandlerEvent.java (revision 7588) >+++ src/org/eclipse/net4j/util/om/trace/TraceHandlerEvent.java (working copy) >@@ -14,6 +14,7 @@ > > /** > * @author Eike Stepper >+ * @noextend This interface is not intended to be extended by clients. > */ > public class TraceHandlerEvent implements OMTraceHandlerEvent, Serializable > { >Index: src/org/eclipse/net4j/util/om/monitor/OMMonitor.java >=================================================================== >--- src/org/eclipse/net4j/util/om/monitor/OMMonitor.java (revision 7588) >+++ src/org/eclipse/net4j/util/om/monitor/OMMonitor.java (working copy) >@@ -12,6 +12,8 @@ > > /** > * @author Eike Stepper >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface OMMonitor extends OMMonitorProgress > { >Index: src/org/eclipse/net4j/util/factory/FactoryCreationException.java >=================================================================== >--- src/org/eclipse/net4j/util/factory/FactoryCreationException.java (revision 7588) >+++ src/org/eclipse/net4j/util/factory/FactoryCreationException.java (working copy) >@@ -12,6 +12,7 @@ > > /** > * @author Eike Stepper >+ * @noextend This class is not intended to be subclassed by clients. > */ > public class FactoryCreationException extends RuntimeException > { >Index: src/org/eclipse/net4j/util/lifecycle/LifecycleEvent.java >=================================================================== >--- src/org/eclipse/net4j/util/lifecycle/LifecycleEvent.java (revision 7588) >+++ src/org/eclipse/net4j/util/lifecycle/LifecycleEvent.java (working copy) >@@ -14,6 +14,7 @@ > > /** > * @author Eike Stepper >+ * @noextend This class is not intended to be subclassed by clients. > */ > public class LifecycleEvent extends Event implements ILifecycleEvent > { >Index: src/org/eclipse/net4j/util/factory/FactoryDescriptor.java >=================================================================== >--- src/org/eclipse/net4j/util/factory/FactoryDescriptor.java (revision 7588) >+++ src/org/eclipse/net4j/util/factory/FactoryDescriptor.java (working copy) >@@ -15,6 +15,7 @@ > > /** > * @author Eike Stepper >+ * @noextend This class is not intended to be subclassed by clients. > */ > public class FactoryDescriptor extends Factory > { >Index: src/org/eclipse/net4j/util/transaction/TransactionException.java >=================================================================== >--- src/org/eclipse/net4j/util/transaction/TransactionException.java (revision 7588) >+++ src/org/eclipse/net4j/util/transaction/TransactionException.java (working copy) >@@ -12,6 +12,7 @@ > > /** > * @author Eike Stepper >+ * @noextend This interface is not intended to be extended by clients. > */ > public class TransactionException extends RuntimeException > { >Index: src/org/eclipse/net4j/util/om/monitor/OMMonitorProgress.java >=================================================================== >--- src/org/eclipse/net4j/util/om/monitor/OMMonitorProgress.java (revision 7588) >+++ src/org/eclipse/net4j/util/om/monitor/OMMonitorProgress.java (working copy) >@@ -13,6 +13,8 @@ > /** > * @author Eike Stepper > * @since 3.1 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface OMMonitorProgress > { >Index: src/org/eclipse/net4j/util/lifecycle/LifecycleException.java >=================================================================== >--- src/org/eclipse/net4j/util/lifecycle/LifecycleException.java (revision 7588) >+++ src/org/eclipse/net4j/util/lifecycle/LifecycleException.java (working copy) >@@ -12,6 +12,7 @@ > > /** > * @author Eike Stepper >+ * @noextend This class is not intended to be subclassed by clients. > */ > public class LifecycleException extends RuntimeException > { >Index: src/org/eclipse/net4j/util/om/pref/OMPreferencesChangeEvent.java >=================================================================== >--- src/org/eclipse/net4j/util/om/pref/OMPreferencesChangeEvent.java (revision 7588) >+++ src/org/eclipse/net4j/util/om/pref/OMPreferencesChangeEvent.java (working copy) >@@ -14,6 +14,8 @@ > > /** > * @author Eike Stepper >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface OMPreferencesChangeEvent<T> extends IEvent > { >Index: src/org/eclipse/net4j/util/om/OMPlatform.java >=================================================================== >--- src/org/eclipse/net4j/util/om/OMPlatform.java (revision 7588) >+++ src/org/eclipse/net4j/util/om/OMPlatform.java (working copy) >@@ -19,6 +19,8 @@ > > /** > * @author Eike Stepper >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface OMPlatform > { >Index: src/org/eclipse/net4j/util/om/trace/OMTraceHandlerEvent.java >=================================================================== >--- src/org/eclipse/net4j/util/om/trace/OMTraceHandlerEvent.java (revision 7588) >+++ src/org/eclipse/net4j/util/om/trace/OMTraceHandlerEvent.java (working copy) >@@ -12,6 +12,8 @@ > > /** > * @author Eike Stepper >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface OMTraceHandlerEvent > { >Index: src/org/eclipse/net4j/util/lifecycle/ILifecycleEvent.java >=================================================================== >--- src/org/eclipse/net4j/util/lifecycle/ILifecycleEvent.java (revision 7588) >+++ src/org/eclipse/net4j/util/lifecycle/ILifecycleEvent.java (working copy) >@@ -14,6 +14,8 @@ > > /** > * @author Eike Stepper >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface ILifecycleEvent extends IEvent > { >Index: src/org/eclipse/net4j/util/WrappedException.java >=================================================================== >--- src/org/eclipse/net4j/util/WrappedException.java (revision 7588) >+++ src/org/eclipse/net4j/util/WrappedException.java (working copy) >@@ -12,6 +12,7 @@ > > /** > * @author Eike Stepper >+ * @noextend This class is not intended to be subclassed by clients. > */ > public class WrappedException extends RuntimeException > { >Index: src/org/eclipse/net4j/util/container/IPluginContainer.java >=================================================================== >--- src/org/eclipse/net4j/util/container/IPluginContainer.java (revision 7588) >+++ src/org/eclipse/net4j/util/container/IPluginContainer.java (working copy) >@@ -14,6 +14,7 @@ > > /** > * @author Eike Stepper >+ * @noextend This interface is not intended to be extended by clients. > * @noimplement This interface is not intended to be implemented by clients. > */ > public interface IPluginContainer extends IManagedContainer >Index: src/org/eclipse/net4j/util/event/ValueEvent.java >=================================================================== >--- src/org/eclipse/net4j/util/event/ValueEvent.java (revision 7588) >+++ src/org/eclipse/net4j/util/event/ValueEvent.java (working copy) >@@ -13,6 +13,7 @@ > /** > * @author Eike Stepper > * @since 3.1 >+ * @noextend This class is not intended to be subclassed by clients. > */ > public class ValueEvent<VALUE> extends Event > { >Index: src/org/eclipse/net4j/util/om/trace/OMTracer.java >=================================================================== >--- src/org/eclipse/net4j/util/om/trace/OMTracer.java (revision 7588) >+++ src/org/eclipse/net4j/util/om/trace/OMTracer.java (working copy) >@@ -14,6 +14,8 @@ > > /** > * @author Eike Stepper >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface OMTracer > { >Index: src/org/eclipse/net4j/util/om/monitor/MonitorCanceledException.java >=================================================================== >--- src/org/eclipse/net4j/util/om/monitor/MonitorCanceledException.java (revision 7588) >+++ src/org/eclipse/net4j/util/om/monitor/MonitorCanceledException.java (working copy) >@@ -13,6 +13,7 @@ > /** > * @author Eike Stepper > * @since 2.0 >+ * @noextend This interface is not intended to be extended by clients. > */ > public class MonitorCanceledException extends RuntimeException > { >Index: src/org/eclipse/net4j/util/om/log/OMLogger.java >=================================================================== >--- src/org/eclipse/net4j/util/om/log/OMLogger.java (revision 7588) >+++ src/org/eclipse/net4j/util/om/log/OMLogger.java (working copy) >@@ -14,6 +14,8 @@ > > /** > * @author Eike Stepper >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface OMLogger > { >Index: src/org/eclipse/net4j/util/container/ContainerEvent.java >=================================================================== >--- src/org/eclipse/net4j/util/container/ContainerEvent.java (revision 7588) >+++ src/org/eclipse/net4j/util/container/ContainerEvent.java (working copy) >@@ -19,6 +19,7 @@ > > /** > * @author Eike Stepper >+ * @noextend This class is not intended to be subclassed by clients. > */ > public class ContainerEvent<E> extends Event implements IContainerEvent<E> > { >#P org.eclipse.emf.cdo.server >Index: src/org/eclipse/emf/cdo/spi/server/InternalView.java >=================================================================== >--- src/org/eclipse/emf/cdo/spi/server/InternalView.java (revision 7692) >+++ src/org/eclipse/emf/cdo/spi/server/InternalView.java (working copy) >@@ -22,6 +22,8 @@ > /** > * @author Eike Stepper > * @since 3.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface InternalView extends IView, ILifecycle > { >Index: src/org/eclipse/emf/cdo/server/IMEMStore.java >=================================================================== >--- src/org/eclipse/emf/cdo/server/IMEMStore.java (revision 7692) >+++ src/org/eclipse/emf/cdo/server/IMEMStore.java (working copy) >@@ -23,6 +23,8 @@ > * > * @author Eike Stepper > * @since 2.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface IMEMStore extends IStore, CDOAllRevisionsProvider > { >Index: src/org/eclipse/emf/cdo/spi/server/InternalLockManager.java >=================================================================== >--- src/org/eclipse/emf/cdo/spi/server/InternalLockManager.java (revision 7692) >+++ src/org/eclipse/emf/cdo/spi/server/InternalLockManager.java (working copy) >@@ -22,6 +22,8 @@ > * > * @author Eike Stepper > * @since 3.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface InternalLockManager extends IRWLockManager<Object, IView> > { >Index: src/org/eclipse/emf/cdo/server/ISession.java >=================================================================== >--- src/org/eclipse/emf/cdo/server/ISession.java (revision 7692) >+++ src/org/eclipse/emf/cdo/server/ISession.java (working copy) >@@ -19,6 +19,8 @@ > > /** > * @author Eike Stepper >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface ISession extends CDOCommonSession, IContainer<IView> > { >Index: src/org/eclipse/emf/cdo/spi/server/InternalCommitManager.java >=================================================================== >--- src/org/eclipse/emf/cdo/spi/server/InternalCommitManager.java (revision 7692) >+++ src/org/eclipse/emf/cdo/spi/server/InternalCommitManager.java (working copy) >@@ -17,6 +17,8 @@ > /** > * @author Eike Stepper > * @since 3.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface InternalCommitManager > { >Index: src/org/eclipse/emf/cdo/spi/server/ISessionProtocol.java >=================================================================== >--- src/org/eclipse/emf/cdo/spi/server/ISessionProtocol.java (revision 7692) >+++ src/org/eclipse/emf/cdo/spi/server/ISessionProtocol.java (working copy) >@@ -12,17 +12,22 @@ > > import org.eclipse.emf.cdo.common.CDOCommonRepository; > import org.eclipse.emf.cdo.common.commit.CDOCommitInfo; >-import org.eclipse.emf.cdo.common.protocol.CDOAuthenticationResult; > import org.eclipse.emf.cdo.common.protocol.CDOProtocol; > import org.eclipse.emf.cdo.session.remote.CDORemoteSessionMessage; >+import org.eclipse.emf.cdo.spi.common.CDOAuthenticationResult; > import org.eclipse.emf.cdo.spi.common.branch.InternalCDOBranch; > > /** > * @author Eike Stepper > * @since 3.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface ISessionProtocol extends CDOProtocol > { >+ /** >+ * @since 4.0 >+ */ > public CDOAuthenticationResult sendAuthenticationChallenge(byte[] randomToken) throws Exception; > > public void sendRepositoryTypeNotification(CDOCommonRepository.Type oldType, CDOCommonRepository.Type newType) >Index: src/org/eclipse/emf/cdo/spi/server/InternalTransaction.java >=================================================================== >--- src/org/eclipse/emf/cdo/spi/server/InternalTransaction.java (revision 7692) >+++ src/org/eclipse/emf/cdo/spi/server/InternalTransaction.java (working copy) >@@ -15,6 +15,8 @@ > /** > * @author Eike Stepper > * @since 3.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface InternalTransaction extends ITransaction, InternalView > { >Index: src/org/eclipse/emf/cdo/spi/server/InternalSynchronizableRepository.java >=================================================================== >--- src/org/eclipse/emf/cdo/spi/server/InternalSynchronizableRepository.java (revision 7692) >+++ src/org/eclipse/emf/cdo/spi/server/InternalSynchronizableRepository.java (working copy) >@@ -17,6 +17,8 @@ > /** > * @author Eike Stepper > * @since 3.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface InternalSynchronizableRepository extends ISynchronizableRepository, InternalRepository, > CDOReplicationContext, CDORawReplicationContext >Index: src/org/eclipse/emf/cdo/server/IView.java >=================================================================== >--- src/org/eclipse/emf/cdo/server/IView.java (revision 7692) >+++ src/org/eclipse/emf/cdo/server/IView.java (working copy) >@@ -14,6 +14,8 @@ > > /** > * @author Eike Stepper >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface IView extends CDOCommonView > { >Index: .settings/.api_filters >=================================================================== >--- .settings/.api_filters (revision 7692) >+++ .settings/.api_filters (working copy) >@@ -1,21 +1,157 @@ > <?xml version="1.0" encoding="UTF-8" standalone="no"?> > <component id="org.eclipse.emf.cdo.server" version="2"> >- <resource path="src/org/eclipse/emf/cdo/internal/server/ServerCDOView.java" type="org.eclipse.emf.cdo.internal.server.ServerCDOView$ServerCDOSession"> >+ <resource path="src/org/eclipse/emf/cdo/internal/server/DelegatingRepository.java" type="org.eclipse.emf.cdo.internal.server.DelegatingRepository"> > <filter id="574660632"> > <message_arguments> >+ <message_argument value="InternalRepository"/> >+ <message_argument value="CDOCommonRepository"/> >+ <message_argument value="DelegatingRepository"/> >+ </message_arguments> >+ </filter> >+ </resource> >+ <resource path="src/org/eclipse/emf/cdo/internal/server/ServerCDOView.java" type="org.eclipse.emf.cdo.internal.server.ServerCDOView$ServerCDOSession"> >+ <filter id="574619656"> >+ <message_arguments> >+ <message_argument value="CDORepositoryInfo"/> >+ <message_argument value="ServerCDOSession"/> >+ </message_arguments> >+ </filter> >+ <filter id="574619656"> >+ <message_arguments> > <message_argument value="InternalCDOSession"/> >- <message_argument value="CDOSession"/> > <message_argument value="ServerCDOSession"/> > </message_arguments> > </filter> > </resource> >- <resource path="src/org/eclipse/emf/cdo/internal/server/syncing/OfflineClone.java" type="org.eclipse.emf.cdo.internal.server.syncing.OfflineClone$CommitContextData"> >+ <resource path="src/org/eclipse/emf/cdo/internal/server/Session.java" type="org.eclipse.emf.cdo.internal.server.Session"> > <filter id="574660632"> > <message_arguments> >+ <message_argument value="InternalSession"/> >+ <message_argument value="CDOCommonSession"/> >+ <message_argument value="Session"/> >+ </message_arguments> >+ </filter> >+ </resource> >+ <resource path="src/org/eclipse/emf/cdo/internal/server/TransactionCommitContext.java" type="org.eclipse.emf.cdo.internal.server.TransactionCommitContext$DeltaLockWrapper"> >+ <filter id="574619656"> >+ <message_arguments> >+ <message_argument value="CDOIDAndBranch"/> >+ <message_argument value="DeltaLockWrapper"/> >+ </message_arguments> >+ </filter> >+ </resource> >+ <resource path="src/org/eclipse/emf/cdo/internal/server/TransactionCommitContext.java" type="org.eclipse.emf.cdo.internal.server.TransactionCommitContext$XRefContext"> >+ <filter id="572522506"> >+ <message_arguments> >+ <message_argument value="CDOIDReference"/> >+ <message_argument value="XRefContext"/> >+ </message_arguments> >+ </filter> >+ </resource> >+ <resource path="src/org/eclipse/emf/cdo/internal/server/View.java" type="org.eclipse.emf.cdo.internal.server.View"> >+ <filter id="574660632"> >+ <message_arguments> >+ <message_argument value="InternalView"/> >+ <message_argument value="CDOCommonView"/> >+ <message_argument value="View"/> >+ </message_arguments> >+ </filter> >+ </resource> >+ <resource path="src/org/eclipse/emf/cdo/internal/server/XRefsQueryHandler.java" type="org.eclipse.emf.cdo.internal.server.XRefsQueryHandler$QueryContext"> >+ <filter id="572522506"> >+ <message_arguments> >+ <message_argument value="CDOIDReference"/> >+ <message_argument value="QueryContext"/> >+ </message_arguments> >+ </filter> >+ </resource> >+ <resource path="src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedClientSessionConfiguration.java" type="org.eclipse.emf.cdo.internal.server.embedded.EmbeddedClientSessionConfiguration$RepositoryInfo"> >+ <filter id="574619656"> >+ <message_arguments> >+ <message_argument value="CDORepositoryInfo"/> >+ <message_argument value="RepositoryInfo"/> >+ </message_arguments> >+ </filter> >+ </resource> >+ <resource path="src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedClientSessionProtocol.java" type="org.eclipse.emf.cdo.internal.server.embedded.EmbeddedClientSessionProtocol"> >+ <filter id="574619656"> >+ <message_arguments> >+ <message_argument value="CDOSessionProtocol"/> >+ <message_argument value="EmbeddedClientSessionProtocol"/> >+ </message_arguments> >+ </filter> >+ </resource> >+ <resource path="src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedServerSessionProtocol.java" type="org.eclipse.emf.cdo.internal.server.embedded.EmbeddedServerSessionProtocol"> >+ <filter id="574660632"> >+ <message_arguments> >+ <message_argument value="ISessionProtocol"/> >+ <message_argument value="CDOProtocol"/> >+ <message_argument value="EmbeddedServerSessionProtocol"/> >+ </message_arguments> >+ </filter> >+ </resource> >+ <resource path="src/org/eclipse/emf/cdo/internal/server/syncing/OfflineClone.java" type="org.eclipse.emf.cdo.internal.server.syncing.OfflineClone$CommitContextData"> >+ <filter id="574619656"> >+ <message_arguments> > <message_argument value="CDOCommitData"/> >- <message_argument value="CDOChangeSetData"/> > <message_argument value="CommitContextData"/> > </message_arguments> > </filter> > </resource> >+ <resource path="src/org/eclipse/emf/cdo/server/IRepository.java" type="org.eclipse.emf.cdo.server.IRepository"> >+ <filter id="574619656"> >+ <message_arguments> >+ <message_argument value="CDOCommonRepository"/> >+ <message_argument value="IRepository"/> >+ </message_arguments> >+ </filter> >+ </resource> >+ <resource path="src/org/eclipse/emf/cdo/server/ISession.java" type="org.eclipse.emf.cdo.server.ISession"> >+ <filter id="574619656"> >+ <message_arguments> >+ <message_argument value="CDOCommonSession"/> >+ <message_argument value="ISession"/> >+ </message_arguments> >+ </filter> >+ </resource> >+ <resource path="src/org/eclipse/emf/cdo/server/ITransaction.java" type="org.eclipse.emf.cdo.server.ITransaction"> >+ <filter id="571473929"> >+ <message_arguments> >+ <message_argument value="CDOCommonTransaction"/> >+ <message_argument value="ITransaction"/> >+ </message_arguments> >+ </filter> >+ </resource> >+ <resource path="src/org/eclipse/emf/cdo/server/IView.java" type="org.eclipse.emf.cdo.server.IView"> >+ <filter id="571473929"> >+ <message_arguments> >+ <message_argument value="CDOCommonView"/> >+ <message_argument value="IView"/> >+ </message_arguments> >+ </filter> >+ </resource> >+ <resource path="src/org/eclipse/emf/cdo/server/embedded/CDOSession.java" type="org.eclipse.emf.cdo.server.embedded.CDOSession"> >+ <filter id="571473929"> >+ <message_arguments> >+ <message_argument value="CDOSession"/> >+ <message_argument value="CDOSession"/> >+ </message_arguments> >+ </filter> >+ </resource> >+ <resource path="src/org/eclipse/emf/cdo/server/embedded/CDOSessionConfiguration.java" type="org.eclipse.emf.cdo.server.embedded.CDOSessionConfiguration"> >+ <filter id="571473929"> >+ <message_arguments> >+ <message_argument value="CDOSessionConfiguration"/> >+ <message_argument value="CDOSessionConfiguration"/> >+ </message_arguments> >+ </filter> >+ </resource> >+ <resource path="src/org/eclipse/emf/cdo/spi/server/ISessionProtocol.java" type="org.eclipse.emf.cdo.spi.server.ISessionProtocol"> >+ <filter id="571473929"> >+ <message_arguments> >+ <message_argument value="CDOProtocol"/> >+ <message_argument value="ISessionProtocol"/> >+ </message_arguments> >+ </filter> >+ </resource> > </component> >Index: src/org/eclipse/emf/cdo/internal/server/embedded/DelegatingCDOPackageRegistry.java >=================================================================== >--- src/org/eclipse/emf/cdo/internal/server/embedded/DelegatingCDOPackageRegistry.java (revision 7692) >+++ src/org/eclipse/emf/cdo/internal/server/embedded/DelegatingCDOPackageRegistry.java (working copy) >@@ -1,177 +0,0 @@ >-/** >- * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, 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 >- * http://www.eclipse.org/legal/epl-v10.html >- * >- * Contributors: >- * Eike Stepper - initial API and implementation >- */ >-package org.eclipse.emf.cdo.internal.server.embedded; >- >-import org.eclipse.emf.cdo.spi.common.model.InternalCDOPackageInfo; >-import org.eclipse.emf.cdo.spi.common.model.InternalCDOPackageRegistry; >-import org.eclipse.emf.cdo.spi.common.model.InternalCDOPackageUnit; >- >-import org.eclipse.net4j.util.lifecycle.Lifecycle; >- >-import org.eclipse.emf.ecore.EFactory; >-import org.eclipse.emf.ecore.EPackage; >- >-import java.util.Collection; >-import java.util.Map; >-import java.util.Set; >- >-/** >- * @author Eike Stepper >- */ >-@Deprecated >-public abstract class DelegatingCDOPackageRegistry extends Lifecycle implements InternalCDOPackageRegistry >-{ >- public DelegatingCDOPackageRegistry() >- { >- } >- >- protected abstract InternalCDOPackageRegistry getDelegate(); >- >- public Object basicPut(String nsURI, Object value) >- { >- return getDelegate().basicPut(nsURI, value); >- } >- >- public void clear() >- { >- getDelegate().clear(); >- } >- >- public boolean containsKey(Object key) >- { >- return getDelegate().containsKey(key); >- } >- >- public boolean containsValue(Object value) >- { >- return getDelegate().containsValue(value); >- } >- >- public Set<java.util.Map.Entry<String, Object>> entrySet() >- { >- return getDelegate().entrySet(); >- } >- >- public Object get(Object key) >- { >- return getDelegate().get(key); >- } >- >- public EFactory getEFactory(String nsURI) >- { >- return getDelegate().getEFactory(nsURI); >- } >- >- public EPackage getEPackage(String nsURI) >- { >- return getDelegate().getEPackage(nsURI); >- } >- >- public EPackage[] getEPackages() >- { >- return getDelegate().getEPackages(); >- } >- >- public InternalCDOPackageInfo getPackageInfo(EPackage ePackage) >- { >- return getDelegate().getPackageInfo(ePackage); >- } >- >- public InternalCDOPackageInfo[] getPackageInfos() >- { >- return getDelegate().getPackageInfos(); >- } >- >- public PackageLoader getPackageLoader() >- { >- return getDelegate().getPackageLoader(); >- } >- >- public PackageProcessor getPackageProcessor() >- { >- return getDelegate().getPackageProcessor(); >- } >- >- public InternalCDOPackageUnit getPackageUnit(EPackage ePackage) >- { >- return getDelegate().getPackageUnit(ePackage); >- } >- >- public InternalCDOPackageUnit[] getPackageUnits() >- { >- return getDelegate().getPackageUnits(); >- } >- >- public boolean isEmpty() >- { >- return getDelegate().isEmpty(); >- } >- >- public boolean isReplacingDescriptors() >- { >- return getDelegate().isReplacingDescriptors(); >- } >- >- public Set<String> keySet() >- { >- return getDelegate().keySet(); >- } >- >- public Object put(String key, Object value) >- { >- return getDelegate().put(key, value); >- } >- >- public void putAll(Map<? extends String, ? extends Object> t) >- { >- getDelegate().putAll(t); >- } >- >- public Object putEPackage(EPackage ePackage) >- { >- return getDelegate().putEPackage(ePackage); >- } >- >- public void putPackageUnit(InternalCDOPackageUnit packageUnit) >- { >- getDelegate().putPackageUnit(packageUnit); >- } >- >- public Object remove(Object key) >- { >- return getDelegate().remove(key); >- } >- >- public void setPackageLoader(PackageLoader packageLoader) >- { >- getDelegate().setPackageLoader(packageLoader); >- } >- >- public void setPackageProcessor(PackageProcessor packageProcessor) >- { >- getDelegate().setPackageProcessor(packageProcessor); >- } >- >- public void setReplacingDescriptors(boolean replacingDescriptors) >- { >- getDelegate().setReplacingDescriptors(replacingDescriptors); >- } >- >- public int size() >- { >- return getDelegate().size(); >- } >- >- public Collection<Object> values() >- { >- return getDelegate().values(); >- } >-} >Index: src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedClientSessionProtocol.java >=================================================================== >--- src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedClientSessionProtocol.java (revision 7692) >+++ src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedClientSessionProtocol.java (working copy) >@@ -25,7 +25,6 @@ > import org.eclipse.emf.cdo.common.lob.CDOLob; > import org.eclipse.emf.cdo.common.lob.CDOLobInfo; > import org.eclipse.emf.cdo.common.model.CDOPackageUnit; >-import org.eclipse.emf.cdo.common.protocol.CDOAuthenticationResult; > import org.eclipse.emf.cdo.common.protocol.CDOAuthenticator; > import org.eclipse.emf.cdo.common.revision.CDOIDAndVersion; > import org.eclipse.emf.cdo.common.revision.CDORevisionHandler; >@@ -34,6 +33,7 @@ > import org.eclipse.emf.cdo.server.StoreThreadLocal; > import org.eclipse.emf.cdo.session.remote.CDORemoteSession; > import org.eclipse.emf.cdo.session.remote.CDORemoteSessionMessage; >+import org.eclipse.emf.cdo.spi.common.CDOAuthenticationResult; > import org.eclipse.emf.cdo.spi.common.CDORawReplicationContext; > import org.eclipse.emf.cdo.spi.common.CDOReplicationContext; > import org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo; >Index: src/org/eclipse/emf/cdo/server/ISynchronizableRepository.java >=================================================================== >--- src/org/eclipse/emf/cdo/server/ISynchronizableRepository.java (revision 7692) >+++ src/org/eclipse/emf/cdo/server/ISynchronizableRepository.java (working copy) >@@ -15,6 +15,8 @@ > * > * @author Eike Stepper > * @since 3.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface ISynchronizableRepository extends IRepository > { >Index: src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedServerSessionProtocol.java >=================================================================== >--- src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedServerSessionProtocol.java (revision 7692) >+++ src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedServerSessionProtocol.java (working copy) >@@ -12,8 +12,8 @@ > > import org.eclipse.emf.cdo.common.CDOCommonRepository; > import org.eclipse.emf.cdo.common.commit.CDOCommitInfo; >-import org.eclipse.emf.cdo.common.protocol.CDOAuthenticationResult; > import org.eclipse.emf.cdo.session.remote.CDORemoteSessionMessage; >+import org.eclipse.emf.cdo.spi.common.CDOAuthenticationResult; > import org.eclipse.emf.cdo.spi.common.branch.InternalCDOBranch; > import org.eclipse.emf.cdo.spi.server.ISessionProtocol; > import org.eclipse.emf.cdo.spi.server.InternalRepository; >Index: src/org/eclipse/emf/cdo/spi/server/InternalRepository.java >=================================================================== >--- src/org/eclipse/emf/cdo/spi/server/InternalRepository.java (revision 7692) >+++ src/org/eclipse/emf/cdo/spi/server/InternalRepository.java (working copy) >@@ -51,6 +51,8 @@ > /** > * @author Eike Stepper > * @since 3.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface InternalRepository extends IRepository, PackageProcessor, PackageLoader, BranchLoader, RevisionLoader, > CommitInfoLoader >Index: src/org/eclipse/emf/cdo/internal/server/SessionManager.java >=================================================================== >--- src/org/eclipse/emf/cdo/internal/server/SessionManager.java (revision 7692) >+++ src/org/eclipse/emf/cdo/internal/server/SessionManager.java (working copy) >@@ -14,11 +14,11 @@ > > import org.eclipse.emf.cdo.common.CDOCommonRepository; > import org.eclipse.emf.cdo.common.commit.CDOCommitInfo; >-import org.eclipse.emf.cdo.common.protocol.CDOAuthenticationResult; > import org.eclipse.emf.cdo.common.protocol.CDOProtocolConstants; > import org.eclipse.emf.cdo.internal.server.bundle.OM; > import org.eclipse.emf.cdo.server.ISession; > import org.eclipse.emf.cdo.session.remote.CDORemoteSessionMessage; >+import org.eclipse.emf.cdo.spi.common.CDOAuthenticationResult; > import org.eclipse.emf.cdo.spi.common.branch.InternalCDOBranch; > import org.eclipse.emf.cdo.spi.server.ISessionProtocol; > import org.eclipse.emf.cdo.spi.server.InternalRepository; >Index: src/org/eclipse/emf/cdo/spi/server/InternalSession.java >=================================================================== >--- src/org/eclipse/emf/cdo/spi/server/InternalSession.java (revision 7692) >+++ src/org/eclipse/emf/cdo/spi/server/InternalSession.java (working copy) >@@ -28,6 +28,8 @@ > /** > * @author Eike Stepper > * @since 3.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface InternalSession extends ISession, CDOIDProvider, CDOCommonSession.Options > { >Index: src/org/eclipse/emf/cdo/spi/server/InternalRepositorySynchronizer.java >=================================================================== >--- src/org/eclipse/emf/cdo/spi/server/InternalRepositorySynchronizer.java (revision 7692) >+++ src/org/eclipse/emf/cdo/spi/server/InternalRepositorySynchronizer.java (working copy) >@@ -20,6 +20,8 @@ > /** > * @author Eike Stepper > * @since 3.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface InternalRepositorySynchronizer extends IRepositorySynchronizer, ILifecycle > { >Index: src/org/eclipse/emf/cdo/server/IQueryContext.java >=================================================================== >--- src/org/eclipse/emf/cdo/server/IQueryContext.java (revision 7692) >+++ src/org/eclipse/emf/cdo/server/IQueryContext.java (working copy) >@@ -15,8 +15,8 @@ > /** > * @author Eike Stepper > * @since 2.0 >- * @noimplement This interface is not intended to be implemented by clients. > * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface IQueryContext extends CDOBranchPoint > { >Index: src/org/eclipse/emf/cdo/spi/server/InternalCommitContext.java >=================================================================== >--- src/org/eclipse/emf/cdo/spi/server/InternalCommitContext.java (revision 7692) >+++ src/org/eclipse/emf/cdo/spi/server/InternalCommitContext.java (working copy) >@@ -28,6 +28,8 @@ > /** > * @author Eike Stepper > * @since 3.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface InternalCommitContext extends IStoreAccessor.CommitContext > { >Index: src/org/eclipse/emf/cdo/spi/server/InternalSessionManager.java >=================================================================== >--- src/org/eclipse/emf/cdo/spi/server/InternalSessionManager.java (revision 7692) >+++ src/org/eclipse/emf/cdo/spi/server/InternalSessionManager.java (working copy) >@@ -23,6 +23,8 @@ > /** > * @author Eike Stepper > * @since 3.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface InternalSessionManager extends ISessionManager > { >Index: src/org/eclipse/emf/cdo/spi/server/InternalQueryManager.java >=================================================================== >--- src/org/eclipse/emf/cdo/spi/server/InternalQueryManager.java (revision 7692) >+++ src/org/eclipse/emf/cdo/spi/server/InternalQueryManager.java (working copy) >@@ -15,6 +15,8 @@ > /** > * @author Eike Stepper > * @since 3.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface InternalQueryManager > { >Index: src/org/eclipse/emf/cdo/server/ITransaction.java >=================================================================== >--- src/org/eclipse/emf/cdo/server/ITransaction.java (revision 7692) >+++ src/org/eclipse/emf/cdo/server/ITransaction.java (working copy) >@@ -15,6 +15,7 @@ > > /** > * @author Eike Stepper >+ * @noextend This interface is not intended to be extended by clients. > * @noimplement This interface is not intended to be implemented by clients. > */ > public interface ITransaction extends IView, CDOCommonTransaction >Index: src/org/eclipse/emf/cdo/spi/server/IRecoverableProperty.java >=================================================================== >--- src/org/eclipse/emf/cdo/spi/server/IRecoverableProperty.java (revision 7692) >+++ src/org/eclipse/emf/cdo/spi/server/IRecoverableProperty.java (working copy) >@@ -1,268 +0,0 @@ >-/** >- * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, 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 >- * http://www.eclipse.org/legal/epl-v10.html >- * >- * Contributors: >- * Eike Stepper - initial API and implementation >- */ >-package org.eclipse.emf.cdo.spi.server; >- >-/** >- * @author Eike Stepper >- * @since 4.0 >- */ >-public interface IRecoverableProperty >-{ >- public String getName(); >- >- public String getValue(); >- >- public void setValue(String value); >- >- public void recover(); >- >- /** >- * @author Eike Stepper >- */ >- public static abstract class NamedRecoverableProperty implements IRecoverableProperty >- { >- private String name; >- >- public NamedRecoverableProperty(String name) >- { >- this.name = name; >- } >- >- public final String getName() >- { >- return name; >- } >- >- @Override >- public String toString() >- { >- return name + "=" + getValue(); >- } >- } >- >- /** >- * @author Eike Stepper >- */ >- public static abstract class IntCounter extends NamedRecoverableProperty >- { >- private int start; >- >- private int end; >- >- private int value; >- >- private boolean needNext; >- >- public IntCounter(String name, int start, int end) >- { >- super(name); >- this.start = start; >- this.end = end; >- >- value = this.start; >- } >- >- public final int getStart() >- { >- return start; >- } >- >- public final int getEnd() >- { >- return end; >- } >- >- public final boolean isAscending() >- { >- return start < end; >- } >- >- public final synchronized int getNextInt() >- { >- if (needNext) >- { >- if (value == end) >- { >- overflow(); >- } >- >- if (isAscending()) >- { >- ++value; >- } >- else >- { >- --value; >- } >- } >- >- needNext = true; >- return value; >- } >- >- public final synchronized int getInt() >- { >- return value; >- } >- >- public final synchronized void setInt(int value) >- { >- checkValue(value); >- this.value = value; >- needNext = false; >- } >- >- public final synchronized String getValue() >- { >- return Integer.toString(value); >- } >- >- public final synchronized void setValue(String value) >- { >- int intValue = Integer.parseInt(value); >- checkValue(intValue); >- this.value = intValue; >- needNext = false; >- } >- >- private void checkValue(int value) >- { >- if (isAscending()) >- { >- if (value < start || value > end) >- { >- overflow(); >- } >- } >- else >- { >- if (value > start || value < end) >- { >- overflow(); >- } >- } >- } >- >- private static void overflow() >- { >- throw new IllegalStateException("Overflow"); >- } >- } >- >- /** >- * @author Eike Stepper >- */ >- public static abstract class LongCounter extends NamedRecoverableProperty >- { >- private long start; >- >- private long end; >- >- private long value; >- >- private boolean needNext; >- >- public LongCounter(String name, long start, long end) >- { >- super(name); >- this.start = start; >- this.end = end; >- >- value = this.start; >- } >- >- public final long getStart() >- { >- return start; >- } >- >- public final long getEnd() >- { >- return end; >- } >- >- public final boolean isAscending() >- { >- return start < end; >- } >- >- public final synchronized long getNextLong() >- { >- if (needNext) >- { >- if (value == end) >- { >- overflow(); >- } >- >- if (isAscending()) >- { >- ++value; >- } >- else >- { >- --value; >- } >- } >- >- needNext = true; >- return value; >- } >- >- public final synchronized long getLong() >- { >- return value; >- } >- >- public final synchronized void setLong(long value) >- { >- checkValue(value); >- this.value = value; >- needNext = false; >- } >- >- public final synchronized String getValue() >- { >- return Long.toString(value); >- } >- >- public final synchronized void setValue(String value) >- { >- long longValue = Long.parseLong(value); >- checkValue(longValue); >- this.value = longValue; >- needNext = false; >- } >- >- private void checkValue(long value) >- { >- if (isAscending()) >- { >- if (value < start || value > end) >- { >- overflow(); >- } >- } >- else >- { >- if (value > start || value < end) >- { >- overflow(); >- } >- } >- } >- >- private static void overflow() >- { >- throw new IllegalStateException("Overflow"); >- } >- } >-} >Index: src/org/eclipse/emf/cdo/spi/server/InternalQueryResult.java >=================================================================== >--- src/org/eclipse/emf/cdo/spi/server/InternalQueryResult.java (revision 7692) >+++ src/org/eclipse/emf/cdo/spi/server/InternalQueryResult.java (working copy) >@@ -17,6 +17,8 @@ > /** > * @author Eike Stepper > * @since 3.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface InternalQueryResult extends BlockingCloseableIterator<Object> > { >Index: src/org/eclipse/emf/cdo/internal/server/TransactionCommitContext.java >=================================================================== >--- src/org/eclipse/emf/cdo/internal/server/TransactionCommitContext.java (revision 7708) >+++ src/org/eclipse/emf/cdo/internal/server/TransactionCommitContext.java (working copy) >@@ -24,7 +24,6 @@ > import org.eclipse.emf.cdo.common.model.CDOPackageUnit; > import org.eclipse.emf.cdo.common.revision.CDOIDAndBranch; > import org.eclipse.emf.cdo.common.revision.CDOIDAndVersion; >-import org.eclipse.emf.cdo.common.revision.CDOReferenceAdjuster; > import org.eclipse.emf.cdo.common.revision.CDORevision; > import org.eclipse.emf.cdo.common.revision.CDORevisionKey; > import org.eclipse.emf.cdo.common.revision.CDORevisionUtil; >@@ -50,6 +49,7 @@ > import org.eclipse.emf.cdo.spi.common.model.InternalCDOPackageUnit; > import org.eclipse.emf.cdo.spi.common.revision.CDOFeatureDeltaVisitorImpl; > import org.eclipse.emf.cdo.spi.common.revision.CDOIDMapper; >+import org.eclipse.emf.cdo.spi.common.revision.CDOReferenceAdjuster; > import org.eclipse.emf.cdo.spi.common.revision.DetachedCDORevision; > import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision; > import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionDelta; >Index: src/org/eclipse/emf/cdo/server/ISessionManager.java >=================================================================== >--- src/org/eclipse/emf/cdo/server/ISessionManager.java (revision 7692) >+++ src/org/eclipse/emf/cdo/server/ISessionManager.java (working copy) >@@ -14,6 +14,7 @@ > > /** > * @author Eike Stepper >+ * @noextend This interface is not intended to be extended by clients. > * @noimplement This interface is not intended to be implemented by clients. > */ > public interface ISessionManager extends IContainer<ISession> >Index: src/org/eclipse/emf/cdo/server/IRepositorySynchronizer.java >=================================================================== >--- src/org/eclipse/emf/cdo/server/IRepositorySynchronizer.java (revision 7692) >+++ src/org/eclipse/emf/cdo/server/IRepositorySynchronizer.java (working copy) >@@ -18,6 +18,8 @@ > /** > * @author Eike Stepper > * @since 3.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface IRepositorySynchronizer extends INotifier > { >Index: src/org/eclipse/emf/cdo/server/IRepository.java >=================================================================== >--- src/org/eclipse/emf/cdo/server/IRepository.java (revision 7712) >+++ src/org/eclipse/emf/cdo/server/IRepository.java (working copy) >@@ -28,6 +28,8 @@ > > /** > * @author Eike Stepper >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface IRepository extends CDOCommonRepository, IQueryHandlerProvider, IContainer<Object> > { >Index: src/org/eclipse/emf/cdo/spi/server/InternalFailoverParticipant.java >=================================================================== >--- src/org/eclipse/emf/cdo/spi/server/InternalFailoverParticipant.java (revision 7692) >+++ src/org/eclipse/emf/cdo/spi/server/InternalFailoverParticipant.java (working copy) >@@ -13,6 +13,8 @@ > /** > * @author Eike Stepper > * @since 4.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface InternalFailoverParticipant extends InternalSynchronizableRepository > { >#P org.eclipse.emf.cdo.tests >Index: src/org/eclipse/emf/cdo/tests/CommitInfoTest.java >=================================================================== >--- src/org/eclipse/emf/cdo/tests/CommitInfoTest.java (revision 7732) >+++ src/org/eclipse/emf/cdo/tests/CommitInfoTest.java (working copy) >@@ -14,14 +14,14 @@ > import org.eclipse.emf.cdo.common.branch.CDOBranchPoint; > import org.eclipse.emf.cdo.common.commit.CDOCommitInfo; > import org.eclipse.emf.cdo.common.commit.CDOCommitInfoHandler; >+import org.eclipse.emf.cdo.common.commit.handler.AsyncCommitInfoHandler; >+import org.eclipse.emf.cdo.common.commit.handler.TextCommitInfoLog; > import org.eclipse.emf.cdo.eresource.CDOResource; > import org.eclipse.emf.cdo.server.IRepository; > import org.eclipse.emf.cdo.server.IStoreAccessor.CommitContext; > import org.eclipse.emf.cdo.server.ITransaction; > import org.eclipse.emf.cdo.server.StoreThreadLocal; > import org.eclipse.emf.cdo.session.CDOSession; >-import org.eclipse.emf.cdo.spi.common.commit.AsyncCommitInfoHandler; >-import org.eclipse.emf.cdo.spi.common.commit.TextCommitInfoLog; > import org.eclipse.emf.cdo.spi.server.InternalSession; > import org.eclipse.emf.cdo.tests.config.impl.RepositoryConfig; > import org.eclipse.emf.cdo.tests.config.impl.SessionConfig; >#P org.eclipse.net4j.jvm >Index: src/org/eclipse/net4j/jvm/IJVMConnector.java >=================================================================== >--- src/org/eclipse/net4j/jvm/IJVMConnector.java (revision 6877) >+++ src/org/eclipse/net4j/jvm/IJVMConnector.java (working copy) >@@ -14,6 +14,7 @@ > > /** > * @author Eike Stepper >+ * @noextend This interface is not intended to be extended by clients. > * @noimplement This interface is not intended to be implemented by clients. > */ > public interface IJVMConnector extends IConnector >Index: src/org/eclipse/net4j/jvm/IJVMAcceptor.java >=================================================================== >--- src/org/eclipse/net4j/jvm/IJVMAcceptor.java (revision 6877) >+++ src/org/eclipse/net4j/jvm/IJVMAcceptor.java (working copy) >@@ -14,6 +14,7 @@ > > /** > * @author Eike Stepper >+ * @noextend This interface is not intended to be extended by clients. > * @noimplement This interface is not intended to be implemented by clients. > */ > public interface IJVMAcceptor extends IAcceptor >Index: src/org/eclipse/net4j/jvm/IJVMAcceptorManager.java >=================================================================== >--- src/org/eclipse/net4j/jvm/IJVMAcceptorManager.java (revision 6877) >+++ src/org/eclipse/net4j/jvm/IJVMAcceptorManager.java (working copy) >@@ -15,6 +15,7 @@ > > /** > * @author Eike Stepper >+ * @noextend This interface is not intended to be extended by clients. > * @noimplement This interface is not intended to be implemented by clients. > */ > public interface IJVMAcceptorManager >#P org.eclipse.net4j >Index: src/org/eclipse/net4j/connector/IConnectorEvent.java >=================================================================== >--- src/org/eclipse/net4j/connector/IConnectorEvent.java (revision 7603) >+++ src/org/eclipse/net4j/connector/IConnectorEvent.java (working copy) >@@ -17,6 +17,8 @@ > * An event that is fired by an {@link IConnector}. > * > * @author Eike Stepper >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface IConnectorEvent extends IEvent > { >Index: src/org/eclipse/net4j/channel/IChannel.java >=================================================================== >--- src/org/eclipse/net4j/channel/IChannel.java (revision 7603) >+++ src/org/eclipse/net4j/channel/IChannel.java (working copy) >@@ -76,9 +76,7 @@ > * </pre> > * > * @author Eike Stepper >- * @noimplement This interface is <b>not</b> intended to be implemented by clients. Providers of channels (for example >- * for new physical connection types) have to extend/subclass {@link org.eclipse.spi.net4j.InternalChannel >- * InternalChannel}. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface IChannel extends ILocationAware, IUserAware, IBufferHandler, INotifier, Closeable > { >Index: src/org/eclipse/net4j/connector/IConnectorStateEvent.java >=================================================================== >--- src/org/eclipse/net4j/connector/IConnectorStateEvent.java (revision 7603) >+++ src/org/eclipse/net4j/connector/IConnectorStateEvent.java (working copy) >@@ -14,6 +14,7 @@ > * An event that is fired by an {@link IConnector} to indicate that its state has changed. > * > * @author Eike Stepper >+ * @noextend This interface is not intended to be extended by clients. > * @noimplement This interface is not intended to be implemented by clients. > */ > public interface IConnectorStateEvent extends IConnectorEvent >Index: src/org/eclipse/net4j/channel/IChannelMultiplexer.java >=================================================================== >--- src/org/eclipse/net4j/channel/IChannelMultiplexer.java (revision 7603) >+++ src/org/eclipse/net4j/channel/IChannelMultiplexer.java (working copy) >@@ -22,6 +22,7 @@ > > /** > * @author Eike Stepper >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface IChannelMultiplexer extends ILocationAware, IContainer<IChannel> > { >Index: src/org/eclipse/net4j/signal/SignalFinishedEvent.java >=================================================================== >--- src/org/eclipse/net4j/signal/SignalFinishedEvent.java (revision 7603) >+++ src/org/eclipse/net4j/signal/SignalFinishedEvent.java (working copy) >@@ -15,6 +15,7 @@ > /** > * @author Eike Stepper > * @since 3.0 >+ * @noextend This interface is not intended to be extended by clients. > */ > public class SignalFinishedEvent<INFRA_STRUCTURE> extends Event > { >Index: src/org/eclipse/net4j/buffer/IBuffer.java >=================================================================== >--- src/org/eclipse/net4j/buffer/IBuffer.java (revision 7603) >+++ src/org/eclipse/net4j/buffer/IBuffer.java (working copy) >@@ -83,6 +83,7 @@ > * @see IChannel#setReceiveHandler(IBufferHandler) > * @see IBufferHandler#handleBuffer(IBuffer) > * @author Eike Stepper >+ * @noextend This interface is not intended to be extended by clients. > * @noimplement This interface is not intended to be implemented by clients. > */ > public interface IBuffer >Index: src/org/eclipse/net4j/connector/ConnectorState.java >=================================================================== >--- src/org/eclipse/net4j/connector/ConnectorState.java (revision 7603) >+++ src/org/eclipse/net4j/connector/ConnectorState.java (working copy) >@@ -29,6 +29,7 @@ > * > * @see IConnector#getState() > * @author Eike Stepper >+ * @noextend This interface is not intended to be extended by clients. > */ > public enum ConnectorState > { >Index: src/org/eclipse/net4j/channel/ChannelException.java >=================================================================== >--- src/org/eclipse/net4j/channel/ChannelException.java (revision 7603) >+++ src/org/eclipse/net4j/channel/ChannelException.java (working copy) >@@ -16,6 +16,7 @@ > * @see IChannelMultiplexer > * @author Eike Stepper > * @since 2.0 >+ * @noextend This interface is not intended to be extended by clients. > */ > public class ChannelException extends RuntimeException > { >Index: src/org/eclipse/net4j/signal/SignalScheduledEvent.java >=================================================================== >--- src/org/eclipse/net4j/signal/SignalScheduledEvent.java (revision 7603) >+++ src/org/eclipse/net4j/signal/SignalScheduledEvent.java (working copy) >@@ -15,6 +15,7 @@ > /** > * @author Eike Stepper > * @since 3.0 >+ * @noextend This interface is not intended to be extended by clients. > */ > public class SignalScheduledEvent<INFRA_STRUCTURE> extends Event > { >Index: src/org/eclipse/net4j/ITransportConfig.java >=================================================================== >--- src/org/eclipse/net4j/ITransportConfig.java (revision 7603) >+++ src/org/eclipse/net4j/ITransportConfig.java (working copy) >@@ -20,6 +20,8 @@ > /** > * @author Eike Stepper > * @since 2.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface ITransportConfig extends INegotiatorAware > { >Index: src/org/eclipse/spi/net4j/InternalChannel.java >=================================================================== >--- src/org/eclipse/spi/net4j/InternalChannel.java (revision 7603) >+++ src/org/eclipse/spi/net4j/InternalChannel.java (working copy) >@@ -61,6 +61,8 @@ > /** > * @author Eike Stepper > * @since 3.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface SendQueueEvent extends IEvent > { >Index: src/org/eclipse/net4j/buffer/BufferState.java >=================================================================== >--- src/org/eclipse/net4j/buffer/BufferState.java (revision 7603) >+++ src/org/eclipse/net4j/buffer/BufferState.java (working copy) >@@ -26,6 +26,7 @@ > * COORDS="532,428,682,451" HREF="BufferState.html#GETTING"> </MAP> > * > * @author Eike Stepper >+ * @noextend This interface is not intended to be extended by clients. > */ > public enum BufferState > { >Index: src/org/eclipse/net4j/acceptor/IAcceptor.java >=================================================================== >--- src/org/eclipse/net4j/acceptor/IAcceptor.java (revision 7603) >+++ src/org/eclipse/net4j/acceptor/IAcceptor.java (working copy) >@@ -42,6 +42,7 @@ > * COORDS="64,516,444,596" HREF="ConnectorState.html#NEGOTIATING"> </MAP> > * > * @author Eike Stepper >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface IAcceptor extends IContainer<IConnector>, Closeable > { >Index: src/org/eclipse/net4j/connector/IConnector.java >=================================================================== >--- src/org/eclipse/net4j/connector/IConnector.java (revision 7671) >+++ src/org/eclipse/net4j/connector/IConnector.java (working copy) >@@ -15,12 +15,13 @@ > import org.eclipse.net4j.channel.IChannelMultiplexer; > import org.eclipse.net4j.util.collection.Closeable; > import org.eclipse.net4j.util.security.IUserAware; >-import org.eclipse.net4j.ILocationAware.Location; > > /** > * One endpoint of a physical connection of arbitrary nature between two communicating parties. A {@link IConnector} >- * encapsulates the process of establishing and closing such connections and has a {@link Location location} of >- * {@link Location#CLIENT CLIENT} or {@link Location#SERVER SERVER} with respect to this process. Once a connection is >+ * encapsulates the process of establishing and closing such connections and has a >+ * {@link org.eclipse.net4j.ILocationAware.Location location} of >+ * {@link org.eclipse.net4j.ILocationAware.Location#CLIENT CLIENT} or >+ * {@link org.eclipse.net4j.ILocationAware.Location#SERVER SERVER} with respect to this process. Once a connection is > * established either party can use its connector to open multiple {@link IChannel}s to asynchronously exchange > * {@link IBuffer}s. > * <p> >@@ -44,6 +45,7 @@ > * HREF="IProtocol.html"> </MAP> > * > * @author Eike Stepper >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface IConnector extends IChannelMultiplexer, IUserAware, Closeable > { >#P org.eclipse.net4j.http.server >Index: src/org/eclipse/net4j/http/server/INet4jTransportServlet.java >=================================================================== >--- src/org/eclipse/net4j/http/server/INet4jTransportServlet.java (revision 6877) >+++ src/org/eclipse/net4j/http/server/INet4jTransportServlet.java (working copy) >@@ -20,6 +20,8 @@ > > /** > * @author Eike Stepper >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface INet4jTransportServlet extends Servlet > { >Index: src/org/eclipse/net4j/http/server/IHTTPAcceptor.java >=================================================================== >--- src/org/eclipse/net4j/http/server/IHTTPAcceptor.java (revision 6877) >+++ src/org/eclipse/net4j/http/server/IHTTPAcceptor.java (working copy) >@@ -14,6 +14,7 @@ > > /** > * @author Eike Stepper >+ * @noextend This interface is not intended to be extended by clients. > * @noimplement This interface is not intended to be implemented by clients. > */ > public interface IHTTPAcceptor extends IAcceptor >#P org.eclipse.net4j.tcp >Index: src/org/eclipse/net4j/tcp/ITCPAcceptor.java >=================================================================== >--- src/org/eclipse/net4j/tcp/ITCPAcceptor.java (revision 7603) >+++ src/org/eclipse/net4j/tcp/ITCPAcceptor.java (working copy) >@@ -15,6 +15,7 @@ > > /** > * @author Eike Stepper >+ * @noextend This interface is not intended to be extended by clients. > * @noimplement This interface is not intended to be implemented by clients. > */ > public interface ITCPAcceptor extends IAcceptor >Index: src/org/eclipse/net4j/tcp/ITCPSelector.java >=================================================================== >--- src/org/eclipse/net4j/tcp/ITCPSelector.java (revision 7603) >+++ src/org/eclipse/net4j/tcp/ITCPSelector.java (working copy) >@@ -17,6 +17,7 @@ > > /** > * @author Eike Stepper >+ * @noextend This interface is not intended to be extended by clients. > * @noimplement This interface is not intended to be implemented by clients. > */ > public interface ITCPSelector >Index: src/org/eclipse/net4j/tcp/ITCPNegotiationContext.java >=================================================================== >--- src/org/eclipse/net4j/tcp/ITCPNegotiationContext.java (revision 7603) >+++ src/org/eclipse/net4j/tcp/ITCPNegotiationContext.java (working copy) >@@ -15,6 +15,8 @@ > /** > * @author Eike Stepper > * @since 2.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface ITCPNegotiationContext extends INegotiationContext > { >Index: src/org/eclipse/net4j/tcp/ITCPConnector.java >=================================================================== >--- src/org/eclipse/net4j/tcp/ITCPConnector.java (revision 7603) >+++ src/org/eclipse/net4j/tcp/ITCPConnector.java (working copy) >@@ -14,6 +14,7 @@ > > /** > * @author Eike Stepper >+ * @noextend This interface is not intended to be extended by clients. > * @noimplement This interface is not intended to be implemented by clients. > */ > public interface ITCPConnector extends IConnector >#P org.eclipse.emf.cdo >Index: src/org/eclipse/emf/cdo/eresource/EresourcePackage.java >=================================================================== >--- src/org/eclipse/emf/cdo/eresource/EresourcePackage.java (revision 7692) >+++ src/org/eclipse/emf/cdo/eresource/EresourcePackage.java (working copy) >@@ -24,8 +24,9 @@ > * <li>each enum,</li> > * <li>and each data type</li> > * </ul> >- * <!-- end-user-doc --> > * >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. <!-- end-user-doc --> > * @see org.eclipse.emf.cdo.eresource.EresourceFactory > * @model kind="package" > * @generated >Index: src/org/eclipse/emf/cdo/util/DanglingReferenceException.java >=================================================================== >--- src/org/eclipse/emf/cdo/util/DanglingReferenceException.java (revision 7692) >+++ src/org/eclipse/emf/cdo/util/DanglingReferenceException.java (working copy) >@@ -22,6 +22,8 @@ > /** > * @author Simon McDuff > * @since 2.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noinstantiate This class is not intended to be instantiated by clients. > */ > public class DanglingReferenceException extends CDOException > { >Index: src/org/eclipse/emf/spi/cdo/CDOStore.java >=================================================================== >--- src/org/eclipse/emf/spi/cdo/CDOStore.java (revision 7692) >+++ src/org/eclipse/emf/spi/cdo/CDOStore.java (working copy) >@@ -32,6 +32,8 @@ > * > * @author Eike Stepper > * @since 4.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDOStore extends EStore > { >Index: src/org/eclipse/emf/cdo/CDOIDDangling.java >=================================================================== >--- src/org/eclipse/emf/cdo/CDOIDDangling.java (revision 7692) >+++ src/org/eclipse/emf/cdo/CDOIDDangling.java (working copy) >@@ -17,6 +17,8 @@ > /** > * @author Eike Stepper > * @since 3.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDOIDDangling extends CDOID > { >Index: src/org/eclipse/emf/spi/cdo/CDOChangeSubscriptionAdapter.java >=================================================================== >--- src/org/eclipse/emf/spi/cdo/CDOChangeSubscriptionAdapter.java (revision 7692) >+++ src/org/eclipse/emf/spi/cdo/CDOChangeSubscriptionAdapter.java (working copy) >@@ -24,6 +24,8 @@ > /** > * @author Eike Stepper > * @since 4.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noinstantiate This class is not intended to be instantiated by clients. > */ > public class CDOChangeSubscriptionAdapter extends AdapterImpl > { >Index: src/org/eclipse/emf/spi/cdo/InternalCDOTransaction.java >=================================================================== >--- src/org/eclipse/emf/spi/cdo/InternalCDOTransaction.java (revision 7692) >+++ src/org/eclipse/emf/spi/cdo/InternalCDOTransaction.java (working copy) >@@ -35,6 +35,7 @@ > /** > * @author Simon McDuff > * @since 2.0 >+ * @noextend This interface is not intended to be extended by clients. > * @noimplement This interface is not intended to be implemented by clients. > */ > public interface InternalCDOTransaction extends CDOTransaction, InternalCDOUserTransaction, InternalCDOView >Index: src/org/eclipse/emf/cdo/util/CommitException.java >=================================================================== >--- src/org/eclipse/emf/cdo/util/CommitException.java (revision 7692) >+++ src/org/eclipse/emf/cdo/util/CommitException.java (working copy) >@@ -13,6 +13,8 @@ > /** > * @author Eike Stepper > * @since 3.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noinstantiate This class is not intended to be instantiated by clients. > */ > public class CommitException extends Exception > { >Index: src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java >=================================================================== >--- src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java (revision 7692) >+++ src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java (working copy) >@@ -76,22 +76,23 @@ > /** > * <!-- begin-user-doc --> An implementation of the model object '<em><b>CDO Resource</b></em>'. > * >- * @extends Resource.Internal<!-- end-user-doc --> >- * <p> >- * The following features are implemented: >- * <ul> >- * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#getResourceSet <em>Resource Set</em>}</li> >- * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#getURI <em>URI</em>}</li> >- * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#getContents <em>Contents</em>}</li> >- * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#isModified <em>Modified</em>}</li> >- * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#isLoaded <em>Loaded</em>}</li> >- * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#isTrackingModification <em>Tracking >- * Modification</em>}</li> >- * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#getErrors <em>Errors</em>}</li> >- * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#getWarnings <em>Warnings</em>}</li> >- * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#getTimeStamp <em>Time Stamp</em>}</li> >- * </ul> >- * </p> >+ * @extends Resource.Internal >+ * @noextend This interface is not intended to be extended by clients. <!-- end-user-doc --> >+ * <p> >+ * The following features are implemented: >+ * <ul> >+ * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#getResourceSet <em>Resource Set</em>}</li> >+ * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#getURI <em>URI</em>}</li> >+ * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#getContents <em>Contents</em>}</li> >+ * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#isModified <em>Modified</em>}</li> >+ * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#isLoaded <em>Loaded</em>}</li> >+ * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#isTrackingModification <em>Tracking >+ * Modification</em>}</li> >+ * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#getErrors <em>Errors</em>}</li> >+ * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#getWarnings <em>Warnings</em>}</li> >+ * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#getTimeStamp <em>Time Stamp</em>}</li> >+ * </ul> >+ * </p> > * @generated > */ > public class CDOResourceImpl extends CDOResourceNodeImpl implements CDOResource, Resource.Internal >Index: src/org/eclipse/emf/cdo/eresource/impl/CDOResourceFolderImpl.java >=================================================================== >--- src/org/eclipse/emf/cdo/eresource/impl/CDOResourceFolderImpl.java (revision 7692) >+++ src/org/eclipse/emf/cdo/eresource/impl/CDOResourceFolderImpl.java (working copy) >@@ -27,13 +27,14 @@ > /** > * <!-- begin-user-doc --> An implementation of the model object '<em><b>CDO Resource Folder</b></em>'. > * >- * @since 2.0<!-- end-user-doc --> >- * <p> >- * The following features are implemented: >- * <ul> >- * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceFolderImpl#getNodes <em>Nodes</em>}</li> >- * </ul> >- * </p> >+ * @since 2.0 >+ * @noextend This interface is not intended to be extended by clients. <!-- end-user-doc --> >+ * <p> >+ * The following features are implemented: >+ * <ul> >+ * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceFolderImpl#getNodes <em>Nodes</em>}</li> >+ * </ul> >+ * </p> > * @generated > */ > public class CDOResourceFolderImpl extends CDOResourceNodeImpl implements CDOResourceFolder >Index: src/org/eclipse/emf/cdo/CDOState.java >=================================================================== >--- src/org/eclipse/emf/cdo/CDOState.java (revision 7692) >+++ src/org/eclipse/emf/cdo/CDOState.java (working copy) >@@ -12,6 +12,7 @@ > > /** > * @author Eike Stepper >+ * @noextend This interface is not intended to be extended by clients. > */ > public enum CDOState > { >Index: src/org/eclipse/emf/cdo/transaction/CDOTransactionFinishedEvent.java >=================================================================== >--- src/org/eclipse/emf/cdo/transaction/CDOTransactionFinishedEvent.java (revision 7692) >+++ src/org/eclipse/emf/cdo/transaction/CDOTransactionFinishedEvent.java (working copy) >@@ -17,8 +17,9 @@ > > /** > * @author Eike Stepper >- * @noimplement This interface is not intended to be implemented by clients. > * @since 2.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDOTransactionFinishedEvent extends CDOViewEvent > { >Index: src/org/eclipse/emf/spi/cdo/CDOSessionInvalidationAggregator.java >=================================================================== >--- src/org/eclipse/emf/spi/cdo/CDOSessionInvalidationAggregator.java (revision 7692) >+++ src/org/eclipse/emf/spi/cdo/CDOSessionInvalidationAggregator.java (working copy) >@@ -22,6 +22,8 @@ > /** > * @author Eike Stepper > * @since 4.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noinstantiate This class is not intended to be instantiated by clients. > */ > public class CDOSessionInvalidationAggregator > { >Index: src/org/eclipse/emf/cdo/view/CDOView.java >=================================================================== >--- src/org/eclipse/emf/cdo/view/CDOView.java (revision 7692) >+++ src/org/eclipse/emf/cdo/view/CDOView.java (working copy) >@@ -68,8 +68,9 @@ > * </pre> > * > * @author Eike Stepper >- * @noimplement This interface is not intended to be implemented by clients. > * @since 2.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDOView extends CDOCommonView, CDOUpdatable, INotifier, IOptionsContainer > { >Index: src/org/eclipse/emf/cdo/view/CDOViewEvent.java >=================================================================== >--- src/org/eclipse/emf/cdo/view/CDOViewEvent.java (revision 7692) >+++ src/org/eclipse/emf/cdo/view/CDOViewEvent.java (working copy) >@@ -14,8 +14,9 @@ > > /** > * @author Eike Stepper >- * @noimplement This interface is not intended to be implemented by clients. > * @since 2.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDOViewEvent extends IEvent > { >Index: src/org/eclipse/emf/spi/cdo/CDOTransactionStrategy.java >=================================================================== >--- src/org/eclipse/emf/spi/cdo/CDOTransactionStrategy.java (revision 7692) >+++ src/org/eclipse/emf/spi/cdo/CDOTransactionStrategy.java (working copy) >@@ -24,6 +24,8 @@ > * > * @author Simon McDuff > * @since 2.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDOTransactionStrategy > { >Index: .settings/.api_filters >=================================================================== >--- .settings/.api_filters (revision 0) >+++ .settings/.api_filters (revision 0) >@@ -0,0 +1,136 @@ >+<?xml version="1.0" encoding="UTF-8" standalone="no"?> >+<component id="org.eclipse.emf.cdo" version="2"> >+ <resource path="src/org/eclipse/emf/cdo/CDOIDDangling.java" type="org.eclipse.emf.cdo.CDOIDDangling"> >+ <filter id="571473929"> >+ <message_arguments> >+ <message_argument value="CDOID"/> >+ <message_argument value="CDOIDDangling"/> >+ </message_arguments> >+ </filter> >+ </resource> >+ <resource path="src/org/eclipse/emf/cdo/CDOObjectReference.java" type="org.eclipse.emf.cdo.CDOObjectReference"> >+ <filter id="574619656"> >+ <message_arguments> >+ <message_argument value="CDOReference<OBJECT>"/> >+ <message_argument value="CDOObjectReference"/> >+ </message_arguments> >+ </filter> >+ </resource> >+ <resource path="src/org/eclipse/emf/cdo/session/CDORepositoryInfo.java" type="org.eclipse.emf.cdo.session.CDORepositoryInfo"> >+ <filter id="571473929"> >+ <message_arguments> >+ <message_argument value="CDOCommonRepository"/> >+ <message_argument value="CDORepositoryInfo"/> >+ </message_arguments> >+ </filter> >+ </resource> >+ <resource path="src/org/eclipse/emf/cdo/session/CDOSession.java" type="org.eclipse.emf.cdo.session.CDOSession"> >+ <filter id="574619656"> >+ <message_arguments> >+ <message_argument value="CDOCommonSession"/> >+ <message_argument value="CDOSession"/> >+ </message_arguments> >+ </filter> >+ </resource> >+ <resource path="src/org/eclipse/emf/cdo/session/CDOSessionInvalidationEvent.java" type="org.eclipse.emf.cdo.session.CDOSessionInvalidationEvent"> >+ <filter id="571473929"> >+ <message_arguments> >+ <message_argument value="CDOCommitInfo"/> >+ <message_argument value="CDOSessionInvalidationEvent"/> >+ </message_arguments> >+ </filter> >+ </resource> >+ <resource path="src/org/eclipse/emf/cdo/transaction/CDOPushTransaction.java" type="org.eclipse.emf.cdo.transaction.CDOPushTransaction"> >+ <filter id="574660632"> >+ <message_arguments> >+ <message_argument value="CDOTransaction"/> >+ <message_argument value="CDOCommonView"/> >+ <message_argument value="CDOPushTransaction"/> >+ </message_arguments> >+ </filter> >+ </resource> >+ <resource path="src/org/eclipse/emf/cdo/transaction/CDOTransaction.java" type="org.eclipse.emf.cdo.transaction.CDOTransaction"> >+ <filter id="571473929"> >+ <message_arguments> >+ <message_argument value="CDOCommonTransaction"/> >+ <message_argument value="CDOTransaction"/> >+ </message_arguments> >+ </filter> >+ </resource> >+ <resource path="src/org/eclipse/emf/cdo/view/CDOQuery.java" type="org.eclipse.emf.cdo.view.CDOQuery"> >+ <filter id="571473929"> >+ <message_arguments> >+ <message_argument value="CDOQueryInfo"/> >+ <message_argument value="CDOQuery"/> >+ </message_arguments> >+ </filter> >+ </resource> >+ <resource path="src/org/eclipse/emf/cdo/view/CDOView.java" type="org.eclipse.emf.cdo.view.CDOView"> >+ <filter id="571473929"> >+ <message_arguments> >+ <message_argument value="CDOCommonView"/> >+ <message_argument value="CDOView"/> >+ </message_arguments> >+ </filter> >+ </resource> >+ <resource path="src/org/eclipse/emf/internal/cdo/object/CDOIDDanglingImpl.java" type="org.eclipse.emf.internal.cdo.object.CDOIDDanglingImpl"> >+ <filter id="571473929"> >+ <message_arguments> >+ <message_argument value="AbstractCDOID"/> >+ <message_argument value="CDOIDDanglingImpl"/> >+ </message_arguments> >+ </filter> >+ </resource> >+ <resource path="src/org/eclipse/emf/internal/cdo/object/CDOObjectReferenceImpl.java" type="org.eclipse.emf.internal.cdo.object.CDOObjectReferenceImpl"> >+ <filter id="574660632"> >+ <message_arguments> >+ <message_argument value="CDOObjectReference"/> >+ <message_argument value="CDOReference"/> >+ <message_argument value="CDOObjectReferenceImpl"/> >+ </message_arguments> >+ </filter> >+ </resource> >+ <resource path="src/org/eclipse/emf/internal/cdo/session/CDOSessionImpl.java" type="org.eclipse.emf.internal.cdo.session.CDOSessionImpl"> >+ <filter id="574660632"> >+ <message_arguments> >+ <message_argument value="InternalCDOSession"/> >+ <message_argument value="CDOCommonSession"/> >+ <message_argument value="CDOSessionImpl"/> >+ </message_arguments> >+ </filter> >+ </resource> >+ <resource path="src/org/eclipse/emf/internal/cdo/session/DelegatingSessionProtocol.java" type="org.eclipse.emf.internal.cdo.session.DelegatingSessionProtocol"> >+ <filter id="574660632"> >+ <message_arguments> >+ <message_argument value="CDOSessionProtocol"/> >+ <message_argument value="CDOProtocol"/> >+ <message_argument value="DelegatingSessionProtocol"/> >+ </message_arguments> >+ </filter> >+ </resource> >+ <resource path="src/org/eclipse/emf/internal/cdo/view/AbstractCDOView.java" type="org.eclipse.emf.internal.cdo.view.AbstractCDOView"> >+ <filter id="574660632"> >+ <message_arguments> >+ <message_argument value="InternalCDOView"/> >+ <message_argument value="CDOCommonView"/> >+ <message_argument value="AbstractCDOView"/> >+ </message_arguments> >+ </filter> >+ </resource> >+ <resource path="src/org/eclipse/emf/spi/cdo/CDOSessionProtocol.java" type="org.eclipse.emf.spi.cdo.CDOSessionProtocol"> >+ <filter id="571473929"> >+ <message_arguments> >+ <message_argument value="CDOProtocol"/> >+ <message_argument value="CDOSessionProtocol"/> >+ </message_arguments> >+ </filter> >+ </resource> >+ <resource path="src/org/eclipse/emf/spi/cdo/InternalCDOObject.java" type="org.eclipse.emf.spi.cdo.InternalCDOObject"> >+ <filter id="571473929"> >+ <message_arguments> >+ <message_argument value="CDOObjectMarker"/> >+ <message_argument value="InternalCDOObject"/> >+ </message_arguments> >+ </filter> >+ </resource> >+</component> >Index: src/org/eclipse/emf/spi/cdo/CDOSessionProtocol.java >=================================================================== >--- src/org/eclipse/emf/spi/cdo/CDOSessionProtocol.java (revision 7692) >+++ src/org/eclipse/emf/spi/cdo/CDOSessionProtocol.java (working copy) >@@ -26,7 +26,6 @@ > import org.eclipse.emf.cdo.common.model.CDOPackageUnit; > import org.eclipse.emf.cdo.common.protocol.CDOProtocol; > import org.eclipse.emf.cdo.common.revision.CDOIDAndVersion; >-import org.eclipse.emf.cdo.common.revision.CDOReferenceAdjuster; > import org.eclipse.emf.cdo.common.revision.CDORevisionHandler; > import org.eclipse.emf.cdo.common.revision.CDORevisionKey; > import org.eclipse.emf.cdo.common.util.CDOCommonUtil; >@@ -40,6 +39,7 @@ > import org.eclipse.emf.cdo.spi.common.model.InternalCDOPackageRegistry.PackageLoader; > import org.eclipse.emf.cdo.spi.common.model.InternalCDOPackageUnit; > import org.eclipse.emf.cdo.spi.common.revision.CDOIDMapper; >+import org.eclipse.emf.cdo.spi.common.revision.CDOReferenceAdjuster; > import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision; > import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionManager.RevisionLoader; > import org.eclipse.emf.cdo.view.CDOView; >@@ -65,6 +65,8 @@ > /** > * @author Eike Stepper > * @since 2.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDOSessionProtocol extends CDOProtocol, PackageLoader, BranchLoader, RevisionLoader, CommitInfoLoader > { >@@ -605,6 +607,9 @@ > this.previousTimeStamp = previousTimeStamp; > } > >+ /** >+ * @since 4.0 >+ */ > public CDOReferenceAdjuster getReferenceAdjuster() > { > if (referenceAdjuster == null) >@@ -615,6 +620,9 @@ > return referenceAdjuster; > } > >+ /** >+ * @since 4.0 >+ */ > public void setReferenceAdjuster(CDOReferenceAdjuster referenceAdjuster) > { > this.referenceAdjuster = referenceAdjuster; >Index: src/org/eclipse/emf/cdo/CDOObjectReference.java >=================================================================== >--- src/org/eclipse/emf/cdo/CDOObjectReference.java (revision 7692) >+++ src/org/eclipse/emf/cdo/CDOObjectReference.java (working copy) >@@ -15,8 +15,8 @@ > /** > * @author Eike Stepper > * @since 3.0 >- * @noimplement This interface is not intended to be implemented by clients. > * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDOObjectReference extends CDOReference<CDOObject> > { >Index: src/org/eclipse/emf/cdo/eresource/impl/CDOResourceFactoryImpl.java >=================================================================== >--- src/org/eclipse/emf/cdo/eresource/impl/CDOResourceFactoryImpl.java (revision 7692) >+++ src/org/eclipse/emf/cdo/eresource/impl/CDOResourceFactoryImpl.java (working copy) >@@ -20,6 +20,7 @@ > > /** > * @author Eike Stepper >+ * @noextend This interface is not intended to be extended by clients. > */ > public class CDOResourceFactoryImpl implements CDOResourceFactory > { >Index: src/org/eclipse/emf/internal/cdo/session/CDOAuthenticatorImpl.java >=================================================================== >--- src/org/eclipse/emf/internal/cdo/session/CDOAuthenticatorImpl.java (revision 7692) >+++ src/org/eclipse/emf/internal/cdo/session/CDOAuthenticatorImpl.java (working copy) >@@ -10,8 +10,8 @@ > */ > package org.eclipse.emf.internal.cdo.session; > >-import org.eclipse.emf.cdo.common.protocol.CDOAuthenticationResult; > import org.eclipse.emf.cdo.common.protocol.CDOAuthenticator; >+import org.eclipse.emf.cdo.spi.common.CDOAuthenticationResult; > > import org.eclipse.net4j.util.security.IPasswordCredentials; > import org.eclipse.net4j.util.security.IPasswordCredentialsProvider; >Index: src/org/eclipse/emf/cdo/transaction/CDOTransactionConflictEvent.java >=================================================================== >--- src/org/eclipse/emf/cdo/transaction/CDOTransactionConflictEvent.java (revision 7692) >+++ src/org/eclipse/emf/cdo/transaction/CDOTransactionConflictEvent.java (working copy) >@@ -15,8 +15,9 @@ > > /** > * @author Eike Stepper >- * @noimplement This interface is not intended to be implemented by clients. > * @since 2.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDOTransactionConflictEvent extends CDOViewEvent > { >Index: src/org/eclipse/emf/cdo/session/CDOSessionInvalidationEvent.java >=================================================================== >--- src/org/eclipse/emf/cdo/session/CDOSessionInvalidationEvent.java (revision 7692) >+++ src/org/eclipse/emf/cdo/session/CDOSessionInvalidationEvent.java (working copy) >@@ -27,8 +27,9 @@ > * @author Eike Stepper > * @see CDOInvalidationNotification > * @see CDOAdapterPolicy >- * @noimplement This interface is not intended to be implemented by clients. > * @since 2.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDOSessionInvalidationEvent extends CDOSessionEvent, CDOCommitInfo > { >Index: src/org/eclipse/emf/cdo/etypes/Annotation.java >=================================================================== >--- src/org/eclipse/emf/cdo/etypes/Annotation.java (revision 7692) >+++ src/org/eclipse/emf/cdo/etypes/Annotation.java (working copy) >@@ -17,17 +17,19 @@ > /** > * <!-- begin-user-doc --> A representation of the model object '<em><b>Annotation</b></em>'. > * >- * @since 4.0 <!-- end-user-doc --> >- * <p> >- * The following features are supported: >- * <ul> >- * <li>{@link org.eclipse.emf.cdo.etypes.Annotation#getSource <em>Source</em>}</li> >- * <li>{@link org.eclipse.emf.cdo.etypes.Annotation#getDetails <em>Details</em>}</li> >- * <li>{@link org.eclipse.emf.cdo.etypes.Annotation#getModelElement <em>Model Element</em>}</li> >- * <li>{@link org.eclipse.emf.cdo.etypes.Annotation#getContents <em>Contents</em>}</li> >- * <li>{@link org.eclipse.emf.cdo.etypes.Annotation#getReferences <em>References</em>}</li> >- * </ul> >- * </p> >+ * @since 4.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. <!-- end-user-doc --> >+ * <p> >+ * The following features are supported: >+ * <ul> >+ * <li>{@link org.eclipse.emf.cdo.etypes.Annotation#getSource <em>Source</em>}</li> >+ * <li>{@link org.eclipse.emf.cdo.etypes.Annotation#getDetails <em>Details</em>}</li> >+ * <li>{@link org.eclipse.emf.cdo.etypes.Annotation#getModelElement <em>Model Element</em>}</li> >+ * <li>{@link org.eclipse.emf.cdo.etypes.Annotation#getContents <em>Contents</em>}</li> >+ * <li>{@link org.eclipse.emf.cdo.etypes.Annotation#getReferences <em>References</em>}</li> >+ * </ul> >+ * </p> > * @see org.eclipse.emf.cdo.etypes.EtypesPackage#getAnnotation() > * @model > * @generated >Index: src/org/eclipse/emf/cdo/session/remote/CDORemoteSession.java >=================================================================== >--- src/org/eclipse/emf/cdo/session/remote/CDORemoteSession.java (revision 7692) >+++ src/org/eclipse/emf/cdo/session/remote/CDORemoteSession.java (working copy) >@@ -20,6 +20,8 @@ > * > * @author Eike Stepper > * @since 2.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDORemoteSession extends Comparable<CDORemoteSession> > { >Index: src/org/eclipse/emf/cdo/transaction/CDOTransaction.java >=================================================================== >--- src/org/eclipse/emf/cdo/transaction/CDOTransaction.java (revision 7692) >+++ src/org/eclipse/emf/cdo/transaction/CDOTransaction.java (working copy) >@@ -45,8 +45,9 @@ > * A read-write view to the <em>current</em> (i.e. latest) state of the object graph in the repository. > * > * @author Eike Stepper >- * @noimplement This interface is not intended to be implemented by clients. > * @since 2.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDOTransaction extends CDOView, CDOCommonTransaction, CDOUserTransaction, CDOChangeSetDataProvider > { >Index: src/org/eclipse/emf/cdo/session/CDORepositoryInfo.java >=================================================================== >--- src/org/eclipse/emf/cdo/session/CDORepositoryInfo.java (revision 7692) >+++ src/org/eclipse/emf/cdo/session/CDORepositoryInfo.java (working copy) >@@ -18,6 +18,8 @@ > * @author Eike Stepper > * @see CDOSession#getRepositoryInfo() > * @since 3.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDORepositoryInfo extends CDOCommonRepository > { >Index: src/org/eclipse/emf/cdo/util/InvalidObjectException.java >=================================================================== >--- src/org/eclipse/emf/cdo/util/InvalidObjectException.java (revision 7692) >+++ src/org/eclipse/emf/cdo/util/InvalidObjectException.java (working copy) >@@ -27,6 +27,8 @@ > * > * @author Simon McDuff > * @since 2.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noinstantiate This class is not intended to be instantiated by clients. > */ > public class InvalidObjectException extends CDOException > { >Index: src/org/eclipse/emf/cdo/transaction/CDOPushTransaction.java >=================================================================== >--- src/org/eclipse/emf/cdo/transaction/CDOPushTransaction.java (revision 7692) >+++ src/org/eclipse/emf/cdo/transaction/CDOPushTransaction.java (working copy) >@@ -60,6 +60,8 @@ > /** > * @author Eike Stepper > * @since 3.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noinstantiate This class is not intended to be instantiated by clients. > */ > public class CDOPushTransaction extends Notifier implements CDOTransaction > { >Index: src/org/eclipse/emf/cdo/eresource/CDOResourceNode.java >=================================================================== >--- src/org/eclipse/emf/cdo/eresource/CDOResourceNode.java (revision 7692) >+++ src/org/eclipse/emf/cdo/eresource/CDOResourceNode.java (working copy) >@@ -18,17 +18,18 @@ > import java.util.Map; > > /** >- * <!-- begin-user-doc --> A representation of the model object '<em><b>CDO Resource Node</b></em>'. <!-- end-user-doc >- * --> >- * <p> >- * The following features are supported: >- * <ul> >- * <li>{@link org.eclipse.emf.cdo.eresource.CDOResourceNode#getFolder <em>Folder</em>}</li> >- * <li>{@link org.eclipse.emf.cdo.eresource.CDOResourceNode#getName <em>Name</em>}</li> >- * <li>{@link org.eclipse.emf.cdo.eresource.CDOResourceNode#getPath <em>Path</em>}</li> >- * </ul> >- * </p> >+ * <!-- begin-user-doc --> A representation of the model object '<em><b>CDO Resource Node</b></em>'. > * >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. <!-- end-user-doc --> >+ * <p> >+ * The following features are supported: >+ * <ul> >+ * <li>{@link org.eclipse.emf.cdo.eresource.CDOResourceNode#getFolder <em>Folder</em>}</li> >+ * <li>{@link org.eclipse.emf.cdo.eresource.CDOResourceNode#getName <em>Name</em>}</li> >+ * <li>{@link org.eclipse.emf.cdo.eresource.CDOResourceNode#getPath <em>Path</em>}</li> >+ * </ul> >+ * </p> > * @see org.eclipse.emf.cdo.eresource.EresourcePackage#getCDOResourceNode() > * @model abstract="true" > * @generated >Index: src/org/eclipse/emf/cdo/eresource/impl/EresourcePackageImpl.java >=================================================================== >--- src/org/eclipse/emf/cdo/eresource/impl/EresourcePackageImpl.java (revision 7692) >+++ src/org/eclipse/emf/cdo/eresource/impl/EresourcePackageImpl.java (working copy) >@@ -28,8 +28,9 @@ > import org.eclipse.emf.ecore.resource.ResourceSet; > > /** >- * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc --> >+ * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. > * >+ * @noextend This interface is not intended to be extended by clients. <!-- end-user-doc --> > * @generated > */ > public class EresourcePackageImpl extends EPackageImpl implements EresourcePackage >@@ -116,7 +117,9 @@ > public static EresourcePackage init() > { > if (isInited) >+ { > return (EresourcePackage)EPackage.Registry.INSTANCE.getEPackage(EresourcePackage.eNS_URI); >+ } > > // Obtain or create and register package > EresourcePackageImpl theEresourcePackage = (EresourcePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof EresourcePackageImpl ? EPackage.Registry.INSTANCE >@@ -363,7 +366,9 @@ > public void createPackageContents() > { > if (isCreated) >+ { > return; >+ } > isCreated = true; > > // Create classes and their features >@@ -408,7 +413,9 @@ > public void initializePackageContents() > { > if (isInitialized) >+ { > return; >+ } > isInitialized = true; > > // Initialize package >@@ -424,16 +431,16 @@ > // Set bounds for type parameters > > // Add supertypes to classes >- cdoResourceFolderEClass.getESuperTypes().add(this.getCDOResourceNode()); >- cdoResourceEClass.getESuperTypes().add(this.getCDOResourceNode()); >+ cdoResourceFolderEClass.getESuperTypes().add(getCDOResourceNode()); >+ cdoResourceEClass.getESuperTypes().add(getCDOResourceNode()); > > // Initialize classes and features; add operations and parameters > initEClass(cdoResourceNodeEClass, CDOResourceNode.class, > "CDOResourceNode", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ > initEReference( > getCDOResourceNode_Folder(), >- this.getCDOResourceFolder(), >- this.getCDOResourceFolder_Nodes(), >+ getCDOResourceFolder(), >+ getCDOResourceFolder_Nodes(), > "folder", null, 0, 1, CDOResourceNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ > initEAttribute( > getCDOResourceNode_Name(), >@@ -448,26 +455,26 @@ > "CDOResourceFolder", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ > initEReference( > getCDOResourceFolder_Nodes(), >- this.getCDOResourceNode(), >- this.getCDOResourceNode_Folder(), >+ getCDOResourceNode(), >+ getCDOResourceNode_Folder(), > "nodes", null, 0, -1, CDOResourceFolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ > >- EOperation op = addEOperation(cdoResourceFolderEClass, this.getCDOResourceFolder(), >+ EOperation op = addEOperation(cdoResourceFolderEClass, getCDOResourceFolder(), > "addResourceFolder", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$ > addEParameter(op, theEcorePackage.getEString(), "name", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$ > >- op = addEOperation(cdoResourceFolderEClass, this.getCDOResource(), "addResource", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$ >+ op = addEOperation(cdoResourceFolderEClass, getCDOResource(), "addResource", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$ > addEParameter(op, theEcorePackage.getEString(), "name", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$ > > initEClass(cdoResourceEClass, CDOResource.class, > "CDOResource", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ > initEAttribute( > getCDOResource_ResourceSet(), >- this.getResourceSet(), >+ getResourceSet(), > "resourceSet", null, 0, 1, CDOResource.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ > initEAttribute( > getCDOResource_URI(), >- this.getURI(), >+ getURI(), > "uRI", null, 0, 1, CDOResource.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ > initEReference( > getCDOResource_Contents(), >@@ -488,11 +495,11 @@ > "trackingModification", null, 0, 1, CDOResource.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ > initEAttribute( > getCDOResource_Errors(), >- this.getDiagnostic(), >+ getDiagnostic(), > "errors", null, 0, -1, CDOResource.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ > initEAttribute( > getCDOResource_Warnings(), >- this.getDiagnostic(), >+ getDiagnostic(), > "warnings", null, 0, -1, CDOResource.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ > initEAttribute( > getCDOResource_TimeStamp(), >Index: src/org/eclipse/emf/spi/cdo/InternalCDOViewSet.java >=================================================================== >--- src/org/eclipse/emf/spi/cdo/InternalCDOViewSet.java (revision 7692) >+++ src/org/eclipse/emf/spi/cdo/InternalCDOViewSet.java (working copy) >@@ -17,6 +17,8 @@ > /** > * @author Eike Stepper > * @since 2.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface InternalCDOViewSet extends CDOViewSet, Adapter > { >Index: src/org/eclipse/emf/cdo/util/InvalidURIException.java >=================================================================== >--- src/org/eclipse/emf/cdo/util/InvalidURIException.java (revision 7692) >+++ src/org/eclipse/emf/cdo/util/InvalidURIException.java (working copy) >@@ -21,6 +21,8 @@ > /** > * @author Eike Stepper > * @since 2.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noinstantiate This class is not intended to be instantiated by clients. > */ > public class InvalidURIException extends CDOException > { >Index: src/org/eclipse/emf/cdo/util/ServerException.java >=================================================================== >--- src/org/eclipse/emf/cdo/util/ServerException.java (revision 7692) >+++ src/org/eclipse/emf/cdo/util/ServerException.java (working copy) >@@ -14,6 +14,8 @@ > > /** > * @author Eike Stepper >+ * @noextend This interface is not intended to be extended by clients. >+ * @noinstantiate This class is not intended to be instantiated by clients. > */ > public class ServerException extends CDOException > { >Index: src/org/eclipse/emf/cdo/view/CDOViewSet.java >=================================================================== >--- src/org/eclipse/emf/cdo/view/CDOViewSet.java (revision 7692) >+++ src/org/eclipse/emf/cdo/view/CDOViewSet.java (working copy) >@@ -25,6 +25,8 @@ > * > * @author Simon McDuff > * @since 2.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDOViewSet extends Notifier > { >Index: src/org/eclipse/emf/spi/cdo/InternalCDOSession.java >=================================================================== >--- src/org/eclipse/emf/spi/cdo/InternalCDOSession.java (revision 7692) >+++ src/org/eclipse/emf/spi/cdo/InternalCDOSession.java (working copy) >@@ -43,6 +43,8 @@ > /** > * @author Eike Stepper > * @since 2.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface InternalCDOSession extends CDOSession, PackageProcessor, PackageLoader, RevisionLocker, ILifecycle > { >Index: src/org/eclipse/emf/cdo/util/ObjectNotFoundException.java >=================================================================== >--- src/org/eclipse/emf/cdo/util/ObjectNotFoundException.java (revision 7692) >+++ src/org/eclipse/emf/cdo/util/ObjectNotFoundException.java (working copy) >@@ -25,6 +25,8 @@ > * > * @author Simon McDuff > * @since 2.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noinstantiate This class is not intended to be instantiated by clients. > */ > public class ObjectNotFoundException extends CDOException > { >Index: src/org/eclipse/emf/cdo/etypes/EtypesPackage.java >=================================================================== >--- src/org/eclipse/emf/cdo/etypes/EtypesPackage.java (revision 7692) >+++ src/org/eclipse/emf/cdo/etypes/EtypesPackage.java (working copy) >@@ -25,7 +25,9 @@ > * <li>and each data type</li> > * </ul> > * >- * @since 4.0 <!-- end-user-doc --> >+ * @since 4.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. <!-- end-user-doc --> > * @see org.eclipse.emf.cdo.etypes.EtypesFactory > * @model kind="package" > * @generated >Index: src/org/eclipse/emf/cdo/view/CDOViewTargetChangedEvent.java >=================================================================== >--- src/org/eclipse/emf/cdo/view/CDOViewTargetChangedEvent.java (revision 7692) >+++ src/org/eclipse/emf/cdo/view/CDOViewTargetChangedEvent.java (working copy) >@@ -18,6 +18,8 @@ > * > * @author Victor Roldan Betancort > * @since 3.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDOViewTargetChangedEvent extends CDOViewEvent > { >Index: src/org/eclipse/emf/cdo/CDOLock.java >=================================================================== >--- src/org/eclipse/emf/cdo/CDOLock.java (revision 7692) >+++ src/org/eclipse/emf/cdo/CDOLock.java (working copy) >@@ -25,6 +25,8 @@ > * > * @author Simon McDuff > * @since 2.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDOLock extends Lock > { >Index: src/org/eclipse/emf/cdo/view/CDOQuery.java >=================================================================== >--- src/org/eclipse/emf/cdo/view/CDOQuery.java (revision 7692) >+++ src/org/eclipse/emf/cdo/view/CDOQuery.java (working copy) >@@ -22,6 +22,8 @@ > * > * @author Simon McDuff > * @since 2.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDOQuery extends CDOQueryInfo > { >Index: src/org/eclipse/emf/spi/cdo/InternalCDOObject.java >=================================================================== >--- src/org/eclipse/emf/spi/cdo/InternalCDOObject.java (revision 7692) >+++ src/org/eclipse/emf/spi/cdo/InternalCDOObject.java (working copy) >@@ -25,6 +25,8 @@ > /** > * @author Eike Stepper > * @since 2.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface InternalCDOObject extends CDOObject, InternalEObject, InternalCDOLoadable, CDOObjectMarker > { >Index: src/org/eclipse/emf/internal/cdo/transaction/CDOXACommitContextImpl.java >=================================================================== >--- src/org/eclipse/emf/internal/cdo/transaction/CDOXACommitContextImpl.java (revision 7692) >+++ src/org/eclipse/emf/internal/cdo/transaction/CDOXACommitContextImpl.java (working copy) >@@ -15,9 +15,9 @@ > import org.eclipse.emf.cdo.common.id.CDOID; > import org.eclipse.emf.cdo.common.lob.CDOLob; > import org.eclipse.emf.cdo.common.model.CDOPackageUnit; >-import org.eclipse.emf.cdo.common.revision.CDOReferenceAdjuster; > import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta; > import org.eclipse.emf.cdo.internal.common.id.CDOIDTempObjectExternalImpl; >+import org.eclipse.emf.cdo.spi.common.revision.CDOReferenceAdjuster; > import org.eclipse.emf.cdo.util.CDOUtil; > > import org.eclipse.emf.internal.cdo.messages.Messages; >Index: src/org/eclipse/emf/cdo/util/StaleRevisionLockException.java >=================================================================== >--- src/org/eclipse/emf/cdo/util/StaleRevisionLockException.java (revision 7692) >+++ src/org/eclipse/emf/cdo/util/StaleRevisionLockException.java (working copy) >@@ -18,6 +18,8 @@ > /** > * @author Caspar De Groot > * @since 4.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noinstantiate This class is not intended to be instantiated by clients. > */ > public class StaleRevisionLockException extends CDOException > { >Index: src/org/eclipse/emf/spi/cdo/InternalCDOSessionConfiguration.java >=================================================================== >--- src/org/eclipse/emf/spi/cdo/InternalCDOSessionConfiguration.java (revision 7692) >+++ src/org/eclipse/emf/spi/cdo/InternalCDOSessionConfiguration.java (working copy) >@@ -15,6 +15,8 @@ > /** > * @author Eike Stepper > * @since 3.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface InternalCDOSessionConfiguration extends CDOSessionConfiguration > { >Index: src/org/eclipse/emf/cdo/session/remote/CDORemoteSessionManager.java >=================================================================== >--- src/org/eclipse/emf/cdo/session/remote/CDORemoteSessionManager.java (revision 7692) >+++ src/org/eclipse/emf/cdo/session/remote/CDORemoteSessionManager.java (working copy) >@@ -43,6 +43,8 @@ > * > * @author Eike Stepper > * @since 2.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDORemoteSessionManager extends IContainer<CDORemoteSession> > { >Index: src/org/eclipse/emf/cdo/util/LockTimeoutException.java >=================================================================== >--- src/org/eclipse/emf/cdo/util/LockTimeoutException.java (revision 7692) >+++ src/org/eclipse/emf/cdo/util/LockTimeoutException.java (working copy) >@@ -15,6 +15,8 @@ > /** > * @author Caspar De Groot > * @since 4.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noinstantiate This class is not intended to be instantiated by clients. > */ > public class LockTimeoutException extends CDOException > { >Index: src/org/eclipse/emf/cdo/view/CDOViewProviderRegistry.java >=================================================================== >--- src/org/eclipse/emf/cdo/view/CDOViewProviderRegistry.java (revision 7692) >+++ src/org/eclipse/emf/cdo/view/CDOViewProviderRegistry.java (working copy) >@@ -22,6 +22,8 @@ > * > * @author Victor Roldan Betancort > * @since 2.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDOViewProviderRegistry extends IContainer<CDOViewProvider> > { >Index: src/org/eclipse/emf/cdo/eresource/impl/CDOResourceNodeImpl.java >=================================================================== >--- src/org/eclipse/emf/cdo/eresource/impl/CDOResourceNodeImpl.java (revision 7692) >+++ src/org/eclipse/emf/cdo/eresource/impl/CDOResourceNodeImpl.java (working copy) >@@ -29,17 +29,17 @@ > import java.util.List; > > /** >- * <!-- begin-user-doc --> An implementation of the model object '<em><b>CDO Resource Node</b></em>'. <!-- end-user-doc >- * --> >- * <p> >- * The following features are implemented: >- * <ul> >- * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceNodeImpl#getFolder <em>Folder</em>}</li> >- * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceNodeImpl#getName <em>Name</em>}</li> >- * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceNodeImpl#getPath <em>Path</em>}</li> >- * </ul> >- * </p> >+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>CDO Resource Node</b></em>'. > * >+ * @noextend This interface is not intended to be extended by clients. <!-- end-user-doc --> >+ * <p> >+ * The following features are implemented: >+ * <ul> >+ * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceNodeImpl#getFolder <em>Folder</em>}</li> >+ * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceNodeImpl#getName <em>Name</em>}</li> >+ * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceNodeImpl#getPath <em>Path</em>}</li> >+ * </ul> >+ * </p> > * @generated > * @since 2.0 > */ >Index: src/org/eclipse/emf/cdo/transaction/CDOTransactionStartedEvent.java >=================================================================== >--- src/org/eclipse/emf/cdo/transaction/CDOTransactionStartedEvent.java (revision 7692) >+++ src/org/eclipse/emf/cdo/transaction/CDOTransactionStartedEvent.java (working copy) >@@ -14,8 +14,9 @@ > > /** > * @author Eike Stepper >- * @noimplement This interface is not intended to be implemented by clients. > * @since 2.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDOTransactionStartedEvent extends CDOViewEvent > { >Index: src/org/eclipse/emf/spi/cdo/InternalCDORemoteSession.java >=================================================================== >--- src/org/eclipse/emf/spi/cdo/InternalCDORemoteSession.java (revision 7692) >+++ src/org/eclipse/emf/spi/cdo/InternalCDORemoteSession.java (working copy) >@@ -15,6 +15,8 @@ > /** > * @author Eike Stepper > * @since 3.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface InternalCDORemoteSession extends CDORemoteSession > { >Index: src/org/eclipse/emf/cdo/eresource/CDOResourceFolder.java >=================================================================== >--- src/org/eclipse/emf/cdo/eresource/CDOResourceFolder.java (revision 7692) >+++ src/org/eclipse/emf/cdo/eresource/CDOResourceFolder.java (working copy) >@@ -13,9 +13,10 @@ > import org.eclipse.emf.common.util.EList; > > /** >- * <!-- begin-user-doc --> A representation of the model object '<em><b>CDO Resource Folder</b></em>'. <!-- end-user-doc >- * --> >+ * <!-- begin-user-doc --> A representation of the model object '<em><b>CDO Resource Folder</b></em>'. > * >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. <!-- end-user-doc --> > * @see org.eclipse.emf.cdo.eresource.EresourcePackage#getCDOResourceFolder() > * @model > * @generated >Index: src/org/eclipse/emf/cdo/util/CDOUpdatable.java >=================================================================== >--- src/org/eclipse/emf/cdo/util/CDOUpdatable.java (revision 7692) >+++ src/org/eclipse/emf/cdo/util/CDOUpdatable.java (working copy) >@@ -15,6 +15,8 @@ > /** > * @author Eike Stepper > * @since 3.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDOUpdatable > { >Index: src/org/eclipse/emf/cdo/util/ReferentialIntegrityException.java >=================================================================== >--- src/org/eclipse/emf/cdo/util/ReferentialIntegrityException.java (revision 7692) >+++ src/org/eclipse/emf/cdo/util/ReferentialIntegrityException.java (working copy) >@@ -17,6 +17,8 @@ > /** > * @author Eike Stepper > * @since 4.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noinstantiate This class is not intended to be instantiated by clients. > */ > public class ReferentialIntegrityException extends CommitException > { >Index: src/org/eclipse/emf/cdo/util/LegacyModeNotEnabledException.java >=================================================================== >--- src/org/eclipse/emf/cdo/util/LegacyModeNotEnabledException.java (revision 7692) >+++ src/org/eclipse/emf/cdo/util/LegacyModeNotEnabledException.java (working copy) >@@ -13,6 +13,8 @@ > /** > * @author Eike Stepper > * @since 3.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noinstantiate This class is not intended to be instantiated by clients. > */ > public class LegacyModeNotEnabledException extends IllegalStateException > { >Index: src/org/eclipse/emf/cdo/transaction/CDOXATransaction.java >=================================================================== >--- src/org/eclipse/emf/cdo/transaction/CDOXATransaction.java (revision 7692) >+++ src/org/eclipse/emf/cdo/transaction/CDOXATransaction.java (working copy) >@@ -16,6 +16,8 @@ > /** > * @author Simon McDuff > * @since 2.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDOXATransaction extends CDOUserTransaction > { >Index: src/org/eclipse/emf/cdo/session/CDOSessionEvent.java >=================================================================== >--- src/org/eclipse/emf/cdo/session/CDOSessionEvent.java (revision 7692) >+++ src/org/eclipse/emf/cdo/session/CDOSessionEvent.java (working copy) >@@ -15,6 +15,8 @@ > /** > * @author Eike Stepper > * @since 2.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDOSessionEvent extends IEvent > { >Index: src/org/eclipse/emf/cdo/eresource/impl/EresourceFactoryImpl.java >=================================================================== >--- src/org/eclipse/emf/cdo/eresource/impl/EresourceFactoryImpl.java (revision 7692) >+++ src/org/eclipse/emf/cdo/eresource/impl/EresourceFactoryImpl.java (working copy) >@@ -25,8 +25,9 @@ > import org.eclipse.emf.ecore.plugin.EcorePlugin; > > /** >- * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc --> >+ * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. > * >+ * @noextend This interface is not intended to be extended by clients. <!-- end-user-doc --> > * @generated > */ > public class EresourceFactoryImpl extends EFactoryImpl implements EresourceFactory >Index: src/org/eclipse/emf/cdo/util/CommitIntegrityException.java >=================================================================== >--- src/org/eclipse/emf/cdo/util/CommitIntegrityException.java (revision 7692) >+++ src/org/eclipse/emf/cdo/util/CommitIntegrityException.java (working copy) >@@ -17,6 +17,8 @@ > /** > * @author Caspar De Groot > * @since 4.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noinstantiate This class is not intended to be instantiated by clients. > */ > public class CommitIntegrityException extends CommitException > { >Index: src/org/eclipse/emf/cdo/etypes/impl/AnnotationImpl.java >=================================================================== >--- src/org/eclipse/emf/cdo/etypes/impl/AnnotationImpl.java (revision 7692) >+++ src/org/eclipse/emf/cdo/etypes/impl/AnnotationImpl.java (working copy) >@@ -22,17 +22,18 @@ > /** > * <!-- begin-user-doc --> An implementation of the model object '<em><b>Annotation</b></em>'. > * >- * @since 4.0 <!-- end-user-doc --> >- * <p> >- * The following features are implemented: >- * <ul> >- * <li>{@link org.eclipse.emf.cdo.etypes.impl.AnnotationImpl#getSource <em>Source</em>}</li> >- * <li>{@link org.eclipse.emf.cdo.etypes.impl.AnnotationImpl#getDetails <em>Details</em>}</li> >- * <li>{@link org.eclipse.emf.cdo.etypes.impl.AnnotationImpl#getModelElement <em>Model Element</em>}</li> >- * <li>{@link org.eclipse.emf.cdo.etypes.impl.AnnotationImpl#getContents <em>Contents</em>}</li> >- * <li>{@link org.eclipse.emf.cdo.etypes.impl.AnnotationImpl#getReferences <em>References</em>}</li> >- * </ul> >- * </p> >+ * @since 4.0 >+ * @noextend This interface is not intended to be extended by clients. <!-- end-user-doc --> >+ * <p> >+ * The following features are implemented: >+ * <ul> >+ * <li>{@link org.eclipse.emf.cdo.etypes.impl.AnnotationImpl#getSource <em>Source</em>}</li> >+ * <li>{@link org.eclipse.emf.cdo.etypes.impl.AnnotationImpl#getDetails <em>Details</em>}</li> >+ * <li>{@link org.eclipse.emf.cdo.etypes.impl.AnnotationImpl#getModelElement <em>Model Element</em>}</li> >+ * <li>{@link org.eclipse.emf.cdo.etypes.impl.AnnotationImpl#getContents <em>Contents</em>}</li> >+ * <li>{@link org.eclipse.emf.cdo.etypes.impl.AnnotationImpl#getReferences <em>References</em>}</li> >+ * </ul> >+ * </p> > * @generated > */ > public class AnnotationImpl extends ModelElementImpl implements Annotation >Index: src/org/eclipse/emf/spi/cdo/InternalCDORemoteSessionManager.java >=================================================================== >--- src/org/eclipse/emf/spi/cdo/InternalCDORemoteSessionManager.java (revision 7692) >+++ src/org/eclipse/emf/spi/cdo/InternalCDORemoteSessionManager.java (working copy) >@@ -18,6 +18,8 @@ > /** > * @author Eike Stepper > * @since 2.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface InternalCDORemoteSessionManager extends CDORemoteSessionManager, ILifecycle > { >Index: src/org/eclipse/emf/cdo/etypes/EtypesFactory.java >=================================================================== >--- src/org/eclipse/emf/cdo/etypes/EtypesFactory.java (revision 7692) >+++ src/org/eclipse/emf/cdo/etypes/EtypesFactory.java (working copy) >@@ -16,7 +16,9 @@ > * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a create method for each non-abstract class of > * the model. > * >- * @since 4.0 <!-- end-user-doc --> >+ * @since 4.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. <!-- end-user-doc --> > * @see org.eclipse.emf.cdo.etypes.EtypesPackage > * @generated > */ >Index: src/org/eclipse/emf/cdo/view/CDOFetchRuleManager.java >=================================================================== >--- src/org/eclipse/emf/cdo/view/CDOFetchRuleManager.java (revision 7692) >+++ src/org/eclipse/emf/cdo/view/CDOFetchRuleManager.java (working copy) >@@ -23,6 +23,8 @@ > * > * @author Simon McDuff > * @since 2.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDOFetchRuleManager > { >Index: src/org/eclipse/emf/cdo/eresource/EresourceFactory.java >=================================================================== >--- src/org/eclipse/emf/cdo/eresource/EresourceFactory.java (revision 7692) >+++ src/org/eclipse/emf/cdo/eresource/EresourceFactory.java (working copy) >@@ -14,8 +14,10 @@ > > /** > * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a create method for each non-abstract class of >- * the model. <!-- end-user-doc --> >+ * the model. > * >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. <!-- end-user-doc --> > * @see org.eclipse.emf.cdo.eresource.EresourcePackage > * @generated > */ >Index: src/org/eclipse/emf/spi/cdo/InternalCDOUserTransaction.java >=================================================================== >--- src/org/eclipse/emf/spi/cdo/InternalCDOUserTransaction.java (revision 7692) >+++ src/org/eclipse/emf/spi/cdo/InternalCDOUserTransaction.java (working copy) >@@ -15,6 +15,8 @@ > /** > * @author Eike Stepper > * @since 3.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface InternalCDOUserTransaction extends CDOUserTransaction > { >Index: src/org/eclipse/emf/cdo/view/CDOViewInvalidationEvent.java >=================================================================== >--- src/org/eclipse/emf/cdo/view/CDOViewInvalidationEvent.java (revision 7692) >+++ src/org/eclipse/emf/cdo/view/CDOViewInvalidationEvent.java (working copy) >@@ -28,8 +28,9 @@ > * @author Simon McDuff > * @see CDOInvalidationNotification > * @see CDOAdapterPolicy >- * @noimplement This interface is not intended to be implemented by clients. > * @since 2.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDOViewInvalidationEvent extends CDOViewEvent > { >Index: src/org/eclipse/emf/spi/cdo/InternalCDOXATransaction.java >=================================================================== >--- src/org/eclipse/emf/spi/cdo/InternalCDOXATransaction.java (revision 7692) >+++ src/org/eclipse/emf/spi/cdo/InternalCDOXATransaction.java (working copy) >@@ -29,6 +29,8 @@ > /** > * @author Eike Stepper > * @since 2.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface InternalCDOXATransaction extends CDOXATransaction, InternalCDOUserTransaction > { >Index: src/org/eclipse/emf/cdo/etypes/impl/EtypesFactoryImpl.java >=================================================================== >--- src/org/eclipse/emf/cdo/etypes/impl/EtypesFactoryImpl.java (revision 7692) >+++ src/org/eclipse/emf/cdo/etypes/impl/EtypesFactoryImpl.java (working copy) >@@ -26,7 +26,8 @@ > /** > * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. > * >- * @since 4.0 <!-- end-user-doc --> >+ * @since 4.0 >+ * @noextend This interface is not intended to be extended by clients. <!-- end-user-doc --> > * @generated > */ > public class EtypesFactoryImpl extends EFactoryImpl implements EtypesFactory >Index: src/org/eclipse/emf/spi/cdo/InternalCDOView.java >=================================================================== >--- src/org/eclipse/emf/spi/cdo/InternalCDOView.java (revision 7692) >+++ src/org/eclipse/emf/spi/cdo/InternalCDOView.java (working copy) >@@ -34,6 +34,8 @@ > /** > * @author Eike Stepper > * @since 2.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface InternalCDOView extends CDOView, CDOIDProvider, ILifecycle > { >Index: src/org/eclipse/emf/spi/cdo/AbstractQueryIterator.java >=================================================================== >--- src/org/eclipse/emf/spi/cdo/AbstractQueryIterator.java (revision 7692) >+++ src/org/eclipse/emf/spi/cdo/AbstractQueryIterator.java (working copy) >@@ -21,6 +21,7 @@ > /** > * @author Simon McDuff > * @since 2.0 >+ * @noextend This interface is not intended to be extended by clients. > */ > public abstract class AbstractQueryIterator<T> extends AbstractQueryResult<T> > { >Index: src/org/eclipse/emf/cdo/transaction/CDOCommitContext.java >=================================================================== >--- src/org/eclipse/emf/cdo/transaction/CDOCommitContext.java (revision 7692) >+++ src/org/eclipse/emf/cdo/transaction/CDOCommitContext.java (working copy) >@@ -26,6 +26,8 @@ > * > * @author Simon McDuff > * @since 2.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDOCommitContext > { >Index: src/org/eclipse/emf/spi/cdo/InternalCDOLoadable.java >=================================================================== >--- src/org/eclipse/emf/spi/cdo/InternalCDOLoadable.java (revision 7692) >+++ src/org/eclipse/emf/spi/cdo/InternalCDOLoadable.java (working copy) >@@ -14,6 +14,8 @@ > /** > * @author Simon McDuff > * @since 2.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface InternalCDOLoadable > { >Index: src/org/eclipse/emf/cdo/session/CDOSession.java >=================================================================== >--- src/org/eclipse/emf/cdo/session/CDOSession.java (revision 7692) >+++ src/org/eclipse/emf/cdo/session/CDOSession.java (working copy) >@@ -54,6 +54,7 @@ > * > * @author Eike Stepper > * @since 2.0 >+ * @noextend This interface is not intended to be extended by clients. > * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDOSession extends CDOCommonSession, CDOUpdatable, IContainer<CDOView> >Index: src/org/eclipse/emf/cdo/eresource/CDOResource.java >=================================================================== >--- src/org/eclipse/emf/cdo/eresource/CDOResource.java (revision 7692) >+++ src/org/eclipse/emf/cdo/eresource/CDOResource.java (working copy) >@@ -23,21 +23,24 @@ > /** > * <!-- begin-user-doc --> A representation of the model object '<em><b>CDO Resource</b></em>'. > * >- * @extends Resource <!-- end-user-doc --> >- * <p> >- * The following features are supported: >- * <ul> >- * <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#getResourceSet <em>Resource Set</em>}</li> >- * <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#getURI <em>URI</em>}</li> >- * <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#getContents <em>Contents</em>}</li> >- * <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#isModified <em>Modified</em>}</li> >- * <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#isLoaded <em>Loaded</em>}</li> >- * <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#isTrackingModification <em>Tracking Modification</em>}</li> >- * <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#getErrors <em>Errors</em>}</li> >- * <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#getWarnings <em>Warnings</em>}</li> >- * <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#getTimeStamp <em>Time Stamp</em>}</li> >- * </ul> >- * </p> >+ * @extends Resource >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. <!-- end-user-doc --> >+ * <p> >+ * The following features are supported: >+ * <ul> >+ * <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#getResourceSet <em>Resource Set</em>}</li> >+ * <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#getURI <em>URI</em>}</li> >+ * <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#getContents <em>Contents</em>}</li> >+ * <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#isModified <em>Modified</em>}</li> >+ * <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#isLoaded <em>Loaded</em>}</li> >+ * <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#isTrackingModification <em>Tracking Modification >+ * </em>}</li> >+ * <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#getErrors <em>Errors</em>}</li> >+ * <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#getWarnings <em>Warnings</em>}</li> >+ * <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#getTimeStamp <em>Time Stamp</em>}</li> >+ * </ul> >+ * </p> > * @see org.eclipse.emf.cdo.eresource.EresourcePackage#getCDOResource() > * @model > * @generated >Index: src/org/eclipse/emf/cdo/CDONotification.java >=================================================================== >--- src/org/eclipse/emf/cdo/CDONotification.java (revision 7692) >+++ src/org/eclipse/emf/cdo/CDONotification.java (working copy) >@@ -18,6 +18,8 @@ > * > * @since 2.0 > * @author Simon McDuff >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDONotification extends Notification > { >Index: src/org/eclipse/emf/cdo/etypes/impl/EtypesPackageImpl.java >=================================================================== >--- src/org/eclipse/emf/cdo/etypes/impl/EtypesPackageImpl.java (revision 7692) >+++ src/org/eclipse/emf/cdo/etypes/impl/EtypesPackageImpl.java (working copy) >@@ -29,7 +29,8 @@ > /** > * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. > * >- * @since 4.0 <!-- end-user-doc --> >+ * @since 4.0 >+ * @noextend This interface is not intended to be extended by clients. <!-- end-user-doc --> > * @generated > */ > public class EtypesPackageImpl extends EPackageImpl implements EtypesPackage >@@ -102,7 +103,9 @@ > public static EtypesPackage init() > { > if (isInited) >+ { > return (EtypesPackage)EPackage.Registry.INSTANCE.getEPackage(EtypesPackage.eNS_URI); >+ } > > // Obtain or create and register package > EtypesPackageImpl theEtypesPackage = (EtypesPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof EtypesPackageImpl ? EPackage.Registry.INSTANCE >@@ -253,7 +256,9 @@ > public void createPackageContents() > { > if (isCreated) >+ { > return; >+ } > isCreated = true; > > // Create classes and their features >@@ -288,7 +293,9 @@ > public void initializePackageContents() > { > if (isInitialized) >+ { > return; >+ } > isInitialized = true; > > // Initialize package >@@ -304,19 +311,18 @@ > // Set bounds for type parameters > > // Add supertypes to classes >- annotationEClass.getESuperTypes().add(this.getModelElement()); >+ annotationEClass.getESuperTypes().add(getModelElement()); > > // Initialize classes and features; add operations and parameters > initEClass(modelElementEClass, ModelElement.class, > "ModelElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ > initEReference( > getModelElement_Annotations(), >- this.getAnnotation(), >- this.getAnnotation_ModelElement(), >+ getAnnotation(), >+ getAnnotation_ModelElement(), > "annotations", null, 0, -1, ModelElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ > >- EOperation op = addEOperation(modelElementEClass, this.getAnnotation(), >- "getAnnotation", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$ >+ EOperation op = addEOperation(modelElementEClass, getAnnotation(), "getAnnotation", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$ > addEParameter(op, theEcorePackage.getEString(), "source", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$ > > initEClass(annotationEClass, Annotation.class, >@@ -332,8 +338,8 @@ > "details", null, 0, -1, Annotation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ > initEReference( > getAnnotation_ModelElement(), >- this.getModelElement(), >- this.getModelElement_Annotations(), >+ getModelElement(), >+ getModelElement_Annotations(), > "modelElement", null, 0, 1, Annotation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ > initEReference( > getAnnotation_Contents(), >Index: src/org/eclipse/emf/cdo/util/ReadOnlyException.java >=================================================================== >--- src/org/eclipse/emf/cdo/util/ReadOnlyException.java (revision 7692) >+++ src/org/eclipse/emf/cdo/util/ReadOnlyException.java (working copy) >@@ -14,6 +14,8 @@ > > /** > * @author Eike Stepper >+ * @noextend This interface is not intended to be extended by clients. >+ * @noinstantiate This class is not intended to be instantiated by clients. > */ > public class ReadOnlyException extends CDOException > { >Index: src/org/eclipse/emf/cdo/transaction/CDOUserTransaction.java >=================================================================== >--- src/org/eclipse/emf/cdo/transaction/CDOUserTransaction.java (revision 7692) >+++ src/org/eclipse/emf/cdo/transaction/CDOUserTransaction.java (working copy) >@@ -21,6 +21,8 @@ > * > * @author Simon McDuff > * @since 2.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDOUserTransaction > { >Index: src/org/eclipse/emf/cdo/session/CDOSessionConfiguration.java >=================================================================== >--- src/org/eclipse/emf/cdo/session/CDOSessionConfiguration.java (revision 7692) >+++ src/org/eclipse/emf/cdo/session/CDOSessionConfiguration.java (working copy) >@@ -16,6 +16,8 @@ > /** > * @author Eike Stepper > * @since 2.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDOSessionConfiguration > { >Index: src/org/eclipse/emf/cdo/view/CDOViewAdaptersNotifiedEvent.java >=================================================================== >--- src/org/eclipse/emf/cdo/view/CDOViewAdaptersNotifiedEvent.java (revision 7692) >+++ src/org/eclipse/emf/cdo/view/CDOViewAdaptersNotifiedEvent.java (working copy) >@@ -13,6 +13,8 @@ > /** > * @author Eike Stepper > * @since 3.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDOViewAdaptersNotifiedEvent extends CDOViewEvent > { >Index: src/org/eclipse/emf/cdo/session/remote/CDORemoteSessionEvent.java >=================================================================== >--- src/org/eclipse/emf/cdo/session/remote/CDORemoteSessionEvent.java (revision 7692) >+++ src/org/eclipse/emf/cdo/session/remote/CDORemoteSessionEvent.java (working copy) >@@ -15,6 +15,8 @@ > /** > * @author Eike Stepper > * @since 2.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDORemoteSessionEvent extends IEvent > { >@@ -27,6 +29,8 @@ > > /** > * @author Eike Stepper >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface SubscriptionChanged extends CDORemoteSessionEvent > { >@@ -36,6 +40,8 @@ > /** > * @author Eike Stepper > * @since 3.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface MessageReceived extends CDORemoteSessionEvent > { >Index: src/org/eclipse/emf/cdo/CDODeltaNotification.java >=================================================================== >--- src/org/eclipse/emf/cdo/CDODeltaNotification.java (revision 7692) >+++ src/org/eclipse/emf/cdo/CDODeltaNotification.java (working copy) >@@ -27,7 +27,8 @@ > * </ul> > * > * @since 2.0 >- * @author Simon McDuff >+ * @author Simon McDuff * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDODeltaNotification extends CDONotification > { >Index: src/org/eclipse/emf/cdo/eresource/CDOResourceFactory.java >=================================================================== >--- src/org/eclipse/emf/cdo/eresource/CDOResourceFactory.java (revision 7692) >+++ src/org/eclipse/emf/cdo/eresource/CDOResourceFactory.java (working copy) >@@ -17,6 +17,8 @@ > > /** > * @author Eike Stepper >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDOResourceFactory extends Resource.Factory > { >Index: src/org/eclipse/emf/cdo/CDOInvalidationNotification.java >=================================================================== >--- src/org/eclipse/emf/cdo/CDOInvalidationNotification.java (revision 7692) >+++ src/org/eclipse/emf/cdo/CDOInvalidationNotification.java (working copy) >@@ -30,6 +30,7 @@ > * @author Simon McDuff > * @see CDOSessionInvalidationEvent > * @see CDOAdapterPolicy >+ * @noextend This interface is not intended to be extended by clients. > * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDOInvalidationNotification extends CDONotification >Index: src/org/eclipse/emf/cdo/view/CDOStaleObject.java >=================================================================== >--- src/org/eclipse/emf/cdo/view/CDOStaleObject.java (revision 7692) >+++ src/org/eclipse/emf/cdo/view/CDOStaleObject.java (working copy) >@@ -15,6 +15,8 @@ > * > * @author Simon McDuff > * @since 3.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDOStaleObject > { >#P org.eclipse.emf.cdo.dawn >Index: .settings/.api_filters >=================================================================== >--- .settings/.api_filters (revision 7670) >+++ .settings/.api_filters (working copy) >@@ -8,4 +8,36 @@ > </message_arguments> > </filter> > </resource> >+ <resource path="src/org/eclipse/emf/cdo/dawn/resources/DawnResourceFactory.java" type="org.eclipse.emf.cdo.dawn.resources.DawnResourceFactory"> >+ <filter id="571473929"> >+ <message_arguments> >+ <message_argument value="CDOResourceFactory"/> >+ <message_argument value="DawnResourceFactory"/> >+ </message_arguments> >+ </filter> >+ </resource> >+ <resource path="src/org/eclipse/emf/cdo/dawn/resources/DawnWrapperResource.java" type="org.eclipse.emf.cdo.dawn.resources.DawnWrapperResource"> >+ <filter id="571473929"> >+ <message_arguments> >+ <message_argument value="CDOResource"/> >+ <message_argument value="DawnWrapperResource"/> >+ </message_arguments> >+ </filter> >+ </resource> >+ <resource path="src/org/eclipse/emf/cdo/dawn/resources/impl/DawnResourceFactoryImpl.java" type="org.eclipse.emf.cdo.dawn.resources.impl.DawnResourceFactoryImpl"> >+ <filter id="571473929"> >+ <message_arguments> >+ <message_argument value="CDOResourceFactoryImpl"/> >+ <message_argument value="DawnResourceFactoryImpl"/> >+ </message_arguments> >+ </filter> >+ </resource> >+ <resource path="src/org/eclipse/emf/cdo/dawn/resources/impl/DawnWrapperResourceImpl.java" type="org.eclipse.emf.cdo.dawn.resources.impl.DawnWrapperResourceImpl"> >+ <filter id="571473929"> >+ <message_arguments> >+ <message_argument value="CDOResourceImpl"/> >+ <message_argument value="DawnWrapperResourceImpl"/> >+ </message_arguments> >+ </filter> >+ </resource> > </component> >#P org.eclipse.emf.cdo.server.db >Index: src/org/eclipse/emf/cdo/server/db/IObjectTypeMapper.java >=================================================================== >--- src/org/eclipse/emf/cdo/server/db/IObjectTypeMapper.java (revision 7585) >+++ src/org/eclipse/emf/cdo/server/db/IObjectTypeMapper.java (working copy) >@@ -1,51 +0,0 @@ >-/** >- * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, 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 >- * http://www.eclipse.org/legal/epl-v10.html >- * >- * Contributors: >- * Eike Stepper - initial API and implementation >- * Stefan Winkler - 271444: [DB] Multiple refactorings bug 271444 >- */ >-package org.eclipse.emf.cdo.server.db; >- >-import org.eclipse.emf.cdo.common.id.CDOID; >-import org.eclipse.emf.cdo.common.model.CDOClassifierRef; >-import org.eclipse.emf.cdo.common.protocol.CDODataInput; >-import org.eclipse.emf.cdo.common.protocol.CDODataOutput; >- >-import org.eclipse.net4j.util.om.monitor.OMMonitor; >- >-import org.eclipse.emf.ecore.EClass; >- >-import java.io.IOException; >-import java.sql.Connection; >- >-/** >- * @author Eike Stepper >- * @since 4.0 >- */ >-public interface IObjectTypeMapper >-{ >- public CDOClassifierRef getObjectType(IDBStoreAccessor accessor, CDOID id); >- >- public void putObjectType(IDBStoreAccessor accessor, long timeStamp, CDOID id, EClass type); >- >- public void removeObjectType(IDBStoreAccessor accessor, CDOID id); >- >- /** >- * Return the maximum object id managed by this cache. >- * >- * @param connection >- * the DB connection to use. >- * @return the maximum object ID. >- */ >- public CDOID getMaxID(Connection connection, IIDHandler idHandler); >- >- public void rawExport(Connection connection, CDODataOutput out, long fromCommitTime, long toCommitTime) >- throws IOException; >- >- public void rawImport(Connection connection, CDODataInput in, OMMonitor monitor) throws IOException; >-} >Index: src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AbstractObjectTypeMapper.java >=================================================================== >--- src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AbstractObjectTypeMapper.java (revision 7585) >+++ src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AbstractObjectTypeMapper.java (working copy) >@@ -14,8 +14,8 @@ > package org.eclipse.emf.cdo.server.internal.db.mapping.horizontal; > > import org.eclipse.emf.cdo.server.db.IMetaDataManager; >-import org.eclipse.emf.cdo.server.db.IObjectTypeMapper; > import org.eclipse.emf.cdo.server.db.mapping.IMappingStrategy; >+import org.eclipse.emf.cdo.server.internal.db.IObjectTypeMapper; > > import org.eclipse.net4j.util.lifecycle.Lifecycle; > >Index: src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/DelegatingObjectTypeMapper.java >=================================================================== >--- src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/DelegatingObjectTypeMapper.java (revision 7611) >+++ src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/DelegatingObjectTypeMapper.java (working copy) >@@ -16,7 +16,7 @@ > import org.eclipse.emf.cdo.common.protocol.CDODataOutput; > import org.eclipse.emf.cdo.server.db.IDBStoreAccessor; > import org.eclipse.emf.cdo.server.db.IIDHandler; >-import org.eclipse.emf.cdo.server.db.IObjectTypeMapper; >+import org.eclipse.emf.cdo.server.internal.db.IObjectTypeMapper; > > import org.eclipse.net4j.util.lifecycle.LifecycleUtil; > import org.eclipse.net4j.util.om.monitor.OMMonitor; >Index: src/org/eclipse/emf/cdo/server/db/IDBStoreAccessor.java >=================================================================== >--- src/org/eclipse/emf/cdo/server/db/IDBStoreAccessor.java (revision 7585) >+++ src/org/eclipse/emf/cdo/server/db/IDBStoreAccessor.java (working copy) >@@ -16,6 +16,8 @@ > > /** > * @author Eike Stepper >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface IDBStoreAccessor extends IStoreAccessor.Raw > { >Index: src/org/eclipse/emf/cdo/server/db/IIDHandler.java >=================================================================== >--- src/org/eclipse/emf/cdo/server/db/IIDHandler.java (revision 7585) >+++ src/org/eclipse/emf/cdo/server/db/IIDHandler.java (working copy) >@@ -31,6 +31,8 @@ > /** > * @author Eike Stepper > * @since 4.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface IIDHandler extends Comparator<CDOID> > { >Index: src/org/eclipse/emf/cdo/server/db/IPreparedStatementCache.java >=================================================================== >--- src/org/eclipse/emf/cdo/server/db/IPreparedStatementCache.java (revision 7585) >+++ src/org/eclipse/emf/cdo/server/db/IPreparedStatementCache.java (working copy) >@@ -17,6 +17,8 @@ > /** > * @author Stefan Winkler > * @since 2.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface IPreparedStatementCache > { >@@ -39,6 +41,7 @@ > * > * @author Stefan Winkler > * @since 2.0 >+ * @noextend This interface is not intended to be extended by clients. > */ > public static enum ReuseProbability > { >Index: src/org/eclipse/emf/cdo/server/internal/db/IObjectTypeMapper.java >=================================================================== >--- src/org/eclipse/emf/cdo/server/internal/db/IObjectTypeMapper.java (revision 7585) >+++ src/org/eclipse/emf/cdo/server/internal/db/IObjectTypeMapper.java (working copy) >@@ -9,12 +9,14 @@ > * Eike Stepper - initial API and implementation > * Stefan Winkler - 271444: [DB] Multiple refactorings bug 271444 > */ >-package org.eclipse.emf.cdo.server.db; >+package org.eclipse.emf.cdo.server.internal.db; > > import org.eclipse.emf.cdo.common.id.CDOID; > import org.eclipse.emf.cdo.common.model.CDOClassifierRef; > import org.eclipse.emf.cdo.common.protocol.CDODataInput; > import org.eclipse.emf.cdo.common.protocol.CDODataOutput; >+import org.eclipse.emf.cdo.server.db.IDBStoreAccessor; >+import org.eclipse.emf.cdo.server.db.IIDHandler; > > import org.eclipse.net4j.util.om.monitor.OMMonitor; > >Index: src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AbstractHorizontalMappingStrategy.java >=================================================================== >--- src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AbstractHorizontalMappingStrategy.java (revision 7585) >+++ src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AbstractHorizontalMappingStrategy.java (working copy) >@@ -22,10 +22,10 @@ > import org.eclipse.emf.cdo.server.IStoreAccessor.QueryXRefsContext; > import org.eclipse.emf.cdo.server.db.IDBStoreAccessor; > import org.eclipse.emf.cdo.server.db.IIDHandler; >-import org.eclipse.emf.cdo.server.db.IObjectTypeMapper; > import org.eclipse.emf.cdo.server.db.mapping.IClassMapping; > import org.eclipse.emf.cdo.server.db.mapping.IListMapping; > import org.eclipse.emf.cdo.server.internal.db.CDODBSchema; >+import org.eclipse.emf.cdo.server.internal.db.IObjectTypeMapper; > import org.eclipse.emf.cdo.server.internal.db.bundle.OM; > import org.eclipse.emf.cdo.server.internal.db.mapping.AbstractMappingStrategy; > >Index: src/org/eclipse/emf/cdo/server/db/IDBStoreChunkReader.java >=================================================================== >--- src/org/eclipse/emf/cdo/server/db/IDBStoreChunkReader.java (revision 7585) >+++ src/org/eclipse/emf/cdo/server/db/IDBStoreChunkReader.java (working copy) >@@ -14,6 +14,8 @@ > > /** > * @author Eike Stepper >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface IDBStoreChunkReader extends IStoreChunkReader > { >Index: src/org/eclipse/emf/cdo/server/db/IDBStore.java >=================================================================== >--- src/org/eclipse/emf/cdo/server/db/IDBStore.java (revision 7585) >+++ src/org/eclipse/emf/cdo/server/db/IDBStore.java (working copy) >@@ -23,6 +23,8 @@ > > /** > * @author Eike Stepper >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface IDBStore extends IStore, IDBConnectionProvider > { >Index: src/org/eclipse/emf/cdo/server/db/IMetaDataManager.java >=================================================================== >--- src/org/eclipse/emf/cdo/server/db/IMetaDataManager.java (revision 7585) >+++ src/org/eclipse/emf/cdo/server/db/IMetaDataManager.java (working copy) >@@ -30,6 +30,8 @@ > /** > * @author Eike Stepper > * @since 2.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface IMetaDataManager > { >Index: src/org/eclipse/emf/cdo/server/internal/db/MetaDataManager.java >=================================================================== >--- src/org/eclipse/emf/cdo/server/internal/db/MetaDataManager.java (revision 7585) >+++ src/org/eclipse/emf/cdo/server/internal/db/MetaDataManager.java (working copy) >@@ -15,6 +15,7 @@ > > import org.eclipse.emf.cdo.common.branch.CDOBranchPoint; > import org.eclipse.emf.cdo.common.id.CDOID; >+import org.eclipse.emf.cdo.common.model.CDOModelConstants; > import org.eclipse.emf.cdo.common.model.CDOModelUtil; > import org.eclipse.emf.cdo.common.model.CDOPackageUnit; > import org.eclipse.emf.cdo.common.model.EMFUtil; >@@ -146,9 +147,9 @@ > throws IOException > { > // Export package units >- String where = " WHERE p_u." + CDODBSchema.PACKAGE_UNITS_ID + "<>'" + CDOModelUtil.CORE_PACKAGE_URI + // >- "' AND p_u." + CDODBSchema.PACKAGE_UNITS_ID + "<>'" + CDOModelUtil.RESOURCE_PACKAGE_URI + // >- "' AND p_u." + CDODBSchema.PACKAGE_UNITS_ID + "<>'" + CDOModelUtil.TYPES_PACKAGE_URI + // >+ String where = " WHERE p_u." + CDODBSchema.PACKAGE_UNITS_ID + "<>'" + CDOModelConstants.CORE_PACKAGE_URI + // >+ "' AND p_u." + CDODBSchema.PACKAGE_UNITS_ID + "<>'" + CDOModelConstants.RESOURCE_PACKAGE_URI + // >+ "' AND p_u." + CDODBSchema.PACKAGE_UNITS_ID + "<>'" + CDOModelConstants.TYPES_PACKAGE_URI + // > "' AND p_u." + CDODBSchema.PACKAGE_UNITS_TIME_STAMP + " BETWEEN " + fromCommitTime + " AND " + toCommitTime; > DBUtil.serializeTable(out, connection, CDODBSchema.PACKAGE_UNITS, "p_u", where); > >@@ -362,9 +363,9 @@ > String where = null; > if (fromCommitTime != CDOBranchPoint.UNSPECIFIED_DATE) > { >- where = CDODBSchema.PACKAGE_UNITS_ID + "<>'" + CDOModelUtil.CORE_PACKAGE_URI + "' AND " >- + CDODBSchema.PACKAGE_UNITS_ID + "<>'" + CDOModelUtil.RESOURCE_PACKAGE_URI + "' AND " >- + CDODBSchema.PACKAGE_UNITS_ID + "<>'" + CDOModelUtil.TYPES_PACKAGE_URI + "' AND " >+ where = CDODBSchema.PACKAGE_UNITS_ID + "<>'" + CDOModelConstants.CORE_PACKAGE_URI + "' AND " >+ + CDODBSchema.PACKAGE_UNITS_ID + "<>'" + CDOModelConstants.RESOURCE_PACKAGE_URI + "' AND " >+ + CDODBSchema.PACKAGE_UNITS_ID + "<>'" + CDOModelConstants.TYPES_PACKAGE_URI + "' AND " > + CDODBSchema.PACKAGE_UNITS_TIME_STAMP + " BETWEEN " + fromCommitTime + " AND " + toCommitTime; > } > >#P org.eclipse.net4j.http.common >Index: src/org/eclipse/net4j/http/common/IHTTPConnector.java >=================================================================== >--- src/org/eclipse/net4j/http/common/IHTTPConnector.java (revision 6877) >+++ src/org/eclipse/net4j/http/common/IHTTPConnector.java (working copy) >@@ -14,6 +14,7 @@ > > /** > * @author Eike Stepper >+ * @noextend This interface is not intended to be extended by clients. > * @noimplement This interface is not intended to be implemented by clients. > */ > public interface IHTTPConnector extends IConnector >#P org.eclipse.emf.cdo.server.hibernate >Index: src/org/eclipse/emf/cdo/server/hibernate/IHibernateStore.java >=================================================================== >--- src/org/eclipse/emf/cdo/server/hibernate/IHibernateStore.java (revision 7729) >+++ src/org/eclipse/emf/cdo/server/hibernate/IHibernateStore.java (working copy) >@@ -21,6 +21,8 @@ > /** > * @author Eike Stepper > * @since 4.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface IHibernateStore extends IStore, IDBConnectionProvider > { >Index: src/org/eclipse/emf/cdo/server/hibernate/IHibernateStoreChunkReader.java >=================================================================== >--- src/org/eclipse/emf/cdo/server/hibernate/IHibernateStoreChunkReader.java (revision 7729) >+++ src/org/eclipse/emf/cdo/server/hibernate/IHibernateStoreChunkReader.java (working copy) >@@ -14,6 +14,8 @@ > > /** > * @author Eike Stepper >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface IHibernateStoreChunkReader extends IStoreChunkReader > { >Index: .settings/.api_filters >=================================================================== >--- .settings/.api_filters (revision 0) >+++ .settings/.api_filters (revision 0) >@@ -0,0 +1,12 @@ >+<?xml version="1.0" encoding="UTF-8" standalone="no"?> >+<component id="org.eclipse.emf.cdo.server.hibernate" version="2"> >+ <resource path="src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/WrappedHibernateList.java" type="org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.WrappedHibernateList"> >+ <filter id="574660632"> >+ <message_arguments> >+ <message_argument value="InternalCDOList"/> >+ <message_argument value="CDOList"/> >+ <message_argument value="WrappedHibernateList"/> >+ </message_arguments> >+ </filter> >+ </resource> >+</component> >Index: src/org/eclipse/emf/cdo/server/hibernate/IHibernateStoreAccessor.java >=================================================================== >--- src/org/eclipse/emf/cdo/server/hibernate/IHibernateStoreAccessor.java (revision 7729) >+++ src/org/eclipse/emf/cdo/server/hibernate/IHibernateStoreAccessor.java (working copy) >@@ -19,6 +19,8 @@ > > /** > * @author Eike Stepper >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface IHibernateStoreAccessor extends IStoreAccessor > { >Index: src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/WrappedHibernateList.java >=================================================================== >--- src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/WrappedHibernateList.java (revision 7729) >+++ src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/WrappedHibernateList.java (working copy) >@@ -15,9 +15,9 @@ > import org.eclipse.emf.cdo.common.model.CDOModelUtil; > import org.eclipse.emf.cdo.common.model.CDOType; > import org.eclipse.emf.cdo.common.revision.CDOListFactory; >-import org.eclipse.emf.cdo.common.revision.CDOReferenceAdjuster; > import org.eclipse.emf.cdo.common.revision.CDORevision; > import org.eclipse.emf.cdo.server.internal.hibernate.HibernateUtil; >+import org.eclipse.emf.cdo.spi.common.revision.CDOReferenceAdjuster; > import org.eclipse.emf.cdo.spi.common.revision.InternalCDOList; > > import org.eclipse.emf.ecore.EClassifier; >#P org.eclipse.emf.cdo.net4j >Index: src/org/eclipse/emf/cdo/net4j/CDOSession.java >=================================================================== >--- src/org/eclipse/emf/cdo/net4j/CDOSession.java (revision 7692) >+++ src/org/eclipse/emf/cdo/net4j/CDOSession.java (working copy) >@@ -19,6 +19,7 @@ > /** > * @since 2.0 > * @author Eike Stepper >+ * @noextend This interface is not intended to be extended by clients. > * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDOSession extends org.eclipse.emf.cdo.session.CDOSession >Index: .settings/.api_filters >=================================================================== >--- .settings/.api_filters (revision 7692) >+++ .settings/.api_filters (working copy) >@@ -1,5 +1,30 @@ > <?xml version="1.0" encoding="UTF-8" standalone="no"?> > <component id="org.eclipse.emf.cdo.net4j" version="2"> >+ <resource path="src/org/eclipse/emf/cdo/internal/net4j/CDONet4jSessionConfigurationImpl.java" type="org.eclipse.emf.cdo.internal.net4j.CDONet4jSessionConfigurationImpl$RepositoryInfo"> >+ <filter id="574619656"> >+ <message_arguments> >+ <message_argument value="CDORepositoryInfo"/> >+ <message_argument value="RepositoryInfo"/> >+ </message_arguments> >+ </filter> >+ </resource> >+ <resource path="src/org/eclipse/emf/cdo/internal/net4j/CDOSessionRecoveryEventImpl.java" type="org.eclipse.emf.cdo.internal.net4j.CDOSessionRecoveryEventImpl"> >+ <filter id="574660632"> >+ <message_arguments> >+ <message_argument value="CDOSessionRecoveryEvent"/> >+ <message_argument value="CDOSessionEvent"/> >+ <message_argument value="CDOSessionRecoveryEventImpl"/> >+ </message_arguments> >+ </filter> >+ </resource> >+ <resource path="src/org/eclipse/emf/cdo/internal/net4j/protocol/CDOClientProtocol.java" type="org.eclipse.emf.cdo.internal.net4j.protocol.CDOClientProtocol"> >+ <filter id="574619656"> >+ <message_arguments> >+ <message_argument value="CDOSessionProtocol"/> >+ <message_argument value="CDOClientProtocol"/> >+ </message_arguments> >+ </filter> >+ </resource> > <resource path="src/org/eclipse/emf/cdo/internal/net4j/protocol/OpenSessionRequest.java" type="org.eclipse.emf.cdo.internal.net4j.protocol.OpenSessionRequest"> > <filter id="572522506"> > <message_arguments> >@@ -8,4 +33,28 @@ > </message_arguments> > </filter> > </resource> >+ <resource path="src/org/eclipse/emf/cdo/net4j/CDOSession.java" type="org.eclipse.emf.cdo.net4j.CDOSession"> >+ <filter id="571473929"> >+ <message_arguments> >+ <message_argument value="CDOSession"/> >+ <message_argument value="CDOSession"/> >+ </message_arguments> >+ </filter> >+ </resource> >+ <resource path="src/org/eclipse/emf/cdo/net4j/CDOSessionConfiguration.java" type="org.eclipse.emf.cdo.net4j.CDOSessionConfiguration"> >+ <filter id="571473929"> >+ <message_arguments> >+ <message_argument value="CDOSessionConfiguration"/> >+ <message_argument value="CDOSessionConfiguration"/> >+ </message_arguments> >+ </filter> >+ </resource> >+ <resource path="src/org/eclipse/emf/cdo/net4j/CDOSessionRecoveryEvent.java" type="org.eclipse.emf.cdo.net4j.CDOSessionRecoveryEvent"> >+ <filter id="571473929"> >+ <message_arguments> >+ <message_argument value="CDOSessionEvent"/> >+ <message_argument value="CDOSessionRecoveryEvent"/> >+ </message_arguments> >+ </filter> >+ </resource> > </component> >Index: src/org/eclipse/emf/cdo/internal/net4j/protocol/AuthenticationIndication.java >=================================================================== >--- src/org/eclipse/emf/cdo/internal/net4j/protocol/AuthenticationIndication.java (revision 7723) >+++ src/org/eclipse/emf/cdo/internal/net4j/protocol/AuthenticationIndication.java (working copy) >@@ -10,9 +10,9 @@ > */ > package org.eclipse.emf.cdo.internal.net4j.protocol; > >-import org.eclipse.emf.cdo.common.protocol.CDOAuthenticationResult; > import org.eclipse.emf.cdo.common.protocol.CDOAuthenticator; > import org.eclipse.emf.cdo.common.protocol.CDOProtocolConstants; >+import org.eclipse.emf.cdo.spi.common.CDOAuthenticationResult; > > import org.eclipse.net4j.signal.IndicationWithMonitoring; > import org.eclipse.net4j.signal.SignalProtocol; >Index: src/org/eclipse/emf/cdo/net4j/CDOSessionRecoveryEvent.java >=================================================================== >--- src/org/eclipse/emf/cdo/net4j/CDOSessionRecoveryEvent.java (revision 7692) >+++ src/org/eclipse/emf/cdo/net4j/CDOSessionRecoveryEvent.java (working copy) >@@ -16,6 +16,8 @@ > /** > * @author Eike Stepper > * @since 4.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDOSessionRecoveryEvent extends CDOSessionEvent > { >@@ -23,6 +25,7 @@ > > /** > * @author Eike Stepper >+ * @noextend This interface is not intended to be extended by clients. > */ > public enum Type > { >Index: src/org/eclipse/emf/cdo/net4j/ReconnectingCDOSessionConfiguration.java >=================================================================== >--- src/org/eclipse/emf/cdo/net4j/ReconnectingCDOSessionConfiguration.java (revision 7692) >+++ src/org/eclipse/emf/cdo/net4j/ReconnectingCDOSessionConfiguration.java (working copy) >@@ -13,6 +13,8 @@ > /** > * @author Caspar De Groot > * @since 4.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface ReconnectingCDOSessionConfiguration extends RecoveringCDOSessionConfiguration > { >Index: src/org/eclipse/emf/cdo/net4j/RecoveringCDOSessionConfiguration.java >=================================================================== >--- src/org/eclipse/emf/cdo/net4j/RecoveringCDOSessionConfiguration.java (revision 7692) >+++ src/org/eclipse/emf/cdo/net4j/RecoveringCDOSessionConfiguration.java (working copy) >@@ -13,6 +13,8 @@ > /** > * @author Caspar De Groot > * @since 4.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface RecoveringCDOSessionConfiguration extends CDOSessionConfiguration > { >Index: src/org/eclipse/emf/cdo/net4j/CDOSessionConfiguration.java >=================================================================== >--- src/org/eclipse/emf/cdo/net4j/CDOSessionConfiguration.java (revision 7692) >+++ src/org/eclipse/emf/cdo/net4j/CDOSessionConfiguration.java (working copy) >@@ -19,8 +19,9 @@ > > /** > * @author Eike Stepper >- * @noimplement This interface is not intended to be implemented by clients. > * @since 3.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface CDOSessionConfiguration extends org.eclipse.emf.cdo.session.CDOSessionConfiguration > { >Index: src/org/eclipse/emf/cdo/net4j/FailoverCDOSessionConfiguration.java >=================================================================== >--- src/org/eclipse/emf/cdo/net4j/FailoverCDOSessionConfiguration.java (revision 7692) >+++ src/org/eclipse/emf/cdo/net4j/FailoverCDOSessionConfiguration.java (working copy) >@@ -13,6 +13,8 @@ > /** > * @author Eike Stepper > * @since 4.0 >+ * @noextend This interface is not intended to be extended by clients. >+ * @noimplement This interface is not intended to be implemented by clients. > */ > public interface FailoverCDOSessionConfiguration extends RecoveringCDOSessionConfiguration > {
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 345905
: 195711