Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon McDuff2009-01-13 12:14:21 +0000
committerSimon McDuff2009-01-13 12:14:21 +0000
commit746f174e659db16c38503b98a262e84472da0adb (patch)
tree779f9d085cfc09d362855bf3c5956df3cae9337f /plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo
parentb91f6349da149235d401939294f478a8b66825a5 (diff)
downloadcdo-746f174e659db16c38503b98a262e84472da0adb.tar.gz
cdo-746f174e659db16c38503b98a262e84472da0adb.tar.xz
cdo-746f174e659db16c38503b98a262e84472da0adb.zip
added since tags
Diffstat (limited to 'plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo')
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOObject.java2
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourceFactoryImpl.java4
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourcePackageImpl.java34
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/util/EresourceSwitch.java10
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/validation/CDOResourceFolderValidator.java2
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/validation/CDOResourceNodeValidator.java2
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/validation/CDOResourceValidator.java2
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/net4j/CDOSessionConfiguration.java1
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOPackageRegistry.java4
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOPackageType.java1
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOPackageTypeRegistry.java1
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDORevisionManager.java2
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSession.java18
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionConfiguration.java7
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionEvent.java1
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionInvalidationEvent.java3
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionPackageManager.java3
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionProvider.java1
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/remote/CDORemoteSession.java1
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/remote/CDORemoteSessionManager.java1
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransaction.java18
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransactionConflictEvent.java1
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransactionFinishedEvent.java1
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransactionHandler.java11
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransactionStartedEvent.java1
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOEvent.java1
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOUtil.java9
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/EMFUtil.java12
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOAudit.java3
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOView.java33
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewEvent.java1
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewResourcesEvent.java1
32 files changed, 84 insertions, 108 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOObject.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOObject.java
index b7bd75a117..59452e7cb9 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOObject.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOObject.java
@@ -81,6 +81,8 @@ public interface CDOObject extends EObject
/**
* Returns the {@link CDOView view} this object is associated with, or <code>null</code> if this object is not
* associated with a view. This view manages all aspects of this object and cahces it as long as required.
+ *
+ * @since 2.0
*/
public CDOView cdoView();
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourceFactoryImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourceFactoryImpl.java
index cd58d0d1be..23738ff774 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourceFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourceFactoryImpl.java
@@ -74,9 +74,9 @@ public class EresourceFactoryImpl extends EFactoryImpl implements EresourceFacto
switch (eClass.getClassifierID())
{
case EresourcePackage.CDO_RESOURCE_FOLDER:
- return (EObject)createCDOResourceFolder();
+ return createCDOResourceFolder();
case EresourcePackage.CDO_RESOURCE:
- return (EObject)createCDOResource();
+ return createCDOResource();
default:
throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourcePackageImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourcePackageImpl.java
index 7106a1ecb8..f9f0673191 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourcePackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourcePackageImpl.java
@@ -121,7 +121,9 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
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.getEPackage(eNS_URI) instanceof EresourcePackageImpl ? EPackage.Registry.INSTANCE
@@ -367,7 +369,9 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
public void createPackageContents()
{
if (isCreated)
+ {
return;
+ }
isCreated = true;
// Create classes and their features
@@ -412,7 +416,9 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
public void initializePackageContents()
{
if (isInitialized)
+ {
return;
+ }
isInitialized = true;
// Initialize package
@@ -428,15 +434,15 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
// 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);
- initEReference(getCDOResourceNode_Folder(), this.getCDOResourceFolder(), this.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);
+ initEReference(getCDOResourceNode_Folder(), 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);
initEAttribute(getCDOResourceNode_Name(), ecorePackage.getEString(), "name", null, 0, 1, CDOResourceNode.class,
!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getCDOResourceNode_Path(), ecorePackage.getEString(), "path", null, 0, 1, CDOResourceNode.class,
@@ -444,16 +450,16 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
initEClass(cdoResourceFolderEClass, CDOResourceFolder.class, "CDOResourceFolder", !IS_ABSTRACT, !IS_INTERFACE,
IS_GENERATED_INSTANCE_CLASS);
- initEReference(getCDOResourceFolder_Nodes(), this.getCDOResourceNode(), this.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);
+ initEReference(getCDOResourceFolder_Nodes(), 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);
initEClass(cdoResourceEClass, CDOResource.class, "CDOResource", !IS_ABSTRACT, !IS_INTERFACE,
IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getCDOResource_ResourceSet(), this.getResourceSet(), "resourceSet", null, 0, 1, CDOResource.class,
+ initEAttribute(getCDOResource_ResourceSet(), getResourceSet(), "resourceSet", null, 0, 1, CDOResource.class,
IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getCDOResource_URI(), this.getURI(), "uRI", null, 0, 1, CDOResource.class, IS_TRANSIENT,
- IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
+ initEAttribute(getCDOResource_URI(), getURI(), "uRI", null, 0, 1, CDOResource.class, IS_TRANSIENT, IS_VOLATILE,
+ IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
initEReference(getCDOResource_Contents(), theEcorePackage.getEObject(), null, "contents", null, 0, -1,
CDOResource.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -464,9 +470,9 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
initEAttribute(getCDOResource_TrackingModification(), ecorePackage.getEBoolean(), "trackingModification", null, 0,
1, CDOResource.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
!IS_DERIVED, IS_ORDERED);
- initEAttribute(getCDOResource_Errors(), this.getDiagnostic(), "errors", null, 0, -1, CDOResource.class,
- IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
- initEAttribute(getCDOResource_Warnings(), this.getDiagnostic(), "warnings", null, 0, -1, CDOResource.class,
+ initEAttribute(getCDOResource_Errors(), getDiagnostic(), "errors", null, 0, -1, CDOResource.class, IS_TRANSIENT,
+ IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
+ initEAttribute(getCDOResource_Warnings(), getDiagnostic(), "warnings", null, 0, -1, CDOResource.class,
IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
initEAttribute(getCDOResource_TimeStamp(), theEcorePackage.getELong(), "timeStamp", null, 0, 1, CDOResource.class,
IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/util/EresourceSwitch.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/util/EresourceSwitch.java
index 83cddba2b0..9bcd26876f 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/util/EresourceSwitch.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/util/EresourceSwitch.java
@@ -99,7 +99,9 @@ public class EresourceSwitch<T>
CDOResourceNode cdoResourceNode = (CDOResourceNode)theEObject;
T result = caseCDOResourceNode(cdoResourceNode);
if (result == null)
+ {
result = defaultCase(theEObject);
+ }
return result;
}
case EresourcePackage.CDO_RESOURCE_FOLDER:
@@ -107,9 +109,13 @@ public class EresourceSwitch<T>
CDOResourceFolder cdoResourceFolder = (CDOResourceFolder)theEObject;
T result = caseCDOResourceFolder(cdoResourceFolder);
if (result == null)
+ {
result = caseCDOResourceNode(cdoResourceFolder);
+ }
if (result == null)
+ {
result = defaultCase(theEObject);
+ }
return result;
}
case EresourcePackage.CDO_RESOURCE:
@@ -117,9 +123,13 @@ public class EresourceSwitch<T>
CDOResource cdoResource = (CDOResource)theEObject;
T result = caseCDOResource(cdoResource);
if (result == null)
+ {
result = caseCDOResourceNode(cdoResource);
+ }
if (result == null)
+ {
result = defaultCase(theEObject);
+ }
return result;
}
default:
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/validation/CDOResourceFolderValidator.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/validation/CDOResourceFolderValidator.java
index f4edafc46b..15c3799119 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/validation/CDOResourceFolderValidator.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/validation/CDOResourceFolderValidator.java
@@ -19,6 +19,8 @@ import org.eclipse.emf.common.util.EList;
* anything, and it's not a real EMF artifact. It was generated by the org.eclipse.emf.examples.generator.validator
* plug-in to illustrate how EMF's code generator can be extended. This can be disabled with -vmargs
* -Dorg.eclipse.emf.examples.generator.validator=false.
+ *
+ * @since 2.0
*/
public interface CDOResourceFolderValidator
{
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/validation/CDOResourceNodeValidator.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/validation/CDOResourceNodeValidator.java
index a620d05e96..22244b2d11 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/validation/CDOResourceNodeValidator.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/validation/CDOResourceNodeValidator.java
@@ -17,6 +17,8 @@ import org.eclipse.emf.cdo.eresource.CDOResourceFolder;
* anything, and it's not a real EMF artifact. It was generated by the org.eclipse.emf.examples.generator.validator
* plug-in to illustrate how EMF's code generator can be extended. This can be disabled with -vmargs
* -Dorg.eclipse.emf.examples.generator.validator=false.
+ *
+ * @since 2.0
*/
public interface CDOResourceNodeValidator
{
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/validation/CDOResourceValidator.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/validation/CDOResourceValidator.java
index f19b7676ed..b9f0f54ec5 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/validation/CDOResourceValidator.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/validation/CDOResourceValidator.java
@@ -21,6 +21,8 @@ import org.eclipse.emf.ecore.resource.Resource.Diagnostic;
* and it's not a real EMF artifact. It was generated by the org.eclipse.emf.examples.generator.validator plug-in to
* illustrate how EMF's code generator can be extended. This can be disabled with -vmargs
* -Dorg.eclipse.emf.examples.generator.validator=false.
+ *
+ * @since 2.0
*/
public interface CDOResourceValidator
{
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/net4j/CDOSessionConfiguration.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/net4j/CDOSessionConfiguration.java
index 816aa7d970..94a6e68ee2 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/net4j/CDOSessionConfiguration.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/net4j/CDOSessionConfiguration.java
@@ -17,6 +17,7 @@ import org.eclipse.net4j.signal.failover.IFailOverStrategy;
/**
* @author Eike Stepper
* @noimplement This interface is not intended to be implemented by clients.
+ * @since 2.0
*/
public interface CDOSessionConfiguration extends org.eclipse.emf.cdo.session.CDOSessionConfiguration
{
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOPackageRegistry.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOPackageRegistry.java
index bab0af9906..ed65a896d9 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOPackageRegistry.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOPackageRegistry.java
@@ -16,6 +16,7 @@ import org.eclipse.emf.ecore.EPackage;
/**
* @author Eike Stepper
+ * @since 2.0
*/
public interface CDOPackageRegistry extends EPackage.Registry
{
@@ -32,9 +33,6 @@ public interface CDOPackageRegistry extends EPackage.Registry
public void putPackageDescriptor(CDOPackage proxy);
- /**
- * @since 2.0
- */
public CDOSession getSession();
public void setSession(CDOSession session);
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOPackageType.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOPackageType.java
index e4feb50074..ad0d58da8e 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOPackageType.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOPackageType.java
@@ -15,6 +15,7 @@ import org.eclipse.emf.internal.cdo.CDOStateMachine;
/**
* @author Eike Stepper
+ * @since 2.0
*/
public enum CDOPackageType
{
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOPackageTypeRegistry.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOPackageTypeRegistry.java
index 58e92e5d5c..852d38b42a 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOPackageTypeRegistry.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOPackageTypeRegistry.java
@@ -19,6 +19,7 @@ import org.eclipse.emf.ecore.EPackage;
*
* @author Eike Stepper
* @noimplement This interface is not intended to be implemented by clients.
+ * @since 2.0
*/
public interface CDOPackageTypeRegistry extends IRegistry<String, CDOPackageType>
{
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDORevisionManager.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDORevisionManager.java
index 446afab514..db195b3a6a 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDORevisionManager.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDORevisionManager.java
@@ -18,6 +18,7 @@ import org.eclipse.emf.cdo.common.revision.CDORevisionResolver;
/**
* @author Eike Stepper
* @noimplement This interface is not intended to be implemented by clients.
+ * @since 2.0
*/
public interface CDORevisionManager extends CDORevisionResolver
{
@@ -34,7 +35,6 @@ public interface CDORevisionManager extends CDORevisionResolver
* Load objects at the client from fromIndex (inclusive)
* @param toIndex
* Load objects at the client to toIndex (inclusive)
- * @since 2.0
*/
public Object loadChunkByRange(CDORevision revision, CDOFeature feature, int accessIndex, int fetchIndex,
int fromIndex, int toIndex);
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSession.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSession.java
index 99b266b5ed..846ef66c4d 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSession.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSession.java
@@ -51,6 +51,7 @@ import java.util.Collection;
*
* @author Eike Stepper
* @noimplement This interface is not intended to be implemented by clients.
+ * @since 2.0
*/
public interface CDOSession extends CDOCommonSession, IContainer<CDOView>, IOptionsContainer
{
@@ -150,29 +151,22 @@ public interface CDOSession extends CDOCommonSession, IContainer<CDOView>, IOpti
* Takes CDOID and version of all objects in the cache and sends it to the server. {@link CDOTimeStampContext}
* contains informations of which objects changed/detached. The collection is ordered by timestamp. In the case where
* {@link #isPassiveUpdateEnabled()} is <code>true</code>, this method will return immediately without doing anything.
- *
- * @since 2.0
*/
public Collection<CDOTimeStampContext> refresh();
/**
* Returns the {@link Options options} of this session.
- *
- * @since 2.0
*/
public Options options();
/**
* Returns an instance of {@link Repository} that describes the model repository this {@link CDOSession session} is
* connected to.
- *
- * @since 2.0
*/
public Repository repository();
/**
* @author Simon McDuff
- * @since 2.0
*/
public interface Options extends CDOCommonSession.Options
{
@@ -227,23 +221,14 @@ public interface CDOSession extends CDOCommonSession, IContainer<CDOView>, IOpti
*/
public void setRevisionFactory(CDORevisionFactory factory);
- /**
- * @since 2.0
- */
public interface PassiveUpdateEvent extends IOptionsEvent, CDOEvent
{
}
- /**
- * @since 2.0
- */
public interface CollectionLoadingPolicyEvent extends IOptionsEvent, CDOEvent
{
}
- /**
- * @since 2.0
- */
public interface RevisionFactoryEvent extends IOptionsEvent, CDOEvent
{
}
@@ -252,7 +237,6 @@ public interface CDOSession extends CDOCommonSession, IContainer<CDOView>, IOpti
/**
* Describes a model repository a {@link CDOSession session} is connected to.
*
- * @since 2.0
* @author Eike Stepper
* @see CDOSession#repository()
*/
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionConfiguration.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionConfiguration.java
index 4a8378b3f2..d08f62cf77 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionConfiguration.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionConfiguration.java
@@ -17,6 +17,7 @@ import org.eclipse.emf.internal.cdo.session.CDORevisionManagerImpl;
/**
* @author Eike Stepper
* @noimplement This interface is not intended to be implemented by clients.
+ * @since 2.0
*/
public interface CDOSessionConfiguration
{
@@ -32,7 +33,6 @@ public interface CDOSessionConfiguration
/**
* @see CDOSession#getPackageRegistry()
- * @since 2.0
*/
public CDOPackageRegistry getPackageRegistry();
@@ -40,7 +40,6 @@ public interface CDOSessionConfiguration
* The package registry must be set <b>before</b> the session is opened and can not be changed thereafter.
*
* @see CDOSession#getPackageRegistry()
- * @since 2.0
*/
public void setPackageRegistry(CDOPackageRegistry packageRegistry);
@@ -48,7 +47,6 @@ public interface CDOSessionConfiguration
* The package registry must be set <b>before</b> the session is opened and can not be changed thereafter.
*
* @see CDOSession#getPackageRegistry()
- * @since 2.0
*/
public void setEagerPackageRegistry();
@@ -56,13 +54,11 @@ public interface CDOSessionConfiguration
* The package registry must be set <b>before</b> the session is opened and can not be changed thereafter.
*
* @see CDOSession#getPackageRegistry()
- * @since 2.0
*/
public void setLazyPackageRegistry();
/**
* @see CDORevisionManagerImpl#getCache()
- * @since 2.0
*/
public CDORevisionCache getRevisionCache();
@@ -70,7 +66,6 @@ public interface CDOSessionConfiguration
* The revision cache must be set <b>before</b> the session is opened and can not be changed thereafter.
*
* @see CDORevisionManagerImpl#setCache(CDORevisionCache)
- * @since 2.0
*/
public void setRevisionCache(CDORevisionCache revisionCache);
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionEvent.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionEvent.java
index 9752281337..60cc9ab578 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionEvent.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionEvent.java
@@ -15,6 +15,7 @@ import org.eclipse.emf.cdo.util.CDOEvent;
/**
* @author Eike Stepper
* @noimplement This interface is not intended to be implemented by clients.
+ * @since 2.0
*/
public interface CDOSessionEvent extends CDOEvent
{
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionInvalidationEvent.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionInvalidationEvent.java
index 7637eb8a93..34dabae819 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionInvalidationEvent.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionInvalidationEvent.java
@@ -31,6 +31,7 @@ import java.util.Set;
* @see CDOInvalidationNotification
* @see CDOAdapterPolicy
* @noimplement This interface is not intended to be implemented by clients.
+ * @since 2.0
*/
public interface CDOSessionInvalidationEvent extends CDOSessionEvent
{
@@ -55,8 +56,6 @@ public interface CDOSessionInvalidationEvent extends CDOSessionEvent
/**
* Returns a collection of the {@link CDOID CDOIDs} of the removed objects.
- *
- * @since 2.0
*/
public Collection<CDOID> getDetachedObjects();
}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionPackageManager.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionPackageManager.java
index 9e437bd858..46d2686ced 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionPackageManager.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionPackageManager.java
@@ -26,13 +26,12 @@ import org.eclipse.emf.ecore.EStructuralFeature;
*
* @author Eike Stepper
* @noimplement This interface is not intended to be implemented by clients.
+ * @since 2.0
*/
public interface CDOSessionPackageManager extends CDOPackageManager
{
/**
* Returns the session this package manager is associated with.
- *
- * @since 2.0
*/
public CDOSession getSession();
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionProvider.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionProvider.java
index f7305f8678..1a22417ece 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionProvider.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionProvider.java
@@ -12,6 +12,7 @@ package org.eclipse.emf.cdo.session;
/**
* @author Eike Stepper
+ * @since 2.0
*/
public interface CDOSessionProvider
{
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/remote/CDORemoteSession.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/remote/CDORemoteSession.java
index 906372e258..3635b99b11 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/remote/CDORemoteSession.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/remote/CDORemoteSession.java
@@ -12,6 +12,7 @@ package org.eclipse.emf.cdo.session.remote;
/**
* @author Eike Stepper
+ * @since 2.0
*/
public interface CDORemoteSession extends Comparable<CDORemoteSession>
{
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/remote/CDORemoteSessionManager.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/remote/CDORemoteSessionManager.java
index 4eb45f4f0f..1092f4f100 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/remote/CDORemoteSessionManager.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/remote/CDORemoteSessionManager.java
@@ -16,6 +16,7 @@ import org.eclipse.net4j.util.container.IContainer;
/**
* @author Eike Stepper
+ * @since 2.0
*/
public interface CDORemoteSessionManager extends IContainer<CDORemoteSession>
{
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransaction.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransaction.java
index 7b85f9c83a..ae4060b766 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransaction.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransaction.java
@@ -37,38 +37,26 @@ import java.util.Set;
*
* @author Eike Stepper
* @noimplement This interface is not intended to be implemented by clients.
+ * @since 2.0
*/
public interface CDOTransaction extends CDOView, CDOUserTransaction
{
- /**
- * @since 2.0
- */
public long getLastCommitTime();
/**
* Returns <code>true</code> if this transaction is not closed and contains uncommitted changes, <code>false</code>
* otherwise.
- *
- * @since 2.0
*/
public boolean isDirty();
/**
* Returns <code>true</code> if this transaction contains local modifications that are conflicting with remote
* modifications, <code>false</code> otherwise.
- *
- * @since 2.0
*/
public boolean hasConflict();
- /**
- * @since 2.0
- */
public Set<CDOObject> getConflicts();
- /**
- * @since 2.0
- */
public void resolveConflicts(CDOConflictResolver... resolver);
/**
@@ -101,14 +89,10 @@ public interface CDOTransaction extends CDOView, CDOUserTransaction
*/
public Map<CDOID, CDOObject> getDetachedObjects();
- /**
- * @since 2.0
- */
public Options options();
/**
* @author Simon McDuff
- * @since 2.0
*/
public interface Options extends CDOView.Options
{
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransactionConflictEvent.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransactionConflictEvent.java
index 82a51d1a50..db5b505924 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransactionConflictEvent.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransactionConflictEvent.java
@@ -16,6 +16,7 @@ import org.eclipse.emf.cdo.view.CDOViewEvent;
/**
* @author Eike Stepper
* @noimplement This interface is not intended to be implemented by clients.
+ * @since 2.0
*/
public interface CDOTransactionConflictEvent extends CDOViewEvent
{
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransactionFinishedEvent.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransactionFinishedEvent.java
index 4d7c9f214e..c4116df8d0 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransactionFinishedEvent.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransactionFinishedEvent.java
@@ -19,6 +19,7 @@ import java.util.Map;
/**
* @author Eike Stepper
* @noimplement This interface is not intended to be implemented by clients.
+ * @since 2.0
*/
public interface CDOTransactionFinishedEvent extends CDOViewEvent
{
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransactionHandler.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransactionHandler.java
index 0ba9a9a67b..6de348ac50 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransactionHandler.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransactionHandler.java
@@ -18,22 +18,19 @@ import org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDelta;
/**
* @author Eike Stepper
+ * @since 2.0
*/
public interface CDOTransactionHandler
{
/**
* Called by a <code>CDOTransaction</code> <b>before</b> an object is added. The implementor of this method is allowed
* to throw an unchecked exception that will propagate up to the operation that is about to add the object.
- *
- * @since 2.0
*/
public void attachingObject(CDOTransaction transaction, CDOObject object);
/**
* Called by a <code>CDOTransaction</code> <b>before</b> an object is detached. The implementor of this method is
* allowed to throw an unchecked exception that will propagate up to the operation that is about to remove the object.
- *
- * @since 2.0
*/
public void detachingObject(CDOTransaction transaction, CDOObject object);
@@ -49,24 +46,18 @@ public interface CDOTransactionHandler
* Called by a <code>CDOTransaction</code> <b>before</b> it is being committed. The implementor of this method is
* allowed to throw an unchecked exception that will propagate up to the operation that is about to commit the
* transaction.
- *
- * @since 2.0
*/
public void committingTransaction(CDOTransaction transaction, CDOCommitContext commitContext);
/**
* Called by a <code>CDOTransaction</code> <b>after</b> it is being committed. The implementor of this method is
* <b>not</b> allowed to throw an unchecked exception.
- *
- * @since 2.0
*/
public void committedTransaction(CDOTransaction transaction, CDOCommitContext commitContext);
/**
* Called by a <code>CDOTransaction</code> <b>after</b> it is rolled back. If the implementor of this method throws an
* exception it will be logged as an error and subsequent handlers will be further called.
- *
- * @since 2.0
*/
public void rolledBackTransaction(CDOTransaction transaction);
}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransactionStartedEvent.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransactionStartedEvent.java
index 018d7c7f98..dc62540f4e 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransactionStartedEvent.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransactionStartedEvent.java
@@ -15,6 +15,7 @@ import org.eclipse.emf.cdo.view.CDOViewEvent;
/**
* @author Eike Stepper
* @noimplement This interface is not intended to be implemented by clients.
+ * @since 2.0
*/
public interface CDOTransactionStartedEvent extends CDOViewEvent
{
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOEvent.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOEvent.java
index 9d39a099bf..9fe1b36fa8 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOEvent.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOEvent.java
@@ -22,6 +22,7 @@ import org.eclipse.net4j.util.event.IEvent;
*
* @author Eike Stepper
* @noimplement This interface is not intended to be implemented by clients.
+ * @since 2.0
*/
public interface CDOEvent extends IEvent
{
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOUtil.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOUtil.java
index 2fcb2ff08c..72c33e6335 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOUtil.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOUtil.java
@@ -59,12 +59,18 @@ public final class CDOUtil
{
}
+ /**
+ * @since 2.0
+ */
public static CDOSessionConfiguration createSessionConfiguration()
{
// TODO Remove before release
return CDONet4jUtil.createSessionConfiguration();
}
+ /**
+ * @since 2.0
+ */
public static void prepareContainer(IManagedContainer container)
{
// TODO Remove before release
@@ -169,6 +175,9 @@ public final class CDOUtil
return null;
}
+ /**
+ * @since 2.0
+ */
public static void load(EObject eObject, CDOView view)
{
InternalCDOObject cdoObject = FSMUtil.adapt(eObject, view);
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/EMFUtil.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/EMFUtil.java
index 9aa497690f..4b0c3f82e1 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/EMFUtil.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/EMFUtil.java
@@ -58,6 +58,9 @@ public final class EMFUtil
{
}
+ /**
+ * @since 2.0
+ */
public static EPackage createEPackage(String name, String nsPrefix, String nsURI)
{
EPackage ePackage = EcoreFactory.eINSTANCE.createEPackage();
@@ -67,6 +70,9 @@ public final class EMFUtil
return ePackage;
}
+ /**
+ * @since 2.0
+ */
public static EClass createEClass(EPackage ePackage, String name, boolean isAbstract, boolean isInterface)
{
EClass eClass = EcoreFactory.eINSTANCE.createEClass();
@@ -77,6 +83,9 @@ public final class EMFUtil
return eClass;
}
+ /**
+ * @since 2.0
+ */
public static EAttribute createEAttribute(EClass eClass, String name, EClassifier type)
{
EAttribute eAttribute = EcoreFactory.eINSTANCE.createEAttribute();
@@ -86,6 +95,9 @@ public final class EMFUtil
return eAttribute;
}
+ /**
+ * @since 2.0
+ */
public static EReference createEReference(EClass eClass, String name, EClassifier type, boolean isRequired,
boolean isMany)
{
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOAudit.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOAudit.java
index 898c6c41d8..00a37250fa 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOAudit.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOAudit.java
@@ -19,6 +19,7 @@ import org.eclipse.emf.cdo.common.revision.CDORevision;
*
* @author Eike Stepper
* @noimplement This interface is not intended to be implemented by clients.
+ * @since 2.0
*/
public interface CDOAudit extends CDOView
{
@@ -31,8 +32,6 @@ public interface CDOAudit extends CDOView
/**
* Sets the point in (repository) time this audit view should refer to. {@link CDOObject Objects} provided by this
* view will be {@link CDORevision#isValid(long) valid} at this time.
- *
- * @since 2.0
*/
public void setTimeStamp(long timeStamp);
}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOView.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOView.java
index 2d729e02e8..8bc1d2a51a 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOView.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOView.java
@@ -70,6 +70,7 @@ import java.util.concurrent.locks.ReentrantLock;
*
* @author Eike Stepper
* @noimplement This interface is not intended to be implemented by clients.
+ * @since 2.0
*/
public interface CDOView extends CDOCommonView, INotifier, IOptionsContainer
{
@@ -93,7 +94,6 @@ public interface CDOView extends CDOCommonView, INotifier, IOptionsContainer
*
* @return The view set this view is associated with, never <code>null</code>.
* @see CDOViewSet#getViews()
- * @since 2.0
*/
public CDOViewSet getViewSet();
@@ -107,7 +107,6 @@ public interface CDOView extends CDOCommonView, INotifier, IOptionsContainer
public ResourceSet getResourceSet();
/**
- * @since 2.0
* @deprecated This API is provisional and subject to change or removal.
*/
@Deprecated
@@ -148,8 +147,6 @@ public interface CDOView extends CDOCommonView, INotifier, IOptionsContainer
*
* Note that this method really just returns the lock instance but does <b>not</b> acquire the lock! The above example
* acquires the lock with a timeout that expires after five seconds.
- *
- * @since 2.0
*/
public ReentrantLock getLock();
@@ -180,7 +177,6 @@ public interface CDOView extends CDOCommonView, INotifier, IOptionsContainer
/**
* @see ResourceSet#getResource(URI, boolean)
- * @since 2.0
*/
public CDOResource getResource(String path, boolean loadInDemand);
@@ -194,8 +190,6 @@ public interface CDOView extends CDOCommonView, INotifier, IOptionsContainer
* <p>
* The root resource is a special resource with only {@link CDOResourceNode CDOResourceNodes} in its contents list.
* You can use it as the main entry into the new resource and folder structure.
- *
- * @since 2.0
*/
public CDOResource getRootResource();
@@ -210,7 +204,6 @@ public interface CDOView extends CDOCommonView, INotifier, IOptionsContainer
* @param exactMatch
* <code>true</code> if the complete name of the resource must match, <code>false</code> if only a common
* prefix of the name must match.
- * @since 2.0
*/
public List<CDOResourceNode> queryResources(CDOResourceFolder folder, String name, boolean exactMatch);
@@ -225,7 +218,6 @@ public interface CDOView extends CDOCommonView, INotifier, IOptionsContainer
* @param exactMatch
* <code>true</code> if the complete name of the resource must match, <code>false</code> if only a common
* prefix of the name must match.
- * @since 2.0
*/
public CloseableIterator<CDOResourceNode> queryResourcesAsync(CDOResourceFolder folder, String name,
boolean exactMatch);
@@ -258,8 +250,6 @@ public interface CDOView extends CDOCommonView, INotifier, IOptionsContainer
* thrown.
* <li>If <code>null</code> is passed <code>null</code> is returned.
* </ul>
- *
- * @since 2.0
*/
public <T extends EObject> T getObject(T objectFromDifferentView);
@@ -274,16 +264,11 @@ public interface CDOView extends CDOCommonView, INotifier, IOptionsContainer
*/
public int reload(CDOObject... objects);
- /**
- * @since 2.0
- */
public void lockObjects(Collection<? extends CDOObject> objects, RWLockManager.LockType lockType, long timeout)
throws InterruptedException;
/**
* Unlocks the given locked objects of this view.
- *
- * @since 2.0
*/
public void unlockObjects(Collection<? extends CDOObject> objects, RWLockManager.LockType lockType);
@@ -306,7 +291,6 @@ public interface CDOView extends CDOCommonView, INotifier, IOptionsContainer
/**
* @author Simon McDuff
- * @since 2.0
*/
public interface Options extends IOptions
{
@@ -424,37 +408,22 @@ public interface CDOView extends CDOCommonView, INotifier, IOptionsContainer
*/
public void setRevisionPrefetchingPolicy(CDORevisionPrefetchingPolicy prefetchingPolicy);
- /**
- * @since 2.0
- */
public interface CacheReferenceTypeEvent extends IOptionsEvent, CDOEvent
{
}
- /**
- * @since 2.0
- */
public interface ReferencePolicyEvent extends IOptionsEvent, CDOEvent
{
}
- /**
- * @since 2.0
- */
public interface ChangeSubscriptionPoliciesEvent extends IOptionsEvent, CDOEvent
{
}
- /**
- * @since 2.0
- */
public interface InvalidationNotificationEvent extends IOptionsEvent, CDOEvent
{
}
- /**
- * @since 2.0
- */
public interface RevisionPrefetchingPolicyEvent extends IOptionsEvent, CDOEvent
{
}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewEvent.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewEvent.java
index ae45c081da..9e748f7261 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewEvent.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewEvent.java
@@ -15,6 +15,7 @@ import org.eclipse.emf.cdo.util.CDOEvent;
/**
* @author Eike Stepper
* @noimplement This interface is not intended to be implemented by clients.
+ * @since 2.0
*/
public interface CDOViewEvent extends CDOEvent
{
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewResourcesEvent.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewResourcesEvent.java
index f548ddf8c3..674e1cf847 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewResourcesEvent.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewResourcesEvent.java
@@ -13,6 +13,7 @@ package org.eclipse.emf.cdo.view;
/**
* @author Eike Stepper
* @noimplement This interface is not intended to be implemented by clients.
+ * @since 2.0
*/
public interface CDOViewResourcesEvent extends CDOViewEvent
{

Back to the top