diff options
| author | Eike Stepper | 2012-03-21 10:53:40 +0000 |
|---|---|---|
| committer | Eike Stepper | 2012-03-21 10:53:40 +0000 |
| commit | b255e7b5c36e07a796b294447d0caee8460a79e0 (patch) | |
| tree | 53bae1785a85f129f586fd2ea13bad281d97db9d | |
| parent | b3a680df10ef6dae765bd392cbb4400bb2da958e (diff) | |
| download | cdo-b255e7b5c36e07a796b294447d0caee8460a79e0.tar.gz cdo-b255e7b5c36e07a796b294447d0caee8460a79e0.tar.xz cdo-b255e7b5c36e07a796b294447d0caee8460a79e0.zip | |
[374418] Issue on control/uncontrol of model element with Savepoint
https://bugs.eclipse.org/bugs/show_bug.cgi?id=374418
44 files changed, 699 insertions, 851 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/model/model6.genmodel b/plugins/org.eclipse.emf.cdo.tests.model6/model/model6.genmodel index 7ceef8889a..2e436be2e8 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/model/model6.genmodel +++ b/plugins/org.eclipse.emf.cdo.tests.model6/model/model6.genmodel @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="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"
modelDirectory="/org.eclipse.emf.cdo.tests.model6/src" editDirectory="" editorDirectory=""
modelPluginID="org.eclipse.emf.cdo.tests.model6" modelName="model6" editPluginClass="org.eclipse.emf.cdo.tests.model6.provider.Model6EditPlugin"
editorPluginClass="org.eclipse.emf.cdo.tests.model6.presentation.Model6EditorPlugin"
updateClasspath="false" rootExtendsClass="org.eclipse.emf.internal.cdo.CDOObjectImpl"
reflectiveDelegation="true" codeFormatting="true" testsDirectory="" testSuiteClass="org.eclipse.emf.cdo.tests.model6.tests.model6AllTests"
- importerID="org.eclipse.emf.importer.cdo" featureDelegation="Reflective" complianceLevel="5.0"
- copyrightFields="false" editPluginID="org.eclipse.emf.cdo.tests.model6.edit" runtimeVersion="2.6">
+ importerID="org.eclipse.emf.importer.cdo" featureDelegation="Reflective" containmentProxies="true"
+ complianceLevel="5.0" copyrightFields="false" editPluginID="org.eclipse.emf.cdo.tests.model6.edit"
+ runtimeVersion="2.6">
<foreignModel>model6.ecore</foreignModel>
<modelPluginVariables>CDO=org.eclipse.emf.cdo</modelPluginVariables>
<genPackages prefix="Model6" basePackage="org.eclipse.emf.cdo.tests" disposableProviderFactory="true"
@@ -32,5 +32,22 @@ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model6.ecore#//ContainmentObject/containmentOptional"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model6.ecore#//ContainmentObject/containmentList"/>
</genClasses>
+ <genClasses ecoreClass="model6.ecore#//A">
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model6.ecore#//A/ownedDs"/>
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model6.ecore#//A/ownedBs"/>
+ </genClasses>
+ <genClasses ecoreClass="model6.ecore#//B">
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model6.ecore#//B/ownedC"/>
+ </genClasses>
+ <genClasses ecoreClass="model6.ecore#//C"/>
+ <genClasses ecoreClass="model6.ecore#//D">
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model6.ecore#//D/data"/>
+ </genClasses>
+ <genClasses ecoreClass="model6.ecore#//E">
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model6.ecore#//E/ownedAs"/>
+ </genClasses>
+ <genClasses ecoreClass="model6.ecore#//F">
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model6.ecore#//F/ownedEs"/>
+ </genClasses>
</genPackages>
</genmodel:GenModel>
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/model/model6.legacy.genmodel b/plugins/org.eclipse.emf.cdo.tests.model6/model/model6.legacy.genmodel index 5fc5a37a89..b73ceca3bf 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/model/model6.legacy.genmodel +++ b/plugins/org.eclipse.emf.cdo.tests.model6/model/model6.legacy.genmodel @@ -1,11 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="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"
modelDirectory="/org.eclipse.emf.cdo.tests.model6/src" editDirectory="" editorDirectory=""
modelPluginID="org.eclipse.emf.cdo.tests.model6" modelName="model6" updateClasspath="false"
codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.ecore"
- complianceLevel="5.0" providerRootExtendsClass="" runtimeVersion="2.6">
+ containmentProxies="true" complianceLevel="5.0" providerRootExtendsClass="" runtimeVersion="2.6">
<foreignModel>model6.ecore</foreignModel>
<modelPluginVariables>CDO=org.eclipse.emf.cdo</modelPluginVariables>
<genPackages prefix="Model6" basePackage="org.eclipse.emf.cdo.tests.legacy" disposableProviderFactory="true"
@@ -30,5 +29,22 @@ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model6.ecore#//ContainmentObject/containmentOptional"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model6.ecore#//ContainmentObject/containmentList"/>
</genClasses>
+ <genClasses ecoreClass="model6.ecore#//A">
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model6.ecore#//A/ownedDs"/>
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model6.ecore#//A/ownedBs"/>
+ </genClasses>
+ <genClasses ecoreClass="model6.ecore#//B">
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model6.ecore#//B/ownedC"/>
+ </genClasses>
+ <genClasses ecoreClass="model6.ecore#//C"/>
+ <genClasses ecoreClass="model6.ecore#//D">
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model6.ecore#//D/data"/>
+ </genClasses>
+ <genClasses ecoreClass="model6.ecore#//E">
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model6.ecore#//E/ownedAs"/>
+ </genClasses>
+ <genClasses ecoreClass="model6.ecore#//F">
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model6.ecore#//F/ownedEs"/>
+ </genClasses>
</genPackages>
</genmodel:GenModel>
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/Model6Factory.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/Model6Factory.java index 9ab23b41bd..cb90209c9f 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/Model6Factory.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/Model6Factory.java @@ -24,7 +24,6 @@ import org.eclipse.emf.cdo.tests.model6.Root; /**
* <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a create method for each non-abstract class of
* the model. <!-- end-user-doc -->
- *
* @see org.eclipse.emf.cdo.tests.legacy.model6.Model6Package
* @generated
*/
@@ -32,101 +31,100 @@ public interface Model6Factory extends org.eclipse.emf.cdo.tests.model6.Model6Fa {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation";
/**
- * The singleton instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The singleton instance of the factory.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
Model6Factory eINSTANCE = org.eclipse.emf.cdo.tests.legacy.model6.impl.Model6FactoryImpl.init();
/**
- * Returns a new object of class '<em>Root</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Returns a new object of class '<em>Root</em>'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @return a new object of class '<em>Root</em>'.
* @generated
*/
Root createRoot();
/**
- * Returns a new object of class '<em>Base Object</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Returns a new object of class '<em>Base Object</em>'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @return a new object of class '<em>Base Object</em>'.
* @generated
*/
BaseObject createBaseObject();
/**
- * Returns a new object of class '<em>Reference Object</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Returns a new object of class '<em>Reference Object</em>'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @return a new object of class '<em>Reference Object</em>'.
* @generated
*/
ReferenceObject createReferenceObject();
/**
- * Returns a new object of class '<em>Containment Object</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Returns a new object of class '<em>Containment Object</em>'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @return a new object of class '<em>Containment Object</em>'.
* @generated
*/
ContainmentObject createContainmentObject();
/**
- * Returns a new object of class '<em>A</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Returns a new object of class '<em>A</em>'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @return a new object of class '<em>A</em>'.
* @generated
*/
A createA();
/**
- * Returns a new object of class '<em>B</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Returns a new object of class '<em>B</em>'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @return a new object of class '<em>B</em>'.
* @generated
*/
B createB();
/**
- * Returns a new object of class '<em>C</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Returns a new object of class '<em>C</em>'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @return a new object of class '<em>C</em>'.
* @generated
*/
C createC();
/**
- * Returns a new object of class '<em>D</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Returns a new object of class '<em>D</em>'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @return a new object of class '<em>D</em>'.
* @generated
*/
D createD();
/**
- * Returns a new object of class '<em>E</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Returns a new object of class '<em>E</em>'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @return a new object of class '<em>E</em>'.
* @generated
*/
E createE();
/**
- * Returns a new object of class '<em>F</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Returns a new object of class '<em>F</em>'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @return a new object of class '<em>F</em>'.
* @generated
*/
F createF();
/**
- * Returns the package supported by this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Returns the package supported by this factory.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @return the package supported by this factory.
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/Model6Package.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/Model6Package.java index 210a77b885..febe3d162e 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/Model6Package.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/Model6Package.java @@ -23,7 +23,6 @@ import org.eclipse.emf.ecore.EReference; * <li>and each data type</li>
* </ul>
* <!-- end-user-doc -->
- *
* @see org.eclipse.emf.cdo.tests.legacy.model6.Model6Factory
* @model kind="package"
* @generated
@@ -32,35 +31,34 @@ public interface Model6Package extends org.eclipse.emf.cdo.tests.model6.Model6Pa {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation";
/**
- * The package name. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The package name.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
String eNAME = "model6";
/**
- * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The package namespace URI.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
String eNS_URI = "http://www.eclipse.org/emf/CDO/tests/legacy/model6/1.0.0";
/**
- * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The package namespace name.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
String eNS_PREFIX = "model6";
/**
- * The singleton instance of the package. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The singleton instance of the package.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
Model6Package eINSTANCE = org.eclipse.emf.cdo.tests.legacy.model6.impl.Model6PackageImpl.init();
@@ -68,7 +66,6 @@ public interface Model6Package extends org.eclipse.emf.cdo.tests.model6.Model6Pa /**
* The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.RootImpl <em>Root</em>}' class.
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @see org.eclipse.emf.cdo.tests.legacy.model6.impl.RootImpl
* @see org.eclipse.emf.cdo.tests.legacy.model6.impl.Model6PackageImpl#getRoot()
* @generated
@@ -76,53 +73,52 @@ public interface Model6Package extends org.eclipse.emf.cdo.tests.model6.Model6Pa int ROOT = 0;
/**
- * The feature id for the '<em><b>List A</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>List A</b></em>' containment reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int ROOT__LIST_A = 0;
/**
- * The feature id for the '<em><b>List B</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>List B</b></em>' containment reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int ROOT__LIST_B = 1;
/**
- * The feature id for the '<em><b>List C</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>List C</b></em>' containment reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int ROOT__LIST_C = 2;
/**
- * The feature id for the '<em><b>List D</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>List D</b></em>' containment reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int ROOT__LIST_D = 3;
/**
- * The number of structural features of the '<em>Root</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The number of structural features of the '<em>Root</em>' class.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
* @ordered
*/
int ROOT_FEATURE_COUNT = 4;
/**
- * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.BaseObjectImpl
- * <em>Base Object</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.BaseObjectImpl <em>Base Object</em>}' class.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @see org.eclipse.emf.cdo.tests.legacy.model6.impl.BaseObjectImpl
* @see org.eclipse.emf.cdo.tests.legacy.model6.impl.Model6PackageImpl#getBaseObject()
* @generated
@@ -166,9 +162,8 @@ public interface Model6Package extends org.eclipse.emf.cdo.tests.model6.Model6Pa int BASE_OBJECT_FEATURE_COUNT = 3;
/**
- * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.ReferenceObjectImpl
- * <em>Reference Object</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.ReferenceObjectImpl <em>Reference Object</em>}' class.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @see org.eclipse.emf.cdo.tests.legacy.model6.impl.ReferenceObjectImpl
* @see org.eclipse.emf.cdo.tests.legacy.model6.impl.Model6PackageImpl#getReferenceObject()
* @generated
@@ -221,18 +216,17 @@ public interface Model6Package extends org.eclipse.emf.cdo.tests.model6.Model6Pa int REFERENCE_OBJECT__REFERENCE_LIST = BASE_OBJECT_FEATURE_COUNT + 1;
/**
- * The number of structural features of the '<em>Reference Object</em>' class. <!-- begin-user-doc --> <!--
+ * The number of structural features of the '<em>Reference Object</em>' class.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int REFERENCE_OBJECT_FEATURE_COUNT = BASE_OBJECT_FEATURE_COUNT + 2;
/**
- * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.ContainmentObjectImpl
- * <em>Containment Object</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.ContainmentObjectImpl <em>Containment Object</em>}' class.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @see org.eclipse.emf.cdo.tests.legacy.model6.impl.ContainmentObjectImpl
* @see org.eclipse.emf.cdo.tests.legacy.model6.impl.Model6PackageImpl#getContainmentObject()
* @generated
@@ -267,27 +261,27 @@ public interface Model6Package extends org.eclipse.emf.cdo.tests.model6.Model6Pa int CONTAINMENT_OBJECT__ATTRIBUTE_LIST = BASE_OBJECT__ATTRIBUTE_LIST;
/**
- * The feature id for the '<em><b>Containment Optional</b></em>' containment reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Containment Optional</b></em>' containment reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL = BASE_OBJECT_FEATURE_COUNT + 0;
/**
- * The feature id for the '<em><b>Containment List</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Containment List</b></em>' containment reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int CONTAINMENT_OBJECT__CONTAINMENT_LIST = BASE_OBJECT_FEATURE_COUNT + 1;
/**
- * The number of structural features of the '<em>Containment Object</em>' class. <!-- begin-user-doc --> <!--
+ * The number of structural features of the '<em>Containment Object</em>' class.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -304,26 +298,26 @@ public interface Model6Package extends org.eclipse.emf.cdo.tests.model6.Model6Pa int A = 4;
/**
- * The feature id for the '<em><b>Owned Ds</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Owned Ds</b></em>' containment reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int A__OWNED_DS = 0;
/**
- * The feature id for the '<em><b>Owned Bs</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Owned Bs</b></em>' containment reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int A__OWNED_BS = 1;
/**
- * The number of structural features of the '<em>A</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The number of structural features of the '<em>A</em>' class.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -349,8 +343,8 @@ public interface Model6Package extends org.eclipse.emf.cdo.tests.model6.Model6Pa int B__OWNED_C = 0;
/**
- * The number of structural features of the '<em>B</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The number of structural features of the '<em>B</em>' class.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -367,8 +361,8 @@ public interface Model6Package extends org.eclipse.emf.cdo.tests.model6.Model6Pa int C = 6;
/**
- * The number of structural features of the '<em>C</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The number of structural features of the '<em>C</em>' class.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -385,16 +379,16 @@ public interface Model6Package extends org.eclipse.emf.cdo.tests.model6.Model6Pa int D = 7;
/**
- * The feature id for the '<em><b>Data</b></em>' containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The feature id for the '<em><b>Data</b></em>' containment reference.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
* @ordered
*/
int D__DATA = 0;
/**
- * The number of structural features of the '<em>D</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The number of structural features of the '<em>D</em>' class.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -411,17 +405,17 @@ public interface Model6Package extends org.eclipse.emf.cdo.tests.model6.Model6Pa int E = 8;
/**
- * The feature id for the '<em><b>Owned As</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Owned As</b></em>' containment reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int E__OWNED_AS = 0;
/**
- * The number of structural features of the '<em>E</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The number of structural features of the '<em>E</em>' class.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -438,17 +432,17 @@ public interface Model6Package extends org.eclipse.emf.cdo.tests.model6.Model6Pa int F = 9;
/**
- * The feature id for the '<em><b>Owned Es</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Owned Es</b></em>' containment reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int F__OWNED_ES = 0;
/**
- * The number of structural features of the '<em>F</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The number of structural features of the '<em>F</em>' class.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -465,10 +459,9 @@ public interface Model6Package extends org.eclipse.emf.cdo.tests.model6.Model6Pa EClass getRoot();
/**
- * Returns the meta object for the containment reference list '
- * {@link org.eclipse.emf.cdo.tests.legacy.model6.Root#getListA <em>List A</em>}'. <!-- begin-user-doc --> <!--
+ * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.legacy.model6.Root#getListA <em>List A</em>}'.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @return the meta object for the containment reference list '<em>List A</em>'.
* @see org.eclipse.emf.cdo.tests.legacy.model6.Root#getListA()
* @see #getRoot()
@@ -477,10 +470,9 @@ public interface Model6Package extends org.eclipse.emf.cdo.tests.model6.Model6Pa EReference getRoot_ListA();
/**
- * Returns the meta object for the containment reference list '
- * {@link org.eclipse.emf.cdo.tests.legacy.model6.Root#getListB <em>List B</em>}'. <!-- begin-user-doc --> <!--
+ * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.legacy.model6.Root#getListB <em>List B</em>}'.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @return the meta object for the containment reference list '<em>List B</em>'.
* @see org.eclipse.emf.cdo.tests.legacy.model6.Root#getListB()
* @see #getRoot()
@@ -489,10 +481,9 @@ public interface Model6Package extends org.eclipse.emf.cdo.tests.model6.Model6Pa EReference getRoot_ListB();
/**
- * Returns the meta object for the containment reference list '
- * {@link org.eclipse.emf.cdo.tests.legacy.model6.Root#getListC <em>List C</em>}'. <!-- begin-user-doc --> <!--
+ * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.legacy.model6.Root#getListC <em>List C</em>}'.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @return the meta object for the containment reference list '<em>List C</em>'.
* @see org.eclipse.emf.cdo.tests.legacy.model6.Root#getListC()
* @see #getRoot()
@@ -501,10 +492,9 @@ public interface Model6Package extends org.eclipse.emf.cdo.tests.model6.Model6Pa EReference getRoot_ListC();
/**
- * Returns the meta object for the containment reference list '
- * {@link org.eclipse.emf.cdo.tests.legacy.model6.Root#getListD <em>List D</em>}'. <!-- begin-user-doc --> <!--
+ * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.legacy.model6.Root#getListD <em>List D</em>}'.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @return the meta object for the containment reference list '<em>List D</em>'.
* @see org.eclipse.emf.cdo.tests.legacy.model6.Root#getListD()
* @see #getRoot()
@@ -513,9 +503,8 @@ public interface Model6Package extends org.eclipse.emf.cdo.tests.model6.Model6Pa EReference getRoot_ListD();
/**
- * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model6.BaseObject <em>Base Object</em>}
- * '. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model6.BaseObject <em>Base Object</em>}'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @return the meta object for class '<em>Base Object</em>'.
* @see org.eclipse.emf.cdo.tests.legacy.model6.BaseObject
* @generated
@@ -559,9 +548,8 @@ public interface Model6Package extends org.eclipse.emf.cdo.tests.model6.Model6Pa EAttribute getBaseObject_AttributeList();
/**
- * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model6.ReferenceObject
- * <em>Reference Object</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model6.ReferenceObject <em>Reference Object</em>}'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @return the meta object for class '<em>Reference Object</em>'.
* @see org.eclipse.emf.cdo.tests.legacy.model6.ReferenceObject
* @generated
@@ -569,10 +557,8 @@ public interface Model6Package extends org.eclipse.emf.cdo.tests.model6.Model6Pa EClass getReferenceObject();
/**
- * Returns the meta object for the reference '
- * {@link org.eclipse.emf.cdo.tests.legacy.model6.ReferenceObject#getReferenceOptional <em>Reference Optional</em>}'.
+ * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.legacy.model6.ReferenceObject#getReferenceOptional <em>Reference Optional</em>}'.
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @return the meta object for the reference '<em>Reference Optional</em>'.
* @see org.eclipse.emf.cdo.tests.legacy.model6.ReferenceObject#getReferenceOptional()
* @see #getReferenceObject()
@@ -593,9 +579,8 @@ public interface Model6Package extends org.eclipse.emf.cdo.tests.model6.Model6Pa EReference getReferenceObject_ReferenceList();
/**
- * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model6.ContainmentObject
- * <em>Containment Object</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model6.ContainmentObject <em>Containment Object</em>}'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @return the meta object for class '<em>Containment Object</em>'.
* @see org.eclipse.emf.cdo.tests.legacy.model6.ContainmentObject
* @generated
@@ -603,10 +588,8 @@ public interface Model6Package extends org.eclipse.emf.cdo.tests.model6.Model6Pa EClass getContainmentObject();
/**
- * Returns the meta object for the containment reference '
- * {@link org.eclipse.emf.cdo.tests.legacy.model6.ContainmentObject#getContainmentOptional
- * <em>Containment Optional</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Returns the meta object for the containment reference '{@link org.eclipse.emf.cdo.tests.legacy.model6.ContainmentObject#getContainmentOptional <em>Containment Optional</em>}'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @return the meta object for the containment reference '<em>Containment Optional</em>'.
* @see org.eclipse.emf.cdo.tests.legacy.model6.ContainmentObject#getContainmentOptional()
* @see #getContainmentObject()
@@ -615,10 +598,8 @@ public interface Model6Package extends org.eclipse.emf.cdo.tests.model6.Model6Pa EReference getContainmentObject_ContainmentOptional();
/**
- * Returns the meta object for the containment reference list '
- * {@link org.eclipse.emf.cdo.tests.legacy.model6.ContainmentObject#getContainmentList <em>Containment List</em>}'.
+ * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.legacy.model6.ContainmentObject#getContainmentList <em>Containment List</em>}'.
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @return the meta object for the containment reference list '<em>Containment List</em>'.
* @see org.eclipse.emf.cdo.tests.legacy.model6.ContainmentObject#getContainmentList()
* @see #getContainmentObject()
@@ -637,10 +618,9 @@ public interface Model6Package extends org.eclipse.emf.cdo.tests.model6.Model6Pa EClass getA();
/**
- * Returns the meta object for the containment reference list '
- * {@link org.eclipse.emf.cdo.tests.legacy.model6.A#getOwnedDs <em>Owned Ds</em>}'. <!-- begin-user-doc --> <!--
+ * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.legacy.model6.A#getOwnedDs <em>Owned Ds</em>}'.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @return the meta object for the containment reference list '<em>Owned Ds</em>'.
* @see org.eclipse.emf.cdo.tests.legacy.model6.A#getOwnedDs()
* @see #getA()
@@ -649,10 +629,9 @@ public interface Model6Package extends org.eclipse.emf.cdo.tests.model6.Model6Pa EReference getA_OwnedDs();
/**
- * Returns the meta object for the containment reference list '
- * {@link org.eclipse.emf.cdo.tests.legacy.model6.A#getOwnedBs <em>Owned Bs</em>}'. <!-- begin-user-doc --> <!--
+ * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.legacy.model6.A#getOwnedBs <em>Owned Bs</em>}'.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @return the meta object for the containment reference list '<em>Owned Bs</em>'.
* @see org.eclipse.emf.cdo.tests.legacy.model6.A#getOwnedBs()
* @see #getA()
@@ -671,9 +650,8 @@ public interface Model6Package extends org.eclipse.emf.cdo.tests.model6.Model6Pa EClass getB();
/**
- * Returns the meta object for the containment reference '{@link org.eclipse.emf.cdo.tests.legacy.model6.B#getOwnedC
- * <em>Owned C</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Returns the meta object for the containment reference '{@link org.eclipse.emf.cdo.tests.legacy.model6.B#getOwnedC <em>Owned C</em>}'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @return the meta object for the containment reference '<em>Owned C</em>'.
* @see org.eclipse.emf.cdo.tests.legacy.model6.B#getOwnedC()
* @see #getB()
@@ -702,9 +680,8 @@ public interface Model6Package extends org.eclipse.emf.cdo.tests.model6.Model6Pa EClass getD();
/**
- * Returns the meta object for the containment reference '{@link org.eclipse.emf.cdo.tests.legacy.model6.D#getData
- * <em>Data</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Returns the meta object for the containment reference '{@link org.eclipse.emf.cdo.tests.legacy.model6.D#getData <em>Data</em>}'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @return the meta object for the containment reference '<em>Data</em>'.
* @see org.eclipse.emf.cdo.tests.legacy.model6.D#getData()
* @see #getD()
@@ -723,10 +700,9 @@ public interface Model6Package extends org.eclipse.emf.cdo.tests.model6.Model6Pa EClass getE();
/**
- * Returns the meta object for the containment reference list '
- * {@link org.eclipse.emf.cdo.tests.legacy.model6.E#getOwnedAs <em>Owned As</em>}'. <!-- begin-user-doc --> <!--
+ * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.legacy.model6.E#getOwnedAs <em>Owned As</em>}'.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @return the meta object for the containment reference list '<em>Owned As</em>'.
* @see org.eclipse.emf.cdo.tests.legacy.model6.E#getOwnedAs()
* @see #getE()
@@ -745,10 +721,9 @@ public interface Model6Package extends org.eclipse.emf.cdo.tests.model6.Model6Pa EClass getF();
/**
- * Returns the meta object for the containment reference list '
- * {@link org.eclipse.emf.cdo.tests.legacy.model6.F#getOwnedEs <em>Owned Es</em>}'. <!-- begin-user-doc --> <!--
+ * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.legacy.model6.F#getOwnedEs <em>Owned Es</em>}'.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @return the meta object for the containment reference list '<em>Owned Es</em>'.
* @see org.eclipse.emf.cdo.tests.legacy.model6.F#getOwnedEs()
* @see #getF()
@@ -757,8 +732,8 @@ public interface Model6Package extends org.eclipse.emf.cdo.tests.model6.Model6Pa EReference getF_OwnedEs();
/**
- * Returns the factory that creates the instances of the model. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Returns the factory that creates the instances of the model.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @return the factory that creates the instances of the model.
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/AImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/AImpl.java index 7d1a26bca3..3fbab5b71a 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/AImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/AImpl.java @@ -30,26 +30,25 @@ import java.util.Collection; * <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.AImpl#getOwnedDs <em>Owned Ds</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.AImpl#getOwnedBs <em>Owned Bs</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.AImpl#getOwnedDs <em>Owned Ds</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.AImpl#getOwnedBs <em>Owned Bs</em>}</li>
* </ul>
* </p>
- *
+ *
* @generated
*/
public class AImpl extends EObjectImpl implements A
{
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public static final String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation";
/**
- * The cached value of the '{@link #getOwnedDs() <em>Owned Ds</em>}' containment reference list. <!-- begin-user-doc
+ * The cached value of the '{@link #getOwnedDs() <em>Owned Ds</em>}' containment reference list.
+ * <!-- begin-user-doc
* --> <!-- end-user-doc -->
- *
* @see #getOwnedDs()
* @generated
* @ordered
@@ -57,9 +56,9 @@ public class AImpl extends EObjectImpl implements A protected EList<D> ownedDs;
/**
- * The cached value of the '{@link #getOwnedBs() <em>Owned Bs</em>}' containment reference list. <!-- begin-user-doc
+ * The cached value of the '{@link #getOwnedBs() <em>Owned Bs</em>}' containment reference list.
+ * <!-- begin-user-doc
* --> <!-- end-user-doc -->
- *
* @see #getOwnedBs()
* @generated
* @ordered
@@ -68,7 +67,6 @@ public class AImpl extends EObjectImpl implements A /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
protected AImpl()
@@ -78,7 +76,6 @@ public class AImpl extends EObjectImpl implements A /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -89,35 +86,32 @@ public class AImpl extends EObjectImpl implements A /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public EList<D> getOwnedDs()
{
if (ownedDs == null)
{
- ownedDs = new EObjectContainmentEList<D>(D.class, this, Model6Package.A__OWNED_DS);
+ ownedDs = new EObjectContainmentEList.Resolving<D>(D.class, this, Model6Package.A__OWNED_DS);
}
return ownedDs;
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public EList<B> getOwnedBs()
{
if (ownedBs == null)
{
- ownedBs = new EObjectContainmentEList<B>(B.class, this, Model6Package.A__OWNED_BS);
+ ownedBs = new EObjectContainmentEList.Resolving<B>(B.class, this, Model6Package.A__OWNED_BS);
}
return ownedBs;
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -135,7 +129,6 @@ public class AImpl extends EObjectImpl implements A /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -153,7 +146,6 @@ public class AImpl extends EObjectImpl implements A /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@SuppressWarnings("unchecked")
@@ -176,7 +168,6 @@ public class AImpl extends EObjectImpl implements A /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -196,7 +187,6 @@ public class AImpl extends EObjectImpl implements A /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/BImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/BImpl.java index f7634b8395..fd6519319d 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/BImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/BImpl.java @@ -26,25 +26,24 @@ import org.eclipse.emf.ecore.impl.EObjectImpl; * <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.BImpl#getOwnedC <em>Owned C</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.BImpl#getOwnedC <em>Owned C</em>}</li>
* </ul>
* </p>
- *
+ *
* @generated
*/
public class BImpl extends EObjectImpl implements B
{
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public static final String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation";
/**
- * The cached value of the '{@link #getOwnedC() <em>Owned C</em>}' containment reference. <!-- begin-user-doc --> <!--
+ * The cached value of the '{@link #getOwnedC() <em>Owned C</em>}' containment reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @see #getOwnedC()
* @generated
* @ordered
@@ -53,7 +52,6 @@ public class BImpl extends EObjectImpl implements B /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
protected BImpl()
@@ -63,7 +61,6 @@ public class BImpl extends EObjectImpl implements B /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -74,17 +71,44 @@ public class BImpl extends EObjectImpl implements B /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public C getOwnedC()
{
+ if (ownedC != null && ownedC.eIsProxy())
+ {
+ InternalEObject oldOwnedC = (InternalEObject)ownedC;
+ ownedC = (C)eResolveProxy(oldOwnedC);
+ if (ownedC != oldOwnedC)
+ {
+ InternalEObject newOwnedC = (InternalEObject)ownedC;
+ NotificationChain msgs = oldOwnedC.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Model6Package.B__OWNED_C,
+ null, null);
+ if (newOwnedC.eInternalContainer() == null)
+ {
+ msgs = newOwnedC.eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Model6Package.B__OWNED_C, null, msgs);
+ }
+ if (msgs != null)
+ msgs.dispatch();
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model6Package.B__OWNED_C, oldOwnedC, ownedC));
+ }
+ }
+ return ownedC;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public C basicGetOwnedC()
+ {
return ownedC;
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public NotificationChain basicSetOwnedC(C newOwnedC, NotificationChain msgs)
@@ -105,7 +129,6 @@ public class BImpl extends EObjectImpl implements B /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public void setOwnedC(C newOwnedC)
@@ -129,7 +152,6 @@ public class BImpl extends EObjectImpl implements B /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -145,7 +167,6 @@ public class BImpl extends EObjectImpl implements B /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -154,14 +175,15 @@ public class BImpl extends EObjectImpl implements B switch (featureID)
{
case Model6Package.B__OWNED_C:
- return getOwnedC();
+ if (resolve)
+ return getOwnedC();
+ return basicGetOwnedC();
}
return super.eGet(featureID, resolve, coreType);
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -178,7 +200,6 @@ public class BImpl extends EObjectImpl implements B /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -195,7 +216,6 @@ public class BImpl extends EObjectImpl implements B /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/BaseObjectImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/BaseObjectImpl.java index 2a9e9250c8..985b3bddbb 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/BaseObjectImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/BaseObjectImpl.java @@ -27,21 +27,18 @@ import java.util.Collection; * <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.BaseObjectImpl#getAttributeOptional <em>Attribute Optional
- * </em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.BaseObjectImpl#getAttributeRequired <em>Attribute Required
- * </em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.BaseObjectImpl#getAttributeList <em>Attribute List</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.BaseObjectImpl#getAttributeOptional <em>Attribute Optional</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.BaseObjectImpl#getAttributeRequired <em>Attribute Required</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.BaseObjectImpl#getAttributeList <em>Attribute List</em>}</li>
* </ul>
* </p>
- *
+ *
* @generated
*/
public class BaseObjectImpl extends EObjectImpl implements BaseObject
{
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public static final String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation";
@@ -87,9 +84,9 @@ public class BaseObjectImpl extends EObjectImpl implements BaseObject protected String attributeRequired = ATTRIBUTE_REQUIRED_EDEFAULT;
/**
- * The cached value of the '{@link #getAttributeList() <em>Attribute List</em>}' attribute list. <!-- begin-user-doc
+ * The cached value of the '{@link #getAttributeList() <em>Attribute List</em>}' attribute list.
+ * <!-- begin-user-doc
* --> <!-- end-user-doc -->
- *
* @see #getAttributeList()
* @generated
* @ordered
@@ -98,7 +95,6 @@ public class BaseObjectImpl extends EObjectImpl implements BaseObject /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
protected BaseObjectImpl()
@@ -108,7 +104,6 @@ public class BaseObjectImpl extends EObjectImpl implements BaseObject /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -119,7 +114,6 @@ public class BaseObjectImpl extends EObjectImpl implements BaseObject /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public String getAttributeOptional()
@@ -129,7 +123,6 @@ public class BaseObjectImpl extends EObjectImpl implements BaseObject /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public void setAttributeOptional(String newAttributeOptional)
@@ -143,7 +136,6 @@ public class BaseObjectImpl extends EObjectImpl implements BaseObject /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public String getAttributeRequired()
@@ -153,7 +145,6 @@ public class BaseObjectImpl extends EObjectImpl implements BaseObject /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public void setAttributeRequired(String newAttributeRequired)
@@ -167,7 +158,6 @@ public class BaseObjectImpl extends EObjectImpl implements BaseObject /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public EList<String> getAttributeList()
@@ -181,7 +171,6 @@ public class BaseObjectImpl extends EObjectImpl implements BaseObject /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -201,7 +190,6 @@ public class BaseObjectImpl extends EObjectImpl implements BaseObject /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@SuppressWarnings("unchecked")
@@ -226,7 +214,6 @@ public class BaseObjectImpl extends EObjectImpl implements BaseObject /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -249,7 +236,6 @@ public class BaseObjectImpl extends EObjectImpl implements BaseObject /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -271,7 +257,6 @@ public class BaseObjectImpl extends EObjectImpl implements BaseObject /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/CImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/CImpl.java index bdd50c8b2f..b522c424d5 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/CImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/CImpl.java @@ -20,21 +20,19 @@ import org.eclipse.emf.ecore.impl.EObjectImpl; * <!-- begin-user-doc --> An implementation of the model object '<em><b>C</b></em>'. <!-- end-user-doc -->
* <p>
* </p>
- *
+ *
* @generated
*/
public class CImpl extends EObjectImpl implements C
{
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public static final String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation";
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
protected CImpl()
@@ -44,7 +42,6 @@ public class CImpl extends EObjectImpl implements C /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/ContainmentObjectImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/ContainmentObjectImpl.java index ce69c695b4..e421a99e04 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/ContainmentObjectImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/ContainmentObjectImpl.java @@ -30,20 +30,17 @@ import java.util.Collection; * <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.ContainmentObjectImpl#getContainmentOptional <em>Containment
- * Optional</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.ContainmentObjectImpl#getContainmentList <em>Containment List
- * </em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.ContainmentObjectImpl#getContainmentOptional <em>Containment Optional</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.ContainmentObjectImpl#getContainmentList <em>Containment List</em>}</li>
* </ul>
* </p>
- *
+ *
* @generated
*/
public class ContainmentObjectImpl extends BaseObjectImpl implements ContainmentObject
{
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public static final String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation";
@@ -51,7 +48,6 @@ public class ContainmentObjectImpl extends BaseObjectImpl implements Containment /**
* The cached value of the '{@link #getContainmentOptional() <em>Containment Optional</em>}' containment reference.
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @see #getContainmentOptional()
* @generated
* @ordered
@@ -70,7 +66,6 @@ public class ContainmentObjectImpl extends BaseObjectImpl implements Containment /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
protected ContainmentObjectImpl()
@@ -80,7 +75,6 @@ public class ContainmentObjectImpl extends BaseObjectImpl implements Containment /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -91,17 +85,46 @@ public class ContainmentObjectImpl extends BaseObjectImpl implements Containment /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public BaseObject getContainmentOptional()
{
+ if (containmentOptional != null && containmentOptional.eIsProxy())
+ {
+ InternalEObject oldContainmentOptional = (InternalEObject)containmentOptional;
+ containmentOptional = (BaseObject)eResolveProxy(oldContainmentOptional);
+ if (containmentOptional != oldContainmentOptional)
+ {
+ InternalEObject newContainmentOptional = (InternalEObject)containmentOptional;
+ NotificationChain msgs = oldContainmentOptional.eInverseRemove(this, EOPPOSITE_FEATURE_BASE
+ - Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL, null, null);
+ if (newContainmentOptional.eInternalContainer() == null)
+ {
+ msgs = newContainmentOptional.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
+ - Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL, null, msgs);
+ }
+ if (msgs != null)
+ msgs.dispatch();
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+ Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL, oldContainmentOptional, containmentOptional));
+ }
+ }
+ return containmentOptional;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public BaseObject basicGetContainmentOptional()
+ {
return containmentOptional;
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public NotificationChain basicSetContainmentOptional(BaseObject newContainmentOptional, NotificationChain msgs)
@@ -122,7 +145,6 @@ public class ContainmentObjectImpl extends BaseObjectImpl implements Containment /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public void setContainmentOptional(BaseObject newContainmentOptional)
@@ -147,14 +169,13 @@ public class ContainmentObjectImpl extends BaseObjectImpl implements Containment /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public EList<BaseObject> getContainmentList()
{
if (containmentList == null)
{
- containmentList = new EObjectContainmentEList<BaseObject>(BaseObject.class, this,
+ containmentList = new EObjectContainmentEList.Resolving<BaseObject>(BaseObject.class, this,
Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_LIST);
}
return containmentList;
@@ -162,7 +183,6 @@ public class ContainmentObjectImpl extends BaseObjectImpl implements Containment /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -180,7 +200,6 @@ public class ContainmentObjectImpl extends BaseObjectImpl implements Containment /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -189,7 +208,9 @@ public class ContainmentObjectImpl extends BaseObjectImpl implements Containment switch (featureID)
{
case Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL:
- return getContainmentOptional();
+ if (resolve)
+ return getContainmentOptional();
+ return basicGetContainmentOptional();
case Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_LIST:
return getContainmentList();
}
@@ -198,7 +219,6 @@ public class ContainmentObjectImpl extends BaseObjectImpl implements Containment /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@SuppressWarnings("unchecked")
@@ -220,7 +240,6 @@ public class ContainmentObjectImpl extends BaseObjectImpl implements Containment /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -240,7 +259,6 @@ public class ContainmentObjectImpl extends BaseObjectImpl implements Containment /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/DImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/DImpl.java index d71e34b2e2..b0c30fceb7 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/DImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/DImpl.java @@ -26,25 +26,24 @@ import org.eclipse.emf.ecore.impl.EObjectImpl; * <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.DImpl#getData <em>Data</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.DImpl#getData <em>Data</em>}</li>
* </ul>
* </p>
- *
+ *
* @generated
*/
public class DImpl extends EObjectImpl implements D
{
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public static final String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation";
/**
- * The cached value of the '{@link #getData() <em>Data</em>}' containment reference. <!-- begin-user-doc --> <!--
+ * The cached value of the '{@link #getData() <em>Data</em>}' containment reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @see #getData()
* @generated
* @ordered
@@ -53,7 +52,6 @@ public class DImpl extends EObjectImpl implements D /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
protected DImpl()
@@ -63,7 +61,6 @@ public class DImpl extends EObjectImpl implements D /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -74,7 +71,6 @@ public class DImpl extends EObjectImpl implements D /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public EObject getData()
@@ -84,7 +80,6 @@ public class DImpl extends EObjectImpl implements D /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public NotificationChain basicSetData(EObject newData, NotificationChain msgs)
@@ -105,7 +100,6 @@ public class DImpl extends EObjectImpl implements D /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public void setData(EObject newData)
@@ -127,7 +121,6 @@ public class DImpl extends EObjectImpl implements D /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -143,7 +136,6 @@ public class DImpl extends EObjectImpl implements D /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -159,7 +151,6 @@ public class DImpl extends EObjectImpl implements D /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -176,7 +167,6 @@ public class DImpl extends EObjectImpl implements D /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -193,7 +183,6 @@ public class DImpl extends EObjectImpl implements D /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/EImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/EImpl.java index 05c0065034..0ddbf8b07b 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/EImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/EImpl.java @@ -29,25 +29,24 @@ import java.util.Collection; * <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.EImpl#getOwnedAs <em>Owned As</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.EImpl#getOwnedAs <em>Owned As</em>}</li>
* </ul>
* </p>
- *
+ *
* @generated
*/
public class EImpl extends EObjectImpl implements E
{
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public static final String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation";
/**
- * The cached value of the '{@link #getOwnedAs() <em>Owned As</em>}' containment reference list. <!-- begin-user-doc
+ * The cached value of the '{@link #getOwnedAs() <em>Owned As</em>}' containment reference list.
+ * <!-- begin-user-doc
* --> <!-- end-user-doc -->
- *
* @see #getOwnedAs()
* @generated
* @ordered
@@ -56,7 +55,6 @@ public class EImpl extends EObjectImpl implements E /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
protected EImpl()
@@ -66,7 +64,6 @@ public class EImpl extends EObjectImpl implements E /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -77,21 +74,19 @@ public class EImpl extends EObjectImpl implements E /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public EList<A> getOwnedAs()
{
if (ownedAs == null)
{
- ownedAs = new EObjectContainmentEList<A>(A.class, this, Model6Package.E__OWNED_AS);
+ ownedAs = new EObjectContainmentEList.Resolving<A>(A.class, this, Model6Package.E__OWNED_AS);
}
return ownedAs;
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -107,7 +102,6 @@ public class EImpl extends EObjectImpl implements E /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -123,7 +117,6 @@ public class EImpl extends EObjectImpl implements E /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@SuppressWarnings("unchecked")
@@ -142,7 +135,6 @@ public class EImpl extends EObjectImpl implements E /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -159,7 +151,6 @@ public class EImpl extends EObjectImpl implements E /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/FImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/FImpl.java index 0252d1602f..c3c5cb2ece 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/FImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/FImpl.java @@ -29,25 +29,24 @@ import java.util.Collection; * <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.FImpl#getOwnedEs <em>Owned Es</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.FImpl#getOwnedEs <em>Owned Es</em>}</li>
* </ul>
* </p>
- *
+ *
* @generated
*/
public class FImpl extends EObjectImpl implements F
{
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public static final String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation";
/**
- * The cached value of the '{@link #getOwnedEs() <em>Owned Es</em>}' containment reference list. <!-- begin-user-doc
+ * The cached value of the '{@link #getOwnedEs() <em>Owned Es</em>}' containment reference list.
+ * <!-- begin-user-doc
* --> <!-- end-user-doc -->
- *
* @see #getOwnedEs()
* @generated
* @ordered
@@ -56,7 +55,6 @@ public class FImpl extends EObjectImpl implements F /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
protected FImpl()
@@ -66,7 +64,6 @@ public class FImpl extends EObjectImpl implements F /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -77,21 +74,19 @@ public class FImpl extends EObjectImpl implements F /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public EList<E> getOwnedEs()
{
if (ownedEs == null)
{
- ownedEs = new EObjectContainmentEList<E>(E.class, this, Model6Package.F__OWNED_ES);
+ ownedEs = new EObjectContainmentEList.Resolving<E>(E.class, this, Model6Package.F__OWNED_ES);
}
return ownedEs;
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -107,7 +102,6 @@ public class FImpl extends EObjectImpl implements F /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -123,7 +117,6 @@ public class FImpl extends EObjectImpl implements F /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@SuppressWarnings("unchecked")
@@ -142,7 +135,6 @@ public class FImpl extends EObjectImpl implements F /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -159,7 +151,6 @@ public class FImpl extends EObjectImpl implements F /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/Model6FactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/Model6FactoryImpl.java index 919cbf7509..3c9ae7d66d 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/Model6FactoryImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/Model6FactoryImpl.java @@ -31,21 +31,19 @@ import org.eclipse.emf.ecore.plugin.EcorePlugin; /**
* <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc -->
- *
* @generated
*/
public class Model6FactoryImpl extends EFactoryImpl implements Model6Factory
{
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public static final String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation";
/**
- * Creates the default factory implementation. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Creates the default factory implementation.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
public static Model6Factory init()
@@ -67,8 +65,8 @@ public class Model6FactoryImpl extends EFactoryImpl implements Model6Factory }
/**
- * Creates an instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Creates an instance of the factory.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
public Model6FactoryImpl()
@@ -78,7 +76,6 @@ public class Model6FactoryImpl extends EFactoryImpl implements Model6Factory /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -113,7 +110,6 @@ public class Model6FactoryImpl extends EFactoryImpl implements Model6Factory /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public Root createRoot()
@@ -124,7 +120,6 @@ public class Model6FactoryImpl extends EFactoryImpl implements Model6Factory /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public BaseObject createBaseObject()
@@ -135,7 +130,6 @@ public class Model6FactoryImpl extends EFactoryImpl implements Model6Factory /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public ReferenceObject createReferenceObject()
@@ -146,7 +140,6 @@ public class Model6FactoryImpl extends EFactoryImpl implements Model6Factory /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public ContainmentObject createContainmentObject()
@@ -157,7 +150,6 @@ public class Model6FactoryImpl extends EFactoryImpl implements Model6Factory /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public A createA()
@@ -168,7 +160,6 @@ public class Model6FactoryImpl extends EFactoryImpl implements Model6Factory /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public B createB()
@@ -179,7 +170,6 @@ public class Model6FactoryImpl extends EFactoryImpl implements Model6Factory /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public C createC()
@@ -190,7 +180,6 @@ public class Model6FactoryImpl extends EFactoryImpl implements Model6Factory /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public D createD()
@@ -201,7 +190,6 @@ public class Model6FactoryImpl extends EFactoryImpl implements Model6Factory /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public E createE()
@@ -212,7 +200,6 @@ public class Model6FactoryImpl extends EFactoryImpl implements Model6Factory /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public F createF()
@@ -223,7 +210,6 @@ public class Model6FactoryImpl extends EFactoryImpl implements Model6Factory /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public Model6Package getModel6Package()
@@ -233,7 +219,6 @@ public class Model6FactoryImpl extends EFactoryImpl implements Model6Factory /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @deprecated
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/Model6PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/Model6PackageImpl.java index e1fd38260d..03b2af29f7 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/Model6PackageImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/Model6PackageImpl.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Eike Stepper - initial API and implementation
*/
@@ -554,16 +554,16 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package // Initialize classes and features; add operations and parameters
initEClass(rootEClass, Root.class, "Root", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getRoot_ListA(), getBaseObject(), null, "listA", null, 0, -1, Root.class, !IS_TRANSIENT,
- !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+ !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
IS_ORDERED);
initEReference(getRoot_ListB(), getBaseObject(), null, "listB", null, 0, -1, Root.class, !IS_TRANSIENT,
- !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+ !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
IS_ORDERED);
initEReference(getRoot_ListC(), getBaseObject(), null, "listC", null, 0, -1, Root.class, !IS_TRANSIENT,
- !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+ !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
IS_ORDERED);
initEReference(getRoot_ListD(), getBaseObject(), null, "listD", null, 0, -1, Root.class, !IS_TRANSIENT,
- !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+ !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
IS_ORDERED);
initEClass(baseObjectEClass, BaseObject.class, "BaseObject", !IS_ABSTRACT, !IS_INTERFACE,
@@ -590,21 +590,21 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package initEClass(containmentObjectEClass, ContainmentObject.class, "ContainmentObject", !IS_ABSTRACT, !IS_INTERFACE,
IS_GENERATED_INSTANCE_CLASS);
initEReference(getContainmentObject_ContainmentOptional(), getBaseObject(), null, "containmentOptional", null, 0,
- 1, ContainmentObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+ 1, ContainmentObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getContainmentObject_ContainmentList(), getBaseObject(), null, "containmentList", null, 0, -1,
- ContainmentObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+ ContainmentObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(aEClass, A.class, "A", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getA_OwnedDs(), getD(), null, "ownedDs", null, 0, -1, A.class, !IS_TRANSIENT, !IS_VOLATILE,
- IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getA_OwnedBs(), getB(), null, "ownedBs", null, 0, -1, A.class, !IS_TRANSIENT, !IS_VOLATILE,
- IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(bEClass, B.class, "B", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getB_OwnedC(), getC(), null, "ownedC", null, 0, 1, B.class, !IS_TRANSIENT, !IS_VOLATILE,
- IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(cEClass, C.class, "C", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -615,11 +615,11 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package initEClass(eEClass, E.class, "E", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getE_OwnedAs(), getA(), null, "ownedAs", null, 0, -1, E.class, !IS_TRANSIENT, !IS_VOLATILE,
- IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(fEClass, F.class, "F", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getF_OwnedEs(), getE(), null, "ownedEs", null, 0, -1, F.class, !IS_TRANSIENT, !IS_VOLATILE,
- IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
// Create resource
createResource(eNS_URI);
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/ReferenceObjectImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/ReferenceObjectImpl.java index 2e71a9d892..d0c5da7823 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/ReferenceObjectImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/ReferenceObjectImpl.java @@ -44,7 +44,6 @@ public class ReferenceObjectImpl extends BaseObjectImpl implements ReferenceObje {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public static final String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation";
@@ -60,9 +59,9 @@ public class ReferenceObjectImpl extends BaseObjectImpl implements ReferenceObje protected BaseObject referenceOptional;
/**
- * The cached value of the '{@link #getReferenceList() <em>Reference List</em>}' reference list. <!-- begin-user-doc
+ * The cached value of the '{@link #getReferenceList() <em>Reference List</em>}' reference list.
+ * <!-- begin-user-doc
* --> <!-- end-user-doc -->
- *
* @see #getReferenceList()
* @generated
* @ordered
@@ -71,7 +70,6 @@ public class ReferenceObjectImpl extends BaseObjectImpl implements ReferenceObje /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
protected ReferenceObjectImpl()
@@ -81,7 +79,6 @@ public class ReferenceObjectImpl extends BaseObjectImpl implements ReferenceObje /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -92,7 +89,6 @@ public class ReferenceObjectImpl extends BaseObjectImpl implements ReferenceObje /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public BaseObject getReferenceOptional()
@@ -113,7 +109,6 @@ public class ReferenceObjectImpl extends BaseObjectImpl implements ReferenceObje /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public BaseObject basicGetReferenceOptional()
@@ -123,7 +118,6 @@ public class ReferenceObjectImpl extends BaseObjectImpl implements ReferenceObje /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public void setReferenceOptional(BaseObject newReferenceOptional)
@@ -137,7 +131,6 @@ public class ReferenceObjectImpl extends BaseObjectImpl implements ReferenceObje /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public EList<BaseObject> getReferenceList()
@@ -152,7 +145,6 @@ public class ReferenceObjectImpl extends BaseObjectImpl implements ReferenceObje /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -172,7 +164,6 @@ public class ReferenceObjectImpl extends BaseObjectImpl implements ReferenceObje /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@SuppressWarnings("unchecked")
@@ -194,7 +185,6 @@ public class ReferenceObjectImpl extends BaseObjectImpl implements ReferenceObje /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -214,7 +204,6 @@ public class ReferenceObjectImpl extends BaseObjectImpl implements ReferenceObje /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/RootImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/RootImpl.java index 5256ec58b3..5d8d33b5a4 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/RootImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/RootImpl.java @@ -29,28 +29,27 @@ import java.util.Collection; * <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.RootImpl#getListA <em>List A</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.RootImpl#getListB <em>List B</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.RootImpl#getListC <em>List C</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.RootImpl#getListD <em>List D</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.RootImpl#getListA <em>List A</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.RootImpl#getListB <em>List B</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.RootImpl#getListC <em>List C</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.RootImpl#getListD <em>List D</em>}</li>
* </ul>
* </p>
- *
+ *
* @generated
*/
public class RootImpl extends EObjectImpl implements Root
{
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public static final String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation";
/**
- * The cached value of the '{@link #getListA() <em>List A</em>}' containment reference list. <!-- begin-user-doc -->
+ * The cached value of the '{@link #getListA() <em>List A</em>}' containment reference list.
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @see #getListA()
* @generated
* @ordered
@@ -58,9 +57,9 @@ public class RootImpl extends EObjectImpl implements Root protected EList<BaseObject> listA;
/**
- * The cached value of the '{@link #getListB() <em>List B</em>}' containment reference list. <!-- begin-user-doc -->
+ * The cached value of the '{@link #getListB() <em>List B</em>}' containment reference list.
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @see #getListB()
* @generated
* @ordered
@@ -68,9 +67,9 @@ public class RootImpl extends EObjectImpl implements Root protected EList<BaseObject> listB;
/**
- * The cached value of the '{@link #getListC() <em>List C</em>}' containment reference list. <!-- begin-user-doc -->
+ * The cached value of the '{@link #getListC() <em>List C</em>}' containment reference list.
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @see #getListC()
* @generated
* @ordered
@@ -78,9 +77,9 @@ public class RootImpl extends EObjectImpl implements Root protected EList<BaseObject> listC;
/**
- * The cached value of the '{@link #getListD() <em>List D</em>}' containment reference list. <!-- begin-user-doc -->
+ * The cached value of the '{@link #getListD() <em>List D</em>}' containment reference list.
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @see #getListD()
* @generated
* @ordered
@@ -89,7 +88,6 @@ public class RootImpl extends EObjectImpl implements Root /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
protected RootImpl()
@@ -99,7 +97,6 @@ public class RootImpl extends EObjectImpl implements Root /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -110,63 +107,58 @@ public class RootImpl extends EObjectImpl implements Root /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public EList<BaseObject> getListA()
{
if (listA == null)
{
- listA = new EObjectContainmentEList<BaseObject>(BaseObject.class, this, Model6Package.ROOT__LIST_A);
+ listA = new EObjectContainmentEList.Resolving<BaseObject>(BaseObject.class, this, Model6Package.ROOT__LIST_A);
}
return listA;
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public EList<BaseObject> getListB()
{
if (listB == null)
{
- listB = new EObjectContainmentEList<BaseObject>(BaseObject.class, this, Model6Package.ROOT__LIST_B);
+ listB = new EObjectContainmentEList.Resolving<BaseObject>(BaseObject.class, this, Model6Package.ROOT__LIST_B);
}
return listB;
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public EList<BaseObject> getListC()
{
if (listC == null)
{
- listC = new EObjectContainmentEList<BaseObject>(BaseObject.class, this, Model6Package.ROOT__LIST_C);
+ listC = new EObjectContainmentEList.Resolving<BaseObject>(BaseObject.class, this, Model6Package.ROOT__LIST_C);
}
return listC;
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public EList<BaseObject> getListD()
{
if (listD == null)
{
- listD = new EObjectContainmentEList<BaseObject>(BaseObject.class, this, Model6Package.ROOT__LIST_D);
+ listD = new EObjectContainmentEList.Resolving<BaseObject>(BaseObject.class, this, Model6Package.ROOT__LIST_D);
}
return listD;
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -188,7 +180,6 @@ public class RootImpl extends EObjectImpl implements Root /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -210,7 +201,6 @@ public class RootImpl extends EObjectImpl implements Root /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@SuppressWarnings("unchecked")
@@ -241,7 +231,6 @@ public class RootImpl extends EObjectImpl implements Root /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -267,7 +256,6 @@ public class RootImpl extends EObjectImpl implements Root /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/A.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/A.java index 9e0bd87bc7..352fd66579 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/A.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/A.java @@ -15,14 +15,15 @@ import org.eclipse.emf.ecore.EObject; /**
* <!-- begin-user-doc --> A representation of the model object '<em><b>A</b></em>'. <!-- end-user-doc -->
+ *
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.model6.A#getOwnedDs <em>Owned Ds</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.model6.A#getOwnedBs <em>Owned Bs</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model6.A#getOwnedDs <em>Owned Ds</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model6.A#getOwnedBs <em>Owned Bs</em>}</li>
* </ul>
* </p>
- *
+ *
* @see org.eclipse.emf.cdo.tests.model6.Model6Package#getA()
* @model
* @generated
@@ -30,33 +31,33 @@ import org.eclipse.emf.ecore.EObject; public interface A extends EObject
{
/**
- * Returns the value of the '<em><b>Owned Ds</b></em>' containment reference list. The list contents are of type
- * {@link org.eclipse.emf.cdo.tests.model6.D}. <!-- begin-user-doc -->
+ * Returns the value of the '<em><b>Owned Ds</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.emf.cdo.tests.model6.D}.
+ * <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Owned Ds</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>Owned Ds</em>' containment reference list.
* @see org.eclipse.emf.cdo.tests.model6.Model6Package#getA_OwnedDs()
- * @model containment="true"
+ * @model containment="true" resolveProxies="true"
* @generated
*/
EList<D> getOwnedDs();
/**
- * Returns the value of the '<em><b>Owned Bs</b></em>' containment reference list. The list contents are of type
- * {@link org.eclipse.emf.cdo.tests.model6.B}. <!-- begin-user-doc -->
+ * Returns the value of the '<em><b>Owned Bs</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.emf.cdo.tests.model6.B}.
+ * <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Owned Bs</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>Owned Bs</em>' containment reference list.
* @see org.eclipse.emf.cdo.tests.model6.Model6Package#getA_OwnedBs()
- * @model containment="true"
+ * @model containment="true" resolveProxies="true"
* @generated
*/
EList<B> getOwnedBs();
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/B.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/B.java index 5791933633..16b1c7bc31 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/B.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/B.java @@ -14,13 +14,14 @@ import org.eclipse.emf.ecore.EObject; /**
* <!-- begin-user-doc --> A representation of the model object '<em><b>B</b></em>'. <!-- end-user-doc -->
+ *
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.model6.B#getOwnedC <em>Owned C</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model6.B#getOwnedC <em>Owned C</em>}</li>
* </ul>
* </p>
- *
+ *
* @see org.eclipse.emf.cdo.tests.model6.Model6Package#getB()
* @model
* @generated
@@ -40,11 +41,9 @@ public interface B extends EObject C getOwnedC();
/**
- * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model6.B#getOwnedC <em>Owned C</em>}' containment
- * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @param value
- * the new value of the '<em>Owned C</em>' containment reference.
+ * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model6.B#getOwnedC <em>Owned C</em>}' containment reference.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * @param value the new value of the '<em>Owned C</em>' containment reference.
* @see #getOwnedC()
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/BaseObject.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/BaseObject.java index 366f1d7850..c1e9439717 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/BaseObject.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/BaseObject.java @@ -15,15 +15,16 @@ import org.eclipse.emf.ecore.EObject; /**
* <!-- begin-user-doc --> A representation of the model object '<em><b>Base Object</b></em>'. <!-- end-user-doc -->
+ *
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.model6.BaseObject#getAttributeOptional <em>Attribute Optional</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.model6.BaseObject#getAttributeRequired <em>Attribute Required</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.model6.BaseObject#getAttributeList <em>Attribute List</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model6.BaseObject#getAttributeOptional <em>Attribute Optional</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model6.BaseObject#getAttributeRequired <em>Attribute Required</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model6.BaseObject#getAttributeList <em>Attribute List</em>}</li>
* </ul>
* </p>
- *
+ *
* @see org.eclipse.emf.cdo.tests.model6.Model6Package#getBaseObject()
* @model
* @generated
@@ -31,13 +32,13 @@ import org.eclipse.emf.ecore.EObject; public interface BaseObject extends EObject
{
/**
- * Returns the value of the '<em><b>Attribute Optional</b></em>' attribute. <!-- begin-user-doc -->
+ * Returns the value of the '<em><b>Attribute Optional</b></em>' attribute.
+ * <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Attribute Optional</em>' attribute isn't clear, there really should be more of a
* description here...
* </p>
* <!-- end-user-doc -->
- *
* @return the value of the '<em>Attribute Optional</em>' attribute.
* @see #setAttributeOptional(String)
* @see org.eclipse.emf.cdo.tests.model6.Model6Package#getBaseObject_AttributeOptional()
@@ -47,24 +48,22 @@ public interface BaseObject extends EObject String getAttributeOptional();
/**
- * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model6.BaseObject#getAttributeOptional
- * <em>Attribute Optional</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @param value
- * the new value of the '<em>Attribute Optional</em>' attribute.
+ * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model6.BaseObject#getAttributeOptional <em>Attribute Optional</em>}' attribute.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * @param value the new value of the '<em>Attribute Optional</em>' attribute.
* @see #getAttributeOptional()
* @generated
*/
void setAttributeOptional(String value);
/**
- * Returns the value of the '<em><b>Attribute Required</b></em>' attribute. <!-- begin-user-doc -->
+ * Returns the value of the '<em><b>Attribute Required</b></em>' attribute.
+ * <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Attribute Required</em>' attribute isn't clear, there really should be more of a
* description here...
* </p>
* <!-- end-user-doc -->
- *
* @return the value of the '<em>Attribute Required</em>' attribute.
* @see #setAttributeRequired(String)
* @see org.eclipse.emf.cdo.tests.model6.Model6Package#getBaseObject_AttributeRequired()
@@ -74,25 +73,23 @@ public interface BaseObject extends EObject String getAttributeRequired();
/**
- * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model6.BaseObject#getAttributeRequired
- * <em>Attribute Required</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @param value
- * the new value of the '<em>Attribute Required</em>' attribute.
+ * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model6.BaseObject#getAttributeRequired <em>Attribute Required</em>}' attribute.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * @param value the new value of the '<em>Attribute Required</em>' attribute.
* @see #getAttributeRequired()
* @generated
*/
void setAttributeRequired(String value);
/**
- * Returns the value of the '<em><b>Attribute List</b></em>' attribute list. The list contents are of type
- * {@link java.lang.String}. <!-- begin-user-doc -->
+ * Returns the value of the '<em><b>Attribute List</b></em>' attribute list.
+ * The list contents are of type {@link java.lang.String}.
+ * <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Attribute List</em>' attribute list isn't clear, there really should be more of a
* description here...
* </p>
* <!-- end-user-doc -->
- *
* @return the value of the '<em>Attribute List</em>' attribute list.
* @see org.eclipse.emf.cdo.tests.model6.Model6Package#getBaseObject_AttributeList()
* @model
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/C.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/C.java index 85ae83b4cc..d69345d5ca 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/C.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/C.java @@ -14,7 +14,8 @@ import org.eclipse.emf.ecore.EObject; /**
* <!-- begin-user-doc --> A representation of the model object '<em><b>C</b></em>'. <!-- end-user-doc -->
- *
+ *
+ *
* @see org.eclipse.emf.cdo.tests.model6.Model6Package#getC()
* @model
* @generated
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/ContainmentObject.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/ContainmentObject.java index 8a7c5c9ec5..081d0ee2a8 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/ContainmentObject.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/ContainmentObject.java @@ -30,44 +30,42 @@ import org.eclipse.emf.common.util.EList; public interface ContainmentObject extends BaseObject
{
/**
- * Returns the value of the '<em><b>Containment Optional</b></em>' containment reference. <!-- begin-user-doc -->
+ * Returns the value of the '<em><b>Containment Optional</b></em>' containment reference.
+ * <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Containment Optional</em>' containment reference isn't clear, there really should be
* more of a description here...
* </p>
* <!-- end-user-doc -->
- *
* @return the value of the '<em>Containment Optional</em>' containment reference.
* @see #setContainmentOptional(BaseObject)
* @see org.eclipse.emf.cdo.tests.model6.Model6Package#getContainmentObject_ContainmentOptional()
- * @model containment="true"
+ * @model containment="true" resolveProxies="true"
* @generated
*/
BaseObject getContainmentOptional();
/**
- * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model6.ContainmentObject#getContainmentOptional
- * <em>Containment Optional</em>}' containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @param value
- * the new value of the '<em>Containment Optional</em>' containment reference.
+ * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model6.ContainmentObject#getContainmentOptional <em>Containment Optional</em>}' containment reference.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * @param value the new value of the '<em>Containment Optional</em>' containment reference.
* @see #getContainmentOptional()
* @generated
*/
void setContainmentOptional(BaseObject value);
/**
- * Returns the value of the '<em><b>Containment List</b></em>' containment reference list. The list contents are of
- * type {@link org.eclipse.emf.cdo.tests.model6.BaseObject}. <!-- begin-user-doc -->
+ * Returns the value of the '<em><b>Containment List</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.emf.cdo.tests.model6.BaseObject}.
+ * <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Containment List</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>Containment List</em>' containment reference list.
* @see org.eclipse.emf.cdo.tests.model6.Model6Package#getContainmentObject_ContainmentList()
- * @model containment="true"
+ * @model containment="true" resolveProxies="true"
* @generated
*/
EList<BaseObject> getContainmentList();
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/D.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/D.java index d7eee8ebff..dcf7dcdbbd 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/D.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/D.java @@ -14,13 +14,14 @@ import org.eclipse.emf.ecore.EObject; /**
* <!-- begin-user-doc --> A representation of the model object '<em><b>D</b></em>'. <!-- end-user-doc -->
+ *
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.model6.D#getData <em>Data</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model6.D#getData <em>Data</em>}</li>
* </ul>
* </p>
- *
+ *
* @see org.eclipse.emf.cdo.tests.model6.Model6Package#getD()
* @model
* @generated
@@ -28,13 +29,13 @@ import org.eclipse.emf.ecore.EObject; public interface D extends EObject
{
/**
- * Returns the value of the '<em><b>Data</b></em>' containment reference. <!-- begin-user-doc -->
+ * Returns the value of the '<em><b>Data</b></em>' containment reference.
+ * <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Data</em>' containment reference isn't clear, there really should be more of a
* description here...
* </p>
* <!-- end-user-doc -->
- *
* @return the value of the '<em>Data</em>' containment reference.
* @see #setData(EObject)
* @see org.eclipse.emf.cdo.tests.model6.Model6Package#getD_Data()
@@ -46,9 +47,7 @@ public interface D extends EObject /**
* Sets the value of the '{@link org.eclipse.emf.cdo.tests.model6.D#getData <em>Data</em>}' containment reference.
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @param value
- * the new value of the '<em>Data</em>' containment reference.
+ * @param value the new value of the '<em>Data</em>' containment reference.
* @see #getData()
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/E.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/E.java index da54444759..72892d2d01 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/E.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/E.java @@ -15,13 +15,14 @@ import org.eclipse.emf.ecore.EObject; /**
* <!-- begin-user-doc --> A representation of the model object '<em><b>E</b></em>'. <!-- end-user-doc -->
+ *
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.model6.E#getOwnedAs <em>Owned As</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model6.E#getOwnedAs <em>Owned As</em>}</li>
* </ul>
* </p>
- *
+ *
* @see org.eclipse.emf.cdo.tests.model6.Model6Package#getE()
* @model
* @generated
@@ -29,17 +30,17 @@ import org.eclipse.emf.ecore.EObject; public interface E extends EObject
{
/**
- * Returns the value of the '<em><b>Owned As</b></em>' containment reference list. The list contents are of type
- * {@link org.eclipse.emf.cdo.tests.model6.A}. <!-- begin-user-doc -->
+ * Returns the value of the '<em><b>Owned As</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.emf.cdo.tests.model6.A}.
+ * <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Owned As</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>Owned As</em>' containment reference list.
* @see org.eclipse.emf.cdo.tests.model6.Model6Package#getE_OwnedAs()
- * @model containment="true"
+ * @model containment="true" resolveProxies="true"
* @generated
*/
EList<A> getOwnedAs();
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/F.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/F.java index 8febe35a8e..ece107d427 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/F.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/F.java @@ -15,13 +15,14 @@ import org.eclipse.emf.ecore.EObject; /**
* <!-- begin-user-doc --> A representation of the model object '<em><b>F</b></em>'. <!-- end-user-doc -->
+ *
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.model6.F#getOwnedEs <em>Owned Es</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model6.F#getOwnedEs <em>Owned Es</em>}</li>
* </ul>
* </p>
- *
+ *
* @see org.eclipse.emf.cdo.tests.model6.Model6Package#getF()
* @model
* @generated
@@ -29,17 +30,17 @@ import org.eclipse.emf.ecore.EObject; public interface F extends EObject
{
/**
- * Returns the value of the '<em><b>Owned Es</b></em>' containment reference list. The list contents are of type
- * {@link org.eclipse.emf.cdo.tests.model6.E}. <!-- begin-user-doc -->
+ * Returns the value of the '<em><b>Owned Es</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.emf.cdo.tests.model6.E}.
+ * <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Owned Es</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>Owned Es</em>' containment reference list.
* @see org.eclipse.emf.cdo.tests.model6.Model6Package#getF_OwnedEs()
- * @model containment="true"
+ * @model containment="true" resolveProxies="true"
* @generated
*/
EList<E> getOwnedEs();
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Model6Factory.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Model6Factory.java index 664b498410..4539af69b2 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Model6Factory.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Model6Factory.java @@ -15,102 +15,101 @@ import org.eclipse.emf.ecore.EFactory; /**
* <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a create method for each non-abstract class of
* the model. <!-- end-user-doc -->
- *
* @see org.eclipse.emf.cdo.tests.model6.Model6Package
* @generated
*/
public interface Model6Factory extends EFactory
{
/**
- * The singleton instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The singleton instance of the factory.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
Model6Factory eINSTANCE = org.eclipse.emf.cdo.tests.model6.impl.Model6FactoryImpl.init();
/**
- * Returns a new object of class '<em>Root</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Returns a new object of class '<em>Root</em>'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @return a new object of class '<em>Root</em>'.
* @generated
*/
Root createRoot();
/**
- * Returns a new object of class '<em>Base Object</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Returns a new object of class '<em>Base Object</em>'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @return a new object of class '<em>Base Object</em>'.
* @generated
*/
BaseObject createBaseObject();
/**
- * Returns a new object of class '<em>Reference Object</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Returns a new object of class '<em>Reference Object</em>'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @return a new object of class '<em>Reference Object</em>'.
* @generated
*/
ReferenceObject createReferenceObject();
/**
- * Returns a new object of class '<em>Containment Object</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Returns a new object of class '<em>Containment Object</em>'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @return a new object of class '<em>Containment Object</em>'.
* @generated
*/
ContainmentObject createContainmentObject();
/**
- * Returns a new object of class '<em>A</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Returns a new object of class '<em>A</em>'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @return a new object of class '<em>A</em>'.
* @generated
*/
A createA();
/**
- * Returns a new object of class '<em>B</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Returns a new object of class '<em>B</em>'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @return a new object of class '<em>B</em>'.
* @generated
*/
B createB();
/**
- * Returns a new object of class '<em>C</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Returns a new object of class '<em>C</em>'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @return a new object of class '<em>C</em>'.
* @generated
*/
C createC();
/**
- * Returns a new object of class '<em>D</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Returns a new object of class '<em>D</em>'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @return a new object of class '<em>D</em>'.
* @generated
*/
D createD();
/**
- * Returns a new object of class '<em>E</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Returns a new object of class '<em>E</em>'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @return a new object of class '<em>E</em>'.
* @generated
*/
E createE();
/**
- * Returns a new object of class '<em>F</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Returns a new object of class '<em>F</em>'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @return a new object of class '<em>F</em>'.
* @generated
*/
F createF();
/**
- * Returns the package supported by this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Returns the package supported by this factory.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @return the package supported by this factory.
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Model6Package.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Model6Package.java index 4f5b208e51..825b13d880 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Model6Package.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Model6Package.java @@ -24,7 +24,6 @@ import org.eclipse.emf.ecore.EReference; * <li>and each data type</li>
* </ul>
* <!-- end-user-doc -->
- *
* @see org.eclipse.emf.cdo.tests.model6.Model6Factory
* @model kind="package"
* @generated
@@ -32,29 +31,29 @@ import org.eclipse.emf.ecore.EReference; public interface Model6Package extends EPackage
{
/**
- * The package name. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The package name.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
String eNAME = "model6";
/**
- * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The package namespace URI.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
String eNS_URI = "http://www.eclipse.org/emf/CDO/tests/model6/1.0.0";
/**
- * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The package namespace name.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
String eNS_PREFIX = "model6";
/**
- * The singleton instance of the package. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The singleton instance of the package.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
Model6Package eINSTANCE = org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl.init();
@@ -70,53 +69,52 @@ public interface Model6Package extends EPackage int ROOT = 0;
/**
- * The feature id for the '<em><b>List A</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>List A</b></em>' containment reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int ROOT__LIST_A = 0;
/**
- * The feature id for the '<em><b>List B</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>List B</b></em>' containment reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int ROOT__LIST_B = 1;
/**
- * The feature id for the '<em><b>List C</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>List C</b></em>' containment reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int ROOT__LIST_C = 2;
/**
- * The feature id for the '<em><b>List D</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>List D</b></em>' containment reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int ROOT__LIST_D = 3;
/**
- * The number of structural features of the '<em>Root</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The number of structural features of the '<em>Root</em>' class.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
* @ordered
*/
int ROOT_FEATURE_COUNT = 4;
/**
- * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.impl.BaseObjectImpl <em>Base Object</em>}'
- * class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.impl.BaseObjectImpl <em>Base Object</em>}' class.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @see org.eclipse.emf.cdo.tests.model6.impl.BaseObjectImpl
* @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getBaseObject()
* @generated
@@ -160,9 +158,8 @@ public interface Model6Package extends EPackage int BASE_OBJECT_FEATURE_COUNT = 3;
/**
- * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.impl.ReferenceObjectImpl
- * <em>Reference Object</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.impl.ReferenceObjectImpl <em>Reference Object</em>}' class.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @see org.eclipse.emf.cdo.tests.model6.impl.ReferenceObjectImpl
* @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getReferenceObject()
* @generated
@@ -215,18 +212,17 @@ public interface Model6Package extends EPackage int REFERENCE_OBJECT__REFERENCE_LIST = BASE_OBJECT_FEATURE_COUNT + 1;
/**
- * The number of structural features of the '<em>Reference Object</em>' class. <!-- begin-user-doc --> <!--
+ * The number of structural features of the '<em>Reference Object</em>' class.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int REFERENCE_OBJECT_FEATURE_COUNT = BASE_OBJECT_FEATURE_COUNT + 2;
/**
- * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.impl.ContainmentObjectImpl
- * <em>Containment Object</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.impl.ContainmentObjectImpl <em>Containment Object</em>}' class.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @see org.eclipse.emf.cdo.tests.model6.impl.ContainmentObjectImpl
* @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getContainmentObject()
* @generated
@@ -261,27 +257,27 @@ public interface Model6Package extends EPackage int CONTAINMENT_OBJECT__ATTRIBUTE_LIST = BASE_OBJECT__ATTRIBUTE_LIST;
/**
- * The feature id for the '<em><b>Containment Optional</b></em>' containment reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Containment Optional</b></em>' containment reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL = BASE_OBJECT_FEATURE_COUNT + 0;
/**
- * The feature id for the '<em><b>Containment List</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Containment List</b></em>' containment reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int CONTAINMENT_OBJECT__CONTAINMENT_LIST = BASE_OBJECT_FEATURE_COUNT + 1;
/**
- * The number of structural features of the '<em>Containment Object</em>' class. <!-- begin-user-doc --> <!--
+ * The number of structural features of the '<em>Containment Object</em>' class.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -298,26 +294,26 @@ public interface Model6Package extends EPackage int A = 4;
/**
- * The feature id for the '<em><b>Owned Ds</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Owned Ds</b></em>' containment reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int A__OWNED_DS = 0;
/**
- * The feature id for the '<em><b>Owned Bs</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Owned Bs</b></em>' containment reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int A__OWNED_BS = 1;
/**
- * The number of structural features of the '<em>A</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The number of structural features of the '<em>A</em>' class.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -343,8 +339,8 @@ public interface Model6Package extends EPackage int B__OWNED_C = 0;
/**
- * The number of structural features of the '<em>B</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The number of structural features of the '<em>B</em>' class.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -361,8 +357,8 @@ public interface Model6Package extends EPackage int C = 6;
/**
- * The number of structural features of the '<em>C</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The number of structural features of the '<em>C</em>' class.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -379,16 +375,16 @@ public interface Model6Package extends EPackage int D = 7;
/**
- * The feature id for the '<em><b>Data</b></em>' containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The feature id for the '<em><b>Data</b></em>' containment reference.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
* @ordered
*/
int D__DATA = 0;
/**
- * The number of structural features of the '<em>D</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The number of structural features of the '<em>D</em>' class.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -405,17 +401,17 @@ public interface Model6Package extends EPackage int E = 8;
/**
- * The feature id for the '<em><b>Owned As</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Owned As</b></em>' containment reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int E__OWNED_AS = 0;
/**
- * The number of structural features of the '<em>E</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The number of structural features of the '<em>E</em>' class.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -432,17 +428,17 @@ public interface Model6Package extends EPackage int F = 9;
/**
- * The feature id for the '<em><b>Owned Es</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Owned Es</b></em>' containment reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int F__OWNED_ES = 0;
/**
- * The number of structural features of the '<em>F</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The number of structural features of the '<em>F</em>' class.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -459,9 +455,8 @@ public interface Model6Package extends EPackage EClass getRoot();
/**
- * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model6.Root#getListA
- * <em>List A</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model6.Root#getListA <em>List A</em>}'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @return the meta object for the containment reference list '<em>List A</em>'.
* @see org.eclipse.emf.cdo.tests.model6.Root#getListA()
* @see #getRoot()
@@ -470,9 +465,8 @@ public interface Model6Package extends EPackage EReference getRoot_ListA();
/**
- * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model6.Root#getListB
- * <em>List B</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model6.Root#getListB <em>List B</em>}'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @return the meta object for the containment reference list '<em>List B</em>'.
* @see org.eclipse.emf.cdo.tests.model6.Root#getListB()
* @see #getRoot()
@@ -481,9 +475,8 @@ public interface Model6Package extends EPackage EReference getRoot_ListB();
/**
- * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model6.Root#getListC
- * <em>List C</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model6.Root#getListC <em>List C</em>}'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @return the meta object for the containment reference list '<em>List C</em>'.
* @see org.eclipse.emf.cdo.tests.model6.Root#getListC()
* @see #getRoot()
@@ -492,9 +485,8 @@ public interface Model6Package extends EPackage EReference getRoot_ListC();
/**
- * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model6.Root#getListD
- * <em>List D</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model6.Root#getListD <em>List D</em>}'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @return the meta object for the containment reference list '<em>List D</em>'.
* @see org.eclipse.emf.cdo.tests.model6.Root#getListD()
* @see #getRoot()
@@ -513,9 +505,8 @@ public interface Model6Package extends EPackage EClass getBaseObject();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model6.BaseObject#getAttributeOptional
- * <em>Attribute Optional</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model6.BaseObject#getAttributeOptional <em>Attribute Optional</em>}'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @return the meta object for the attribute '<em>Attribute Optional</em>'.
* @see org.eclipse.emf.cdo.tests.model6.BaseObject#getAttributeOptional()
* @see #getBaseObject()
@@ -524,9 +515,8 @@ public interface Model6Package extends EPackage EAttribute getBaseObject_AttributeOptional();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model6.BaseObject#getAttributeRequired
- * <em>Attribute Required</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model6.BaseObject#getAttributeRequired <em>Attribute Required</em>}'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @return the meta object for the attribute '<em>Attribute Required</em>'.
* @see org.eclipse.emf.cdo.tests.model6.BaseObject#getAttributeRequired()
* @see #getBaseObject()
@@ -535,10 +525,9 @@ public interface Model6Package extends EPackage EAttribute getBaseObject_AttributeRequired();
/**
- * Returns the meta object for the attribute list '
- * {@link org.eclipse.emf.cdo.tests.model6.BaseObject#getAttributeList <em>Attribute List</em>}'. <!-- begin-user-doc
+ * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.tests.model6.BaseObject#getAttributeList <em>Attribute List</em>}'.
+ * <!-- begin-user-doc
* --> <!-- end-user-doc -->
- *
* @return the meta object for the attribute list '<em>Attribute List</em>'.
* @see org.eclipse.emf.cdo.tests.model6.BaseObject#getAttributeList()
* @see #getBaseObject()
@@ -547,9 +536,8 @@ public interface Model6Package extends EPackage EAttribute getBaseObject_AttributeList();
/**
- * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model6.ReferenceObject
- * <em>Reference Object</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model6.ReferenceObject <em>Reference Object</em>}'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @return the meta object for class '<em>Reference Object</em>'.
* @see org.eclipse.emf.cdo.tests.model6.ReferenceObject
* @generated
@@ -581,9 +569,8 @@ public interface Model6Package extends EPackage EReference getReferenceObject_ReferenceList();
/**
- * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model6.ContainmentObject
- * <em>Containment Object</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model6.ContainmentObject <em>Containment Object</em>}'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @return the meta object for class '<em>Containment Object</em>'.
* @see org.eclipse.emf.cdo.tests.model6.ContainmentObject
* @generated
@@ -591,10 +578,8 @@ public interface Model6Package extends EPackage EClass getContainmentObject();
/**
- * Returns the meta object for the containment reference '
- * {@link org.eclipse.emf.cdo.tests.model6.ContainmentObject#getContainmentOptional <em>Containment Optional</em>}'.
+ * Returns the meta object for the containment reference '{@link org.eclipse.emf.cdo.tests.model6.ContainmentObject#getContainmentOptional <em>Containment Optional</em>}'.
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @return the meta object for the containment reference '<em>Containment Optional</em>'.
* @see org.eclipse.emf.cdo.tests.model6.ContainmentObject#getContainmentOptional()
* @see #getContainmentObject()
@@ -615,9 +600,9 @@ public interface Model6Package extends EPackage EReference getContainmentObject_ContainmentList();
/**
- * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model6.A <em>A</em>}'. <!-- begin-user-doc -->
+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model6.A <em>A</em>}'.
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @return the meta object for class '<em>A</em>'.
* @see org.eclipse.emf.cdo.tests.model6.A
* @generated
@@ -625,9 +610,8 @@ public interface Model6Package extends EPackage EClass getA();
/**
- * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model6.A#getOwnedDs
- * <em>Owned Ds</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model6.A#getOwnedDs <em>Owned Ds</em>}'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @return the meta object for the containment reference list '<em>Owned Ds</em>'.
* @see org.eclipse.emf.cdo.tests.model6.A#getOwnedDs()
* @see #getA()
@@ -636,9 +620,8 @@ public interface Model6Package extends EPackage EReference getA_OwnedDs();
/**
- * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model6.A#getOwnedBs
- * <em>Owned Bs</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model6.A#getOwnedBs <em>Owned Bs</em>}'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @return the meta object for the containment reference list '<em>Owned Bs</em>'.
* @see org.eclipse.emf.cdo.tests.model6.A#getOwnedBs()
* @see #getA()
@@ -647,9 +630,9 @@ public interface Model6Package extends EPackage EReference getA_OwnedBs();
/**
- * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model6.B <em>B</em>}'. <!-- begin-user-doc -->
+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model6.B <em>B</em>}'.
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @return the meta object for class '<em>B</em>'.
* @see org.eclipse.emf.cdo.tests.model6.B
* @generated
@@ -657,9 +640,8 @@ public interface Model6Package extends EPackage EClass getB();
/**
- * Returns the meta object for the containment reference '{@link org.eclipse.emf.cdo.tests.model6.B#getOwnedC
- * <em>Owned C</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Returns the meta object for the containment reference '{@link org.eclipse.emf.cdo.tests.model6.B#getOwnedC <em>Owned C</em>}'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @return the meta object for the containment reference '<em>Owned C</em>'.
* @see org.eclipse.emf.cdo.tests.model6.B#getOwnedC()
* @see #getB()
@@ -668,9 +650,9 @@ public interface Model6Package extends EPackage EReference getB_OwnedC();
/**
- * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model6.C <em>C</em>}'. <!-- begin-user-doc -->
+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model6.C <em>C</em>}'.
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @return the meta object for class '<em>C</em>'.
* @see org.eclipse.emf.cdo.tests.model6.C
* @generated
@@ -678,9 +660,9 @@ public interface Model6Package extends EPackage EClass getC();
/**
- * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model6.D <em>D</em>}'. <!-- begin-user-doc -->
+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model6.D <em>D</em>}'.
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @return the meta object for class '<em>D</em>'.
* @see org.eclipse.emf.cdo.tests.model6.D
* @generated
@@ -688,9 +670,8 @@ public interface Model6Package extends EPackage EClass getD();
/**
- * Returns the meta object for the containment reference '{@link org.eclipse.emf.cdo.tests.model6.D#getData
- * <em>Data</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Returns the meta object for the containment reference '{@link org.eclipse.emf.cdo.tests.model6.D#getData <em>Data</em>}'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @return the meta object for the containment reference '<em>Data</em>'.
* @see org.eclipse.emf.cdo.tests.model6.D#getData()
* @see #getD()
@@ -699,9 +680,9 @@ public interface Model6Package extends EPackage EReference getD_Data();
/**
- * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model6.E <em>E</em>}'. <!-- begin-user-doc -->
+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model6.E <em>E</em>}'.
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @return the meta object for class '<em>E</em>'.
* @see org.eclipse.emf.cdo.tests.model6.E
* @generated
@@ -709,9 +690,8 @@ public interface Model6Package extends EPackage EClass getE();
/**
- * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model6.E#getOwnedAs
- * <em>Owned As</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model6.E#getOwnedAs <em>Owned As</em>}'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @return the meta object for the containment reference list '<em>Owned As</em>'.
* @see org.eclipse.emf.cdo.tests.model6.E#getOwnedAs()
* @see #getE()
@@ -720,9 +700,9 @@ public interface Model6Package extends EPackage EReference getE_OwnedAs();
/**
- * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model6.F <em>F</em>}'. <!-- begin-user-doc -->
+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model6.F <em>F</em>}'.
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @return the meta object for class '<em>F</em>'.
* @see org.eclipse.emf.cdo.tests.model6.F
* @generated
@@ -730,9 +710,8 @@ public interface Model6Package extends EPackage EClass getF();
/**
- * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model6.F#getOwnedEs
- * <em>Owned Es</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model6.F#getOwnedEs <em>Owned Es</em>}'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @return the meta object for the containment reference list '<em>Owned Es</em>'.
* @see org.eclipse.emf.cdo.tests.model6.F#getOwnedEs()
* @see #getF()
@@ -741,8 +720,8 @@ public interface Model6Package extends EPackage EReference getF_OwnedEs();
/**
- * Returns the factory that creates the instances of the model. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Returns the factory that creates the instances of the model.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @return the factory that creates the instances of the model.
* @generated
*/
@@ -757,7 +736,6 @@ public interface Model6Package extends EPackage * <li>and each data type</li>
* </ul>
* <!-- end-user-doc -->
- *
* @generated
*/
interface Literals
@@ -765,7 +743,6 @@ public interface Model6Package extends EPackage /**
* The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model6.impl.RootImpl <em>Root</em>}' class.
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @see org.eclipse.emf.cdo.tests.model6.impl.RootImpl
* @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getRoot()
* @generated
@@ -773,41 +750,40 @@ public interface Model6Package extends EPackage EClass ROOT = eINSTANCE.getRoot();
/**
- * The meta object literal for the '<em><b>List A</b></em>' containment reference list feature. <!-- begin-user-doc
+ * The meta object literal for the '<em><b>List A</b></em>' containment reference list feature.
+ * <!-- begin-user-doc
* --> <!-- end-user-doc -->
- *
* @generated
*/
EReference ROOT__LIST_A = eINSTANCE.getRoot_ListA();
/**
- * The meta object literal for the '<em><b>List B</b></em>' containment reference list feature. <!-- begin-user-doc
+ * The meta object literal for the '<em><b>List B</b></em>' containment reference list feature.
+ * <!-- begin-user-doc
* --> <!-- end-user-doc -->
- *
* @generated
*/
EReference ROOT__LIST_B = eINSTANCE.getRoot_ListB();
/**
- * The meta object literal for the '<em><b>List C</b></em>' containment reference list feature. <!-- begin-user-doc
+ * The meta object literal for the '<em><b>List C</b></em>' containment reference list feature.
+ * <!-- begin-user-doc
* --> <!-- end-user-doc -->
- *
* @generated
*/
EReference ROOT__LIST_C = eINSTANCE.getRoot_ListC();
/**
- * The meta object literal for the '<em><b>List D</b></em>' containment reference list feature. <!-- begin-user-doc
+ * The meta object literal for the '<em><b>List D</b></em>' containment reference list feature.
+ * <!-- begin-user-doc
* --> <!-- end-user-doc -->
- *
* @generated
*/
EReference ROOT__LIST_D = eINSTANCE.getRoot_ListD();
/**
- * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model6.impl.BaseObjectImpl
- * <em>Base Object</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model6.impl.BaseObjectImpl <em>Base Object</em>}' class.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @see org.eclipse.emf.cdo.tests.model6.impl.BaseObjectImpl
* @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getBaseObject()
* @generated
@@ -815,33 +791,32 @@ public interface Model6Package extends EPackage EClass BASE_OBJECT = eINSTANCE.getBaseObject();
/**
- * The meta object literal for the '<em><b>Attribute Optional</b></em>' attribute feature. <!-- begin-user-doc -->
+ * The meta object literal for the '<em><b>Attribute Optional</b></em>' attribute feature.
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
EAttribute BASE_OBJECT__ATTRIBUTE_OPTIONAL = eINSTANCE.getBaseObject_AttributeOptional();
/**
- * The meta object literal for the '<em><b>Attribute Required</b></em>' attribute feature. <!-- begin-user-doc -->
+ * The meta object literal for the '<em><b>Attribute Required</b></em>' attribute feature.
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
EAttribute BASE_OBJECT__ATTRIBUTE_REQUIRED = eINSTANCE.getBaseObject_AttributeRequired();
/**
- * The meta object literal for the '<em><b>Attribute List</b></em>' attribute list feature. <!-- begin-user-doc -->
+ * The meta object literal for the '<em><b>Attribute List</b></em>' attribute list feature.
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
EAttribute BASE_OBJECT__ATTRIBUTE_LIST = eINSTANCE.getBaseObject_AttributeList();
/**
- * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model6.impl.ReferenceObjectImpl
- * <em>Reference Object</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model6.impl.ReferenceObjectImpl <em>Reference Object</em>}' class.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @see org.eclipse.emf.cdo.tests.model6.impl.ReferenceObjectImpl
* @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getReferenceObject()
* @generated
@@ -849,25 +824,24 @@ public interface Model6Package extends EPackage EClass REFERENCE_OBJECT = eINSTANCE.getReferenceObject();
/**
- * The meta object literal for the '<em><b>Reference Optional</b></em>' reference feature. <!-- begin-user-doc -->
+ * The meta object literal for the '<em><b>Reference Optional</b></em>' reference feature.
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
EReference REFERENCE_OBJECT__REFERENCE_OPTIONAL = eINSTANCE.getReferenceObject_ReferenceOptional();
/**
- * The meta object literal for the '<em><b>Reference List</b></em>' reference list feature. <!-- begin-user-doc -->
+ * The meta object literal for the '<em><b>Reference List</b></em>' reference list feature.
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
EReference REFERENCE_OBJECT__REFERENCE_LIST = eINSTANCE.getReferenceObject_ReferenceList();
/**
- * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model6.impl.ContainmentObjectImpl
- * <em>Containment Object</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model6.impl.ContainmentObjectImpl <em>Containment Object</em>}' class.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @see org.eclipse.emf.cdo.tests.model6.impl.ContainmentObjectImpl
* @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getContainmentObject()
* @generated
@@ -927,9 +901,9 @@ public interface Model6Package extends EPackage EClass B = eINSTANCE.getB();
/**
- * The meta object literal for the '<em><b>Owned C</b></em>' containment reference feature. <!-- begin-user-doc -->
+ * The meta object literal for the '<em><b>Owned C</b></em>' containment reference feature.
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
EReference B__OWNED_C = eINSTANCE.getB_OwnedC();
@@ -955,9 +929,9 @@ public interface Model6Package extends EPackage EClass D = eINSTANCE.getD();
/**
- * The meta object literal for the '<em><b>Data</b></em>' containment reference feature. <!-- begin-user-doc -->
+ * The meta object literal for the '<em><b>Data</b></em>' containment reference feature.
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
EReference D__DATA = eINSTANCE.getD_Data();
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/ReferenceObject.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/ReferenceObject.java index a9da3fb5e3..7c029e355a 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/ReferenceObject.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/ReferenceObject.java @@ -30,13 +30,13 @@ import org.eclipse.emf.common.util.EList; public interface ReferenceObject extends BaseObject
{
/**
- * Returns the value of the '<em><b>Reference Optional</b></em>' reference. <!-- begin-user-doc -->
+ * Returns the value of the '<em><b>Reference Optional</b></em>' reference.
+ * <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Reference Optional</em>' reference isn't clear, there really should be more of a
* description here...
* </p>
* <!-- end-user-doc -->
- *
* @return the value of the '<em>Reference Optional</em>' reference.
* @see #setReferenceOptional(BaseObject)
* @see org.eclipse.emf.cdo.tests.model6.Model6Package#getReferenceObject_ReferenceOptional()
@@ -46,25 +46,23 @@ public interface ReferenceObject extends BaseObject BaseObject getReferenceOptional();
/**
- * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model6.ReferenceObject#getReferenceOptional
- * <em>Reference Optional</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @param value
- * the new value of the '<em>Reference Optional</em>' reference.
+ * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model6.ReferenceObject#getReferenceOptional <em>Reference Optional</em>}' reference.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * @param value the new value of the '<em>Reference Optional</em>' reference.
* @see #getReferenceOptional()
* @generated
*/
void setReferenceOptional(BaseObject value);
/**
- * Returns the value of the '<em><b>Reference List</b></em>' reference list. The list contents are of type
- * {@link org.eclipse.emf.cdo.tests.model6.BaseObject}. <!-- begin-user-doc -->
+ * Returns the value of the '<em><b>Reference List</b></em>' reference list.
+ * The list contents are of type {@link org.eclipse.emf.cdo.tests.model6.BaseObject}.
+ * <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Reference List</em>' reference list isn't clear, there really should be more of a
* description here...
* </p>
* <!-- end-user-doc -->
- *
* @return the value of the '<em>Reference List</em>' reference list.
* @see org.eclipse.emf.cdo.tests.model6.Model6Package#getReferenceObject_ReferenceList()
* @model
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Root.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Root.java index 80c0f5dd23..fcab783f92 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Root.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Root.java @@ -15,16 +15,17 @@ import org.eclipse.emf.ecore.EObject; /**
* <!-- begin-user-doc --> A representation of the model object '<em><b>Root</b></em>'. <!-- end-user-doc -->
+ *
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.model6.Root#getListA <em>List A</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.model6.Root#getListB <em>List B</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.model6.Root#getListC <em>List C</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.model6.Root#getListD <em>List D</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model6.Root#getListA <em>List A</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model6.Root#getListB <em>List B</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model6.Root#getListC <em>List C</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model6.Root#getListD <em>List D</em>}</li>
* </ul>
* </p>
- *
+ *
* @see org.eclipse.emf.cdo.tests.model6.Model6Package#getRoot()
* @model
* @generated
@@ -32,65 +33,65 @@ import org.eclipse.emf.ecore.EObject; public interface Root extends EObject
{
/**
- * Returns the value of the '<em><b>List A</b></em>' containment reference list. The list contents are of type
- * {@link org.eclipse.emf.cdo.tests.model6.BaseObject}. <!-- begin-user-doc -->
+ * Returns the value of the '<em><b>List A</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.emf.cdo.tests.model6.BaseObject}.
+ * <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>List A</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>List A</em>' containment reference list.
* @see org.eclipse.emf.cdo.tests.model6.Model6Package#getRoot_ListA()
- * @model containment="true"
+ * @model containment="true" resolveProxies="true"
* @generated
*/
EList<BaseObject> getListA();
/**
- * Returns the value of the '<em><b>List B</b></em>' containment reference list. The list contents are of type
- * {@link org.eclipse.emf.cdo.tests.model6.BaseObject}. <!-- begin-user-doc -->
+ * Returns the value of the '<em><b>List B</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.emf.cdo.tests.model6.BaseObject}.
+ * <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>List B</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>List B</em>' containment reference list.
* @see org.eclipse.emf.cdo.tests.model6.Model6Package#getRoot_ListB()
- * @model containment="true"
+ * @model containment="true" resolveProxies="true"
* @generated
*/
EList<BaseObject> getListB();
/**
- * Returns the value of the '<em><b>List C</b></em>' containment reference list. The list contents are of type
- * {@link org.eclipse.emf.cdo.tests.model6.BaseObject}. <!-- begin-user-doc -->
+ * Returns the value of the '<em><b>List C</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.emf.cdo.tests.model6.BaseObject}.
+ * <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>List C</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>List C</em>' containment reference list.
* @see org.eclipse.emf.cdo.tests.model6.Model6Package#getRoot_ListC()
- * @model containment="true"
+ * @model containment="true" resolveProxies="true"
* @generated
*/
EList<BaseObject> getListC();
/**
- * Returns the value of the '<em><b>List D</b></em>' containment reference list. The list contents are of type
- * {@link org.eclipse.emf.cdo.tests.model6.BaseObject}. <!-- begin-user-doc -->
+ * Returns the value of the '<em><b>List D</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.emf.cdo.tests.model6.BaseObject}.
+ * <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>List D</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>List D</em>' containment reference list.
* @see org.eclipse.emf.cdo.tests.model6.Model6Package#getRoot_ListD()
- * @model containment="true"
+ * @model containment="true" resolveProxies="true"
* @generated
*/
EList<BaseObject> getListD();
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/AImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/AImpl.java index 896b7b024a..8455d58121 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/AImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/AImpl.java @@ -25,18 +25,17 @@ import org.eclipse.emf.ecore.EClass; * <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.model6.impl.AImpl#getOwnedDs <em>Owned Ds</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.model6.impl.AImpl#getOwnedBs <em>Owned Bs</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model6.impl.AImpl#getOwnedDs <em>Owned Ds</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model6.impl.AImpl#getOwnedBs <em>Owned Bs</em>}</li>
* </ul>
* </p>
- *
+ *
* @generated
*/
public class AImpl extends CDOObjectImpl implements A
{
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
protected AImpl()
@@ -46,7 +45,6 @@ public class AImpl extends CDOObjectImpl implements A /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -57,7 +55,6 @@ public class AImpl extends CDOObjectImpl implements A /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -68,7 +65,6 @@ public class AImpl extends CDOObjectImpl implements A /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@SuppressWarnings("unchecked")
@@ -79,7 +75,6 @@ public class AImpl extends CDOObjectImpl implements A /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@SuppressWarnings("unchecked")
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/BImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/BImpl.java index 5a264d2398..025c150990 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/BImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/BImpl.java @@ -23,17 +23,16 @@ import org.eclipse.emf.ecore.EClass; * <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.model6.impl.BImpl#getOwnedC <em>Owned C</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model6.impl.BImpl#getOwnedC <em>Owned C</em>}</li>
* </ul>
* </p>
- *
+ *
* @generated
*/
public class BImpl extends CDOObjectImpl implements B
{
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
protected BImpl()
@@ -43,7 +42,6 @@ public class BImpl extends CDOObjectImpl implements B /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -54,7 +52,6 @@ public class BImpl extends CDOObjectImpl implements B /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -65,7 +62,6 @@ public class BImpl extends CDOObjectImpl implements B /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public C getOwnedC()
@@ -75,7 +71,6 @@ public class BImpl extends CDOObjectImpl implements B /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public void setOwnedC(C newOwnedC)
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/BaseObjectImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/BaseObjectImpl.java index 10a443a5a4..a4d1a035f9 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/BaseObjectImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/BaseObjectImpl.java @@ -23,19 +23,18 @@ import org.eclipse.emf.ecore.EClass; * <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.model6.impl.BaseObjectImpl#getAttributeOptional <em>Attribute Optional</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.model6.impl.BaseObjectImpl#getAttributeRequired <em>Attribute Required</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.model6.impl.BaseObjectImpl#getAttributeList <em>Attribute List</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model6.impl.BaseObjectImpl#getAttributeOptional <em>Attribute Optional</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model6.impl.BaseObjectImpl#getAttributeRequired <em>Attribute Required</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model6.impl.BaseObjectImpl#getAttributeList <em>Attribute List</em>}</li>
* </ul>
* </p>
- *
+ *
* @generated
*/
public class BaseObjectImpl extends CDOObjectImpl implements BaseObject
{
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
protected BaseObjectImpl()
@@ -45,7 +44,6 @@ public class BaseObjectImpl extends CDOObjectImpl implements BaseObject /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -56,7 +54,6 @@ public class BaseObjectImpl extends CDOObjectImpl implements BaseObject /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -67,7 +64,6 @@ public class BaseObjectImpl extends CDOObjectImpl implements BaseObject /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public String getAttributeOptional()
@@ -77,7 +73,6 @@ public class BaseObjectImpl extends CDOObjectImpl implements BaseObject /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public void setAttributeOptional(String newAttributeOptional)
@@ -87,7 +82,6 @@ public class BaseObjectImpl extends CDOObjectImpl implements BaseObject /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public String getAttributeRequired()
@@ -97,7 +91,6 @@ public class BaseObjectImpl extends CDOObjectImpl implements BaseObject /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public void setAttributeRequired(String newAttributeRequired)
@@ -107,7 +100,6 @@ public class BaseObjectImpl extends CDOObjectImpl implements BaseObject /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@SuppressWarnings("unchecked")
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/CImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/CImpl.java index 4a16675081..1e081c1966 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/CImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/CImpl.java @@ -21,14 +21,13 @@ import org.eclipse.emf.ecore.EClass; * <!-- begin-user-doc --> An implementation of the model object '<em><b>C</b></em>'. <!-- end-user-doc -->
* <p>
* </p>
- *
+ *
* @generated
*/
public class CImpl extends CDOObjectImpl implements C
{
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
protected CImpl()
@@ -38,7 +37,6 @@ public class CImpl extends CDOObjectImpl implements C /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -49,7 +47,6 @@ public class CImpl extends CDOObjectImpl implements C /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/ContainmentObjectImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/ContainmentObjectImpl.java index 0ba6ff1e7f..87b3f05413 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/ContainmentObjectImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/ContainmentObjectImpl.java @@ -35,7 +35,6 @@ public class ContainmentObjectImpl extends BaseObjectImpl implements Containment {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
protected ContainmentObjectImpl()
@@ -45,7 +44,6 @@ public class ContainmentObjectImpl extends BaseObjectImpl implements Containment /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -56,7 +54,6 @@ public class ContainmentObjectImpl extends BaseObjectImpl implements Containment /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public BaseObject getContainmentOptional()
@@ -66,7 +63,6 @@ public class ContainmentObjectImpl extends BaseObjectImpl implements Containment /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public void setContainmentOptional(BaseObject newContainmentOptional)
@@ -76,7 +72,6 @@ public class ContainmentObjectImpl extends BaseObjectImpl implements Containment /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@SuppressWarnings("unchecked")
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/DImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/DImpl.java index c2a1095b93..18dd5991f7 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/DImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/DImpl.java @@ -23,17 +23,16 @@ import org.eclipse.emf.ecore.EObject; * <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.model6.impl.DImpl#getData <em>Data</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model6.impl.DImpl#getData <em>Data</em>}</li>
* </ul>
* </p>
- *
+ *
* @generated
*/
public class DImpl extends CDOObjectImpl implements D
{
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
protected DImpl()
@@ -43,7 +42,6 @@ public class DImpl extends CDOObjectImpl implements D /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -54,7 +52,6 @@ public class DImpl extends CDOObjectImpl implements D /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -65,7 +62,6 @@ public class DImpl extends CDOObjectImpl implements D /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public EObject getData()
@@ -75,7 +71,6 @@ public class DImpl extends CDOObjectImpl implements D /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public void setData(EObject newData)
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/EImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/EImpl.java index cb49b56df8..e497ac806c 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/EImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/EImpl.java @@ -24,17 +24,16 @@ import org.eclipse.emf.ecore.EClass; * <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.model6.impl.EImpl#getOwnedAs <em>Owned As</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model6.impl.EImpl#getOwnedAs <em>Owned As</em>}</li>
* </ul>
* </p>
- *
+ *
* @generated
*/
public class EImpl extends CDOObjectImpl implements E
{
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
protected EImpl()
@@ -44,7 +43,6 @@ public class EImpl extends CDOObjectImpl implements E /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -55,7 +53,6 @@ public class EImpl extends CDOObjectImpl implements E /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -66,7 +63,6 @@ public class EImpl extends CDOObjectImpl implements E /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@SuppressWarnings("unchecked")
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/FImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/FImpl.java index 1800f85524..c9551f333f 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/FImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/FImpl.java @@ -24,17 +24,16 @@ import org.eclipse.emf.ecore.EClass; * <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.model6.impl.FImpl#getOwnedEs <em>Owned Es</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model6.impl.FImpl#getOwnedEs <em>Owned Es</em>}</li>
* </ul>
* </p>
- *
+ *
* @generated
*/
public class FImpl extends CDOObjectImpl implements F
{
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
protected FImpl()
@@ -44,7 +43,6 @@ public class FImpl extends CDOObjectImpl implements F /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -55,7 +53,6 @@ public class FImpl extends CDOObjectImpl implements F /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -66,7 +63,6 @@ public class FImpl extends CDOObjectImpl implements F /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@SuppressWarnings("unchecked")
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/Model6FactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/Model6FactoryImpl.java index eea731bf22..43336c0225 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/Model6FactoryImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/Model6FactoryImpl.java @@ -31,14 +31,13 @@ import org.eclipse.emf.ecore.plugin.EcorePlugin; /**
* <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc -->
- *
* @generated
*/
public class Model6FactoryImpl extends EFactoryImpl implements Model6Factory
{
/**
- * Creates the default factory implementation. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Creates the default factory implementation.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
public static Model6Factory init()
@@ -60,8 +59,8 @@ public class Model6FactoryImpl extends EFactoryImpl implements Model6Factory }
/**
- * Creates an instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Creates an instance of the factory.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
public Model6FactoryImpl()
@@ -71,7 +70,6 @@ public class Model6FactoryImpl extends EFactoryImpl implements Model6Factory /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -106,7 +104,6 @@ public class Model6FactoryImpl extends EFactoryImpl implements Model6Factory /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public Root createRoot()
@@ -117,7 +114,6 @@ public class Model6FactoryImpl extends EFactoryImpl implements Model6Factory /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public BaseObject createBaseObject()
@@ -128,7 +124,6 @@ public class Model6FactoryImpl extends EFactoryImpl implements Model6Factory /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public ReferenceObject createReferenceObject()
@@ -139,7 +134,6 @@ public class Model6FactoryImpl extends EFactoryImpl implements Model6Factory /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public ContainmentObject createContainmentObject()
@@ -150,7 +144,6 @@ public class Model6FactoryImpl extends EFactoryImpl implements Model6Factory /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public A createA()
@@ -161,7 +154,6 @@ public class Model6FactoryImpl extends EFactoryImpl implements Model6Factory /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public B createB()
@@ -172,7 +164,6 @@ public class Model6FactoryImpl extends EFactoryImpl implements Model6Factory /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public C createC()
@@ -183,7 +174,6 @@ public class Model6FactoryImpl extends EFactoryImpl implements Model6Factory /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public D createD()
@@ -194,7 +184,6 @@ public class Model6FactoryImpl extends EFactoryImpl implements Model6Factory /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public E createE()
@@ -205,7 +194,6 @@ public class Model6FactoryImpl extends EFactoryImpl implements Model6Factory /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public F createF()
@@ -216,7 +204,6 @@ public class Model6FactoryImpl extends EFactoryImpl implements Model6Factory /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public Model6Package getModel6Package()
@@ -226,7 +213,6 @@ public class Model6FactoryImpl extends EFactoryImpl implements Model6Factory /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @deprecated
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/Model6PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/Model6PackageImpl.java index 9a548b28f9..f74a72b721 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/Model6PackageImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/Model6PackageImpl.java @@ -25,77 +25,66 @@ import org.eclipse.emf.ecore.impl.EPackageImpl; /**
* <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc -->
- *
* @generated
*/
public class Model6PackageImpl extends EPackageImpl implements Model6Package
{
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
private EClass rootEClass = null;
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
private EClass baseObjectEClass = null;
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
private EClass referenceObjectEClass = null;
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
private EClass containmentObjectEClass = null;
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
private EClass aEClass = null;
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
private EClass bEClass = null;
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
private EClass cEClass = null;
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
private EClass dEClass = null;
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
private EClass eEClass = null;
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
private EClass fEClass = null;
@@ -120,18 +109,17 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
private static boolean isInited = false;
/**
* Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
- * <p>
- * This method is used to initialize {@link Model6Package#eINSTANCE} when that field is accessed. Clients should not
- * invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
*
+ * <p>This method is used to initialize {@link Model6Package#eINSTANCE} when that field is accessed.
+ * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @see #eNS_URI
* @see #createPackageContents()
* @see #initializePackageContents()
@@ -164,7 +152,6 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public EClass getRoot()
@@ -174,7 +161,6 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public EReference getRoot_ListA()
@@ -184,7 +170,6 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public EReference getRoot_ListB()
@@ -194,7 +179,6 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public EReference getRoot_ListC()
@@ -204,7 +188,6 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public EReference getRoot_ListD()
@@ -214,7 +197,6 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public EClass getBaseObject()
@@ -224,7 +206,6 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public EAttribute getBaseObject_AttributeOptional()
@@ -234,7 +215,6 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public EAttribute getBaseObject_AttributeRequired()
@@ -244,7 +224,6 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public EAttribute getBaseObject_AttributeList()
@@ -254,7 +233,6 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public EClass getReferenceObject()
@@ -264,7 +242,6 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public EReference getReferenceObject_ReferenceOptional()
@@ -274,7 +251,6 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public EReference getReferenceObject_ReferenceList()
@@ -284,7 +260,6 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public EClass getContainmentObject()
@@ -294,7 +269,6 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public EReference getContainmentObject_ContainmentOptional()
@@ -304,7 +278,6 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public EReference getContainmentObject_ContainmentList()
@@ -314,7 +287,6 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public EClass getA()
@@ -324,7 +296,6 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public EReference getA_OwnedDs()
@@ -334,7 +305,6 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public EReference getA_OwnedBs()
@@ -344,7 +314,6 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public EClass getB()
@@ -354,7 +323,6 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public EReference getB_OwnedC()
@@ -364,7 +332,6 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public EClass getC()
@@ -374,7 +341,6 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public EClass getD()
@@ -384,7 +350,6 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public EReference getD_Data()
@@ -394,7 +359,6 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public EClass getE()
@@ -404,7 +368,6 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public EReference getE_OwnedAs()
@@ -414,7 +377,6 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public EClass getF()
@@ -424,7 +386,6 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public EReference getF_OwnedEs()
@@ -434,7 +395,6 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public Model6Factory getModel6Factory()
@@ -444,15 +404,14 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
private boolean isCreated = false;
/**
- * Creates the meta-model objects for the package. This method is guarded to have no affect on any invocation but its
- * first. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Creates the meta-model objects for the package. This method is
+ * guarded to have no affect on any invocation but its first.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
public void createPackageContents()
@@ -502,15 +461,14 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
private boolean isInitialized = false;
/**
- * Complete the initialization of the package and its meta-model. This method is guarded to have no affect on any
- * invocation but its first. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Complete the initialization of the package and its meta-model. This
+ * method is guarded to have no affect on any invocation but its first.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
public void initializePackageContents()
@@ -535,16 +493,16 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package // Initialize classes and features; add operations and parameters
initEClass(rootEClass, Root.class, "Root", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getRoot_ListA(), this.getBaseObject(), null, "listA", null, 0, -1, Root.class, !IS_TRANSIENT,
- !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+ !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
IS_ORDERED);
initEReference(getRoot_ListB(), this.getBaseObject(), null, "listB", null, 0, -1, Root.class, !IS_TRANSIENT,
- !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+ !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
IS_ORDERED);
initEReference(getRoot_ListC(), this.getBaseObject(), null, "listC", null, 0, -1, Root.class, !IS_TRANSIENT,
- !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+ !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
IS_ORDERED);
initEReference(getRoot_ListD(), this.getBaseObject(), null, "listD", null, 0, -1, Root.class, !IS_TRANSIENT,
- !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+ !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
IS_ORDERED);
initEClass(baseObjectEClass, BaseObject.class, "BaseObject", !IS_ABSTRACT, !IS_INTERFACE,
@@ -571,25 +529,25 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package initEClass(containmentObjectEClass, ContainmentObject.class, "ContainmentObject", !IS_ABSTRACT, !IS_INTERFACE,
IS_GENERATED_INSTANCE_CLASS);
initEReference(getContainmentObject_ContainmentOptional(), this.getBaseObject(), null, "containmentOptional", null,
- 0, 1, ContainmentObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+ 0, 1, ContainmentObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getContainmentObject_ContainmentList(), this.getBaseObject(), null, "containmentList", null, 0, -1,
- ContainmentObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+ ContainmentObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(aEClass, org.eclipse.emf.cdo.tests.model6.A.class, "A", !IS_ABSTRACT, !IS_INTERFACE,
IS_GENERATED_INSTANCE_CLASS);
initEReference(getA_OwnedDs(), this.getD(), null, "ownedDs", null, 0, -1, org.eclipse.emf.cdo.tests.model6.A.class,
- !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
!IS_DERIVED, IS_ORDERED);
initEReference(getA_OwnedBs(), this.getB(), null, "ownedBs", null, 0, -1, org.eclipse.emf.cdo.tests.model6.A.class,
- !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
!IS_DERIVED, IS_ORDERED);
initEClass(bEClass, org.eclipse.emf.cdo.tests.model6.B.class, "B", !IS_ABSTRACT, !IS_INTERFACE,
IS_GENERATED_INSTANCE_CLASS);
initEReference(getB_OwnedC(), this.getC(), null, "ownedC", null, 0, 1, org.eclipse.emf.cdo.tests.model6.B.class,
- !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
!IS_DERIVED, IS_ORDERED);
initEClass(cEClass, org.eclipse.emf.cdo.tests.model6.C.class, "C", !IS_ABSTRACT, !IS_INTERFACE,
@@ -604,13 +562,13 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package initEClass(eEClass, org.eclipse.emf.cdo.tests.model6.E.class, "E", !IS_ABSTRACT, !IS_INTERFACE,
IS_GENERATED_INSTANCE_CLASS);
initEReference(getE_OwnedAs(), this.getA(), null, "ownedAs", null, 0, -1, org.eclipse.emf.cdo.tests.model6.E.class,
- !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
!IS_DERIVED, IS_ORDERED);
initEClass(fEClass, org.eclipse.emf.cdo.tests.model6.F.class, "F", !IS_ABSTRACT, !IS_INTERFACE,
IS_GENERATED_INSTANCE_CLASS);
initEReference(getF_OwnedEs(), this.getE(), null, "ownedEs", null, 0, -1, org.eclipse.emf.cdo.tests.model6.F.class,
- !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
!IS_DERIVED, IS_ORDERED);
// Create resource
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/ReferenceObjectImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/ReferenceObjectImpl.java index 6516b82ffb..132c220d4b 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/ReferenceObjectImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/ReferenceObjectImpl.java @@ -35,7 +35,6 @@ public class ReferenceObjectImpl extends BaseObjectImpl implements ReferenceObje {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
protected ReferenceObjectImpl()
@@ -45,7 +44,6 @@ public class ReferenceObjectImpl extends BaseObjectImpl implements ReferenceObje /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -56,7 +54,6 @@ public class ReferenceObjectImpl extends BaseObjectImpl implements ReferenceObje /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public BaseObject getReferenceOptional()
@@ -66,7 +63,6 @@ public class ReferenceObjectImpl extends BaseObjectImpl implements ReferenceObje /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public void setReferenceOptional(BaseObject newReferenceOptional)
@@ -76,7 +72,6 @@ public class ReferenceObjectImpl extends BaseObjectImpl implements ReferenceObje /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@SuppressWarnings("unchecked")
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/RootImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/RootImpl.java index 426fecb7b9..6ca0141f99 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/RootImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/RootImpl.java @@ -24,20 +24,19 @@ import org.eclipse.emf.ecore.EClass; * <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.model6.impl.RootImpl#getListA <em>List A</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.model6.impl.RootImpl#getListB <em>List B</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.model6.impl.RootImpl#getListC <em>List C</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.model6.impl.RootImpl#getListD <em>List D</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model6.impl.RootImpl#getListA <em>List A</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model6.impl.RootImpl#getListB <em>List B</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model6.impl.RootImpl#getListC <em>List C</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model6.impl.RootImpl#getListD <em>List D</em>}</li>
* </ul>
* </p>
- *
+ *
* @generated
*/
public class RootImpl extends CDOObjectImpl implements Root
{
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
protected RootImpl()
@@ -47,7 +46,6 @@ public class RootImpl extends CDOObjectImpl implements Root /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -58,7 +56,6 @@ public class RootImpl extends CDOObjectImpl implements Root /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -69,7 +66,6 @@ public class RootImpl extends CDOObjectImpl implements Root /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@SuppressWarnings("unchecked")
@@ -80,7 +76,6 @@ public class RootImpl extends CDOObjectImpl implements Root /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@SuppressWarnings("unchecked")
@@ -91,7 +86,6 @@ public class RootImpl extends CDOObjectImpl implements Root /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@SuppressWarnings("unchecked")
@@ -102,7 +96,6 @@ public class RootImpl extends CDOObjectImpl implements Root /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@SuppressWarnings("unchecked")
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/util/Model6AdapterFactory.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/util/Model6AdapterFactory.java index 4250f432ae..be600f3ffa 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/util/Model6AdapterFactory.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/util/Model6AdapterFactory.java @@ -30,22 +30,21 @@ import org.eclipse.emf.ecore.EObject; /**
* <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter <code>createXXX</code>
* method for each class of the model. <!-- end-user-doc -->
- *
* @see org.eclipse.emf.cdo.tests.model6.Model6Package
* @generated
*/
public class Model6AdapterFactory extends AdapterFactoryImpl
{
/**
- * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The cached model package.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
protected static Model6Package modelPackage;
/**
- * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Creates an instance of the adapter factory.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
public Model6AdapterFactory()
@@ -57,10 +56,10 @@ public class Model6AdapterFactory extends AdapterFactoryImpl }
/**
- * Returns whether this factory is applicable for the type of the object. <!-- begin-user-doc --> This implementation
+ * Returns whether this factory is applicable for the type of the object.
+ * <!-- begin-user-doc --> This implementation
* returns <code>true</code> if the object is either the model's package or is an instance object of the model. <!--
* end-user-doc -->
- *
* @return whether this factory is applicable for the type of the object.
* @generated
*/
@@ -79,8 +78,8 @@ public class Model6AdapterFactory extends AdapterFactoryImpl }
/**
- * The switch that delegates to the <code>createXXX</code> methods. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The switch that delegates to the <code>createXXX</code> methods.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
protected Model6Switch<Adapter> modelSwitch = new Model6Switch<Adapter>()
@@ -153,10 +152,9 @@ public class Model6AdapterFactory extends AdapterFactoryImpl };
/**
- * Creates an adapter for the <code>target</code>. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @param target
- * the object to adapt.
+ * Creates an adapter for the <code>target</code>.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * @param target the object to adapt.
* @return the adapter for the <code>target</code>.
* @generated
*/
@@ -181,10 +179,9 @@ public class Model6AdapterFactory extends AdapterFactoryImpl }
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model6.BaseObject
- * <em>Base Object</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model6.BaseObject <em>Base Object</em>}'.
+ * <!-- begin-user-doc --> This default implementation returns null so that we can easily
* ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
- *
* @return the new adapter.
* @see org.eclipse.emf.cdo.tests.model6.BaseObject
* @generated
@@ -195,10 +192,9 @@ public class Model6AdapterFactory extends AdapterFactoryImpl }
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model6.ReferenceObject
- * <em>Reference Object</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model6.ReferenceObject <em>Reference Object</em>}'.
+ * <!-- begin-user-doc --> This default implementation returns null so that we can easily
* ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
- *
* @return the new adapter.
* @see org.eclipse.emf.cdo.tests.model6.ReferenceObject
* @generated
@@ -209,11 +205,10 @@ public class Model6AdapterFactory extends AdapterFactoryImpl }
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model6.ContainmentObject
- * <em>Containment Object</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model6.ContainmentObject <em>Containment Object</em>}'.
+ * <!-- begin-user-doc --> This default implementation returns null so that we can
* easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
* end-user-doc -->
- *
* @return the new adapter.
* @see org.eclipse.emf.cdo.tests.model6.ContainmentObject
* @generated
@@ -308,9 +303,9 @@ public class Model6AdapterFactory extends AdapterFactoryImpl }
/**
- * Creates a new adapter for the default case. <!-- begin-user-doc --> This default implementation returns null. <!--
+ * Creates a new adapter for the default case.
+ * <!-- begin-user-doc --> This default implementation returns null. <!--
* end-user-doc -->
- *
* @return the new adapter.
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/util/Model6Switch.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/util/Model6Switch.java index 215cc89bf2..8295505494 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/util/Model6Switch.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/util/Model6Switch.java @@ -32,22 +32,21 @@ import java.util.List; * {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
* starting with the actual class of the object and proceeding up the inheritance hierarchy until a non-null result is
* returned, which is the result of the switch. <!-- end-user-doc -->
- *
* @see org.eclipse.emf.cdo.tests.model6.Model6Package
* @generated
*/
public class Model6Switch<T>
{
/**
- * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The cached model package
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
protected static Model6Package modelPackage;
/**
- * Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Creates an instance of the switch.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
public Model6Switch()
@@ -61,7 +60,6 @@ public class Model6Switch<T> /**
* Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @return the first non-null result returned by a <code>caseXXX</code> call.
* @generated
*/
@@ -73,7 +71,6 @@ public class Model6Switch<T> /**
* Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @return the first non-null result returned by a <code>caseXXX</code> call.
* @generated
*/
@@ -93,7 +90,6 @@ public class Model6Switch<T> /**
* Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @return the first non-null result returned by a <code>caseXXX</code> call.
* @generated
*/
@@ -191,11 +187,10 @@ public class Model6Switch<T> }
/**
- * Returns the result of interpreting the object as an instance of '<em>Root</em>'. <!-- begin-user-doc --> This
+ * Returns the result of interpreting the object as an instance of '<em>Root</em>'.
+ * <!-- begin-user-doc --> This
* implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
- *
- * @param object
- * the target of the switch.
+ * @param object the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Root</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -206,11 +201,10 @@ public class Model6Switch<T> }
/**
- * Returns the result of interpreting the object as an instance of '<em>Base Object</em>'. <!-- begin-user-doc -->
+ * Returns the result of interpreting the object as an instance of '<em>Base Object</em>'.
+ * <!-- begin-user-doc -->
* This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
- *
- * @param object
- * the target of the switch.
+ * @param object the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Base Object</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -221,11 +215,10 @@ public class Model6Switch<T> }
/**
- * Returns the result of interpreting the object as an instance of '<em>Reference Object</em>'. <!-- begin-user-doc
+ * Returns the result of interpreting the object as an instance of '<em>Reference Object</em>'.
+ * <!-- begin-user-doc
* --> This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
- *
- * @param object
- * the target of the switch.
+ * @param object the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Reference Object</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -236,11 +229,10 @@ public class Model6Switch<T> }
/**
- * Returns the result of interpreting the object as an instance of '<em>Containment Object</em>'. <!-- begin-user-doc
+ * Returns the result of interpreting the object as an instance of '<em>Containment Object</em>'.
+ * <!-- begin-user-doc
* --> This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
- *
- * @param object
- * the target of the switch.
+ * @param object the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Containment Object</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -251,11 +243,10 @@ public class Model6Switch<T> }
/**
- * Returns the result of interpreting the object as an instance of '<em>A</em>'. <!-- begin-user-doc --> This
+ * Returns the result of interpreting the object as an instance of '<em>A</em>'.
+ * <!-- begin-user-doc --> This
* implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
- *
- * @param object
- * the target of the switch.
+ * @param object the target of the switch.
* @return the result of interpreting the object as an instance of '<em>A</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -266,11 +257,10 @@ public class Model6Switch<T> }
/**
- * Returns the result of interpreting the object as an instance of '<em>B</em>'. <!-- begin-user-doc --> This
+ * Returns the result of interpreting the object as an instance of '<em>B</em>'.
+ * <!-- begin-user-doc --> This
* implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
- *
- * @param object
- * the target of the switch.
+ * @param object the target of the switch.
* @return the result of interpreting the object as an instance of '<em>B</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -281,11 +271,10 @@ public class Model6Switch<T> }
/**
- * Returns the result of interpreting the object as an instance of '<em>C</em>'. <!-- begin-user-doc --> This
+ * Returns the result of interpreting the object as an instance of '<em>C</em>'.
+ * <!-- begin-user-doc --> This
* implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
- *
- * @param object
- * the target of the switch.
+ * @param object the target of the switch.
* @return the result of interpreting the object as an instance of '<em>C</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -296,11 +285,10 @@ public class Model6Switch<T> }
/**
- * Returns the result of interpreting the object as an instance of '<em>D</em>'. <!-- begin-user-doc --> This
+ * Returns the result of interpreting the object as an instance of '<em>D</em>'.
+ * <!-- begin-user-doc --> This
* implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
- *
- * @param object
- * the target of the switch.
+ * @param object the target of the switch.
* @return the result of interpreting the object as an instance of '<em>D</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -311,11 +299,10 @@ public class Model6Switch<T> }
/**
- * Returns the result of interpreting the object as an instance of '<em>E</em>'. <!-- begin-user-doc --> This
+ * Returns the result of interpreting the object as an instance of '<em>E</em>'.
+ * <!-- begin-user-doc --> This
* implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
- *
- * @param object
- * the target of the switch.
+ * @param object the target of the switch.
* @return the result of interpreting the object as an instance of '<em>E</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -326,11 +313,10 @@ public class Model6Switch<T> }
/**
- * Returns the result of interpreting the object as an instance of '<em>F</em>'. <!-- begin-user-doc --> This
+ * Returns the result of interpreting the object as an instance of '<em>F</em>'.
+ * <!-- begin-user-doc --> This
* implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
- *
- * @param object
- * the target of the switch.
+ * @param object the target of the switch.
* @return the result of interpreting the object as an instance of '<em>F</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -341,12 +327,11 @@ public class Model6Switch<T> }
/**
- * Returns the result of interpreting the object as an instance of '<em>EObject</em>'. <!-- begin-user-doc --> This
+ * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+ * <!-- begin-user-doc --> This
* implementation returns null; returning a non-null result will terminate the switch, but this is the last case
* anyway. <!-- end-user-doc -->
- *
- * @param object
- * the target of the switch.
+ * @param object the target of the switch.
* @return the result of interpreting the object as an instance of '<em>EObject</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject)
* @generated
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_374418_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_374418_Test.java new file mode 100644 index 0000000000..33c11fc9df --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_374418_Test.java @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2004 - 2012 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: + * Esteban Dugueperoux - initial API and implementation + */ +package org.eclipse.emf.cdo.tests.bugzilla; + +import org.eclipse.emf.cdo.eresource.CDOResource; +import org.eclipse.emf.cdo.session.CDOSession; +import org.eclipse.emf.cdo.tests.AbstractCDOTest; +import org.eclipse.emf.cdo.tests.model6.BaseObject; +import org.eclipse.emf.cdo.tests.model6.Root; +import org.eclipse.emf.cdo.transaction.CDOTransaction; + +/** + * @author Esteban Dugueperoux + */ +public class Bugzilla_374418_Test extends AbstractCDOTest +{ + public void testControlUncontrol() throws Throwable + { + Root root = getModel6Factory().createRoot(); + BaseObject childRoot = getModel6Factory().createBaseObject(); + root.getListA().add(childRoot); + + CDOSession session = openSession(); + CDOTransaction transaction = session.openTransaction(); + CDOResource mainResource = transaction.createResource(getResourcePath("/mainResource.model1")); + mainResource.getContents().add(root); + transaction.commit(); + + // Control childRoot to a new resource + CDOResource fragmentResource = transaction.createResource(getResourcePath("/fragmentResource.model1")); + fragmentResource.getContents().add(childRoot); + transaction.commit(); + + // Uncontrol category1 to its original resource + fragmentResource.getContents().remove(childRoot); + transaction.setSavepoint(); // <---- Problem here!!! + transaction.commit(); + + // Control again childRoot to the new resource + fragmentResource.getContents().add(childRoot); + transaction.commit(); + + System.out.println(); + } +} diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOSavepointImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOSavepointImpl.java index 6db6dcd2b7..c1c99057d6 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOSavepointImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOSavepointImpl.java @@ -307,7 +307,7 @@ public class CDOSavepointImpl extends CDOUserSavepointImpl implements InternalCD return Collections.unmodifiableMap(getRevisionDeltas()); } - // We need to combined the result for all delta in different Savepoint + // We need to combine the result for all deltas in different savepoints Map<CDOID, CDORevisionDelta> allRevisionDeltas = new HashMap<CDOID, CDORevisionDelta>(); for (InternalCDOSavepoint savepoint = getFirstSavePoint(); savepoint != null; savepoint = savepoint .getNextSavepoint()) @@ -332,9 +332,13 @@ public class CDOSavepointImpl extends CDOUserSavepointImpl implements InternalCD } } + Set<CDOID> reattachedObjects = savepoint.getReattachedObjects().keySet(); for (CDOID detachedID : savepoint.getDetachedObjects().keySet()) { - allRevisionDeltas.remove(detachedID); + if (!reattachedObjects.contains(detachedID)) + { + allRevisionDeltas.remove(detachedID); + } } } |