From fcd33409206c1bda9a386ffe05fb212715681016 Mon Sep 17 00:00:00 2001 From: Eike Stepper Date: Wed, 12 Aug 2009 17:16:39 +0000 Subject: Upgraded all models --- .../org/eclipse/emf/cdo/eresource/CDOResource.java | 102 ++++---- .../emf/cdo/eresource/CDOResourceFolder.java | 8 +- .../eclipse/emf/cdo/eresource/CDOResourceNode.java | 22 +- .../emf/cdo/eresource/EresourceFactory.java | 16 +- .../emf/cdo/eresource/EresourcePackage.java | 260 ++++++++++----------- .../cdo/eresource/impl/CDOResourceFolderImpl.java | 16 +- .../emf/cdo/eresource/impl/CDOResourceImpl.java | 39 ++-- .../cdo/eresource/impl/CDOResourceNodeImpl.java | 7 - .../cdo/eresource/impl/EresourceFactoryImpl.java | 17 +- .../cdo/eresource/impl/EresourcePackageImpl.java | 82 ++----- .../eresource/util/EresourceAdapterFactory.java | 41 ++-- .../emf/cdo/eresource/util/EresourceSwitch.java | 48 ++-- 12 files changed, 285 insertions(+), 373 deletions(-) (limited to 'plugins/org.eclipse.emf.cdo/src/org/eclipse') 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 f2b4b9292e..8c76c5605a 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,20 +22,22 @@ import org.eclipse.core.runtime.IProgressMonitor; * A representation of the model object 'CDO Resource'. * * @extends Resource - *

- * The following features are supported: - *

- *

+ * + *

+ * The following features are supported: + *

+ *

+ * * @see org.eclipse.emf.cdo.eresource.EresourcePackage#getCDOResource() * @model * @generated @@ -49,13 +51,13 @@ public interface CDOResource extends CDOResourceNode, Resource public static final String OPTION_SAVE_PROGRESS_MONITOR = IProgressMonitor.class.getName(); /** - * Returns the value of the 'Resource Set' attribute. + * Returns the value of the 'Resource Set' attribute. + * *

* If the meaning of the 'Resource Set' attribute isn't clear, there really should be more of a description * here... *

* - * * @return the value of the 'Resource Set' attribute. * @see #setResourceSet(ResourceSet) * @see org.eclipse.emf.cdo.eresource.EresourcePackage#getCDOResource_ResourceSet() @@ -65,23 +67,21 @@ public interface CDOResource extends CDOResourceNode, Resource ResourceSet getResourceSet(); /** - * Sets the value of the '{@link org.eclipse.emf.cdo.eresource.CDOResource#getResourceSet Resource Set}' - * attribute. - * - * @param value - * the new value of the 'Resource Set' attribute. + * Sets the value of the '{@link org.eclipse.emf.cdo.eresource.CDOResource#getResourceSet Resource Set}' attribute. + * + * @param value the new value of the 'Resource Set' attribute. * @see #getResourceSet() * @generated */ void setResourceSet(ResourceSet value); /** - * Returns the value of the 'URI' attribute. + * Returns the value of the 'URI' attribute. + * *

* If the meaning of the 'URI' attribute isn't clear, there really should be more of a description here... *

* - * * @return the value of the 'URI' 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 'Contents' containment reference list. The list contents are of type - * {@link org.eclipse.emf.ecore.EObject}. + * Returns the value of the 'Contents' containment reference list. + * The list contents are of type {@link org.eclipse.emf.ecore.EObject}. + * *

* If the meaning of the 'Contents' containment reference list isn't clear, there really should be more of a * description here... *

