diff options
| author | Eike Stepper | 2009-01-10 07:09:14 +0000 |
|---|---|---|
| committer | Eike Stepper | 2009-01-10 07:09:14 +0000 |
| commit | 9e9b95c59cb1e3f4be543c7551079a3153176ad1 (patch) | |
| tree | c587253d21cf954e05302c3a953f8e13b9cfed88 /plugins/org.eclipse.emf.cdo/src/org | |
| parent | 7181d9947bc8c61cc8f2e60e474429c29f1ab42a (diff) | |
| download | cdo-9e9b95c59cb1e3f4be543c7551079a3153176ad1.tar.gz cdo-9e9b95c59cb1e3f4be543c7551079a3153176ad1.tar.xz cdo-9e9b95c59cb1e3f4be543c7551079a3153176ad1.zip | |
[260613] Cleanup cdo.common plugin
https://bugs.eclipse.org/bugs/show_bug.cgi?id=260613
Diffstat (limited to 'plugins/org.eclipse.emf.cdo/src/org')
39 files changed, 370 insertions, 315 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResource.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResource.java index 076b7f311d..929c05f7b2 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResource.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResource.java @@ -22,22 +22,20 @@ import org.eclipse.core.runtime.IProgressMonitor; * <!-- 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> - * + * <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 @@ -51,13 +49,13 @@ public interface CDOResource extends CDOResourceNode, Resource public static final String OPTION_SAVE_PROGRESS_MONITOR = IProgressMonitor.class.getName(); /** - * Returns the value of the '<em><b>Resource Set</b></em>' attribute. - * <!-- begin-user-doc --> + * Returns the value of the '<em><b>Resource Set</b></em>' attribute. <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Resource Set</em>' attribute isn't clear, there really should be more of a description * here... * </p> * <!-- end-user-doc --> + * * @return the value of the '<em>Resource Set</em>' attribute. * @see #setResourceSet(ResourceSet) * @see org.eclipse.emf.cdo.eresource.EresourcePackage#getCDOResource_ResourceSet() @@ -67,21 +65,23 @@ public interface CDOResource extends CDOResourceNode, Resource ResourceSet getResourceSet(); /** - * Sets the value of the '{@link org.eclipse.emf.cdo.eresource.CDOResource#getResourceSet <em>Resource Set</em>}' attribute. - * <!-- begin-user-doc --> <!-- end-user-doc --> - * @param value the new value of the '<em>Resource Set</em>' attribute. + * Sets the value of the '{@link org.eclipse.emf.cdo.eresource.CDOResource#getResourceSet <em>Resource Set</em>}' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @param value + * the new value of the '<em>Resource Set</em>' attribute. * @see #getResourceSet() * @generated */ void setResourceSet(ResourceSet value); /** - * Returns the value of the '<em><b>URI</b></em>' attribute. - * <!-- begin-user-doc --> + * Returns the value of the '<em><b>URI</b></em>' attribute. <!-- begin-user-doc --> * <p> * If the meaning of the '<em>URI</em>' attribute isn't clear, there really should be more of a description here... * </p> * <!-- end-user-doc --> + * * @return the value of the '<em>URI</em>' attribute. * @see #setURI(URI) * @see org.eclipse.emf.cdo.eresource.EresourcePackage#getCDOResource_URI() @@ -102,14 +102,14 @@ public interface CDOResource extends CDOResourceNode, Resource void setURI(URI value); /** - * Returns the value of the '<em><b>Contents</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.emf.ecore.EObject}. - * <!-- begin-user-doc --> + * Returns the value of the '<em><b>Contents</b></em>' containment reference list. The list contents are of type + * {@link org.eclipse.emf.ecore.EObject}. <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Contents</em>' containment reference list isn't clear, there really should be more of a * description here... * </p> * <!-- end-user-doc --> + * * @return the value of the '<em>Contents</em>' containment reference list. * @see org.eclipse.emf.cdo.eresource.EresourcePackage#getCDOResource_Contents() * @model containment="true" @@ -118,13 +118,13 @@ public interface CDOResource extends CDOResourceNode, Resource EList<EObject> getContents(); /** - * Returns the value of the '<em><b>Modified</b></em>' attribute. - * <!-- begin-user-doc --> + * Returns the value of the '<em><b>Modified</b></em>' attribute. <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Modified</em>' attribute isn't clear, there really should be more of a description * here... * </p> * <!-- end-user-doc --> + * * @return the value of the '<em>Modified</em>' attribute. * @see #setModified(boolean) * @see org.eclipse.emf.cdo.eresource.EresourcePackage#getCDOResource_Modified() @@ -136,7 +136,9 @@ public interface CDOResource extends CDOResourceNode, Resource /** * Sets the value of the '{@link org.eclipse.emf.cdo.eresource.CDOResource#isModified <em>Modified</em>}' attribute. * <!-- begin-user-doc --> <!-- end-user-doc --> - * @param value the new value of the '<em>Modified</em>' attribute. + * + * @param value + * the new value of the '<em>Modified</em>' attribute. * @see #isModified() * @generated */ @@ -158,13 +160,13 @@ public interface CDOResource extends CDOResourceNode, Resource boolean isLoaded(); /** - * Returns the value of the '<em><b>Tracking Modification</b></em>' attribute. - * <!-- begin-user-doc --> + * Returns the value of the '<em><b>Tracking Modification</b></em>' attribute. <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Tracking Modification</em>' attribute isn't clear, there really should be more of a * description here... * </p> * <!-- end-user-doc --> + * * @return the value of the '<em>Tracking Modification</em>' attribute. * @see #setTrackingModification(boolean) * @see org.eclipse.emf.cdo.eresource.EresourcePackage#getCDOResource_TrackingModification() @@ -174,54 +176,58 @@ public interface CDOResource extends CDOResourceNode, Resource boolean isTrackingModification(); /** - * Sets the value of the '{@link org.eclipse.emf.cdo.eresource.CDOResource#isTrackingModification <em>Tracking Modification</em>}' attribute. - * <!-- begin-user-doc --> <!-- end-user-doc --> - * @param value the new value of the '<em>Tracking Modification</em>' attribute. + * Sets the value of the '{@link org.eclipse.emf.cdo.eresource.CDOResource#isTrackingModification + * <em>Tracking Modification</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @param value + * the new value of the '<em>Tracking Modification</em>' attribute. * @see #isTrackingModification() * @generated */ void setTrackingModification(boolean value); /** - * Returns the value of the '<em><b>Errors</b></em>' attribute list. - * The list contents are of type {@link org.eclipse.emf.ecore.resource.Resource.Diagnostic}. - * <!-- begin-user-doc --> + * Returns the value of the '<em><b>Errors</b></em>' attribute list. The list contents are of type + * {@link org.eclipse.emf.ecore.resource.Resource.Diagnostic}. <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Errors</em>' attribute list isn't clear, there really should be more of a description * here... * </p> * <!-- end-user-doc --> + * * @return the value of the '<em>Errors</em>' attribute list. * @see org.eclipse.emf.cdo.eresource.EresourcePackage#getCDOResource_Errors() - * @model dataType="org.eclipse.emf.cdo.eresource.Diagnostic" transient="true" changeable="false" volatile="true" derived="true" + * @model dataType="org.eclipse.emf.cdo.eresource.Diagnostic" transient="true" changeable="false" volatile="true" + * derived="true" * @generated */ EList<Diagnostic> getErrors(); /** - * Returns the value of the '<em><b>Warnings</b></em>' attribute list. - * The list contents are of type {@link org.eclipse.emf.ecore.resource.Resource.Diagnostic}. - * <!-- begin-user-doc --> + * Returns the value of the '<em><b>Warnings</b></em>' attribute list. The list contents are of type + * {@link org.eclipse.emf.ecore.resource.Resource.Diagnostic}. <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Warnings</em>' attribute list isn't clear, there really should be more of a description * here... * </p> * <!-- end-user-doc --> + * * @return the value of the '<em>Warnings</em>' attribute list. * @see org.eclipse.emf.cdo.eresource.EresourcePackage#getCDOResource_Warnings() - * @model dataType="org.eclipse.emf.cdo.eresource.Diagnostic" transient="true" changeable="false" volatile="true" derived="true" + * @model dataType="org.eclipse.emf.cdo.eresource.Diagnostic" transient="true" changeable="false" volatile="true" + * derived="true" * @generated */ EList<Diagnostic> getWarnings(); /** - * Returns the value of the '<em><b>Time Stamp</b></em>' attribute. - * <!-- begin-user-doc --> + * Returns the value of the '<em><b>Time Stamp</b></em>' attribute. <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Time Stamp</em>' attribute isn't clear, there really should be more of a description * here... * </p> * <!-- end-user-doc --> + * * @return the value of the '<em>Time Stamp</em>' attribute. * @see #setTimeStamp(long) * @see org.eclipse.emf.cdo.eresource.EresourcePackage#getCDOResource_TimeStamp() @@ -231,9 +237,11 @@ public interface CDOResource extends CDOResourceNode, Resource long getTimeStamp(); /** - * Sets the value of the '{@link org.eclipse.emf.cdo.eresource.CDOResource#getTimeStamp <em>Time Stamp</em>}' attribute. - * <!-- begin-user-doc --> <!-- end-user-doc --> - * @param value the new value of the '<em>Time Stamp</em>' attribute. + * Sets the value of the '{@link org.eclipse.emf.cdo.eresource.CDOResource#getTimeStamp <em>Time Stamp</em>}' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @param value + * the new value of the '<em>Time Stamp</em>' attribute. * @see #getTimeStamp() * @generated */ diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResourceFolder.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResourceFolder.java index 066c0fb5c0..c3014f140f 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResourceFolder.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResourceFolder.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation * - * $Id: CDOResourceFolder.java,v 1.4 2008-12-29 14:53:09 estepper Exp $ + * $Id: CDOResourceFolder.java,v 1.5 2009-01-10 07:09:05 estepper Exp $ */ package org.eclipse.emf.cdo.eresource; @@ -32,15 +32,15 @@ import org.eclipse.emf.common.util.EList; public interface CDOResourceFolder extends CDOResourceNode { /** - * Returns the value of the '<em><b>Nodes</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.emf.cdo.eresource.CDOResourceNode}. - * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.eresource.CDOResourceNode#getFolder <em>Folder</em>}'. - * <!-- begin-user-doc --> + * Returns the value of the '<em><b>Nodes</b></em>' containment reference list. The list contents are of type + * {@link org.eclipse.emf.cdo.eresource.CDOResourceNode}. It is bidirectional and its opposite is ' + * {@link org.eclipse.emf.cdo.eresource.CDOResourceNode#getFolder <em>Folder</em>}'. <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Nodes</em>' containment reference list isn't clear, there really should be more of a * description here... * </p> * <!-- end-user-doc --> + * * @return the value of the '<em>Nodes</em>' containment reference list. * @see org.eclipse.emf.cdo.eresource.EresourcePackage#getCDOResourceFolder_Nodes() * @see org.eclipse.emf.cdo.eresource.CDOResourceNode#getFolder diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResourceNode.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResourceNode.java index 23f9fd515e..e2a51e98f5 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResourceNode.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResourceNode.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation * - * $Id: CDOResourceNode.java,v 1.4 2008-12-29 14:53:09 estepper Exp $ + * $Id: CDOResourceNode.java,v 1.5 2009-01-10 07:09:05 estepper Exp $ */ package org.eclipse.emf.cdo.eresource; @@ -52,14 +52,14 @@ public interface CDOResourceNode extends CDOObject public boolean isRoot(); /** - * Returns the value of the '<em><b>Folder</b></em>' container reference. - * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.eresource.CDOResourceFolder#getNodes <em>Nodes</em>}'. - * <!-- begin-user-doc --> + * Returns the value of the '<em><b>Folder</b></em>' container reference. It is bidirectional and its opposite is ' + * {@link org.eclipse.emf.cdo.eresource.CDOResourceFolder#getNodes <em>Nodes</em>}'. <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Folder</em>' container reference isn't clear, there really should be more of a * description here... * </p> * <!-- end-user-doc --> + * * @return the value of the '<em>Folder</em>' container reference. * @see #setFolder(CDOResourceFolder) * @see org.eclipse.emf.cdo.eresource.EresourcePackage#getCDOResourceNode_Folder() @@ -70,21 +70,23 @@ public interface CDOResourceNode extends CDOObject CDOResourceFolder getFolder(); /** - * Sets the value of the '{@link org.eclipse.emf.cdo.eresource.CDOResourceNode#getFolder <em>Folder</em>}' container reference. - * <!-- begin-user-doc --> <!-- end-user-doc --> - * @param value the new value of the '<em>Folder</em>' container reference. + * Sets the value of the '{@link org.eclipse.emf.cdo.eresource.CDOResourceNode#getFolder <em>Folder</em>}' container + * reference. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @param value + * the new value of the '<em>Folder</em>' container reference. * @see #getFolder() * @generated */ void setFolder(CDOResourceFolder value); /** - * Returns the value of the '<em><b>Name</b></em>' attribute. - * <!-- begin-user-doc --> + * Returns the value of the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here... * </p> * <!-- end-user-doc --> + * * @return the value of the '<em>Name</em>' attribute. * @see #setName(String) * @see org.eclipse.emf.cdo.eresource.EresourcePackage#getCDOResourceNode_Name() @@ -105,12 +107,12 @@ public interface CDOResourceNode extends CDOObject void setName(String value); /** - * Returns the value of the '<em><b>Path</b></em>' attribute. - * <!-- begin-user-doc --> + * Returns the value of the '<em><b>Path</b></em>' attribute. <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Path</em>' attribute isn't clear, there really should be more of a description here... * </p> * <!-- end-user-doc --> + * * @return the value of the '<em>Path</em>' attribute. * @see #setPath(String) * @see org.eclipse.emf.cdo.eresource.EresourcePackage#getCDOResourceNode_Path() diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/EresourceFactory.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/EresourceFactory.java index d82ad32812..50e830ded4 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/EresourceFactory.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/EresourceFactory.java @@ -15,21 +15,21 @@ import org.eclipse.emf.ecore.EFactory; /** * <!-- 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 --> + * * @see org.eclipse.emf.cdo.eresource.EresourcePackage * @generated */ public interface EresourceFactory extends EFactory { /** - * The singleton instance of the factory. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The singleton instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ EresourceFactory eINSTANCE = org.eclipse.emf.cdo.eresource.impl.EresourceFactoryImpl.init(); /** - * Returns a new object of class '<em>CDO Resource Folder</em>'. - * <!-- begin-user-doc --> + * Returns a new object of class '<em>CDO Resource Folder</em>'. <!-- begin-user-doc --> * * @since 2.0<!-- end-user-doc --> * @return a new object of class '<em>CDO Resource Folder</em>'. @@ -38,16 +38,16 @@ public interface EresourceFactory extends EFactory CDOResourceFolder createCDOResourceFolder(); /** - * Returns a new object of class '<em>CDO Resource</em>'. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Returns a new object of class '<em>CDO Resource</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @return a new object of class '<em>CDO Resource</em>'. * @generated */ CDOResource createCDOResource(); /** - * Returns the package supported by this factory. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Returns the package supported by this factory. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @return the package supported by this factory. * @generated */ diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/EresourcePackage.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/EresourcePackage.java index 9da68804f1..891155c44a 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/EresourcePackage.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/EresourcePackage.java @@ -25,6 +25,7 @@ import org.eclipse.emf.ecore.EReference; * <li>and each data type</li> * </ul> * <!-- end-user-doc --> + * * @see org.eclipse.emf.cdo.eresource.EresourceFactory * @model kind="package" * @generated @@ -32,36 +33,36 @@ import org.eclipse.emf.ecore.EReference; public interface EresourcePackage extends EPackage { /** - * The package name. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The package name. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ String eNAME = "eresource"; /** - * The package namespace URI. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ String eNS_URI = "http://www.eclipse.org/emf/CDO/resource/2.0.0"; /** - * The package namespace name. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ String eNS_PREFIX = "eresource"; /** - * The singleton instance of the package. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The singleton instance of the package. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ EresourcePackage eINSTANCE = org.eclipse.emf.cdo.eresource.impl.EresourcePackageImpl.init(); /** - * The meta object id for the '{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceNodeImpl <em>CDO Resource Node</em>}' class. - * <!-- begin-user-doc --> + * The meta object id for the '{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceNodeImpl + * <em>CDO Resource Node</em>}' class. <!-- begin-user-doc --> * * @since 2.0<!-- end-user-doc --> * @see org.eclipse.emf.cdo.eresource.impl.CDOResourceNodeImpl @@ -71,8 +72,7 @@ public interface EresourcePackage extends EPackage int CDO_RESOURCE_NODE = 0; /** - * The feature id for the '<em><b>Folder</b></em>' container reference. - * <!-- begin-user-doc --> + * The feature id for the '<em><b>Folder</b></em>' container reference. <!-- begin-user-doc --> * * @since 2.0<!-- end-user-doc --> * @generated @@ -81,8 +81,7 @@ public interface EresourcePackage extends EPackage int CDO_RESOURCE_NODE__FOLDER = 0; /** - * The feature id for the '<em><b>Name</b></em>' attribute. - * <!-- begin-user-doc --> + * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> * * @since 2.0<!-- end-user-doc --> * @generated @@ -91,8 +90,7 @@ public interface EresourcePackage extends EPackage int CDO_RESOURCE_NODE__NAME = 1; /** - * The feature id for the '<em><b>Path</b></em>' attribute. - * <!-- begin-user-doc --> + * The feature id for the '<em><b>Path</b></em>' attribute. <!-- begin-user-doc --> * * @since 2.0<!-- end-user-doc --> * @generated @@ -101,8 +99,7 @@ public interface EresourcePackage extends EPackage int CDO_RESOURCE_NODE__PATH = 2; /** - * The number of structural features of the '<em>CDO Resource Node</em>' class. - * <!-- begin-user-doc --> + * The number of structural features of the '<em>CDO Resource Node</em>' class. <!-- begin-user-doc --> * * @since 2.0<!-- end-user-doc --> * @generated @@ -111,8 +108,8 @@ public interface EresourcePackage extends EPackage int CDO_RESOURCE_NODE_FEATURE_COUNT = 3; /** - * The meta object id for the '{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceFolderImpl <em>CDO Resource Folder</em>}' class. - * <!-- begin-user-doc --> + * The meta object id for the '{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceFolderImpl + * <em>CDO Resource Folder</em>}' class. <!-- begin-user-doc --> * * @since 2.0<!-- end-user-doc --> * @see org.eclipse.emf.cdo.eresource.impl.CDOResourceFolderImpl @@ -122,8 +119,7 @@ public interface EresourcePackage extends EPackage int CDO_RESOURCE_FOLDER = 1; /** - * The feature id for the '<em><b>Folder</b></em>' container reference. - * <!-- begin-user-doc --> + * The feature id for the '<em><b>Folder</b></em>' container reference. <!-- begin-user-doc --> * * @since 2.0<!-- end-user-doc --> * @generated @@ -132,8 +128,7 @@ public interface EresourcePackage extends EPackage int CDO_RESOURCE_FOLDER__FOLDER = CDO_RESOURCE_NODE__FOLDER; /** - * The feature id for the '<em><b>Name</b></em>' attribute. - * <!-- begin-user-doc --> + * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> * * @since 2.0<!-- end-user-doc --> * @generated @@ -142,8 +137,7 @@ public interface EresourcePackage extends EPackage int CDO_RESOURCE_FOLDER__NAME = CDO_RESOURCE_NODE__NAME; /** - * The feature id for the '<em><b>Path</b></em>' attribute. - * <!-- begin-user-doc --> + * The feature id for the '<em><b>Path</b></em>' attribute. <!-- begin-user-doc --> * * @since 2.0<!-- end-user-doc --> * @generated @@ -152,8 +146,7 @@ public interface EresourcePackage extends EPackage int CDO_RESOURCE_FOLDER__PATH = CDO_RESOURCE_NODE__PATH; /** - * The feature id for the '<em><b>Nodes</b></em>' containment reference list. - * <!-- begin-user-doc --> + * The feature id for the '<em><b>Nodes</b></em>' containment reference list. <!-- begin-user-doc --> * * @since 2.0<!-- end-user-doc --> * @generated @@ -162,8 +155,7 @@ public interface EresourcePackage extends EPackage int CDO_RESOURCE_FOLDER__NODES = CDO_RESOURCE_NODE_FEATURE_COUNT + 0; /** - * The number of structural features of the '<em>CDO Resource Folder</em>' class. - * <!-- begin-user-doc --> + * The number of structural features of the '<em>CDO Resource Folder</em>' class. <!-- begin-user-doc --> * * @since 2.0<!-- end-user-doc --> * @generated @@ -172,8 +164,9 @@ public interface EresourcePackage extends EPackage int CDO_RESOURCE_FOLDER_FEATURE_COUNT = CDO_RESOURCE_NODE_FEATURE_COUNT + 1; /** - * The meta object id for the '{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl <em>CDO Resource</em>}' class. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The meta object id for the '{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl <em>CDO Resource</em>}' + * class. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @see org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl * @see org.eclipse.emf.cdo.eresource.impl.EresourcePackageImpl#getCDOResource() * @generated @@ -181,8 +174,7 @@ public interface EresourcePackage extends EPackage int CDO_RESOURCE = 2; /** - * The feature id for the '<em><b>Folder</b></em>' container reference. - * <!-- begin-user-doc --> + * The feature id for the '<em><b>Folder</b></em>' container reference. <!-- begin-user-doc --> * * @since 2.0<!-- end-user-doc --> * @generated @@ -191,8 +183,7 @@ public interface EresourcePackage extends EPackage int CDO_RESOURCE__FOLDER = CDO_RESOURCE_NODE__FOLDER; /** - * The feature id for the '<em><b>Name</b></em>' attribute. - * <!-- begin-user-doc --> + * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> * * @since 2.0<!-- end-user-doc --> * @generated @@ -201,49 +192,49 @@ public interface EresourcePackage extends EPackage int CDO_RESOURCE__NAME = CDO_RESOURCE_NODE__NAME; /** - * The feature id for the '<em><b>Path</b></em>' attribute. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The feature id for the '<em><b>Path</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated * @ordered */ int CDO_RESOURCE__PATH = CDO_RESOURCE_NODE__PATH; /** - * The feature id for the '<em><b>Resource Set</b></em>' attribute. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The feature id for the '<em><b>Resource Set</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated * @ordered */ int CDO_RESOURCE__RESOURCE_SET = CDO_RESOURCE_NODE_FEATURE_COUNT + 0; /** - * The feature id for the '<em><b>URI</b></em>' attribute. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The feature id for the '<em><b>URI</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated * @ordered */ int CDO_RESOURCE__URI = CDO_RESOURCE_NODE_FEATURE_COUNT + 1; /** - * The feature id for the '<em><b>Contents</b></em>' containment reference list. - * <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Contents</b></em>' containment reference list. <!-- begin-user-doc --> <!-- * end-user-doc --> + * * @generated * @ordered */ int CDO_RESOURCE__CONTENTS = CDO_RESOURCE_NODE_FEATURE_COUNT + 2; /** - * The feature id for the '<em><b>Modified</b></em>' attribute. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The feature id for the '<em><b>Modified</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated * @ordered */ int CDO_RESOURCE__MODIFIED = CDO_RESOURCE_NODE_FEATURE_COUNT + 3; /** - * The feature id for the '<em><b>Loaded</b></em>' attribute. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The feature id for the '<em><b>Loaded</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated * @ordered */ @@ -259,24 +250,24 @@ public interface EresourcePackage extends EPackage int CDO_RESOURCE__TRACKING_MODIFICATION = CDO_RESOURCE_NODE_FEATURE_COUNT + 5; /** - * The feature id for the '<em><b>Errors</b></em>' attribute list. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The feature id for the '<em><b>Errors</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated * @ordered */ int CDO_RESOURCE__ERRORS = CDO_RESOURCE_NODE_FEATURE_COUNT + 6; /** - * The feature id for the '<em><b>Warnings</b></em>' attribute list. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The feature id for the '<em><b>Warnings</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated * @ordered */ int CDO_RESOURCE__WARNINGS = CDO_RESOURCE_NODE_FEATURE_COUNT + 7; /** - * The feature id for the '<em><b>Time Stamp</b></em>' attribute. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The feature id for the '<em><b>Time Stamp</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated * @ordered */ @@ -292,8 +283,8 @@ public interface EresourcePackage extends EPackage int CDO_RESOURCE_FEATURE_COUNT = CDO_RESOURCE_NODE_FEATURE_COUNT + 9; /** - * The meta object id for the '<em>Resource Set</em>' data type. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The meta object id for the '<em>Resource Set</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @see org.eclipse.emf.ecore.resource.ResourceSet * @see org.eclipse.emf.cdo.eresource.impl.EresourcePackageImpl#getResourceSet() * @generated @@ -301,8 +292,8 @@ public interface EresourcePackage extends EPackage int RESOURCE_SET = 3; /** - * The meta object id for the '<em>URI</em>' data type. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The meta object id for the '<em>URI</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @see org.eclipse.emf.common.util.URI * @see org.eclipse.emf.cdo.eresource.impl.EresourcePackageImpl#getURI() * @generated @@ -310,8 +301,8 @@ public interface EresourcePackage extends EPackage int URI = 4; /** - * The meta object id for the '<em>Diagnostic</em>' data type. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The meta object id for the '<em>Diagnostic</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @see org.eclipse.emf.ecore.resource.Resource.Diagnostic * @see org.eclipse.emf.cdo.eresource.impl.EresourcePackageImpl#getDiagnostic() * @generated @@ -319,8 +310,8 @@ public interface EresourcePackage extends EPackage int DIAGNOSTIC = 5; /** - * Returns the meta object for class '{@link org.eclipse.emf.cdo.eresource.CDOResourceNode <em>CDO Resource Node</em>}'. - * <!-- begin-user-doc --> + * Returns the meta object for class '{@link org.eclipse.emf.cdo.eresource.CDOResourceNode <em>CDO Resource Node</em>} + * '. <!-- begin-user-doc --> * * @since 2.0<!-- end-user-doc --> * @return the meta object for class '<em>CDO Resource Node</em>'. @@ -330,8 +321,8 @@ public interface EresourcePackage extends EPackage EClass getCDOResourceNode(); /** - * Returns the meta object for the container reference '{@link org.eclipse.emf.cdo.eresource.CDOResourceNode#getFolder <em>Folder</em>}'. - * <!-- begin-user-doc --> + * Returns the meta object for the container reference ' + * {@link org.eclipse.emf.cdo.eresource.CDOResourceNode#getFolder <em>Folder</em>}'. <!-- begin-user-doc --> * * @since 2.0<!-- end-user-doc --> * @return the meta object for the container reference '<em>Folder</em>'. @@ -342,8 +333,8 @@ public interface EresourcePackage extends EPackage EReference getCDOResourceNode_Folder(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.eresource.CDOResourceNode#getName <em>Name</em>}'. - * <!-- begin-user-doc --> + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.eresource.CDOResourceNode#getName + * <em>Name</em>}'. <!-- begin-user-doc --> * * @since 2.0<!-- end-user-doc --> * @return the meta object for the attribute '<em>Name</em>'. @@ -354,8 +345,8 @@ public interface EresourcePackage extends EPackage EAttribute getCDOResourceNode_Name(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.eresource.CDOResourceNode#getPath <em>Path</em>}'. - * <!-- begin-user-doc --> + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.eresource.CDOResourceNode#getPath + * <em>Path</em>}'. <!-- begin-user-doc --> * * @since 2.0<!-- end-user-doc --> * @return the meta object for the attribute '<em>Path</em>'. @@ -366,8 +357,8 @@ public interface EresourcePackage extends EPackage EAttribute getCDOResourceNode_Path(); /** - * Returns the meta object for class '{@link org.eclipse.emf.cdo.eresource.CDOResourceFolder <em>CDO Resource Folder</em>}'. - * <!-- begin-user-doc --> + * Returns the meta object for class '{@link org.eclipse.emf.cdo.eresource.CDOResourceFolder + * <em>CDO Resource Folder</em>}'. <!-- begin-user-doc --> * * @since 2.0<!-- end-user-doc --> * @return the meta object for class '<em>CDO Resource Folder</em>'. @@ -377,8 +368,8 @@ public interface EresourcePackage extends EPackage EClass getCDOResourceFolder(); /** - * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.eresource.CDOResourceFolder#getNodes <em>Nodes</em>}'. - * <!-- begin-user-doc --> + * Returns the meta object for the containment reference list ' + * {@link org.eclipse.emf.cdo.eresource.CDOResourceFolder#getNodes <em>Nodes</em>}'. <!-- begin-user-doc --> * * @since 2.0<!-- end-user-doc --> * @return the meta object for the containment reference list '<em>Nodes</em>'. @@ -399,8 +390,9 @@ public interface EresourcePackage extends EPackage EClass getCDOResource(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.eresource.CDOResource#getResourceSet <em>Resource Set</em>}'. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.eresource.CDOResource#getResourceSet + * <em>Resource Set</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @return the meta object for the attribute '<em>Resource Set</em>'. * @see org.eclipse.emf.cdo.eresource.CDOResource#getResourceSet() * @see #getCDOResource() @@ -411,6 +403,7 @@ public interface EresourcePackage extends EPackage /** * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.eresource.CDOResource#getURI <em>URI</em>}'. * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @return the meta object for the attribute '<em>URI</em>'. * @see org.eclipse.emf.cdo.eresource.CDOResource#getURI() * @see #getCDOResource() @@ -419,9 +412,10 @@ public interface EresourcePackage extends EPackage EAttribute getCDOResource_URI(); /** - * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.eresource.CDOResource#getContents <em>Contents</em>}'. - * <!-- begin-user-doc --> <!-- + * Returns the meta object for the containment reference list ' + * {@link org.eclipse.emf.cdo.eresource.CDOResource#getContents <em>Contents</em>}'. <!-- begin-user-doc --> <!-- * end-user-doc --> + * * @return the meta object for the containment reference list '<em>Contents</em>'. * @see org.eclipse.emf.cdo.eresource.CDOResource#getContents() * @see #getCDOResource() @@ -430,8 +424,9 @@ public interface EresourcePackage extends EPackage EReference getCDOResource_Contents(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.eresource.CDOResource#isModified <em>Modified</em>}'. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.eresource.CDOResource#isModified + * <em>Modified</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @return the meta object for the attribute '<em>Modified</em>'. * @see org.eclipse.emf.cdo.eresource.CDOResource#isModified() * @see #getCDOResource() @@ -440,8 +435,9 @@ public interface EresourcePackage extends EPackage EAttribute getCDOResource_Modified(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.eresource.CDOResource#isLoaded <em>Loaded</em>}'. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.eresource.CDOResource#isLoaded + * <em>Loaded</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @return the meta object for the attribute '<em>Loaded</em>'. * @see org.eclipse.emf.cdo.eresource.CDOResource#isLoaded() * @see #getCDOResource() @@ -450,8 +446,9 @@ public interface EresourcePackage extends EPackage EAttribute getCDOResource_Loaded(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.eresource.CDOResource#isTrackingModification <em>Tracking Modification</em>}'. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.eresource.CDOResource#isTrackingModification + * <em>Tracking Modification</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @return the meta object for the attribute '<em>Tracking Modification</em>'. * @see org.eclipse.emf.cdo.eresource.CDOResource#isTrackingModification() * @see #getCDOResource() @@ -460,8 +457,9 @@ public interface EresourcePackage extends EPackage EAttribute getCDOResource_TrackingModification(); /** - * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.eresource.CDOResource#getErrors <em>Errors</em>}'. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.eresource.CDOResource#getErrors + * <em>Errors</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @return the meta object for the attribute list '<em>Errors</em>'. * @see org.eclipse.emf.cdo.eresource.CDOResource#getErrors() * @see #getCDOResource() @@ -470,8 +468,9 @@ public interface EresourcePackage extends EPackage EAttribute getCDOResource_Errors(); /** - * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.eresource.CDOResource#getWarnings <em>Warnings</em>}'. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.eresource.CDOResource#getWarnings + * <em>Warnings</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @return the meta object for the attribute list '<em>Warnings</em>'. * @see org.eclipse.emf.cdo.eresource.CDOResource#getWarnings() * @see #getCDOResource() @@ -480,8 +479,9 @@ public interface EresourcePackage extends EPackage EAttribute getCDOResource_Warnings(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.eresource.CDOResource#getTimeStamp <em>Time Stamp</em>}'. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.eresource.CDOResource#getTimeStamp + * <em>Time Stamp</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @return the meta object for the attribute '<em>Time Stamp</em>'. * @see org.eclipse.emf.cdo.eresource.CDOResource#getTimeStamp() * @see #getCDOResource() @@ -492,6 +492,7 @@ public interface EresourcePackage extends EPackage /** * Returns the meta object for data type '{@link org.eclipse.emf.ecore.resource.ResourceSet <em>Resource Set</em>}'. * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @return the meta object for data type '<em>Resource Set</em>'. * @see org.eclipse.emf.ecore.resource.ResourceSet * @model instanceClass="org.eclipse.emf.ecore.resource.ResourceSet" serializeable="false" @@ -500,9 +501,9 @@ public interface EresourcePackage extends EPackage EDataType getResourceSet(); /** - * Returns the meta object for data type '{@link org.eclipse.emf.common.util.URI <em>URI</em>}'. - * <!-- begin-user-doc + * Returns the meta object for data type '{@link org.eclipse.emf.common.util.URI <em>URI</em>}'. <!-- begin-user-doc * --> <!-- end-user-doc --> + * * @return the meta object for data type '<em>URI</em>'. * @see org.eclipse.emf.common.util.URI * @model instanceClass="org.eclipse.emf.common.util.URI" @@ -511,8 +512,9 @@ public interface EresourcePackage extends EPackage EDataType getURI(); /** - * Returns the meta object for data type '{@link org.eclipse.emf.ecore.resource.Resource.Diagnostic <em>Diagnostic</em>}'. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Returns the meta object for data type '{@link org.eclipse.emf.ecore.resource.Resource.Diagnostic + * <em>Diagnostic</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @return the meta object for data type '<em>Diagnostic</em>'. * @see org.eclipse.emf.ecore.resource.Resource.Diagnostic * @model instanceClass="org.eclipse.emf.ecore.resource.Resource.Diagnostic" serializeable="false" @@ -521,8 +523,8 @@ public interface EresourcePackage extends EPackage EDataType getDiagnostic(); /** - * Returns the factory that creates the instances of the model. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Returns the factory that creates the instances of the model. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @return the factory that creates the instances of the model. * @generated */ @@ -537,13 +539,14 @@ public interface EresourcePackage extends EPackage * <li>and each data type</li> * </ul> * <!-- end-user-doc --> + * * @generated */ interface Literals { /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceNodeImpl <em>CDO Resource Node</em>}' class. - * <!-- begin-user-doc --> + * The meta object literal for the '{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceNodeImpl + * <em>CDO Resource Node</em>}' class. <!-- begin-user-doc --> * * @since 2.0<!-- end-user-doc --> * @see org.eclipse.emf.cdo.eresource.impl.CDOResourceNodeImpl @@ -553,8 +556,7 @@ public interface EresourcePackage extends EPackage EClass CDO_RESOURCE_NODE = eINSTANCE.getCDOResourceNode(); /** - * The meta object literal for the '<em><b>Folder</b></em>' container reference feature. - * <!-- begin-user-doc --> + * The meta object literal for the '<em><b>Folder</b></em>' container reference feature. <!-- begin-user-doc --> * * @since 2.0<!-- end-user-doc --> * @generated @@ -562,8 +564,7 @@ public interface EresourcePackage extends EPackage EReference CDO_RESOURCE_NODE__FOLDER = eINSTANCE.getCDOResourceNode_Folder(); /** - * The meta object literal for the '<em><b>Name</b></em>' attribute feature. - * <!-- begin-user-doc --> + * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> * * @since 2.0<!-- end-user-doc --> * @generated @@ -571,8 +572,7 @@ public interface EresourcePackage extends EPackage EAttribute CDO_RESOURCE_NODE__NAME = eINSTANCE.getCDOResourceNode_Name(); /** - * The meta object literal for the '<em><b>Path</b></em>' attribute feature. - * <!-- begin-user-doc --> + * The meta object literal for the '<em><b>Path</b></em>' attribute feature. <!-- begin-user-doc --> * * @since 2.0<!-- end-user-doc --> * @generated @@ -580,8 +580,8 @@ public interface EresourcePackage extends EPackage EAttribute CDO_RESOURCE_NODE__PATH = eINSTANCE.getCDOResourceNode_Path(); /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceFolderImpl <em>CDO Resource Folder</em>}' class. - * <!-- begin-user-doc --> + * The meta object literal for the '{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceFolderImpl + * <em>CDO Resource Folder</em>}' class. <!-- begin-user-doc --> * * @since 2.0<!-- end-user-doc --> * @see org.eclipse.emf.cdo.eresource.impl.CDOResourceFolderImpl @@ -591,8 +591,7 @@ public interface EresourcePackage extends EPackage EClass CDO_RESOURCE_FOLDER = eINSTANCE.getCDOResourceFolder(); /** - * The meta object literal for the '<em><b>Nodes</b></em>' containment reference list feature. - * <!-- begin-user-doc + * The meta object literal for the '<em><b>Nodes</b></em>' containment reference list feature. <!-- begin-user-doc * --> * * @since 2.0<!-- end-user-doc --> @@ -601,8 +600,9 @@ public interface EresourcePackage extends EPackage EReference CDO_RESOURCE_FOLDER__NODES = eINSTANCE.getCDOResourceFolder_Nodes(); /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl <em>CDO Resource</em>}' class. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The meta object literal for the '{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl <em>CDO Resource</em>} + * ' class. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @see org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl * @see org.eclipse.emf.cdo.eresource.impl.EresourcePackageImpl#getCDOResource() * @generated @@ -610,17 +610,17 @@ public interface EresourcePackage extends EPackage EClass CDO_RESOURCE = eINSTANCE.getCDOResource(); /** - * The meta object literal for the '<em><b>Resource Set</b></em>' attribute feature. - * <!-- begin-user-doc --> <!-- + * The meta object literal for the '<em><b>Resource Set</b></em>' attribute feature. <!-- begin-user-doc --> <!-- * end-user-doc --> + * * @generated */ EAttribute CDO_RESOURCE__RESOURCE_SET = eINSTANCE.getCDOResource_ResourceSet(); /** - * The meta object literal for the '<em><b>URI</b></em>' attribute feature. - * <!-- begin-user-doc --> <!-- + * The meta object literal for the '<em><b>URI</b></em>' attribute feature. <!-- begin-user-doc --> <!-- * end-user-doc --> + * * @generated */ EAttribute CDO_RESOURCE__URI = eINSTANCE.getCDOResource_URI(); @@ -634,56 +634,56 @@ public interface EresourcePackage extends EPackage EReference CDO_RESOURCE__CONTENTS = eINSTANCE.getCDOResource_Contents(); /** - * The meta object literal for the '<em><b>Modified</b></em>' attribute feature. - * <!-- begin-user-doc --> <!-- + * The meta object literal for the '<em><b>Modified</b></em>' attribute feature. <!-- begin-user-doc --> <!-- * end-user-doc --> + * * @generated */ EAttribute CDO_RESOURCE__MODIFIED = eINSTANCE.getCDOResource_Modified(); /** - * The meta object literal for the '<em><b>Loaded</b></em>' attribute feature. - * <!-- begin-user-doc --> <!-- + * The meta object literal for the '<em><b>Loaded</b></em>' attribute feature. <!-- begin-user-doc --> <!-- * end-user-doc --> + * * @generated */ EAttribute CDO_RESOURCE__LOADED = eINSTANCE.getCDOResource_Loaded(); /** - * The meta object literal for the '<em><b>Tracking Modification</b></em>' attribute feature. - * <!-- begin-user-doc + * The meta object literal for the '<em><b>Tracking Modification</b></em>' attribute feature. <!-- begin-user-doc * --> <!-- end-user-doc --> + * * @generated */ EAttribute CDO_RESOURCE__TRACKING_MODIFICATION = eINSTANCE.getCDOResource_TrackingModification(); /** - * The meta object literal for the '<em><b>Errors</b></em>' attribute list feature. - * <!-- begin-user-doc --> <!-- + * The meta object literal for the '<em><b>Errors</b></em>' attribute list feature. <!-- begin-user-doc --> <!-- * end-user-doc --> + * * @generated */ EAttribute CDO_RESOURCE__ERRORS = eINSTANCE.getCDOResource_Errors(); /** - * The meta object literal for the '<em><b>Warnings</b></em>' attribute list feature. - * <!-- begin-user-doc --> <!-- + * The meta object literal for the '<em><b>Warnings</b></em>' attribute list feature. <!-- begin-user-doc --> <!-- * end-user-doc --> + * * @generated */ EAttribute CDO_RESOURCE__WARNINGS = eINSTANCE.getCDOResource_Warnings(); /** - * The meta object literal for the '<em><b>Time Stamp</b></em>' attribute feature. - * <!-- begin-user-doc --> <!-- + * The meta object literal for the '<em><b>Time Stamp</b></em>' attribute feature. <!-- begin-user-doc --> <!-- * end-user-doc --> + * * @generated */ EAttribute CDO_RESOURCE__TIME_STAMP = eINSTANCE.getCDOResource_TimeStamp(); /** - * The meta object literal for the '<em>Resource Set</em>' data type. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The meta object literal for the '<em>Resource Set</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @see org.eclipse.emf.ecore.resource.ResourceSet * @see org.eclipse.emf.cdo.eresource.impl.EresourcePackageImpl#getResourceSet() * @generated @@ -691,8 +691,8 @@ public interface EresourcePackage extends EPackage EDataType RESOURCE_SET = eINSTANCE.getResourceSet(); /** - * The meta object literal for the '<em>URI</em>' data type. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The meta object literal for the '<em>URI</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @see org.eclipse.emf.common.util.URI * @see org.eclipse.emf.cdo.eresource.impl.EresourcePackageImpl#getURI() * @generated @@ -700,8 +700,8 @@ public interface EresourcePackage extends EPackage EDataType URI = eINSTANCE.getURI(); /** - * The meta object literal for the '<em>Diagnostic</em>' data type. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The meta object literal for the '<em>Diagnostic</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @see org.eclipse.emf.ecore.resource.Resource.Diagnostic * @see org.eclipse.emf.cdo.eresource.impl.EresourcePackageImpl#getDiagnostic() * @generated diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceFolderImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceFolderImpl.java index d088099ace..ad9dac8cb3 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceFolderImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceFolderImpl.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation * - * $Id: CDOResourceFolderImpl.java,v 1.4 2008-12-29 14:53:10 estepper Exp $ + * $Id: CDOResourceFolderImpl.java,v 1.5 2009-01-10 07:09:05 estepper Exp $ */ package org.eclipse.emf.cdo.eresource.impl; @@ -23,19 +23,19 @@ import org.eclipse.emf.ecore.EClass; * <!-- 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> - * + * <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 { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ protected CDOResourceFolderImpl() @@ -69,6 +69,7 @@ public class CDOResourceFolderImpl extends CDOResourceNodeImpl implements CDORes /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ @Override @@ -79,6 +80,7 @@ public class CDOResourceFolderImpl extends CDOResourceNodeImpl implements CDORes /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ @SuppressWarnings("unchecked") diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceNodeImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceNodeImpl.java index 369715d450..e61de4c331 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceNodeImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceNodeImpl.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation * - * $Id: CDOResourceNodeImpl.java,v 1.6 2008-12-29 14:53:10 estepper Exp $ + * $Id: CDOResourceNodeImpl.java,v 1.7 2009-01-10 07:09:05 estepper Exp $ */ package org.eclipse.emf.cdo.eresource.impl; @@ -46,6 +46,7 @@ public abstract class CDOResourceNodeImpl extends CDOObjectImpl implements CDORe { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ protected CDOResourceNodeImpl() @@ -55,6 +56,7 @@ public abstract class CDOResourceNodeImpl extends CDOObjectImpl implements CDORe /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ @Override @@ -65,6 +67,7 @@ public abstract class CDOResourceNodeImpl extends CDOObjectImpl implements CDORe /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ @Override @@ -75,6 +78,7 @@ public abstract class CDOResourceNodeImpl extends CDOObjectImpl implements CDORe /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public CDOResourceFolder getFolder() @@ -84,6 +88,7 @@ public abstract class CDOResourceNodeImpl extends CDOObjectImpl implements CDORe /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public void setFolderGen(CDOResourceFolder newFolder) @@ -123,6 +128,7 @@ public abstract class CDOResourceNodeImpl extends CDOObjectImpl implements CDORe /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public String getName() @@ -132,6 +138,7 @@ public abstract class CDOResourceNodeImpl extends CDOObjectImpl implements CDORe /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public void setNameGen(String newName) 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 f09859ecd5..7ba186bae6 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 @@ -25,13 +25,14 @@ import org.eclipse.emf.ecore.plugin.EcorePlugin; /** * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc --> + * * @generated */ public class EresourceFactoryImpl extends EFactoryImpl implements EresourceFactory { /** - * Creates the default factory implementation. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Creates the default factory implementation. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public static EresourceFactory init() @@ -53,8 +54,8 @@ public class EresourceFactoryImpl extends EFactoryImpl implements EresourceFacto } /** - * Creates an instance of the factory. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Creates an instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EresourceFactoryImpl() @@ -64,6 +65,7 @@ public class EresourceFactoryImpl extends EFactoryImpl implements EresourceFacto /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ @Override @@ -82,6 +84,7 @@ public class EresourceFactoryImpl extends EFactoryImpl implements EresourceFacto /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ @Override @@ -98,6 +101,7 @@ public class EresourceFactoryImpl extends EFactoryImpl implements EresourceFacto /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ @Override @@ -126,6 +130,7 @@ public class EresourceFactoryImpl extends EFactoryImpl implements EresourceFacto /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public CDOResource createCDOResource() @@ -156,6 +161,7 @@ public class EresourceFactoryImpl extends EFactoryImpl implements EresourceFacto /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EresourcePackage getEresourcePackage() @@ -165,6 +171,7 @@ public class EresourceFactoryImpl extends EFactoryImpl implements EresourceFacto /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @deprecated * @generated */ 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 0dfb9ef2e3..f544416125 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 @@ -28,42 +28,49 @@ import org.eclipse.emf.ecore.resource.Resource.Diagnostic; /** * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc --> + * * @generated */ public class EresourcePackageImpl extends EPackageImpl implements EresourcePackage { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ private EClass cdoResourceNodeEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ private EClass cdoResourceFolderEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ private EClass cdoResourceEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ private EDataType resourceSetEDataType = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ private EDataType uriEDataType = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ private EDataType diagnosticEDataType = null; @@ -88,27 +95,24 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ private static boolean isInited = false; /** - * Creates, registers, and initializes the <b>Package</b> for this - * model, and for any others upon which it depends. Simple - * dependencies are satisfied by calling this method on all - * dependent packages before doing anything else. This method drives - * initialization for interdependent packages directly, in parallel - * with this package, itself. - * <p>Of this package and its interdependencies, all packages which - * have not yet been registered by their URI values are first created - * and registered. The packages are then initialized in two steps: - * meta-model objects for all of the packages are created before any - * are initialized, since one package's meta-model objects may refer to - * those of another. - * <p>Invocation of this method will not affect any packages that have - * already been initialized. - * <!-- begin-user-doc --> + * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends. + * Simple dependencies are satisfied by calling this method on all dependent packages before doing anything else. This + * method drives initialization for interdependent packages directly, in parallel with this package, itself. + * <p> + * Of this package and its interdependencies, all packages which have not yet been registered by their URI values are + * first created and registered. The packages are then initialized in two steps: meta-model objects for all of the + * packages are created before any are initialized, since one package's meta-model objects may refer to those of + * another. + * <p> + * Invocation of this method will not affect any packages that have already been initialized. <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @see #eNS_URI * @see #createPackageContents() * @see #initializePackageContents() @@ -209,6 +213,7 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EClass getCDOResource() @@ -218,6 +223,7 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EAttribute getCDOResource_ResourceSet() @@ -227,6 +233,7 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EAttribute getCDOResource_URI() @@ -236,6 +243,7 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EReference getCDOResource_Contents() @@ -245,6 +253,7 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EAttribute getCDOResource_Modified() @@ -254,6 +263,7 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EAttribute getCDOResource_Loaded() @@ -263,6 +273,7 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EAttribute getCDOResource_TrackingModification() @@ -272,6 +283,7 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EAttribute getCDOResource_Errors() @@ -281,6 +293,7 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EAttribute getCDOResource_Warnings() @@ -290,6 +303,7 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EAttribute getCDOResource_TimeStamp() @@ -299,6 +313,7 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EDataType getResourceSet() @@ -308,6 +323,7 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EDataType getURI() @@ -317,6 +333,7 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EDataType getDiagnostic() @@ -326,6 +343,7 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EresourceFactory getEresourceFactory() @@ -335,14 +353,15 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ private boolean isCreated = false; /** - * Creates the meta-model objects for the package. This method is - * guarded to have no affect on any invocation but its first. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Creates the meta-model objects for the package. This method is guarded to have no affect on any invocation but its + * first. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public void createPackageContents() @@ -379,14 +398,15 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ private boolean isInitialized = false; /** - * Complete the initialization of the package and its meta-model. This - * method is guarded to have no affect on any invocation but its first. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Complete the initialization of the package and its meta-model. This method is guarded to have no affect on any + * invocation but its first. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public void initializePackageContents() diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/util/EresourceAdapterFactory.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/util/EresourceAdapterFactory.java index 131d4deeca..b682d6a099 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/util/EresourceAdapterFactory.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/util/EresourceAdapterFactory.java @@ -23,21 +23,22 @@ import org.eclipse.emf.ecore.EObject; /** * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter <code>createXXX</code> * method for each class of the model. <!-- end-user-doc --> + * * @see org.eclipse.emf.cdo.eresource.EresourcePackage * @generated */ public class EresourceAdapterFactory extends AdapterFactoryImpl { /** - * The cached model package. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ protected static EresourcePackage modelPackage; /** - * Creates an instance of the adapter factory. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EresourceAdapterFactory() @@ -49,10 +50,10 @@ public class EresourceAdapterFactory extends AdapterFactoryImpl } /** - * Returns whether this factory is applicable for the type of the object. - * <!-- begin-user-doc --> This implementation + * Returns whether this factory is applicable for the type of the object. <!-- begin-user-doc --> This implementation * returns <code>true</code> if the object is either the model's package or is an instance object of the model. <!-- * end-user-doc --> + * * @return whether this factory is applicable for the type of the object. * @generated */ @@ -71,8 +72,8 @@ public class EresourceAdapterFactory extends AdapterFactoryImpl } /** - * The switch that delegates to the <code>createXXX</code> methods. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The switch that delegates to the <code>createXXX</code> methods. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ protected EresourceSwitch<Adapter> modelSwitch = new EresourceSwitch<Adapter>() @@ -103,9 +104,10 @@ public class EresourceAdapterFactory extends AdapterFactoryImpl }; /** - * Creates an adapter for the <code>target</code>. - * <!-- begin-user-doc --> <!-- end-user-doc --> - * @param target the object to adapt. + * Creates an adapter for the <code>target</code>. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @param target + * the object to adapt. * @return the adapter for the <code>target</code>. * @generated */ @@ -116,8 +118,8 @@ public class EresourceAdapterFactory extends AdapterFactoryImpl } /** - * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.eresource.CDOResourceNode <em>CDO Resource Node</em>}'. - * <!-- begin-user-doc --> This default implementation returns null so that we can + * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.eresource.CDOResourceNode + * <em>CDO Resource Node</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can * easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. * * @since 2.0<!-- end-user-doc --> @@ -131,8 +133,8 @@ public class EresourceAdapterFactory extends AdapterFactoryImpl } /** - * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.eresource.CDOResourceFolder <em>CDO Resource Folder</em>}'. - * <!-- begin-user-doc --> This default implementation returns null so that we can + * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.eresource.CDOResourceFolder + * <em>CDO Resource Folder</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can * easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. * * @since 2.0<!-- end-user-doc --> @@ -146,9 +148,10 @@ public class EresourceAdapterFactory extends AdapterFactoryImpl } /** - * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.eresource.CDOResource <em>CDO Resource</em>}'. - * <!-- begin-user-doc --> This default implementation returns null so that we can easily + * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.eresource.CDOResource + * <em>CDO Resource</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc --> + * * @return the new adapter. * @see org.eclipse.emf.cdo.eresource.CDOResource * @generated @@ -159,9 +162,9 @@ public class EresourceAdapterFactory extends AdapterFactoryImpl } /** - * Creates a new adapter for the default case. - * <!-- begin-user-doc --> This default implementation returns null. <!-- + * Creates a new adapter for the default case. <!-- begin-user-doc --> This default implementation returns null. <!-- * end-user-doc --> + * * @return the new adapter. * @generated */ 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 5457012395..7ad369b56a 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 @@ -25,21 +25,22 @@ import java.util.List; * {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model, * starting with the actual class of the object and proceeding up the inheritance hierarchy until a non-null result is * returned, which is the result of the switch. <!-- end-user-doc --> + * * @see org.eclipse.emf.cdo.eresource.EresourcePackage * @generated */ public class EresourceSwitch<T> { /** - * The cached model package - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The cached model package <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ protected static EresourcePackage modelPackage; /** - * Creates an instance of the switch. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EresourceSwitch() @@ -53,6 +54,7 @@ public class EresourceSwitch<T> /** * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @return the first non-null result returned by a <code>caseXXX</code> call. * @generated */ @@ -64,6 +66,7 @@ public class EresourceSwitch<T> /** * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @return the first non-null result returned by a <code>caseXXX</code> call. * @generated */ @@ -83,6 +86,7 @@ public class EresourceSwitch<T> /** * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @return the first non-null result returned by a <code>caseXXX</code> call. * @generated */ @@ -124,12 +128,12 @@ public class EresourceSwitch<T> } /** - * Returns the result of interpreting the object as an instance of '<em>CDO Resource Node</em>'. - * <!-- begin-user-doc + * Returns the result of interpreting the object as an instance of '<em>CDO Resource Node</em>'. <!-- begin-user-doc * --> This implementation returns null; returning a non-null result will terminate the switch. * * @since 2.0<!-- end-user-doc --> - * @param object the target of the switch. + * @param object + * the target of the switch. * @return the result of interpreting the object as an instance of '<em>CDO Resource Node</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated @@ -140,12 +144,12 @@ public class EresourceSwitch<T> } /** - * Returns the result of interpreting the object as an instance of '<em>CDO Resource Folder</em>'. - * <!-- begin-user-doc + * Returns the result of interpreting the object as an instance of '<em>CDO Resource Folder</em>'. <!-- begin-user-doc * --> This implementation returns null; returning a non-null result will terminate the switch. * * @since 2.0 <!-- end-user-doc --> - * @param object the target of the switch. + * @param object + * the target of the switch. * @return the result of interpreting the object as an instance of '<em>CDO Resource Folder</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated @@ -156,10 +160,11 @@ public class EresourceSwitch<T> } /** - * Returns the result of interpreting the object as an instance of '<em>CDO Resource</em>'. - * <!-- begin-user-doc --> + * Returns the result of interpreting the object as an instance of '<em>CDO Resource</em>'. <!-- begin-user-doc --> * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc --> - * @param object the target of the switch. + * + * @param object + * the target of the switch. * @return the result of interpreting the object as an instance of '<em>CDO Resource</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated @@ -170,11 +175,12 @@ public class EresourceSwitch<T> } /** - * Returns the result of interpreting the object as an instance of '<em>EObject</em>'. - * <!-- begin-user-doc --> This + * Returns the result of interpreting the object as an instance of '<em>EObject</em>'. <!-- begin-user-doc --> This * implementation returns null; returning a non-null result will terminate the switch, but this is the last case * anyway. <!-- end-user-doc --> - * @param object the target of the switch. + * + * @param object + * the target of the switch. * @return the result of interpreting the object as an instance of '<em>EObject</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) * @generated 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 2387655c69..71076dc661 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 @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: CDOResourceFolderValidator.java,v 1.1 2008-12-29 14:53:09 estepper Exp $ + * $Id: CDOResourceFolderValidator.java,v 1.2 2009-01-10 07:09:05 estepper Exp $ */ package org.eclipse.emf.cdo.eresource.validation; @@ -11,10 +11,10 @@ import org.eclipse.emf.cdo.eresource.CDOResourceNode; import org.eclipse.emf.common.util.EList; /** - * A sample validator interface for {@link org.eclipse.emf.cdo.eresource.CDOResourceFolder}. - * This doesn't really do 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. + * A sample validator interface for {@link org.eclipse.emf.cdo.eresource.CDOResourceFolder}. This doesn't really do + * 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. */ 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 2607cd58dc..1c8bc5864a 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 @@ -2,17 +2,17 @@ * <copyright> * </copyright> * - * $Id: CDOResourceNodeValidator.java,v 1.1 2008-12-29 14:53:09 estepper Exp $ + * $Id: CDOResourceNodeValidator.java,v 1.2 2009-01-10 07:09:05 estepper Exp $ */ package org.eclipse.emf.cdo.eresource.validation; import org.eclipse.emf.cdo.eresource.CDOResourceFolder; /** - * A sample validator interface for {@link org.eclipse.emf.cdo.eresource.CDOResourceNode}. - * This doesn't really do 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. + * A sample validator interface for {@link org.eclipse.emf.cdo.eresource.CDOResourceNode}. This doesn't really do + * 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. */ 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 be507083b6..dc8bf1dfa8 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 @@ -13,10 +13,10 @@ import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.ecore.resource.Resource.Diagnostic; /** - * A sample validator interface for {@link org.eclipse.emf.cdo.eresource.CDOResource}. - * This doesn't really do 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. + * A sample validator interface for {@link org.eclipse.emf.cdo.eresource.CDOResource}. This doesn't really do 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. */ public interface CDOResourceValidator { diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOAuditImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOAuditImpl.java index e908625f9a..9286e06a5a 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOAuditImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOAuditImpl.java @@ -14,7 +14,7 @@ import org.eclipse.emf.cdo.CDOAudit; import org.eclipse.emf.cdo.common.id.CDOID; import org.eclipse.emf.cdo.common.revision.CDORevision; import org.eclipse.emf.cdo.common.revision.CDORevisionResolver; -import org.eclipse.emf.cdo.spi.common.InternalCDORevision; +import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision; import org.eclipse.emf.internal.cdo.protocol.CDOClientProtocol; import org.eclipse.emf.internal.cdo.protocol.SetAuditRequest; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOCollectionLoadingPolicyImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOCollectionLoadingPolicyImpl.java index 65ffc2fdf3..26beb66ebf 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOCollectionLoadingPolicyImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOCollectionLoadingPolicyImpl.java @@ -14,7 +14,7 @@ import org.eclipse.emf.cdo.CDOCollectionLoadingPolicy; import org.eclipse.emf.cdo.CDORevisionManager; import org.eclipse.emf.cdo.common.model.CDOFeature; import org.eclipse.emf.cdo.common.revision.CDORevision; -import org.eclipse.emf.cdo.spi.common.InternalCDORevision; +import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision; import org.eclipse.emf.internal.cdo.revision.CDOElementProxy; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOLegacyWrapper.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOLegacyWrapper.java index 0e36c1e5b2..97d5eb0b9b 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOLegacyWrapper.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOLegacyWrapper.java @@ -20,7 +20,7 @@ import org.eclipse.emf.cdo.common.protocol.CDOProtocolConstants; import org.eclipse.emf.cdo.common.revision.CDORevision; import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta; import org.eclipse.emf.cdo.eresource.CDOResource; -import org.eclipse.emf.cdo.spi.common.InternalCDORevision; +import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision; import org.eclipse.emf.cdo.util.CDOPackageRegistry; import org.eclipse.emf.internal.cdo.bundle.OM; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOMetaWrapper.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOMetaWrapper.java index 75c9a198dc..37ebcfcb95 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOMetaWrapper.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOMetaWrapper.java @@ -15,7 +15,7 @@ import org.eclipse.emf.cdo.common.id.CDOID; import org.eclipse.emf.cdo.common.model.CDOClass; import org.eclipse.emf.cdo.common.revision.CDORevision; import org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl; -import org.eclipse.emf.cdo.spi.common.InternalCDORevision; +import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision; import org.eclipse.emf.ecore.InternalEObject; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java index 8539641c9f..dcaffa7e68 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java @@ -20,7 +20,7 @@ import org.eclipse.emf.cdo.common.model.CDOFeature; import org.eclipse.emf.cdo.common.revision.CDORevision; import org.eclipse.emf.cdo.eresource.CDOResource; import org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl; -import org.eclipse.emf.cdo.spi.common.InternalCDORevision; +import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision; import org.eclipse.emf.cdo.util.CDOUtil; import org.eclipse.emf.internal.cdo.bundle.OM; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectMerger.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectMerger.java index a86b079759..16c5edbabb 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectMerger.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectMerger.java @@ -14,7 +14,7 @@ package org.eclipse.emf.internal.cdo; import org.eclipse.emf.cdo.CDOState; import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta; import org.eclipse.emf.cdo.internal.common.revision.delta.CDORevisionMerger; -import org.eclipse.emf.cdo.spi.common.InternalCDORevision; +import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision; /** * @author Simon McDuff diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDORevisionManagerImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDORevisionManagerImpl.java index 91bd4c665b..a63672b057 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDORevisionManagerImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDORevisionManagerImpl.java @@ -20,7 +20,7 @@ import org.eclipse.emf.cdo.common.model.CDOPackageManager; import org.eclipse.emf.cdo.common.revision.CDORevision; import org.eclipse.emf.cdo.common.util.TransportException; import org.eclipse.emf.cdo.internal.common.revision.CDORevisionResolverImpl; -import org.eclipse.emf.cdo.spi.common.InternalCDORevision; +import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision; import org.eclipse.emf.internal.cdo.bundle.OM; import org.eclipse.emf.internal.cdo.protocol.CDOClientProtocol; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionImpl.java index 8b668e344c..38909fcd72 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionImpl.java @@ -38,7 +38,7 @@ import org.eclipse.emf.cdo.common.revision.CDORevision; import org.eclipse.emf.cdo.common.revision.CDORevisionFactory; import org.eclipse.emf.cdo.common.revision.CDORevisionUtil; import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta; -import org.eclipse.emf.cdo.spi.common.InternalCDORevision; +import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision; import org.eclipse.emf.cdo.util.CDOPackageRegistry; import org.eclipse.emf.cdo.util.CDOUtil; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionPackageManagerImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionPackageManagerImpl.java index 481ef2afcd..a3e7693e1c 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionPackageManagerImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionPackageManagerImpl.java @@ -21,7 +21,7 @@ import org.eclipse.emf.cdo.common.model.CDOPackage; import org.eclipse.emf.cdo.common.model.CDOPackageInfo; import org.eclipse.emf.cdo.common.util.TransportException; import org.eclipse.emf.cdo.internal.common.model.CDOPackageManagerImpl; -import org.eclipse.emf.cdo.spi.common.InternalCDOPackage; +import org.eclipse.emf.cdo.spi.common.model.InternalCDOPackage; import org.eclipse.emf.internal.cdo.bundle.OM; import org.eclipse.emf.internal.cdo.protocol.CDOClientProtocol; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java index 2f0387acb0..b867f717a9 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java @@ -21,7 +21,7 @@ import org.eclipse.emf.cdo.common.revision.CDORevision; import org.eclipse.emf.cdo.common.revision.CDORevisionFactory; import org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDelta; import org.eclipse.emf.cdo.common.util.TransportException; -import org.eclipse.emf.cdo.spi.common.InternalCDORevision; +import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision; import org.eclipse.emf.cdo.util.InvalidObjectException; import org.eclipse.emf.internal.cdo.bundle.OM; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStore.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStore.java index 0a75811fe2..98afef0b97 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStore.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStore.java @@ -30,7 +30,7 @@ import org.eclipse.emf.cdo.internal.common.revision.delta.CDOMoveFeatureDeltaImp import org.eclipse.emf.cdo.internal.common.revision.delta.CDORemoveFeatureDeltaImpl; import org.eclipse.emf.cdo.internal.common.revision.delta.CDOSetFeatureDeltaImpl; import org.eclipse.emf.cdo.internal.common.revision.delta.CDOUnsetFeatureDeltaImpl; -import org.eclipse.emf.cdo.spi.common.InternalCDORevision; +import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision; import org.eclipse.emf.internal.cdo.bundle.OM; import org.eclipse.emf.internal.cdo.revision.CDOElementProxy; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOTransactionImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOTransactionImpl.java index 750c66e35d..430a8a7a20 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOTransactionImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOTransactionImpl.java @@ -38,8 +38,8 @@ import org.eclipse.emf.cdo.eresource.CDOResourceNode; import org.eclipse.emf.cdo.eresource.EresourceFactory; import org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl; import org.eclipse.emf.cdo.eresource.impl.CDOResourceNodeImpl; -import org.eclipse.emf.cdo.spi.common.InternalCDOPackage; -import org.eclipse.emf.cdo.spi.common.InternalCDORevisionDelta; +import org.eclipse.emf.cdo.spi.common.model.InternalCDOPackage; +import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionDelta; import org.eclipse.emf.cdo.util.CDOURIUtil; import org.eclipse.emf.internal.cdo.bundle.OM; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java index ed7e21c020..1ab443f9b5 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java @@ -43,7 +43,7 @@ import org.eclipse.emf.cdo.eresource.CDOResource; import org.eclipse.emf.cdo.eresource.CDOResourceFolder; import org.eclipse.emf.cdo.eresource.CDOResourceNode; import org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl; -import org.eclipse.emf.cdo.spi.common.InternalCDORevision; +import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision; import org.eclipse.emf.cdo.util.CDOURIUtil; import org.eclipse.emf.cdo.util.CDOUtil; import org.eclipse.emf.cdo.util.DanglingReferenceException; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/InternalCDOObject.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/InternalCDOObject.java index 3a873be884..f8f87552bb 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/InternalCDOObject.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/InternalCDOObject.java @@ -15,7 +15,7 @@ import org.eclipse.emf.cdo.CDOState; import org.eclipse.emf.cdo.CDOView; import org.eclipse.emf.cdo.common.id.CDOID; import org.eclipse.emf.cdo.common.revision.CDORevision; -import org.eclipse.emf.cdo.spi.common.InternalCDORevision; +import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.InternalEObject; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/InternalCDOView.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/InternalCDOView.java index 23f22bf303..57e357dd82 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/InternalCDOView.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/InternalCDOView.java @@ -18,7 +18,7 @@ import org.eclipse.emf.cdo.common.id.CDOIDAndVersion; import org.eclipse.emf.cdo.common.id.CDOIDProvider; import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta; import org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl; -import org.eclipse.emf.cdo.spi.common.InternalCDORevision; +import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision; import org.eclipse.net4j.util.concurrent.RWLockManager; import org.eclipse.net4j.util.lifecycle.ILifecycle; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitTransactionRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitTransactionRequest.java index 40b2de718b..254884e980 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitTransactionRequest.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitTransactionRequest.java @@ -35,7 +35,7 @@ import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta; import org.eclipse.emf.cdo.eresource.CDOResource; import org.eclipse.emf.cdo.internal.common.io.CDODataInputImpl; import org.eclipse.emf.cdo.internal.common.io.CDODataOutputImpl; -import org.eclipse.emf.cdo.spi.common.InternalCDOPackage; +import org.eclipse.emf.cdo.spi.common.model.InternalCDOPackage; import org.eclipse.emf.internal.cdo.InternalCDOCommitContext; import org.eclipse.emf.internal.cdo.InternalCDOSession; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadChunkRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadChunkRequest.java index 594cadf9c8..e8d0295381 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadChunkRequest.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadChunkRequest.java @@ -15,7 +15,7 @@ import org.eclipse.emf.cdo.common.io.CDODataInput; import org.eclipse.emf.cdo.common.io.CDODataOutput; import org.eclipse.emf.cdo.common.model.CDOFeature; import org.eclipse.emf.cdo.common.protocol.CDOProtocolConstants; -import org.eclipse.emf.cdo.spi.common.InternalCDORevision; +import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision; import org.eclipse.emf.internal.cdo.bundle.OM; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadRevisionRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadRevisionRequest.java index bf6a2b88a6..a6f1ec3530 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadRevisionRequest.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadRevisionRequest.java @@ -16,7 +16,7 @@ import org.eclipse.emf.cdo.common.id.CDOID; import org.eclipse.emf.cdo.common.io.CDODataInput; import org.eclipse.emf.cdo.common.io.CDODataOutput; import org.eclipse.emf.cdo.common.protocol.CDOProtocolConstants; -import org.eclipse.emf.cdo.spi.common.InternalCDORevision; +import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision; import org.eclipse.emf.internal.cdo.CDORevisionManagerImpl; import org.eclipse.emf.internal.cdo.bundle.OM; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/SyncRevisionRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/SyncRevisionRequest.java index 3bed04dd67..ca0d121e6a 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/SyncRevisionRequest.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/SyncRevisionRequest.java @@ -19,7 +19,7 @@ import org.eclipse.emf.cdo.common.io.CDODataInput; import org.eclipse.emf.cdo.common.io.CDODataOutput; import org.eclipse.emf.cdo.common.protocol.CDOProtocolConstants; import org.eclipse.emf.cdo.common.revision.CDORevision; -import org.eclipse.emf.cdo.spi.common.InternalCDORevision; +import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision; import org.eclipse.emf.internal.cdo.CDORevisionManagerImpl; import org.eclipse.emf.internal.cdo.CDOTimeStampContextImpl; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/VerifyRevisionRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/VerifyRevisionRequest.java index e13fee3c68..0e7d867e6c 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/VerifyRevisionRequest.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/VerifyRevisionRequest.java @@ -15,7 +15,7 @@ import org.eclipse.emf.cdo.common.io.CDODataInput; import org.eclipse.emf.cdo.common.io.CDODataOutput; import org.eclipse.emf.cdo.common.protocol.CDOProtocolConstants; import org.eclipse.emf.cdo.common.revision.CDORevision; -import org.eclipse.emf.cdo.spi.common.InternalCDORevision; +import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision; import org.eclipse.emf.internal.cdo.bundle.OM; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/revision/CDOListWithElementProxiesImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/revision/CDOListWithElementProxiesImpl.java index 86c14585ef..36867fed7f 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/revision/CDOListWithElementProxiesImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/revision/CDOListWithElementProxiesImpl.java @@ -14,8 +14,8 @@ 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.internal.common.revision.CDOListImpl; -import org.eclipse.emf.cdo.spi.common.InternalCDOList; -import org.eclipse.emf.cdo.spi.common.InternalCDORevision; +import org.eclipse.emf.cdo.spi.common.revision.InternalCDOList; +import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision; /** * @author Simon McDuff diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CDOPackageRegistryImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CDOPackageRegistryImpl.java index 1b63672c5d..6047687e4e 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CDOPackageRegistryImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CDOPackageRegistryImpl.java @@ -20,7 +20,7 @@ import org.eclipse.emf.cdo.CDOView; import org.eclipse.emf.cdo.common.id.CDOIDMetaRange; import org.eclipse.emf.cdo.common.model.CDOPackage; import org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDelta; -import org.eclipse.emf.cdo.spi.common.InternalCDOPackage; +import org.eclipse.emf.cdo.spi.common.model.InternalCDOPackage; import org.eclipse.emf.cdo.util.CDOPackageRegistry; import org.eclipse.emf.cdo.util.CDOPackageType; import org.eclipse.emf.cdo.util.CDOPackageTypeRegistry; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ModelUtil.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ModelUtil.java index 706c886012..a6032d53e4 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ModelUtil.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ModelUtil.java @@ -27,9 +27,9 @@ import org.eclipse.emf.cdo.common.model.resource.CDOResourceNodeClass; import org.eclipse.emf.cdo.common.model.resource.CDOResourcePackage; import org.eclipse.emf.cdo.common.util.CDOException; import org.eclipse.emf.cdo.eresource.EresourcePackage; -import org.eclipse.emf.cdo.spi.common.InternalCDOClass; -import org.eclipse.emf.cdo.spi.common.InternalCDOFeature; -import org.eclipse.emf.cdo.spi.common.InternalCDOPackage; +import org.eclipse.emf.cdo.spi.common.model.InternalCDOClass; +import org.eclipse.emf.cdo.spi.common.model.InternalCDOFeature; +import org.eclipse.emf.cdo.spi.common.model.InternalCDOPackage; import org.eclipse.emf.cdo.util.CDOPackageRegistry; import org.eclipse.emf.cdo.util.EMFUtil; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/RevisionAdjuster.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/RevisionAdjuster.java index 09d7b10b02..224e4123cb 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/RevisionAdjuster.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/RevisionAdjuster.java @@ -22,8 +22,8 @@ import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta; import org.eclipse.emf.cdo.common.revision.delta.CDOSetFeatureDelta; import org.eclipse.emf.cdo.internal.common.revision.delta.CDOFeatureDeltaVisitorImpl; import org.eclipse.emf.cdo.internal.common.revision.delta.CDOListFeatureDeltaImpl; -import org.eclipse.emf.cdo.spi.common.InternalCDOList; -import org.eclipse.emf.cdo.spi.common.InternalCDORevision; +import org.eclipse.emf.cdo.spi.common.revision.InternalCDOList; +import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision; import org.eclipse.emf.internal.cdo.revision.CDOElementProxy; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/ObjectConflictResolver.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/ObjectConflictResolver.java index 123505fc6b..e418671a3f 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/ObjectConflictResolver.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/ObjectConflictResolver.java @@ -24,8 +24,8 @@ import org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDelta; import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta; import org.eclipse.emf.cdo.common.util.CDOException; import org.eclipse.emf.cdo.internal.common.revision.delta.CDORevisionMerger; -import org.eclipse.emf.cdo.spi.common.InternalCDORevision; -import org.eclipse.emf.cdo.spi.common.InternalCDORevisionDelta; +import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision; +import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionDelta; import org.eclipse.emf.cdo.util.CDODefaultTransactionHandler; import org.eclipse.emf.internal.cdo.CDOObjectMerger; |