Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2013-01-07 09:03:51 +0000
committerEike Stepper2013-01-07 09:03:51 +0000
commit48791c63b845135e716ef9cbb35285b3874f49eb (patch)
treeac1e8bd45182dd108a6edcb00faec3f4f0a53ce1
parent442d924c572a8c6a9818467af7654cf54bbd2299 (diff)
downloadcdo-48791c63b845135e716ef9cbb35285b3874f49eb.tar.gz
cdo-48791c63b845135e716ef9cbb35285b3874f49eb.tar.xz
cdo-48791c63b845135e716ef9cbb35285b3874f49eb.zip
ant
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.mango/model/mango.ecore6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.mango/model/mango.genmodel12
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.mango/model/mango.legacy.genmodel2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoParameter.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoValue.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoValueList.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/ParameterPassing.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoFactoryImpl.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/impl/MangoFactoryImpl.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/util/MangoAdapterFactory.java3
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/util/MangoSwitch.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/util/MangoSwitch.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/model/model1.genmodel11
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Address.java15
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Category.java15
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Company.java19
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Customer.java13
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Order.java11
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/OrderAddress.java11
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/OrderDetail.java15
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Product1.java19
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/PurchaseOrder.java13
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/SalesOrder.java13
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Supplier.java11
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/VAT.java9
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1FactoryImpl.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/Model1FactoryImpl.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/Model1PackageImpl.java102
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/util/Model1AdapterFactory.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/util/Model1Switch.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/util/Model1Switch.java40
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model2/model/model2.ecore7
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model2/model/model2.genmodel12
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model2/model/model2.legacy.genmodel2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/EnumListHolder.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/MapHolder.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/NotUnsettable.java24
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/NotUnsettableWithDefault.java24
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/PersistentContainment.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/SpecialPurchaseOrder.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/Task.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/TaskContainer.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/TransientContainer.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/Unsettable1.java24
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/Unsettable2WithDefault.java16
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/Model2FactoryImpl.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/Model2FactoryImpl.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/util/Model2AdapterFactory.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/util/Model2Switch.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/util/Model2AdapterFactory.java16
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/util/Model2Switch.java22
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Class1.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/ClassWithIDAttribute.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/ClassWithJavaClassAttribute.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/ClassWithJavaObjectAttribute.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/File.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Image.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/MetaRef.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/NodeA.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/NodeB.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/NodeC.java12
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/NodeD.java12
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Polygon.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/PolygonWithDuplicates.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/util/Model3AdapterFactory.java1
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/util/Model3Switch.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/Class2.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/legacy/util/SubpackageAdapterFactory.java1
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/legacy/util/SubpackageSwitch.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4/model/model4.ecore33
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4/model/model4.genmodel14
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4/model/model4.legacy.genmodel4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ContainedElementNoOpposite.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefMapNonContained.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefMultiContained.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefMultiNUNonContained.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefMultiNonContained.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefSingleContained.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefSingleNonContained.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplContainedElementNPL.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefContainedElement.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefContainer.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefContainerNPL.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefNonContainedElement.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefNonContainer.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefNonContainerNPL.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefContainedElement.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefContainer.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefContainerNPL.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefNonContainedElement.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefNonContainer.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefNonContainerNPL.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/MultiContainedElement.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/MultiNonContainedElement.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/MultiNonContainedUnsettableElement.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiContained.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiContainedNPL.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiNonContained.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiNonContainedNPL.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiNonContainedUnsettable.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefSingleContained.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefSingleContainedNPL.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefSingleNonContained.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefSingleNonContainedNPL.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/SingleContainedElement.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/SingleNonContainedElement.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/util/model4AdapterFactory.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/util/model4Switch.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/util/model4Switch.java98
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4/text/description.txt103
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4interfaces/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.genmodel56
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.legacy.genmodel56
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/model4interfaces.ecore (renamed from plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.ecore)7
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/model4interfaces.genmodel54
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/model4interfaces.legacy.genmodel56
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IContainedElementNoParentLink.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefContainedElement.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefContainer.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefContainerNPL.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefNonContainedElement.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefNonContainer.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefNonContainerNPL.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/INamedElement.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefContainedElement.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefContainer.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefContainerNPL.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefNonContainedElement.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefNonContainer.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefNonContainerNPL.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/legacy/util/model4interfacesAdapterFactory.java3
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/legacy/util/model4interfacesSwitch.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/util/model4interfacesSwitch.java28
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model5/model/model5.genmodel2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Child.java15
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Doctor.java9
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfBoolean.java9
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfChar.java9
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfDate.java9
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfDouble.java9
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfFloat.java9
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfInt.java11
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfIntArray.java11
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfInteger.java9
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfLong.java9
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfShort.java9
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfString.java9
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Manager.java9
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Parent.java15
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/TestFeatureMap.java13
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/util/Model5AdapterFactory.java3
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/util/Model5Switch.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/util/Model5Switch.java32
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model6/model/model6.genmodel2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/A.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/B.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/BaseObject.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/C.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/ContainmentObject.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/D.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/E.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/F.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/G.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/HasNillableAttribute.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Holdable.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Holder.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/MyEnum.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/MyEnumList.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/MyEnumListUnsettable.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/PropertiesMap.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/PropertiesMapEntryValue.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/ReferenceObject.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Root.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Thing.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/UnorderedList.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/util/Model6AdapterFactory.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/util/Model6Switch.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/generateTestModels.launch16
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/generateTestModels.xml40
179 files changed, 651 insertions, 1085 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/model/mango.ecore b/plugins/org.eclipse.emf.cdo.tests.mango/model/mango.ecore
index aa4ca9f3db..bfb8a0c26c 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/model/mango.ecore
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/model/mango.ecore
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="mango"
- nsURI="http://www.eclipse.org/emf/CDO/tests/mango" nsPrefix="mango">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="mango" nsURI="http://www.eclipse.org/emf/CDO/tests/mango" nsPrefix="mango">
<eClassifiers xsi:type="ecore:EClass" name="MangoValueList">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="values" upperBound="-1"
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/model/mango.genmodel b/plugins/org.eclipse.emf.cdo.tests.mango/model/mango.genmodel
index b0c971b1b5..ddba803b07 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/model/mango.genmodel
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/model/mango.genmodel
@@ -1,11 +1,9 @@
<?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"
- xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel"
- modelDirectory="/org.eclipse.emf.cdo.tests.mango/src" editDirectory="" editorDirectory=""
- modelPluginID="org.eclipse.emf.cdo.tests.mango" modelName="Mango" modelPluginClass=""
- updateClasspath="false" rootExtendsClass="org.eclipse.emf.internal.cdo.CDOObjectImpl"
- reflectiveDelegation="true" codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.cdo"
+<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" modelDirectory="/org.eclipse.emf.cdo.tests.mango/src" editDirectory=""
+ editorDirectory="" modelPluginID="org.eclipse.emf.cdo.tests.mango" modelName="Mango"
+ modelPluginClass="" updateClasspath="false" rootExtendsClass="org.eclipse.emf.internal.cdo.CDOObjectImpl"
+ reflectiveDelegation="true" codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.ecore"
featureDelegation="Reflective" complianceLevel="5.0" copyrightFields="false" providerRootExtendsClass="org.eclipse.emf.cdo.edit.CDOItemProviderAdapter"
runtimeVersion="2.6">
<foreignModel>mango.ecore</foreignModel>
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/model/mango.legacy.genmodel b/plugins/org.eclipse.emf.cdo.tests.mango/model/mango.legacy.genmodel
index 985705eb1d..8e629cbc00 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/model/mango.legacy.genmodel
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/model/mango.legacy.genmodel
@@ -3,7 +3,7 @@
xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA; Eike Stepper - initial API and implementation"
modelDirectory="/org.eclipse.emf.cdo.tests.mango/src" editDirectory="" editorDirectory=""
modelPluginID="org.eclipse.emf.cdo.tests.mango" modelName="Mango" modelPluginClass=""
- updateClasspath="false" codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.cdo"
+ updateClasspath="false" codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.ecore"
complianceLevel="5.0" copyrightFields="false" providerRootExtendsClass="" runtimeVersion="2.6">
<foreignModel>mango.ecore</foreignModel>
<modelPluginVariables>CDO=org.eclipse.emf.cdo</modelPluginVariables>
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoParameter.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoParameter.java
index a50d1c1896..06d3a661ed 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoParameter.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoParameter.java
@@ -23,7 +23,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.mango.legacy.MangoPackage#getMangoParameter()
+ * @see org.eclipse.emf.cdo.tests.mango.MangoPackage#getMangoParameter()
* @model
* @generated
*/
@@ -38,7 +38,7 @@ public interface MangoParameter extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Name</em>' attribute.
* @see #setName(String)
- * @see org.eclipse.emf.cdo.tests.mango.legacy.MangoPackage#getMangoParameter_Name()
+ * @see org.eclipse.emf.cdo.tests.mango.MangoPackage#getMangoParameter_Name()
* @model
* @generated
*/
@@ -65,7 +65,7 @@ public interface MangoParameter extends EObject
* @return the value of the '<em>Passing</em>' attribute.
* @see org.eclipse.emf.cdo.tests.mango.ParameterPassing
* @see #setPassing(ParameterPassing)
- * @see org.eclipse.emf.cdo.tests.mango.legacy.MangoPackage#getMangoParameter_Passing()
+ * @see org.eclipse.emf.cdo.tests.mango.MangoPackage#getMangoParameter_Passing()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoValue.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoValue.java
index 9fe321a610..c72ebb9925 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoValue.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoValue.java
@@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.mango.legacy.MangoPackage#getMangoValue()
+ * @see org.eclipse.emf.cdo.tests.mango.MangoPackage#getMangoValue()
* @model
* @generated
*/
@@ -37,7 +37,7 @@ public interface MangoValue extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Name</em>' attribute.
* @see #setName(String)
- * @see org.eclipse.emf.cdo.tests.mango.legacy.MangoPackage#getMangoValue_Name()
+ * @see org.eclipse.emf.cdo.tests.mango.MangoPackage#getMangoValue_Name()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoValueList.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoValueList.java
index d50cdfd669..af9213c687 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoValueList.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoValueList.java
@@ -24,7 +24,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.mango.legacy.MangoPackage#getMangoValueList()
+ * @see org.eclipse.emf.cdo.tests.mango.MangoPackage#getMangoValueList()
* @model
* @generated
*/
@@ -39,7 +39,7 @@ public interface MangoValueList extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Name</em>' attribute.
* @see #setName(String)
- * @see org.eclipse.emf.cdo.tests.mango.legacy.MangoPackage#getMangoValueList_Name()
+ * @see org.eclipse.emf.cdo.tests.mango.MangoPackage#getMangoValueList_Name()
* @model
* @generated
*/
@@ -64,7 +64,7 @@ public interface MangoValueList extends EObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Values</em>' reference list.
- * @see org.eclipse.emf.cdo.tests.mango.legacy.MangoPackage#getMangoValueList_Values()
+ * @see org.eclipse.emf.cdo.tests.mango.MangoPackage#getMangoValueList_Values()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/ParameterPassing.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/ParameterPassing.java
index a7ef203bc7..ee9b4b2421 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/ParameterPassing.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/ParameterPassing.java
@@ -19,7 +19,7 @@ import java.util.List;
/**
* <!-- begin-user-doc --> A representation of the literals of the enumeration '<em><b>Parameter Passing</b></em>', and
* utility methods for working with them. <!-- end-user-doc -->
- * @see org.eclipse.emf.cdo.tests.mango.legacy.MangoPackage#getParameterPassing()
+ * @see org.eclipse.emf.cdo.tests.mango.MangoPackage#getParameterPassing()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoFactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoFactoryImpl.java
index 2d8de16a9a..cca8ca233e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoFactoryImpl.java
@@ -154,10 +154,8 @@ public class MangoFactoryImpl extends EFactoryImpl implements MangoFactory
{
ParameterPassing result = ParameterPassing.get(initialValue);
if (result == null)
- {
throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '"
+ eDataType.getName() + "'");
- }
return result;
}
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/impl/MangoFactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/impl/MangoFactoryImpl.java
index b7b3340c1b..fe44f8007f 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/impl/MangoFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/impl/MangoFactoryImpl.java
@@ -163,10 +163,8 @@ public class MangoFactoryImpl extends EFactoryImpl implements MangoFactory
{
ParameterPassing result = ParameterPassing.get(initialValue);
if (result == null)
- {
throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '"
+ eDataType.getName() + "'");
- }
return result;
}
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/util/MangoAdapterFactory.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/util/MangoAdapterFactory.java
index ff86abc72b..7008a78859 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/util/MangoAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/util/MangoAdapterFactory.java
@@ -4,12 +4,13 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.tests.mango.legacy.util;
+//import org.eclipse.emf.cdo.tests.mango.*;
import org.eclipse.emf.cdo.tests.mango.MangoParameter;
import org.eclipse.emf.cdo.tests.mango.MangoValue;
import org.eclipse.emf.cdo.tests.mango.MangoValueList;
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/util/MangoSwitch.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/util/MangoSwitch.java
index ed52477721..c442cfba03 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/util/MangoSwitch.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/util/MangoSwitch.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
*/
@@ -20,6 +20,8 @@ import org.eclipse.emf.ecore.EObject;
import java.util.List;
+//import org.eclipse.emf.cdo.tests.mango.*;
+
/**
* <!-- begin-user-doc -->
* The <b>Switch</b> for the model's inheritance hierarchy.
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/util/MangoSwitch.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/util/MangoSwitch.java
index 003b46aafe..95ec0067e9 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/util/MangoSwitch.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/util/MangoSwitch.java
@@ -97,9 +97,7 @@ public class MangoSwitch<T>
MangoValueList mangoValueList = (MangoValueList)theEObject;
T result = caseMangoValueList(mangoValueList);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case MangoPackage.MANGO_VALUE:
@@ -107,9 +105,7 @@ public class MangoSwitch<T>
MangoValue mangoValue = (MangoValue)theEObject;
T result = caseMangoValue(mangoValue);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case MangoPackage.MANGO_PARAMETER:
@@ -117,9 +113,7 @@ public class MangoSwitch<T>
MangoParameter mangoParameter = (MangoParameter)theEObject;
T result = caseMangoParameter(mangoParameter);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
default:
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/model/model1.genmodel b/plugins/org.eclipse.emf.cdo.tests.model1/model/model1.genmodel
index 336f640951..535f8fe82b 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/model/model1.genmodel
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/model/model1.genmodel
@@ -1,10 +1,8 @@
<?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"
- xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel"
- modelDirectory="/org.eclipse.emf.cdo.tests.model1/src" creationIcons="false" editDirectory=""
- editorDirectory="" modelPluginID="org.eclipse.emf.cdo.tests.model1" modelName="Model1"
- updateClasspath="false" rootExtendsClass="org.eclipse.emf.internal.cdo.CDOObjectImpl"
+<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" modelDirectory="/org.eclipse.emf.cdo.tests.model1/src" creationIcons="false"
+ editDirectory="" editorDirectory="" modelPluginID="org.eclipse.emf.cdo.tests.model1"
+ modelName="Model1" updateClasspath="false" rootExtendsClass="org.eclipse.emf.internal.cdo.CDOObjectImpl"
reflectiveDelegation="true" codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.ecore"
featureDelegation="Reflective" complianceLevel="5.0" providerRootExtendsClass="org.eclipse.emf.cdo.edit.CDOItemProviderAdapter"
optimizedHasChildren="true" tableProviders="true" colorProviders="true" fontProviders="true">
@@ -63,6 +61,7 @@
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute model1.ecore#//Product1/name"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model1.ecore#//Product1/orderDetails"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute model1.ecore#//Product1/vat"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model1.ecore#//Product1/otherVATs"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute model1.ecore#//Product1/description"/>
</genClasses>
<genClasses ecoreClass="model1.ecore#//OrderAddress">
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Address.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Address.java
index dbb994c481..89ee7cc5df 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Address.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Address.java
@@ -24,20 +24,13 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model1.legacy.Model1Package#getAddress()
+ * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getAddress()
* @model
* @generated
*/
public interface Address extends EObject
{
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String copyright = "Copyright (c) 2004 - 2012 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";
-
- /**
* Returns the value of the '<em><b>Name</b></em>' attribute.
* <!-- begin-user-doc -->
* <p>
@@ -46,7 +39,7 @@ public interface Address extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Name</em>' attribute.
* @see #setName(String)
- * @see org.eclipse.emf.cdo.tests.model1.legacy.Model1Package#getAddress_Name()
+ * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getAddress_Name()
* @model
* @generated
*/
@@ -72,7 +65,7 @@ public interface Address extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Street</em>' attribute.
* @see #setStreet(String)
- * @see org.eclipse.emf.cdo.tests.model1.legacy.Model1Package#getAddress_Street()
+ * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getAddress_Street()
* @model
* @generated
*/
@@ -98,7 +91,7 @@ public interface Address extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>City</em>' attribute.
* @see #setCity(String)
- * @see org.eclipse.emf.cdo.tests.model1.legacy.Model1Package#getAddress_City()
+ * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getAddress_City()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Category.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Category.java
index 731ec0337a..2d2ca0be35 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Category.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Category.java
@@ -25,20 +25,13 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model1.legacy.Model1Package#getCategory()
+ * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCategory()
* @model
* @generated
*/
public interface Category extends EObject
{
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String copyright = "Copyright (c) 2004 - 2012 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";
-
- /**
* Returns the value of the '<em><b>Name</b></em>' attribute.
* <!-- begin-user-doc -->
* <p>
@@ -47,7 +40,7 @@ public interface Category extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Name</em>' attribute.
* @see #setName(String)
- * @see org.eclipse.emf.cdo.tests.model1.legacy.Model1Package#getCategory_Name()
+ * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCategory_Name()
* @model
* @generated
*/
@@ -74,7 +67,7 @@ public interface Category extends EObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Categories</em>' containment reference list.
- * @see org.eclipse.emf.cdo.tests.model1.legacy.Model1Package#getCategory_Categories()
+ * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCategory_Categories()
* @model containment="true"
* @generated
*/
@@ -90,7 +83,7 @@ public interface Category extends EObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Products</em>' containment reference list.
- * @see org.eclipse.emf.cdo.tests.model1.legacy.Model1Package#getCategory_Products()
+ * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCategory_Products()
* @model containment="true"
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Company.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Company.java
index 2347144bf4..98cacda872 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Company.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Company.java
@@ -26,20 +26,13 @@ import org.eclipse.emf.common.util.EList;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model1.legacy.Model1Package#getCompany()
+ * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCompany()
* @model
* @generated
*/
public interface Company extends Address
{
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String copyright = "Copyright (c) 2004 - 2012 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";
-
- /**
* Returns the value of the '<em><b>Categories</b></em>' containment reference list.
* The list contents are of type {@link org.eclipse.emf.cdo.tests.model1.Category}.
* <!-- begin-user-doc -->
@@ -49,7 +42,7 @@ public interface Company extends Address
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Categories</em>' containment reference list.
- * @see org.eclipse.emf.cdo.tests.model1.legacy.Model1Package#getCompany_Categories()
+ * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCompany_Categories()
* @model containment="true"
* @generated
*/
@@ -65,7 +58,7 @@ public interface Company extends Address
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Suppliers</em>' containment reference list.
- * @see org.eclipse.emf.cdo.tests.model1.legacy.Model1Package#getCompany_Suppliers()
+ * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCompany_Suppliers()
* @model containment="true"
* @generated
*/
@@ -81,7 +74,7 @@ public interface Company extends Address
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Purchase Orders</em>' containment reference list.
- * @see org.eclipse.emf.cdo.tests.model1.legacy.Model1Package#getCompany_PurchaseOrders()
+ * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCompany_PurchaseOrders()
* @model containment="true"
* @generated
*/
@@ -97,7 +90,7 @@ public interface Company extends Address
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Customers</em>' containment reference list.
- * @see org.eclipse.emf.cdo.tests.model1.legacy.Model1Package#getCompany_Customers()
+ * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCompany_Customers()
* @model containment="true"
* @generated
*/
@@ -113,7 +106,7 @@ public interface Company extends Address
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Sales Orders</em>' containment reference list.
- * @see org.eclipse.emf.cdo.tests.model1.legacy.Model1Package#getCompany_SalesOrders()
+ * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCompany_SalesOrders()
* @model containment="true"
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Customer.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Customer.java
index e9434fbd88..3e44bd0e52 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Customer.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Customer.java
@@ -24,20 +24,13 @@ import org.eclipse.emf.common.util.EMap;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model1.legacy.Model1Package#getCustomer()
+ * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCustomer()
* @model
* @generated
*/
public interface Customer extends Address
{
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String copyright = "Copyright (c) 2004 - 2012 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";
-
- /**
* Returns the value of the '<em><b>Sales Orders</b></em>' reference list.
* The list contents are of type {@link org.eclipse.emf.cdo.tests.model1.SalesOrder}.
* It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model1.SalesOrder#getCustomer <em>Customer</em>}'.
@@ -48,7 +41,7 @@ public interface Customer extends Address
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Sales Orders</em>' reference list.
- * @see org.eclipse.emf.cdo.tests.model1.legacy.Model1Package#getCustomer_SalesOrders()
+ * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCustomer_SalesOrders()
* @see org.eclipse.emf.cdo.tests.model1.SalesOrder#getCustomer
* @model opposite="customer"
* @generated
@@ -66,7 +59,7 @@ public interface Customer extends Address
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Order By Product</em>' map.
- * @see org.eclipse.emf.cdo.tests.model1.legacy.Model1Package#getCustomer_OrderByProduct()
+ * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCustomer_OrderByProduct()
* @model mapType="org.eclipse.emf.cdo.tests.model1.ProductToOrder<org.eclipse.emf.cdo.tests.model1.Product1, org.eclipse.emf.cdo.tests.model1.SalesOrder>"
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Order.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Order.java
index 72322d48cc..00119b1b39 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Order.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Order.java
@@ -23,7 +23,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model1.legacy.Model1Package#getOrder()
+ * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getOrder()
* @model abstract="true"
* annotation="teneo.jpa value='@Entity(name=\"BaseOrder\")'"
* @generated
@@ -31,13 +31,6 @@ import org.eclipse.emf.ecore.EObject;
public interface Order extends EObject
{
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String copyright = "Copyright (c) 2004 - 2012 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";
-
- /**
* Returns the value of the '<em><b>Order Details</b></em>' containment reference list.
* The list contents are of type {@link org.eclipse.emf.cdo.tests.model1.OrderDetail}.
* It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getOrder <em>Order</em>}'.
@@ -48,7 +41,7 @@ public interface Order extends EObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Order Details</em>' containment reference list.
- * @see org.eclipse.emf.cdo.tests.model1.legacy.Model1Package#getOrder_OrderDetails()
+ * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getOrder_OrderDetails()
* @see org.eclipse.emf.cdo.tests.model1.OrderDetail#getOrder
* @model opposite="order" containment="true"
* @generated
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/OrderAddress.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/OrderAddress.java
index d4a0621bb6..6014fe7510 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/OrderAddress.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/OrderAddress.java
@@ -20,20 +20,13 @@ package org.eclipse.emf.cdo.tests.model1;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model1.legacy.Model1Package#getOrderAddress()
+ * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getOrderAddress()
* @model annotation="teneo.jpa value='@AssociationOverride(name=\"orderDetails\", joinColumns=@JoinColumn(name=\"orderdetails_orderaddressid\"))'"
* @generated
*/
public interface OrderAddress extends Address, Order, OrderDetail
{
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String copyright = "Copyright (c) 2004 - 2012 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";
-
- /**
* Returns the value of the '<em><b>Test Attribute</b></em>' attribute.
* <!-- begin-user-doc -->
* <p>
@@ -43,7 +36,7 @@ public interface OrderAddress extends Address, Order, OrderDetail
* <!-- end-user-doc -->
* @return the value of the '<em>Test Attribute</em>' attribute.
* @see #setTestAttribute(boolean)
- * @see org.eclipse.emf.cdo.tests.model1.legacy.Model1Package#getOrderAddress_TestAttribute()
+ * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getOrderAddress_TestAttribute()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/OrderDetail.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/OrderDetail.java
index e5958a9302..7665f4e09d 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/OrderDetail.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/OrderDetail.java
@@ -24,20 +24,13 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model1.legacy.Model1Package#getOrderDetail()
+ * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getOrderDetail()
* @model
* @generated
*/
public interface OrderDetail extends EObject
{
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String copyright = "Copyright (c) 2004 - 2012 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";
-
- /**
* Returns the value of the '<em><b>Order</b></em>' container reference.
* It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model1.Order#getOrderDetails <em>Order Details</em>}'.
* <!-- begin-user-doc -->
@@ -48,7 +41,7 @@ public interface OrderDetail extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Order</em>' container reference.
* @see #setOrder(Order)
- * @see org.eclipse.emf.cdo.tests.model1.legacy.Model1Package#getOrderDetail_Order()
+ * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getOrderDetail_Order()
* @see org.eclipse.emf.cdo.tests.model1.Order#getOrderDetails
* @model opposite="orderDetails" required="true" transient="false"
* @generated
@@ -75,7 +68,7 @@ public interface OrderDetail extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Product</em>' reference.
* @see #setProduct(Product1)
- * @see org.eclipse.emf.cdo.tests.model1.legacy.Model1Package#getOrderDetail_Product()
+ * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getOrderDetail_Product()
* @see org.eclipse.emf.cdo.tests.model1.Product1#getOrderDetails
* @model opposite="orderDetails"
* @generated
@@ -100,7 +93,7 @@ public interface OrderDetail extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Price</em>' attribute.
* @see #setPrice(float)
- * @see org.eclipse.emf.cdo.tests.model1.legacy.Model1Package#getOrderDetail_Price()
+ * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getOrderDetail_Price()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Product1.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Product1.java
index cfe8204bef..10727e4517 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Product1.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Product1.java
@@ -27,20 +27,13 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model1.legacy.Model1Package#getProduct1()
+ * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getProduct1()
* @model
* @generated
*/
public interface Product1 extends EObject
{
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String copyright = "Copyright (c) 2004 - 2012 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";
-
- /**
* Returns the value of the '<em><b>Name</b></em>' attribute.
* <!-- begin-user-doc -->
* <p>
@@ -49,7 +42,7 @@ public interface Product1 extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Name</em>' attribute.
* @see #setName(String)
- * @see org.eclipse.emf.cdo.tests.model1.legacy.Model1Package#getProduct1_Name()
+ * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getProduct1_Name()
* @model annotation="teneo.jpa value='@Id'"
* @generated
*/
@@ -77,7 +70,7 @@ public interface Product1 extends EObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Order Details</em>' reference list.
- * @see org.eclipse.emf.cdo.tests.model1.legacy.Model1Package#getProduct1_OrderDetails()
+ * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getProduct1_OrderDetails()
* @see org.eclipse.emf.cdo.tests.model1.OrderDetail#getProduct
* @model opposite="product"
* @generated
@@ -96,7 +89,7 @@ public interface Product1 extends EObject
* @return the value of the '<em>Vat</em>' attribute.
* @see org.eclipse.emf.cdo.tests.model1.VAT
* @see #setVat(VAT)
- * @see org.eclipse.emf.cdo.tests.model1.legacy.Model1Package#getProduct1_Vat()
+ * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getProduct1_Vat()
* @model default="vat15"
* @generated
*/
@@ -126,7 +119,7 @@ public interface Product1 extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Other VA Ts</em>' attribute list.
* @see org.eclipse.emf.cdo.tests.model1.VAT
- * @see org.eclipse.emf.cdo.tests.model1.legacy.Model1Package#getProduct1_OtherVATs()
+ * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getProduct1_OtherVATs()
* @model default="vat15"
* @generated
*/
@@ -142,7 +135,7 @@ public interface Product1 extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Description</em>' attribute.
* @see #setDescription(String)
- * @see org.eclipse.emf.cdo.tests.model1.legacy.Model1Package#getProduct1_Description()
+ * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getProduct1_Description()
* @model transient="true"
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/PurchaseOrder.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/PurchaseOrder.java
index b257ae6ee4..f8873444a4 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/PurchaseOrder.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/PurchaseOrder.java
@@ -23,20 +23,13 @@ import java.util.Date;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model1.legacy.Model1Package#getPurchaseOrder()
+ * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getPurchaseOrder()
* @model
* @generated
*/
public interface PurchaseOrder extends Order
{
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String copyright = "Copyright (c) 2004 - 2012 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";
-
- /**
* Returns the value of the '<em><b>Date</b></em>' attribute.
* <!-- begin-user-doc -->
* <p>
@@ -45,7 +38,7 @@ public interface PurchaseOrder extends Order
* <!-- end-user-doc -->
* @return the value of the '<em>Date</em>' attribute.
* @see #setDate(Date)
- * @see org.eclipse.emf.cdo.tests.model1.legacy.Model1Package#getPurchaseOrder_Date()
+ * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getPurchaseOrder_Date()
* @model
* @generated
*/
@@ -72,7 +65,7 @@ public interface PurchaseOrder extends Order
* <!-- end-user-doc -->
* @return the value of the '<em>Supplier</em>' reference.
* @see #setSupplier(Supplier)
- * @see org.eclipse.emf.cdo.tests.model1.legacy.Model1Package#getPurchaseOrder_Supplier()
+ * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getPurchaseOrder_Supplier()
* @see org.eclipse.emf.cdo.tests.model1.Supplier#getPurchaseOrders
* @model opposite="purchaseOrders" required="true"
* @generated
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/SalesOrder.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/SalesOrder.java
index e5d2bde11a..c5756231d7 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/SalesOrder.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/SalesOrder.java
@@ -21,20 +21,13 @@ package org.eclipse.emf.cdo.tests.model1;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model1.legacy.Model1Package#getSalesOrder()
+ * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getSalesOrder()
* @model
* @generated
*/
public interface SalesOrder extends Order
{
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String copyright = "Copyright (c) 2004 - 2012 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";
-
- /**
* Returns the value of the '<em><b>Id</b></em>' attribute.
* <!-- begin-user-doc -->
* <p>
@@ -43,7 +36,7 @@ public interface SalesOrder extends Order
* <!-- end-user-doc -->
* @return the value of the '<em>Id</em>' attribute.
* @see #setId(int)
- * @see org.eclipse.emf.cdo.tests.model1.legacy.Model1Package#getSalesOrder_Id()
+ * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getSalesOrder_Id()
* @model
* @generated
*/
@@ -71,7 +64,7 @@ public interface SalesOrder extends Order
* <!-- end-user-doc -->
* @return the value of the '<em>Customer</em>' reference.
* @see #setCustomer(Customer)
- * @see org.eclipse.emf.cdo.tests.model1.legacy.Model1Package#getSalesOrder_Customer()
+ * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getSalesOrder_Customer()
* @see org.eclipse.emf.cdo.tests.model1.Customer#getSalesOrders
* @model opposite="salesOrders" required="true"
* @generated
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Supplier.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Supplier.java
index e7f3553f79..c0de3d4f69 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Supplier.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Supplier.java
@@ -23,20 +23,13 @@ import org.eclipse.emf.common.util.EList;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model1.legacy.Model1Package#getSupplier()
+ * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getSupplier()
* @model
* @generated
*/
public interface Supplier extends Address
{
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String copyright = "Copyright (c) 2004 - 2012 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";
-
- /**
* Returns the value of the '<em><b>Purchase Orders</b></em>' reference list.
* The list contents are of type {@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder}.
* It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getSupplier <em>Supplier</em>}'.
@@ -47,7 +40,7 @@ public interface Supplier extends Address
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Purchase Orders</em>' reference list.
- * @see org.eclipse.emf.cdo.tests.model1.legacy.Model1Package#getSupplier_PurchaseOrders()
+ * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getSupplier_PurchaseOrders()
* @see org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getSupplier
* @model opposite="supplier"
* @generated
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/VAT.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/VAT.java
index 228da50f15..84074b7fd3 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/VAT.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/VAT.java
@@ -19,7 +19,7 @@ import java.util.List;
/**
* <!-- begin-user-doc --> A representation of the literals of the enumeration '<em><b>VAT</b></em>', and utility
* methods for working with them. <!-- end-user-doc -->
- * @see org.eclipse.emf.cdo.tests.model1.legacy.Model1Package#getVAT()
+ * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getVAT()
* @model
* @generated
*/
@@ -53,13 +53,6 @@ public enum VAT implements Enumerator
VAT15(15, "vat15", "vat15");
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String copyright = "Copyright (c) 2004 - 2012 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 '<em><b>Vat0</b></em>' literal value.
* <!-- begin-user-doc -->
* <p>
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1FactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1FactoryImpl.java
index d32ef2c1f4..e1615abb7e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1FactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1FactoryImpl.java
@@ -212,10 +212,8 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory
{
VAT result = VAT.get(initialValue);
if (result == null)
- {
throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '"
+ eDataType.getName() + "'");
- }
return result;
}
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/Model1FactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/Model1FactoryImpl.java
index a4e062c83c..95415342f8 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/Model1FactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/Model1FactoryImpl.java
@@ -266,10 +266,8 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory
{
VAT result = VAT.get(initialValue);
if (result == null)
- {
throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '"
+ eDataType.getName() + "'");
- }
return result;
}
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/Model1PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/Model1PackageImpl.java
index 5524c85cab..c2d39fc7dd 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/Model1PackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/Model1PackageImpl.java
@@ -609,9 +609,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
public void createPackageContents()
{
if (isCreated)
- {
return;
- }
isCreated = true;
// Create classes and their features
@@ -689,9 +687,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
public void initializePackageContents()
{
if (isInitialized)
- {
return;
- }
isInitialized = true;
// Initialize package
@@ -704,14 +700,14 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
// Set bounds for type parameters
// Add supertypes to classes
- companyEClass.getESuperTypes().add(getAddress());
- supplierEClass.getESuperTypes().add(getAddress());
- customerEClass.getESuperTypes().add(getAddress());
- purchaseOrderEClass.getESuperTypes().add(getOrder());
- salesOrderEClass.getESuperTypes().add(getOrder());
- orderAddressEClass.getESuperTypes().add(getAddress());
- orderAddressEClass.getESuperTypes().add(getOrder());
- orderAddressEClass.getESuperTypes().add(getOrderDetail());
+ companyEClass.getESuperTypes().add(this.getAddress());
+ supplierEClass.getESuperTypes().add(this.getAddress());
+ customerEClass.getESuperTypes().add(this.getAddress());
+ purchaseOrderEClass.getESuperTypes().add(this.getOrder());
+ salesOrderEClass.getESuperTypes().add(this.getOrder());
+ orderAddressEClass.getESuperTypes().add(this.getAddress());
+ orderAddressEClass.getESuperTypes().add(this.getOrder());
+ orderAddressEClass.getESuperTypes().add(this.getOrderDetail());
// Initialize classes and features; add operations and parameters
initEClass(addressEClass, Address.class, "Address", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -723,49 +719,49 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(companyEClass, Company.class, "Company", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getCompany_Categories(), getCategory(), null, "categories", null, 0, -1, Company.class,
+ initEReference(getCompany_Categories(), this.getCategory(), null, "categories", null, 0, -1, Company.class,
!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
!IS_DERIVED, IS_ORDERED);
- initEReference(getCompany_Suppliers(), getSupplier(), null, "suppliers", null, 0, -1, Company.class, !IS_TRANSIENT,
- !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
- IS_ORDERED);
- initEReference(getCompany_Customers(), getCustomer(), null, "customers", null, 0, -1, Company.class, !IS_TRANSIENT,
- !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
- IS_ORDERED);
- initEReference(getCompany_PurchaseOrders(), getPurchaseOrder(), null, "purchaseOrders", null, 0, -1, Company.class,
+ initEReference(getCompany_Suppliers(), this.getSupplier(), null, "suppliers", null, 0, -1, Company.class,
!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
!IS_DERIVED, IS_ORDERED);
- initEReference(getCompany_SalesOrders(), getSalesOrder(), null, "salesOrders", null, 0, -1, Company.class,
+ initEReference(getCompany_Customers(), this.getCustomer(), null, "customers", null, 0, -1, Company.class,
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
+ initEReference(getCompany_PurchaseOrders(), this.getPurchaseOrder(), null, "purchaseOrders", null, 0, -1,
+ Company.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+ IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getCompany_SalesOrders(), this.getSalesOrder(), null, "salesOrders", null, 0, -1, Company.class,
!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
!IS_DERIVED, IS_ORDERED);
initEClass(supplierEClass, Supplier.class, "Supplier", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getSupplier_PurchaseOrders(), getPurchaseOrder(), getPurchaseOrder_Supplier(), "purchaseOrders",
- null, 0, -1, Supplier.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
- !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getSupplier_PurchaseOrders(), this.getPurchaseOrder(), this.getPurchaseOrder_Supplier(),
+ "purchaseOrders", null, 0, -1, Supplier.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+ IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getSupplier_Preferred(), ecorePackage.getEBoolean(), "preferred", "true", 0, 1, Supplier.class,
!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(customerEClass, Customer.class, "Customer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getCustomer_SalesOrders(), getSalesOrder(), getSalesOrder_Customer(), "salesOrders", null, 0, -1,
- Customer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
- IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getCustomer_OrderByProduct(), getProductToOrder(), null, "orderByProduct", null, 0, -1,
+ initEReference(getCustomer_SalesOrders(), this.getSalesOrder(), this.getSalesOrder_Customer(), "salesOrders", null,
+ 0, -1, Customer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+ !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getCustomer_OrderByProduct(), this.getProductToOrder(), null, "orderByProduct", null, 0, -1,
Customer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(orderEClass, Order.class, "Order", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getOrder_OrderDetails(), getOrderDetail(), getOrderDetail_Order(), "orderDetails", null, 0, -1,
- Order.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
- IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getOrder_OrderDetails(), this.getOrderDetail(), this.getOrderDetail_Order(), "orderDetails", null,
+ 0, -1, Order.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+ !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(orderDetailEClass, OrderDetail.class, "OrderDetail", !IS_ABSTRACT, !IS_INTERFACE,
IS_GENERATED_INSTANCE_CLASS);
- initEReference(getOrderDetail_Order(), getOrder(), getOrder_OrderDetails(), "order", null, 1, 1, OrderDetail.class,
- !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
- initEReference(getOrderDetail_Product(), getProduct1(), getProduct1_OrderDetails(), "product", null, 0, 1,
- OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+ initEReference(getOrderDetail_Order(), this.getOrder(), this.getOrder_OrderDetails(), "order", null, 1, 1,
+ OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+ !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getOrderDetail_Product(), this.getProduct1(), this.getProduct1_OrderDetails(), "product", null, 0,
+ 1, OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getOrderDetail_Price(), ecorePackage.getEFloat(), "price", null, 0, 1, OrderDetail.class,
!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -774,37 +770,37 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getPurchaseOrder_Date(), ecorePackage.getEDate(), "date", null, 0, 1, PurchaseOrder.class,
!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getPurchaseOrder_Supplier(), getSupplier(), getSupplier_PurchaseOrders(), "supplier", null, 1, 1,
- PurchaseOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+ initEReference(getPurchaseOrder_Supplier(), this.getSupplier(), this.getSupplier_PurchaseOrders(), "supplier",
+ null, 1, 1, PurchaseOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(salesOrderEClass, SalesOrder.class, "SalesOrder", !IS_ABSTRACT, !IS_INTERFACE,
IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getSalesOrder_Id(), ecorePackage.getEInt(), "id", null, 0, 1, SalesOrder.class, !IS_TRANSIENT,
!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getSalesOrder_Customer(), getCustomer(), getCustomer_SalesOrders(), "customer", null, 1, 1,
- SalesOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+ initEReference(getSalesOrder_Customer(), this.getCustomer(), this.getCustomer_SalesOrders(), "customer", null, 1,
+ 1, SalesOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(categoryEClass, Category.class, "Category", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getCategory_Name(), ecorePackage.getEString(), "name", null, 0, 1, Category.class, !IS_TRANSIENT,
!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getCategory_Categories(), getCategory(), null, "categories", null, 0, -1, Category.class,
+ initEReference(getCategory_Categories(), this.getCategory(), null, "categories", null, 0, -1, Category.class,
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
+ initEReference(getCategory_Products(), this.getProduct1(), null, "products", null, 0, -1, Category.class,
!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
!IS_DERIVED, IS_ORDERED);
- initEReference(getCategory_Products(), getProduct1(), null, "products", null, 0, -1, Category.class, !IS_TRANSIENT,
- !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
- IS_ORDERED);
initEClass(product1EClass, Product1.class, "Product1", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getProduct1_Name(), ecorePackage.getEString(), "name", null, 0, 1, Product1.class, !IS_TRANSIENT,
!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getProduct1_OrderDetails(), getOrderDetail(), getOrderDetail_Product(), "orderDetails", null, 0, -1,
- Product1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
- IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getProduct1_Vat(), getVAT(), "vat", "vat15", 0, 1, Product1.class, !IS_TRANSIENT, !IS_VOLATILE,
+ initEReference(getProduct1_OrderDetails(), this.getOrderDetail(), this.getOrderDetail_Product(), "orderDetails",
+ null, 0, -1, Product1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+ !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getProduct1_Vat(), this.getVAT(), "vat", "vat15", 0, 1, Product1.class, !IS_TRANSIENT, !IS_VOLATILE,
IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getProduct1_OtherVATs(), getVAT(), "otherVATs", "vat15", 0, -1, Product1.class, !IS_TRANSIENT,
+ initEAttribute(getProduct1_OtherVATs(), this.getVAT(), "otherVATs", "vat15", 0, -1, Product1.class, !IS_TRANSIENT,
!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getProduct1_Description(), ecorePackage.getEString(), "description", null, 0, 1, Product1.class,
IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -817,10 +813,10 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
initEClass(productToOrderEClass, Map.Entry.class, "ProductToOrder", !IS_ABSTRACT, !IS_INTERFACE,
!IS_GENERATED_INSTANCE_CLASS);
- initEReference(getProductToOrder_Key(), getProduct1(), null, "key", null, 0, 1, Map.Entry.class, !IS_TRANSIENT,
- !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
- IS_ORDERED);
- initEReference(getProductToOrder_Value(), getSalesOrder(), null, "value", null, 0, 1, Map.Entry.class,
+ initEReference(getProductToOrder_Key(), this.getProduct1(), null, "key", null, 0, 1, Map.Entry.class,
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
+ initEReference(getProductToOrder_Value(), this.getSalesOrder(), null, "value", null, 0, 1, Map.Entry.class,
!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
!IS_DERIVED, IS_ORDERED);
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/util/Model1AdapterFactory.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/util/Model1AdapterFactory.java
index 96ec061a7e..ca63acce2a 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/util/Model1AdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/util/Model1AdapterFactory.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
*/
@@ -30,6 +30,8 @@ import org.eclipse.emf.ecore.EObject;
import java.util.Map;
+//import org.eclipse.emf.cdo.tests.model1.*;
+
/**
* <!-- begin-user-doc -->
* The <b>Adapter Factory</b> for the model.
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/util/Model1Switch.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/util/Model1Switch.java
index e221ac095e..1de06fa7b9 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/util/Model1Switch.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/util/Model1Switch.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
*/
@@ -29,6 +29,8 @@ import org.eclipse.emf.ecore.EObject;
import java.util.List;
import java.util.Map;
+//import org.eclipse.emf.cdo.tests.model1.*;
+
/**
* <!-- begin-user-doc -->
* The <b>Switch</b> for the model's inheritance hierarchy.
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/util/Model1Switch.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/util/Model1Switch.java
index dddeeda2fc..134636c835 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/util/Model1Switch.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/util/Model1Switch.java
@@ -91,9 +91,7 @@ public class Model1Switch<T> extends Switch<T>
Address address = (Address)theEObject;
T result = caseAddress(address);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case Model1Package.COMPANY:
@@ -101,13 +99,9 @@ public class Model1Switch<T> extends Switch<T>
Company company = (Company)theEObject;
T result = caseCompany(company);
if (result == null)
- {
result = caseAddress(company);
- }
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case Model1Package.SUPPLIER:
@@ -115,13 +109,9 @@ public class Model1Switch<T> extends Switch<T>
Supplier supplier = (Supplier)theEObject;
T result = caseSupplier(supplier);
if (result == null)
- {
result = caseAddress(supplier);
- }
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case Model1Package.CUSTOMER:
@@ -129,13 +119,9 @@ public class Model1Switch<T> extends Switch<T>
Customer customer = (Customer)theEObject;
T result = caseCustomer(customer);
if (result == null)
- {
result = caseAddress(customer);
- }
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case Model1Package.ORDER:
@@ -143,9 +129,7 @@ public class Model1Switch<T> extends Switch<T>
Order order = (Order)theEObject;
T result = caseOrder(order);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case Model1Package.ORDER_DETAIL:
@@ -153,9 +137,7 @@ public class Model1Switch<T> extends Switch<T>
OrderDetail orderDetail = (OrderDetail)theEObject;
T result = caseOrderDetail(orderDetail);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case Model1Package.PURCHASE_ORDER:
@@ -163,13 +145,9 @@ public class Model1Switch<T> extends Switch<T>
PurchaseOrder purchaseOrder = (PurchaseOrder)theEObject;
T result = casePurchaseOrder(purchaseOrder);
if (result == null)
- {
result = caseOrder(purchaseOrder);
- }
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case Model1Package.SALES_ORDER:
@@ -177,13 +155,9 @@ public class Model1Switch<T> extends Switch<T>
SalesOrder salesOrder = (SalesOrder)theEObject;
T result = caseSalesOrder(salesOrder);
if (result == null)
- {
result = caseOrder(salesOrder);
- }
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case Model1Package.CATEGORY:
@@ -191,9 +165,7 @@ public class Model1Switch<T> extends Switch<T>
Category category = (Category)theEObject;
T result = caseCategory(category);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case Model1Package.PRODUCT1:
@@ -201,9 +173,7 @@ public class Model1Switch<T> extends Switch<T>
Product1 product1 = (Product1)theEObject;
T result = caseProduct1(product1);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case Model1Package.ORDER_ADDRESS:
@@ -211,21 +181,13 @@ public class Model1Switch<T> extends Switch<T>
OrderAddress orderAddress = (OrderAddress)theEObject;
T result = caseOrderAddress(orderAddress);
if (result == null)
- {
result = caseAddress(orderAddress);
- }
if (result == null)
- {
result = caseOrder(orderAddress);
- }
if (result == null)
- {
result = caseOrderDetail(orderAddress);
- }
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case Model1Package.PRODUCT_TO_ORDER:
@@ -234,9 +196,7 @@ public class Model1Switch<T> extends Switch<T>
Map.Entry<Product1, SalesOrder> productToOrder = (Map.Entry<Product1, SalesOrder>)theEObject;
T result = caseProductToOrder(productToOrder);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
default:
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/model/model2.ecore b/plugins/org.eclipse.emf.cdo.tests.model2/model/model2.ecore
index 94bb6709f3..5fcf7ef17a 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/model/model2.ecore
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/model/model2.ecore
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="model2"
- nsURI="http://www.eclipse.org/emf/CDO/tests/model2/1.0.0" nsPrefix="model2">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="model2" nsURI="http://www.eclipse.org/emf/CDO/tests/model2/1.0.0"
+ nsPrefix="model2">
<eClassifiers xsi:type="ecore:EClass" name="SpecialPurchaseOrder" eSuperTypes="../../org.eclipse.emf.cdo.tests.model1/model/model1.ecore#//PurchaseOrder">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="discountCode" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="shippingAddress" eType="ecore:EClass ../../org.eclipse.emf.cdo.tests.model1/model/model1.ecore#//Address"
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/model/model2.genmodel b/plugins/org.eclipse.emf.cdo.tests.model2/model/model2.genmodel
index 18577634f9..93e61b1406 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/model/model2.genmodel
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/model/model2.genmodel
@@ -1,11 +1,9 @@
<?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"
- xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel"
- modelDirectory="/org.eclipse.emf.cdo.tests.model2/src" creationIcons="false" editDirectory=""
- editorDirectory="" modelPluginID="org.eclipse.emf.cdo.tests.model2" modelName="Model2"
- updateClasspath="false" rootExtendsClass="org.eclipse.emf.internal.cdo.CDOObjectImpl"
- reflectiveDelegation="true" codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.cdo"
+<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" modelDirectory="/org.eclipse.emf.cdo.tests.model2/src" creationIcons="false"
+ editDirectory="" editorDirectory="" modelPluginID="org.eclipse.emf.cdo.tests.model2"
+ modelName="Model2" updateClasspath="false" rootExtendsClass="org.eclipse.emf.internal.cdo.CDOObjectImpl"
+ reflectiveDelegation="true" codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.ecore"
featureDelegation="Reflective" complianceLevel="5.0" copyrightFields="false" providerRootExtendsClass="org.eclipse.emf.cdo.edit.CDOItemProviderAdapter"
optimizedHasChildren="true" tableProviders="true" colorProviders="true" fontProviders="true"
usedGenPackages="../../org.eclipse.emf.cdo.tests.model1/model/model1.genmodel#//model1">
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/model/model2.legacy.genmodel b/plugins/org.eclipse.emf.cdo.tests.model2/model/model2.legacy.genmodel
index 2a8b6981f8..c8b215a99a 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/model/model2.legacy.genmodel
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/model/model2.legacy.genmodel
@@ -3,7 +3,7 @@
xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA; Eike Stepper - initial API and implementation"
modelDirectory="/org.eclipse.emf.cdo.tests.model2/src" editDirectory="" editorDirectory=""
modelPluginID="org.eclipse.emf.cdo.tests.model2" modelName="Model2" updateClasspath="false"
- codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.cdo"
+ codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.ecore"
complianceLevel="5.0" copyrightFields="false" usedGenPackages="../../org.eclipse.emf.cdo.tests.model1/model/model1.legacy.genmodel#//model1">
<foreignModel>model2.ecore</foreignModel>
<modelPluginVariables>CDO=org.eclipse.emf.cdo</modelPluginVariables>
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/EnumListHolder.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/EnumListHolder.java
index 09b0ed128d..8e0ee8741f 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/EnumListHolder.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/EnumListHolder.java
@@ -43,7 +43,7 @@ public interface EnumListHolder extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Enum List</em>' attribute list.
* @see org.eclipse.emf.cdo.tests.model1.VAT
- * @see org.eclipse.emf.cdo.tests.model2.legacy.Model2Package#getEnumListHolder_EnumList()
+ * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getEnumListHolder_EnumList()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/MapHolder.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/MapHolder.java
index 96c4766049..8f51f2ae1a 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/MapHolder.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/MapHolder.java
@@ -36,7 +36,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model2.legacy.Model2Package#getMapHolder()
+ * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getMapHolder()
* @model
* @generated
*/
@@ -53,7 +53,7 @@ public interface MapHolder extends EObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Integer To String Map</em>' map.
- * @see org.eclipse.emf.cdo.tests.model2.legacy.Model2Package#getMapHolder_IntegerToStringMap()
+ * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getMapHolder_IntegerToStringMap()
* @model mapType="org.eclipse.emf.cdo.tests.model2.IntegerToStringMap<org.eclipse.emf.ecore.EIntegerObject, org.eclipse.emf.ecore.EString>"
* @generated
*/
@@ -70,7 +70,7 @@ public interface MapHolder extends EObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>String To String Map</em>' map.
- * @see org.eclipse.emf.cdo.tests.model2.legacy.Model2Package#getMapHolder_StringToStringMap()
+ * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getMapHolder_StringToStringMap()
* @model mapType="org.eclipse.emf.cdo.tests.model2.StringToStringMap<org.eclipse.emf.ecore.EString, org.eclipse.emf.ecore.EString>"
* @generated
*/
@@ -87,7 +87,7 @@ public interface MapHolder extends EObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>String To VAT Map</em>' map.
- * @see org.eclipse.emf.cdo.tests.model2.legacy.Model2Package#getMapHolder_StringToVATMap()
+ * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getMapHolder_StringToVATMap()
* @model mapType="org.eclipse.emf.cdo.tests.model2.StringToVATMap<org.eclipse.emf.ecore.EString, org.eclipse.emf.cdo.tests.model1.VAT>"
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/NotUnsettable.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/NotUnsettable.java
index 7e19b64176..b12b54bdca 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/NotUnsettable.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/NotUnsettable.java
@@ -38,7 +38,7 @@ import java.util.Date;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model2.legacy.Model2Package#getNotUnsettable()
+ * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getNotUnsettable()
* @model
* @generated
*/
@@ -54,7 +54,7 @@ public interface NotUnsettable extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Not Unsettable Boolean</em>' attribute.
* @see #setNotUnsettableBoolean(boolean)
- * @see org.eclipse.emf.cdo.tests.model2.legacy.Model2Package#getNotUnsettable_NotUnsettableBoolean()
+ * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getNotUnsettable_NotUnsettableBoolean()
* @model
* @generated
*/
@@ -79,7 +79,7 @@ public interface NotUnsettable extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Not Unsettable Byte</em>' attribute.
* @see #setNotUnsettableByte(byte)
- * @see org.eclipse.emf.cdo.tests.model2.legacy.Model2Package#getNotUnsettable_NotUnsettableByte()
+ * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getNotUnsettable_NotUnsettableByte()
* @model
* @generated
*/
@@ -104,7 +104,7 @@ public interface NotUnsettable extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Not Unsettable Char</em>' attribute.
* @see #setNotUnsettableChar(char)
- * @see org.eclipse.emf.cdo.tests.model2.legacy.Model2Package#getNotUnsettable_NotUnsettableChar()
+ * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getNotUnsettable_NotUnsettableChar()
* @model
* @generated
*/
@@ -129,7 +129,7 @@ public interface NotUnsettable extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Not Unsettable Date</em>' attribute.
* @see #setNotUnsettableDate(Date)
- * @see org.eclipse.emf.cdo.tests.model2.legacy.Model2Package#getNotUnsettable_NotUnsettableDate()
+ * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getNotUnsettable_NotUnsettableDate()
* @model
* @generated
*/
@@ -154,7 +154,7 @@ public interface NotUnsettable extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Not Unsettable Double</em>' attribute.
* @see #setNotUnsettableDouble(double)
- * @see org.eclipse.emf.cdo.tests.model2.legacy.Model2Package#getNotUnsettable_NotUnsettableDouble()
+ * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getNotUnsettable_NotUnsettableDouble()
* @model
* @generated
*/
@@ -179,7 +179,7 @@ public interface NotUnsettable extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Not Unsettable Float</em>' attribute.
* @see #setNotUnsettableFloat(float)
- * @see org.eclipse.emf.cdo.tests.model2.legacy.Model2Package#getNotUnsettable_NotUnsettableFloat()
+ * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getNotUnsettable_NotUnsettableFloat()
* @model
* @generated
*/
@@ -204,7 +204,7 @@ public interface NotUnsettable extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Not Unsettable Int</em>' attribute.
* @see #setNotUnsettableInt(int)
- * @see org.eclipse.emf.cdo.tests.model2.legacy.Model2Package#getNotUnsettable_NotUnsettableInt()
+ * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getNotUnsettable_NotUnsettableInt()
* @model
* @generated
*/
@@ -229,7 +229,7 @@ public interface NotUnsettable extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Not Unsettable Long</em>' attribute.
* @see #setNotUnsettableLong(long)
- * @see org.eclipse.emf.cdo.tests.model2.legacy.Model2Package#getNotUnsettable_NotUnsettableLong()
+ * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getNotUnsettable_NotUnsettableLong()
* @model
* @generated
*/
@@ -254,7 +254,7 @@ public interface NotUnsettable extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Not Unsettable Short</em>' attribute.
* @see #setNotUnsettableShort(short)
- * @see org.eclipse.emf.cdo.tests.model2.legacy.Model2Package#getNotUnsettable_NotUnsettableShort()
+ * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getNotUnsettable_NotUnsettableShort()
* @model
* @generated
*/
@@ -279,7 +279,7 @@ public interface NotUnsettable extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Not Unsettable String</em>' attribute.
* @see #setNotUnsettableString(String)
- * @see org.eclipse.emf.cdo.tests.model2.legacy.Model2Package#getNotUnsettable_NotUnsettableString()
+ * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getNotUnsettable_NotUnsettableString()
* @model
* @generated
*/
@@ -306,7 +306,7 @@ public interface NotUnsettable extends EObject
* @return the value of the '<em>Not Unsettable VAT</em>' attribute.
* @see org.eclipse.emf.cdo.tests.model1.VAT
* @see #setNotUnsettableVAT(VAT)
- * @see org.eclipse.emf.cdo.tests.model2.legacy.Model2Package#getNotUnsettable_NotUnsettableVAT()
+ * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getNotUnsettable_NotUnsettableVAT()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/NotUnsettableWithDefault.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/NotUnsettableWithDefault.java
index c9d398106e..af843b9c5b 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/NotUnsettableWithDefault.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/NotUnsettableWithDefault.java
@@ -39,7 +39,7 @@ import java.util.Date;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model2.legacy.Model2Package#getNotUnsettableWithDefault()
+ * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getNotUnsettableWithDefault()
* @model
* @generated
*/
@@ -56,7 +56,7 @@ public interface NotUnsettableWithDefault extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Not Unsettable Boolean</em>' attribute.
* @see #setNotUnsettableBoolean(boolean)
- * @see org.eclipse.emf.cdo.tests.model2.legacy.Model2Package#getNotUnsettableWithDefault_NotUnsettableBoolean()
+ * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getNotUnsettableWithDefault_NotUnsettableBoolean()
* @model default="true"
* @generated
*/
@@ -82,7 +82,7 @@ public interface NotUnsettableWithDefault extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Not Unsettable Byte</em>' attribute.
* @see #setNotUnsettableByte(byte)
- * @see org.eclipse.emf.cdo.tests.model2.legacy.Model2Package#getNotUnsettableWithDefault_NotUnsettableByte()
+ * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getNotUnsettableWithDefault_NotUnsettableByte()
* @model default="3"
* @generated
*/
@@ -108,7 +108,7 @@ public interface NotUnsettableWithDefault extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Not Unsettable Char</em>' attribute.
* @see #setNotUnsettableChar(char)
- * @see org.eclipse.emf.cdo.tests.model2.legacy.Model2Package#getNotUnsettableWithDefault_NotUnsettableChar()
+ * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getNotUnsettableWithDefault_NotUnsettableChar()
* @model default="\'x\'"
* @generated
*/
@@ -134,7 +134,7 @@ public interface NotUnsettableWithDefault extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Not Unsettable Date</em>' attribute.
* @see #setNotUnsettableDate(Date)
- * @see org.eclipse.emf.cdo.tests.model2.legacy.Model2Package#getNotUnsettableWithDefault_NotUnsettableDate()
+ * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getNotUnsettableWithDefault_NotUnsettableDate()
* @model default="1979-03-15T07:12:59"
* @generated
*/
@@ -160,7 +160,7 @@ public interface NotUnsettableWithDefault extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Not Unsettable Double</em>' attribute.
* @see #setNotUnsettableDouble(double)
- * @see org.eclipse.emf.cdo.tests.model2.legacy.Model2Package#getNotUnsettableWithDefault_NotUnsettableDouble()
+ * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getNotUnsettableWithDefault_NotUnsettableDouble()
* @model default="3.3"
* @generated
*/
@@ -186,7 +186,7 @@ public interface NotUnsettableWithDefault extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Not Unsettable Float</em>' attribute.
* @see #setNotUnsettableFloat(float)
- * @see org.eclipse.emf.cdo.tests.model2.legacy.Model2Package#getNotUnsettableWithDefault_NotUnsettableFloat()
+ * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getNotUnsettableWithDefault_NotUnsettableFloat()
* @model default="4.4"
* @generated
*/
@@ -212,7 +212,7 @@ public interface NotUnsettableWithDefault extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Not Unsettable Int</em>' attribute.
* @see #setNotUnsettableInt(int)
- * @see org.eclipse.emf.cdo.tests.model2.legacy.Model2Package#getNotUnsettableWithDefault_NotUnsettableInt()
+ * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getNotUnsettableWithDefault_NotUnsettableInt()
* @model default="5"
* @generated
*/
@@ -238,7 +238,7 @@ public interface NotUnsettableWithDefault extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Not Unsettable Long</em>' attribute.
* @see #setNotUnsettableLong(long)
- * @see org.eclipse.emf.cdo.tests.model2.legacy.Model2Package#getNotUnsettableWithDefault_NotUnsettableLong()
+ * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getNotUnsettableWithDefault_NotUnsettableLong()
* @model default="6"
* @generated
*/
@@ -264,7 +264,7 @@ public interface NotUnsettableWithDefault extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Not Unsettable Short</em>' attribute.
* @see #setNotUnsettableShort(short)
- * @see org.eclipse.emf.cdo.tests.model2.legacy.Model2Package#getNotUnsettableWithDefault_NotUnsettableShort()
+ * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getNotUnsettableWithDefault_NotUnsettableShort()
* @model default="7"
* @generated
*/
@@ -290,7 +290,7 @@ public interface NotUnsettableWithDefault extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Not Unsettable String</em>' attribute.
* @see #setNotUnsettableString(String)
- * @see org.eclipse.emf.cdo.tests.model2.legacy.Model2Package#getNotUnsettableWithDefault_NotUnsettableString()
+ * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getNotUnsettableWithDefault_NotUnsettableString()
* @model default="\"eike\""
* @generated
*/
@@ -318,7 +318,7 @@ public interface NotUnsettableWithDefault extends EObject
* @return the value of the '<em>Not Unsettable VAT</em>' attribute.
* @see org.eclipse.emf.cdo.tests.model1.VAT
* @see #setNotUnsettableVAT(VAT)
- * @see org.eclipse.emf.cdo.tests.model2.legacy.Model2Package#getNotUnsettableWithDefault_NotUnsettableVAT()
+ * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getNotUnsettableWithDefault_NotUnsettableVAT()
* @model default="vat15"
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/PersistentContainment.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/PersistentContainment.java
index 3fc35ca570..b0afec5bc6 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/PersistentContainment.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/PersistentContainment.java
@@ -26,7 +26,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model2.legacy.Model2Package#getPersistentContainment()
+ * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getPersistentContainment()
* @model
* @generated
*/
@@ -42,7 +42,7 @@ public interface PersistentContainment extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Attr Before</em>' attribute.
* @see #setAttrBefore(String)
- * @see org.eclipse.emf.cdo.tests.model2.legacy.Model2Package#getPersistentContainment_AttrBefore()
+ * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getPersistentContainment_AttrBefore()
* @model
* @generated
*/
@@ -68,7 +68,7 @@ public interface PersistentContainment extends EObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Children</em>' containment reference list.
- * @see org.eclipse.emf.cdo.tests.model2.legacy.Model2Package#getPersistentContainment_Children()
+ * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getPersistentContainment_Children()
* @see org.eclipse.emf.cdo.tests.model2.TransientContainer#getParent
* @model opposite="parent" containment="true" ordered="false"
* @generated
@@ -85,7 +85,7 @@ public interface PersistentContainment extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Attr After</em>' attribute.
* @see #setAttrAfter(String)
- * @see org.eclipse.emf.cdo.tests.model2.legacy.Model2Package#getPersistentContainment_AttrAfter()
+ * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getPersistentContainment_AttrAfter()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/SpecialPurchaseOrder.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/SpecialPurchaseOrder.java
index 21d669c28d..7ded4f729f 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/SpecialPurchaseOrder.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/SpecialPurchaseOrder.java
@@ -25,7 +25,7 @@ import org.eclipse.emf.cdo.tests.model1.PurchaseOrder;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model2.legacy.Model2Package#getSpecialPurchaseOrder()
+ * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getSpecialPurchaseOrder()
* @model
* @generated
*/
@@ -41,7 +41,7 @@ public interface SpecialPurchaseOrder extends PurchaseOrder
* <!-- end-user-doc -->
* @return the value of the '<em>Discount Code</em>' attribute.
* @see #setDiscountCode(String)
- * @see org.eclipse.emf.cdo.tests.model2.legacy.Model2Package#getSpecialPurchaseOrder_DiscountCode()
+ * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getSpecialPurchaseOrder_DiscountCode()
* @model
* @generated
*/
@@ -66,7 +66,7 @@ public interface SpecialPurchaseOrder extends PurchaseOrder
* <!-- end-user-doc -->
* @return the value of the '<em>Shipping Address</em>' containment reference.
* @see #setShippingAddress(Address)
- * @see org.eclipse.emf.cdo.tests.model2.legacy.Model2Package#getSpecialPurchaseOrder_ShippingAddress()
+ * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getSpecialPurchaseOrder_ShippingAddress()
* @model containment="true"
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/Task.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/Task.java
index 35c72ced28..730f6f6a79 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/Task.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/Task.java
@@ -24,7 +24,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model2.legacy.Model2Package#getTask()
+ * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getTask()
* @model
* @generated
*/
@@ -41,7 +41,7 @@ public interface Task extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Task Container</em>' container reference.
* @see #setTaskContainer(TaskContainer)
- * @see org.eclipse.emf.cdo.tests.model2.legacy.Model2Package#getTask_TaskContainer()
+ * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getTask_TaskContainer()
* @see org.eclipse.emf.cdo.tests.model2.TaskContainer#getTasks
* @model opposite="tasks" transient="false"
* @generated
@@ -67,7 +67,7 @@ public interface Task extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Description</em>' attribute.
* @see #setDescription(String)
- * @see org.eclipse.emf.cdo.tests.model2.legacy.Model2Package#getTask_Description()
+ * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getTask_Description()
* @model
* @generated
*/
@@ -91,7 +91,7 @@ public interface Task extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Done</em>' attribute.
* @see #setDone(boolean)
- * @see org.eclipse.emf.cdo.tests.model2.legacy.Model2Package#getTask_Done()
+ * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getTask_Done()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/TaskContainer.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/TaskContainer.java
index 415032d4da..cd1aa44b95 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/TaskContainer.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/TaskContainer.java
@@ -23,7 +23,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model2.legacy.Model2Package#getTaskContainer()
+ * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getTaskContainer()
* @model
* @generated
*/
@@ -40,7 +40,7 @@ public interface TaskContainer extends EObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Tasks</em>' containment reference list.
- * @see org.eclipse.emf.cdo.tests.model2.legacy.Model2Package#getTaskContainer_Tasks()
+ * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getTaskContainer_Tasks()
* @see org.eclipse.emf.cdo.tests.model2.Task#getTaskContainer
* @model opposite="taskContainer" containment="true"
* @generated
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/TransientContainer.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/TransientContainer.java
index 7042963094..870b2b3c3b 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/TransientContainer.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/TransientContainer.java
@@ -38,7 +38,7 @@ public interface TransientContainer extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Attr Before</em>' attribute.
* @see #setAttrBefore(String)
- * @see org.eclipse.emf.cdo.tests.model2.legacy.Model2Package#getTransientContainer_AttrBefore()
+ * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getTransientContainer_AttrBefore()
* @model
* @generated
*/
@@ -65,7 +65,7 @@ public interface TransientContainer extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Parent</em>' container reference.
* @see #setParent(PersistentContainment)
- * @see org.eclipse.emf.cdo.tests.model2.legacy.Model2Package#getTransientContainer_Parent()
+ * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getTransientContainer_Parent()
* @see org.eclipse.emf.cdo.tests.model2.PersistentContainment#getChildren
* @model opposite="children"
* @generated
@@ -91,7 +91,7 @@ public interface TransientContainer extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Attr After</em>' attribute.
* @see #setAttrAfter(String)
- * @see org.eclipse.emf.cdo.tests.model2.legacy.Model2Package#getTransientContainer_AttrAfter()
+ * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getTransientContainer_AttrAfter()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/Unsettable1.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/Unsettable1.java
index 995c6ede65..c699fbf018 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/Unsettable1.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/Unsettable1.java
@@ -36,7 +36,7 @@ import java.util.Date;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model2.legacy.Model2Package#getUnsettable1()
+ * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getUnsettable1()
* @model
* @generated
*/
@@ -54,7 +54,7 @@ public interface Unsettable1 extends EObject
* @see #isSetUnsettableBoolean()
* @see #unsetUnsettableBoolean()
* @see #setUnsettableBoolean(boolean)
- * @see org.eclipse.emf.cdo.tests.model2.legacy.Model2Package#getUnsettable1_UnsettableBoolean()
+ * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getUnsettable1_UnsettableBoolean()
* @model unsettable="true"
* @generated
*/
@@ -104,7 +104,7 @@ public interface Unsettable1 extends EObject
* @see #isSetUnsettableByte()
* @see #unsetUnsettableByte()
* @see #setUnsettableByte(byte)
- * @see org.eclipse.emf.cdo.tests.model2.legacy.Model2Package#getUnsettable1_UnsettableByte()
+ * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getUnsettable1_UnsettableByte()
* @model unsettable="true"
* @generated
*/
@@ -154,7 +154,7 @@ public interface Unsettable1 extends EObject
* @see #isSetUnsettableChar()
* @see #unsetUnsettableChar()
* @see #setUnsettableChar(char)
- * @see org.eclipse.emf.cdo.tests.model2.legacy.Model2Package#getUnsettable1_UnsettableChar()
+ * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getUnsettable1_UnsettableChar()
* @model unsettable="true"
* @generated
*/
@@ -204,7 +204,7 @@ public interface Unsettable1 extends EObject
* @see #isSetUnsettableDate()
* @see #unsetUnsettableDate()
* @see #setUnsettableDate(Date)
- * @see org.eclipse.emf.cdo.tests.model2.legacy.Model2Package#getUnsettable1_UnsettableDate()
+ * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getUnsettable1_UnsettableDate()
* @model unsettable="true"
* @generated
*/
@@ -254,7 +254,7 @@ public interface Unsettable1 extends EObject
* @see #isSetUnsettableDouble()
* @see #unsetUnsettableDouble()
* @see #setUnsettableDouble(double)
- * @see org.eclipse.emf.cdo.tests.model2.legacy.Model2Package#getUnsettable1_UnsettableDouble()
+ * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getUnsettable1_UnsettableDouble()
* @model unsettable="true"
* @generated
*/
@@ -304,7 +304,7 @@ public interface Unsettable1 extends EObject
* @see #isSetUnsettableFloat()
* @see #unsetUnsettableFloat()
* @see #setUnsettableFloat(float)
- * @see org.eclipse.emf.cdo.tests.model2.legacy.Model2Package#getUnsettable1_UnsettableFloat()
+ * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getUnsettable1_UnsettableFloat()
* @model unsettable="true"
* @generated
*/
@@ -354,7 +354,7 @@ public interface Unsettable1 extends EObject
* @see #isSetUnsettableInt()
* @see #unsetUnsettableInt()
* @see #setUnsettableInt(int)
- * @see org.eclipse.emf.cdo.tests.model2.legacy.Model2Package#getUnsettable1_UnsettableInt()
+ * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getUnsettable1_UnsettableInt()
* @model unsettable="true"
* @generated
*/
@@ -404,7 +404,7 @@ public interface Unsettable1 extends EObject
* @see #isSetUnsettableLong()
* @see #unsetUnsettableLong()
* @see #setUnsettableLong(long)
- * @see org.eclipse.emf.cdo.tests.model2.legacy.Model2Package#getUnsettable1_UnsettableLong()
+ * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getUnsettable1_UnsettableLong()
* @model unsettable="true"
* @generated
*/
@@ -454,7 +454,7 @@ public interface Unsettable1 extends EObject
* @see #isSetUnsettableShort()
* @see #unsetUnsettableShort()
* @see #setUnsettableShort(short)
- * @see org.eclipse.emf.cdo.tests.model2.legacy.Model2Package#getUnsettable1_UnsettableShort()
+ * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getUnsettable1_UnsettableShort()
* @model unsettable="true"
* @generated
*/
@@ -504,7 +504,7 @@ public interface Unsettable1 extends EObject
* @see #isSetUnsettableString()
* @see #unsetUnsettableString()
* @see #setUnsettableString(String)
- * @see org.eclipse.emf.cdo.tests.model2.legacy.Model2Package#getUnsettable1_UnsettableString()
+ * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getUnsettable1_UnsettableString()
* @model unsettable="true"
* @generated
*/
@@ -556,7 +556,7 @@ public interface Unsettable1 extends EObject
* @see #isSetUnsettableVAT()
* @see #unsetUnsettableVAT()
* @see #setUnsettableVAT(VAT)
- * @see org.eclipse.emf.cdo.tests.model2.legacy.Model2Package#getUnsettable1_UnsettableVAT()
+ * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getUnsettable1_UnsettableVAT()
* @model unsettable="true"
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/Unsettable2WithDefault.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/Unsettable2WithDefault.java
index de08c6f613..f0719c0a17 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/Unsettable2WithDefault.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/Unsettable2WithDefault.java
@@ -37,7 +37,7 @@ import java.util.Date;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model2.legacy.Model2Package#getUnsettable2WithDefault()
+ * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getUnsettable2WithDefault()
* @model
* @generated
*/
@@ -56,7 +56,7 @@ public interface Unsettable2WithDefault extends EObject
* @see #isSetUnsettableBoolean()
* @see #unsetUnsettableBoolean()
* @see #setUnsettableBoolean(boolean)
- * @see org.eclipse.emf.cdo.tests.model2.legacy.Model2Package#getUnsettable2WithDefault_UnsettableBoolean()
+ * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getUnsettable2WithDefault_UnsettableBoolean()
* @model default="true" unsettable="true"
* @generated
*/
@@ -158,7 +158,7 @@ public interface Unsettable2WithDefault extends EObject
* @see #isSetUnsettableChar()
* @see #unsetUnsettableChar()
* @see #setUnsettableChar(char)
- * @see org.eclipse.emf.cdo.tests.model2.legacy.Model2Package#getUnsettable2WithDefault_UnsettableChar()
+ * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getUnsettable2WithDefault_UnsettableChar()
* @model default="\'x\'" unsettable="true"
* @generated
*/
@@ -209,7 +209,7 @@ public interface Unsettable2WithDefault extends EObject
* @see #isSetUnsettableDate()
* @see #unsetUnsettableDate()
* @see #setUnsettableDate(Date)
- * @see org.eclipse.emf.cdo.tests.model2.legacy.Model2Package#getUnsettable2WithDefault_UnsettableDate()
+ * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getUnsettable2WithDefault_UnsettableDate()
* @model default="2009-12-21T15:12:59" unsettable="true"
* @generated
*/
@@ -260,7 +260,7 @@ public interface Unsettable2WithDefault extends EObject
* @see #isSetUnsettableDouble()
* @see #unsetUnsettableDouble()
* @see #setUnsettableDouble(double)
- * @see org.eclipse.emf.cdo.tests.model2.legacy.Model2Package#getUnsettable2WithDefault_UnsettableDouble()
+ * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getUnsettable2WithDefault_UnsettableDouble()
* @model default="3.3" unsettable="true"
* @generated
*/
@@ -311,7 +311,7 @@ public interface Unsettable2WithDefault extends EObject
* @see #isSetUnsettableFloat()
* @see #unsetUnsettableFloat()
* @see #setUnsettableFloat(float)
- * @see org.eclipse.emf.cdo.tests.model2.legacy.Model2Package#getUnsettable2WithDefault_UnsettableFloat()
+ * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getUnsettable2WithDefault_UnsettableFloat()
* @model default="4.4" unsettable="true"
* @generated
*/
@@ -515,7 +515,7 @@ public interface Unsettable2WithDefault extends EObject
* @see #isSetUnsettableString()
* @see #unsetUnsettableString()
* @see #setUnsettableString(String)
- * @see org.eclipse.emf.cdo.tests.model2.legacy.Model2Package#getUnsettable2WithDefault_UnsettableString()
+ * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getUnsettable2WithDefault_UnsettableString()
* @model default="\"eike\"" unsettable="true"
* @generated
*/
@@ -568,7 +568,7 @@ public interface Unsettable2WithDefault extends EObject
* @see #isSetUnsettableVAT()
* @see #unsetUnsettableVAT()
* @see #setUnsettableVAT(VAT)
- * @see org.eclipse.emf.cdo.tests.model2.legacy.Model2Package#getUnsettable2WithDefault_UnsettableVAT()
+ * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getUnsettable2WithDefault_UnsettableVAT()
* @model default="vat15" unsettable="true"
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/Model2FactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/Model2FactoryImpl.java
index 098c8e9589..efbfe112ab 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/Model2FactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/Model2FactoryImpl.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
*/
@@ -34,6 +34,8 @@ import org.eclipse.emf.ecore.plugin.EcorePlugin;
import java.util.Map;
+//import org.eclipse.emf.cdo.tests.model2.*;
+
/**
* <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc -->
* @generated
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/Model2FactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/Model2FactoryImpl.java
index 512becf304..5f10b1fa51 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/Model2FactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/Model2FactoryImpl.java
@@ -34,6 +34,8 @@ import org.eclipse.emf.ecore.plugin.EcorePlugin;
import java.util.Map;
+//import org.eclipse.emf.cdo.tests.model2.*;
+
/**
* <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc -->
* @generated
@@ -42,7 +44,7 @@ public class Model2FactoryImpl extends EFactoryImpl implements Model2Factory
{
/**
* Creates the default factory implementation. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated NOT
*/
public static Model2Factory init()
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/util/Model2AdapterFactory.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/util/Model2AdapterFactory.java
index e8971eabb6..1f7da0b112 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/util/Model2AdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/util/Model2AdapterFactory.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
*/
@@ -34,6 +34,8 @@ import org.eclipse.emf.ecore.EObject;
import java.util.Map;
+//import org.eclipse.emf.cdo.tests.model2.*;
+
/**
* <!-- begin-user-doc -->
* The <b>Adapter Factory</b> for the model.
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/util/Model2Switch.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/util/Model2Switch.java
index f2b4c2258f..55f8313468 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/util/Model2Switch.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/util/Model2Switch.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
*/
@@ -33,6 +33,8 @@ import org.eclipse.emf.ecore.util.Switch;
import java.util.Map;
+//import org.eclipse.emf.cdo.tests.model2.*;
+
/**
* <!-- begin-user-doc -->
* The <b>Switch</b> for the model's inheritance hierarchy.
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/util/Model2AdapterFactory.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/util/Model2AdapterFactory.java
index 6a1727c557..9aeb114c34 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/util/Model2AdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/util/Model2AdapterFactory.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
*/
@@ -34,6 +34,8 @@ import org.eclipse.emf.ecore.EObject;
import java.util.Map;
+//import org.eclipse.emf.cdo.tests.model2.*;
+
/**
* <!-- 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 -->
@@ -274,7 +276,7 @@ public class Model2AdapterFactory extends AdapterFactoryImpl
* Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model2.Task <em>Task</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.model2.Task
* @generated
@@ -383,7 +385,7 @@ public class Model2AdapterFactory extends AdapterFactoryImpl
* Creates a new adapter for an object of class '{@link java.util.Map.Entry <em>String To String Map</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 java.util.Map.Entry
* @generated
@@ -397,7 +399,7 @@ public class Model2AdapterFactory extends AdapterFactoryImpl
* Creates a new adapter for an object of class '{@link java.util.Map.Entry <em>Integer To String Map</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 java.util.Map.Entry
* @generated
@@ -411,7 +413,7 @@ public class Model2AdapterFactory extends AdapterFactoryImpl
* Creates a new adapter for an object of class '{@link java.util.Map.Entry <em>String To VAT Map</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 java.util.Map.Entry
* @generated
@@ -452,7 +454,7 @@ public class Model2AdapterFactory extends AdapterFactoryImpl
* Creates a new adapter for an object of class '{@link java.util.Map.Entry <em>EObject To EObject Map</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 java.util.Map.Entry
* @generated
@@ -521,7 +523,7 @@ public class Model2AdapterFactory extends AdapterFactoryImpl
* Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.Order <em>Order</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.model1.Order
* @generated
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/util/Model2Switch.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/util/Model2Switch.java
index 549053c335..58198bec47 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/util/Model2Switch.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/util/Model2Switch.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
*/
@@ -33,6 +33,8 @@ import org.eclipse.emf.ecore.util.Switch;
import java.util.Map;
+//import org.eclipse.emf.cdo.tests.model2.*;
+
/**
* <!-- begin-user-doc --> The <b>Switch</b> for the model's inheritance hierarchy. It supports the call
* {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
@@ -270,7 +272,7 @@ public class Model2Switch<T> extends Switch<T>
* Returns the result of interpreting the object as an instance of '<em>Special Purchase Order</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.
* @return the result of interpreting the object as an instance of '<em>Special Purchase Order</em>'.
@@ -328,7 +330,7 @@ public class Model2Switch<T> extends Switch<T>
* Returns the result of interpreting the object as an instance of '<em>Unsettable2 With Default</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.
* @return the result of interpreting the object as an instance of '<em>Unsettable2 With Default</em>'.
@@ -344,7 +346,7 @@ public class Model2Switch<T> extends Switch<T>
* Returns the result of interpreting the object as an instance of '<em>Persistent Containment</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.
* @return the result of interpreting the object as an instance of '<em>Persistent Containment</em>'.
@@ -388,7 +390,7 @@ public class Model2Switch<T> extends Switch<T>
* Returns the result of interpreting the object as an instance of '<em>Not Unsettable With Default</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.
* @return the result of interpreting the object as an instance of '<em>Not Unsettable With Default</em>'.
@@ -418,7 +420,7 @@ public class Model2Switch<T> extends Switch<T>
* Returns the result of interpreting the object as an instance of '<em>String To String Map</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.
* @return the result of interpreting the object as an instance of '<em>String To String Map</em>'.
@@ -434,7 +436,7 @@ public class Model2Switch<T> extends Switch<T>
* Returns the result of interpreting the object as an instance of '<em>Integer To String Map</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.
* @return the result of interpreting the object as an instance of '<em>Integer To String Map</em>'.
@@ -464,7 +466,7 @@ public class Model2Switch<T> extends Switch<T>
* Returns the result of interpreting the object as an instance of '<em>String To Address Containment Map</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.
* @return the result of interpreting the object as an instance of '<em>String To Address Containment Map</em>'.
@@ -480,7 +482,7 @@ public class Model2Switch<T> extends Switch<T>
* Returns the result of interpreting the object as an instance of '<em>String To Address Reference Map</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.
* @return the result of interpreting the object as an instance of '<em>String To Address Reference Map</em>'.
@@ -496,7 +498,7 @@ public class Model2Switch<T> extends Switch<T>
* Returns the result of interpreting the object as an instance of '<em>EObject To EObject Map</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.
* @return the result of interpreting the object as an instance of '<em>EObject To EObject Map</em>'.
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Class1.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Class1.java
index 600d236fea..efb2779c46 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Class1.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Class1.java
@@ -25,7 +25,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getClass1()
+ * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getClass1()
* @model
* @generated
*/
@@ -44,7 +44,7 @@ public interface Class1 extends EObject
* @return the value of the '<em>Class2</em>' reference list.
* @see #isSetClass2()
* @see #unsetClass2()
- * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getClass1_Class2()
+ * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getClass1_Class2()
* @see org.eclipse.emf.cdo.tests.model3.subpackage.Class2#getClass1
* @model opposite="class1" unsettable="true"
* @generated
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/ClassWithIDAttribute.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/ClassWithIDAttribute.java
index 11438c4c0c..1f59ba2b9c 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/ClassWithIDAttribute.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/ClassWithIDAttribute.java
@@ -23,7 +23,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getClassWithIDAttribute()
+ * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getClassWithIDAttribute()
* @model
* @generated
*/
@@ -38,7 +38,7 @@ public interface ClassWithIDAttribute extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Id</em>' attribute.
* @see #setId(String)
- * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getClassWithIDAttribute_Id()
+ * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getClassWithIDAttribute_Id()
* @model id="true"
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/ClassWithJavaClassAttribute.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/ClassWithJavaClassAttribute.java
index 19c9e7b61f..052a5e2b62 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/ClassWithJavaClassAttribute.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/ClassWithJavaClassAttribute.java
@@ -16,7 +16,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getClassWithJavaClassAttribute()
+ * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getClassWithJavaClassAttribute()
* @model
* @generated
*/
@@ -32,7 +32,7 @@ public interface ClassWithJavaClassAttribute extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Java Class</em>' attribute.
* @see #setJavaClass(Class)
- * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getClassWithJavaClassAttribute_JavaClass()
+ * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getClassWithJavaClassAttribute_JavaClass()
* @model id="true"
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/ClassWithJavaObjectAttribute.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/ClassWithJavaObjectAttribute.java
index 18aabd05c8..e92ba1cfd9 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/ClassWithJavaObjectAttribute.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/ClassWithJavaObjectAttribute.java
@@ -16,7 +16,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getClassWithJavaObjectAttribute()
+ * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getClassWithJavaObjectAttribute()
* @model
* @generated
*/
@@ -32,7 +32,7 @@ public interface ClassWithJavaObjectAttribute extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Java Object</em>' attribute.
* @see #setJavaObject(Object)
- * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getClassWithJavaObjectAttribute_JavaObject()
+ * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getClassWithJavaObjectAttribute_JavaObject()
* @model id="true"
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/File.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/File.java
index bbb5b6f26f..429a3ea47f 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/File.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/File.java
@@ -25,7 +25,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getFile()
+ * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getFile()
* @model
* @generated
*/
@@ -40,7 +40,7 @@ public interface File extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Name</em>' attribute.
* @see #setName(String)
- * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getFile_Name()
+ * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getFile_Name()
* @model
* @generated
*/
@@ -66,7 +66,7 @@ public interface File extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Data</em>' attribute.
* @see #setData(CDOClob)
- * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getFile_Data()
+ * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getFile_Data()
* @model dataType="org.eclipse.emf.cdo.etypes.Clob"
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Image.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Image.java
index 6d89a16a1e..f26d52c3fe 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Image.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Image.java
@@ -26,7 +26,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getImage()
+ * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getImage()
* @model
* @generated
*/
@@ -41,7 +41,7 @@ public interface Image extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Width</em>' attribute.
* @see #setWidth(int)
- * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getImage_Width()
+ * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getImage_Width()
* @model
* @generated
*/
@@ -67,7 +67,7 @@ public interface Image extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Height</em>' attribute.
* @see #setHeight(int)
- * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getImage_Height()
+ * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getImage_Height()
* @model
* @generated
*/
@@ -93,7 +93,7 @@ public interface Image extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Data</em>' attribute.
* @see #setData(CDOBlob)
- * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getImage_Data()
+ * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getImage_Data()
* @model dataType="org.eclipse.emf.cdo.etypes.Blob"
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/MetaRef.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/MetaRef.java
index ab41f926e5..1f33a4a2c7 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/MetaRef.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/MetaRef.java
@@ -62,7 +62,7 @@ public interface MetaRef extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>EClass Ref</em>' reference.
* @see #setEClassRef(EClass)
- * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getMetaRef_EClassRef()
+ * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getMetaRef_EClassRef()
* @model
* @generated
*/
@@ -87,7 +87,7 @@ public interface MetaRef extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>EReference Ref</em>' reference.
* @see #setEReferenceRef(EReference)
- * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getMetaRef_EReferenceRef()
+ * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getMetaRef_EReferenceRef()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/NodeA.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/NodeA.java
index 5bb40c925b..6d1faeabd0 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/NodeA.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/NodeA.java
@@ -25,7 +25,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getNodeA()
+ * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getNodeA()
* @model
* @generated
*/
@@ -41,7 +41,7 @@ public interface NodeA extends EObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Children</em>' containment reference list.
- * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getNodeA_Children()
+ * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getNodeA_Children()
* @model containment="true"
* @generated
*/
@@ -56,7 +56,7 @@ public interface NodeA extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Name</em>' attribute.
* @see #setName(String)
- * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getNodeA_Name()
+ * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getNodeA_Name()
* @model
* @generated
*/
@@ -83,7 +83,7 @@ public interface NodeA extends EObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Other Nodes</em>' reference list.
- * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getNodeA_OtherNodes()
+ * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getNodeA_OtherNodes()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/NodeB.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/NodeB.java
index d2c392e4e3..4a017b80d1 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/NodeB.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/NodeB.java
@@ -25,7 +25,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getNodeB()
+ * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getNodeB()
* @model
* @generated
*/
@@ -42,7 +42,7 @@ public interface NodeB extends EObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Children</em>' containment reference list.
- * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getNodeB_Children()
+ * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getNodeB_Children()
* @see org.eclipse.emf.cdo.tests.model3.NodeB#getParent
* @model opposite="parent" containment="true"
* @generated
@@ -60,7 +60,7 @@ public interface NodeB extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Parent</em>' container reference.
* @see #setParent(NodeB)
- * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getNodeB_Parent()
+ * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getNodeB_Parent()
* @see org.eclipse.emf.cdo.tests.model3.NodeB#getChildren
* @model opposite="children" transient="false"
* @generated
@@ -85,7 +85,7 @@ public interface NodeB extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Name</em>' attribute.
* @see #setName(String)
- * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getNodeB_Name()
+ * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getNodeB_Name()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/NodeC.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/NodeC.java
index 06160d755f..c9336c6bb8 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/NodeC.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/NodeC.java
@@ -27,7 +27,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getNodeC()
+ * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getNodeC()
* @model
* @generated
*/
@@ -44,7 +44,7 @@ public interface NodeC extends EObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Children</em>' containment reference list.
- * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getNodeC_Children()
+ * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getNodeC_Children()
* @see org.eclipse.emf.cdo.tests.model3.NodeC#getParent
* @model opposite="parent" containment="true"
* @generated
@@ -62,7 +62,7 @@ public interface NodeC extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Parent</em>' container reference.
* @see #setParent(NodeC)
- * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getNodeC_Parent()
+ * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getNodeC_Parent()
* @see org.eclipse.emf.cdo.tests.model3.NodeC#getChildren
* @model opposite="children" transient="false"
* @generated
@@ -87,7 +87,7 @@ public interface NodeC extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Name</em>' attribute.
* @see #setName(String)
- * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getNodeC_Name()
+ * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getNodeC_Name()
* @model
* @generated
*/
@@ -115,7 +115,7 @@ public interface NodeC extends EObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Other Nodes</em>' reference list.
- * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getNodeC_OtherNodes()
+ * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getNodeC_OtherNodes()
* @see org.eclipse.emf.cdo.tests.model3.NodeC#getOppositeNodes
* @model opposite="oppositeNodes"
* @generated
@@ -133,7 +133,7 @@ public interface NodeC extends EObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Opposite Nodes</em>' reference list.
- * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getNodeC_OppositeNodes()
+ * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getNodeC_OppositeNodes()
* @see org.eclipse.emf.cdo.tests.model3.NodeC#getOtherNodes
* @model opposite="otherNodes"
* @generated
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/NodeD.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/NodeD.java
index 476faa9aad..99f8ea4eec 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/NodeD.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/NodeD.java
@@ -27,7 +27,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getNodeD()
+ * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getNodeD()
* @model
* @generated
*/
@@ -44,7 +44,7 @@ public interface NodeD extends EObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Children</em>' containment reference list.
- * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getNodeD_Children()
+ * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getNodeD_Children()
* @see org.eclipse.emf.cdo.tests.model3.NodeD#getParent
* @model opposite="parent" containment="true"
* @generated
@@ -62,7 +62,7 @@ public interface NodeD extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Parent</em>' container reference.
* @see #setParent(NodeD)
- * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getNodeD_Parent()
+ * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getNodeD_Parent()
* @see org.eclipse.emf.cdo.tests.model3.NodeD#getChildren
* @model opposite="children" transient="false"
* @generated
@@ -87,7 +87,7 @@ public interface NodeD extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Name</em>' attribute.
* @see #setName(String)
- * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getNodeD_Name()
+ * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getNodeD_Name()
* @model
* @generated
*/
@@ -115,7 +115,7 @@ public interface NodeD extends EObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Other Nodes</em>' reference list.
- * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getNodeD_OtherNodes()
+ * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getNodeD_OtherNodes()
* @see org.eclipse.emf.cdo.tests.model3.NodeD#getOppositeNode
* @model opposite="oppositeNode"
* @generated
@@ -133,7 +133,7 @@ public interface NodeD extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Opposite Node</em>' reference.
* @see #setOppositeNode(NodeD)
- * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getNodeD_OppositeNode()
+ * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getNodeD_OppositeNode()
* @see org.eclipse.emf.cdo.tests.model3.NodeD#getOtherNodes
* @model opposite="otherNodes"
* @generated
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Polygon.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Polygon.java
index e9d97dc4db..d3f1056eee 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Polygon.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Polygon.java
@@ -23,7 +23,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getPolygon()
+ * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getPolygon()
* @model
* @generated
*/
@@ -39,7 +39,7 @@ public interface Polygon extends EObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Points</em>' attribute list.
- * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getPolygon_Points()
+ * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getPolygon_Points()
* @model dataType="org.eclipse.emf.cdo.tests.model3.Point" required="true"
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/PolygonWithDuplicates.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/PolygonWithDuplicates.java
index 183f3cdf4c..596f2d89b4 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/PolygonWithDuplicates.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/PolygonWithDuplicates.java
@@ -24,7 +24,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getPolygonWithDuplicates()
+ * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getPolygonWithDuplicates()
* @model
* @generated
*/
@@ -40,7 +40,7 @@ public interface PolygonWithDuplicates extends EObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Points</em>' attribute list.
- * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getPolygonWithDuplicates_Points()
+ * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getPolygonWithDuplicates_Points()
* @model unique="false" dataType="org.eclipse.emf.cdo.tests.model3.Point" required="true"
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/util/Model3AdapterFactory.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/util/Model3AdapterFactory.java
index b79c17fcf3..afbba244bb 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/util/Model3AdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/util/Model3AdapterFactory.java
@@ -2,6 +2,7 @@
*/
package org.eclipse.emf.cdo.tests.model3.legacy.util;
+//import org.eclipse.emf.cdo.tests.model3.*;
import org.eclipse.emf.cdo.tests.model3.Class1;
import org.eclipse.emf.cdo.tests.model3.ClassWithIDAttribute;
import org.eclipse.emf.cdo.tests.model3.ClassWithJavaClassAttribute;
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/util/Model3Switch.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/util/Model3Switch.java
index 7605180b58..750d35e601 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/util/Model3Switch.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/util/Model3Switch.java
@@ -22,6 +22,8 @@ import org.eclipse.emf.ecore.EObject;
import java.util.List;
+//import org.eclipse.emf.cdo.tests.model3.*;
+
/**
* <!-- begin-user-doc -->
* The <b>Switch</b> for the model's inheritance hierarchy.
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/Class2.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/Class2.java
index 532e2ec44d..9890c418bc 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/Class2.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/Class2.java
@@ -25,7 +25,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model3.subpackage.legacy.SubpackagePackage#getClass2()
+ * @see org.eclipse.emf.cdo.tests.model3.subpackage.SubpackagePackage#getClass2()
* @model
* @generated
*/
@@ -42,7 +42,7 @@ public interface Class2 extends EObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Class1</em>' reference list.
- * @see org.eclipse.emf.cdo.tests.model3.subpackage.legacy.SubpackagePackage#getClass2_Class1()
+ * @see org.eclipse.emf.cdo.tests.model3.subpackage.SubpackagePackage#getClass2_Class1()
* @see org.eclipse.emf.cdo.tests.model3.Class1#getClass2
* @model opposite="class2"
* @generated
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/legacy/util/SubpackageAdapterFactory.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/legacy/util/SubpackageAdapterFactory.java
index a8fa667830..e245c71b6e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/legacy/util/SubpackageAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/legacy/util/SubpackageAdapterFactory.java
@@ -2,6 +2,7 @@
*/
package org.eclipse.emf.cdo.tests.model3.subpackage.legacy.util;
+//import org.eclipse.emf.cdo.tests.model3.subpackage.*;
import org.eclipse.emf.cdo.tests.model3.subpackage.Class2;
import org.eclipse.emf.cdo.tests.model3.subpackage.legacy.SubpackagePackage;
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/legacy/util/SubpackageSwitch.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/legacy/util/SubpackageSwitch.java
index 34c46bb5f3..0116dc464c 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/legacy/util/SubpackageSwitch.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/legacy/util/SubpackageSwitch.java
@@ -10,6 +10,8 @@ import org.eclipse.emf.ecore.EObject;
import java.util.List;
+//import org.eclipse.emf.cdo.tests.model3.subpackage.*;
+
/**
* <!-- begin-user-doc -->
* The <b>Switch</b> for the model's inheritance hierarchy.
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/model/model4.ecore b/plugins/org.eclipse.emf.cdo.tests.model4/model/model4.ecore
index 1a622ffe34..0e774b98c5 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/model/model4.ecore
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/model/model4.ecore
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="model4"
- nsURI="http://www.eclipse.org/emf/CDO/tests/model4/1.0.0" nsPrefix="model4">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="model4" nsURI="http://www.eclipse.org/emf/CDO/tests/model4/1.0.0"
+ nsPrefix="model4">
<eClassifiers xsi:type="ecore:EClass" name="RefSingleContained">
<eStructuralFeatures xsi:type="ecore:EReference" name="element" eType="#//SingleContainedElement"
containment="true" eOpposite="#//SingleContainedElement/parent"/>
@@ -81,27 +80,27 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="elements" upperBound="-1"
eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="ImplSingleRefContainer" eSuperTypes="../../org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.ecore#//ISingleRefContainer"/>
- <eClassifiers xsi:type="ecore:EClass" name="ImplSingleRefContainedElement" eSuperTypes="../../org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.ecore#//ISingleRefContainedElement">
+ <eClassifiers xsi:type="ecore:EClass" name="ImplSingleRefContainer" eSuperTypes="../../org.eclipse.emf.cdo.tests.model4interfaces/model/model4interfaces.ecore#//ISingleRefContainer"/>
+ <eClassifiers xsi:type="ecore:EClass" name="ImplSingleRefContainedElement" eSuperTypes="../../org.eclipse.emf.cdo.tests.model4interfaces/model/model4interfaces.ecore#//ISingleRefContainedElement">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="ImplSingleRefNonContainer" eSuperTypes="../../org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.ecore#//ISingleRefNonContainer"/>
- <eClassifiers xsi:type="ecore:EClass" name="ImplSingleRefNonContainedElement" eSuperTypes="../../org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.ecore#//ISingleRefNonContainedElement">
+ <eClassifiers xsi:type="ecore:EClass" name="ImplSingleRefNonContainer" eSuperTypes="../../org.eclipse.emf.cdo.tests.model4interfaces/model/model4interfaces.ecore#//ISingleRefNonContainer"/>
+ <eClassifiers xsi:type="ecore:EClass" name="ImplSingleRefNonContainedElement" eSuperTypes="../../org.eclipse.emf.cdo.tests.model4interfaces/model/model4interfaces.ecore#//ISingleRefNonContainedElement">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="ImplMultiRefNonContainer" eSuperTypes="../../org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.ecore#//IMultiRefNonContainer"/>
- <eClassifiers xsi:type="ecore:EClass" name="ImplMultiRefNonContainedElement" eSuperTypes="../../org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.ecore#//IMultiRefNonContainedElement">
+ <eClassifiers xsi:type="ecore:EClass" name="ImplMultiRefNonContainer" eSuperTypes="../../org.eclipse.emf.cdo.tests.model4interfaces/model/model4interfaces.ecore#//IMultiRefNonContainer"/>
+ <eClassifiers xsi:type="ecore:EClass" name="ImplMultiRefNonContainedElement" eSuperTypes="../../org.eclipse.emf.cdo.tests.model4interfaces/model/model4interfaces.ecore#//IMultiRefNonContainedElement">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="ImplMultiRefContainer" eSuperTypes="../../org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.ecore#//IMultiRefContainer"/>
- <eClassifiers xsi:type="ecore:EClass" name="ImplMultiRefContainedElement" eSuperTypes="../../org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.ecore#//IMultiRefContainedElement">
+ <eClassifiers xsi:type="ecore:EClass" name="ImplMultiRefContainer" eSuperTypes="../../org.eclipse.emf.cdo.tests.model4interfaces/model/model4interfaces.ecore#//IMultiRefContainer"/>
+ <eClassifiers xsi:type="ecore:EClass" name="ImplMultiRefContainedElement" eSuperTypes="../../org.eclipse.emf.cdo.tests.model4interfaces/model/model4interfaces.ecore#//IMultiRefContainedElement">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="ImplSingleRefContainerNPL" eSuperTypes="../../org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.ecore#//ISingleRefContainerNPL"/>
- <eClassifiers xsi:type="ecore:EClass" name="ImplSingleRefNonContainerNPL" eSuperTypes="../../org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.ecore#//ISingleRefNonContainerNPL"/>
- <eClassifiers xsi:type="ecore:EClass" name="ImplMultiRefContainerNPL" eSuperTypes="../../org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.ecore#//IMultiRefContainerNPL"/>
- <eClassifiers xsi:type="ecore:EClass" name="ImplMultiRefNonContainerNPL" eSuperTypes="../../org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.ecore#//IMultiRefNonContainerNPL"/>
- <eClassifiers xsi:type="ecore:EClass" name="ImplContainedElementNPL" eSuperTypes="../../org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.ecore#//IContainedElementNoParentLink ../../org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.ecore#//INamedElement"/>
+ <eClassifiers xsi:type="ecore:EClass" name="ImplSingleRefContainerNPL" eSuperTypes="../../org.eclipse.emf.cdo.tests.model4interfaces/model/model4interfaces.ecore#//ISingleRefContainerNPL"/>
+ <eClassifiers xsi:type="ecore:EClass" name="ImplSingleRefNonContainerNPL" eSuperTypes="../../org.eclipse.emf.cdo.tests.model4interfaces/model/model4interfaces.ecore#//ISingleRefNonContainerNPL"/>
+ <eClassifiers xsi:type="ecore:EClass" name="ImplMultiRefContainerNPL" eSuperTypes="../../org.eclipse.emf.cdo.tests.model4interfaces/model/model4interfaces.ecore#//IMultiRefContainerNPL"/>
+ <eClassifiers xsi:type="ecore:EClass" name="ImplMultiRefNonContainerNPL" eSuperTypes="../../org.eclipse.emf.cdo.tests.model4interfaces/model/model4interfaces.ecore#//IMultiRefNonContainerNPL"/>
+ <eClassifiers xsi:type="ecore:EClass" name="ImplContainedElementNPL" eSuperTypes="../../org.eclipse.emf.cdo.tests.model4interfaces/model/model4interfaces.ecore#//IContainedElementNoParentLink ../../org.eclipse.emf.cdo.tests.model4interfaces/model/model4interfaces.ecore#//INamedElement"/>
<eClassifiers xsi:type="ecore:EClass" name="GenRefMultiNUNonContained">
<eStructuralFeatures xsi:type="ecore:EReference" name="elements" unique="false"
upperBound="-1" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/model/model4.genmodel b/plugins/org.eclipse.emf.cdo.tests.model4/model/model4.genmodel
index ed86d3f14b..00ff6213cf 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/model/model4.genmodel
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/model/model4.genmodel
@@ -1,13 +1,11 @@
<?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"
- xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel"
- modelDirectory="/org.eclipse.emf.cdo.tests.model4/src" editDirectory="" editorDirectory=""
- modelPluginID="org.eclipse.emf.cdo.tests.model4" modelName="Model4" updateClasspath="false"
- rootExtendsClass="org.eclipse.emf.internal.cdo.CDOObjectImpl" reflectiveDelegation="true"
- codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.cdo"
+<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" modelDirectory="/org.eclipse.emf.cdo.tests.model4/src" editDirectory=""
+ editorDirectory="" modelPluginID="org.eclipse.emf.cdo.tests.model4" modelName="Model4"
+ updateClasspath="false" rootExtendsClass="org.eclipse.emf.internal.cdo.CDOObjectImpl"
+ reflectiveDelegation="true" codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.ecore"
featureDelegation="Reflective" complianceLevel="5.0" copyrightFields="false" editPluginID="org.eclipse.emf.cdo.tests.model4.edit"
- runtimeVersion="2.6" usedGenPackages="../../org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.genmodel#//model4interfaces">
+ runtimeVersion="2.6" usedGenPackages="../../org.eclipse.emf.cdo.tests.model4interfaces/model/model4interfaces.genmodel#//model4interfaces">
<foreignModel>model4.ecore</foreignModel>
<modelPluginVariables>CDO=org.eclipse.emf.cdo</modelPluginVariables>
<genPackages prefix="model4" basePackage="org.eclipse.emf.cdo.tests" disposableProviderFactory="true"
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/model/model4.legacy.genmodel b/plugins/org.eclipse.emf.cdo.tests.model4/model/model4.legacy.genmodel
index 52fbefe556..065cdca7f3 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/model/model4.legacy.genmodel
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/model/model4.legacy.genmodel
@@ -3,9 +3,9 @@
xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA; Eike Stepper - initial API and implementation"
modelDirectory="/org.eclipse.emf.cdo.tests.model4/src" editDirectory="" editorDirectory=""
modelPluginID="org.eclipse.emf.cdo.tests.model4" modelName="Model4" updateClasspath="false"
- codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.cdo"
+ codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.ecore"
complianceLevel="5.0" copyrightFields="false" editPluginID="org.eclipse.emf.cdo.tests.model4.edit"
- runtimeVersion="2.6" usedGenPackages="../../org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.legacy.genmodel#//model4interfaces">
+ runtimeVersion="2.6" usedGenPackages="../../org.eclipse.emf.cdo.tests.model4interfaces/model/model4interfaces.legacy.genmodel#//model4interfaces">
<foreignModel>model4.ecore</foreignModel>
<modelPluginVariables>CDO=org.eclipse.emf.cdo</modelPluginVariables>
<genPackages prefix="model4" basePackage="org.eclipse.emf.cdo.tests" disposableProviderFactory="true"
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ContainedElementNoOpposite.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ContainedElementNoOpposite.java
index ae76ff7568..e556e96327 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ContainedElementNoOpposite.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ContainedElementNoOpposite.java
@@ -23,7 +23,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model4.legacy.model4Package#getContainedElementNoOpposite()
+ * @see org.eclipse.emf.cdo.tests.model4.model4Package#getContainedElementNoOpposite()
* @model
* @generated
*/
@@ -38,7 +38,7 @@ public interface ContainedElementNoOpposite extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Name</em>' attribute.
* @see #setName(String)
- * @see org.eclipse.emf.cdo.tests.model4.legacy.model4Package#getContainedElementNoOpposite_Name()
+ * @see org.eclipse.emf.cdo.tests.model4.model4Package#getContainedElementNoOpposite_Name()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefMapNonContained.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefMapNonContained.java
index f7fa51a370..8a8340de57 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefMapNonContained.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefMapNonContained.java
@@ -24,7 +24,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model4.legacy.model4Package#getGenRefMapNonContained()
+ * @see org.eclipse.emf.cdo.tests.model4.model4Package#getGenRefMapNonContained()
* @model
* @generated
*/
@@ -41,7 +41,7 @@ public interface GenRefMapNonContained extends EObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Elements</em>' map.
- * @see org.eclipse.emf.cdo.tests.model4.legacy.model4Package#getGenRefMapNonContained_Elements()
+ * @see org.eclipse.emf.cdo.tests.model4.model4Package#getGenRefMapNonContained_Elements()
* @model mapType="org.eclipse.emf.cdo.tests.model4.StringToEObject<org.eclipse.emf.ecore.EString, org.eclipse.emf.ecore.EObject>"
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefMultiContained.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefMultiContained.java
index a1d0d6e10e..93397a2a12 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefMultiContained.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefMultiContained.java
@@ -24,7 +24,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model4.legacy.model4Package#getGenRefMultiContained()
+ * @see org.eclipse.emf.cdo.tests.model4.model4Package#getGenRefMultiContained()
* @model
* @generated
*/
@@ -40,7 +40,7 @@ public interface GenRefMultiContained extends EObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Elements</em>' containment reference list.
- * @see org.eclipse.emf.cdo.tests.model4.legacy.model4Package#getGenRefMultiContained_Elements()
+ * @see org.eclipse.emf.cdo.tests.model4.model4Package#getGenRefMultiContained_Elements()
* @model containment="true"
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefMultiNUNonContained.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefMultiNUNonContained.java
index 79318969b5..450abc1ee4 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefMultiNUNonContained.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefMultiNUNonContained.java
@@ -24,7 +24,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model4.legacy.model4Package#getGenRefMultiNUNonContained()
+ * @see org.eclipse.emf.cdo.tests.model4.model4Package#getGenRefMultiNUNonContained()
* @model
* @generated
*/
@@ -40,7 +40,7 @@ public interface GenRefMultiNUNonContained extends EObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Elements</em>' reference list.
- * @see org.eclipse.emf.cdo.tests.model4.legacy.model4Package#getGenRefMultiNUNonContained_Elements()
+ * @see org.eclipse.emf.cdo.tests.model4.model4Package#getGenRefMultiNUNonContained_Elements()
* @model resolveProxies="false"
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefMultiNonContained.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefMultiNonContained.java
index 0845d4f853..525e0e2f22 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefMultiNonContained.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefMultiNonContained.java
@@ -24,7 +24,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model4.legacy.model4Package#getGenRefMultiNonContained()
+ * @see org.eclipse.emf.cdo.tests.model4.model4Package#getGenRefMultiNonContained()
* @model
* @generated
*/
@@ -40,7 +40,7 @@ public interface GenRefMultiNonContained extends EObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Elements</em>' reference list.
- * @see org.eclipse.emf.cdo.tests.model4.legacy.model4Package#getGenRefMultiNonContained_Elements()
+ * @see org.eclipse.emf.cdo.tests.model4.model4Package#getGenRefMultiNonContained_Elements()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefSingleContained.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefSingleContained.java
index 114e4cd803..b621d5f9ef 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefSingleContained.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefSingleContained.java
@@ -23,7 +23,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model4.legacy.model4Package#getGenRefSingleContained()
+ * @see org.eclipse.emf.cdo.tests.model4.model4Package#getGenRefSingleContained()
* @model
* @generated
*/
@@ -39,7 +39,7 @@ public interface GenRefSingleContained extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Element</em>' containment reference.
* @see #setElement(EObject)
- * @see org.eclipse.emf.cdo.tests.model4.legacy.model4Package#getGenRefSingleContained_Element()
+ * @see org.eclipse.emf.cdo.tests.model4.model4Package#getGenRefSingleContained_Element()
* @model containment="true"
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefSingleNonContained.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefSingleNonContained.java
index 95a25852b9..38eccd1513 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefSingleNonContained.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefSingleNonContained.java
@@ -23,7 +23,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model4.legacy.model4Package#getGenRefSingleNonContained()
+ * @see org.eclipse.emf.cdo.tests.model4.model4Package#getGenRefSingleNonContained()
* @model
* @generated
*/
@@ -39,7 +39,7 @@ public interface GenRefSingleNonContained extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Element</em>' reference.
* @see #setElement(EObject)
- * @see org.eclipse.emf.cdo.tests.model4.legacy.model4Package#getGenRefSingleNonContained_Element()
+ * @see org.eclipse.emf.cdo.tests.model4.model4Package#getGenRefSingleNonContained_Element()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplContainedElementNPL.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplContainedElementNPL.java
index 3fdf76b542..2d8d41257c 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplContainedElementNPL.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplContainedElementNPL.java
@@ -18,7 +18,7 @@ import org.eclipse.emf.cdo.tests.model4interfaces.INamedElement;
* end-user-doc -->
*
*
- * @see org.eclipse.emf.cdo.tests.model4.legacy.model4Package#getImplContainedElementNPL()
+ * @see org.eclipse.emf.cdo.tests.model4.model4Package#getImplContainedElementNPL()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefContainedElement.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefContainedElement.java
index d94edd8155..faeff59730 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefContainedElement.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefContainedElement.java
@@ -23,7 +23,7 @@ import org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainedElement;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model4.legacy.model4Package#getImplMultiRefContainedElement()
+ * @see org.eclipse.emf.cdo.tests.model4.model4Package#getImplMultiRefContainedElement()
* @model
* @generated
*/
@@ -38,7 +38,7 @@ public interface ImplMultiRefContainedElement extends IMultiRefContainedElement
* <!-- end-user-doc -->
* @return the value of the '<em>Name</em>' attribute.
* @see #setName(String)
- * @see org.eclipse.emf.cdo.tests.model4.legacy.model4Package#getImplMultiRefContainedElement_Name()
+ * @see org.eclipse.emf.cdo.tests.model4.model4Package#getImplMultiRefContainedElement_Name()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefContainer.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefContainer.java
index 6942dceb06..352cd97564 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefContainer.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefContainer.java
@@ -17,7 +17,7 @@ import org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainer;
* end-user-doc -->
*
*
- * @see org.eclipse.emf.cdo.tests.model4.legacy.model4Package#getImplMultiRefContainer()
+ * @see org.eclipse.emf.cdo.tests.model4.model4Package#getImplMultiRefContainer()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefContainerNPL.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefContainerNPL.java
index c0cd7e5b22..7374a5fe0e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefContainerNPL.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefContainerNPL.java
@@ -17,7 +17,7 @@ import org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainerNPL;
* end-user-doc -->
*
*
- * @see org.eclipse.emf.cdo.tests.model4.legacy.model4Package#getImplMultiRefContainerNPL()
+ * @see org.eclipse.emf.cdo.tests.model4.model4Package#getImplMultiRefContainerNPL()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefNonContainedElement.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefNonContainedElement.java
index ed240ae04f..7aec7d31fb 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefNonContainedElement.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefNonContainedElement.java
@@ -23,7 +23,7 @@ import org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainedElement;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model4.legacy.model4Package#getImplMultiRefNonContainedElement()
+ * @see org.eclipse.emf.cdo.tests.model4.model4Package#getImplMultiRefNonContainedElement()
* @model
* @generated
*/
@@ -38,7 +38,7 @@ public interface ImplMultiRefNonContainedElement extends IMultiRefNonContainedEl
* <!-- end-user-doc -->
* @return the value of the '<em>Name</em>' attribute.
* @see #setName(String)
- * @see org.eclipse.emf.cdo.tests.model4.legacy.model4Package#getImplMultiRefNonContainedElement_Name()
+ * @see org.eclipse.emf.cdo.tests.model4.model4Package#getImplMultiRefNonContainedElement_Name()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefNonContainer.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefNonContainer.java
index 707b458183..0b7a2205ba 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefNonContainer.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefNonContainer.java
@@ -17,7 +17,7 @@ import org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainer;
* end-user-doc -->
*
*
- * @see org.eclipse.emf.cdo.tests.model4.legacy.model4Package#getImplMultiRefNonContainer()
+ * @see org.eclipse.emf.cdo.tests.model4.model4Package#getImplMultiRefNonContainer()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefNonContainerNPL.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefNonContainerNPL.java
index 3c76a291e0..e7c714b7e8 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefNonContainerNPL.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefNonContainerNPL.java
@@ -17,7 +17,7 @@ import org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainerNPL;
* end-user-doc -->
*
*
- * @see org.eclipse.emf.cdo.tests.model4.legacy.model4Package#getImplMultiRefNonContainerNPL()
+ * @see org.eclipse.emf.cdo.tests.model4.model4Package#getImplMultiRefNonContainerNPL()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefContainedElement.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefContainedElement.java
index 9c8c3bc2dc..ae0ada8f18 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefContainedElement.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefContainedElement.java
@@ -23,7 +23,7 @@ import org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainedElement;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model4.legacy.model4Package#getImplSingleRefContainedElement()
+ * @see org.eclipse.emf.cdo.tests.model4.model4Package#getImplSingleRefContainedElement()
* @model
* @generated
*/
@@ -38,7 +38,7 @@ public interface ImplSingleRefContainedElement extends ISingleRefContainedElemen
* <!-- end-user-doc -->
* @return the value of the '<em>Name</em>' attribute.
* @see #setName(String)
- * @see org.eclipse.emf.cdo.tests.model4.legacy.model4Package#getImplSingleRefContainedElement_Name()
+ * @see org.eclipse.emf.cdo.tests.model4.model4Package#getImplSingleRefContainedElement_Name()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefContainer.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefContainer.java
index 589cc3620d..39949c8b02 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefContainer.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefContainer.java
@@ -17,7 +17,7 @@ import org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainer;
* end-user-doc -->
*
*
- * @see org.eclipse.emf.cdo.tests.model4.legacy.model4Package#getImplSingleRefContainer()
+ * @see org.eclipse.emf.cdo.tests.model4.model4Package#getImplSingleRefContainer()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefContainerNPL.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefContainerNPL.java
index 31b3aafad9..f71b9aff02 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefContainerNPL.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefContainerNPL.java
@@ -17,7 +17,7 @@ import org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainerNPL;
* end-user-doc -->
*
*
- * @see org.eclipse.emf.cdo.tests.model4.legacy.model4Package#getImplSingleRefContainerNPL()
+ * @see org.eclipse.emf.cdo.tests.model4.model4Package#getImplSingleRefContainerNPL()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefNonContainedElement.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefNonContainedElement.java
index eb9f3edb63..7db8bd4b76 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefNonContainedElement.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefNonContainedElement.java
@@ -23,7 +23,7 @@ import org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainedElement;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model4.legacy.model4Package#getImplSingleRefNonContainedElement()
+ * @see org.eclipse.emf.cdo.tests.model4.model4Package#getImplSingleRefNonContainedElement()
* @model
* @generated
*/
@@ -38,7 +38,7 @@ public interface ImplSingleRefNonContainedElement extends ISingleRefNonContained
* <!-- end-user-doc -->
* @return the value of the '<em>Name</em>' attribute.
* @see #setName(String)
- * @see org.eclipse.emf.cdo.tests.model4.legacy.model4Package#getImplSingleRefNonContainedElement_Name()
+ * @see org.eclipse.emf.cdo.tests.model4.model4Package#getImplSingleRefNonContainedElement_Name()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefNonContainer.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefNonContainer.java
index 1292f5e2d0..823e0ee025 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefNonContainer.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefNonContainer.java
@@ -17,7 +17,7 @@ import org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainer;
* end-user-doc -->
*
*
- * @see org.eclipse.emf.cdo.tests.model4.legacy.model4Package#getImplSingleRefNonContainer()
+ * @see org.eclipse.emf.cdo.tests.model4.model4Package#getImplSingleRefNonContainer()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefNonContainerNPL.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefNonContainerNPL.java
index b5e0299e32..bb79056d13 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefNonContainerNPL.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefNonContainerNPL.java
@@ -17,7 +17,7 @@ import org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainerNPL;
* <!-- end-user-doc -->
*
*
- * @see org.eclipse.emf.cdo.tests.model4.legacy.model4Package#getImplSingleRefNonContainerNPL()
+ * @see org.eclipse.emf.cdo.tests.model4.model4Package#getImplSingleRefNonContainerNPL()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/MultiContainedElement.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/MultiContainedElement.java
index c714953183..eaed89e754 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/MultiContainedElement.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/MultiContainedElement.java
@@ -24,7 +24,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model4.legacy.model4Package#getMultiContainedElement()
+ * @see org.eclipse.emf.cdo.tests.model4.model4Package#getMultiContainedElement()
* @model
* @generated
*/
@@ -39,7 +39,7 @@ public interface MultiContainedElement extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Name</em>' attribute.
* @see #setName(String)
- * @see org.eclipse.emf.cdo.tests.model4.legacy.model4Package#getMultiContainedElement_Name()
+ * @see org.eclipse.emf.cdo.tests.model4.model4Package#getMultiContainedElement_Name()
* @model
* @generated
*/
@@ -65,7 +65,7 @@ public interface MultiContainedElement extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Parent</em>' container reference.
* @see #setParent(RefMultiContained)
- * @see org.eclipse.emf.cdo.tests.model4.legacy.model4Package#getMultiContainedElement_Parent()
+ * @see org.eclipse.emf.cdo.tests.model4.model4Package#getMultiContainedElement_Parent()
* @see org.eclipse.emf.cdo.tests.model4.RefMultiContained#getElements
* @model opposite="elements" transient="false"
* @generated
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/MultiNonContainedElement.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/MultiNonContainedElement.java
index 29203b4d69..7e3fb34be8 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/MultiNonContainedElement.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/MultiNonContainedElement.java
@@ -24,7 +24,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model4.legacy.model4Package#getMultiNonContainedElement()
+ * @see org.eclipse.emf.cdo.tests.model4.model4Package#getMultiNonContainedElement()
* @model
* @generated
*/
@@ -39,7 +39,7 @@ public interface MultiNonContainedElement extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Name</em>' attribute.
* @see #setName(String)
- * @see org.eclipse.emf.cdo.tests.model4.legacy.model4Package#getMultiNonContainedElement_Name()
+ * @see org.eclipse.emf.cdo.tests.model4.model4Package#getMultiNonContainedElement_Name()
* @model
* @generated
*/
@@ -66,7 +66,7 @@ public interface MultiNonContainedElement extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Parent</em>' reference.
* @see #setParent(RefMultiNonContained)
- * @see org.eclipse.emf.cdo.tests.model4.legacy.model4Package#getMultiNonContainedElement_Parent()
+ * @see org.eclipse.emf.cdo.tests.model4.model4Package#getMultiNonContainedElement_Parent()
* @see org.eclipse.emf.cdo.tests.model4.RefMultiNonContained#getElements
* @model opposite="elements"
* @generated
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/MultiNonContainedUnsettableElement.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/MultiNonContainedUnsettableElement.java
index 44d9e9a96f..fad7207e67 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/MultiNonContainedUnsettableElement.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/MultiNonContainedUnsettableElement.java
@@ -24,7 +24,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model4.legacy.model4Package#getMultiNonContainedUnsettableElement()
+ * @see org.eclipse.emf.cdo.tests.model4.model4Package#getMultiNonContainedUnsettableElement()
* @model
* @generated
*/
@@ -39,7 +39,7 @@ public interface MultiNonContainedUnsettableElement extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Name</em>' attribute.
* @see #setName(String)
- * @see org.eclipse.emf.cdo.tests.model4.legacy.model4Package#getMultiNonContainedUnsettableElement_Name()
+ * @see org.eclipse.emf.cdo.tests.model4.model4Package#getMultiNonContainedUnsettableElement_Name()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiContained.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiContained.java
index c2fe59c0b3..15c6ac7f3d 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiContained.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiContained.java
@@ -40,7 +40,7 @@ public interface RefMultiContained extends EObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Elements</em>' containment reference list.
- * @see org.eclipse.emf.cdo.tests.model4.legacy.model4Package#getRefMultiContained_Elements()
+ * @see org.eclipse.emf.cdo.tests.model4.model4Package#getRefMultiContained_Elements()
* @see org.eclipse.emf.cdo.tests.model4.MultiContainedElement#getParent
* @model opposite="parent" containment="true"
* @generated
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiContainedNPL.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiContainedNPL.java
index 7a5d498c98..69414f9e0f 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiContainedNPL.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiContainedNPL.java
@@ -24,7 +24,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model4.legacy.model4Package#getRefMultiContainedNPL()
+ * @see org.eclipse.emf.cdo.tests.model4.model4Package#getRefMultiContainedNPL()
* @model
* @generated
*/
@@ -40,7 +40,7 @@ public interface RefMultiContainedNPL extends EObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Elements</em>' containment reference list.
- * @see org.eclipse.emf.cdo.tests.model4.legacy.model4Package#getRefMultiContainedNPL_Elements()
+ * @see org.eclipse.emf.cdo.tests.model4.model4Package#getRefMultiContainedNPL_Elements()
* @model containment="true"
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiNonContained.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiNonContained.java
index 3fbcb9fa70..5032145c81 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiNonContained.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiNonContained.java
@@ -24,7 +24,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model4.legacy.model4Package#getRefMultiNonContained()
+ * @see org.eclipse.emf.cdo.tests.model4.model4Package#getRefMultiNonContained()
* @model
* @generated
*/
@@ -42,7 +42,7 @@ public interface RefMultiNonContained extends EObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Elements</em>' reference list.
- * @see org.eclipse.emf.cdo.tests.model4.legacy.model4Package#getRefMultiNonContained_Elements()
+ * @see org.eclipse.emf.cdo.tests.model4.model4Package#getRefMultiNonContained_Elements()
* @see org.eclipse.emf.cdo.tests.model4.MultiNonContainedElement#getParent
* @model opposite="parent"
* @generated
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiNonContainedNPL.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiNonContainedNPL.java
index e47982e9c9..63e6e5c898 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiNonContainedNPL.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiNonContainedNPL.java
@@ -24,7 +24,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model4.legacy.model4Package#getRefMultiNonContainedNPL()
+ * @see org.eclipse.emf.cdo.tests.model4.model4Package#getRefMultiNonContainedNPL()
* @model
* @generated
*/
@@ -40,7 +40,7 @@ public interface RefMultiNonContainedNPL extends EObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Elements</em>' reference list.
- * @see org.eclipse.emf.cdo.tests.model4.legacy.model4Package#getRefMultiNonContainedNPL_Elements()
+ * @see org.eclipse.emf.cdo.tests.model4.model4Package#getRefMultiNonContainedNPL_Elements()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiNonContainedUnsettable.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiNonContainedUnsettable.java
index 6c52e990cc..f8c24784d2 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiNonContainedUnsettable.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiNonContainedUnsettable.java
@@ -24,7 +24,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model4.legacy.model4Package#getRefMultiNonContainedUnsettable()
+ * @see org.eclipse.emf.cdo.tests.model4.model4Package#getRefMultiNonContainedUnsettable()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefSingleContained.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefSingleContained.java
index 580f1f85cd..b4ddc5f7e5 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefSingleContained.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefSingleContained.java
@@ -23,7 +23,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model4.legacy.model4Package#getRefSingleContained()
+ * @see org.eclipse.emf.cdo.tests.model4.model4Package#getRefSingleContained()
* @model
* @generated
*/
@@ -40,7 +40,7 @@ public interface RefSingleContained extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Element</em>' containment reference.
* @see #setElement(SingleContainedElement)
- * @see org.eclipse.emf.cdo.tests.model4.legacy.model4Package#getRefSingleContained_Element()
+ * @see org.eclipse.emf.cdo.tests.model4.model4Package#getRefSingleContained_Element()
* @see org.eclipse.emf.cdo.tests.model4.SingleContainedElement#getParent
* @model opposite="parent" containment="true"
* @generated
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefSingleContainedNPL.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefSingleContainedNPL.java
index 22f02e5e6f..08d119cd76 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefSingleContainedNPL.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefSingleContainedNPL.java
@@ -23,7 +23,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model4.legacy.model4Package#getRefSingleContainedNPL()
+ * @see org.eclipse.emf.cdo.tests.model4.model4Package#getRefSingleContainedNPL()
* @model
* @generated
*/
@@ -39,7 +39,7 @@ public interface RefSingleContainedNPL extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Element</em>' containment reference.
* @see #setElement(ContainedElementNoOpposite)
- * @see org.eclipse.emf.cdo.tests.model4.legacy.model4Package#getRefSingleContainedNPL_Element()
+ * @see org.eclipse.emf.cdo.tests.model4.model4Package#getRefSingleContainedNPL_Element()
* @model containment="true"
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefSingleNonContained.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefSingleNonContained.java
index 7d0a4b2060..7ecc6926eb 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefSingleNonContained.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefSingleNonContained.java
@@ -23,7 +23,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model4.legacy.model4Package#getRefSingleNonContained()
+ * @see org.eclipse.emf.cdo.tests.model4.model4Package#getRefSingleNonContained()
* @model
* @generated
*/
@@ -41,7 +41,7 @@ public interface RefSingleNonContained extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Element</em>' reference.
* @see #setElement(SingleNonContainedElement)
- * @see org.eclipse.emf.cdo.tests.model4.legacy.model4Package#getRefSingleNonContained_Element()
+ * @see org.eclipse.emf.cdo.tests.model4.model4Package#getRefSingleNonContained_Element()
* @see org.eclipse.emf.cdo.tests.model4.SingleNonContainedElement#getParent
* @model opposite="parent"
* @generated
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefSingleNonContainedNPL.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefSingleNonContainedNPL.java
index 3de1b06003..353a07fb6b 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefSingleNonContainedNPL.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefSingleNonContainedNPL.java
@@ -23,7 +23,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model4.legacy.model4Package#getRefSingleNonContainedNPL()
+ * @see org.eclipse.emf.cdo.tests.model4.model4Package#getRefSingleNonContainedNPL()
* @model
* @generated
*/
@@ -39,7 +39,7 @@ public interface RefSingleNonContainedNPL extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Element</em>' reference.
* @see #setElement(ContainedElementNoOpposite)
- * @see org.eclipse.emf.cdo.tests.model4.legacy.model4Package#getRefSingleNonContainedNPL_Element()
+ * @see org.eclipse.emf.cdo.tests.model4.model4Package#getRefSingleNonContainedNPL_Element()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/SingleContainedElement.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/SingleContainedElement.java
index b0cb7817e2..7643027a8f 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/SingleContainedElement.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/SingleContainedElement.java
@@ -24,7 +24,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model4.legacy.model4Package#getSingleContainedElement()
+ * @see org.eclipse.emf.cdo.tests.model4.model4Package#getSingleContainedElement()
* @model
* @generated
*/
@@ -39,7 +39,7 @@ public interface SingleContainedElement extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Name</em>' attribute.
* @see #setName(String)
- * @see org.eclipse.emf.cdo.tests.model4.legacy.model4Package#getSingleContainedElement_Name()
+ * @see org.eclipse.emf.cdo.tests.model4.model4Package#getSingleContainedElement_Name()
* @model
* @generated
*/
@@ -65,7 +65,7 @@ public interface SingleContainedElement extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Parent</em>' container reference.
* @see #setParent(RefSingleContained)
- * @see org.eclipse.emf.cdo.tests.model4.legacy.model4Package#getSingleContainedElement_Parent()
+ * @see org.eclipse.emf.cdo.tests.model4.model4Package#getSingleContainedElement_Parent()
* @see org.eclipse.emf.cdo.tests.model4.RefSingleContained#getElement
* @model opposite="element" transient="false"
* @generated
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/SingleNonContainedElement.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/SingleNonContainedElement.java
index 337f56a609..9370c61652 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/SingleNonContainedElement.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/SingleNonContainedElement.java
@@ -24,7 +24,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model4.legacy.model4Package#getSingleNonContainedElement()
+ * @see org.eclipse.emf.cdo.tests.model4.model4Package#getSingleNonContainedElement()
* @model
* @generated
*/
@@ -39,7 +39,7 @@ public interface SingleNonContainedElement extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Name</em>' attribute.
* @see #setName(String)
- * @see org.eclipse.emf.cdo.tests.model4.legacy.model4Package#getSingleNonContainedElement_Name()
+ * @see org.eclipse.emf.cdo.tests.model4.model4Package#getSingleNonContainedElement_Name()
* @model
* @generated
*/
@@ -65,7 +65,7 @@ public interface SingleNonContainedElement extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Parent</em>' reference.
* @see #setParent(RefSingleNonContained)
- * @see org.eclipse.emf.cdo.tests.model4.legacy.model4Package#getSingleNonContainedElement_Parent()
+ * @see org.eclipse.emf.cdo.tests.model4.model4Package#getSingleNonContainedElement_Parent()
* @see org.eclipse.emf.cdo.tests.model4.RefSingleNonContained#getElement
* @model opposite="element"
* @generated
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/util/model4AdapterFactory.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/util/model4AdapterFactory.java
index 481ff3c8eb..83146a3d6c 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/util/model4AdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/util/model4AdapterFactory.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
*/
@@ -67,6 +67,8 @@ import org.eclipse.emf.ecore.EObject;
import java.util.Map;
+//import org.eclipse.emf.cdo.tests.model4.*;
+
/**
* <!-- begin-user-doc -->
* The <b>Adapter Factory</b> for the model.
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/util/model4Switch.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/util/model4Switch.java
index aeae789837..2e7c743958 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/util/model4Switch.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/util/model4Switch.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
*/
@@ -66,6 +66,8 @@ import org.eclipse.emf.ecore.EObject;
import java.util.List;
import java.util.Map;
+//import org.eclipse.emf.cdo.tests.model4.*;
+
/**
* <!-- begin-user-doc -->
* The <b>Switch</b> for the model's inheritance hierarchy.
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/util/model4Switch.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/util/model4Switch.java
index e7d1674056..914b76f42c 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/util/model4Switch.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/util/model4Switch.java
@@ -143,9 +143,7 @@ public class model4Switch<T>
RefSingleContained refSingleContained = (RefSingleContained)theEObject;
T result = caseRefSingleContained(refSingleContained);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case model4Package.SINGLE_CONTAINED_ELEMENT:
@@ -153,9 +151,7 @@ public class model4Switch<T>
SingleContainedElement singleContainedElement = (SingleContainedElement)theEObject;
T result = caseSingleContainedElement(singleContainedElement);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case model4Package.REF_SINGLE_NON_CONTAINED:
@@ -163,9 +159,7 @@ public class model4Switch<T>
RefSingleNonContained refSingleNonContained = (RefSingleNonContained)theEObject;
T result = caseRefSingleNonContained(refSingleNonContained);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case model4Package.SINGLE_NON_CONTAINED_ELEMENT:
@@ -173,9 +167,7 @@ public class model4Switch<T>
SingleNonContainedElement singleNonContainedElement = (SingleNonContainedElement)theEObject;
T result = caseSingleNonContainedElement(singleNonContainedElement);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case model4Package.REF_MULTI_CONTAINED:
@@ -183,9 +175,7 @@ public class model4Switch<T>
RefMultiContained refMultiContained = (RefMultiContained)theEObject;
T result = caseRefMultiContained(refMultiContained);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case model4Package.MULTI_CONTAINED_ELEMENT:
@@ -193,9 +183,7 @@ public class model4Switch<T>
MultiContainedElement multiContainedElement = (MultiContainedElement)theEObject;
T result = caseMultiContainedElement(multiContainedElement);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case model4Package.REF_MULTI_NON_CONTAINED:
@@ -203,9 +191,7 @@ public class model4Switch<T>
RefMultiNonContained refMultiNonContained = (RefMultiNonContained)theEObject;
T result = caseRefMultiNonContained(refMultiNonContained);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case model4Package.MULTI_NON_CONTAINED_ELEMENT:
@@ -213,9 +199,7 @@ public class model4Switch<T>
MultiNonContainedElement multiNonContainedElement = (MultiNonContainedElement)theEObject;
T result = caseMultiNonContainedElement(multiNonContainedElement);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case model4Package.REF_MULTI_NON_CONTAINED_UNSETTABLE:
@@ -223,9 +207,7 @@ public class model4Switch<T>
RefMultiNonContainedUnsettable refMultiNonContainedUnsettable = (RefMultiNonContainedUnsettable)theEObject;
T result = caseRefMultiNonContainedUnsettable(refMultiNonContainedUnsettable);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case model4Package.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT:
@@ -233,9 +215,7 @@ public class model4Switch<T>
MultiNonContainedUnsettableElement multiNonContainedUnsettableElement = (MultiNonContainedUnsettableElement)theEObject;
T result = caseMultiNonContainedUnsettableElement(multiNonContainedUnsettableElement);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case model4Package.REF_SINGLE_CONTAINED_NPL:
@@ -243,9 +223,7 @@ public class model4Switch<T>
RefSingleContainedNPL refSingleContainedNPL = (RefSingleContainedNPL)theEObject;
T result = caseRefSingleContainedNPL(refSingleContainedNPL);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case model4Package.REF_SINGLE_NON_CONTAINED_NPL:
@@ -253,9 +231,7 @@ public class model4Switch<T>
RefSingleNonContainedNPL refSingleNonContainedNPL = (RefSingleNonContainedNPL)theEObject;
T result = caseRefSingleNonContainedNPL(refSingleNonContainedNPL);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case model4Package.REF_MULTI_CONTAINED_NPL:
@@ -263,9 +239,7 @@ public class model4Switch<T>
RefMultiContainedNPL refMultiContainedNPL = (RefMultiContainedNPL)theEObject;
T result = caseRefMultiContainedNPL(refMultiContainedNPL);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case model4Package.REF_MULTI_NON_CONTAINED_NPL:
@@ -273,9 +247,7 @@ public class model4Switch<T>
RefMultiNonContainedNPL refMultiNonContainedNPL = (RefMultiNonContainedNPL)theEObject;
T result = caseRefMultiNonContainedNPL(refMultiNonContainedNPL);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case model4Package.CONTAINED_ELEMENT_NO_OPPOSITE:
@@ -283,9 +255,7 @@ public class model4Switch<T>
ContainedElementNoOpposite containedElementNoOpposite = (ContainedElementNoOpposite)theEObject;
T result = caseContainedElementNoOpposite(containedElementNoOpposite);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case model4Package.GEN_REF_SINGLE_CONTAINED:
@@ -293,9 +263,7 @@ public class model4Switch<T>
GenRefSingleContained genRefSingleContained = (GenRefSingleContained)theEObject;
T result = caseGenRefSingleContained(genRefSingleContained);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case model4Package.GEN_REF_SINGLE_NON_CONTAINED:
@@ -303,9 +271,7 @@ public class model4Switch<T>
GenRefSingleNonContained genRefSingleNonContained = (GenRefSingleNonContained)theEObject;
T result = caseGenRefSingleNonContained(genRefSingleNonContained);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case model4Package.GEN_REF_MULTI_CONTAINED:
@@ -313,9 +279,7 @@ public class model4Switch<T>
GenRefMultiContained genRefMultiContained = (GenRefMultiContained)theEObject;
T result = caseGenRefMultiContained(genRefMultiContained);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case model4Package.GEN_REF_MULTI_NON_CONTAINED:
@@ -323,9 +287,7 @@ public class model4Switch<T>
GenRefMultiNonContained genRefMultiNonContained = (GenRefMultiNonContained)theEObject;
T result = caseGenRefMultiNonContained(genRefMultiNonContained);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case model4Package.IMPL_SINGLE_REF_CONTAINER:
@@ -333,13 +295,9 @@ public class model4Switch<T>
ImplSingleRefContainer implSingleRefContainer = (ImplSingleRefContainer)theEObject;
T result = caseImplSingleRefContainer(implSingleRefContainer);
if (result == null)
- {
result = caseISingleRefContainer(implSingleRefContainer);
- }
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case model4Package.IMPL_SINGLE_REF_CONTAINED_ELEMENT:
@@ -347,13 +305,9 @@ public class model4Switch<T>
ImplSingleRefContainedElement implSingleRefContainedElement = (ImplSingleRefContainedElement)theEObject;
T result = caseImplSingleRefContainedElement(implSingleRefContainedElement);
if (result == null)
- {
result = caseISingleRefContainedElement(implSingleRefContainedElement);
- }
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case model4Package.IMPL_SINGLE_REF_NON_CONTAINER:
@@ -361,13 +315,9 @@ public class model4Switch<T>
ImplSingleRefNonContainer implSingleRefNonContainer = (ImplSingleRefNonContainer)theEObject;
T result = caseImplSingleRefNonContainer(implSingleRefNonContainer);
if (result == null)
- {
result = caseISingleRefNonContainer(implSingleRefNonContainer);
- }
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case model4Package.IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT:
@@ -375,13 +325,9 @@ public class model4Switch<T>
ImplSingleRefNonContainedElement implSingleRefNonContainedElement = (ImplSingleRefNonContainedElement)theEObject;
T result = caseImplSingleRefNonContainedElement(implSingleRefNonContainedElement);
if (result == null)
- {
result = caseISingleRefNonContainedElement(implSingleRefNonContainedElement);
- }
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case model4Package.IMPL_MULTI_REF_NON_CONTAINER:
@@ -389,13 +335,9 @@ public class model4Switch<T>
ImplMultiRefNonContainer implMultiRefNonContainer = (ImplMultiRefNonContainer)theEObject;
T result = caseImplMultiRefNonContainer(implMultiRefNonContainer);
if (result == null)
- {
result = caseIMultiRefNonContainer(implMultiRefNonContainer);
- }
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case model4Package.IMPL_MULTI_REF_NON_CONTAINED_ELEMENT:
@@ -403,13 +345,9 @@ public class model4Switch<T>
ImplMultiRefNonContainedElement implMultiRefNonContainedElement = (ImplMultiRefNonContainedElement)theEObject;
T result = caseImplMultiRefNonContainedElement(implMultiRefNonContainedElement);
if (result == null)
- {
result = caseIMultiRefNonContainedElement(implMultiRefNonContainedElement);
- }
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case model4Package.IMPL_MULTI_REF_CONTAINER:
@@ -417,13 +355,9 @@ public class model4Switch<T>
ImplMultiRefContainer implMultiRefContainer = (ImplMultiRefContainer)theEObject;
T result = caseImplMultiRefContainer(implMultiRefContainer);
if (result == null)
- {
result = caseIMultiRefContainer(implMultiRefContainer);
- }
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case model4Package.IMPL_MULTI_REF_CONTAINED_ELEMENT:
@@ -431,13 +365,9 @@ public class model4Switch<T>
ImplMultiRefContainedElement implMultiRefContainedElement = (ImplMultiRefContainedElement)theEObject;
T result = caseImplMultiRefContainedElement(implMultiRefContainedElement);
if (result == null)
- {
result = caseIMultiRefContainedElement(implMultiRefContainedElement);
- }
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case model4Package.IMPL_SINGLE_REF_CONTAINER_NPL:
@@ -445,13 +375,9 @@ public class model4Switch<T>
ImplSingleRefContainerNPL implSingleRefContainerNPL = (ImplSingleRefContainerNPL)theEObject;
T result = caseImplSingleRefContainerNPL(implSingleRefContainerNPL);
if (result == null)
- {
result = caseISingleRefContainerNPL(implSingleRefContainerNPL);
- }
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case model4Package.IMPL_SINGLE_REF_NON_CONTAINER_NPL:
@@ -459,13 +385,9 @@ public class model4Switch<T>
ImplSingleRefNonContainerNPL implSingleRefNonContainerNPL = (ImplSingleRefNonContainerNPL)theEObject;
T result = caseImplSingleRefNonContainerNPL(implSingleRefNonContainerNPL);
if (result == null)
- {
result = caseISingleRefNonContainerNPL(implSingleRefNonContainerNPL);
- }
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case model4Package.IMPL_MULTI_REF_CONTAINER_NPL:
@@ -473,13 +395,9 @@ public class model4Switch<T>
ImplMultiRefContainerNPL implMultiRefContainerNPL = (ImplMultiRefContainerNPL)theEObject;
T result = caseImplMultiRefContainerNPL(implMultiRefContainerNPL);
if (result == null)
- {
result = caseIMultiRefContainerNPL(implMultiRefContainerNPL);
- }
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case model4Package.IMPL_MULTI_REF_NON_CONTAINER_NPL:
@@ -487,13 +405,9 @@ public class model4Switch<T>
ImplMultiRefNonContainerNPL implMultiRefNonContainerNPL = (ImplMultiRefNonContainerNPL)theEObject;
T result = caseImplMultiRefNonContainerNPL(implMultiRefNonContainerNPL);
if (result == null)
- {
result = caseIMultiRefNonContainerNPL(implMultiRefNonContainerNPL);
- }
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case model4Package.IMPL_CONTAINED_ELEMENT_NPL:
@@ -501,17 +415,11 @@ public class model4Switch<T>
ImplContainedElementNPL implContainedElementNPL = (ImplContainedElementNPL)theEObject;
T result = caseImplContainedElementNPL(implContainedElementNPL);
if (result == null)
- {
result = caseIContainedElementNoParentLink(implContainedElementNPL);
- }
if (result == null)
- {
result = caseINamedElement(implContainedElementNPL);
- }
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case model4Package.GEN_REF_MULTI_NU_NON_CONTAINED:
@@ -519,9 +427,7 @@ public class model4Switch<T>
GenRefMultiNUNonContained genRefMultiNUNonContained = (GenRefMultiNUNonContained)theEObject;
T result = caseGenRefMultiNUNonContained(genRefMultiNUNonContained);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case model4Package.GEN_REF_MAP_NON_CONTAINED:
@@ -529,9 +435,7 @@ public class model4Switch<T>
GenRefMapNonContained genRefMapNonContained = (GenRefMapNonContained)theEObject;
T result = caseGenRefMapNonContained(genRefMapNonContained);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case model4Package.STRING_TO_EOBJECT:
@@ -540,9 +444,7 @@ public class model4Switch<T>
Map.Entry<String, EObject> stringToEObject = (Map.Entry<String, EObject>)theEObject;
T result = caseStringToEObject(stringToEObject);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
default:
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/text/description.txt b/plugins/org.eclipse.emf.cdo.tests.model4/text/description.txt
deleted file mode 100644
index f318b6b2d5..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model4/text/description.txt
+++ /dev/null
@@ -1,103 +0,0 @@
-Model Model4
-
-This model description is not a real EMF artifact. It was generated by the
-org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's
-code generator can be extended.
-This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
-
-Package model4 <http://www.eclipse.org/emf/CDO/tests/model4/1.0.0>
-
- Class RefSingleContained
- Reference element : SingleContainedElement
-
- Class SingleContainedElement
- Attribute name : EString
- Reference parent : RefSingleContained
-
- Class RefSingleNonContained
- Reference element : SingleNonContainedElement
-
- Class SingleNonContainedElement
- Attribute name : EString
- Reference parent : RefSingleNonContained
-
- Class RefMultiContained
- Reference elements : MultiContainedElement<<0..*>>
-
- Class MultiContainedElement
- Attribute name : EString
- Reference parent : RefMultiContained
-
- Class RefMultiNonContained
- Reference elements : MultiNonContainedElement<<0..*>>
-
- Class MultiNonContainedElement
- Attribute name : EString
- Reference parent : RefMultiNonContained
-
- Class RefSingleContainedNPL
- Reference element : ContainedElementNoOpposite
-
- Class RefSingleNonContainedNPL
- Reference element : ContainedElementNoOpposite
-
- Class RefMultiContainedNPL
- Reference elements : ContainedElementNoOpposite<<0..*>>
-
- Class RefMultiNonContainedNPL
- Reference elements : ContainedElementNoOpposite<<0..*>>
-
- Class ContainedElementNoOpposite
- Attribute name : EString
-
- Class GenRefSingleContained
- Reference element : EObject
-
- Class GenRefSingleNonContained
- Reference element : EObject
-
- Class GenRefMultiContained
- Reference elements : EObject<<0..*>>
-
- Class GenRefMultiNonContained
- Reference elements : EObject<<0..*>>
-
- Class ImplSingleRefContainer -> ISingleRefContainer
-
- Class ImplSingleRefContainedElement -> ISingleRefContainedElement
- Attribute name : EString
-
- Class ImplSingleRefNonContainer -> ISingleRefNonContainer
-
- Class ImplSingleRefNonContainedElement -> ISingleRefNonContainedElement
- Attribute name : EString
-
- Class ImplMultiRefNonContainer -> IMultiRefNonContainer
-
- Class ImplMultiRefNonContainedElement -> IMultiRefNonContainedElement
- Attribute name : EString
-
- Class ImplMultiRefContainer -> IMultiRefContainer
-
- Class ImplMultiRefContainedElement -> IMultiRefContainedElement
- Attribute name : EString
-
- Class ImplSingleRefContainerNPL -> ISingleRefContainerNPL
-
- Class ImplSingleRefNonContainerNPL -> ISingleRefNonContainerNPL
-
- Class ImplMultiRefContainerNPL -> IMultiRefContainerNPL
-
- Class ImplMultiRefNonContainerNPL -> IMultiRefNonContainerNPL
-
- Class ImplContainedElementNPL -> IContainedElementNoParentLink, INamedElement
-
- Class GenRefMultiNUNonContained
- Reference elements : EObject<<0..*>>
-
- Class GenRefMapNonContained
- Reference elements : StringToEObject<<0..*>>
-
- Class StringToEObject
- Attribute key : EString
- Reference value : EObject
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/.settings/org.eclipse.core.resources.prefs
index 845a3b0679..c00c29ffbe 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/.settings/org.eclipse.core.resources.prefs
@@ -1,2 +1,2 @@
eclipse.preferences.version=1
-encoding//model/interfaces.legacy.genmodel=UTF-8
+encoding//model/model4interfaces.legacy.genmodel=UTF-8
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.genmodel b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.genmodel
deleted file mode 100644
index dd30ee38a4..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.genmodel
+++ /dev/null
@@ -1,56 +0,0 @@
-<?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"
- xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel"
- modelDirectory="/org.eclipse.emf.cdo.tests.model4interfaces/src" editDirectory=""
- editorDirectory="" modelPluginID="org.eclipse.emf.cdo.tests.model4interfaces"
- modelName="Interfaces" updateClasspath="false" rootExtendsClass="org.eclipse.emf.internal.cdo.CDOObjectImpl"
- reflectiveDelegation="true" codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.cdo"
- featureDelegation="Reflective" complianceLevel="5.0" copyrightFields="false" editPluginID="org.eclipse.emf.cdo.tests.model4interfaces.edit"
- editorPluginID="org.eclipse.emf.cdo.tests.model4interfaces.edit" runtimeVersion="2.6">
- <foreignModel>interfaces.ecore</foreignModel>
- <modelPluginVariables>CDO=org.eclipse.emf.cdo</modelPluginVariables>
- <genPackages prefix="model4interfaces" basePackage="org.eclipse.emf.cdo.tests" disposableProviderFactory="true"
- literalsInterface="false" ecorePackage="interfaces.ecore#/">
- <genClasses image="false" ecoreClass="interfaces.ecore#//ISingleRefContainer">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference interfaces.ecore#//ISingleRefContainer/element"/>
- </genClasses>
- <genClasses image="false" ecoreClass="interfaces.ecore#//ISingleRefContainedElement">
- <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference interfaces.ecore#//ISingleRefContainedElement/parent"/>
- </genClasses>
- <genClasses image="false" ecoreClass="interfaces.ecore#//ISingleRefNonContainer">
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference interfaces.ecore#//ISingleRefNonContainer/element"/>
- </genClasses>
- <genClasses image="false" ecoreClass="interfaces.ecore#//ISingleRefNonContainedElement">
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference interfaces.ecore#//ISingleRefNonContainedElement/parent"/>
- </genClasses>
- <genClasses image="false" ecoreClass="interfaces.ecore#//IMultiRefContainer">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference interfaces.ecore#//IMultiRefContainer/elements"/>
- </genClasses>
- <genClasses image="false" ecoreClass="interfaces.ecore#//IMultiRefContainedElement">
- <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference interfaces.ecore#//IMultiRefContainedElement/parent"/>
- </genClasses>
- <genClasses image="false" ecoreClass="interfaces.ecore#//IMultiRefNonContainer">
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference interfaces.ecore#//IMultiRefNonContainer/elements"/>
- </genClasses>
- <genClasses image="false" ecoreClass="interfaces.ecore#//IMultiRefNonContainedElement">
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference interfaces.ecore#//IMultiRefNonContainedElement/parent"/>
- </genClasses>
- <genClasses image="false" ecoreClass="interfaces.ecore#//INamedElement">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute interfaces.ecore#//INamedElement/name"/>
- </genClasses>
- <genClasses image="false" ecoreClass="interfaces.ecore#//IContainedElementNoParentLink"/>
- <genClasses image="false" ecoreClass="interfaces.ecore#//ISingleRefContainerNPL">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference interfaces.ecore#//ISingleRefContainerNPL/element"/>
- </genClasses>
- <genClasses image="false" ecoreClass="interfaces.ecore#//ISingleRefNonContainerNPL">
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference interfaces.ecore#//ISingleRefNonContainerNPL/element"/>
- </genClasses>
- <genClasses image="false" ecoreClass="interfaces.ecore#//IMultiRefContainerNPL">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference interfaces.ecore#//IMultiRefContainerNPL/elements"/>
- </genClasses>
- <genClasses image="false" ecoreClass="interfaces.ecore#//IMultiRefNonContainerNPL">
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference interfaces.ecore#//IMultiRefNonContainerNPL/elements"/>
- </genClasses>
- </genPackages>
-</genmodel:GenModel>
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.legacy.genmodel b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.legacy.genmodel
deleted file mode 100644
index c10f40b611..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.legacy.genmodel
+++ /dev/null
@@ -1,56 +0,0 @@
-<?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"
- xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA; Eike Stepper - initial API and implementation"
- modelDirectory="/org.eclipse.emf.cdo.tests.model4interfaces/src" editDirectory=""
- editorDirectory="" modelPluginID="org.eclipse.emf.cdo.tests.model4interfaces"
- modelName="Interfaces" updateClasspath="false" codeFormatting="true" testsDirectory=""
- importerID="org.eclipse.emf.importer.cdo" complianceLevel="5.0" copyrightFields="false"
- editPluginID="org.eclipse.emf.cdo.tests.model4interfaces.edit" editorPluginID="org.eclipse.emf.cdo.tests.model4interfaces.edit"
- runtimeVersion="2.6">
- <foreignModel>interfaces.ecore</foreignModel>
- <modelPluginVariables>CDO=org.eclipse.emf.cdo</modelPluginVariables>
- <genPackages prefix="model4interfaces" basePackage="org.eclipse.emf.cdo.tests" disposableProviderFactory="true"
- metaDataPackageSuffix="legacy" classPackageSuffix="legacy.impl" utilityPackageSuffix="legacy.util"
- literalsInterface="false" ecorePackage="interfaces.ecore#/">
- <genClasses image="false" ecoreClass="interfaces.ecore#//ISingleRefContainer">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference interfaces.ecore#//ISingleRefContainer/element"/>
- </genClasses>
- <genClasses image="false" ecoreClass="interfaces.ecore#//ISingleRefContainedElement">
- <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference interfaces.ecore#//ISingleRefContainedElement/parent"/>
- </genClasses>
- <genClasses image="false" ecoreClass="interfaces.ecore#//ISingleRefNonContainer">
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference interfaces.ecore#//ISingleRefNonContainer/element"/>
- </genClasses>
- <genClasses image="false" ecoreClass="interfaces.ecore#//ISingleRefNonContainedElement">
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference interfaces.ecore#//ISingleRefNonContainedElement/parent"/>
- </genClasses>
- <genClasses image="false" ecoreClass="interfaces.ecore#//IMultiRefContainer">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference interfaces.ecore#//IMultiRefContainer/elements"/>
- </genClasses>
- <genClasses image="false" ecoreClass="interfaces.ecore#//IMultiRefContainedElement">
- <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference interfaces.ecore#//IMultiRefContainedElement/parent"/>
- </genClasses>
- <genClasses image="false" ecoreClass="interfaces.ecore#//IMultiRefNonContainer">
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference interfaces.ecore#//IMultiRefNonContainer/elements"/>
- </genClasses>
- <genClasses image="false" ecoreClass="interfaces.ecore#//IMultiRefNonContainedElement">
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference interfaces.ecore#//IMultiRefNonContainedElement/parent"/>
- </genClasses>
- <genClasses image="false" ecoreClass="interfaces.ecore#//INamedElement">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute interfaces.ecore#//INamedElement/name"/>
- </genClasses>
- <genClasses image="false" ecoreClass="interfaces.ecore#//IContainedElementNoParentLink"/>
- <genClasses image="false" ecoreClass="interfaces.ecore#//ISingleRefContainerNPL">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference interfaces.ecore#//ISingleRefContainerNPL/element"/>
- </genClasses>
- <genClasses image="false" ecoreClass="interfaces.ecore#//ISingleRefNonContainerNPL">
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference interfaces.ecore#//ISingleRefNonContainerNPL/element"/>
- </genClasses>
- <genClasses image="false" ecoreClass="interfaces.ecore#//IMultiRefContainerNPL">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference interfaces.ecore#//IMultiRefContainerNPL/elements"/>
- </genClasses>
- <genClasses image="false" ecoreClass="interfaces.ecore#//IMultiRefNonContainerNPL">
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference interfaces.ecore#//IMultiRefNonContainerNPL/elements"/>
- </genClasses>
- </genPackages>
-</genmodel:GenModel>
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.ecore b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/model4interfaces.ecore
index 71b02acaf8..65cc861667 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.ecore
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/model4interfaces.ecore
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="model4interfaces"
- nsURI="http://www.eclipse.org/emf/CDO/tests/model4interfaces/1.0.0" nsPrefix="model4interfaces">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="model4interfaces" nsURI="http://www.eclipse.org/emf/CDO/tests/model4interfaces/1.0.0"
+ nsPrefix="model4interfaces">
<eClassifiers xsi:type="ecore:EClass" name="ISingleRefContainer" abstract="true"
interface="true">
<eStructuralFeatures xsi:type="ecore:EReference" name="element" eType="#//ISingleRefContainedElement"
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/model4interfaces.genmodel b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/model4interfaces.genmodel
new file mode 100644
index 0000000000..415b72a6be
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/model4interfaces.genmodel
@@ -0,0 +1,54 @@
+<?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"
+ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.emf.cdo.tests.model4interfaces/src"
+ editDirectory="" editorDirectory="" modelPluginID="org.eclipse.emf.cdo.tests.model4interfaces"
+ modelName="Interfaces" updateClasspath="false" rootExtendsClass="org.eclipse.emf.internal.cdo.CDOObjectImpl"
+ reflectiveDelegation="true" codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.ecore"
+ featureDelegation="Reflective" complianceLevel="5.0" copyrightFields="false" editPluginID="org.eclipse.emf.cdo.tests.model4interfaces.edit"
+ editorPluginID="org.eclipse.emf.cdo.tests.model4interfaces.edit" runtimeVersion="2.6">
+ <foreignModel>model4interfaces.ecore</foreignModel>
+ <modelPluginVariables>CDO=org.eclipse.emf.cdo</modelPluginVariables>
+ <genPackages prefix="model4interfaces" basePackage="org.eclipse.emf.cdo.tests" disposableProviderFactory="true"
+ literalsInterface="false" ecorePackage="model4interfaces.ecore#/">
+ <genClasses image="false" ecoreClass="model4interfaces.ecore#//ISingleRefContainer">
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model4interfaces.ecore#//ISingleRefContainer/element"/>
+ </genClasses>
+ <genClasses image="false" ecoreClass="model4interfaces.ecore#//ISingleRefContainedElement">
+ <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference model4interfaces.ecore#//ISingleRefContainedElement/parent"/>
+ </genClasses>
+ <genClasses image="false" ecoreClass="model4interfaces.ecore#//ISingleRefNonContainer">
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model4interfaces.ecore#//ISingleRefNonContainer/element"/>
+ </genClasses>
+ <genClasses image="false" ecoreClass="model4interfaces.ecore#//ISingleRefNonContainedElement">
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model4interfaces.ecore#//ISingleRefNonContainedElement/parent"/>
+ </genClasses>
+ <genClasses image="false" ecoreClass="model4interfaces.ecore#//IMultiRefContainer">
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model4interfaces.ecore#//IMultiRefContainer/elements"/>
+ </genClasses>
+ <genClasses image="false" ecoreClass="model4interfaces.ecore#//IMultiRefContainedElement">
+ <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference model4interfaces.ecore#//IMultiRefContainedElement/parent"/>
+ </genClasses>
+ <genClasses image="false" ecoreClass="model4interfaces.ecore#//IMultiRefNonContainer">
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model4interfaces.ecore#//IMultiRefNonContainer/elements"/>
+ </genClasses>
+ <genClasses image="false" ecoreClass="model4interfaces.ecore#//IMultiRefNonContainedElement">
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model4interfaces.ecore#//IMultiRefNonContainedElement/parent"/>
+ </genClasses>
+ <genClasses image="false" ecoreClass="model4interfaces.ecore#//INamedElement">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model4interfaces.ecore#//INamedElement/name"/>
+ </genClasses>
+ <genClasses image="false" ecoreClass="model4interfaces.ecore#//IContainedElementNoParentLink"/>
+ <genClasses image="false" ecoreClass="model4interfaces.ecore#//ISingleRefContainerNPL">
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model4interfaces.ecore#//ISingleRefContainerNPL/element"/>
+ </genClasses>
+ <genClasses image="false" ecoreClass="model4interfaces.ecore#//ISingleRefNonContainerNPL">
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model4interfaces.ecore#//ISingleRefNonContainerNPL/element"/>
+ </genClasses>
+ <genClasses image="false" ecoreClass="model4interfaces.ecore#//IMultiRefContainerNPL">
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model4interfaces.ecore#//IMultiRefContainerNPL/elements"/>
+ </genClasses>
+ <genClasses image="false" ecoreClass="model4interfaces.ecore#//IMultiRefNonContainerNPL">
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model4interfaces.ecore#//IMultiRefNonContainerNPL/elements"/>
+ </genClasses>
+ </genPackages>
+</genmodel:GenModel>
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/model4interfaces.legacy.genmodel b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/model4interfaces.legacy.genmodel
new file mode 100644
index 0000000000..b4e3f1331b
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/model4interfaces.legacy.genmodel
@@ -0,0 +1,56 @@
+<?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"
+ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA; Eike Stepper - initial API and implementation"
+ modelDirectory="/org.eclipse.emf.cdo.tests.model4interfaces/src" editDirectory=""
+ editorDirectory="" modelPluginID="org.eclipse.emf.cdo.tests.model4interfaces"
+ modelName="Interfaces" updateClasspath="false" codeFormatting="true" testsDirectory=""
+ importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false"
+ editPluginID="org.eclipse.emf.cdo.tests.model4interfaces.edit" editorPluginID="org.eclipse.emf.cdo.tests.model4interfaces.edit"
+ runtimeVersion="2.6">
+ <foreignModel>model4interfaces.ecore</foreignModel>
+ <modelPluginVariables>CDO=org.eclipse.emf.cdo</modelPluginVariables>
+ <genPackages prefix="model4interfaces" basePackage="org.eclipse.emf.cdo.tests" disposableProviderFactory="true"
+ metaDataPackageSuffix="legacy" classPackageSuffix="legacy.impl" utilityPackageSuffix="legacy.util"
+ literalsInterface="false" ecorePackage="model4interfaces.ecore#/">
+ <genClasses image="false" ecoreClass="model4interfaces.ecore#//ISingleRefContainer">
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model4interfaces.ecore#//ISingleRefContainer/element"/>
+ </genClasses>
+ <genClasses image="false" ecoreClass="model4interfaces.ecore#//ISingleRefContainedElement">
+ <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference model4interfaces.ecore#//ISingleRefContainedElement/parent"/>
+ </genClasses>
+ <genClasses image="false" ecoreClass="model4interfaces.ecore#//ISingleRefNonContainer">
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model4interfaces.ecore#//ISingleRefNonContainer/element"/>
+ </genClasses>
+ <genClasses image="false" ecoreClass="model4interfaces.ecore#//ISingleRefNonContainedElement">
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model4interfaces.ecore#//ISingleRefNonContainedElement/parent"/>
+ </genClasses>
+ <genClasses image="false" ecoreClass="model4interfaces.ecore#//IMultiRefContainer">
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model4interfaces.ecore#//IMultiRefContainer/elements"/>
+ </genClasses>
+ <genClasses image="false" ecoreClass="model4interfaces.ecore#//IMultiRefContainedElement">
+ <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference model4interfaces.ecore#//IMultiRefContainedElement/parent"/>
+ </genClasses>
+ <genClasses image="false" ecoreClass="model4interfaces.ecore#//IMultiRefNonContainer">
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model4interfaces.ecore#//IMultiRefNonContainer/elements"/>
+ </genClasses>
+ <genClasses image="false" ecoreClass="model4interfaces.ecore#//IMultiRefNonContainedElement">
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model4interfaces.ecore#//IMultiRefNonContainedElement/parent"/>
+ </genClasses>
+ <genClasses image="false" ecoreClass="model4interfaces.ecore#//INamedElement">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model4interfaces.ecore#//INamedElement/name"/>
+ </genClasses>
+ <genClasses image="false" ecoreClass="model4interfaces.ecore#//IContainedElementNoParentLink"/>
+ <genClasses image="false" ecoreClass="model4interfaces.ecore#//ISingleRefContainerNPL">
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model4interfaces.ecore#//ISingleRefContainerNPL/element"/>
+ </genClasses>
+ <genClasses image="false" ecoreClass="model4interfaces.ecore#//ISingleRefNonContainerNPL">
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model4interfaces.ecore#//ISingleRefNonContainerNPL/element"/>
+ </genClasses>
+ <genClasses image="false" ecoreClass="model4interfaces.ecore#//IMultiRefContainerNPL">
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model4interfaces.ecore#//IMultiRefContainerNPL/elements"/>
+ </genClasses>
+ <genClasses image="false" ecoreClass="model4interfaces.ecore#//IMultiRefNonContainerNPL">
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model4interfaces.ecore#//IMultiRefNonContainerNPL/elements"/>
+ </genClasses>
+ </genPackages>
+</genmodel:GenModel>
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IContainedElementNoParentLink.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IContainedElementNoParentLink.java
index 20ec12be87..93b14b911d 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IContainedElementNoParentLink.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IContainedElementNoParentLink.java
@@ -17,7 +17,7 @@ import org.eclipse.emf.ecore.EObject;
* <!-- end-user-doc -->
*
*
- * @see org.eclipse.emf.cdo.tests.model4interfaces.legacy.model4interfacesPackage#getIContainedElementNoParentLink()
+ * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getIContainedElementNoParentLink()
* @model interface="true" abstract="true"
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefContainedElement.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefContainedElement.java
index 9541a1f429..6728ca5d82 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefContainedElement.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefContainedElement.java
@@ -23,7 +23,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model4interfaces.legacy.model4interfacesPackage#getIMultiRefContainedElement()
+ * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getIMultiRefContainedElement()
* @model interface="true" abstract="true"
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefContainer.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefContainer.java
index 9465af8865..1710ba36a2 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefContainer.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefContainer.java
@@ -24,7 +24,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model4interfaces.legacy.model4interfacesPackage#getIMultiRefContainer()
+ * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getIMultiRefContainer()
* @model interface="true" abstract="true"
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefContainerNPL.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefContainerNPL.java
index 0f7cab5dcb..3fb0555e9f 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefContainerNPL.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefContainerNPL.java
@@ -24,7 +24,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model4interfaces.legacy.model4interfacesPackage#getIMultiRefContainerNPL()
+ * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getIMultiRefContainerNPL()
* @model interface="true" abstract="true"
* @generated
*/
@@ -40,7 +40,7 @@ public interface IMultiRefContainerNPL extends EObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Elements</em>' containment reference list.
- * @see org.eclipse.emf.cdo.tests.model4interfaces.legacy.model4interfacesPackage#getIMultiRefContainerNPL_Elements()
+ * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getIMultiRefContainerNPL_Elements()
* @model containment="true"
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefNonContainedElement.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefNonContainedElement.java
index 347f338e55..ac2f3652ef 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefNonContainedElement.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefNonContainedElement.java
@@ -23,7 +23,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model4interfaces.legacy.model4interfacesPackage#getIMultiRefNonContainedElement()
+ * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getIMultiRefNonContainedElement()
* @model interface="true" abstract="true"
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefNonContainer.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefNonContainer.java
index 9b2440b63e..dac47cc552 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefNonContainer.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefNonContainer.java
@@ -24,7 +24,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model4interfaces.legacy.model4interfacesPackage#getIMultiRefNonContainer()
+ * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getIMultiRefNonContainer()
* @model interface="true" abstract="true"
* @generated
*/
@@ -41,7 +41,7 @@ public interface IMultiRefNonContainer extends EObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Elements</em>' reference list.
- * @see org.eclipse.emf.cdo.tests.model4interfaces.legacy.model4interfacesPackage#getIMultiRefNonContainer_Elements()
+ * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getIMultiRefNonContainer_Elements()
* @see org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainedElement#getParent
* @model opposite="parent"
* @generated
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefNonContainerNPL.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefNonContainerNPL.java
index a3c87be379..afaa8a4800 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefNonContainerNPL.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefNonContainerNPL.java
@@ -24,7 +24,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model4interfaces.legacy.model4interfacesPackage#getIMultiRefNonContainerNPL()
+ * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getIMultiRefNonContainerNPL()
* @model interface="true" abstract="true"
* @generated
*/
@@ -40,7 +40,7 @@ public interface IMultiRefNonContainerNPL extends EObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Elements</em>' reference list.
- * @see org.eclipse.emf.cdo.tests.model4interfaces.legacy.model4interfacesPackage#getIMultiRefNonContainerNPL_Elements()
+ * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getIMultiRefNonContainerNPL_Elements()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/INamedElement.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/INamedElement.java
index 8d5869e6ad..912bbc897e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/INamedElement.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/INamedElement.java
@@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model4interfaces.legacy.model4interfacesPackage#getINamedElement()
+ * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getINamedElement()
* @model interface="true" abstract="true"
* @generated
*/
@@ -37,7 +37,7 @@ public interface INamedElement extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Name</em>' attribute.
* @see #setName(String)
- * @see org.eclipse.emf.cdo.tests.model4interfaces.legacy.model4interfacesPackage#getINamedElement_Name()
+ * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getINamedElement_Name()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefContainedElement.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefContainedElement.java
index 09c3f14826..73c7ff95a1 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefContainedElement.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefContainedElement.java
@@ -23,7 +23,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model4interfaces.legacy.model4interfacesPackage#getISingleRefContainedElement()
+ * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getISingleRefContainedElement()
* @model interface="true" abstract="true"
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefContainer.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefContainer.java
index b48c1beb63..a7b5caac5e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefContainer.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefContainer.java
@@ -23,7 +23,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model4interfaces.legacy.model4interfacesPackage#getISingleRefContainer()
+ * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getISingleRefContainer()
* @model interface="true" abstract="true"
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefContainerNPL.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefContainerNPL.java
index 4f1892c479..71173aacaa 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefContainerNPL.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefContainerNPL.java
@@ -23,7 +23,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model4interfaces.legacy.model4interfacesPackage#getISingleRefContainerNPL()
+ * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getISingleRefContainerNPL()
* @model interface="true" abstract="true"
* @generated
*/
@@ -39,7 +39,7 @@ public interface ISingleRefContainerNPL extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Element</em>' containment reference.
* @see #setElement(IContainedElementNoParentLink)
- * @see org.eclipse.emf.cdo.tests.model4interfaces.legacy.model4interfacesPackage#getISingleRefContainerNPL_Element()
+ * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getISingleRefContainerNPL_Element()
* @model containment="true"
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefNonContainedElement.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefNonContainedElement.java
index 5740280a28..b9a0591363 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefNonContainedElement.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefNonContainedElement.java
@@ -23,7 +23,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model4interfaces.legacy.model4interfacesPackage#getISingleRefNonContainedElement()
+ * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getISingleRefNonContainedElement()
* @model interface="true" abstract="true"
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefNonContainer.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefNonContainer.java
index 108b8d7db1..eb3cb4e51f 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefNonContainer.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefNonContainer.java
@@ -23,7 +23,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model4interfaces.legacy.model4interfacesPackage#getISingleRefNonContainer()
+ * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getISingleRefNonContainer()
* @model interface="true" abstract="true"
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefNonContainerNPL.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefNonContainerNPL.java
index 2cea409e79..28a57e4840 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefNonContainerNPL.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefNonContainerNPL.java
@@ -23,7 +23,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model4interfaces.legacy.model4interfacesPackage#getISingleRefNonContainerNPL()
+ * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getISingleRefNonContainerNPL()
* @model interface="true" abstract="true"
* @generated
*/
@@ -39,7 +39,7 @@ public interface ISingleRefNonContainerNPL extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Element</em>' reference.
* @see #setElement(IContainedElementNoParentLink)
- * @see org.eclipse.emf.cdo.tests.model4interfaces.legacy.model4interfacesPackage#getISingleRefNonContainerNPL_Element()
+ * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getISingleRefNonContainerNPL_Element()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/legacy/util/model4interfacesAdapterFactory.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/legacy/util/model4interfacesAdapterFactory.java
index 85c8add074..76b4c18a1e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/legacy/util/model4interfacesAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/legacy/util/model4interfacesAdapterFactory.java
@@ -4,12 +4,13 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.tests.model4interfaces.legacy.util;
+//import org.eclipse.emf.cdo.tests.model4interfaces.*;
import org.eclipse.emf.cdo.tests.model4interfaces.IContainedElementNoParentLink;
import org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainedElement;
import org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainer;
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/legacy/util/model4interfacesSwitch.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/legacy/util/model4interfacesSwitch.java
index 00e95962bc..c1a7d90f6e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/legacy/util/model4interfacesSwitch.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/legacy/util/model4interfacesSwitch.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
*/
@@ -31,6 +31,8 @@ import org.eclipse.emf.ecore.EObject;
import java.util.List;
+//import org.eclipse.emf.cdo.tests.model4interfaces.*;
+
/**
* <!-- begin-user-doc -->
* The <b>Switch</b> for the model's inheritance hierarchy.
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/util/model4interfacesSwitch.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/util/model4interfacesSwitch.java
index a0734f643c..8d0bf4a913 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/util/model4interfacesSwitch.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/util/model4interfacesSwitch.java
@@ -108,9 +108,7 @@ public class model4interfacesSwitch<T>
ISingleRefContainer iSingleRefContainer = (ISingleRefContainer)theEObject;
T result = caseISingleRefContainer(iSingleRefContainer);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case model4interfacesPackage.ISINGLE_REF_CONTAINED_ELEMENT:
@@ -118,9 +116,7 @@ public class model4interfacesSwitch<T>
ISingleRefContainedElement iSingleRefContainedElement = (ISingleRefContainedElement)theEObject;
T result = caseISingleRefContainedElement(iSingleRefContainedElement);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case model4interfacesPackage.ISINGLE_REF_NON_CONTAINER:
@@ -128,9 +124,7 @@ public class model4interfacesSwitch<T>
ISingleRefNonContainer iSingleRefNonContainer = (ISingleRefNonContainer)theEObject;
T result = caseISingleRefNonContainer(iSingleRefNonContainer);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case model4interfacesPackage.ISINGLE_REF_NON_CONTAINED_ELEMENT:
@@ -138,9 +132,7 @@ public class model4interfacesSwitch<T>
ISingleRefNonContainedElement iSingleRefNonContainedElement = (ISingleRefNonContainedElement)theEObject;
T result = caseISingleRefNonContainedElement(iSingleRefNonContainedElement);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case model4interfacesPackage.IMULTI_REF_CONTAINER:
@@ -148,9 +140,7 @@ public class model4interfacesSwitch<T>
IMultiRefContainer iMultiRefContainer = (IMultiRefContainer)theEObject;
T result = caseIMultiRefContainer(iMultiRefContainer);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case model4interfacesPackage.IMULTI_REF_CONTAINED_ELEMENT:
@@ -158,9 +148,7 @@ public class model4interfacesSwitch<T>
IMultiRefContainedElement iMultiRefContainedElement = (IMultiRefContainedElement)theEObject;
T result = caseIMultiRefContainedElement(iMultiRefContainedElement);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case model4interfacesPackage.IMULTI_REF_NON_CONTAINER:
@@ -168,9 +156,7 @@ public class model4interfacesSwitch<T>
IMultiRefNonContainer iMultiRefNonContainer = (IMultiRefNonContainer)theEObject;
T result = caseIMultiRefNonContainer(iMultiRefNonContainer);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case model4interfacesPackage.IMULTI_REF_NON_CONTAINED_ELEMENT:
@@ -178,9 +164,7 @@ public class model4interfacesSwitch<T>
IMultiRefNonContainedElement iMultiRefNonContainedElement = (IMultiRefNonContainedElement)theEObject;
T result = caseIMultiRefNonContainedElement(iMultiRefNonContainedElement);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case model4interfacesPackage.INAMED_ELEMENT:
@@ -188,9 +172,7 @@ public class model4interfacesSwitch<T>
INamedElement iNamedElement = (INamedElement)theEObject;
T result = caseINamedElement(iNamedElement);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case model4interfacesPackage.ICONTAINED_ELEMENT_NO_PARENT_LINK:
@@ -198,9 +180,7 @@ public class model4interfacesSwitch<T>
IContainedElementNoParentLink iContainedElementNoParentLink = (IContainedElementNoParentLink)theEObject;
T result = caseIContainedElementNoParentLink(iContainedElementNoParentLink);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case model4interfacesPackage.ISINGLE_REF_CONTAINER_NPL:
@@ -208,9 +188,7 @@ public class model4interfacesSwitch<T>
ISingleRefContainerNPL iSingleRefContainerNPL = (ISingleRefContainerNPL)theEObject;
T result = caseISingleRefContainerNPL(iSingleRefContainerNPL);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case model4interfacesPackage.ISINGLE_REF_NON_CONTAINER_NPL:
@@ -218,9 +196,7 @@ public class model4interfacesSwitch<T>
ISingleRefNonContainerNPL iSingleRefNonContainerNPL = (ISingleRefNonContainerNPL)theEObject;
T result = caseISingleRefNonContainerNPL(iSingleRefNonContainerNPL);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case model4interfacesPackage.IMULTI_REF_CONTAINER_NPL:
@@ -228,9 +204,7 @@ public class model4interfacesSwitch<T>
IMultiRefContainerNPL iMultiRefContainerNPL = (IMultiRefContainerNPL)theEObject;
T result = caseIMultiRefContainerNPL(iMultiRefContainerNPL);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case model4interfacesPackage.IMULTI_REF_NON_CONTAINER_NPL:
@@ -238,9 +212,7 @@ public class model4interfacesSwitch<T>
IMultiRefNonContainerNPL iMultiRefNonContainerNPL = (IMultiRefNonContainerNPL)theEObject;
T result = caseIMultiRefNonContainerNPL(iMultiRefNonContainerNPL);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
default:
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/model/model5.genmodel b/plugins/org.eclipse.emf.cdo.tests.model5/model/model5.genmodel
index a5bd8af583..e558bcccc4 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/model/model5.genmodel
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/model/model5.genmodel
@@ -3,7 +3,7 @@
xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.emf.cdo.tests.model5/src" editDirectory=""
editorDirectory="" modelPluginID="org.eclipse.emf.cdo.tests.model5" modelName="Model5"
updateClasspath="false" rootExtendsClass="org.eclipse.emf.internal.cdo.CDOObjectImpl"
- reflectiveDelegation="true" codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.cdo"
+ reflectiveDelegation="true" codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.ecore"
featureDelegation="Reflective" complianceLevel="5.0" providerRootExtendsClass="org.eclipse.emf.cdo.edit.CDOItemProviderAdapter"
runtimeVersion="2.6">
<foreignModel>model5.ecore</foreignModel>
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Child.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Child.java
index 525b6dd751..12608f38ff 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Child.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Child.java
@@ -26,20 +26,13 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model5.legacy.Model5Package#getChild()
+ * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getChild()
* @model
* @generated
*/
public interface Child extends EObject
{
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String copyright = "Copyright (c) 2004 - 2012 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";
-
- /**
* Returns the value of the '<em><b>Parent</b></em>' container reference.
* It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model5.Parent#getChildren <em>Children</em>}'.
* <!-- begin-user-doc -->
@@ -50,7 +43,7 @@ public interface Child extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Parent</em>' container reference.
* @see #setParent(Parent)
- * @see org.eclipse.emf.cdo.tests.model5.legacy.Model5Package#getChild_Parent()
+ * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getChild_Parent()
* @see org.eclipse.emf.cdo.tests.model5.Parent#getChildren
* @model opposite="children" transient="false"
* @generated
@@ -78,7 +71,7 @@ public interface Child extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Preferred By</em>' reference.
* @see #setPreferredBy(Parent)
- * @see org.eclipse.emf.cdo.tests.model5.legacy.Model5Package#getChild_PreferredBy()
+ * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getChild_PreferredBy()
* @see org.eclipse.emf.cdo.tests.model5.Parent#getFavourite
* @model opposite="favourite"
* @generated
@@ -105,7 +98,7 @@ public interface Child extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Name</em>' attribute.
* @see #setName(String)
- * @see org.eclipse.emf.cdo.tests.model5.legacy.Model5Package#getChild_Name()
+ * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getChild_Name()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Doctor.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Doctor.java
index 30a4d7f217..e82a119252 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Doctor.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Doctor.java
@@ -16,17 +16,10 @@ import org.eclipse.emf.ecore.EObject;
* <!-- begin-user-doc --> A representation of the model object '<em><b>Doctor</b></em>'. <!-- end-user-doc -->
*
*
- * @see org.eclipse.emf.cdo.tests.model5.legacy.Model5Package#getDoctor()
+ * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getDoctor()
* @model
* @generated
*/
public interface Doctor extends EObject
{
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String copyright = "Copyright (c) 2004 - 2012 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";
} // Doctor
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfBoolean.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfBoolean.java
index 0e09711bb6..e9b86dc65c 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfBoolean.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfBoolean.java
@@ -30,13 +30,6 @@ import org.eclipse.emf.ecore.EObject;
public interface GenListOfBoolean extends EObject
{
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String copyright = "Copyright (c) 2004 - 2012 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";
-
- /**
* Returns the value of the '<em><b>Elements</b></em>' attribute list.
* The list contents are of type {@link java.lang.Boolean}.
* <!-- begin-user-doc -->
@@ -46,7 +39,7 @@ public interface GenListOfBoolean extends EObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Elements</em>' attribute list.
- * @see org.eclipse.emf.cdo.tests.model5.legacy.Model5Package#getGenListOfBoolean_Elements()
+ * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getGenListOfBoolean_Elements()
* @model unique="false"
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfChar.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfChar.java
index c0b472caa5..223d74a08f 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfChar.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfChar.java
@@ -30,13 +30,6 @@ import org.eclipse.emf.ecore.EObject;
public interface GenListOfChar extends EObject
{
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String copyright = "Copyright (c) 2004 - 2012 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";
-
- /**
* Returns the value of the '<em><b>Elements</b></em>' attribute list.
* The list contents are of type {@link java.lang.Character}.
* <!-- begin-user-doc -->
@@ -46,7 +39,7 @@ public interface GenListOfChar extends EObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Elements</em>' attribute list.
- * @see org.eclipse.emf.cdo.tests.model5.legacy.Model5Package#getGenListOfChar_Elements()
+ * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getGenListOfChar_Elements()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfDate.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfDate.java
index 6c8982c711..2defe86830 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfDate.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfDate.java
@@ -32,13 +32,6 @@ import java.util.Date;
public interface GenListOfDate extends EObject
{
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String copyright = "Copyright (c) 2004 - 2012 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";
-
- /**
* Returns the value of the '<em><b>Elements</b></em>' attribute list.
* The list contents are of type {@link java.util.Date}.
* <!-- begin-user-doc -->
@@ -48,7 +41,7 @@ public interface GenListOfDate extends EObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Elements</em>' attribute list.
- * @see org.eclipse.emf.cdo.tests.model5.legacy.Model5Package#getGenListOfDate_Elements()
+ * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getGenListOfDate_Elements()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfDouble.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfDouble.java
index 85af224855..772df24f06 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfDouble.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfDouble.java
@@ -30,13 +30,6 @@ import org.eclipse.emf.ecore.EObject;
public interface GenListOfDouble extends EObject
{
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String copyright = "Copyright (c) 2004 - 2012 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";
-
- /**
* Returns the value of the '<em><b>Elements</b></em>' attribute list.
* The list contents are of type {@link java.lang.Double}.
* <!-- begin-user-doc -->
@@ -46,7 +39,7 @@ public interface GenListOfDouble extends EObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Elements</em>' attribute list.
- * @see org.eclipse.emf.cdo.tests.model5.legacy.Model5Package#getGenListOfDouble_Elements()
+ * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getGenListOfDouble_Elements()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfFloat.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfFloat.java
index 19be601eab..884e9b54c9 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfFloat.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfFloat.java
@@ -30,13 +30,6 @@ import org.eclipse.emf.ecore.EObject;
public interface GenListOfFloat extends EObject
{
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String copyright = "Copyright (c) 2004 - 2012 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";
-
- /**
* Returns the value of the '<em><b>Elements</b></em>' attribute list.
* The list contents are of type {@link java.lang.Float}.
* <!-- begin-user-doc -->
@@ -46,7 +39,7 @@ public interface GenListOfFloat extends EObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Elements</em>' attribute list.
- * @see org.eclipse.emf.cdo.tests.model5.legacy.Model5Package#getGenListOfFloat_Elements()
+ * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getGenListOfFloat_Elements()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfInt.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfInt.java
index f45d4a0928..9d703f0d9b 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfInt.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfInt.java
@@ -23,20 +23,13 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model5.legacy.Model5Package#getGenListOfInt()
+ * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getGenListOfInt()
* @model
* @generated
*/
public interface GenListOfInt extends EObject
{
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String copyright = "Copyright (c) 2004 - 2012 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";
-
- /**
* Returns the value of the '<em><b>Elements</b></em>' attribute list.
* The list contents are of type {@link java.lang.Integer}.
* <!-- begin-user-doc -->
@@ -46,7 +39,7 @@ public interface GenListOfInt extends EObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Elements</em>' attribute list.
- * @see org.eclipse.emf.cdo.tests.model5.legacy.Model5Package#getGenListOfInt_Elements()
+ * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getGenListOfInt_Elements()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfIntArray.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfIntArray.java
index 1fd17579f1..ac32a27e79 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfIntArray.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfIntArray.java
@@ -24,20 +24,13 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model5.legacy.Model5Package#getGenListOfIntArray()
+ * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getGenListOfIntArray()
* @model
* @generated
*/
public interface GenListOfIntArray extends EObject
{
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String copyright = "Copyright (c) 2004 - 2012 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";
-
- /**
* Returns the value of the '<em><b>Elements</b></em>' attribute list.
* The list contents are of type {@link int}[].
* <!-- begin-user-doc -->
@@ -47,7 +40,7 @@ public interface GenListOfIntArray extends EObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Elements</em>' attribute list.
- * @see org.eclipse.emf.cdo.tests.model5.legacy.Model5Package#getGenListOfIntArray_Elements()
+ * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getGenListOfIntArray_Elements()
* @model dataType="org.eclipse.emf.cdo.tests.model5.IntArray"
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfInteger.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfInteger.java
index 42751ab4ec..4061fa2f26 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfInteger.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfInteger.java
@@ -30,13 +30,6 @@ import org.eclipse.emf.ecore.EObject;
public interface GenListOfInteger extends EObject
{
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String copyright = "Copyright (c) 2004 - 2012 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";
-
- /**
* Returns the value of the '<em><b>Elements</b></em>' attribute list.
* The list contents are of type {@link java.lang.Integer}.
* <!-- begin-user-doc -->
@@ -46,7 +39,7 @@ public interface GenListOfInteger extends EObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Elements</em>' attribute list.
- * @see org.eclipse.emf.cdo.tests.model5.legacy.Model5Package#getGenListOfInteger_Elements()
+ * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getGenListOfInteger_Elements()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfLong.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfLong.java
index c57c5b0c44..529cb6f6a8 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfLong.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfLong.java
@@ -30,13 +30,6 @@ import org.eclipse.emf.ecore.EObject;
public interface GenListOfLong extends EObject
{
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String copyright = "Copyright (c) 2004 - 2012 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";
-
- /**
* Returns the value of the '<em><b>Elements</b></em>' attribute list.
* The list contents are of type {@link java.lang.Long}.
* <!-- begin-user-doc -->
@@ -46,7 +39,7 @@ public interface GenListOfLong extends EObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Elements</em>' attribute list.
- * @see org.eclipse.emf.cdo.tests.model5.legacy.Model5Package#getGenListOfLong_Elements()
+ * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getGenListOfLong_Elements()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfShort.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfShort.java
index eb3ccbe00d..da070672d8 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfShort.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfShort.java
@@ -30,13 +30,6 @@ import org.eclipse.emf.ecore.EObject;
public interface GenListOfShort extends EObject
{
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String copyright = "Copyright (c) 2004 - 2012 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";
-
- /**
* Returns the value of the '<em><b>Elements</b></em>' attribute list.
* The list contents are of type {@link java.lang.Short}.
* <!-- begin-user-doc -->
@@ -46,7 +39,7 @@ public interface GenListOfShort extends EObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Elements</em>' attribute list.
- * @see org.eclipse.emf.cdo.tests.model5.legacy.Model5Package#getGenListOfShort_Elements()
+ * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getGenListOfShort_Elements()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfString.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfString.java
index a0a9b0d529..45f324babc 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfString.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfString.java
@@ -30,13 +30,6 @@ import org.eclipse.emf.ecore.EObject;
public interface GenListOfString extends EObject
{
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String copyright = "Copyright (c) 2004 - 2012 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";
-
- /**
* Returns the value of the '<em><b>Elements</b></em>' attribute list.
* The list contents are of type {@link java.lang.String}.
* <!-- begin-user-doc -->
@@ -46,7 +39,7 @@ public interface GenListOfString extends EObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Elements</em>' attribute list.
- * @see org.eclipse.emf.cdo.tests.model5.legacy.Model5Package#getGenListOfString_Elements()
+ * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getGenListOfString_Elements()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Manager.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Manager.java
index a662ed074e..d7da9b126a 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Manager.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Manager.java
@@ -16,17 +16,10 @@ import org.eclipse.emf.ecore.EObject;
* <!-- begin-user-doc --> A representation of the model object '<em><b>Manager</b></em>'. <!-- end-user-doc -->
*
*
- * @see org.eclipse.emf.cdo.tests.model5.legacy.Model5Package#getManager()
+ * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getManager()
* @model
* @generated
*/
public interface Manager extends EObject
{
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String copyright = "Copyright (c) 2004 - 2012 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";
} // Manager
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Parent.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Parent.java
index efa5bb6aca..8a270930b4 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Parent.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Parent.java
@@ -27,20 +27,13 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model5.legacy.Model5Package#getParent()
+ * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getParent()
* @model
* @generated
*/
public interface Parent extends EObject
{
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String copyright = "Copyright (c) 2004 - 2012 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";
-
- /**
* Returns the value of the '<em><b>Children</b></em>' containment reference list.
* The list contents are of type {@link org.eclipse.emf.cdo.tests.model5.Child}.
* It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model5.Child#getParent <em>Parent</em>}'.
@@ -51,7 +44,7 @@ public interface Parent extends EObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Children</em>' containment reference list.
- * @see org.eclipse.emf.cdo.tests.model5.legacy.Model5Package#getParent_Children()
+ * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getParent_Children()
* @see org.eclipse.emf.cdo.tests.model5.Child#getParent
* @model opposite="parent" containment="true"
* @generated
@@ -69,7 +62,7 @@ public interface Parent extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Favourite</em>' reference.
* @see #setFavourite(Child)
- * @see org.eclipse.emf.cdo.tests.model5.legacy.Model5Package#getParent_Favourite()
+ * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getParent_Favourite()
* @see org.eclipse.emf.cdo.tests.model5.Child#getPreferredBy
* @model opposite="preferredBy"
* @generated
@@ -96,7 +89,7 @@ public interface Parent extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Name</em>' attribute.
* @see #setName(String)
- * @see org.eclipse.emf.cdo.tests.model5.legacy.Model5Package#getParent_Name()
+ * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getParent_Name()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/TestFeatureMap.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/TestFeatureMap.java
index fcae78991c..2f0c5d81c3 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/TestFeatureMap.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/TestFeatureMap.java
@@ -33,13 +33,6 @@ import org.eclipse.emf.ecore.util.FeatureMap;
public interface TestFeatureMap extends EObject
{
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String copyright = "Copyright (c) 2004 - 2012 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";
-
- /**
* Returns the value of the '<em><b>Managers</b></em>' reference list.
* The list contents are of type {@link org.eclipse.emf.cdo.tests.model5.Manager}.
* <!-- begin-user-doc -->
@@ -49,7 +42,7 @@ public interface TestFeatureMap extends EObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Managers</em>' reference list.
- * @see org.eclipse.emf.cdo.tests.model5.legacy.Model5Package#getTestFeatureMap_Managers()
+ * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getTestFeatureMap_Managers()
* @model transient="true"
* extendedMetaData="group='#people'"
* @generated
@@ -66,7 +59,7 @@ public interface TestFeatureMap extends EObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Doctors</em>' reference list.
- * @see org.eclipse.emf.cdo.tests.model5.legacy.Model5Package#getTestFeatureMap_Doctors()
+ * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getTestFeatureMap_Doctors()
* @model transient="true"
* extendedMetaData="group='#people'"
* @generated
@@ -83,7 +76,7 @@ public interface TestFeatureMap extends EObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>People</em>' attribute list.
- * @see org.eclipse.emf.cdo.tests.model5.legacy.Model5Package#getTestFeatureMap_People()
+ * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getTestFeatureMap_People()
* @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
* extendedMetaData="kind='group'"
* @generated
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/util/Model5AdapterFactory.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/util/Model5AdapterFactory.java
index 6c25319e31..847b7292da 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/util/Model5AdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/util/Model5AdapterFactory.java
@@ -4,12 +4,13 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.tests.model5.legacy.util;
+//import org.eclipse.emf.cdo.tests.model5.*;
import org.eclipse.emf.cdo.tests.model5.Child;
import org.eclipse.emf.cdo.tests.model5.Doctor;
import org.eclipse.emf.cdo.tests.model5.GenListOfBoolean;
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/util/Model5Switch.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/util/Model5Switch.java
index 6fb7142755..7658513674 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/util/Model5Switch.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/util/Model5Switch.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
*/
@@ -33,6 +33,8 @@ import org.eclipse.emf.ecore.EObject;
import java.util.List;
+//import org.eclipse.emf.cdo.tests.model5.*;
+
/**
* <!-- begin-user-doc -->
* The <b>Switch</b> for the model's inheritance hierarchy.
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/util/Model5Switch.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/util/Model5Switch.java
index ce5848c55a..ffec73077c 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/util/Model5Switch.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/util/Model5Switch.java
@@ -110,9 +110,7 @@ public class Model5Switch<T>
TestFeatureMap testFeatureMap = (TestFeatureMap)theEObject;
T result = caseTestFeatureMap(testFeatureMap);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case Model5Package.MANAGER:
@@ -120,9 +118,7 @@ public class Model5Switch<T>
Manager manager = (Manager)theEObject;
T result = caseManager(manager);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case Model5Package.DOCTOR:
@@ -130,9 +126,7 @@ public class Model5Switch<T>
Doctor doctor = (Doctor)theEObject;
T result = caseDoctor(doctor);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case Model5Package.GEN_LIST_OF_STRING:
@@ -140,9 +134,7 @@ public class Model5Switch<T>
GenListOfString genListOfString = (GenListOfString)theEObject;
T result = caseGenListOfString(genListOfString);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case Model5Package.GEN_LIST_OF_INT:
@@ -150,9 +142,7 @@ public class Model5Switch<T>
GenListOfInt genListOfInt = (GenListOfInt)theEObject;
T result = caseGenListOfInt(genListOfInt);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case Model5Package.GEN_LIST_OF_INTEGER:
@@ -160,9 +150,7 @@ public class Model5Switch<T>
GenListOfInteger genListOfInteger = (GenListOfInteger)theEObject;
T result = caseGenListOfInteger(genListOfInteger);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case Model5Package.GEN_LIST_OF_LONG:
@@ -170,9 +158,7 @@ public class Model5Switch<T>
GenListOfLong genListOfLong = (GenListOfLong)theEObject;
T result = caseGenListOfLong(genListOfLong);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case Model5Package.GEN_LIST_OF_BOOLEAN:
@@ -180,9 +166,7 @@ public class Model5Switch<T>
GenListOfBoolean genListOfBoolean = (GenListOfBoolean)theEObject;
T result = caseGenListOfBoolean(genListOfBoolean);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case Model5Package.GEN_LIST_OF_SHORT:
@@ -190,9 +174,7 @@ public class Model5Switch<T>
GenListOfShort genListOfShort = (GenListOfShort)theEObject;
T result = caseGenListOfShort(genListOfShort);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case Model5Package.GEN_LIST_OF_FLOAT:
@@ -200,9 +182,7 @@ public class Model5Switch<T>
GenListOfFloat genListOfFloat = (GenListOfFloat)theEObject;
T result = caseGenListOfFloat(genListOfFloat);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case Model5Package.GEN_LIST_OF_DOUBLE:
@@ -210,9 +190,7 @@ public class Model5Switch<T>
GenListOfDouble genListOfDouble = (GenListOfDouble)theEObject;
T result = caseGenListOfDouble(genListOfDouble);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case Model5Package.GEN_LIST_OF_DATE:
@@ -220,9 +198,7 @@ public class Model5Switch<T>
GenListOfDate genListOfDate = (GenListOfDate)theEObject;
T result = caseGenListOfDate(genListOfDate);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case Model5Package.GEN_LIST_OF_CHAR:
@@ -230,9 +206,7 @@ public class Model5Switch<T>
GenListOfChar genListOfChar = (GenListOfChar)theEObject;
T result = caseGenListOfChar(genListOfChar);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case Model5Package.GEN_LIST_OF_INT_ARRAY:
@@ -240,9 +214,7 @@ public class Model5Switch<T>
GenListOfIntArray genListOfIntArray = (GenListOfIntArray)theEObject;
T result = caseGenListOfIntArray(genListOfIntArray);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case Model5Package.PARENT:
@@ -250,9 +222,7 @@ public class Model5Switch<T>
Parent parent = (Parent)theEObject;
T result = caseParent(parent);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case Model5Package.CHILD:
@@ -260,9 +230,7 @@ public class Model5Switch<T>
Child child = (Child)theEObject;
T result = caseChild(child);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
default:
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 17562e27d9..9cfd2ab677 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/model/model6.genmodel
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/model/model6.genmodel
@@ -5,7 +5,7 @@
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" containmentProxies="true"
+ importerID="org.eclipse.emf.importer.ecore" featureDelegation="Reflective" containmentProxies="true"
complianceLevel="5.0" copyrightFields="false" editPluginID="org.eclipse.emf.cdo.tests.model6.edit"
runtimeVersion="2.6">
<foreignModel>model6.ecore</foreignModel>
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 51596e7796..fc3eeb35db 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
@@ -24,7 +24,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getA()
+ * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getA()
* @model
* @generated
*/
@@ -40,7 +40,7 @@ public interface A extends EObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Owned Ds</em>' containment reference list.
- * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getA_OwnedDs()
+ * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getA_OwnedDs()
* @model containment="true" resolveProxies="true"
* @generated
*/
@@ -56,7 +56,7 @@ public interface A extends EObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Owned Bs</em>' containment reference list.
- * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getA_OwnedBs()
+ * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getA_OwnedBs()
* @model containment="true" resolveProxies="true"
* @generated
*/
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 a908d08cf3..eaf33bd87f 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
@@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getB()
+ * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getB()
* @model
* @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 9fe196fa7c..fa534eeb43 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
@@ -25,7 +25,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getBaseObject()
+ * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getBaseObject()
* @model
* @generated
*/
@@ -41,7 +41,7 @@ public interface BaseObject extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Attribute Optional</em>' attribute.
* @see #setAttributeOptional(String)
- * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getBaseObject_AttributeOptional()
+ * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getBaseObject_AttributeOptional()
* @model
* @generated
*/
@@ -66,7 +66,7 @@ public interface BaseObject extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Attribute Required</em>' attribute.
* @see #setAttributeRequired(String)
- * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getBaseObject_AttributeRequired()
+ * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getBaseObject_AttributeRequired()
* @model required="true"
* @generated
*/
@@ -91,7 +91,7 @@ public interface BaseObject extends EObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Attribute List</em>' attribute list.
- * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getBaseObject_AttributeList()
+ * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getBaseObject_AttributeList()
* @model
* @generated
*/
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 db4678b09e..eca1dda471 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
@@ -16,7 +16,7 @@ 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.legacy.Model6Package#getC()
+ * @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 3177915cb9..fd2deaa798 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
@@ -39,7 +39,7 @@ public interface ContainmentObject extends BaseObject
* <!-- end-user-doc -->
* @return the value of the '<em>Containment Optional</em>' containment reference.
* @see #setContainmentOptional(BaseObject)
- * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getContainmentObject_ContainmentOptional()
+ * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getContainmentObject_ContainmentOptional()
* @model containment="true" resolveProxies="true"
* @generated
*/
@@ -64,7 +64,7 @@ public interface ContainmentObject extends BaseObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Containment List</em>' containment reference list.
- * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getContainmentObject_ContainmentList()
+ * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getContainmentObject_ContainmentList()
* @model containment="true" resolveProxies="true"
* @generated
*/
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 62faf36b8e..b8be2f1591 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
@@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getD()
+ * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getD()
* @model
* @generated
*/
@@ -38,7 +38,7 @@ public interface D extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Data</em>' containment reference.
* @see #setData(EObject)
- * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getD_Data()
+ * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getD_Data()
* @model containment="true"
* @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 82171ff5f2..4493889f3c 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
@@ -23,7 +23,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getE()
+ * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getE()
* @model
* @generated
*/
@@ -39,7 +39,7 @@ public interface E extends EObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Owned As</em>' containment reference list.
- * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getE_OwnedAs()
+ * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getE_OwnedAs()
* @model containment="true" resolveProxies="true"
* @generated
*/
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 a1c842b4a1..936d7adf94 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
@@ -23,7 +23,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getF()
+ * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getF()
* @model
* @generated
*/
@@ -39,7 +39,7 @@ public interface F extends EObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Owned Es</em>' containment reference list.
- * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getF_OwnedEs()
+ * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getF_OwnedEs()
* @model containment="true" resolveProxies="true"
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/G.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/G.java
index aef5a3292d..0040060090 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/G.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/G.java
@@ -30,7 +30,7 @@ import java.util.List;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getG()
+ * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getG()
* @model
* @generated
*/
@@ -46,7 +46,7 @@ public interface G extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Dummy</em>' attribute.
* @see #setDummy(String)
- * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getG_Dummy()
+ * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getG_Dummy()
* @model required="true"
* @generated
*/
@@ -72,7 +72,7 @@ public interface G extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Reference</em>' reference.
* @see #setReference(BaseObject)
- * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getG_Reference()
+ * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getG_Reference()
* @model required="true"
* @generated
*/
@@ -98,7 +98,7 @@ public interface G extends EObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>List</em>' reference list.
- * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getG_List()
+ * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getG_List()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/HasNillableAttribute.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/HasNillableAttribute.java
index bb3767f8df..6583cd066f 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/HasNillableAttribute.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/HasNillableAttribute.java
@@ -16,7 +16,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getHasNillableAttribute()
+ * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getHasNillableAttribute()
* @model
* @generated
*/
@@ -34,7 +34,7 @@ public interface HasNillableAttribute extends EObject
* @see #isSetNillable()
* @see #unsetNillable()
* @see #setNillable(String)
- * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getHasNillableAttribute_Nillable()
+ * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getHasNillableAttribute_Nillable()
* @model unsettable="true" dataType="org.eclipse.emf.cdo.tests.model6.MyString"
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Holdable.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Holdable.java
index 9856d6b787..59c1a703cf 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Holdable.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Holdable.java
@@ -16,7 +16,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getHoldable()
+ * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getHoldable()
* @model abstract="true"
* @generated
*/
@@ -32,7 +32,7 @@ public interface Holdable extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Name</em>' attribute.
* @see #setName(String)
- * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getHoldable_Name()
+ * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getHoldable_Name()
* @model required="true"
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Holder.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Holder.java
index 8aea25cbb0..d51c94f04c 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Holder.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Holder.java
@@ -17,7 +17,7 @@ import org.eclipse.emf.common.util.EList;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getHolder()
+ * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getHolder()
* @model
* @generated
*/
@@ -33,7 +33,7 @@ public interface Holder extends Holdable
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Held</em>' reference list.
- * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getHolder_Held()
+ * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getHolder_Held()
* @model transient="true" derived="true"
* annotation="http://www.eclipse.org/emf/CDO persistent='true' filter='owned'"
* @generated
@@ -50,7 +50,7 @@ public interface Holder extends Holdable
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Owned</em>' containment reference list.
- * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getHolder_Owned()
+ * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getHolder_Owned()
* @model containment="true" resolveProxies="true"
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/MyEnum.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/MyEnum.java
index 1090a83579..bbd6d2de5d 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/MyEnum.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/MyEnum.java
@@ -21,7 +21,7 @@ import java.util.List;
* A representation of the literals of the enumeration '<em><b>My Enum</b></em>',
* and utility methods for working with them.
* <!-- end-user-doc -->
- * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getMyEnum()
+ * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getMyEnum()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/MyEnumList.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/MyEnumList.java
index d5e6caeed3..bd17efd85c 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/MyEnumList.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/MyEnumList.java
@@ -25,7 +25,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getMyEnumList()
+ * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getMyEnumList()
* @model
* @generated
*/
@@ -43,7 +43,7 @@ public interface MyEnumList extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>My Enum</em>' attribute list.
* @see org.eclipse.emf.cdo.tests.model6.MyEnum
- * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getMyEnumList_MyEnum()
+ * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getMyEnumList_MyEnum()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/MyEnumListUnsettable.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/MyEnumListUnsettable.java
index 0a05167c8b..6fd33f9361 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/MyEnumListUnsettable.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/MyEnumListUnsettable.java
@@ -25,7 +25,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getMyEnumListUnsettable()
+ * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getMyEnumListUnsettable()
* @model
* @generated
*/
@@ -45,7 +45,7 @@ public interface MyEnumListUnsettable extends EObject
* @see org.eclipse.emf.cdo.tests.model6.MyEnum
* @see #isSetMyEnum()
* @see #unsetMyEnum()
- * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getMyEnumListUnsettable_MyEnum()
+ * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getMyEnumListUnsettable_MyEnum()
* @model unsettable="true"
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/PropertiesMap.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/PropertiesMap.java
index f3d470694f..45d9a6d6bc 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/PropertiesMap.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/PropertiesMap.java
@@ -27,7 +27,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getPropertiesMap()
+ * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getPropertiesMap()
* @model
* @generated
*/
@@ -43,7 +43,7 @@ public interface PropertiesMap extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Label</em>' attribute.
* @see #setLabel(String)
- * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getPropertiesMap_Label()
+ * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getPropertiesMap_Label()
* @model
* @generated
*/
@@ -70,7 +70,7 @@ public interface PropertiesMap extends EObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Persistent Map</em>' map.
- * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getPropertiesMap_PersistentMap()
+ * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getPropertiesMap_PersistentMap()
* @model mapType="org.eclipse.emf.cdo.tests.model6.PropertiesMapEntry<org.eclipse.emf.ecore.EString, org.eclipse.emf.cdo.tests.model6.PropertiesMapEntryValue>"
* @generated
*/
@@ -87,7 +87,7 @@ public interface PropertiesMap extends EObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Transient Map</em>' map.
- * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getPropertiesMap_TransientMap()
+ * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getPropertiesMap_TransientMap()
* @model mapType="org.eclipse.emf.cdo.tests.model6.PropertiesMapEntry<org.eclipse.emf.ecore.EString, org.eclipse.emf.cdo.tests.model6.PropertiesMapEntryValue>" transient="true"
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/PropertiesMapEntryValue.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/PropertiesMapEntryValue.java
index 0abf4b8a8d..9aac0e4187 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/PropertiesMapEntryValue.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/PropertiesMapEntryValue.java
@@ -24,7 +24,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getPropertiesMapEntryValue()
+ * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getPropertiesMapEntryValue()
* @model
* @generated
*/
@@ -40,7 +40,7 @@ public interface PropertiesMapEntryValue extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Label</em>' attribute.
* @see #setLabel(String)
- * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getPropertiesMapEntryValue_Label()
+ * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getPropertiesMapEntryValue_Label()
* @model
* @generated
*/
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 1da11ce08e..852f1c78f3 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
@@ -39,7 +39,7 @@ public interface ReferenceObject extends BaseObject
* <!-- end-user-doc -->
* @return the value of the '<em>Reference Optional</em>' reference.
* @see #setReferenceOptional(BaseObject)
- * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getReferenceObject_ReferenceOptional()
+ * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getReferenceObject_ReferenceOptional()
* @model
* @generated
*/
@@ -64,7 +64,7 @@ public interface ReferenceObject extends BaseObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Reference List</em>' reference list.
- * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getReferenceObject_ReferenceList()
+ * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getReferenceObject_ReferenceList()
* @model
* @generated
*/
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 4a0c401801..1c0c2c3b60 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
@@ -26,7 +26,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getRoot()
+ * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getRoot()
* @model
* @generated
*/
@@ -42,7 +42,7 @@ public interface Root extends EObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>List A</em>' containment reference list.
- * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getRoot_ListA()
+ * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getRoot_ListA()
* @model containment="true" resolveProxies="true"
* @generated
*/
@@ -58,7 +58,7 @@ public interface Root extends EObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>List B</em>' containment reference list.
- * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getRoot_ListB()
+ * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getRoot_ListB()
* @model containment="true" resolveProxies="true"
* @generated
*/
@@ -74,7 +74,7 @@ public interface Root extends EObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>List C</em>' containment reference list.
- * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getRoot_ListC()
+ * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getRoot_ListC()
* @model containment="true" resolveProxies="true"
* @generated
*/
@@ -90,7 +90,7 @@ public interface Root extends EObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>List D</em>' containment reference list.
- * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getRoot_ListD()
+ * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getRoot_ListD()
* @model containment="true" resolveProxies="true"
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Thing.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Thing.java
index 18d5ad75d7..628d626eef 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Thing.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Thing.java
@@ -8,7 +8,7 @@ package org.eclipse.emf.cdo.tests.model6;
* <!-- end-user-doc -->
*
*
- * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getThing()
+ * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getThing()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/UnorderedList.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/UnorderedList.java
index 249d5ea314..3dcb6e32a9 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/UnorderedList.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/UnorderedList.java
@@ -24,7 +24,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getUnorderedList()
+ * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getUnorderedList()
* @model
* @generated
*/
@@ -40,7 +40,7 @@ public interface UnorderedList extends EObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Contained</em>' containment reference list.
- * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getUnorderedList_Contained()
+ * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getUnorderedList_Contained()
* @model containment="true" resolveProxies="true" ordered="false"
* @generated
*/
@@ -56,7 +56,7 @@ public interface UnorderedList extends EObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Referenced</em>' reference list.
- * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getUnorderedList_Referenced()
+ * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getUnorderedList_Referenced()
* @model ordered="false"
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/util/Model6AdapterFactory.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/util/Model6AdapterFactory.java
index ab0a2e5766..5ea991ad6f 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/util/Model6AdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/util/Model6AdapterFactory.java
@@ -31,6 +31,8 @@ import org.eclipse.emf.ecore.EObject;
import java.util.Map;
+//import org.eclipse.emf.cdo.tests.model6.*;
+
/**
* <!-- begin-user-doc -->
* The <b>Adapter Factory</b> for the model.
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/util/Model6Switch.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/util/Model6Switch.java
index 3a0affc649..80befece87 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/util/Model6Switch.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/util/Model6Switch.java
@@ -30,6 +30,8 @@ import org.eclipse.emf.ecore.EObject;
import java.util.List;
import java.util.Map;
+//import org.eclipse.emf.cdo.tests.model6.*;
+
/**
* <!-- begin-user-doc -->
* The <b>Switch</b> for the model's inheritance hierarchy.
diff --git a/plugins/org.eclipse.emf.cdo.tests/generateTestModels.launch b/plugins/org.eclipse.emf.cdo.tests/generateTestModels.launch
new file mode 100644
index 0000000000..904a5c964e
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests/generateTestModels.launch
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
+<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;resources&gt;&#13;&#10;&lt;item path=&quot;/org.eclipse.emf.cdo.tests.mango&quot; type=&quot;4&quot;/&gt;&#13;&#10;&lt;item path=&quot;/org.eclipse.emf.cdo.tests.model1&quot; type=&quot;4&quot;/&gt;&#13;&#10;&lt;item path=&quot;/org.eclipse.emf.cdo.tests.model2&quot; type=&quot;4&quot;/&gt;&#13;&#10;&lt;item path=&quot;/org.eclipse.emf.cdo.tests.model3&quot; type=&quot;4&quot;/&gt;&#13;&#10;&lt;item path=&quot;/org.eclipse.emf.cdo.tests.model4&quot; type=&quot;4&quot;/&gt;&#13;&#10;&lt;item path=&quot;/org.eclipse.emf.cdo.tests.model4interfaces&quot; type=&quot;4&quot;/&gt;&#13;&#10;&lt;item path=&quot;/org.eclipse.emf.cdo.tests.model5&quot; type=&quot;4&quot;/&gt;&#13;&#10;&lt;item path=&quot;/org.eclipse.emf.cdo.tests.model6&quot; type=&quot;4&quot;/&gt;&#13;&#10;&lt;/resources&gt;}"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.eclipse.emf.cdo.tests/generateTestModels.xml"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.emf.cdo.tests"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.emf.cdo.tests/generateTestModels.xml}"/>
+<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
+</launchConfiguration>
diff --git a/plugins/org.eclipse.emf.cdo.tests/generateTestModels.xml b/plugins/org.eclipse.emf.cdo.tests/generateTestModels.xml
new file mode 100644
index 0000000000..adc2f141d9
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests/generateTestModels.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<!--
+ 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:
+ Eike Stepper - initial API and implementation
+-->
+<project name="generateTestModels" default="main">
+
+ <dirname property="antfile.dir" file="${ant.file}"/>
+ <property name="main.directory" location="${antfile.dir}/.."/>
+
+ <macrodef name="generate">
+ <attribute name="model"/>
+ <sequential>
+ <emf.Ecore2Java model="${main.directory}/org.eclipse.emf.cdo.tests.@{model}/model/@{model}.ecore"
+ genModel="${main.directory}/org.eclipse.emf.cdo.tests.@{model}/model/@{model}.legacy.genmodel"
+ reconcileGenModel="reload"/>
+ <emf.Ecore2Java model="${main.directory}/org.eclipse.emf.cdo.tests.@{model}/model/@{model}.ecore"
+ genModel="${main.directory}/org.eclipse.emf.cdo.tests.@{model}/model/@{model}.genmodel"
+ reconcileGenModel="reload"/>
+ </sequential>
+ </macrodef>
+
+ <target name="main">
+ <generate model="mango"/>
+ <generate model="model1"/>
+ <generate model="model2"/>
+ <generate model="model3"/>
+ <generate model="model4interfaces"/>
+ <generate model="model4"/>
+ <generate model="model5"/>
+ <generate model="model6"/>
+ </target>
+
+</project>

Back to the top