* - * * @return the value of the 'Contents' 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 getContents(); /** - * Returns the value of the 'Modified' attribute. + * Returns the value of the 'Modified' attribute. + * *

* If the meaning of the 'Modified' attribute isn't clear, there really should be more of a description * here... *

* - * * @return the value of the 'Modified' attribute. * @see #setModified(boolean) * @see org.eclipse.emf.cdo.eresource.EresourcePackage#getCDOResource_Modified() @@ -136,9 +136,7 @@ public interface CDOResource extends CDOResourceNode, Resource /** * Sets the value of the '{@link org.eclipse.emf.cdo.eresource.CDOResource#isModified Modified}' attribute. * - * - * @param value - * the new value of the 'Modified' attribute. + * @param value the new value of the 'Modified' attribute. * @see #isModified() * @generated */ @@ -160,13 +158,13 @@ public interface CDOResource extends CDOResourceNode, Resource boolean isLoaded(); /** - * Returns the value of the 'Tracking Modification' attribute. + * Returns the value of the 'Tracking Modification' attribute. + * *

* If the meaning of the 'Tracking Modification' attribute isn't clear, there really should be more of a * description here... *

* - * * @return the value of the 'Tracking Modification' attribute. * @see #setTrackingModification(boolean) * @see org.eclipse.emf.cdo.eresource.EresourcePackage#getCDOResource_TrackingModification() @@ -176,58 +174,54 @@ public interface CDOResource extends CDOResourceNode, Resource boolean isTrackingModification(); /** - * Sets the value of the '{@link org.eclipse.emf.cdo.eresource.CDOResource#isTrackingModification - * Tracking Modification}' attribute. - * - * @param value - * the new value of the 'Tracking Modification' attribute. + * Sets the value of the '{@link org.eclipse.emf.cdo.eresource.CDOResource#isTrackingModification Tracking Modification}' attribute. + * + * @param value the new value of the 'Tracking Modification' attribute. * @see #isTrackingModification() * @generated */ void setTrackingModification(boolean value); /** - * Returns the value of the 'Errors' attribute list. The list contents are of type - * {@link org.eclipse.emf.ecore.resource.Resource.Diagnostic}. + * Returns the value of the 'Errors' attribute list. + * The list contents are of type {@link org.eclipse.emf.ecore.resource.Resource.Diagnostic}. + * *

* If the meaning of the 'Errors' attribute list isn't clear, there really should be more of a description * here... *

* - * * @return the value of the 'Errors' 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 getErrors(); /** - * Returns the value of the 'Warnings' attribute list. The list contents are of type - * {@link org.eclipse.emf.ecore.resource.Resource.Diagnostic}. + * Returns the value of the 'Warnings' attribute list. + * The list contents are of type {@link org.eclipse.emf.ecore.resource.Resource.Diagnostic}. + * *

* If the meaning of the 'Warnings' attribute list isn't clear, there really should be more of a description * here... *

* - * * @return the value of the 'Warnings' 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 getWarnings(); /** - * Returns the value of the 'Time Stamp' attribute. + * Returns the value of the 'Time Stamp' attribute. + * *

* If the meaning of the 'Time Stamp' attribute isn't clear, there really should be more of a description * here... *

* - * * @return the value of the 'Time Stamp' attribute. * @see #setTimeStamp(long) * @see org.eclipse.emf.cdo.eresource.EresourcePackage#getCDOResource_TimeStamp() @@ -237,11 +231,9 @@ public interface CDOResource extends CDOResourceNode, Resource long getTimeStamp(); /** - * Sets the value of the '{@link org.eclipse.emf.cdo.eresource.CDOResource#getTimeStamp Time Stamp}' - * attribute. - * - * @param value - * the new value of the 'Time Stamp' attribute. + * Sets the value of the '{@link org.eclipse.emf.cdo.eresource.CDOResource#getTimeStamp Time Stamp}' attribute. + * + * @param value the new value of the 'Time Stamp' 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 9fdca62ee0..62780faad6 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 @@ -30,15 +30,15 @@ import org.eclipse.emf.common.util.EList; public interface CDOResourceFolder extends CDOResourceNode { /** - * Returns the value of the 'Nodes' 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 Folder}'. + * Returns the value of the 'Nodes' 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 Folder}'. + * *

* If the meaning of the 'Nodes' containment reference list isn't clear, there really should be more of a * description here... *

* - * * @return the value of the 'Nodes' 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 7013097d3d..8369b134b0 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 @@ -57,14 +57,14 @@ public interface CDOResourceNode extends CDOObject public boolean isRoot(); /** - * Returns the value of the 'Folder' container reference. It is bidirectional and its opposite is ' - * {@link org.eclipse.emf.cdo.eresource.CDOResourceFolder#getNodes Nodes}'. + * Returns the value of the 'Folder' container reference. + * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.eresource.CDOResourceFolder#getNodes Nodes}'. + * *

* If the meaning of the 'Folder' container reference isn't clear, there really should be more of a * description here... *

* - * * @return the value of the 'Folder' container reference. * @see #setFolder(CDOResourceFolder) * @see org.eclipse.emf.cdo.eresource.EresourcePackage#getCDOResourceNode_Folder() @@ -75,23 +75,21 @@ public interface CDOResourceNode extends CDOObject CDOResourceFolder getFolder(); /** - * Sets the value of the '{@link org.eclipse.emf.cdo.eresource.CDOResourceNode#getFolder Folder}' container - * reference. - * - * @param value - * the new value of the 'Folder' container reference. + * Sets the value of the '{@link org.eclipse.emf.cdo.eresource.CDOResourceNode#getFolder Folder}' container reference. + * + * @param value the new value of the 'Folder' container reference. * @see #getFolder() * @generated */ void setFolder(CDOResourceFolder value); /** - * Returns the value of the 'Name' attribute. + * Returns the value of the 'Name' attribute. + * *

* If the meaning of the 'Name' attribute isn't clear, there really should be more of a description here... *

* - * * @return the value of the 'Name' attribute. * @see #setName(String) * @see org.eclipse.emf.cdo.eresource.EresourcePackage#getCDOResourceNode_Name() @@ -112,12 +110,12 @@ public interface CDOResourceNode extends CDOObject void setName(String value); /** - * Returns the value of the 'Path' attribute. + * Returns the value of the 'Path' attribute. + * *

* If the meaning of the 'Path' attribute isn't clear, there really should be more of a description here... *

* - * * @return the value of the 'Path' 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 03a306cf66..e24100c8a2 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; /** * The Factory for the model. It provides a create method for each non-abstract class of * the model. - * * @see org.eclipse.emf.cdo.eresource.EresourcePackage * @generated */ public interface EresourceFactory extends EFactory { /** - * The singleton instance of the factory. - * + * The singleton instance of the factory. + * * @generated */ EresourceFactory eINSTANCE = org.eclipse.emf.cdo.eresource.impl.EresourceFactoryImpl.init(); /** - * Returns a new object of class 'CDO Resource Folder'. + * Returns a new object of class 'CDO Resource Folder'. + * * * @since 2.0 * @return a new object of class 'CDO Resource Folder'. @@ -38,16 +38,16 @@ public interface EresourceFactory extends EFactory CDOResourceFolder createCDOResourceFolder(); /** - * Returns a new object of class 'CDO Resource'. - * + * Returns a new object of class 'CDO Resource'. + * * @return a new object of class 'CDO Resource'. * @generated */ CDOResource createCDOResource(); /** - * Returns the package supported by this factory. - * + * Returns the package supported by this factory. + * * @return the package supported by this factory. * @generated */ diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/EresourcePackage.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/EresourcePackage.java index e5526f0d47..4e354ef47a 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,7 +25,6 @@ import org.eclipse.emf.ecore.EReference; *
  • and each data type
    • * * - * * @see org.eclipse.emf.cdo.eresource.EresourceFactory * @model kind="package" * @generated @@ -33,36 +32,36 @@ import org.eclipse.emf.ecore.EReference; public interface EresourcePackage extends EPackage { /** - * The package name. - * + * The package name. + * * @generated */ String eNAME = "eresource"; //$NON-NLS-1$ /** - * The package namespace URI. - * + * The package namespace URI. + * * @generated */ String eNS_URI = "http://www.eclipse.org/emf/CDO/Eresource/2.0.0"; //$NON-NLS-1$ /** - * The package namespace name. - * + * The package namespace name. + * * @generated */ String eNS_PREFIX = "eresource"; //$NON-NLS-1$ /** - * The singleton instance of the package. - * + * The singleton instance of the package. + * * @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 - * CDO Resource Node}' class. + * The meta object id for the '{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceNodeImpl CDO Resource Node}' class. + * * * @since 2.0 * @see org.eclipse.emf.cdo.eresource.impl.CDOResourceNodeImpl @@ -72,7 +71,8 @@ public interface EresourcePackage extends EPackage int CDO_RESOURCE_NODE = 0; /** - * The feature id for the 'Folder' container reference. + * The feature id for the 'Folder' container reference. + * * * @since 2.0 * @generated @@ -81,7 +81,8 @@ public interface EresourcePackage extends EPackage int CDO_RESOURCE_NODE__FOLDER = 0; /** - * The feature id for the 'Name' attribute. + * The feature id for the 'Name' attribute. + * * * @since 2.0 * @generated @@ -90,7 +91,8 @@ public interface EresourcePackage extends EPackage int CDO_RESOURCE_NODE__NAME = 1; /** - * The feature id for the 'Path' attribute. + * The feature id for the 'Path' attribute. + * * * @since 2.0 * @generated @@ -99,7 +101,8 @@ public interface EresourcePackage extends EPackage int CDO_RESOURCE_NODE__PATH = 2; /** - * The number of structural features of the 'CDO Resource Node' class. + * The number of structural features of the 'CDO Resource Node' class. + * * * @since 2.0 * @generated @@ -108,8 +111,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 - * CDO Resource Folder}' class. + * The meta object id for the '{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceFolderImpl CDO Resource Folder}' class. + * * * @since 2.0 * @see org.eclipse.emf.cdo.eresource.impl.CDOResourceFolderImpl @@ -119,7 +122,8 @@ public interface EresourcePackage extends EPackage int CDO_RESOURCE_FOLDER = 1; /** - * The feature id for the 'Folder' container reference. + * The feature id for the 'Folder' container reference. + * * * @since 2.0 * @generated @@ -128,7 +132,8 @@ public interface EresourcePackage extends EPackage int CDO_RESOURCE_FOLDER__FOLDER = CDO_RESOURCE_NODE__FOLDER; /** - * The feature id for the 'Name' attribute. + * The feature id for the 'Name' attribute. + * * * @since 2.0 * @generated @@ -137,7 +142,8 @@ public interface EresourcePackage extends EPackage int CDO_RESOURCE_FOLDER__NAME = CDO_RESOURCE_NODE__NAME; /** - * The feature id for the 'Path' attribute. + * The feature id for the 'Path' attribute. + * * * @since 2.0 * @generated @@ -146,7 +152,8 @@ public interface EresourcePackage extends EPackage int CDO_RESOURCE_FOLDER__PATH = CDO_RESOURCE_NODE__PATH; /** - * The feature id for the 'Nodes' containment reference list. + * The feature id for the 'Nodes' containment reference list. + * * * @since 2.0 * @generated @@ -155,7 +162,8 @@ public interface EresourcePackage extends EPackage int CDO_RESOURCE_FOLDER__NODES = CDO_RESOURCE_NODE_FEATURE_COUNT + 0; /** - * The number of structural features of the 'CDO Resource Folder' class. + * The number of structural features of the 'CDO Resource Folder' class. + * * * @since 2.0 * @generated @@ -164,9 +172,8 @@ 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 CDO Resource}' - * class. - * + * The meta object id for the '{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl CDO Resource}' class. + * * @see org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl * @see org.eclipse.emf.cdo.eresource.impl.EresourcePackageImpl#getCDOResource() * @generated @@ -174,7 +181,8 @@ public interface EresourcePackage extends EPackage int CDO_RESOURCE = 2; /** - * The feature id for the 'Folder' container reference. + * The feature id for the 'Folder' container reference. + * * * @since 2.0 * @generated @@ -183,7 +191,8 @@ public interface EresourcePackage extends EPackage int CDO_RESOURCE__FOLDER = CDO_RESOURCE_NODE__FOLDER; /** - * The feature id for the 'Name' attribute. + * The feature id for the 'Name' attribute. + * * * @since 2.0 * @generated @@ -192,49 +201,49 @@ public interface EresourcePackage extends EPackage int CDO_RESOURCE__NAME = CDO_RESOURCE_NODE__NAME; /** - * The feature id for the 'Path' attribute. - * + * The feature id for the 'Path' attribute. + * * @generated * @ordered */ int CDO_RESOURCE__PATH = CDO_RESOURCE_NODE__PATH; /** - * The feature id for the 'Resource Set' attribute. - * + * The feature id for the 'Resource Set' attribute. + * * @generated * @ordered */ int CDO_RESOURCE__RESOURCE_SET = CDO_RESOURCE_NODE_FEATURE_COUNT + 0; /** - * The feature id for the 'URI' attribute. - * + * The feature id for the 'URI' attribute. + * * @generated * @ordered */ int CDO_RESOURCE__URI = CDO_RESOURCE_NODE_FEATURE_COUNT + 1; /** - * The feature id for the 'Contents' containment reference list. - * * @generated * @ordered */ int CDO_RESOURCE__CONTENTS = CDO_RESOURCE_NODE_FEATURE_COUNT + 2; /** - * The feature id for the 'Modified' attribute. - * + * The feature id for the 'Modified' attribute. + * * @generated * @ordered */ int CDO_RESOURCE__MODIFIED = CDO_RESOURCE_NODE_FEATURE_COUNT + 3; /** - * The feature id for the 'Loaded' attribute. - * + * The feature id for the 'Loaded' attribute. + * * @generated * @ordered */ @@ -250,24 +259,24 @@ public interface EresourcePackage extends EPackage int CDO_RESOURCE__TRACKING_MODIFICATION = CDO_RESOURCE_NODE_FEATURE_COUNT + 5; /** - * The feature id for the 'Errors' attribute list. - * + * The feature id for the 'Errors' attribute list. + * * @generated * @ordered */ int CDO_RESOURCE__ERRORS = CDO_RESOURCE_NODE_FEATURE_COUNT + 6; /** - * The feature id for the 'Warnings' attribute list. - * + * The feature id for the 'Warnings' attribute list. + * * @generated * @ordered */ int CDO_RESOURCE__WARNINGS = CDO_RESOURCE_NODE_FEATURE_COUNT + 7; /** - * The feature id for the 'Time Stamp' attribute. - * + * The feature id for the 'Time Stamp' attribute. + * * @generated * @ordered */ @@ -283,8 +292,8 @@ public interface EresourcePackage extends EPackage int CDO_RESOURCE_FEATURE_COUNT = CDO_RESOURCE_NODE_FEATURE_COUNT + 9; /** - * The meta object id for the 'Resource Set' data type. - * + * The meta object id for the 'Resource Set' data type. + * * @see org.eclipse.emf.ecore.resource.ResourceSet * @see org.eclipse.emf.cdo.eresource.impl.EresourcePackageImpl#getResourceSet() * @generated @@ -292,8 +301,8 @@ public interface EresourcePackage extends EPackage int RESOURCE_SET = 3; /** - * The meta object id for the 'URI' data type. - * + * The meta object id for the 'URI' data type. + * * @see org.eclipse.emf.common.util.URI * @see org.eclipse.emf.cdo.eresource.impl.EresourcePackageImpl#getURI() * @generated @@ -301,8 +310,8 @@ public interface EresourcePackage extends EPackage int URI = 4; /** - * The meta object id for the 'Diagnostic' data type. - * + * The meta object id for the 'Diagnostic' data type. + * * @see org.eclipse.emf.ecore.resource.Resource.Diagnostic * @see org.eclipse.emf.cdo.eresource.impl.EresourcePackageImpl#getDiagnostic() * @generated @@ -310,8 +319,8 @@ public interface EresourcePackage extends EPackage int DIAGNOSTIC = 5; /** - * Returns the meta object for class '{@link org.eclipse.emf.cdo.eresource.CDOResourceNode CDO Resource Node} - * '. + * Returns the meta object for class '{@link org.eclipse.emf.cdo.eresource.CDOResourceNode CDO Resource Node}'. + * * * @since 2.0 * @return the meta object for class 'CDO Resource Node'. @@ -321,8 +330,8 @@ public interface EresourcePackage extends EPackage EClass getCDOResourceNode(); /** - * Returns the meta object for the container reference ' - * {@link org.eclipse.emf.cdo.eresource.CDOResourceNode#getFolder Folder}'. + * Returns the meta object for the container reference '{@link org.eclipse.emf.cdo.eresource.CDOResourceNode#getFolder Folder}'. + * * * @since 2.0 * @return the meta object for the container reference 'Folder'. @@ -333,8 +342,8 @@ public interface EresourcePackage extends EPackage EReference getCDOResourceNode_Folder(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.eresource.CDOResourceNode#getName - * Name}'. + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.eresource.CDOResourceNode#getName Name}'. + * * * @since 2.0 * @return the meta object for the attribute 'Name'. @@ -345,8 +354,8 @@ public interface EresourcePackage extends EPackage EAttribute getCDOResourceNode_Name(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.eresource.CDOResourceNode#getPath - * Path}'. + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.eresource.CDOResourceNode#getPath Path}'. + * * * @since 2.0 * @return the meta object for the attribute 'Path'. @@ -357,8 +366,8 @@ public interface EresourcePackage extends EPackage EAttribute getCDOResourceNode_Path(); /** - * Returns the meta object for class '{@link org.eclipse.emf.cdo.eresource.CDOResourceFolder - * CDO Resource Folder}'. + * Returns the meta object for class '{@link org.eclipse.emf.cdo.eresource.CDOResourceFolder CDO Resource Folder}'. + * * * @since 2.0 * @return the meta object for class 'CDO Resource Folder'. @@ -368,8 +377,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 Nodes}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.eresource.CDOResourceFolder#getNodes Nodes}'. + * * * @since 2.0 * @return the meta object for the containment reference list 'Nodes'. @@ -390,9 +399,8 @@ public interface EresourcePackage extends EPackage EClass getCDOResource(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.eresource.CDOResource#getResourceSet - * Resource Set}'. - * + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.eresource.CDOResource#getResourceSet Resource Set}'. + * * @return the meta object for the attribute 'Resource Set'. * @see org.eclipse.emf.cdo.eresource.CDOResource#getResourceSet() * @see #getCDOResource() @@ -403,7 +411,6 @@ public interface EresourcePackage extends EPackage /** * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.eresource.CDOResource#getURI URI}'. * - * * @return the meta object for the attribute 'URI'. * @see org.eclipse.emf.cdo.eresource.CDOResource#getURI() * @see #getCDOResource() @@ -412,10 +419,9 @@ 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 Contents}'. - * * @return the meta object for the containment reference list 'Contents'. * @see org.eclipse.emf.cdo.eresource.CDOResource#getContents() * @see #getCDOResource() @@ -424,9 +430,8 @@ public interface EresourcePackage extends EPackage EReference getCDOResource_Contents(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.eresource.CDOResource#isModified - * Modified}'. - * + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.eresource.CDOResource#isModified Modified}'. + * * @return the meta object for the attribute 'Modified'. * @see org.eclipse.emf.cdo.eresource.CDOResource#isModified() * @see #getCDOResource() @@ -435,9 +440,8 @@ public interface EresourcePackage extends EPackage EAttribute getCDOResource_Modified(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.eresource.CDOResource#isLoaded - * Loaded}'. - * + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.eresource.CDOResource#isLoaded Loaded}'. + * * @return the meta object for the attribute 'Loaded'. * @see org.eclipse.emf.cdo.eresource.CDOResource#isLoaded() * @see #getCDOResource() @@ -446,9 +450,8 @@ public interface EresourcePackage extends EPackage EAttribute getCDOResource_Loaded(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.eresource.CDOResource#isTrackingModification - * Tracking Modification}'. - * + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.eresource.CDOResource#isTrackingModification Tracking Modification}'. + * * @return the meta object for the attribute 'Tracking Modification'. * @see org.eclipse.emf.cdo.eresource.CDOResource#isTrackingModification() * @see #getCDOResource() @@ -457,9 +460,8 @@ public interface EresourcePackage extends EPackage EAttribute getCDOResource_TrackingModification(); /** - * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.eresource.CDOResource#getErrors - * Errors}'. - * + * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.eresource.CDOResource#getErrors Errors}'. + * * @return the meta object for the attribute list 'Errors'. * @see org.eclipse.emf.cdo.eresource.CDOResource#getErrors() * @see #getCDOResource() @@ -468,9 +470,8 @@ public interface EresourcePackage extends EPackage EAttribute getCDOResource_Errors(); /** - * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.eresource.CDOResource#getWarnings - * Warnings}'. - * + * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.eresource.CDOResource#getWarnings Warnings}'. + * * @return the meta object for the attribute list 'Warnings'. * @see org.eclipse.emf.cdo.eresource.CDOResource#getWarnings() * @see #getCDOResource() @@ -479,9 +480,8 @@ public interface EresourcePackage extends EPackage EAttribute getCDOResource_Warnings(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.eresource.CDOResource#getTimeStamp - * Time Stamp}'. - * + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.eresource.CDOResource#getTimeStamp Time Stamp}'. + * * @return the meta object for the attribute 'Time Stamp'. * @see org.eclipse.emf.cdo.eresource.CDOResource#getTimeStamp() * @see #getCDOResource() @@ -492,7 +492,6 @@ public interface EresourcePackage extends EPackage /** * Returns the meta object for data type '{@link org.eclipse.emf.ecore.resource.ResourceSet Resource Set}'. * - * * @return the meta object for data type 'Resource Set'. * @see org.eclipse.emf.ecore.resource.ResourceSet * @model instanceClass="org.eclipse.emf.ecore.resource.ResourceSet" serializeable="false" @@ -501,9 +500,9 @@ public interface EresourcePackage extends EPackage EDataType getResourceSet(); /** - * Returns the meta object for data type '{@link org.eclipse.emf.common.util.URI URI}'. - * * @return the meta object for data type 'URI'. * @see org.eclipse.emf.common.util.URI * @model instanceClass="org.eclipse.emf.common.util.URI" @@ -512,9 +511,8 @@ public interface EresourcePackage extends EPackage EDataType getURI(); /** - * Returns the meta object for data type '{@link org.eclipse.emf.ecore.resource.Resource.Diagnostic - * Diagnostic}'. - * + * Returns the meta object for data type '{@link org.eclipse.emf.ecore.resource.Resource.Diagnostic Diagnostic}'. + * * @return the meta object for data type 'Diagnostic'. * @see org.eclipse.emf.ecore.resource.Resource.Diagnostic * @model instanceClass="org.eclipse.emf.ecore.resource.Resource.Diagnostic" serializeable="false" @@ -523,8 +521,8 @@ public interface EresourcePackage extends EPackage EDataType getDiagnostic(); /** - * Returns the factory that creates the instances of the model. - * + * Returns the factory that creates the instances of the model. + * * @return the factory that creates the instances of the model. * @generated */ @@ -539,14 +537,13 @@ public interface EresourcePackage extends EPackage *
  • and each data type
    • * * - * * @generated */ interface Literals { /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceNodeImpl - * CDO Resource Node}' class. + * The meta object literal for the '{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceNodeImpl CDO Resource Node}' class. + * * * @since 2.0 * @see org.eclipse.emf.cdo.eresource.impl.CDOResourceNodeImpl @@ -556,7 +553,8 @@ public interface EresourcePackage extends EPackage EClass CDO_RESOURCE_NODE = eINSTANCE.getCDOResourceNode(); /** - * The meta object literal for the 'Folder' container reference feature. + * The meta object literal for the 'Folder' container reference feature. + * * * @since 2.0 * @generated @@ -564,7 +562,8 @@ public interface EresourcePackage extends EPackage EReference CDO_RESOURCE_NODE__FOLDER = eINSTANCE.getCDOResourceNode_Folder(); /** - * The meta object literal for the 'Name' attribute feature. + * The meta object literal for the 'Name' attribute feature. + * * * @since 2.0 * @generated @@ -572,7 +571,8 @@ public interface EresourcePackage extends EPackage EAttribute CDO_RESOURCE_NODE__NAME = eINSTANCE.getCDOResourceNode_Name(); /** - * The meta object literal for the 'Path' attribute feature. + * The meta object literal for the 'Path' attribute feature. + * * * @since 2.0 * @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 - * CDO Resource Folder}' class. + * The meta object literal for the '{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceFolderImpl CDO Resource Folder}' class. + * * * @since 2.0 * @see org.eclipse.emf.cdo.eresource.impl.CDOResourceFolderImpl @@ -591,7 +591,8 @@ public interface EresourcePackage extends EPackage EClass CDO_RESOURCE_FOLDER = eINSTANCE.getCDOResourceFolder(); /** - * The meta object literal for the 'Nodes' containment reference list feature. * * @since 2.0 @@ -600,9 +601,8 @@ 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 CDO Resource} - * ' class. - * + * The meta object literal for the '{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl CDO Resource}' class. + * * @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 'Resource Set' attribute feature. - * * @generated */ EAttribute CDO_RESOURCE__RESOURCE_SET = eINSTANCE.getCDOResource_ResourceSet(); /** - * The meta object literal for the 'URI' attribute feature. - * * @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 'Modified' attribute feature. - * * @generated */ EAttribute CDO_RESOURCE__MODIFIED = eINSTANCE.getCDOResource_Modified(); /** - * The meta object literal for the 'Loaded' attribute feature. - * * @generated */ EAttribute CDO_RESOURCE__LOADED = eINSTANCE.getCDOResource_Loaded(); /** - * The meta object literal for the 'Tracking Modification' attribute feature. - * * @generated */ EAttribute CDO_RESOURCE__TRACKING_MODIFICATION = eINSTANCE.getCDOResource_TrackingModification(); /** - * The meta object literal for the 'Errors' attribute list feature. - * * @generated */ EAttribute CDO_RESOURCE__ERRORS = eINSTANCE.getCDOResource_Errors(); /** - * The meta object literal for the 'Warnings' attribute list feature. - * * @generated */ EAttribute CDO_RESOURCE__WARNINGS = eINSTANCE.getCDOResource_Warnings(); /** - * The meta object literal for the 'Time Stamp' attribute feature. - * * @generated */ EAttribute CDO_RESOURCE__TIME_STAMP = eINSTANCE.getCDOResource_TimeStamp(); /** - * The meta object literal for the 'Resource Set' data type. - * + * The meta object literal for the 'Resource Set' data type. + * * @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 'URI' data type. - * + * The meta object literal for the 'URI' data type. + * * @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 'Diagnostic' data type. - * + * The meta object literal for the 'Diagnostic' data type. + * * @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 f970ae44fc..beb620b2ba 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 @@ -27,19 +27,19 @@ import java.util.Map; * An implementation of the model object 'CDO Resource Folder'. * * @since 2.0 - *

    - * The following features are implemented: - *

      - *
    • {@link org.eclipse.emf.cdo.eresource.impl.CDOResourceFolderImpl#getNodes Nodes}
      • - *
    - *

    + *

    + * The following features are implemented: + *

      + *
    • {@link org.eclipse.emf.cdo.eresource.impl.CDOResourceFolderImpl#getNodes Nodes}
      • + *
    + *

    + * * @generated */ public class CDOResourceFolderImpl extends CDOResourceNodeImpl implements CDOResourceFolder { /** * - * * @generated */ protected CDOResourceFolderImpl() @@ -57,7 +57,6 @@ public class CDOResourceFolderImpl extends CDOResourceNodeImpl implements CDORes /** * - * * @generated */ @Override @@ -68,7 +67,6 @@ public class CDOResourceFolderImpl extends CDOResourceNodeImpl implements CDORes /** * - * * @generated */ @SuppressWarnings("unchecked") diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java index d9b4d97c22..588161066b 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java @@ -62,21 +62,21 @@ import java.util.Map; * An implementation of the model object 'CDO Resource'. * * @extends Resource.Internal - *

    - * The following features are implemented: - *

      - *
    • {@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#getResourceSet Resource Set}
      • - *
    • {@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#getURI URI}
      • - *
    • {@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#getContents Contents}
      • - *
    • {@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#isModified Modified}
      • - *
    • {@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#isLoaded Loaded}
      • - *
    • {@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#isTrackingModification Tracking - * Modification}
      • - *
    • {@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#getErrors Errors}
      • - *
    • {@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#getWarnings Warnings}
      • - *
    • {@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#getTimeStamp Time Stamp}
      • - *
    - *

    + *

    + * The following features are implemented: + *

      + *
    • {@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#getResourceSet Resource Set}
      • + *
    • {@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#getURI URI}
      • + *
    • {@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#getContents Contents}
      • + *
    • {@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#isModified Modified}
      • + *
    • {@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#isLoaded Loaded}
      • + *
    • {@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#isTrackingModification Tracking Modification}
      • + *
    • {@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#getErrors Errors}
      • + *
    • {@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#getWarnings Warnings}
      • + *
    • {@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#getTimeStamp Time Stamp}
      • + *
    + *

    + * * @generated */ public class CDOResourceImpl extends CDOResourceNodeImpl implements CDOResource, Resource.Internal @@ -136,7 +136,6 @@ public class CDOResourceImpl extends CDOResourceNodeImpl implements CDOResource, /** * - * * @generated */ protected CDOResourceImpl() @@ -146,7 +145,6 @@ public class CDOResourceImpl extends CDOResourceNodeImpl implements CDOResource, /** * - * * @generated */ @Override @@ -187,7 +185,6 @@ public class CDOResourceImpl extends CDOResourceNodeImpl implements CDOResource, /** * - * * @generated */ public ResourceSet getResourceSet() @@ -197,7 +194,6 @@ public class CDOResourceImpl extends CDOResourceNodeImpl implements CDOResource, /** * - * * @generated */ public void setResourceSet(ResourceSet newResourceSet) @@ -285,7 +281,6 @@ public class CDOResourceImpl extends CDOResourceNodeImpl implements CDOResource, /** * - * * @generated */ public boolean isModified() @@ -370,7 +365,6 @@ public class CDOResourceImpl extends CDOResourceNodeImpl implements CDOResource, /** * - * * @generated */ public boolean isTrackingModification() @@ -380,7 +374,6 @@ public class CDOResourceImpl extends CDOResourceNodeImpl implements CDOResource, /** * - * * @generated */ public void setTrackingModification(boolean newTrackingModification) @@ -462,7 +455,6 @@ public class CDOResourceImpl extends CDOResourceNodeImpl implements CDOResource, /** * - * * @generated */ public long getTimeStamp() @@ -472,7 +464,6 @@ public class CDOResourceImpl extends CDOResourceNodeImpl implements CDOResource, /** * - * * @generated */ public void setTimeStamp(long newTimeStamp) 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 4476fd4ee3..ca9e920702 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 @@ -47,7 +47,6 @@ public abstract class CDOResourceNodeImpl extends CDOObjectImpl implements CDORe { /** * - * * @generated */ protected CDOResourceNodeImpl() @@ -57,7 +56,6 @@ public abstract class CDOResourceNodeImpl extends CDOObjectImpl implements CDORe /** * - * * @generated */ @Override @@ -68,7 +66,6 @@ public abstract class CDOResourceNodeImpl extends CDOObjectImpl implements CDORe /** * - * * @generated */ @Override @@ -79,7 +76,6 @@ public abstract class CDOResourceNodeImpl extends CDOObjectImpl implements CDORe /** * - * * @generated */ public CDOResourceFolder getFolder() @@ -89,7 +85,6 @@ public abstract class CDOResourceNodeImpl extends CDOObjectImpl implements CDORe /** * - * * @generated */ public void setFolderGen(CDOResourceFolder newFolder) @@ -133,7 +128,6 @@ public abstract class CDOResourceNodeImpl extends CDOObjectImpl implements CDORe /** * - * * @generated */ public String getName() @@ -143,7 +137,6 @@ public abstract class CDOResourceNodeImpl extends CDOObjectImpl implements CDORe /** * - * * @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 00845b04ff..70f922698b 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 @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ @@ -15,8 +15,6 @@ import org.eclipse.emf.cdo.eresource.CDOResourceFolder; import org.eclipse.emf.cdo.eresource.EresourceFactory; import org.eclipse.emf.cdo.eresource.EresourcePackage; -import org.eclipse.emf.internal.cdo.messages.Messages; - import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EDataType; @@ -25,8 +23,6 @@ import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.impl.EFactoryImpl; import org.eclipse.emf.ecore.plugin.EcorePlugin; -import java.text.MessageFormat; - /** * An implementation of the model Factory. * @@ -34,8 +30,6 @@ import java.text.MessageFormat; */ public class EresourceFactoryImpl extends EFactoryImpl implements EresourceFactory { - private static final String dataTypeError = Messages.getString("EresourceFactoryImpl.1"); //$NON-NLS-1$ - /** * Creates the default factory implementation. * @@ -46,7 +40,7 @@ public class EresourceFactoryImpl extends EFactoryImpl implements EresourceFacto try { EresourceFactory theEresourceFactory = (EresourceFactory)EPackage.Registry.INSTANCE - .getEFactory("http://www.eclipse.org/emf/CDO/Eresource/2.0.0"); //$NON-NLS-1$ + .getEFactory("http://www.eclipse.org/emf/CDO/Eresource/2.0.0"); //$NON-NLS-1$ if (theEresourceFactory != null) { return theEresourceFactory; @@ -84,8 +78,7 @@ public class EresourceFactoryImpl extends EFactoryImpl implements EresourceFacto case EresourcePackage.CDO_RESOURCE: return createCDOResource(); default: - throw new IllegalArgumentException(MessageFormat.format( - Messages.getString("EresourceFactoryImpl.3"), eClass.getName())); //$NON-NLS-1$ + throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$ } } @@ -102,7 +95,7 @@ public class EresourceFactoryImpl extends EFactoryImpl implements EresourceFacto case EresourcePackage.URI: return createURIFromString(eDataType, initialValue); default: - throw new IllegalArgumentException(MessageFormat.format(dataTypeError, eDataType.getName())); + throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$ } } @@ -119,7 +112,7 @@ public class EresourceFactoryImpl extends EFactoryImpl implements EresourceFacto case EresourcePackage.URI: return convertURIToString(eDataType, instanceValue); default: - throw new IllegalArgumentException(MessageFormat.format(dataTypeError, eDataType.getName())); + throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$ } } 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 7bb69d8285..9a3ff9762d 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,49 +28,42 @@ import org.eclipse.emf.ecore.resource.Resource.Diagnostic; /** * An implementation of the model Package. - * * @generated */ public class EresourcePackageImpl extends EPackageImpl implements EresourcePackage { /** * - * * @generated */ private EClass cdoResourceNodeEClass = null; /** * - * * @generated */ private EClass cdoResourceFolderEClass = null; /** * - * * @generated */ private EClass cdoResourceEClass = null; /** * - * * @generated */ private EDataType resourceSetEDataType = null; /** * - * * @generated */ private EDataType uriEDataType = null; /** * - * * @generated */ private EDataType diagnosticEDataType = null; @@ -95,24 +88,17 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * - * * @generated */ private static boolean isInited = false; /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * Simple dependencies are satisfied by calling this method on all dependent packages before doing anything else. This - * method drives initialization for interdependent packages directly, in parallel with this package, itself. - *

    - * Of this package and its interdependencies, all packages which have not yet been registered by their URI values are - * first created and registered. The packages are then initialized in two steps: meta-model objects for all of the - * packages are created before any are initialized, since one package's meta-model objects may refer to those of - * another. - *

    - * Invocation of this method will not affect any packages that have already been initialized. - * * + *

    This method is used to initialize {@link EresourcePackage#eINSTANCE} when that field is accessed. + * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. + * + * * @see #eNS_URI * @see #createPackageContents() * @see #initializePackageContents() @@ -121,13 +107,11 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka public static EresourcePackage init() { if (isInited) - { return (EresourcePackage)EPackage.Registry.INSTANCE.getEPackage(EresourcePackage.eNS_URI); - } // Obtain or create and register package - EresourcePackageImpl theEresourcePackage = (EresourcePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof EresourcePackageImpl ? EPackage.Registry.INSTANCE - .getEPackage(eNS_URI) + EresourcePackageImpl theEresourcePackage = (EresourcePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof EresourcePackageImpl ? EPackage.Registry.INSTANCE + .get(eNS_URI) : new EresourcePackageImpl()); isInited = true; @@ -144,6 +128,8 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka // Mark meta-data to indicate it can't be changed theEresourcePackage.freeze(); + // Update the registry and return the package + EPackage.Registry.INSTANCE.put(EresourcePackage.eNS_URI, theEresourcePackage); return theEresourcePackage; } @@ -215,7 +201,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * - * * @generated */ public EClass getCDOResource() @@ -225,7 +210,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * - * * @generated */ public EAttribute getCDOResource_ResourceSet() @@ -235,7 +219,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * - * * @generated */ public EAttribute getCDOResource_URI() @@ -245,7 +228,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * - * * @generated */ public EReference getCDOResource_Contents() @@ -255,7 +237,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * - * * @generated */ public EAttribute getCDOResource_Modified() @@ -265,7 +246,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * - * * @generated */ public EAttribute getCDOResource_Loaded() @@ -275,7 +255,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * - * * @generated */ public EAttribute getCDOResource_TrackingModification() @@ -285,7 +264,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * - * * @generated */ public EAttribute getCDOResource_Errors() @@ -295,7 +273,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * - * * @generated */ public EAttribute getCDOResource_Warnings() @@ -305,7 +282,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * - * * @generated */ public EAttribute getCDOResource_TimeStamp() @@ -315,7 +291,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * - * * @generated */ public EDataType getResourceSet() @@ -325,7 +300,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * - * * @generated */ public EDataType getURI() @@ -335,7 +309,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * - * * @generated */ public EDataType getDiagnostic() @@ -345,7 +318,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * - * * @generated */ public EresourceFactory getEresourceFactory() @@ -355,23 +327,20 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * - * * @generated */ private boolean isCreated = false; /** - * Creates the meta-model objects for the package. This method is guarded to have no affect on any invocation but its - * first. - * + * Creates the meta-model objects for the package. This method is + * guarded to have no affect on any invocation but its first. + * * @generated */ public void createPackageContents() { if (isCreated) - { return; - } isCreated = true; // Create classes and their features @@ -402,23 +371,20 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * - * * @generated */ private boolean isInitialized = false; /** - * Complete the initialization of the package and its meta-model. This method is guarded to have no affect on any - * invocation but its first. - * + * Complete the initialization of the package and its meta-model. This + * method is guarded to have no affect on any invocation but its first. + * * @generated */ public void initializePackageContents() { if (isInitialized) - { return; - } isInitialized = true; // Initialize package @@ -434,16 +400,16 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka // Set bounds for type parameters // Add supertypes to classes - cdoResourceFolderEClass.getESuperTypes().add(getCDOResourceNode()); - cdoResourceEClass.getESuperTypes().add(getCDOResourceNode()); + cdoResourceFolderEClass.getESuperTypes().add(this.getCDOResourceNode()); + cdoResourceEClass.getESuperTypes().add(this.getCDOResourceNode()); // Initialize classes and features; add operations and parameters initEClass(cdoResourceNodeEClass, CDOResourceNode.class, "CDOResourceNode", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ initEReference( getCDOResourceNode_Folder(), - getCDOResourceFolder(), - getCDOResourceFolder_Nodes(), + this.getCDOResourceFolder(), + this.getCDOResourceFolder_Nodes(), "folder", null, 0, 1, CDOResourceNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEAttribute( getCDOResourceNode_Name(), @@ -458,19 +424,19 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka "CDOResourceFolder", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ initEReference( getCDOResourceFolder_Nodes(), - getCDOResourceNode(), - getCDOResourceNode_Folder(), + this.getCDOResourceNode(), + this.getCDOResourceNode_Folder(), "nodes", null, 0, -1, CDOResourceFolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEClass(cdoResourceEClass, CDOResource.class, "CDOResource", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ initEAttribute( getCDOResource_ResourceSet(), - getResourceSet(), + this.getResourceSet(), "resourceSet", null, 0, 1, CDOResource.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEAttribute( getCDOResource_URI(), - getURI(), + this.getURI(), "uRI", null, 0, 1, CDOResource.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEReference( getCDOResource_Contents(), @@ -491,11 +457,11 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka "trackingModification", null, 0, 1, CDOResource.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEAttribute( getCDOResource_Errors(), - getDiagnostic(), + this.getDiagnostic(), "errors", null, 0, -1, CDOResource.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEAttribute( getCDOResource_Warnings(), - getDiagnostic(), + this.getDiagnostic(), "warnings", null, 0, -1, CDOResource.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEAttribute( getCDOResource_TimeStamp(), 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 bcaaedd8ee..bbca219eb1 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,22 +23,21 @@ import org.eclipse.emf.ecore.EObject; /** * The Adapter Factory for the model. It provides an adapter createXXX * method for each class of the model. - * * @see org.eclipse.emf.cdo.eresource.EresourcePackage * @generated */ public class EresourceAdapterFactory extends AdapterFactoryImpl { /** - * The cached model package. - * + * The cached model package. + * * @generated */ protected static EresourcePackage modelPackage; /** - * Creates an instance of the adapter factory. - * + * Creates an instance of the adapter factory. + * * @generated */ public EresourceAdapterFactory() @@ -50,10 +49,10 @@ public class EresourceAdapterFactory extends AdapterFactoryImpl } /** - * Returns whether this factory is applicable for the type of the object. This implementation + * Returns whether this factory is applicable for the type of the object. + * This implementation * returns true if the object is either the model's package or is an instance object of the model. - * * @return whether this factory is applicable for the type of the object. * @generated */ @@ -72,8 +71,8 @@ public class EresourceAdapterFactory extends AdapterFactoryImpl } /** - * The switch that delegates to the createXXX methods. - * + * The switch that delegates to the createXXX methods. + * * @generated */ protected EresourceSwitch modelSwitch = new EresourceSwitch() @@ -104,10 +103,9 @@ public class EresourceAdapterFactory extends AdapterFactoryImpl }; /** - * Creates an adapter for the target. - * - * @param target - * the object to adapt. + * Creates an adapter for the target. + * + * @param target the object to adapt. * @return the adapter for the target. * @generated */ @@ -118,8 +116,8 @@ public class EresourceAdapterFactory extends AdapterFactoryImpl } /** - * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.eresource.CDOResourceNode - * CDO Resource Node}'. 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 CDO Resource Node}'. + * 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 @@ -133,8 +131,8 @@ public class EresourceAdapterFactory extends AdapterFactoryImpl } /** - * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.eresource.CDOResourceFolder - * CDO Resource Folder}'. 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 CDO Resource Folder}'. + * 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 @@ -148,10 +146,9 @@ public class EresourceAdapterFactory extends AdapterFactoryImpl } /** - * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.eresource.CDOResource - * CDO Resource}'. 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 CDO Resource}'. + * This default implementation returns null so that we can easily * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. - * * @return the new adapter. * @see org.eclipse.emf.cdo.eresource.CDOResource * @generated @@ -162,9 +159,9 @@ public class EresourceAdapterFactory extends AdapterFactoryImpl } /** - * Creates a new adapter for the default case. This default implementation returns null. This default implementation returns null. - * * @return the new adapter. * @generated */ diff --git a/plugins/org.eclipse.emf.cdo/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 9bcd26876f..1a0a09ef7c 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,22 +25,21 @@ import java.util.List; * {@link #doSwitch(EObject) doSwitch(object)} to invoke the caseXXX method for each class of the model, * starting with the actual class of the object and proceeding up the inheritance hierarchy until a non-null result is * returned, which is the result of the switch. - * * @see org.eclipse.emf.cdo.eresource.EresourcePackage * @generated */ public class EresourceSwitch { /** - * The cached model package - * + * The cached model package + * * @generated */ protected static EresourcePackage modelPackage; /** - * Creates an instance of the switch. - * + * Creates an instance of the switch. + * * @generated */ public EresourceSwitch() @@ -54,7 +53,6 @@ public class EresourceSwitch /** * Calls caseXXX for each class of the model until one returns a non null result; it yields that result. * - * * @return the first non-null result returned by a caseXXX call. * @generated */ @@ -66,7 +64,6 @@ public class EresourceSwitch /** * Calls caseXXX for each class of the model until one returns a non null result; it yields that result. * - * * @return the first non-null result returned by a caseXXX call. * @generated */ @@ -86,7 +83,6 @@ public class EresourceSwitch /** * Calls caseXXX for each class of the model until one returns a non null result; it yields that result. * - * * @return the first non-null result returned by a caseXXX call. * @generated */ @@ -99,9 +95,7 @@ public class EresourceSwitch CDOResourceNode cdoResourceNode = (CDOResourceNode)theEObject; T result = caseCDOResourceNode(cdoResourceNode); if (result == null) - { result = defaultCase(theEObject); - } return result; } case EresourcePackage.CDO_RESOURCE_FOLDER: @@ -109,13 +103,9 @@ public class EresourceSwitch CDOResourceFolder cdoResourceFolder = (CDOResourceFolder)theEObject; T result = caseCDOResourceFolder(cdoResourceFolder); if (result == null) - { result = caseCDOResourceNode(cdoResourceFolder); - } if (result == null) - { result = defaultCase(theEObject); - } return result; } case EresourcePackage.CDO_RESOURCE: @@ -123,13 +113,9 @@ public class EresourceSwitch CDOResource cdoResource = (CDOResource)theEObject; T result = caseCDOResource(cdoResource); if (result == null) - { result = caseCDOResourceNode(cdoResource); - } if (result == null) - { result = defaultCase(theEObject); - } return result; } default: @@ -138,12 +124,12 @@ public class EresourceSwitch } /** - * Returns the result of interpreting the object as an instance of 'CDO Resource Node'. This implementation returns null; returning a non-null result will terminate the switch. * * @since 2.0 - * @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 'CDO Resource Node'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated @@ -154,12 +140,12 @@ public class EresourceSwitch } /** - * Returns the result of interpreting the object as an instance of 'CDO Resource Folder'. This implementation returns null; returning a non-null result will terminate the switch. * * @since 2.0 - * @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 'CDO Resource Folder'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated @@ -170,11 +156,10 @@ public class EresourceSwitch } /** - * Returns the result of interpreting the object as an instance of 'CDO Resource'. + * Returns the result of interpreting the object as an instance of 'CDO Resource'. + * * This implementation returns null; returning a non-null result will terminate the switch. - * - * @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 'CDO Resource'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated @@ -185,12 +170,11 @@ public class EresourceSwitch } /** - * Returns the result of interpreting the object as an instance of 'EObject'. This + * Returns the result of interpreting the object as an instance of 'EObject'. + * This * implementation returns null; returning a non-null result will terminate the switch, but this is the last case * anyway. - * - * @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 'EObject'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) * @generated -- cgit v1.2.3