summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-02-03 14:05:10 (EST)
committerEike Stepper2007-02-03 14:05:10 (EST)
commitb241fcbab8a97227ddf5b773d6889d664644a6c5 (patch)
treebf3d49196dda1041bd4feb8b30d9ab3da30d920a
parentc883bcd26497dcae129cf38cd9d1681aae2e191d (diff)
downloadcdo-b241fcbab8a97227ddf5b773d6889d664644a6c5.zip
cdo-b241fcbab8a97227ddf5b773d6889d664644a6c5.tar.gz
cdo-b241fcbab8a97227ddf5b773d6889d664644a6c5.tar.bz2
Develop CDO2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/model/model1.ecore2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Category.java19
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Model1Package.java33
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CategoryImpl.java11
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1PackageImpl.java16
5 files changed, 78 insertions, 3 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/model/model1.ecore b/plugins/org.eclipse.emf.cdo.tests.model1/model/model1.ecore
index ce04af9..38bec25 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/model/model1.ecore
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/model/model1.ecore
@@ -22,6 +22,8 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Category">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="categories" upperBound="-1"
+ eType="#//Category" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="products" upperBound="-1"
eType="#//Product" containment="true"/>
</eClassifiers>
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Category.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Category.java
index bdadf33..e58f905 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Category.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Category.java
@@ -17,6 +17,7 @@ import org.eclipse.emf.common.util.EList;
* The following features are supported:
* <ul>
* <li>{@link org.eclipse.emf.cdo.tests.model1.Category#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.Category#getCategories <em>Categories</em>}</li>
* <li>{@link org.eclipse.emf.cdo.tests.model1.Category#getProducts <em>Products</em>}</li>
* </ul>
* </p>
@@ -57,6 +58,24 @@ public interface Category extends CDOObject
void setName(String value);
/**
+ * Returns the value of the '<em><b>Categories</b></em>' containment
+ * reference list. The list contents are of type
+ * {@link org.eclipse.emf.cdo.tests.model1.Category}. <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Categories</em>' containment reference list
+ * isn't clear, there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ *
+ * @return the value of the '<em>Categories</em>' containment reference
+ * list.
+ * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCategory_Categories()
+ * @model type="org.eclipse.emf.cdo.tests.model1.Category" containment="true"
+ * @generated
+ */
+ EList getCategories();
+
+ /**
* Returns the value of the '<em><b>Products</b></em>' containment
* reference list. The list contents are of type
* {@link org.eclipse.emf.cdo.tests.model1.Product}. <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Model1Package.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Model1Package.java
index 0f9d035..ad830a8 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Model1Package.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Model1Package.java
@@ -216,13 +216,22 @@ public interface Model1Package extends EPackage
int CATEGORY__NAME = 0;
/**
+ * The feature id for the '<em><b>Categories</b></em>' containment
+ * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int CATEGORY__CATEGORIES = 1;
+
+ /**
* The feature id for the '<em><b>Products</b></em>' containment
* reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated
* @ordered
*/
- int CATEGORY__PRODUCTS = 1;
+ int CATEGORY__PRODUCTS = 2;
/**
* The number of structural features of the '<em>Category</em>' class.
@@ -231,7 +240,7 @@ public interface Model1Package extends EPackage
* @generated
* @ordered
*/
- int CATEGORY_FEATURE_COUNT = 2;
+ int CATEGORY_FEATURE_COUNT = 3;
/**
* The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.CompanyImpl <em>Company</em>}'
@@ -418,6 +427,17 @@ public interface Model1Package extends EPackage
EAttribute getCategory_Name();
/**
+ * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model1.Category#getCategories <em>Categories</em>}'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return the meta object for the containment reference list '<em>Categories</em>'.
+ * @see org.eclipse.emf.cdo.tests.model1.Category#getCategories()
+ * @see #getCategory()
+ * @generated
+ */
+ EReference getCategory_Categories();
+
+ /**
* Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model1.Category#getProducts <em>Products</em>}'.
* <!-- begin-user-doc --> <!-- end-user-doc -->
*
@@ -610,6 +630,15 @@ public interface Model1Package extends EPackage
EAttribute CATEGORY__NAME = eINSTANCE.getCategory_Name();
/**
+ * The meta object literal for the '<em><b>Categories</b></em>'
+ * containment reference list feature. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @generated
+ */
+ EReference CATEGORY__CATEGORIES = eINSTANCE.getCategory_Categories();
+
+ /**
* The meta object literal for the '<em><b>Products</b></em>'
* containment reference list feature. <!-- begin-user-doc --> <!--
* end-user-doc -->
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CategoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CategoryImpl.java
index 4a0f36e..e6b7c82 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CategoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CategoryImpl.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.internal.cdo.CDOObjectImpl;
* The following features are implemented:
* <ul>
* <li>{@link org.eclipse.emf.cdo.tests.model1.impl.CategoryImpl#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.CategoryImpl#getCategories <em>Categories</em>}</li>
* <li>{@link org.eclipse.emf.cdo.tests.model1.impl.CategoryImpl#getProducts <em>Products</em>}</li>
* </ul>
* </p>
@@ -73,6 +74,16 @@ public class CategoryImpl extends CDOObjectImpl implements Category
*
* @generated
*/
+ public EList getCategories()
+ {
+ return (EList)eGet(Model1Package.Literals.CATEGORY__CATEGORIES, true);
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
public EList getProducts()
{
return (EList)eGet(Model1Package.Literals.CATEGORY__PRODUCTS, true);
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1PackageImpl.java
index 91fe490..7812929 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1PackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1PackageImpl.java
@@ -278,7 +278,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
*
* @generated
*/
- public EReference getCategory_Products()
+ public EReference getCategory_Categories()
{
return (EReference)categoryEClass.getEStructuralFeatures().get(1);
}
@@ -288,6 +288,16 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
*
* @generated
*/
+ public EReference getCategory_Products()
+ {
+ return (EReference)categoryEClass.getEStructuralFeatures().get(2);
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
public EClass getCompany()
{
return companyEClass;
@@ -371,6 +381,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
categoryEClass = createEClass(CATEGORY);
createEAttribute(categoryEClass, CATEGORY__NAME);
+ createEReference(categoryEClass, CATEGORY__CATEGORIES);
createEReference(categoryEClass, CATEGORY__PRODUCTS);
companyEClass = createEClass(COMPANY);
@@ -445,6 +456,9 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
initEAttribute(getCategory_Name(), ecorePackage.getEString(), "name", null, 0, 1,
Category.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getCategory_Categories(), this.getCategory(), null, "categories", null, 0, -1,
+ Category.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+ !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getCategory_Products(), this.getProduct(), null, "products", null, 0, -1,
Category.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
!IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);