diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo/src')
20 files changed, 1720 insertions, 451 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOBinaryResource.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOBinaryResource.java new file mode 100644 index 0000000000..fd64fe80e3 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOBinaryResource.java @@ -0,0 +1,58 @@ +/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.emf.cdo.eresource;
+
+import org.eclipse.emf.cdo.common.lob.CDOBlob;
+
+import java.io.InputStream;
+
+/**
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>CDO Binary Resource</b></em>'.
+ *
+ * @since 4.1
+ * @noextend This interface is not intended to be extended by clients.
+ * @noimplement This interface is not intended to be implemented by clients. <!-- end-user-doc -->
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.emf.cdo.eresource.CDOBinaryResource#getContents <em>Contents</em>}</li>
+ * </ul>
+ * </p>
+ * @see org.eclipse.emf.cdo.eresource.EresourcePackage#getCDOBinaryResource()
+ * @model
+ * @generated
+ */
+public interface CDOBinaryResource extends CDOFileResource<InputStream>
+{
+ /**
+ * Returns the value of the '<em><b>Contents</b></em>' attribute. <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Contents</em>' attribute isn't clear, there really should be more of a description
+ * here...
+ * </p>
+ * <!-- end-user-doc -->
+ *
+ * @return the value of the '<em>Contents</em>' attribute.
+ * @see #setContents(CDOBlob)
+ * @see org.eclipse.emf.cdo.eresource.EresourcePackage#getCDOBinaryResource_Contents()
+ * @model dataType="org.eclipse.emf.cdo.etypes.Blob" required="true"
+ * @generated
+ */
+ CDOBlob getContents();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.emf.cdo.eresource.CDOBinaryResource#getContents <em>Contents</em>}'
+ * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @param value
+ * the new value of the '<em>Contents</em>' attribute.
+ * @see #getContents()
+ * @generated
+ */
+ void setContents(CDOBlob value);
+
+} // CDOBinaryResource
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOFileResource.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOFileResource.java new file mode 100644 index 0000000000..f01996ce2d --- /dev/null +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOFileResource.java @@ -0,0 +1,31 @@ +/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.emf.cdo.eresource;
+
+import org.eclipse.emf.cdo.common.lob.CDOLob;
+
+/**
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>CDO File Resource</b></em>'.
+ *
+ * @since 4.1
+ * @noextend This interface is not intended to be extended by clients.
+ * @noimplement This interface is not intended to be implemented by clients. <!-- end-user-doc -->
+ * @see org.eclipse.emf.cdo.eresource.EresourcePackage#getCDOFileResource()
+ * @model abstract="true"
+ * @generated
+ */
+public interface CDOFileResource<IO> extends CDOResourceLeaf
+{
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @model kind="operation" dataType="org.eclipse.emf.cdo.etypes.Lob" required="true"
+ * @generated
+ */
+ CDOLob<IO> getContents();
+
+} // CDOFileResource
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 ed2c80501e..c1e2551e69 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 @@ -46,7 +46,7 @@ import org.eclipse.core.runtime.IProgressMonitor; * @model * @generated */ -public interface CDOResource extends CDOResourceNode, Resource +public interface CDOResource extends CDOResourceLeaf, Resource { /** * @ADDED diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResourceLeaf.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResourceLeaf.java new file mode 100644 index 0000000000..72aab7af28 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResourceLeaf.java @@ -0,0 +1,21 @@ +/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.emf.cdo.eresource;
+
+/**
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>CDO Resource Leaf</b></em>'.
+ *
+ * @since 4.1
+ * @noextend This interface is not intended to be extended by clients.
+ * @noimplement This interface is not intended to be implemented by clients. <!-- end-user-doc -->
+ * @see org.eclipse.emf.cdo.eresource.EresourcePackage#getCDOResourceLeaf()
+ * @model abstract="true"
+ * @generated
+ */
+public interface CDOResourceLeaf extends CDOResourceNode
+{
+} // CDOResourceLeaf
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOTextResource.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOTextResource.java new file mode 100644 index 0000000000..95252862e5 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOTextResource.java @@ -0,0 +1,57 @@ +/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.emf.cdo.eresource;
+
+import org.eclipse.emf.cdo.common.lob.CDOClob;
+
+import java.io.Reader;
+
+/**
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>CDO Text Resource</b></em>'.
+ *
+ * @since 4.1
+ * @noextend This interface is not intended to be extended by clients. <!-- end-user-doc -->
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.emf.cdo.eresource.CDOTextResource#getContents <em>Contents</em>}</li>
+ * </ul>
+ * </p>
+ * @see org.eclipse.emf.cdo.eresource.EresourcePackage#getCDOTextResource()
+ * @model
+ * @generated
+ */
+public interface CDOTextResource extends CDOFileResource<Reader>
+{
+ /**
+ * Returns the value of the '<em><b>Contents</b></em>' attribute. <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Contents</em>' attribute isn't clear, there really should be more of a description
+ * here...
+ * </p>
+ * <!-- end-user-doc -->
+ *
+ * @return the value of the '<em>Contents</em>' attribute.
+ * @see #setContents(CDOClob)
+ * @see org.eclipse.emf.cdo.eresource.EresourcePackage#getCDOTextResource_Contents()
+ * @model dataType="org.eclipse.emf.cdo.etypes.Clob" required="true"
+ * @generated
+ */
+ CDOClob getContents();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.emf.cdo.eresource.CDOTextResource#getContents <em>Contents</em>}'
+ * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @param value
+ * the new value of the '<em>Contents</em>' attribute.
+ * @see #getContents()
+ * @generated
+ */
+ void setContents(CDOClob value);
+
+} // CDOTextResource
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 e97450fd49..e2c8a60ade 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 @@ -49,6 +49,24 @@ public interface EresourceFactory extends EFactory CDOResource createCDOResource(); /** + * Returns a new object of class '<em>CDO Binary Resource</em>'. <!-- begin-user-doc --> + * + * @since 4.1 <!-- end-user-doc --> + * @return a new object of class '<em>CDO Binary Resource</em>'. + * @generated + */ + CDOBinaryResource createCDOBinaryResource(); + + /** + * Returns a new object of class '<em>CDO Text Resource</em>'. <!-- begin-user-doc --> + * + * @since 4.1 <!-- end-user-doc --> + * @return a new object of class '<em>CDO Text Resource</em>'. + * @generated + */ + CDOTextResource createCDOTextResource(); + + /** * Returns the package supported by this factory. <!-- begin-user-doc --> <!-- end-user-doc --> * * @return the package supported by this factory. 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 aac1f2d100..25f6913742 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 @@ -65,9 +65,8 @@ public interface EresourcePackage extends EPackage /** * The meta object id for the '{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceNodeImpl - * <em>CDO Resource Node</em>}' class. <!-- begin-user-doc --> + * <em>CDO Resource Node</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> * - * @since 2.0<!-- end-user-doc --> * @see org.eclipse.emf.cdo.eresource.impl.CDOResourceNodeImpl * @see org.eclipse.emf.cdo.eresource.impl.EresourcePackageImpl#getCDOResourceNode() * @generated @@ -75,36 +74,33 @@ 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 --> <!-- end-user-doc --> * - * @since 2.0<!-- end-user-doc --> * @generated * @ordered */ 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 --> <!-- end-user-doc --> * - * @since 2.0<!-- end-user-doc --> * @generated * @ordered */ 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 --> <!-- end-user-doc --> * - * @since 2.0<!-- end-user-doc --> * @generated * @ordered */ 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 --> <!-- + * end-user-doc --> * - * @since 2.0<!-- end-user-doc --> * @generated * @ordered */ @@ -112,9 +108,8 @@ public interface EresourcePackage extends EPackage /** * The meta object id for the '{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceFolderImpl - * <em>CDO Resource Folder</em>}' class. <!-- begin-user-doc --> + * <em>CDO Resource Folder</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> * - * @since 2.0<!-- end-user-doc --> * @see org.eclipse.emf.cdo.eresource.impl.CDOResourceFolderImpl * @see org.eclipse.emf.cdo.eresource.impl.EresourcePackageImpl#getCDOResourceFolder() * @generated @@ -122,51 +117,95 @@ 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 --> <!-- end-user-doc --> * - * @since 2.0<!-- end-user-doc --> * @generated * @ordered */ 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 --> <!-- end-user-doc --> * - * @since 2.0<!-- end-user-doc --> * @generated * @ordered */ 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 --> <!-- end-user-doc --> * - * @since 2.0<!-- end-user-doc --> * @generated * @ordered */ 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 --> <!-- + * end-user-doc --> * - * @since 2.0<!-- end-user-doc --> * @generated * @ordered */ 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 --> <!-- + * end-user-doc --> * - * @since 2.0<!-- end-user-doc --> * @generated * @ordered */ 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.CDOResourceLeafImpl + * <em>CDO Resource Leaf</em>}' class. <!-- begin-user-doc --> + * + * @since 4.1 <!-- end-user-doc --> + * @see org.eclipse.emf.cdo.eresource.impl.CDOResourceLeafImpl + * @see org.eclipse.emf.cdo.eresource.impl.EresourcePackageImpl#getCDOResourceLeaf() + * @generated NOT + */ + int CDO_RESOURCE_LEAF = 7; + + /** + * The feature id for the '<em><b>Folder</b></em>' container reference. <!-- begin-user-doc --> + * + * @since 4.1 <!-- end-user-doc --> + * @generated + * @ordered + */ + int CDO_RESOURCE_LEAF__FOLDER = CDO_RESOURCE_NODE__FOLDER; + + /** + * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> + * + * @since 4.1 <!-- end-user-doc --> + * @generated + * @ordered + */ + int CDO_RESOURCE_LEAF__NAME = CDO_RESOURCE_NODE__NAME; + + /** + * The feature id for the '<em><b>Path</b></em>' attribute. <!-- begin-user-doc --> + * + * @since 4.1 <!-- end-user-doc --> + * @generated + * @ordered + */ + int CDO_RESOURCE_LEAF__PATH = CDO_RESOURCE_NODE__PATH; + + /** + * The number of structural features of the '<em>CDO Resource Leaf</em>' class. <!-- begin-user-doc --> + * + * @since 4.1 <!-- end-user-doc --> + * @generated + * @ordered + */ + int CDO_RESOURCE_LEAF_FEATURE_COUNT = CDO_RESOURCE_NODE_FEATURE_COUNT + 0; + + /** * 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 --> * @@ -177,22 +216,20 @@ 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 --> <!-- end-user-doc --> * - * @since 2.0<!-- end-user-doc --> * @generated * @ordered */ - int CDO_RESOURCE__FOLDER = CDO_RESOURCE_NODE__FOLDER; + int CDO_RESOURCE__FOLDER = CDO_RESOURCE_LEAF__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 --> <!-- end-user-doc --> * - * @since 2.0<!-- end-user-doc --> * @generated * @ordered */ - int CDO_RESOURCE__NAME = CDO_RESOURCE_NODE__NAME; + int CDO_RESOURCE__NAME = CDO_RESOURCE_LEAF__NAME; /** * The feature id for the '<em><b>Path</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> @@ -200,7 +237,7 @@ public interface EresourcePackage extends EPackage * @generated * @ordered */ - int CDO_RESOURCE__PATH = CDO_RESOURCE_NODE__PATH; + int CDO_RESOURCE__PATH = CDO_RESOURCE_LEAF__PATH; /** * The feature id for the '<em><b>Resource Set</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> @@ -208,7 +245,7 @@ public interface EresourcePackage extends EPackage * @generated * @ordered */ - int CDO_RESOURCE__RESOURCE_SET = CDO_RESOURCE_NODE_FEATURE_COUNT + 0; + int CDO_RESOURCE__RESOURCE_SET = CDO_RESOURCE_LEAF_FEATURE_COUNT + 0; /** * The feature id for the '<em><b>URI</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> @@ -216,7 +253,7 @@ public interface EresourcePackage extends EPackage * @generated * @ordered */ - int CDO_RESOURCE__URI = CDO_RESOURCE_NODE_FEATURE_COUNT + 1; + int CDO_RESOURCE__URI = CDO_RESOURCE_LEAF_FEATURE_COUNT + 1; /** * The feature id for the '<em><b>Contents</b></em>' containment reference list. <!-- begin-user-doc --> <!-- @@ -225,7 +262,7 @@ public interface EresourcePackage extends EPackage * @generated * @ordered */ - int CDO_RESOURCE__CONTENTS = CDO_RESOURCE_NODE_FEATURE_COUNT + 2; + int CDO_RESOURCE__CONTENTS = CDO_RESOURCE_LEAF_FEATURE_COUNT + 2; /** * The feature id for the '<em><b>Modified</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> @@ -233,7 +270,7 @@ public interface EresourcePackage extends EPackage * @generated * @ordered */ - int CDO_RESOURCE__MODIFIED = CDO_RESOURCE_NODE_FEATURE_COUNT + 3; + int CDO_RESOURCE__MODIFIED = CDO_RESOURCE_LEAF_FEATURE_COUNT + 3; /** * The feature id for the '<em><b>Loaded</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> @@ -241,7 +278,7 @@ public interface EresourcePackage extends EPackage * @generated * @ordered */ - int CDO_RESOURCE__LOADED = CDO_RESOURCE_NODE_FEATURE_COUNT + 4; + int CDO_RESOURCE__LOADED = CDO_RESOURCE_LEAF_FEATURE_COUNT + 4; /** * The feature id for the '<em><b>Tracking Modification</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc @@ -250,7 +287,7 @@ public interface EresourcePackage extends EPackage * @generated * @ordered */ - int CDO_RESOURCE__TRACKING_MODIFICATION = CDO_RESOURCE_NODE_FEATURE_COUNT + 5; + int CDO_RESOURCE__TRACKING_MODIFICATION = CDO_RESOURCE_LEAF_FEATURE_COUNT + 5; /** * The feature id for the '<em><b>Errors</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc --> @@ -258,7 +295,7 @@ public interface EresourcePackage extends EPackage * @generated * @ordered */ - int CDO_RESOURCE__ERRORS = CDO_RESOURCE_NODE_FEATURE_COUNT + 6; + int CDO_RESOURCE__ERRORS = CDO_RESOURCE_LEAF_FEATURE_COUNT + 6; /** * The feature id for the '<em><b>Warnings</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc --> @@ -266,7 +303,7 @@ public interface EresourcePackage extends EPackage * @generated * @ordered */ - int CDO_RESOURCE__WARNINGS = CDO_RESOURCE_NODE_FEATURE_COUNT + 7; + int CDO_RESOURCE__WARNINGS = CDO_RESOURCE_LEAF_FEATURE_COUNT + 7; /** * The feature id for the '<em><b>Time Stamp</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> @@ -274,7 +311,7 @@ public interface EresourcePackage extends EPackage * @generated * @ordered */ - int CDO_RESOURCE__TIME_STAMP = CDO_RESOURCE_NODE_FEATURE_COUNT + 8; + int CDO_RESOURCE__TIME_STAMP = CDO_RESOURCE_LEAF_FEATURE_COUNT + 8; /** * The number of structural features of the '<em>CDO Resource</em>' class. <!-- begin-user-doc --> <!-- end-user-doc @@ -283,14 +320,173 @@ public interface EresourcePackage extends EPackage * @generated * @ordered */ - int CDO_RESOURCE_FEATURE_COUNT = CDO_RESOURCE_NODE_FEATURE_COUNT + 9; + int CDO_RESOURCE_FEATURE_COUNT = CDO_RESOURCE_LEAF_FEATURE_COUNT + 9; + + /** + * The meta object id for the '{@link org.eclipse.emf.cdo.eresource.impl.CDOFileResourceImpl + * <em>CDO File Resource</em>}' class. <!-- begin-user-doc --> + * + * @since 4.1 <!-- end-user-doc --> + * @see org.eclipse.emf.cdo.eresource.impl.CDOFileResourceImpl + * @see org.eclipse.emf.cdo.eresource.impl.EresourcePackageImpl#getCDOFileResource() + * @generated NOT + */ + int CDO_FILE_RESOURCE = 8; + + /** + * The feature id for the '<em><b>Folder</b></em>' container reference. <!-- begin-user-doc --> + * + * @since 4.1 <!-- end-user-doc --> + * @generated + * @ordered + */ + int CDO_FILE_RESOURCE__FOLDER = CDO_RESOURCE_LEAF__FOLDER; + + /** + * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> + * + * @since 4.1 <!-- end-user-doc --> + * @generated + * @ordered + */ + int CDO_FILE_RESOURCE__NAME = CDO_RESOURCE_LEAF__NAME; + + /** + * The feature id for the '<em><b>Path</b></em>' attribute. <!-- begin-user-doc --> + * + * @since 4.1 <!-- end-user-doc --> + * @generated + * @ordered + */ + int CDO_FILE_RESOURCE__PATH = CDO_RESOURCE_LEAF__PATH; + + /** + * The number of structural features of the '<em>CDO File Resource</em>' class. <!-- begin-user-doc --> + * + * @since 4.1 <!-- end-user-doc --> + * @generated + * @ordered + */ + int CDO_FILE_RESOURCE_FEATURE_COUNT = CDO_RESOURCE_LEAF_FEATURE_COUNT + 0; + + /** + * The meta object id for the '{@link org.eclipse.emf.cdo.eresource.impl.CDOBinaryResourceImpl + * <em>CDO Binary Resource</em>}' class. <!-- begin-user-doc --> + * + * @since 4.1 <!-- end-user-doc --> + * @see org.eclipse.emf.cdo.eresource.impl.CDOBinaryResourceImpl + * @see org.eclipse.emf.cdo.eresource.impl.EresourcePackageImpl#getCDOBinaryResource() + * @generated NOT + */ + int CDO_BINARY_RESOURCE = 9; + + /** + * The feature id for the '<em><b>Folder</b></em>' container reference. <!-- begin-user-doc --> + * + * @since 4.1 <!-- end-user-doc --> + * @generated + * @ordered + */ + int CDO_BINARY_RESOURCE__FOLDER = CDO_FILE_RESOURCE__FOLDER; + + /** + * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> + * + * @since 4.1 <!-- end-user-doc --> + * @generated + * @ordered + */ + int CDO_BINARY_RESOURCE__NAME = CDO_FILE_RESOURCE__NAME; + + /** + * The feature id for the '<em><b>Path</b></em>' attribute. <!-- begin-user-doc --> + * + * @since 4.1 <!-- end-user-doc --> + * @generated + * @ordered + */ + int CDO_BINARY_RESOURCE__PATH = CDO_FILE_RESOURCE__PATH; + + /** + * The feature id for the '<em><b>Contents</b></em>' attribute. <!-- begin-user-doc --> + * + * @since 4.1 <!-- end-user-doc --> + * @generated + * @ordered + */ + int CDO_BINARY_RESOURCE__CONTENTS = CDO_FILE_RESOURCE_FEATURE_COUNT + 0; + + /** + * The number of structural features of the '<em>CDO Binary Resource</em>' class. <!-- begin-user-doc --> + * + * @since 4.1 <!-- end-user-doc --> + * @generated + * @ordered + */ + int CDO_BINARY_RESOURCE_FEATURE_COUNT = CDO_FILE_RESOURCE_FEATURE_COUNT + 1; + + /** + * The meta object id for the '{@link org.eclipse.emf.cdo.eresource.impl.CDOTextResourceImpl + * <em>CDO Text Resource</em>}' class. <!-- begin-user-doc --> + * + * @since 4.1 <!-- end-user-doc --> + * @see org.eclipse.emf.cdo.eresource.impl.CDOTextResourceImpl + * @see org.eclipse.emf.cdo.eresource.impl.EresourcePackageImpl#getCDOTextResource() + * @generated NOT + */ + int CDO_TEXT_RESOURCE = 10; + + /** + * The feature id for the '<em><b>Folder</b></em>' container reference. <!-- begin-user-doc --> + * + * @since 4.1 <!-- end-user-doc --> + * @generated + * @ordered + */ + int CDO_TEXT_RESOURCE__FOLDER = CDO_FILE_RESOURCE__FOLDER; + + /** + * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> + * + * @since 4.1 <!-- end-user-doc --> + * @generated + * @ordered + */ + int CDO_TEXT_RESOURCE__NAME = CDO_FILE_RESOURCE__NAME; + + /** + * The feature id for the '<em><b>Path</b></em>' attribute. <!-- begin-user-doc --> + * + * @since 4.1 <!-- end-user-doc --> + * @generated + * @ordered + */ + int CDO_TEXT_RESOURCE__PATH = CDO_FILE_RESOURCE__PATH; + + /** + * The feature id for the '<em><b>Contents</b></em>' attribute. <!-- begin-user-doc --> + * + * @since 4.1 <!-- end-user-doc --> + * @generated + * @ordered + */ + int CDO_TEXT_RESOURCE__CONTENTS = CDO_FILE_RESOURCE_FEATURE_COUNT + 0; + + /** + * The number of structural features of the '<em>CDO Text Resource</em>' class. <!-- begin-user-doc --> + * + * @since 4.1 <!-- end-user-doc --> + * @generated + * @ordered + */ + int CDO_TEXT_RESOURCE_FEATURE_COUNT = CDO_FILE_RESOURCE_FEATURE_COUNT + 1; /** * 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 + * @generated NOT */ int RESOURCE_SET = 3; @@ -299,7 +495,7 @@ public interface EresourcePackage extends EPackage * * @see org.eclipse.emf.common.util.URI * @see org.eclipse.emf.cdo.eresource.impl.EresourcePackageImpl#getURI() - * @generated + * @generated NOT */ int URI = 4; @@ -308,7 +504,7 @@ public interface EresourcePackage extends EPackage * * @see org.eclipse.emf.ecore.resource.Resource.Diagnostic * @see org.eclipse.emf.cdo.eresource.impl.EresourcePackageImpl#getDiagnostic() - * @generated + * @generated NOT */ int DIAGNOSTIC = 5; @@ -493,6 +689,74 @@ public interface EresourcePackage extends EPackage EAttribute getCDOResource_TimeStamp(); /** + * Returns the meta object for class '{@link org.eclipse.emf.cdo.eresource.CDOResourceLeaf <em>CDO Resource Leaf</em>} + * '. <!-- begin-user-doc --> + * + * @since 4.1 <!-- end-user-doc --> + * @return the meta object for class '<em>CDO Resource Leaf</em>'. + * @see org.eclipse.emf.cdo.eresource.CDOResourceLeaf + * @generated + */ + EClass getCDOResourceLeaf(); + + /** + * Returns the meta object for class '{@link org.eclipse.emf.cdo.eresource.CDOFileResource <em>CDO File Resource</em>} + * '. <!-- begin-user-doc --> + * + * @since 4.1 <!-- end-user-doc --> + * @return the meta object for class '<em>CDO File Resource</em>'. + * @see org.eclipse.emf.cdo.eresource.CDOFileResource + * @generated + */ + EClass getCDOFileResource(); + + /** + * Returns the meta object for class '{@link org.eclipse.emf.cdo.eresource.CDOBinaryResource + * <em>CDO Binary Resource</em>}'. <!-- begin-user-doc --> + * + * @since 4.1 <!-- end-user-doc --> + * @return the meta object for class '<em>CDO Binary Resource</em>'. + * @see org.eclipse.emf.cdo.eresource.CDOBinaryResource + * @generated + */ + EClass getCDOBinaryResource(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.eresource.CDOBinaryResource#getContents + * <em>Contents</em>}'. <!-- begin-user-doc --> + * + * @since 4.1 <!-- end-user-doc --> + * @return the meta object for the attribute '<em>Contents</em>'. + * @see org.eclipse.emf.cdo.eresource.CDOBinaryResource#getContents() + * @see #getCDOBinaryResource() + * @generated + */ + EAttribute getCDOBinaryResource_Contents(); + + /** + * Returns the meta object for class '{@link org.eclipse.emf.cdo.eresource.CDOTextResource <em>CDO Text Resource</em>} + * '. <!-- begin-user-doc --> + * + * @since 4.1 <!-- end-user-doc --> + * @return the meta object for class '<em>CDO Text Resource</em>'. + * @see org.eclipse.emf.cdo.eresource.CDOTextResource + * @generated + */ + EClass getCDOTextResource(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.eresource.CDOTextResource#getContents + * <em>Contents</em>}'. <!-- begin-user-doc --> + * + * @since 4.1 <!-- end-user-doc --> + * @return the meta object for the attribute '<em>Contents</em>'. + * @see org.eclipse.emf.cdo.eresource.CDOTextResource#getContents() + * @see #getCDOTextResource() + * @generated + */ + EAttribute getCDOTextResource_Contents(); + + /** * Returns the meta object for data type '{@link org.eclipse.emf.ecore.resource.ResourceSet <em>Resource Set</em>}'. * <!-- begin-user-doc --> <!-- end-user-doc --> * @@ -541,8 +805,10 @@ public interface EresourcePackage extends EPackage * <li>each enum,</li> * <li>and each data type</li> * </ul> - * <!-- end-user-doc --> * + * @since 4.1 + * @noextend This interface is not intended to be extended by clients. + * @noimplement This interface is not intended to be implemented by clients. <!-- end-user-doc --> * @generated */ interface Literals @@ -685,6 +951,66 @@ public interface EresourcePackage extends EPackage EAttribute CDO_RESOURCE__TIME_STAMP = eINSTANCE.getCDOResource_TimeStamp(); /** + * The meta object literal for the '{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceLeafImpl + * <em>CDO Resource Leaf</em>}' class. <!-- begin-user-doc --> + * + * @since 4.1 <!-- end-user-doc --> + * @see org.eclipse.emf.cdo.eresource.impl.CDOResourceLeafImpl + * @see org.eclipse.emf.cdo.eresource.impl.EresourcePackageImpl#getCDOResourceLeaf() + * @generated + */ + EClass CDO_RESOURCE_LEAF = eINSTANCE.getCDOResourceLeaf(); + + /** + * The meta object literal for the '{@link org.eclipse.emf.cdo.eresource.impl.CDOFileResourceImpl + * <em>CDO File Resource</em>}' class. <!-- begin-user-doc --> + * + * @since 4.1 <!-- end-user-doc --> + * @see org.eclipse.emf.cdo.eresource.impl.CDOFileResourceImpl + * @see org.eclipse.emf.cdo.eresource.impl.EresourcePackageImpl#getCDOFileResource() + * @generated + */ + EClass CDO_FILE_RESOURCE = eINSTANCE.getCDOFileResource(); + + /** + * The meta object literal for the '{@link org.eclipse.emf.cdo.eresource.impl.CDOBinaryResourceImpl + * <em>CDO Binary Resource</em>}' class. <!-- begin-user-doc --> + * + * @since 4.1 <!-- end-user-doc --> + * @see org.eclipse.emf.cdo.eresource.impl.CDOBinaryResourceImpl + * @see org.eclipse.emf.cdo.eresource.impl.EresourcePackageImpl#getCDOBinaryResource() + * @generated + */ + EClass CDO_BINARY_RESOURCE = eINSTANCE.getCDOBinaryResource(); + + /** + * The meta object literal for the '<em><b>Contents</b></em>' attribute feature. <!-- begin-user-doc --> + * + * @since 4.1 <!-- end-user-doc --> + * @generated + */ + EAttribute CDO_BINARY_RESOURCE__CONTENTS = eINSTANCE.getCDOBinaryResource_Contents(); + + /** + * The meta object literal for the '{@link org.eclipse.emf.cdo.eresource.impl.CDOTextResourceImpl + * <em>CDO Text Resource</em>}' class. <!-- begin-user-doc --> + * + * @since 4.1 <!-- end-user-doc --> + * @see org.eclipse.emf.cdo.eresource.impl.CDOTextResourceImpl + * @see org.eclipse.emf.cdo.eresource.impl.EresourcePackageImpl#getCDOTextResource() + * @generated + */ + EClass CDO_TEXT_RESOURCE = eINSTANCE.getCDOTextResource(); + + /** + * The meta object literal for the '<em><b>Contents</b></em>' attribute feature. <!-- begin-user-doc --> + * + * @since 4.1 <!-- end-user-doc --> + * @generated + */ + EAttribute CDO_TEXT_RESOURCE__CONTENTS = eINSTANCE.getCDOTextResource_Contents(); + + /** * 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 diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOBinaryResourceImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOBinaryResourceImpl.java new file mode 100644 index 0000000000..5bb7079e29 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOBinaryResourceImpl.java @@ -0,0 +1,74 @@ +/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.emf.cdo.eresource.impl;
+
+import org.eclipse.emf.cdo.common.lob.CDOBlob;
+import org.eclipse.emf.cdo.eresource.CDOBinaryResource;
+import org.eclipse.emf.cdo.eresource.EresourcePackage;
+
+import org.eclipse.emf.ecore.EClass;
+
+import java.io.InputStream;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>CDO Binary Resource</b></em>'.
+ *
+ * @since 4.1
+ * @noextend This class is not intended to be subclassed by clients. <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOBinaryResourceImpl#getContents <em>Contents</em>}</li>
+ * </ul>
+ * </p>
+ * @generated
+ */
+public class CDOBinaryResourceImpl extends CDOFileResourceImpl<InputStream> implements CDOBinaryResource
+{
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected CDOBinaryResourceImpl()
+ {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass()
+ {
+ return EresourcePackage.Literals.CDO_BINARY_RESOURCE;
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public CDOBlob getContents()
+ {
+ return (CDOBlob)eGet(EresourcePackage.Literals.CDO_BINARY_RESOURCE__CONTENTS, true);
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public void setContents(CDOBlob newContents)
+ {
+ eSet(EresourcePackage.Literals.CDO_BINARY_RESOURCE__CONTENTS, newContents);
+ }
+
+} // CDOBinaryResourceImpl
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOFileResourceImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOFileResourceImpl.java new file mode 100644 index 0000000000..fd011cec22 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOFileResourceImpl.java @@ -0,0 +1,86 @@ +/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.emf.cdo.eresource.impl;
+
+import org.eclipse.emf.cdo.common.lob.CDOLob;
+import org.eclipse.emf.cdo.eresource.CDOFileResource;
+import org.eclipse.emf.cdo.eresource.EresourcePackage;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.spi.cdo.FSMUtil;
+import org.eclipse.emf.spi.cdo.InternalCDOView;
+
+import java.io.IOException;
+import java.util.Map;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>CDO File Resource</b></em>'.
+ *
+ * @since 4.1
+ * @noextend This class is not intended to be subclassed by clients. <!-- end-user-doc -->
+ * <p>
+ * </p>
+ * @generated
+ */
+public abstract class CDOFileResourceImpl<IO> extends CDOResourceLeafImpl implements CDOFileResource<IO>
+{
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected CDOFileResourceImpl()
+ {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass()
+ {
+ return EresourcePackage.Literals.CDO_FILE_RESOURCE;
+ }
+
+ /**
+ * @ADDED
+ */
+ public boolean isRoot()
+ {
+ return false;
+ }
+
+ /**
+ * @ADDED
+ */
+ public void delete(Map<?, ?> options) throws IOException
+ {
+ if (!FSMUtil.isTransient(this))
+ {
+ if (getFolder() == null)
+ {
+ InternalCDOView view = cdoView();
+ view.getRootResource().getContents().remove(this);
+ }
+ else
+ {
+ basicSetFolder(null, false);
+ }
+ }
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated NOT
+ */
+ public abstract CDOLob<IO> getContents();
+
+} // CDOFileResourceImpl
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 359cda728d..9ce6023f2a 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 @@ -99,7 +99,7 @@ import java.util.concurrent.Callable; * </p> * @generated */ -public class CDOResourceImpl extends CDOResourceNodeImpl implements CDOResource, Resource.Internal +public class CDOResourceImpl extends CDOResourceLeafImpl implements CDOResource, Resource.Internal { private static final EReference CDO_RESOURCE_CONTENTS = EresourcePackage.eINSTANCE.getCDOResource_Contents(); diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceLeafImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceLeafImpl.java new file mode 100644 index 0000000000..f58a0ccf30 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceLeafImpl.java @@ -0,0 +1,46 @@ +/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.emf.cdo.eresource.impl;
+
+import org.eclipse.emf.cdo.eresource.CDOResourceLeaf;
+import org.eclipse.emf.cdo.eresource.EresourcePackage;
+
+import org.eclipse.emf.ecore.EClass;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>CDO Resource Leaf</b></em>'.
+ *
+ * @since 4.1
+ * @noextend This class is not intended to be subclassed by clients. <!-- end-user-doc -->
+ * <p>
+ * </p>
+ * @generated
+ */
+public abstract class CDOResourceLeafImpl extends CDOResourceNodeImpl implements CDOResourceLeaf
+{
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected CDOResourceLeafImpl()
+ {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass()
+ {
+ return EresourcePackage.Literals.CDO_RESOURCE_LEAF;
+ }
+
+} // CDOResourceLeafImpl
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOTextResourceImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOTextResourceImpl.java new file mode 100644 index 0000000000..63c7f239df --- /dev/null +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOTextResourceImpl.java @@ -0,0 +1,74 @@ +/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.emf.cdo.eresource.impl;
+
+import org.eclipse.emf.cdo.common.lob.CDOClob;
+import org.eclipse.emf.cdo.eresource.CDOTextResource;
+import org.eclipse.emf.cdo.eresource.EresourcePackage;
+
+import org.eclipse.emf.ecore.EClass;
+
+import java.io.Reader;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>CDO Text Resource</b></em>'.
+ *
+ * @since 4.1
+ * @noextend This class is not intended to be subclassed by clients. <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOTextResourceImpl#getContents <em>Contents</em>}</li>
+ * </ul>
+ * </p>
+ * @generated
+ */
+public class CDOTextResourceImpl extends CDOFileResourceImpl<Reader> implements CDOTextResource
+{
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected CDOTextResourceImpl()
+ {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass()
+ {
+ return EresourcePackage.Literals.CDO_TEXT_RESOURCE;
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public CDOClob getContents()
+ {
+ return (CDOClob)eGet(EresourcePackage.Literals.CDO_TEXT_RESOURCE__CONTENTS, true);
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public void setContents(CDOClob newContents)
+ {
+ eSet(EresourcePackage.Literals.CDO_TEXT_RESOURCE__CONTENTS, newContents);
+ }
+
+} // CDOTextResourceImpl
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 2526b58f83..811bf64b32 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 @@ -11,8 +11,10 @@ package org.eclipse.emf.cdo.eresource.impl; //import org.eclipse.emf.cdo.eresource.*; +import org.eclipse.emf.cdo.eresource.CDOBinaryResource; import org.eclipse.emf.cdo.eresource.CDOResource; import org.eclipse.emf.cdo.eresource.CDOResourceFolder; +import org.eclipse.emf.cdo.eresource.CDOTextResource; import org.eclipse.emf.cdo.eresource.EresourceFactory; import org.eclipse.emf.cdo.eresource.EresourcePackage; @@ -80,6 +82,10 @@ public class EresourceFactoryImpl extends EFactoryImpl implements EresourceFacto return (EObject)createCDOResourceFolder(); case EresourcePackage.CDO_RESOURCE: return (EObject)createCDOResource(); + case EresourcePackage.CDO_BINARY_RESOURCE: + return (EObject)createCDOBinaryResource(); + case EresourcePackage.CDO_TEXT_RESOURCE: + return (EObject)createCDOTextResource(); default: throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$ } @@ -143,6 +149,30 @@ public class EresourceFactoryImpl extends EFactoryImpl implements EresourceFacto } /** + * <!-- begin-user-doc --> + * + * @since 4.1 <!-- end-user-doc --> + * @generated + */ + public CDOBinaryResource createCDOBinaryResource() + { + CDOBinaryResourceImpl cdoBinaryResource = new CDOBinaryResourceImpl(); + return cdoBinaryResource; + } + + /** + * <!-- begin-user-doc --> + * + * @since 4.1 <!-- end-user-doc --> + * @generated + */ + public CDOTextResource createCDOTextResource() + { + CDOTextResourceImpl cdoTextResource = new CDOTextResourceImpl(); + return cdoTextResource; + } + + /** * <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated NOT 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 682915b3b6..65286c6d20 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 @@ -10,11 +10,16 @@ */ package org.eclipse.emf.cdo.eresource.impl; +import org.eclipse.emf.cdo.eresource.CDOBinaryResource; +import org.eclipse.emf.cdo.eresource.CDOFileResource; import org.eclipse.emf.cdo.eresource.CDOResource; import org.eclipse.emf.cdo.eresource.CDOResourceFolder; +import org.eclipse.emf.cdo.eresource.CDOResourceLeaf; import org.eclipse.emf.cdo.eresource.CDOResourceNode; +import org.eclipse.emf.cdo.eresource.CDOTextResource; import org.eclipse.emf.cdo.eresource.EresourceFactory; import org.eclipse.emf.cdo.eresource.EresourcePackage; +import org.eclipse.emf.cdo.etypes.EtypesPackage; import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; @@ -61,6 +66,34 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka * * @generated */ + private EClass cdoResourceLeafEClass = null; + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + private EClass cdoFileResourceEClass = null; + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + private EClass cdoBinaryResourceEClass = null; + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + private EClass cdoTextResourceEClass = null; + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ private EDataType resourceSetEDataType = null; /** @@ -126,7 +159,7 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka isInited = true; // Initialize simple dependencies - EcorePackage.eINSTANCE.eClass(); + EtypesPackage.eINSTANCE.eClass(); // Create package meta-data objects theEresourcePackage.createPackageContents(); @@ -309,6 +342,72 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka } /** + * <!-- begin-user-doc --> + * + * @since 4.1 <!-- end-user-doc --> + * @generated + */ + public EClass getCDOResourceLeaf() + { + return cdoResourceLeafEClass; + } + + /** + * <!-- begin-user-doc --> + * + * @since 4.1 <!-- end-user-doc --> + * @generated + */ + public EClass getCDOFileResource() + { + return cdoFileResourceEClass; + } + + /** + * <!-- begin-user-doc --> + * + * @since 4.1 <!-- end-user-doc --> + * @generated + */ + public EClass getCDOBinaryResource() + { + return cdoBinaryResourceEClass; + } + + /** + * <!-- begin-user-doc --> + * + * @since 4.1 <!-- end-user-doc --> + * @generated + */ + public EAttribute getCDOBinaryResource_Contents() + { + return (EAttribute)cdoBinaryResourceEClass.getEStructuralFeatures().get(0); + } + + /** + * <!-- begin-user-doc --> + * + * @since 4.1 <!-- end-user-doc --> + * @generated + */ + public EClass getCDOTextResource() + { + return cdoTextResourceEClass; + } + + /** + * <!-- begin-user-doc --> + * + * @since 4.1 <!-- end-user-doc --> + * @generated + */ + public EAttribute getCDOTextResource_Contents() + { + return (EAttribute)cdoTextResourceEClass.getEStructuralFeatures().get(0); + } + + /** * <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated @@ -387,6 +486,16 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka createEAttribute(cdoResourceEClass, CDO_RESOURCE__WARNINGS); createEAttribute(cdoResourceEClass, CDO_RESOURCE__TIME_STAMP); + cdoResourceLeafEClass = createEClass(CDO_RESOURCE_LEAF); + + cdoFileResourceEClass = createEClass(CDO_FILE_RESOURCE); + + cdoBinaryResourceEClass = createEClass(CDO_BINARY_RESOURCE); + createEAttribute(cdoBinaryResourceEClass, CDO_BINARY_RESOURCE__CONTENTS); + + cdoTextResourceEClass = createEClass(CDO_TEXT_RESOURCE); + createEAttribute(cdoTextResourceEClass, CDO_TEXT_RESOURCE__CONTENTS); + // Create data types resourceSetEDataType = createEDataType(RESOURCE_SET); uriEDataType = createEDataType(URI); @@ -419,6 +528,7 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka // Obtain other dependent packages EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI); + EtypesPackage theEtypesPackage = (EtypesPackage)EPackage.Registry.INSTANCE.getEPackage(EtypesPackage.eNS_URI); // Create type parameters @@ -426,7 +536,11 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka // Add supertypes to classes cdoResourceFolderEClass.getESuperTypes().add(this.getCDOResourceNode()); - cdoResourceEClass.getESuperTypes().add(this.getCDOResourceNode()); + cdoResourceEClass.getESuperTypes().add(this.getCDOResourceLeaf()); + cdoResourceLeafEClass.getESuperTypes().add(this.getCDOResourceNode()); + cdoFileResourceEClass.getESuperTypes().add(this.getCDOResourceLeaf()); + cdoBinaryResourceEClass.getESuperTypes().add(this.getCDOFileResource()); + cdoTextResourceEClass.getESuperTypes().add(this.getCDOFileResource()); // Initialize classes and features; add operations and parameters initEClass(cdoResourceNodeEClass, CDOResourceNode.class, @@ -500,6 +614,28 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka theEcorePackage.getELong(), "timeStamp", null, 0, 1, CDOResource.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ + initEClass(cdoResourceLeafEClass, CDOResourceLeaf.class, + "CDOResourceLeaf", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ + + initEClass(cdoFileResourceEClass, CDOFileResource.class, + "CDOFileResource", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ + + addEOperation(cdoFileResourceEClass, theEtypesPackage.getLob(), "getContents", 1, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$ + + initEClass(cdoBinaryResourceEClass, CDOBinaryResource.class, + "CDOBinaryResource", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ + initEAttribute( + getCDOBinaryResource_Contents(), + theEtypesPackage.getBlob(), + "contents", null, 1, 1, CDOBinaryResource.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ + + initEClass(cdoTextResourceEClass, CDOTextResource.class, + "CDOTextResource", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ + initEAttribute( + getCDOTextResource_Contents(), + theEtypesPackage.getClob(), + "contents", null, 1, 1, CDOTextResource.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ + // Initialize data types initEDataType(resourceSetEDataType, ResourceSet.class, "ResourceSet", !IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ 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 570c2bc54c..bb7e31080b 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 @@ -11,9 +11,13 @@ package org.eclipse.emf.cdo.eresource.util; //import org.eclipse.emf.cdo.eresource.*; +import org.eclipse.emf.cdo.eresource.CDOBinaryResource; +import org.eclipse.emf.cdo.eresource.CDOFileResource; import org.eclipse.emf.cdo.eresource.CDOResource; import org.eclipse.emf.cdo.eresource.CDOResourceFolder; +import org.eclipse.emf.cdo.eresource.CDOResourceLeaf; import org.eclipse.emf.cdo.eresource.CDOResourceNode; +import org.eclipse.emf.cdo.eresource.CDOTextResource; import org.eclipse.emf.cdo.eresource.EresourcePackage; import org.eclipse.emf.common.notify.Adapter; @@ -98,6 +102,30 @@ public class EresourceAdapterFactory extends AdapterFactoryImpl } @Override + public Adapter caseCDOResourceLeaf(CDOResourceLeaf object) + { + return createCDOResourceLeafAdapter(); + } + + @Override + public Adapter caseCDOFileResource(CDOFileResource<?> object) + { + return createCDOFileResourceAdapter(); + } + + @Override + public Adapter caseCDOBinaryResource(CDOBinaryResource object) + { + return createCDOBinaryResourceAdapter(); + } + + @Override + public Adapter caseCDOTextResource(CDOTextResource object) + { + return createCDOTextResourceAdapter(); + } + + @Override public Adapter defaultCase(EObject object) { return createEObjectAdapter(); @@ -163,6 +191,66 @@ public class EresourceAdapterFactory extends AdapterFactoryImpl } /** + * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.eresource.CDOResourceLeaf + * <em>CDO Resource Leaf</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 4.1 <!-- end-user-doc --> + * @return the new adapter. + * @see org.eclipse.emf.cdo.eresource.CDOResourceLeaf + * @generated + */ + public Adapter createCDOResourceLeafAdapter() + { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.eresource.CDOFileResource + * <em>CDO File 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. + * + * @since 4.1 <!-- end-user-doc --> + * @return the new adapter. + * @see org.eclipse.emf.cdo.eresource.CDOFileResource + * @generated + */ + public Adapter createCDOFileResourceAdapter() + { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.eresource.CDOBinaryResource + * <em>CDO Binary 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. + * + * @since 4.1 <!-- end-user-doc --> + * @return the new adapter. + * @see org.eclipse.emf.cdo.eresource.CDOBinaryResource + * @generated + */ + public Adapter createCDOBinaryResourceAdapter() + { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.eresource.CDOTextResource + * <em>CDO Text 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. + * + * @since 4.1 <!-- end-user-doc --> + * @return the new adapter. + * @see org.eclipse.emf.cdo.eresource.CDOTextResource + * @generated + */ + public Adapter createCDOTextResourceAdapter() + { + return null; + } + + /** * Creates a new adapter for the default case. <!-- begin-user-doc --> This default implementation returns null. <!-- * end-user-doc --> * 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 3de480f418..5b1be7ee39 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 @@ -10,9 +10,13 @@ */ package org.eclipse.emf.cdo.eresource.util; +import org.eclipse.emf.cdo.eresource.CDOBinaryResource; +import org.eclipse.emf.cdo.eresource.CDOFileResource; import org.eclipse.emf.cdo.eresource.CDOResource; import org.eclipse.emf.cdo.eresource.CDOResourceFolder; +import org.eclipse.emf.cdo.eresource.CDOResourceLeaf; import org.eclipse.emf.cdo.eresource.CDOResourceNode; +import org.eclipse.emf.cdo.eresource.CDOTextResource; import org.eclipse.emf.cdo.eresource.EresourcePackage; import org.eclipse.emf.ecore.EClass; @@ -76,7 +80,6 @@ public class EresourceSwitch<T> { return doSwitch(theEClass.getClassifierID(), theEObject); } - List<EClass> eSuperTypes = theEClass.getESuperTypes(); return eSuperTypes.isEmpty() ? defaultCase(theEObject) : doSwitch(eSuperTypes.get(0), theEObject); } @@ -122,6 +125,10 @@ public class EresourceSwitch<T> T result = caseCDOResource(cdoResource); if (result == null) { + result = caseCDOResourceLeaf(cdoResource); + } + if (result == null) + { result = caseCDOResourceNode(cdoResource); } if (result == null) @@ -130,6 +137,82 @@ public class EresourceSwitch<T> } return result; } + case EresourcePackage.CDO_RESOURCE_LEAF: + { + CDOResourceLeaf cdoResourceLeaf = (CDOResourceLeaf)theEObject; + T result = caseCDOResourceLeaf(cdoResourceLeaf); + if (result == null) + { + result = caseCDOResourceNode(cdoResourceLeaf); + } + if (result == null) + { + result = defaultCase(theEObject); + } + return result; + } + case EresourcePackage.CDO_FILE_RESOURCE: + { + CDOFileResource<?> cdoFileResource = (CDOFileResource<?>)theEObject; + T result = caseCDOFileResource(cdoFileResource); + if (result == null) + { + result = caseCDOResourceLeaf(cdoFileResource); + } + if (result == null) + { + result = caseCDOResourceNode(cdoFileResource); + } + if (result == null) + { + result = defaultCase(theEObject); + } + return result; + } + case EresourcePackage.CDO_BINARY_RESOURCE: + { + CDOBinaryResource cdoBinaryResource = (CDOBinaryResource)theEObject; + T result = caseCDOBinaryResource(cdoBinaryResource); + if (result == null) + { + result = caseCDOFileResource(cdoBinaryResource); + } + if (result == null) + { + result = caseCDOResourceLeaf(cdoBinaryResource); + } + if (result == null) + { + result = caseCDOResourceNode(cdoBinaryResource); + } + if (result == null) + { + result = defaultCase(theEObject); + } + return result; + } + case EresourcePackage.CDO_TEXT_RESOURCE: + { + CDOTextResource cdoTextResource = (CDOTextResource)theEObject; + T result = caseCDOTextResource(cdoTextResource); + if (result == null) + { + result = caseCDOFileResource(cdoTextResource); + } + if (result == null) + { + result = caseCDOResourceLeaf(cdoTextResource); + } + if (result == null) + { + result = caseCDOResourceNode(cdoTextResource); + } + if (result == null) + { + result = defaultCase(theEObject); + } + return result; + } default: return defaultCase(theEObject); } @@ -183,6 +266,70 @@ public class EresourceSwitch<T> } /** + * Returns the result of interpreting the object as an instance of '<em>CDO Resource Leaf</em>'. <!-- begin-user-doc + * --> This implementation returns null; returning a non-null result will terminate the switch. + * + * @since 4.1 <!-- end-user-doc --> + * @param object + * the target of the switch. + * @return the result of interpreting the object as an instance of '<em>CDO Resource Leaf</em>'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseCDOResourceLeaf(CDOResourceLeaf object) + { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of '<em>CDO File Resource</em>'. <!-- begin-user-doc + * --> This implementation returns null; returning a non-null result will terminate the switch. + * + * @since 4.1 <!-- end-user-doc --> + * @param object + * the target of the switch. + * @return the result of interpreting the object as an instance of '<em>CDO File Resource</em>'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseCDOFileResource(CDOFileResource<?> object) + { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of '<em>CDO Binary Resource</em>'. <!-- begin-user-doc + * --> This implementation returns null; returning a non-null result will terminate the switch. + * + * @since 4.1 <!-- end-user-doc --> + * @param object + * the target of the switch. + * @return the result of interpreting the object as an instance of '<em>CDO Binary Resource</em>'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseCDOBinaryResource(CDOBinaryResource object) + { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of '<em>CDO Text Resource</em>'. <!-- begin-user-doc + * --> This implementation returns null; returning a non-null result will terminate the switch. + * + * @since 4.1 <!-- end-user-doc --> + * @param object + * the target of the switch. + * @return the result of interpreting the object as an instance of '<em>CDO Text Resource</em>'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseCDOTextResource(CDOTextResource object) + { + return null; + } + + /** * 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 --> diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/EtypesPackage.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/EtypesPackage.java index 8224eaa0e7..6015a620f6 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/EtypesPackage.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/EtypesPackage.java @@ -1,400 +1,428 @@ -/* - * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Eike Stepper - initial API and implementation - */ -package org.eclipse.emf.cdo.etypes; - -import org.eclipse.emf.ecore.EAttribute; -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EDataType; -import org.eclipse.emf.ecore.EPackage; -import org.eclipse.emf.ecore.EReference; - -/** - * <!-- begin-user-doc --> The <b>Package</b> for the Etypes model. It contains accessors for the meta objects to - * represent - * <ul> - * <li>each class,</li> - * <li>each feature of each class,</li> - * <li>each enum,</li> - * <li>and each data type</li> - * </ul> - * <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.etypes.EtypesFactory - * @model kind="package" - * @generated - */ -public interface EtypesPackage extends EPackage -{ - /** - * The package name. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - String eNAME = "etypes"; //$NON-NLS-1$ - - /** - * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - String eNS_URI = "http://www.eclipse.org/emf/CDO/Etypes/4.0.0"; //$NON-NLS-1$ - - /** - * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - String eNS_PREFIX = "etypes"; //$NON-NLS-1$ - - /** - * The singleton instance of the package. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - EtypesPackage eINSTANCE = org.eclipse.emf.cdo.etypes.impl.EtypesPackageImpl.init(); - - /** - * The meta object id for the '{@link org.eclipse.emf.cdo.etypes.impl.ModelElementImpl <em>Model Element</em>}' class. - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.etypes.impl.ModelElementImpl - * @see org.eclipse.emf.cdo.etypes.impl.EtypesPackageImpl#getModelElement() - * @generated - */ - int MODEL_ELEMENT = 0; - - /** - * The feature id for the '<em><b>Annotations</b></em>' containment reference list. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - * @ordered - */ - int MODEL_ELEMENT__ANNOTATIONS = 0; - - /** - * The number of structural features of the '<em>Model Element</em>' class. <!-- begin-user-doc --> <!-- end-user-doc - * --> - * - * @generated - * @ordered - */ - int MODEL_ELEMENT_FEATURE_COUNT = 1; - - /** - * The meta object id for the '{@link org.eclipse.emf.cdo.etypes.impl.AnnotationImpl <em>Annotation</em>}' class. <!-- - * begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.etypes.impl.AnnotationImpl - * @see org.eclipse.emf.cdo.etypes.impl.EtypesPackageImpl#getAnnotation() - * @generated - */ - int ANNOTATION = 1; - - /** - * The feature id for the '<em><b>Annotations</b></em>' containment reference list. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - * @ordered - */ - int ANNOTATION__ANNOTATIONS = MODEL_ELEMENT__ANNOTATIONS; - - /** - * The feature id for the '<em><b>Source</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - * @ordered - */ - int ANNOTATION__SOURCE = MODEL_ELEMENT_FEATURE_COUNT + 0; - - /** - * The feature id for the '<em><b>Details</b></em>' map. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - * @ordered - */ - int ANNOTATION__DETAILS = MODEL_ELEMENT_FEATURE_COUNT + 1; - - /** - * The feature id for the '<em><b>Model Element</b></em>' container reference. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - * @ordered - */ - int ANNOTATION__MODEL_ELEMENT = MODEL_ELEMENT_FEATURE_COUNT + 2; - - /** - * The feature id for the '<em><b>Contents</b></em>' containment reference list. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - * @ordered - */ - int ANNOTATION__CONTENTS = MODEL_ELEMENT_FEATURE_COUNT + 3; - - /** - * The feature id for the '<em><b>References</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - * @ordered - */ - int ANNOTATION__REFERENCES = MODEL_ELEMENT_FEATURE_COUNT + 4; - - /** - * The number of structural features of the '<em>Annotation</em>' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - * @ordered - */ - int ANNOTATION_FEATURE_COUNT = MODEL_ELEMENT_FEATURE_COUNT + 5; - - /** - * The meta object id for the '<em>Blob</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.common.lob.CDOBlob - * @see org.eclipse.emf.cdo.etypes.impl.EtypesPackageImpl#getBlob() - * @generated - */ - int BLOB = 2; - - /** - * The meta object id for the '<em>Clob</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.common.lob.CDOClob - * @see org.eclipse.emf.cdo.etypes.impl.EtypesPackageImpl#getClob() - * @generated - */ - int CLOB = 3; - - /** - * Returns the meta object for class '{@link org.eclipse.emf.cdo.etypes.ModelElement <em>Model Element</em>}'. <!-- - * begin-user-doc --> <!-- end-user-doc --> - * - * @return the meta object for class '<em>Model Element</em>'. - * @see org.eclipse.emf.cdo.etypes.ModelElement - * @generated - */ - EClass getModelElement(); - - /** - * Returns the meta object for the containment reference list ' - * {@link org.eclipse.emf.cdo.etypes.ModelElement#getAnnotations <em>Annotations</em>}'. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @return the meta object for the containment reference list '<em>Annotations</em>'. - * @see org.eclipse.emf.cdo.etypes.ModelElement#getAnnotations() - * @see #getModelElement() - * @generated - */ - EReference getModelElement_Annotations(); - - /** - * Returns the meta object for class '{@link org.eclipse.emf.cdo.etypes.Annotation <em>Annotation</em>}'. <!-- - * begin-user-doc --> <!-- end-user-doc --> - * - * @return the meta object for class '<em>Annotation</em>'. - * @see org.eclipse.emf.cdo.etypes.Annotation - * @generated - */ - EClass getAnnotation(); - - /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.etypes.Annotation#getSource <em>Source</em>} - * '. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @return the meta object for the attribute '<em>Source</em>'. - * @see org.eclipse.emf.cdo.etypes.Annotation#getSource() - * @see #getAnnotation() - * @generated - */ - EAttribute getAnnotation_Source(); - - /** - * Returns the meta object for the map '{@link org.eclipse.emf.cdo.etypes.Annotation#getDetails <em>Details</em>}'. - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @return the meta object for the map '<em>Details</em>'. - * @see org.eclipse.emf.cdo.etypes.Annotation#getDetails() - * @see #getAnnotation() - * @generated - */ - EReference getAnnotation_Details(); - - /** - * Returns the meta object for the container reference '{@link org.eclipse.emf.cdo.etypes.Annotation#getModelElement - * <em>Model Element</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @return the meta object for the container reference '<em>Model Element</em>'. - * @see org.eclipse.emf.cdo.etypes.Annotation#getModelElement() - * @see #getAnnotation() - * @generated - */ - EReference getAnnotation_ModelElement(); - - /** - * Returns the meta object for the containment reference list ' - * {@link org.eclipse.emf.cdo.etypes.Annotation#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.etypes.Annotation#getContents() - * @see #getAnnotation() - * @generated - */ - EReference getAnnotation_Contents(); - - /** - * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.etypes.Annotation#getReferences - * <em>References</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @return the meta object for the reference list '<em>References</em>'. - * @see org.eclipse.emf.cdo.etypes.Annotation#getReferences() - * @see #getAnnotation() - * @generated - */ - EReference getAnnotation_References(); - - /** - * Returns the meta object for data type '{@link org.eclipse.emf.cdo.common.lob.CDOBlob <em>Blob</em>}'. <!-- - * begin-user-doc --> <!-- end-user-doc --> - * - * @return the meta object for data type '<em>Blob</em>'. - * @see org.eclipse.emf.cdo.common.lob.CDOBlob - * @model instanceClass="org.eclipse.emf.cdo.etypes.CDOBlob" - * @generated - */ - EDataType getBlob(); - - /** - * Returns the meta object for data type '{@link org.eclipse.emf.cdo.common.lob.CDOClob <em>Clob</em>}'. <!-- - * begin-user-doc --> <!-- end-user-doc --> - * - * @return the meta object for data type '<em>Clob</em>'. - * @see org.eclipse.emf.cdo.common.lob.CDOClob - * @model instanceClass="org.eclipse.emf.cdo.etypes.CDOClob" - * @generated - */ - EDataType getClob(); - - /** - * 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 - */ - EtypesFactory getEtypesFactory(); - - /** - * <!-- begin-user-doc --> Defines literals for the meta objects that represent - * <ul> - * <li>each class,</li> - * <li>each feature of each class,</li> - * <li>each enum,</li> - * <li>and each data type</li> - * </ul> - * <!-- end-user-doc --> - * - * @generated - */ - interface Literals - { - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.etypes.impl.ModelElementImpl <em>Model Element</em>}' - * class. <!-- begin-user-doc --> - * - * @apiviz.exclude <!-- end-user-doc --> - * @see org.eclipse.emf.cdo.etypes.impl.ModelElementImpl - * @see org.eclipse.emf.cdo.etypes.impl.EtypesPackageImpl#getModelElement() - * @generated - */ - EClass MODEL_ELEMENT = eINSTANCE.getModelElement(); - - /** - * The meta object literal for the '<em><b>Annotations</b></em>' containment reference list feature. <!-- - * begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - EReference MODEL_ELEMENT__ANNOTATIONS = eINSTANCE.getModelElement_Annotations(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.etypes.impl.AnnotationImpl <em>Annotation</em>}' - * class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.etypes.impl.AnnotationImpl - * @see org.eclipse.emf.cdo.etypes.impl.EtypesPackageImpl#getAnnotation() - * @generated - */ - EClass ANNOTATION = eINSTANCE.getAnnotation(); - - /** - * The meta object literal for the '<em><b>Source</b></em>' attribute feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EAttribute ANNOTATION__SOURCE = eINSTANCE.getAnnotation_Source(); - - /** - * The meta object literal for the '<em><b>Details</b></em>' map feature. <!-- begin-user-doc --> <!-- end-user-doc - * --> - * - * @generated - */ - EReference ANNOTATION__DETAILS = eINSTANCE.getAnnotation_Details(); - - /** - * The meta object literal for the '<em><b>Model Element</b></em>' container reference feature. <!-- begin-user-doc - * --> <!-- end-user-doc --> - * - * @generated - */ - EReference ANNOTATION__MODEL_ELEMENT = eINSTANCE.getAnnotation_ModelElement(); - - /** - * The meta object literal for the '<em><b>Contents</b></em>' containment reference list feature. <!-- - * begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - EReference ANNOTATION__CONTENTS = eINSTANCE.getAnnotation_Contents(); - - /** - * The meta object literal for the '<em><b>References</b></em>' reference list feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EReference ANNOTATION__REFERENCES = eINSTANCE.getAnnotation_References(); - - /** - * The meta object literal for the '<em>Blob</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.common.lob.CDOBlob - * @see org.eclipse.emf.cdo.etypes.impl.EtypesPackageImpl#getBlob() - * @generated - */ - EDataType BLOB = eINSTANCE.getBlob(); - - /** - * The meta object literal for the '<em>Clob</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.common.lob.CDOClob - * @see org.eclipse.emf.cdo.etypes.impl.EtypesPackageImpl#getClob() - * @generated - */ - EDataType CLOB = eINSTANCE.getClob(); - - } - -} // EtypesPackage +/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.emf.cdo.etypes;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EDataType;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+
+/**
+ * <!-- begin-user-doc --> The <b>Package</b> for the model. It contains accessors for the meta objects to represent
+ * <ul>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
+ * </ul>
+ *
+ * @noextend This interface is not intended to be extended by clients.
+ * @noimplement This interface is not intended to be implemented by clients. <!-- end-user-doc -->
+ * @see org.eclipse.emf.cdo.etypes.EtypesFactory
+ * @model kind="package"
+ * @generated
+ */
+public interface EtypesPackage extends EPackage
+{
+ /**
+ * The package name. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ String eNAME = "etypes"; //$NON-NLS-1$
+
+ /**
+ * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ String eNS_URI = "http://www.eclipse.org/emf/CDO/Etypes/4.0.0"; //$NON-NLS-1$
+
+ /**
+ * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ String eNS_PREFIX = "etypes"; //$NON-NLS-1$
+
+ /**
+ * The singleton instance of the package. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EtypesPackage eINSTANCE = org.eclipse.emf.cdo.etypes.impl.EtypesPackageImpl.init();
+
+ /**
+ * The meta object id for the '{@link org.eclipse.emf.cdo.etypes.impl.ModelElementImpl <em>Model Element</em>}' class.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @see org.eclipse.emf.cdo.etypes.impl.ModelElementImpl
+ * @see org.eclipse.emf.cdo.etypes.impl.EtypesPackageImpl#getModelElement()
+ * @generated
+ */
+ int MODEL_ELEMENT = 0;
+
+ /**
+ * The feature id for the '<em><b>Annotations</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int MODEL_ELEMENT__ANNOTATIONS = 0;
+
+ /**
+ * The number of structural features of the '<em>Model Element</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
+ * -->
+ *
+ * @generated
+ * @ordered
+ */
+ int MODEL_ELEMENT_FEATURE_COUNT = 1;
+
+ /**
+ * The meta object id for the '{@link org.eclipse.emf.cdo.etypes.impl.AnnotationImpl <em>Annotation</em>}' class. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @see org.eclipse.emf.cdo.etypes.impl.AnnotationImpl
+ * @see org.eclipse.emf.cdo.etypes.impl.EtypesPackageImpl#getAnnotation()
+ * @generated
+ */
+ int ANNOTATION = 1;
+
+ /**
+ * The feature id for the '<em><b>Annotations</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int ANNOTATION__ANNOTATIONS = MODEL_ELEMENT__ANNOTATIONS;
+
+ /**
+ * The feature id for the '<em><b>Source</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int ANNOTATION__SOURCE = MODEL_ELEMENT_FEATURE_COUNT + 0;
+
+ /**
+ * The feature id for the '<em><b>Details</b></em>' map. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int ANNOTATION__DETAILS = MODEL_ELEMENT_FEATURE_COUNT + 1;
+
+ /**
+ * The feature id for the '<em><b>Model Element</b></em>' container reference. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int ANNOTATION__MODEL_ELEMENT = MODEL_ELEMENT_FEATURE_COUNT + 2;
+
+ /**
+ * The feature id for the '<em><b>Contents</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int ANNOTATION__CONTENTS = MODEL_ELEMENT_FEATURE_COUNT + 3;
+
+ /**
+ * The feature id for the '<em><b>References</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int ANNOTATION__REFERENCES = MODEL_ELEMENT_FEATURE_COUNT + 4;
+
+ /**
+ * The number of structural features of the '<em>Annotation</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int ANNOTATION_FEATURE_COUNT = MODEL_ELEMENT_FEATURE_COUNT + 5;
+
+ /**
+ * The meta object id for the '<em>Blob</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @see org.eclipse.emf.cdo.common.lob.CDOBlob
+ * @see org.eclipse.emf.cdo.etypes.impl.EtypesPackageImpl#getBlob()
+ * @generated
+ */
+ int BLOB = 2;
+
+ /**
+ * The meta object id for the '<em>Clob</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @see org.eclipse.emf.cdo.common.lob.CDOClob
+ * @see org.eclipse.emf.cdo.etypes.impl.EtypesPackageImpl#getClob()
+ * @generated
+ */
+ int CLOB = 3;
+
+ /**
+ * The meta object id for the '<em>Lob</em>' data type. <!-- begin-user-doc -->
+ *
+ * @since 4.1 <!-- end-user-doc -->
+ * @see org.eclipse.emf.cdo.common.lob.CDOLob
+ * @see org.eclipse.emf.cdo.etypes.impl.EtypesPackageImpl#getLob()
+ * @generated
+ */
+ int LOB = 4;
+
+ /**
+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.etypes.ModelElement <em>Model Element</em>}'. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return the meta object for class '<em>Model Element</em>'.
+ * @see org.eclipse.emf.cdo.etypes.ModelElement
+ * @generated
+ */
+ EClass getModelElement();
+
+ /**
+ * Returns the meta object for the containment reference list '
+ * {@link org.eclipse.emf.cdo.etypes.ModelElement#getAnnotations <em>Annotations</em>}'. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @return the meta object for the containment reference list '<em>Annotations</em>'.
+ * @see org.eclipse.emf.cdo.etypes.ModelElement#getAnnotations()
+ * @see #getModelElement()
+ * @generated
+ */
+ EReference getModelElement_Annotations();
+
+ /**
+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.etypes.Annotation <em>Annotation</em>}'. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return the meta object for class '<em>Annotation</em>'.
+ * @see org.eclipse.emf.cdo.etypes.Annotation
+ * @generated
+ */
+ EClass getAnnotation();
+
+ /**
+ * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.etypes.Annotation#getSource <em>Source</em>}
+ * '. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return the meta object for the attribute '<em>Source</em>'.
+ * @see org.eclipse.emf.cdo.etypes.Annotation#getSource()
+ * @see #getAnnotation()
+ * @generated
+ */
+ EAttribute getAnnotation_Source();
+
+ /**
+ * Returns the meta object for the map '{@link org.eclipse.emf.cdo.etypes.Annotation#getDetails <em>Details</em>}'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return the meta object for the map '<em>Details</em>'.
+ * @see org.eclipse.emf.cdo.etypes.Annotation#getDetails()
+ * @see #getAnnotation()
+ * @generated
+ */
+ EReference getAnnotation_Details();
+
+ /**
+ * Returns the meta object for the container reference '{@link org.eclipse.emf.cdo.etypes.Annotation#getModelElement
+ * <em>Model Element</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return the meta object for the container reference '<em>Model Element</em>'.
+ * @see org.eclipse.emf.cdo.etypes.Annotation#getModelElement()
+ * @see #getAnnotation()
+ * @generated
+ */
+ EReference getAnnotation_ModelElement();
+
+ /**
+ * Returns the meta object for the containment reference list '
+ * {@link org.eclipse.emf.cdo.etypes.Annotation#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.etypes.Annotation#getContents()
+ * @see #getAnnotation()
+ * @generated
+ */
+ EReference getAnnotation_Contents();
+
+ /**
+ * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.etypes.Annotation#getReferences
+ * <em>References</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return the meta object for the reference list '<em>References</em>'.
+ * @see org.eclipse.emf.cdo.etypes.Annotation#getReferences()
+ * @see #getAnnotation()
+ * @generated
+ */
+ EReference getAnnotation_References();
+
+ /**
+ * Returns the meta object for data type '{@link org.eclipse.emf.cdo.common.lob.CDOBlob <em>Blob</em>}'. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return the meta object for data type '<em>Blob</em>'.
+ * @see org.eclipse.emf.cdo.common.lob.CDOBlob
+ * @model instanceClass="org.eclipse.emf.cdo.common.lob.CDOBlob"
+ * @generated
+ */
+ EDataType getBlob();
+
+ /**
+ * Returns the meta object for data type '{@link org.eclipse.emf.cdo.common.lob.CDOClob <em>Clob</em>}'. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return the meta object for data type '<em>Clob</em>'.
+ * @see org.eclipse.emf.cdo.common.lob.CDOClob
+ * @model instanceClass="org.eclipse.emf.cdo.common.lob.CDOClob"
+ * @generated
+ */
+ EDataType getClob();
+
+ /**
+ * Returns the meta object for data type '{@link org.eclipse.emf.cdo.common.lob.CDOLob <em>Lob</em>}'. <!--
+ * begin-user-doc -->
+ *
+ * @since 4.1<!-- end-user-doc -->
+ * @return the meta object for data type '<em>Lob</em>'.
+ * @see org.eclipse.emf.cdo.common.lob.CDOLob
+ * @model instanceClass="org.eclipse.emf.cdo.common.lob.CDOLob"
+ * @generated
+ */
+ EDataType getLob();
+
+ /**
+ * 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
+ */
+ EtypesFactory getEtypesFactory();
+
+ /**
+ * <!-- begin-user-doc --> Defines literals for the meta objects that represent
+ * <ul>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
+ * </ul>
+ *
+ * @noextend This interface is not intended to be extended by clients.
+ * @noimplement This interface is not intended to be implemented by clients. <!-- end-user-doc -->
+ * @generated
+ */
+ interface Literals
+ {
+ /**
+ * The meta object literal for the '{@link org.eclipse.emf.cdo.etypes.impl.ModelElementImpl <em>Model Element</em>}'
+ * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @see org.eclipse.emf.cdo.etypes.impl.ModelElementImpl
+ * @see org.eclipse.emf.cdo.etypes.impl.EtypesPackageImpl#getModelElement()
+ * @generated
+ */
+ EClass MODEL_ELEMENT = eINSTANCE.getModelElement();
+
+ /**
+ * The meta object literal for the '<em><b>Annotations</b></em>' containment reference list feature. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EReference MODEL_ELEMENT__ANNOTATIONS = eINSTANCE.getModelElement_Annotations();
+
+ /**
+ * The meta object literal for the '{@link org.eclipse.emf.cdo.etypes.impl.AnnotationImpl <em>Annotation</em>}'
+ * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @see org.eclipse.emf.cdo.etypes.impl.AnnotationImpl
+ * @see org.eclipse.emf.cdo.etypes.impl.EtypesPackageImpl#getAnnotation()
+ * @generated
+ */
+ EClass ANNOTATION = eINSTANCE.getAnnotation();
+
+ /**
+ * The meta object literal for the '<em><b>Source</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @generated
+ */
+ EAttribute ANNOTATION__SOURCE = eINSTANCE.getAnnotation_Source();
+
+ /**
+ * The meta object literal for the '<em><b>Details</b></em>' map feature. <!-- begin-user-doc --> <!-- end-user-doc
+ * -->
+ *
+ * @generated
+ */
+ EReference ANNOTATION__DETAILS = eINSTANCE.getAnnotation_Details();
+
+ /**
+ * The meta object literal for the '<em><b>Model Element</b></em>' container reference feature. <!-- begin-user-doc
+ * --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EReference ANNOTATION__MODEL_ELEMENT = eINSTANCE.getAnnotation_ModelElement();
+
+ /**
+ * The meta object literal for the '<em><b>Contents</b></em>' containment reference list feature. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EReference ANNOTATION__CONTENTS = eINSTANCE.getAnnotation_Contents();
+
+ /**
+ * The meta object literal for the '<em><b>References</b></em>' reference list feature. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @generated
+ */
+ EReference ANNOTATION__REFERENCES = eINSTANCE.getAnnotation_References();
+
+ /**
+ * The meta object literal for the '<em>Blob</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @see org.eclipse.emf.cdo.common.lob.CDOBlob
+ * @see org.eclipse.emf.cdo.etypes.impl.EtypesPackageImpl#getBlob()
+ * @generated
+ */
+ EDataType BLOB = eINSTANCE.getBlob();
+
+ /**
+ * The meta object literal for the '<em>Clob</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @see org.eclipse.emf.cdo.common.lob.CDOClob
+ * @see org.eclipse.emf.cdo.etypes.impl.EtypesPackageImpl#getClob()
+ * @generated
+ */
+ EDataType CLOB = eINSTANCE.getClob();
+
+ /**
+ * The meta object literal for the '<em>Lob</em>' data type. <!-- begin-user-doc -->
+ *
+ * @since 4.1<!-- end-user-doc -->
+ * @see org.eclipse.emf.cdo.common.lob.CDOLob
+ * @see org.eclipse.emf.cdo.etypes.impl.EtypesPackageImpl#getLob()
+ * @generated
+ */
+ EDataType LOB = eINSTANCE.getLob();
+
+ }
+
+} // EtypesPackage
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/impl/EtypesFactoryImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/impl/EtypesFactoryImpl.java index bf0426fbbd..5838318854 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/impl/EtypesFactoryImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/impl/EtypesFactoryImpl.java @@ -12,6 +12,7 @@ package org.eclipse.emf.cdo.etypes.impl; import org.eclipse.emf.cdo.common.lob.CDOBlob; import org.eclipse.emf.cdo.common.lob.CDOClob; +import org.eclipse.emf.cdo.common.lob.CDOLob; import org.eclipse.emf.cdo.etypes.Annotation; import org.eclipse.emf.cdo.etypes.EtypesFactory; import org.eclipse.emf.cdo.etypes.EtypesPackage; @@ -97,6 +98,8 @@ public class EtypesFactoryImpl extends EFactoryImpl implements EtypesFactory return createBlobFromString(eDataType, initialValue); case EtypesPackage.CLOB: return createClobFromString(eDataType, initialValue); + case EtypesPackage.LOB: + return createLobFromString(eDataType, initialValue); default: throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$ } @@ -116,6 +119,8 @@ public class EtypesFactoryImpl extends EFactoryImpl implements EtypesFactory return convertBlobToString(eDataType, instanceValue); case EtypesPackage.CLOB: return convertClobToString(eDataType, instanceValue); + case EtypesPackage.LOB: + return convertLobToString(eDataType, instanceValue); default: throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$ } @@ -133,8 +138,31 @@ public class EtypesFactoryImpl extends EFactoryImpl implements EtypesFactory } /** - * <!-- begin-user-doc --> <!-- end-user-doc --> + * <!-- begin-user-doc --> * + * @since 4.1 <!-- end-user-doc --> + * @generated + */ + public CDOLob<?> createLobFromString(EDataType eDataType, String initialValue) + { + return (CDOLob<?>)super.createFromString(eDataType, initialValue); + } + + /** + * <!-- begin-user-doc --> + * + * @since 4.1 <!-- end-user-doc --> + * @generated + */ + public String convertLobToString(EDataType eDataType, Object instanceValue) + { + return super.convertToString(eDataType, instanceValue); + } + + /** + * <!-- begin-user-doc --> + * + * @since 4.1 <!-- end-user-doc --> * @generated */ public CDOBlob createBlobFromString(EDataType eDataType, String initialValue) @@ -143,8 +171,9 @@ public class EtypesFactoryImpl extends EFactoryImpl implements EtypesFactory } /** - * <!-- begin-user-doc --> <!-- end-user-doc --> + * <!-- begin-user-doc --> * + * @since 4.1 <!-- end-user-doc --> * @generated */ public String convertBlobToString(EDataType eDataType, Object instanceValue) diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/impl/EtypesPackageImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/impl/EtypesPackageImpl.java index 731ac2386f..d4bb74e95c 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/impl/EtypesPackageImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/impl/EtypesPackageImpl.java @@ -12,6 +12,7 @@ package org.eclipse.emf.cdo.etypes.impl; import org.eclipse.emf.cdo.common.lob.CDOBlob; import org.eclipse.emf.cdo.common.lob.CDOClob; +import org.eclipse.emf.cdo.common.lob.CDOLob; import org.eclipse.emf.cdo.etypes.Annotation; import org.eclipse.emf.cdo.etypes.EtypesFactory; import org.eclipse.emf.cdo.etypes.EtypesPackage; @@ -54,6 +55,13 @@ public class EtypesPackageImpl extends EPackageImpl implements EtypesPackage * * @generated */ + private EDataType lobEDataType = null; + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ private EDataType blobEDataType = null; /** @@ -209,6 +217,17 @@ public class EtypesPackageImpl extends EPackageImpl implements EtypesPackage } /** + * <!-- begin-user-doc --> + * + * @since 4.1 <!-- end-user-doc --> + * @generated + */ + public EDataType getLob() + { + return lobEDataType; + } + + /** * <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated @@ -271,6 +290,7 @@ public class EtypesPackageImpl extends EPackageImpl implements EtypesPackage // Create data types blobEDataType = createEDataType(BLOB); clobEDataType = createEDataType(CLOB); + lobEDataType = createEDataType(LOB); } /** @@ -350,6 +370,7 @@ public class EtypesPackageImpl extends EPackageImpl implements EtypesPackage // Initialize data types initEDataType(blobEDataType, CDOBlob.class, "Blob", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ initEDataType(clobEDataType, CDOClob.class, "Clob", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ + initEDataType(lobEDataType, CDOLob.class, "Lob", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ // Create resource createResource(eNS_URI); diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/util/EtypesSwitch.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/util/EtypesSwitch.java index c6c2b49856..55e84f5d72 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/util/EtypesSwitch.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/util/EtypesSwitch.java @@ -76,7 +76,6 @@ public class EtypesSwitch<T> { return doSwitch(theEClass.getClassifierID(), theEObject); } - List<EClass> eSuperTypes = theEClass.getESuperTypes(); return eSuperTypes.isEmpty() ? defaultCase(theEObject) : doSwitch(eSuperTypes.get(0), theEObject); } |