Download
Getting Started
Members
Projects
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
More
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
Toggle navigation
Bugzilla – Attachment 152232 Details for
Bug 247226
Transparently support legacy models (CDOLegacyAdapter)
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
Terms of Use
|
Copyright Agent
Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read
this important communication.
[patch]
Legacy Tests v2
patch.txt (text/plain), 409.75 KB, created by
Martin Fluegge
on 2009-11-14 13:57:21 EST
(
hide
)
Description:
Legacy Tests v2
Filename:
MIME Type:
Creator:
Martin Fluegge
Created:
2009-11-14 13:57:21 EST
Size:
409.75 KB
patch
obsolete
>### Eclipse Workspace Patch 1.0 >#P org.eclipse.emf.cdo.tests.mango >Index: src/org/eclipse/emf/cdo/tests/mango/MangoFactory.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoFactory.java,v >retrieving revision 1.10 >diff -u -r1.10 MangoFactory.java >--- src/org/eclipse/emf/cdo/tests/mango/MangoFactory.java 22 Aug 2009 09:34:41 -0000 1.10 >+++ src/org/eclipse/emf/cdo/tests/mango/MangoFactory.java 14 Nov 2009 18:55:45 -0000 >@@ -15,46 +15,48 @@ > /** > * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a create method for each non-abstract class of > * the model. <!-- end-user-doc --> >- * > * @see org.eclipse.emf.cdo.tests.mango.MangoPackage > * @generated > */ > public interface MangoFactory extends EFactory > { > /** >- * The singleton instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * The singleton instance of the factory. >+ * <!-- begin-user-doc --> <!-- end-user-doc --> > * @generated > */ > MangoFactory eINSTANCE = org.eclipse.emf.cdo.tests.mango.impl.MangoFactoryImpl.init(); > > /** >- * Returns a new object of class '<em>Value List</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * Returns a new object of class '<em>Value List</em>'. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @return a new object of class '<em>Value List</em>'. > * @generated > */ >- ValueList createValueList(); >+ MangoValueList createMangoValueList(); > > /** >- * Returns a new object of class '<em>Value</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * Returns a new object of class '<em>Value</em>'. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @return a new object of class '<em>Value</em>'. > * @generated > */ >- Value createValue(); >+ MangoValue createMangoValue(); > > /** >- * Returns a new object of class '<em>Parameter</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * Returns a new object of class '<em>Parameter</em>'. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @return a new object of class '<em>Parameter</em>'. > * @generated > */ >- Parameter createParameter(); >+ MangoParameter createMangoParameter(); > > /** >- * Returns the package supported by this factory. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * Returns the package supported by this factory. >+ * <!-- begin-user-doc --> <!-- end-user-doc --> > * @return the package supported by this factory. > * @generated > */ >Index: src/org/eclipse/emf/cdo/tests/mango/ParameterPassing.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/ParameterPassing.java,v >retrieving revision 1.8 >diff -u -r1.8 ParameterPassing.java >--- src/org/eclipse/emf/cdo/tests/mango/ParameterPassing.java 22 Aug 2009 09:34:41 -0000 1.8 >+++ src/org/eclipse/emf/cdo/tests/mango/ParameterPassing.java 14 Nov 2009 18:55:45 -0000 >@@ -19,7 +19,6 @@ > /** > * <!-- 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.MangoPackage#getParameterPassing() > * @model > * @generated >@@ -27,8 +26,8 @@ > public enum ParameterPassing implements Enumerator > { > /** >- * The '<em><b>By Value</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * The '<em><b>By Value</b></em>' literal object. >+ * <!-- begin-user-doc --> <!-- end-user-doc --> > * @see #BY_VALUE_VALUE > * @generated > * @ordered >@@ -36,8 +35,8 @@ > BY_VALUE(0, "ByValue", "ByValue"), > > /** >- * The '<em><b>By Reference</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * The '<em><b>By Reference</b></em>' literal object. >+ * <!-- begin-user-doc --> <!-- end-user-doc --> > * @see #BY_REFERENCE_VALUE > * @generated > * @ordered >@@ -45,13 +44,13 @@ > BY_REFERENCE(1, "ByReference", "ByReference"); > > /** >- * The '<em><b>By Value</b></em>' literal value. <!-- begin-user-doc --> >+ * The '<em><b>By Value</b></em>' literal value. >+ * <!-- begin-user-doc --> > * <p> > * If the meaning of '<em><b>By Value</b></em>' literal object isn't clear, there really should be more of a > * description here... > * </p> > * <!-- end-user-doc --> >- * > * @see #BY_VALUE > * @model name="ByValue" > * @generated >@@ -60,13 +59,13 @@ > public static final int BY_VALUE_VALUE = 0; > > /** >- * The '<em><b>By Reference</b></em>' literal value. <!-- begin-user-doc --> >+ * The '<em><b>By Reference</b></em>' literal value. >+ * <!-- begin-user-doc --> > * <p> > * If the meaning of '<em><b>By Reference</b></em>' literal object isn't clear, there really should be more of a > * description here... > * </p> > * <!-- end-user-doc --> >- * > * @see #BY_REFERENCE > * @model name="ByReference" > * @generated >@@ -75,24 +74,24 @@ > public static final int BY_REFERENCE_VALUE = 1; > > /** >- * An array of all the '<em><b>Parameter Passing</b></em>' enumerators. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * An array of all the '<em><b>Parameter Passing</b></em>' enumerators. >+ * <!-- begin-user-doc --> <!-- end-user-doc --> > * @generated > */ > private static final ParameterPassing[] VALUES_ARRAY = new ParameterPassing[] { BY_VALUE, BY_REFERENCE, }; > > /** >- * A public read-only list of all the '<em><b>Parameter Passing</b></em>' enumerators. <!-- begin-user-doc --> <!-- >+ * A public read-only list of all the '<em><b>Parameter Passing</b></em>' enumerators. >+ * <!-- begin-user-doc --> <!-- > * end-user-doc --> >- * > * @generated > */ > public static final List<ParameterPassing> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY)); > > /** >- * Returns the '<em><b>Parameter Passing</b></em>' literal with the specified literal value. <!-- begin-user-doc --> >+ * Returns the '<em><b>Parameter Passing</b></em>' literal with the specified literal value. >+ * <!-- begin-user-doc --> > * <!-- end-user-doc --> >- * > * @generated > */ > public static ParameterPassing get(String literal) >@@ -109,9 +108,9 @@ > } > > /** >- * Returns the '<em><b>Parameter Passing</b></em>' literal with the specified name. <!-- begin-user-doc --> <!-- >+ * Returns the '<em><b>Parameter Passing</b></em>' literal with the specified name. >+ * <!-- begin-user-doc --> <!-- > * end-user-doc --> >- * > * @generated > */ > public static ParameterPassing getByName(String name) >@@ -128,9 +127,9 @@ > } > > /** >- * Returns the '<em><b>Parameter Passing</b></em>' literal with the specified integer value. <!-- begin-user-doc --> >+ * Returns the '<em><b>Parameter Passing</b></em>' literal with the specified integer value. >+ * <!-- begin-user-doc --> > * <!-- end-user-doc --> >- * > * @generated > */ > public static ParameterPassing get(int value) >@@ -147,28 +146,25 @@ > > /** > * <!-- begin-user-doc --> <!-- end-user-doc --> >- * > * @generated > */ > private final int value; > > /** > * <!-- begin-user-doc --> <!-- end-user-doc --> >- * > * @generated > */ > private final String name; > > /** > * <!-- begin-user-doc --> <!-- end-user-doc --> >- * > * @generated > */ > private final String literal; > > /** >- * Only this class can construct instances. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * Only this class can construct instances. >+ * <!-- begin-user-doc --> <!-- end-user-doc --> > * @generated > */ > private ParameterPassing(int value, String name, String literal) >@@ -180,7 +176,6 @@ > > /** > * <!-- begin-user-doc --> <!-- end-user-doc --> >- * > * @generated > */ > public int getValue() >@@ -190,7 +185,6 @@ > > /** > * <!-- begin-user-doc --> <!-- end-user-doc --> >- * > * @generated > */ > public String getName() >@@ -200,7 +194,6 @@ > > /** > * <!-- begin-user-doc --> <!-- end-user-doc --> >- * > * @generated > */ > public String getLiteral() >@@ -209,9 +202,9 @@ > } > > /** >- * Returns the literal value of the enumerator, which is its string representation. <!-- begin-user-doc --> <!-- >+ * Returns the literal value of the enumerator, which is its string representation. >+ * <!-- begin-user-doc --> <!-- > * end-user-doc --> >- * > * @generated > */ > @Override >Index: src/org/eclipse/emf/cdo/tests/mango/Parameter.java >=================================================================== >RCS file: src/org/eclipse/emf/cdo/tests/mango/Parameter.java >diff -N src/org/eclipse/emf/cdo/tests/mango/Parameter.java >--- src/org/eclipse/emf/cdo/tests/mango/Parameter.java 22 Aug 2009 09:34:41 -0000 1.8 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,87 +0,0 @@ >-/** >- * Copyright (c) 2004 - 2009 Eike Stepper (Berlin, Germany) and others. >- * All rights reserved. This program and the accompanying materials >- * are made available under the terms of the Eclipse Public License v1.0 >- * which accompanies this distribution, and is available at >- * http://www.eclipse.org/legal/epl-v10.html >- * >- * Contributors: >- * Eike Stepper - initial API and implementation >- */ >-package org.eclipse.emf.cdo.tests.mango; >- >-import org.eclipse.emf.ecore.EObject; >- >-/** >- * <!-- begin-user-doc --> A representation of the model object '<em><b>Parameter</b></em>'. <!-- end-user-doc --> >- * <p> >- * The following features are supported: >- * <ul> >- * <li>{@link org.eclipse.emf.cdo.tests.mango.Parameter#getName <em>Name</em>}</li> >- * <li>{@link org.eclipse.emf.cdo.tests.mango.Parameter#getPassing <em>Passing</em>}</li> >- * </ul> >- * </p> >- * >- * @see org.eclipse.emf.cdo.tests.mango.MangoPackage#getParameter() >- * @model >- * @generated >- */ >-public interface Parameter extends EObject >-{ >- /** >- * Returns the value of the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> >- * <p> >- * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here... >- * </p> >- * <!-- end-user-doc --> >- * >- * @return the value of the '<em>Name</em>' attribute. >- * @see #setName(String) >- * @see org.eclipse.emf.cdo.tests.mango.MangoPackage#getParameter_Name() >- * @model >- * @generated >- */ >- String getName(); >- >- /** >- * Sets the value of the '{@link org.eclipse.emf.cdo.tests.mango.Parameter#getName <em>Name</em>}' attribute. <!-- >- * begin-user-doc --> <!-- end-user-doc --> >- * >- * @param value >- * the new value of the '<em>Name</em>' attribute. >- * @see #getName() >- * @generated >- */ >- void setName(String value); >- >- /** >- * Returns the value of the '<em><b>Passing</b></em>' attribute. The literals are from the enumeration >- * {@link org.eclipse.emf.cdo.tests.mango.ParameterPassing}. <!-- begin-user-doc --> >- * <p> >- * If the meaning of the '<em>Passing</em>' attribute isn't clear, there really should be more of a description >- * here... >- * </p> >- * <!-- end-user-doc --> >- * >- * @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.MangoPackage#getParameter_Passing() >- * @model >- * @generated >- */ >- ParameterPassing getPassing(); >- >- /** >- * Sets the value of the '{@link org.eclipse.emf.cdo.tests.mango.Parameter#getPassing <em>Passing</em>}' attribute. >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @param value >- * the new value of the '<em>Passing</em>' attribute. >- * @see org.eclipse.emf.cdo.tests.mango.ParameterPassing >- * @see #getPassing() >- * @generated >- */ >- void setPassing(ParameterPassing value); >- >-} // Parameter >Index: src/org/eclipse/emf/cdo/tests/mango/MangoPackage.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoPackage.java,v >retrieving revision 1.12 >diff -u -r1.12 MangoPackage.java >--- src/org/eclipse/emf/cdo/tests/mango/MangoPackage.java 22 Aug 2009 09:34:41 -0000 1.12 >+++ src/org/eclipse/emf/cdo/tests/mango/MangoPackage.java 14 Nov 2009 18:55:45 -0000 >@@ -25,7 +25,6 @@ > * <li>and each data type</li> > * </ul> > * <!-- end-user-doc --> >- * > * @see org.eclipse.emf.cdo.tests.mango.MangoFactory > * @model kind="package" > * @generated >@@ -33,131 +32,138 @@ > public interface MangoPackage extends EPackage > { > /** >- * The package name. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * The package name. >+ * <!-- begin-user-doc --> <!-- end-user-doc --> > * @generated > */ > String eNAME = "mango"; > > /** >- * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * The package namespace URI. >+ * <!-- begin-user-doc --> <!-- end-user-doc --> > * @generated > */ > String eNS_URI = "http://www.eclipse.org/emf/CDO/tests/mango"; > > /** >- * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * The package namespace name. >+ * <!-- begin-user-doc --> <!-- end-user-doc --> > * @generated > */ > String eNS_PREFIX = "mango"; > > /** >- * The singleton instance of the package. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * The singleton instance of the package. >+ * <!-- begin-user-doc --> <!-- end-user-doc --> > * @generated > */ > MangoPackage eINSTANCE = org.eclipse.emf.cdo.tests.mango.impl.MangoPackageImpl.init(); > > /** >- * The meta object id for the '{@link org.eclipse.emf.cdo.tests.mango.impl.ValueListImpl <em>Value List</em>}' class. >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @see org.eclipse.emf.cdo.tests.mango.impl.ValueListImpl >- * @see org.eclipse.emf.cdo.tests.mango.impl.MangoPackageImpl#getValueList() >+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.mango.impl.MangoValueListImpl <em>Value List</em>}' class. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @see org.eclipse.emf.cdo.tests.mango.impl.MangoValueListImpl >+ * @see org.eclipse.emf.cdo.tests.mango.impl.MangoPackageImpl#getMangoValueList() > * @generated > */ >- int VALUE_LIST = 0; >+ int MANGO_VALUE_LIST = 0; > > /** >- * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * The feature id for the '<em><b>Name</b></em>' attribute. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > * @ordered > */ >- int VALUE_LIST__NAME = 0; >+ int MANGO_VALUE_LIST__NAME = 0; > > /** >- * The feature id for the '<em><b>Values</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * The feature id for the '<em><b>Values</b></em>' reference list. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > * @ordered > */ >- int VALUE_LIST__VALUES = 1; >+ int MANGO_VALUE_LIST__VALUES = 1; > > /** >- * The number of structural features of the '<em>Value List</em>' class. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * The number of structural features of the '<em>Value List</em>' class. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > * @ordered > */ >- int VALUE_LIST_FEATURE_COUNT = 2; >+ int MANGO_VALUE_LIST_FEATURE_COUNT = 2; > > /** >- * The meta object id for the '{@link org.eclipse.emf.cdo.tests.mango.impl.ValueImpl <em>Value</em>}' class. <!-- >- * begin-user-doc --> <!-- end-user-doc --> >- * >- * @see org.eclipse.emf.cdo.tests.mango.impl.ValueImpl >- * @see org.eclipse.emf.cdo.tests.mango.impl.MangoPackageImpl#getValue() >+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.mango.impl.MangoValueImpl <em>Value</em>}' class. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @see org.eclipse.emf.cdo.tests.mango.impl.MangoValueImpl >+ * @see org.eclipse.emf.cdo.tests.mango.impl.MangoPackageImpl#getMangoValue() > * @generated > */ >- int VALUE = 1; >+ int MANGO_VALUE = 1; > > /** >- * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * The feature id for the '<em><b>Name</b></em>' attribute. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > * @ordered > */ >- int VALUE__NAME = 0; >+ int MANGO_VALUE__NAME = 0; > > /** >- * The number of structural features of the '<em>Value</em>' class. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * The number of structural features of the '<em>Value</em>' class. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > * @ordered > */ >- int VALUE_FEATURE_COUNT = 1; >+ int MANGO_VALUE_FEATURE_COUNT = 1; > > /** >- * The meta object id for the '{@link org.eclipse.emf.cdo.tests.mango.impl.ParameterImpl <em>Parameter</em>}' class. >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @see org.eclipse.emf.cdo.tests.mango.impl.ParameterImpl >- * @see org.eclipse.emf.cdo.tests.mango.impl.MangoPackageImpl#getParameter() >+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.mango.impl.MangoParameterImpl <em>Parameter</em>}' class. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @see org.eclipse.emf.cdo.tests.mango.impl.MangoParameterImpl >+ * @see org.eclipse.emf.cdo.tests.mango.impl.MangoPackageImpl#getMangoParameter() > * @generated > */ >- int PARAMETER = 2; >+ int MANGO_PARAMETER = 2; > > /** >- * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * The feature id for the '<em><b>Name</b></em>' attribute. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > * @ordered > */ >- int PARAMETER__NAME = 0; >+ int MANGO_PARAMETER__NAME = 0; > > /** >- * The feature id for the '<em><b>Passing</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * The feature id for the '<em><b>Passing</b></em>' attribute. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > * @ordered > */ >- int PARAMETER__PASSING = 1; >+ int MANGO_PARAMETER__PASSING = 1; > > /** >- * The number of structural features of the '<em>Parameter</em>' class. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * The number of structural features of the '<em>Parameter</em>' class. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > * @ordered > */ >- int PARAMETER_FEATURE_COUNT = 2; >+ int MANGO_PARAMETER_FEATURE_COUNT = 2; > > /** >- * The meta object id for the '{@link org.eclipse.emf.cdo.tests.mango.ParameterPassing <em>Parameter Passing</em>}' >- * enum. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.mango.ParameterPassing <em>Parameter Passing</em>}' enum. >+ * <!-- begin-user-doc --> <!-- end-user-doc --> > * @see org.eclipse.emf.cdo.tests.mango.ParameterPassing > * @see org.eclipse.emf.cdo.tests.mango.impl.MangoPackageImpl#getParameterPassing() > * @generated >@@ -165,94 +171,93 @@ > int PARAMETER_PASSING = 3; > > /** >- * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.mango.ValueList <em>Value List</em>}'. <!-- >- * begin-user-doc --> <!-- end-user-doc --> >- * >+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.mango.MangoValueList <em>Value List</em>}'. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @return the meta object for class '<em>Value List</em>'. >- * @see org.eclipse.emf.cdo.tests.mango.ValueList >+ * @see org.eclipse.emf.cdo.tests.mango.MangoValueList > * @generated > */ >- EClass getValueList(); >+ EClass getMangoValueList(); > > /** >- * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.mango.ValueList#getName <em>Name</em>} >- * '. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.mango.MangoValueList#getName <em>Name</em>}'. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @return the meta object for the attribute '<em>Name</em>'. >- * @see org.eclipse.emf.cdo.tests.mango.ValueList#getName() >- * @see #getValueList() >+ * @see org.eclipse.emf.cdo.tests.mango.MangoValueList#getName() >+ * @see #getMangoValueList() > * @generated > */ >- EAttribute getValueList_Name(); >+ EAttribute getMangoValueList_Name(); > > /** >- * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.mango.ValueList#getValues >- * <em>Values</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.mango.MangoValueList#getValues <em>Values</em>}'. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @return the meta object for the reference list '<em>Values</em>'. >- * @see org.eclipse.emf.cdo.tests.mango.ValueList#getValues() >- * @see #getValueList() >+ * @see org.eclipse.emf.cdo.tests.mango.MangoValueList#getValues() >+ * @see #getMangoValueList() > * @generated > */ >- EReference getValueList_Values(); >+ EReference getMangoValueList_Values(); > > /** >- * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.mango.Value <em>Value</em>}'. <!-- >- * begin-user-doc --> <!-- end-user-doc --> >- * >+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.mango.MangoValue <em>Value</em>}'. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @return the meta object for class '<em>Value</em>'. >- * @see org.eclipse.emf.cdo.tests.mango.Value >+ * @see org.eclipse.emf.cdo.tests.mango.MangoValue > * @generated > */ >- EClass getValue(); >+ EClass getMangoValue(); > > /** >- * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.mango.Value#getName <em>Name</em>}'. >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.mango.MangoValue#getName <em>Name</em>}'. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @return the meta object for the attribute '<em>Name</em>'. >- * @see org.eclipse.emf.cdo.tests.mango.Value#getName() >- * @see #getValue() >+ * @see org.eclipse.emf.cdo.tests.mango.MangoValue#getName() >+ * @see #getMangoValue() > * @generated > */ >- EAttribute getValue_Name(); >+ EAttribute getMangoValue_Name(); > > /** >- * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.mango.Parameter <em>Parameter</em>}'. <!-- >- * begin-user-doc --> <!-- end-user-doc --> >- * >+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.mango.MangoParameter <em>Parameter</em>}'. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @return the meta object for class '<em>Parameter</em>'. >- * @see org.eclipse.emf.cdo.tests.mango.Parameter >+ * @see org.eclipse.emf.cdo.tests.mango.MangoParameter > * @generated > */ >- EClass getParameter(); >+ EClass getMangoParameter(); > > /** >- * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.mango.Parameter#getName <em>Name</em>} >- * '. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.mango.MangoParameter#getName <em>Name</em>}'. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @return the meta object for the attribute '<em>Name</em>'. >- * @see org.eclipse.emf.cdo.tests.mango.Parameter#getName() >- * @see #getParameter() >+ * @see org.eclipse.emf.cdo.tests.mango.MangoParameter#getName() >+ * @see #getMangoParameter() > * @generated > */ >- EAttribute getParameter_Name(); >+ EAttribute getMangoParameter_Name(); > > /** >- * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.mango.Parameter#getPassing >- * <em>Passing</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.mango.MangoParameter#getPassing <em>Passing</em>}'. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @return the meta object for the attribute '<em>Passing</em>'. >- * @see org.eclipse.emf.cdo.tests.mango.Parameter#getPassing() >- * @see #getParameter() >+ * @see org.eclipse.emf.cdo.tests.mango.MangoParameter#getPassing() >+ * @see #getMangoParameter() > * @generated > */ >- EAttribute getParameter_Passing(); >+ EAttribute getMangoParameter_Passing(); > > /** >- * Returns the meta object for enum '{@link org.eclipse.emf.cdo.tests.mango.ParameterPassing >- * <em>Parameter Passing</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * Returns the meta object for enum '{@link org.eclipse.emf.cdo.tests.mango.ParameterPassing <em>Parameter Passing</em>}'. >+ * <!-- begin-user-doc --> <!-- end-user-doc --> > * @return the meta object for enum '<em>Parameter Passing</em>'. > * @see org.eclipse.emf.cdo.tests.mango.ParameterPassing > * @generated >@@ -260,8 +265,8 @@ > EEnum getParameterPassing(); > > /** >- * Returns the factory that creates the instances of the model. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * Returns the factory that creates the instances of the model. >+ * <!-- begin-user-doc --> <!-- end-user-doc --> > * @return the factory that creates the instances of the model. > * @generated > */ >@@ -276,85 +281,83 @@ > * <li>and each data type</li> > * </ul> > * <!-- end-user-doc --> >- * > * @generated > */ > interface Literals > { > /** >- * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.mango.impl.ValueListImpl <em>Value List</em>}' >- * class. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @see org.eclipse.emf.cdo.tests.mango.impl.ValueListImpl >- * @see org.eclipse.emf.cdo.tests.mango.impl.MangoPackageImpl#getValueList() >+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.mango.impl.MangoValueListImpl <em>Value List</em>}' class. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @see org.eclipse.emf.cdo.tests.mango.impl.MangoValueListImpl >+ * @see org.eclipse.emf.cdo.tests.mango.impl.MangoPackageImpl#getMangoValueList() > * @generated > */ >- EClass VALUE_LIST = eINSTANCE.getValueList(); >+ EClass MANGO_VALUE_LIST = eINSTANCE.getMangoValueList(); > > /** >- * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!-- >- * end-user-doc --> >- * >+ * The meta object literal for the '<em><b>Name</b></em>' attribute feature. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ >- EAttribute VALUE_LIST__NAME = eINSTANCE.getValueList_Name(); >+ EAttribute MANGO_VALUE_LIST__NAME = eINSTANCE.getMangoValueList_Name(); > > /** >- * The meta object literal for the '<em><b>Values</b></em>' reference list feature. <!-- begin-user-doc --> <!-- >- * end-user-doc --> >- * >+ * The meta object literal for the '<em><b>Values</b></em>' reference list feature. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ >- EReference VALUE_LIST__VALUES = eINSTANCE.getValueList_Values(); >+ EReference MANGO_VALUE_LIST__VALUES = eINSTANCE.getMangoValueList_Values(); > > /** >- * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.mango.impl.ValueImpl <em>Value</em>}' class. >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @see org.eclipse.emf.cdo.tests.mango.impl.ValueImpl >- * @see org.eclipse.emf.cdo.tests.mango.impl.MangoPackageImpl#getValue() >+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.mango.impl.MangoValueImpl <em>Value</em>}' class. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @see org.eclipse.emf.cdo.tests.mango.impl.MangoValueImpl >+ * @see org.eclipse.emf.cdo.tests.mango.impl.MangoPackageImpl#getMangoValue() > * @generated > */ >- EClass VALUE = eINSTANCE.getValue(); >+ EClass MANGO_VALUE = eINSTANCE.getMangoValue(); > > /** >- * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!-- >- * end-user-doc --> >- * >+ * The meta object literal for the '<em><b>Name</b></em>' attribute feature. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ >- EAttribute VALUE__NAME = eINSTANCE.getValue_Name(); >+ EAttribute MANGO_VALUE__NAME = eINSTANCE.getMangoValue_Name(); > > /** >- * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.mango.impl.ParameterImpl <em>Parameter</em>}' >- * class. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @see org.eclipse.emf.cdo.tests.mango.impl.ParameterImpl >- * @see org.eclipse.emf.cdo.tests.mango.impl.MangoPackageImpl#getParameter() >+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.mango.impl.MangoParameterImpl <em>Parameter</em>}' class. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @see org.eclipse.emf.cdo.tests.mango.impl.MangoParameterImpl >+ * @see org.eclipse.emf.cdo.tests.mango.impl.MangoPackageImpl#getMangoParameter() > * @generated > */ >- EClass PARAMETER = eINSTANCE.getParameter(); >+ EClass MANGO_PARAMETER = eINSTANCE.getMangoParameter(); > > /** >- * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!-- >- * end-user-doc --> >- * >+ * The meta object literal for the '<em><b>Name</b></em>' attribute feature. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ >- EAttribute PARAMETER__NAME = eINSTANCE.getParameter_Name(); >+ EAttribute MANGO_PARAMETER__NAME = eINSTANCE.getMangoParameter_Name(); > > /** >- * The meta object literal for the '<em><b>Passing</b></em>' attribute feature. <!-- begin-user-doc --> <!-- >- * end-user-doc --> >- * >+ * The meta object literal for the '<em><b>Passing</b></em>' attribute feature. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ >- EAttribute PARAMETER__PASSING = eINSTANCE.getParameter_Passing(); >+ EAttribute MANGO_PARAMETER__PASSING = eINSTANCE.getMangoParameter_Passing(); > > /** >- * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.mango.ParameterPassing >- * <em>Parameter Passing</em>}' enum. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.mango.ParameterPassing <em>Parameter Passing</em>}' enum. >+ * <!-- begin-user-doc --> <!-- end-user-doc --> > * @see org.eclipse.emf.cdo.tests.mango.ParameterPassing > * @see org.eclipse.emf.cdo.tests.mango.impl.MangoPackageImpl#getParameterPassing() > * @generated >Index: src/org/eclipse/emf/cdo/tests/mango/ValueList.java >=================================================================== >RCS file: src/org/eclipse/emf/cdo/tests/mango/ValueList.java >diff -N src/org/eclipse/emf/cdo/tests/mango/ValueList.java >--- src/org/eclipse/emf/cdo/tests/mango/ValueList.java 22 Aug 2009 09:34:41 -0000 1.10 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,74 +0,0 @@ >-/** >- * Copyright (c) 2004 - 2009 Eike Stepper (Berlin, Germany) and others. >- * All rights reserved. This program and the accompanying materials >- * are made available under the terms of the Eclipse Public License v1.0 >- * which accompanies this distribution, and is available at >- * http://www.eclipse.org/legal/epl-v10.html >- * >- * Contributors: >- * Eike Stepper - initial API and implementation >- */ >-package org.eclipse.emf.cdo.tests.mango; >- >-import org.eclipse.emf.common.util.EList; >-import org.eclipse.emf.ecore.EObject; >- >-/** >- * <!-- begin-user-doc --> A representation of the model object '<em><b>Value List</b></em>'. <!-- end-user-doc --> >- * <p> >- * The following features are supported: >- * <ul> >- * <li>{@link org.eclipse.emf.cdo.tests.mango.ValueList#getName <em>Name</em>}</li> >- * <li>{@link org.eclipse.emf.cdo.tests.mango.ValueList#getValues <em>Values</em>}</li> >- * </ul> >- * </p> >- * >- * @see org.eclipse.emf.cdo.tests.mango.MangoPackage#getValueList() >- * @model >- * @generated >- */ >-public interface ValueList extends EObject >-{ >- /** >- * Returns the value of the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> >- * <p> >- * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here... >- * </p> >- * <!-- end-user-doc --> >- * >- * @return the value of the '<em>Name</em>' attribute. >- * @see #setName(String) >- * @see org.eclipse.emf.cdo.tests.mango.MangoPackage#getValueList_Name() >- * @model >- * @generated >- */ >- String getName(); >- >- /** >- * Sets the value of the '{@link org.eclipse.emf.cdo.tests.mango.ValueList#getName <em>Name</em>}' attribute. <!-- >- * begin-user-doc --> <!-- end-user-doc --> >- * >- * @param value >- * the new value of the '<em>Name</em>' attribute. >- * @see #getName() >- * @generated >- */ >- void setName(String value); >- >- /** >- * Returns the value of the '<em><b>Values</b></em>' reference list. The list contents are of type >- * {@link org.eclipse.emf.cdo.tests.mango.Value}. <!-- begin-user-doc --> >- * <p> >- * If the meaning of the '<em>Values</em>' reference list isn't clear, there really should be more of a description >- * here... >- * </p> >- * <!-- end-user-doc --> >- * >- * @return the value of the '<em>Values</em>' reference list. >- * @see org.eclipse.emf.cdo.tests.mango.MangoPackage#getValueList_Values() >- * @model >- * @generated >- */ >- EList<Value> getValues(); >- >-} // ValueList >Index: src/org/eclipse/emf/cdo/tests/mango/Value.java >=================================================================== >RCS file: src/org/eclipse/emf/cdo/tests/mango/Value.java >diff -N src/org/eclipse/emf/cdo/tests/mango/Value.java >--- src/org/eclipse/emf/cdo/tests/mango/Value.java 22 Aug 2009 09:34:41 -0000 1.10 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,56 +0,0 @@ >-/** >- * Copyright (c) 2004 - 2009 Eike Stepper (Berlin, Germany) and others. >- * All rights reserved. This program and the accompanying materials >- * are made available under the terms of the Eclipse Public License v1.0 >- * which accompanies this distribution, and is available at >- * http://www.eclipse.org/legal/epl-v10.html >- * >- * Contributors: >- * Eike Stepper - initial API and implementation >- */ >-package org.eclipse.emf.cdo.tests.mango; >- >-import org.eclipse.emf.ecore.EObject; >- >-/** >- * <!-- begin-user-doc --> A representation of the model object '<em><b>Value</b></em>'. <!-- end-user-doc --> >- * <p> >- * The following features are supported: >- * <ul> >- * <li>{@link org.eclipse.emf.cdo.tests.mango.Value#getName <em>Name</em>}</li> >- * </ul> >- * </p> >- * >- * @see org.eclipse.emf.cdo.tests.mango.MangoPackage#getValue() >- * @model >- * @generated >- */ >-public interface Value extends EObject >-{ >- /** >- * Returns the value of the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> >- * <p> >- * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here... >- * </p> >- * <!-- end-user-doc --> >- * >- * @return the value of the '<em>Name</em>' attribute. >- * @see #setName(String) >- * @see org.eclipse.emf.cdo.tests.mango.MangoPackage#getValue_Name() >- * @model >- * @generated >- */ >- String getName(); >- >- /** >- * Sets the value of the '{@link org.eclipse.emf.cdo.tests.mango.Value#getName <em>Name</em>}' attribute. <!-- >- * begin-user-doc --> <!-- end-user-doc --> >- * >- * @param value >- * the new value of the '<em>Name</em>' attribute. >- * @see #getName() >- * @generated >- */ >- void setName(String value); >- >-} // Value >Index: src/org/eclipse/emf/cdo/tests/legacy/mango/ParameterPassing.java >=================================================================== >RCS file: src/org/eclipse/emf/cdo/tests/legacy/mango/ParameterPassing.java >diff -N src/org/eclipse/emf/cdo/tests/legacy/mango/ParameterPassing.java >--- src/org/eclipse/emf/cdo/tests/legacy/mango/ParameterPassing.java 22 Aug 2009 09:34:41 -0000 1.2 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,225 +0,0 @@ >-/** >- * Copyright (c) 2004 - 2009 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 >- * >- * $Id: ParameterPassing.java,v 1.2 2009/08/22 09:34:41 estepper Exp $ >- */ >-package org.eclipse.emf.cdo.tests.legacy.mango; >- >-import org.eclipse.emf.common.util.Enumerator; >- >-import java.util.Arrays; >-import java.util.Collections; >-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.legacy.mango.MangoPackage#getParameterPassing() >- * @model >- * @generated >- */ >-public enum ParameterPassing implements Enumerator >-{ >- /** >- * The '<em><b>By Value</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @see #BY_VALUE_VALUE >- * @generated >- * @ordered >- */ >- BY_VALUE(0, "ByValue", "ByValue"), >- >- /** >- * The '<em><b>By Reference</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @see #BY_REFERENCE_VALUE >- * @generated >- * @ordered >- */ >- BY_REFERENCE(1, "ByReference", "ByReference"); >- >- /** >- * The '<em><b>By Value</b></em>' literal value. <!-- begin-user-doc --> >- * <p> >- * If the meaning of '<em><b>By Value</b></em>' literal object isn't clear, there really should be more of a >- * description here... >- * </p> >- * <!-- end-user-doc --> >- * >- * @see #BY_VALUE >- * @model name="ByValue" >- * @generated >- * @ordered >- */ >- public static final int BY_VALUE_VALUE = 0; >- >- /** >- * The '<em><b>By Reference</b></em>' literal value. <!-- begin-user-doc --> >- * <p> >- * If the meaning of '<em><b>By Reference</b></em>' literal object isn't clear, there really should be more of a >- * description here... >- * </p> >- * <!-- end-user-doc --> >- * >- * @see #BY_REFERENCE >- * @model name="ByReference" >- * @generated >- * @ordered >- */ >- public static final int BY_REFERENCE_VALUE = 1; >- >- /** >- * An array of all the '<em><b>Parameter Passing</b></em>' enumerators. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- private static final ParameterPassing[] VALUES_ARRAY = new ParameterPassing[] { BY_VALUE, BY_REFERENCE, }; >- >- /** >- * A public read-only list of all the '<em><b>Parameter Passing</b></em>' enumerators. <!-- begin-user-doc --> <!-- >- * end-user-doc --> >- * >- * @generated >- */ >- public static final List<ParameterPassing> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY)); >- >- /** >- * Returns the '<em><b>Parameter Passing</b></em>' literal with the specified literal value. <!-- begin-user-doc --> >- * <!-- end-user-doc --> >- * >- * @generated >- */ >- public static ParameterPassing get(String literal) >- { >- for (int i = 0; i < VALUES_ARRAY.length; ++i) >- { >- ParameterPassing result = VALUES_ARRAY[i]; >- if (result.toString().equals(literal)) >- { >- return result; >- } >- } >- return null; >- } >- >- /** >- * Returns the '<em><b>Parameter Passing</b></em>' literal with the specified name. <!-- begin-user-doc --> <!-- >- * end-user-doc --> >- * >- * @generated >- */ >- public static ParameterPassing getByName(String name) >- { >- for (int i = 0; i < VALUES_ARRAY.length; ++i) >- { >- ParameterPassing result = VALUES_ARRAY[i]; >- if (result.getName().equals(name)) >- { >- return result; >- } >- } >- return null; >- } >- >- /** >- * Returns the '<em><b>Parameter Passing</b></em>' literal with the specified integer value. <!-- begin-user-doc --> >- * <!-- end-user-doc --> >- * >- * @generated >- */ >- public static ParameterPassing get(int value) >- { >- switch (value) >- { >- case BY_VALUE_VALUE: >- return BY_VALUE; >- case BY_REFERENCE_VALUE: >- return BY_REFERENCE; >- } >- return null; >- } >- >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- private final int value; >- >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- private final String name; >- >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- private final String literal; >- >- /** >- * Only this class can construct instances. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- private ParameterPassing(int value, String name, String literal) >- { >- this.value = value; >- this.name = name; >- this.literal = literal; >- } >- >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- public int getValue() >- { >- return value; >- } >- >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- public String getName() >- { >- return name; >- } >- >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- public String getLiteral() >- { >- return literal; >- } >- >- /** >- * Returns the literal value of the enumerator, which is its string representation. <!-- begin-user-doc --> <!-- >- * end-user-doc --> >- * >- * @generated >- */ >- @Override >- public String toString() >- { >- return literal; >- } >- >-} // ParameterPassing >Index: src/org/eclipse/emf/cdo/tests/legacy/mango/Parameter.java >=================================================================== >RCS file: src/org/eclipse/emf/cdo/tests/legacy/mango/Parameter.java >diff -N src/org/eclipse/emf/cdo/tests/legacy/mango/Parameter.java >--- src/org/eclipse/emf/cdo/tests/legacy/mango/Parameter.java 22 Aug 2009 09:34:41 -0000 1.2 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,89 +0,0 @@ >-/** >- * Copyright (c) 2004 - 2009 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 >- * >- * $Id: Parameter.java,v 1.2 2009/08/22 09:34:41 estepper Exp $ >- */ >-package org.eclipse.emf.cdo.tests.legacy.mango; >- >-import org.eclipse.emf.ecore.EObject; >- >-/** >- * <!-- begin-user-doc --> A representation of the model object '<em><b>Parameter</b></em>'. <!-- end-user-doc --> >- * <p> >- * The following features are supported: >- * <ul> >- * <li>{@link org.eclipse.emf.cdo.tests.legacy.mango.Parameter#getName <em>Name</em>}</li> >- * <li>{@link org.eclipse.emf.cdo.tests.legacy.mango.Parameter#getPassing <em>Passing</em>}</li> >- * </ul> >- * </p> >- * >- * @see org.eclipse.emf.cdo.tests.legacy.mango.MangoPackage#getParameter() >- * @model >- * @generated >- */ >-public interface Parameter extends EObject >-{ >- /** >- * Returns the value of the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> >- * <p> >- * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here... >- * </p> >- * <!-- end-user-doc --> >- * >- * @return the value of the '<em>Name</em>' attribute. >- * @see #setName(String) >- * @see org.eclipse.emf.cdo.tests.legacy.mango.MangoPackage#getParameter_Name() >- * @model >- * @generated >- */ >- String getName(); >- >- /** >- * Sets the value of the '{@link org.eclipse.emf.cdo.tests.legacy.mango.Parameter#getName <em>Name</em>}' attribute. >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @param value >- * the new value of the '<em>Name</em>' attribute. >- * @see #getName() >- * @generated >- */ >- void setName(String value); >- >- /** >- * Returns the value of the '<em><b>Passing</b></em>' attribute. The literals are from the enumeration >- * {@link org.eclipse.emf.cdo.tests.legacy.mango.ParameterPassing}. <!-- begin-user-doc --> >- * <p> >- * If the meaning of the '<em>Passing</em>' attribute isn't clear, there really should be more of a description >- * here... >- * </p> >- * <!-- end-user-doc --> >- * >- * @return the value of the '<em>Passing</em>' attribute. >- * @see org.eclipse.emf.cdo.tests.legacy.mango.ParameterPassing >- * @see #setPassing(ParameterPassing) >- * @see org.eclipse.emf.cdo.tests.legacy.mango.MangoPackage#getParameter_Passing() >- * @model >- * @generated >- */ >- ParameterPassing getPassing(); >- >- /** >- * Sets the value of the '{@link org.eclipse.emf.cdo.tests.legacy.mango.Parameter#getPassing <em>Passing</em>}' >- * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @param value >- * the new value of the '<em>Passing</em>' attribute. >- * @see org.eclipse.emf.cdo.tests.legacy.mango.ParameterPassing >- * @see #getPassing() >- * @generated >- */ >- void setPassing(ParameterPassing value); >- >-} // Parameter >Index: src/org/eclipse/emf/cdo/tests/legacy/mango/Value.java >=================================================================== >RCS file: src/org/eclipse/emf/cdo/tests/legacy/mango/Value.java >diff -N src/org/eclipse/emf/cdo/tests/legacy/mango/Value.java >--- src/org/eclipse/emf/cdo/tests/legacy/mango/Value.java 22 Aug 2009 09:34:41 -0000 1.2 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,58 +0,0 @@ >-/** >- * Copyright (c) 2004 - 2009 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 >- * >- * $Id: Value.java,v 1.2 2009/08/22 09:34:41 estepper Exp $ >- */ >-package org.eclipse.emf.cdo.tests.legacy.mango; >- >-import org.eclipse.emf.ecore.EObject; >- >-/** >- * <!-- begin-user-doc --> A representation of the model object '<em><b>Value</b></em>'. <!-- end-user-doc --> >- * <p> >- * The following features are supported: >- * <ul> >- * <li>{@link org.eclipse.emf.cdo.tests.legacy.mango.Value#getName <em>Name</em>}</li> >- * </ul> >- * </p> >- * >- * @see org.eclipse.emf.cdo.tests.legacy.mango.MangoPackage#getValue() >- * @model >- * @generated >- */ >-public interface Value extends EObject >-{ >- /** >- * Returns the value of the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> >- * <p> >- * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here... >- * </p> >- * <!-- end-user-doc --> >- * >- * @return the value of the '<em>Name</em>' attribute. >- * @see #setName(String) >- * @see org.eclipse.emf.cdo.tests.legacy.mango.MangoPackage#getValue_Name() >- * @model >- * @generated >- */ >- String getName(); >- >- /** >- * Sets the value of the '{@link org.eclipse.emf.cdo.tests.legacy.mango.Value#getName <em>Name</em>}' attribute. <!-- >- * begin-user-doc --> <!-- end-user-doc --> >- * >- * @param value >- * the new value of the '<em>Name</em>' attribute. >- * @see #getName() >- * @generated >- */ >- void setName(String value); >- >-} // Value >Index: src/org/eclipse/emf/cdo/tests/legacy/mango/MangoPackage.java >=================================================================== >RCS file: src/org/eclipse/emf/cdo/tests/legacy/mango/MangoPackage.java >diff -N src/org/eclipse/emf/cdo/tests/legacy/mango/MangoPackage.java >--- src/org/eclipse/emf/cdo/tests/legacy/mango/MangoPackage.java 22 Aug 2009 09:34:41 -0000 1.5 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,368 +0,0 @@ >-/** >- * Copyright (c) 2004 - 2009 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 >- * >- * $Id: MangoPackage.java,v 1.5 2009/08/22 09:34:41 estepper Exp $ >- */ >-package org.eclipse.emf.cdo.tests.legacy.mango; >- >-import org.eclipse.emf.ecore.EAttribute; >-import org.eclipse.emf.ecore.EClass; >-import org.eclipse.emf.ecore.EEnum; >-import org.eclipse.emf.ecore.EPackage; >-import org.eclipse.emf.ecore.EReference; >- >-/** >- * <!-- begin-user-doc --> The <b>Package</b> for the model. It contains accessors for the meta objects to represent >- * <ul> >- * <li>each class,</li> >- * <li>each feature of each class,</li> >- * <li>each enum,</li> >- * <li>and each data type</li> >- * </ul> >- * <!-- end-user-doc --> >- * >- * @see org.eclipse.emf.cdo.tests.legacy.mango.MangoFactory >- * @model kind="package" >- * @generated >- */ >-public interface MangoPackage extends EPackage >-{ >- /** >- * The package name. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- String eNAME = "mango"; >- >- /** >- * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- String eNS_URI = "http://www.eclipse.org/emf/CDO/tests/mango"; >- >- /** >- * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- String eNS_PREFIX = "mango"; >- >- /** >- * The singleton instance of the package. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- MangoPackage eINSTANCE = org.eclipse.emf.cdo.tests.legacy.mango.impl.MangoPackageImpl.init(); >- >- /** >- * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.mango.impl.ValueListImpl <em>Value List</em>}' >- * class. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @see org.eclipse.emf.cdo.tests.legacy.mango.impl.ValueListImpl >- * @see org.eclipse.emf.cdo.tests.legacy.mango.impl.MangoPackageImpl#getValueList() >- * @generated >- */ >- int VALUE_LIST = 0; >- >- /** >- * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- * @ordered >- */ >- int VALUE_LIST__NAME = 0; >- >- /** >- * The feature id for the '<em><b>Values</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- * @ordered >- */ >- int VALUE_LIST__VALUES = 1; >- >- /** >- * The number of structural features of the '<em>Value List</em>' class. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- * @ordered >- */ >- int VALUE_LIST_FEATURE_COUNT = 2; >- >- /** >- * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.mango.impl.ValueImpl <em>Value</em>}' class. >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @see org.eclipse.emf.cdo.tests.legacy.mango.impl.ValueImpl >- * @see org.eclipse.emf.cdo.tests.legacy.mango.impl.MangoPackageImpl#getValue() >- * @generated >- */ >- int VALUE = 1; >- >- /** >- * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- * @ordered >- */ >- int VALUE__NAME = 0; >- >- /** >- * The number of structural features of the '<em>Value</em>' class. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- * @ordered >- */ >- int VALUE_FEATURE_COUNT = 1; >- >- /** >- * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.mango.impl.ParameterImpl <em>Parameter</em>}' >- * class. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @see org.eclipse.emf.cdo.tests.legacy.mango.impl.ParameterImpl >- * @see org.eclipse.emf.cdo.tests.legacy.mango.impl.MangoPackageImpl#getParameter() >- * @generated >- */ >- int PARAMETER = 2; >- >- /** >- * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- * @ordered >- */ >- int PARAMETER__NAME = 0; >- >- /** >- * The feature id for the '<em><b>Passing</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- * @ordered >- */ >- int PARAMETER__PASSING = 1; >- >- /** >- * The number of structural features of the '<em>Parameter</em>' class. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- * @ordered >- */ >- int PARAMETER_FEATURE_COUNT = 2; >- >- /** >- * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.mango.ParameterPassing >- * <em>Parameter Passing</em>}' enum. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @see org.eclipse.emf.cdo.tests.legacy.mango.ParameterPassing >- * @see org.eclipse.emf.cdo.tests.legacy.mango.impl.MangoPackageImpl#getParameterPassing() >- * @generated >- */ >- int PARAMETER_PASSING = 3; >- >- /** >- * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.mango.ValueList <em>Value List</em>}'. >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @return the meta object for class '<em>Value List</em>'. >- * @see org.eclipse.emf.cdo.tests.legacy.mango.ValueList >- * @generated >- */ >- EClass getValueList(); >- >- /** >- * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.mango.ValueList#getName >- * <em>Name</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @return the meta object for the attribute '<em>Name</em>'. >- * @see org.eclipse.emf.cdo.tests.legacy.mango.ValueList#getName() >- * @see #getValueList() >- * @generated >- */ >- EAttribute getValueList_Name(); >- >- /** >- * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.legacy.mango.ValueList#getValues >- * <em>Values</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @return the meta object for the reference list '<em>Values</em>'. >- * @see org.eclipse.emf.cdo.tests.legacy.mango.ValueList#getValues() >- * @see #getValueList() >- * @generated >- */ >- EReference getValueList_Values(); >- >- /** >- * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.mango.Value <em>Value</em>}'. <!-- >- * begin-user-doc --> <!-- end-user-doc --> >- * >- * @return the meta object for class '<em>Value</em>'. >- * @see org.eclipse.emf.cdo.tests.legacy.mango.Value >- * @generated >- */ >- EClass getValue(); >- >- /** >- * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.mango.Value#getName >- * <em>Name</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @return the meta object for the attribute '<em>Name</em>'. >- * @see org.eclipse.emf.cdo.tests.legacy.mango.Value#getName() >- * @see #getValue() >- * @generated >- */ >- EAttribute getValue_Name(); >- >- /** >- * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.mango.Parameter <em>Parameter</em>}'. >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @return the meta object for class '<em>Parameter</em>'. >- * @see org.eclipse.emf.cdo.tests.legacy.mango.Parameter >- * @generated >- */ >- EClass getParameter(); >- >- /** >- * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.mango.Parameter#getName >- * <em>Name</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @return the meta object for the attribute '<em>Name</em>'. >- * @see org.eclipse.emf.cdo.tests.legacy.mango.Parameter#getName() >- * @see #getParameter() >- * @generated >- */ >- EAttribute getParameter_Name(); >- >- /** >- * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.mango.Parameter#getPassing >- * <em>Passing</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @return the meta object for the attribute '<em>Passing</em>'. >- * @see org.eclipse.emf.cdo.tests.legacy.mango.Parameter#getPassing() >- * @see #getParameter() >- * @generated >- */ >- EAttribute getParameter_Passing(); >- >- /** >- * Returns the meta object for enum '{@link org.eclipse.emf.cdo.tests.legacy.mango.ParameterPassing >- * <em>Parameter Passing</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @return the meta object for enum '<em>Parameter Passing</em>'. >- * @see org.eclipse.emf.cdo.tests.legacy.mango.ParameterPassing >- * @generated >- */ >- EEnum getParameterPassing(); >- >- /** >- * Returns the factory that creates the instances of the model. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @return the factory that creates the instances of the model. >- * @generated >- */ >- MangoFactory getMangoFactory(); >- >- /** >- * <!-- begin-user-doc --> Defines literals for the meta objects that represent >- * <ul> >- * <li>each class,</li> >- * <li>each feature of each class,</li> >- * <li>each enum,</li> >- * <li>and each data type</li> >- * </ul> >- * <!-- end-user-doc --> >- * >- * @generated >- */ >- interface Literals >- { >- /** >- * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.mango.impl.ValueListImpl >- * <em>Value List</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @see org.eclipse.emf.cdo.tests.legacy.mango.impl.ValueListImpl >- * @see org.eclipse.emf.cdo.tests.legacy.mango.impl.MangoPackageImpl#getValueList() >- * @generated >- */ >- EClass VALUE_LIST = eINSTANCE.getValueList(); >- >- /** >- * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!-- >- * end-user-doc --> >- * >- * @generated >- */ >- EAttribute VALUE_LIST__NAME = eINSTANCE.getValueList_Name(); >- >- /** >- * The meta object literal for the '<em><b>Values</b></em>' reference list feature. <!-- begin-user-doc --> <!-- >- * end-user-doc --> >- * >- * @generated >- */ >- EReference VALUE_LIST__VALUES = eINSTANCE.getValueList_Values(); >- >- /** >- * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.mango.impl.ValueImpl <em>Value</em>}' >- * class. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @see org.eclipse.emf.cdo.tests.legacy.mango.impl.ValueImpl >- * @see org.eclipse.emf.cdo.tests.legacy.mango.impl.MangoPackageImpl#getValue() >- * @generated >- */ >- EClass VALUE = eINSTANCE.getValue(); >- >- /** >- * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!-- >- * end-user-doc --> >- * >- * @generated >- */ >- EAttribute VALUE__NAME = eINSTANCE.getValue_Name(); >- >- /** >- * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.mango.impl.ParameterImpl >- * <em>Parameter</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @see org.eclipse.emf.cdo.tests.legacy.mango.impl.ParameterImpl >- * @see org.eclipse.emf.cdo.tests.legacy.mango.impl.MangoPackageImpl#getParameter() >- * @generated >- */ >- EClass PARAMETER = eINSTANCE.getParameter(); >- >- /** >- * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!-- >- * end-user-doc --> >- * >- * @generated >- */ >- EAttribute PARAMETER__NAME = eINSTANCE.getParameter_Name(); >- >- /** >- * The meta object literal for the '<em><b>Passing</b></em>' attribute feature. <!-- begin-user-doc --> <!-- >- * end-user-doc --> >- * >- * @generated >- */ >- EAttribute PARAMETER__PASSING = eINSTANCE.getParameter_Passing(); >- >- /** >- * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.mango.ParameterPassing >- * <em>Parameter Passing</em>}' enum. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @see org.eclipse.emf.cdo.tests.legacy.mango.ParameterPassing >- * @see org.eclipse.emf.cdo.tests.legacy.mango.impl.MangoPackageImpl#getParameterPassing() >- * @generated >- */ >- EEnum PARAMETER_PASSING = eINSTANCE.getParameterPassing(); >- >- } >- >-} // MangoPackage >Index: src/org/eclipse/emf/cdo/tests/legacy/mango/MangoFactory.java >=================================================================== >RCS file: src/org/eclipse/emf/cdo/tests/legacy/mango/MangoFactory.java >diff -N src/org/eclipse/emf/cdo/tests/legacy/mango/MangoFactory.java >--- src/org/eclipse/emf/cdo/tests/legacy/mango/MangoFactory.java 22 Aug 2009 09:34:41 -0000 1.5 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,65 +0,0 @@ >-/** >- * Copyright (c) 2004 - 2009 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 >- * >- * $Id: MangoFactory.java,v 1.5 2009/08/22 09:34:41 estepper Exp $ >- */ >-package org.eclipse.emf.cdo.tests.legacy.mango; >- >-import org.eclipse.emf.ecore.EFactory; >- >-/** >- * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a create method for each non-abstract class of >- * the model. <!-- end-user-doc --> >- * >- * @see org.eclipse.emf.cdo.tests.legacy.mango.MangoPackage >- * @generated >- */ >-public interface MangoFactory extends EFactory >-{ >- /** >- * The singleton instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- MangoFactory eINSTANCE = org.eclipse.emf.cdo.tests.legacy.mango.impl.MangoFactoryImpl.init(); >- >- /** >- * Returns a new object of class '<em>Value List</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @return a new object of class '<em>Value List</em>'. >- * @generated >- */ >- ValueList createValueList(); >- >- /** >- * Returns a new object of class '<em>Value</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @return a new object of class '<em>Value</em>'. >- * @generated >- */ >- Value createValue(); >- >- /** >- * Returns a new object of class '<em>Parameter</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @return a new object of class '<em>Parameter</em>'. >- * @generated >- */ >- Parameter createParameter(); >- >- /** >- * Returns the package supported by this factory. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @return the package supported by this factory. >- * @generated >- */ >- MangoPackage getMangoPackage(); >- >-} // MangoFactory >Index: src/org/eclipse/emf/cdo/tests/legacy/mango/ValueList.java >=================================================================== >RCS file: src/org/eclipse/emf/cdo/tests/legacy/mango/ValueList.java >diff -N src/org/eclipse/emf/cdo/tests/legacy/mango/ValueList.java >--- src/org/eclipse/emf/cdo/tests/legacy/mango/ValueList.java 22 Aug 2009 09:34:41 -0000 1.2 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,76 +0,0 @@ >-/** >- * Copyright (c) 2004 - 2009 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 >- * >- * $Id: ValueList.java,v 1.2 2009/08/22 09:34:41 estepper Exp $ >- */ >-package org.eclipse.emf.cdo.tests.legacy.mango; >- >-import org.eclipse.emf.common.util.EList; >-import org.eclipse.emf.ecore.EObject; >- >-/** >- * <!-- begin-user-doc --> A representation of the model object '<em><b>Value List</b></em>'. <!-- end-user-doc --> >- * <p> >- * The following features are supported: >- * <ul> >- * <li>{@link org.eclipse.emf.cdo.tests.legacy.mango.ValueList#getName <em>Name</em>}</li> >- * <li>{@link org.eclipse.emf.cdo.tests.legacy.mango.ValueList#getValues <em>Values</em>}</li> >- * </ul> >- * </p> >- * >- * @see org.eclipse.emf.cdo.tests.legacy.mango.MangoPackage#getValueList() >- * @model >- * @generated >- */ >-public interface ValueList extends EObject >-{ >- /** >- * Returns the value of the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> >- * <p> >- * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here... >- * </p> >- * <!-- end-user-doc --> >- * >- * @return the value of the '<em>Name</em>' attribute. >- * @see #setName(String) >- * @see org.eclipse.emf.cdo.tests.legacy.mango.MangoPackage#getValueList_Name() >- * @model >- * @generated >- */ >- String getName(); >- >- /** >- * Sets the value of the '{@link org.eclipse.emf.cdo.tests.legacy.mango.ValueList#getName <em>Name</em>}' attribute. >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @param value >- * the new value of the '<em>Name</em>' attribute. >- * @see #getName() >- * @generated >- */ >- void setName(String value); >- >- /** >- * Returns the value of the '<em><b>Values</b></em>' reference list. The list contents are of type >- * {@link org.eclipse.emf.cdo.tests.legacy.mango.Value}. <!-- begin-user-doc --> >- * <p> >- * If the meaning of the '<em>Values</em>' reference list isn't clear, there really should be more of a description >- * here... >- * </p> >- * <!-- end-user-doc --> >- * >- * @return the value of the '<em>Values</em>' reference list. >- * @see org.eclipse.emf.cdo.tests.legacy.mango.MangoPackage#getValueList_Values() >- * @model >- * @generated >- */ >- EList<Value> getValues(); >- >-} // ValueList >Index: src/org/eclipse/emf/cdo/tests/mango/impl/MangoPackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoPackageImpl.java,v >retrieving revision 1.13 >diff -u -r1.13 MangoPackageImpl.java >--- src/org/eclipse/emf/cdo/tests/mango/impl/MangoPackageImpl.java 22 Aug 2009 09:34:41 -0000 1.13 >+++ src/org/eclipse/emf/cdo/tests/mango/impl/MangoPackageImpl.java 14 Nov 2009 18:55:45 -0000 >@@ -12,10 +12,10 @@ > > import org.eclipse.emf.cdo.tests.mango.MangoFactory; > import org.eclipse.emf.cdo.tests.mango.MangoPackage; >-import org.eclipse.emf.cdo.tests.mango.Parameter; >+import org.eclipse.emf.cdo.tests.mango.MangoParameter; >+import org.eclipse.emf.cdo.tests.mango.MangoValue; >+import org.eclipse.emf.cdo.tests.mango.MangoValueList; > import org.eclipse.emf.cdo.tests.mango.ParameterPassing; >-import org.eclipse.emf.cdo.tests.mango.Value; >-import org.eclipse.emf.cdo.tests.mango.ValueList; > > import org.eclipse.emf.ecore.EAttribute; > import org.eclipse.emf.ecore.EClass; >@@ -26,35 +26,33 @@ > > /** > * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc --> >- * > * @generated > */ > public class MangoPackageImpl extends EPackageImpl implements MangoPackage > { > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ >- private EClass valueListEClass = null; >+ private EClass mangoValueListEClass = null; > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ >- private EClass valueEClass = null; >+ private EClass mangoValueEClass = null; > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ >- private EClass parameterEClass = null; >+ private EClass mangoParameterEClass = null; > > /** > * <!-- begin-user-doc --> <!-- end-user-doc --> >- * > * @generated > */ > private EEnum parameterPassingEEnum = null; >@@ -79,18 +77,17 @@ > > /** > * <!-- begin-user-doc --> <!-- end-user-doc --> >- * > * @generated > */ > private static boolean isInited = false; > > /** > * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends. >- * <p> >- * This method is used to initialize {@link MangoPackage#eINSTANCE} when that field is accessed. Clients should not >- * invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc --> >- * <!-- end-user-doc --> > * >+ * <p>This method is used to initialize {@link MangoPackage#eINSTANCE} when that field is accessed. >+ * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @see #eNS_URI > * @see #createPackageContents() > * @see #initializePackageContents() >@@ -123,88 +120,87 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ >- public EClass getValueList() >+ public EClass getMangoValueList() > { >- return valueListEClass; >+ return mangoValueListEClass; > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ >- public EAttribute getValueList_Name() >+ public EAttribute getMangoValueList_Name() > { >- return (EAttribute)valueListEClass.getEStructuralFeatures().get(0); >+ return (EAttribute)mangoValueListEClass.getEStructuralFeatures().get(0); > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ >- public EReference getValueList_Values() >+ public EReference getMangoValueList_Values() > { >- return (EReference)valueListEClass.getEStructuralFeatures().get(1); >+ return (EReference)mangoValueListEClass.getEStructuralFeatures().get(1); > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ >- public EClass getValue() >+ public EClass getMangoValue() > { >- return valueEClass; >+ return mangoValueEClass; > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ >- public EAttribute getValue_Name() >+ public EAttribute getMangoValue_Name() > { >- return (EAttribute)valueEClass.getEStructuralFeatures().get(0); >+ return (EAttribute)mangoValueEClass.getEStructuralFeatures().get(0); > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ >- public EClass getParameter() >+ public EClass getMangoParameter() > { >- return parameterEClass; >+ return mangoParameterEClass; > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ >- public EAttribute getParameter_Name() >+ public EAttribute getMangoParameter_Name() > { >- return (EAttribute)parameterEClass.getEStructuralFeatures().get(0); >+ return (EAttribute)mangoParameterEClass.getEStructuralFeatures().get(0); > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ >- public EAttribute getParameter_Passing() >+ public EAttribute getMangoParameter_Passing() > { >- return (EAttribute)parameterEClass.getEStructuralFeatures().get(1); >+ return (EAttribute)mangoParameterEClass.getEStructuralFeatures().get(1); > } > > /** > * <!-- begin-user-doc --> <!-- end-user-doc --> >- * > * @generated > */ > public EEnum getParameterPassing() >@@ -214,7 +210,6 @@ > > /** > * <!-- begin-user-doc --> <!-- end-user-doc --> >- * > * @generated > */ > public MangoFactory getMangoFactory() >@@ -224,15 +219,14 @@ > > /** > * <!-- begin-user-doc --> <!-- end-user-doc --> >- * > * @generated > */ > private boolean isCreated = false; > > /** >- * Creates the meta-model objects for the package. This method is guarded to have no affect on any invocation but its >- * first. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * Creates the meta-model objects for the package. This method is >+ * guarded to have no affect on any invocation but its first. >+ * <!-- begin-user-doc --> <!-- end-user-doc --> > * @generated > */ > public void createPackageContents() >@@ -242,16 +236,16 @@ > isCreated = true; > > // Create classes and their features >- valueListEClass = createEClass(VALUE_LIST); >- createEAttribute(valueListEClass, VALUE_LIST__NAME); >- createEReference(valueListEClass, VALUE_LIST__VALUES); >- >- valueEClass = createEClass(VALUE); >- createEAttribute(valueEClass, VALUE__NAME); >- >- parameterEClass = createEClass(PARAMETER); >- createEAttribute(parameterEClass, PARAMETER__NAME); >- createEAttribute(parameterEClass, PARAMETER__PASSING); >+ mangoValueListEClass = createEClass(MANGO_VALUE_LIST); >+ createEAttribute(mangoValueListEClass, MANGO_VALUE_LIST__NAME); >+ createEReference(mangoValueListEClass, MANGO_VALUE_LIST__VALUES); >+ >+ mangoValueEClass = createEClass(MANGO_VALUE); >+ createEAttribute(mangoValueEClass, MANGO_VALUE__NAME); >+ >+ mangoParameterEClass = createEClass(MANGO_PARAMETER); >+ createEAttribute(mangoParameterEClass, MANGO_PARAMETER__NAME); >+ createEAttribute(mangoParameterEClass, MANGO_PARAMETER__PASSING); > > // Create enums > parameterPassingEEnum = createEEnum(PARAMETER_PASSING); >@@ -259,15 +253,14 @@ > > /** > * <!-- begin-user-doc --> <!-- end-user-doc --> >- * > * @generated > */ > private boolean isInitialized = false; > > /** >- * Complete the initialization of the package and its meta-model. This method is guarded to have no affect on any >- * invocation but its first. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * Complete the initialization of the package and its meta-model. This >+ * method is guarded to have no affect on any invocation but its first. >+ * <!-- begin-user-doc --> <!-- end-user-doc --> > * @generated > */ > public void initializePackageContents() >@@ -288,22 +281,26 @@ > // Add supertypes to classes > > // Initialize classes and features; add operations and parameters >- initEClass(valueListEClass, ValueList.class, "ValueList", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); >- initEAttribute(getValueList_Name(), ecorePackage.getEString(), "name", null, 0, 1, ValueList.class, !IS_TRANSIENT, >- !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); >- initEReference(getValueList_Values(), this.getValue(), null, "values", null, 0, -1, ValueList.class, !IS_TRANSIENT, >- !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, >- IS_ORDERED); >- >- initEClass(valueEClass, Value.class, "Value", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); >- initEAttribute(getValue_Name(), ecorePackage.getEString(), "name", null, 0, 1, Value.class, !IS_TRANSIENT, >- !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); >- >- initEClass(parameterEClass, Parameter.class, "Parameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); >- initEAttribute(getParameter_Name(), ecorePackage.getEString(), "name", null, 0, 1, Parameter.class, !IS_TRANSIENT, >- !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); >- initEAttribute(getParameter_Passing(), this.getParameterPassing(), "passing", null, 0, 1, Parameter.class, >+ initEClass(mangoValueListEClass, MangoValueList.class, "MangoValueList", !IS_ABSTRACT, !IS_INTERFACE, >+ IS_GENERATED_INSTANCE_CLASS); >+ initEAttribute(getMangoValueList_Name(), ecorePackage.getEString(), "name", null, 0, 1, MangoValueList.class, >+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); >+ initEReference(getMangoValueList_Values(), this.getMangoValue(), null, "values", null, 0, -1, MangoValueList.class, >+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, >+ !IS_DERIVED, IS_ORDERED); >+ >+ initEClass(mangoValueEClass, MangoValue.class, "MangoValue", !IS_ABSTRACT, !IS_INTERFACE, >+ IS_GENERATED_INSTANCE_CLASS); >+ initEAttribute(getMangoValue_Name(), ecorePackage.getEString(), "name", null, 0, 1, MangoValue.class, >+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); >+ >+ initEClass(mangoParameterEClass, MangoParameter.class, "MangoParameter", !IS_ABSTRACT, !IS_INTERFACE, >+ IS_GENERATED_INSTANCE_CLASS); >+ initEAttribute(getMangoParameter_Name(), ecorePackage.getEString(), "name", null, 0, 1, MangoParameter.class, > !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); >+ initEAttribute(getMangoParameter_Passing(), this.getParameterPassing(), "passing", null, 0, 1, >+ MangoParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, >+ !IS_DERIVED, IS_ORDERED); > > // Initialize enums and add enum literals > initEEnum(parameterPassingEEnum, ParameterPassing.class, "ParameterPassing"); >Index: src/org/eclipse/emf/cdo/tests/mango/impl/ValueListImpl.java >=================================================================== >RCS file: src/org/eclipse/emf/cdo/tests/mango/impl/ValueListImpl.java >diff -N src/org/eclipse/emf/cdo/tests/mango/impl/ValueListImpl.java >--- src/org/eclipse/emf/cdo/tests/mango/impl/ValueListImpl.java 22 Aug 2009 09:34:41 -0000 1.10 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,99 +0,0 @@ >-/** >- * Copyright (c) 2004 - 2009 Eike Stepper (Berlin, Germany) and others. >- * All rights reserved. This program and the accompanying materials >- * are made available under the terms of the Eclipse Public License v1.0 >- * which accompanies this distribution, and is available at >- * http://www.eclipse.org/legal/epl-v10.html >- * >- * Contributors: >- * Eike Stepper - initial API and implementation >- */ >-package org.eclipse.emf.cdo.tests.mango.impl; >- >-import org.eclipse.emf.cdo.tests.mango.MangoPackage; >-import org.eclipse.emf.cdo.tests.mango.Value; >-import org.eclipse.emf.cdo.tests.mango.ValueList; >- >-import org.eclipse.emf.internal.cdo.CDOObjectImpl; >- >-import org.eclipse.emf.common.util.EList; >-import org.eclipse.emf.ecore.EClass; >- >-/** >- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Value List</b></em>'. <!-- end-user-doc --> >- * <p> >- * The following features are implemented: >- * <ul> >- * <li>{@link org.eclipse.emf.cdo.tests.mango.impl.ValueListImpl#getName <em>Name</em>}</li> >- * <li>{@link org.eclipse.emf.cdo.tests.mango.impl.ValueListImpl#getValues <em>Values</em>}</li> >- * </ul> >- * </p> >- * >- * @generated >- */ >-public class ValueListImpl extends CDOObjectImpl implements ValueList >-{ >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- protected ValueListImpl() >- { >- super(); >- } >- >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- @Override >- protected EClass eStaticClass() >- { >- return MangoPackage.Literals.VALUE_LIST; >- } >- >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- @Override >- protected int eStaticFeatureCount() >- { >- return 0; >- } >- >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- public String getName() >- { >- return (String)eGet(MangoPackage.Literals.VALUE_LIST__NAME, true); >- } >- >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- public void setName(String newName) >- { >- eSet(MangoPackage.Literals.VALUE_LIST__NAME, newName); >- } >- >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- @SuppressWarnings("unchecked") >- public EList<Value> getValues() >- { >- return (EList<Value>)eGet(MangoPackage.Literals.VALUE_LIST__VALUES, true); >- } >- >-} // ValueListImpl >Index: src/org/eclipse/emf/cdo/tests/mango/impl/ParameterImpl.java >=================================================================== >RCS file: src/org/eclipse/emf/cdo/tests/mango/impl/ParameterImpl.java >diff -N src/org/eclipse/emf/cdo/tests/mango/impl/ParameterImpl.java >--- src/org/eclipse/emf/cdo/tests/mango/impl/ParameterImpl.java 22 Aug 2009 09:34:41 -0000 1.8 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,107 +0,0 @@ >-/** >- * Copyright (c) 2004 - 2009 Eike Stepper (Berlin, Germany) and others. >- * All rights reserved. This program and the accompanying materials >- * are made available under the terms of the Eclipse Public License v1.0 >- * which accompanies this distribution, and is available at >- * http://www.eclipse.org/legal/epl-v10.html >- * >- * Contributors: >- * Eike Stepper - initial API and implementation >- */ >-package org.eclipse.emf.cdo.tests.mango.impl; >- >-import org.eclipse.emf.cdo.tests.mango.MangoPackage; >-import org.eclipse.emf.cdo.tests.mango.Parameter; >-import org.eclipse.emf.cdo.tests.mango.ParameterPassing; >- >-import org.eclipse.emf.internal.cdo.CDOObjectImpl; >- >-import org.eclipse.emf.ecore.EClass; >- >-/** >- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Parameter</b></em>'. <!-- end-user-doc --> >- * <p> >- * The following features are implemented: >- * <ul> >- * <li>{@link org.eclipse.emf.cdo.tests.mango.impl.ParameterImpl#getName <em>Name</em>}</li> >- * <li>{@link org.eclipse.emf.cdo.tests.mango.impl.ParameterImpl#getPassing <em>Passing</em>}</li> >- * </ul> >- * </p> >- * >- * @generated >- */ >-public class ParameterImpl extends CDOObjectImpl implements Parameter >-{ >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- protected ParameterImpl() >- { >- super(); >- } >- >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- @Override >- protected EClass eStaticClass() >- { >- return MangoPackage.Literals.PARAMETER; >- } >- >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- @Override >- protected int eStaticFeatureCount() >- { >- return 0; >- } >- >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- public String getName() >- { >- return (String)eGet(MangoPackage.Literals.PARAMETER__NAME, true); >- } >- >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- public void setName(String newName) >- { >- eSet(MangoPackage.Literals.PARAMETER__NAME, newName); >- } >- >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- public ParameterPassing getPassing() >- { >- return (ParameterPassing)eGet(MangoPackage.Literals.PARAMETER__PASSING, true); >- } >- >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- public void setPassing(ParameterPassing newPassing) >- { >- eSet(MangoPackage.Literals.PARAMETER__PASSING, newPassing); >- } >- >-} // ParameterImpl >Index: src/org/eclipse/emf/cdo/tests/mango/impl/ValueImpl.java >=================================================================== >RCS file: src/org/eclipse/emf/cdo/tests/mango/impl/ValueImpl.java >diff -N src/org/eclipse/emf/cdo/tests/mango/impl/ValueImpl.java >--- src/org/eclipse/emf/cdo/tests/mango/impl/ValueImpl.java 22 Aug 2009 09:34:41 -0000 1.9 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,85 +0,0 @@ >-/** >- * Copyright (c) 2004 - 2009 Eike Stepper (Berlin, Germany) and others. >- * All rights reserved. This program and the accompanying materials >- * are made available under the terms of the Eclipse Public License v1.0 >- * which accompanies this distribution, and is available at >- * http://www.eclipse.org/legal/epl-v10.html >- * >- * Contributors: >- * Eike Stepper - initial API and implementation >- */ >-package org.eclipse.emf.cdo.tests.mango.impl; >- >-import org.eclipse.emf.cdo.tests.mango.MangoPackage; >-import org.eclipse.emf.cdo.tests.mango.Value; >- >-import org.eclipse.emf.internal.cdo.CDOObjectImpl; >- >-import org.eclipse.emf.ecore.EClass; >- >-/** >- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Value</b></em>'. <!-- end-user-doc --> >- * <p> >- * The following features are implemented: >- * <ul> >- * <li>{@link org.eclipse.emf.cdo.tests.mango.impl.ValueImpl#getName <em>Name</em>}</li> >- * </ul> >- * </p> >- * >- * @generated >- */ >-public class ValueImpl extends CDOObjectImpl implements Value >-{ >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- protected ValueImpl() >- { >- super(); >- } >- >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- @Override >- protected EClass eStaticClass() >- { >- return MangoPackage.Literals.VALUE; >- } >- >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- @Override >- protected int eStaticFeatureCount() >- { >- return 0; >- } >- >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- public String getName() >- { >- return (String)eGet(MangoPackage.Literals.VALUE__NAME, true); >- } >- >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- public void setName(String newName) >- { >- eSet(MangoPackage.Literals.VALUE__NAME, newName); >- } >- >-} // ValueImpl >Index: src/org/eclipse/emf/cdo/tests/mango/impl/MangoFactoryImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoFactoryImpl.java,v >retrieving revision 1.12 >diff -u -r1.12 MangoFactoryImpl.java >--- src/org/eclipse/emf/cdo/tests/mango/impl/MangoFactoryImpl.java 22 Aug 2009 09:34:41 -0000 1.12 >+++ src/org/eclipse/emf/cdo/tests/mango/impl/MangoFactoryImpl.java 14 Nov 2009 18:55:45 -0000 >@@ -12,10 +12,10 @@ > > import org.eclipse.emf.cdo.tests.mango.MangoFactory; > import org.eclipse.emf.cdo.tests.mango.MangoPackage; >-import org.eclipse.emf.cdo.tests.mango.Parameter; >+import org.eclipse.emf.cdo.tests.mango.MangoParameter; >+import org.eclipse.emf.cdo.tests.mango.MangoValue; >+import org.eclipse.emf.cdo.tests.mango.MangoValueList; > import org.eclipse.emf.cdo.tests.mango.ParameterPassing; >-import org.eclipse.emf.cdo.tests.mango.Value; >-import org.eclipse.emf.cdo.tests.mango.ValueList; > > import org.eclipse.emf.ecore.EClass; > import org.eclipse.emf.ecore.EDataType; >@@ -26,14 +26,13 @@ > > /** > * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc --> >- * > * @generated > */ > public class MangoFactoryImpl extends EFactoryImpl implements MangoFactory > { > /** >- * Creates the default factory implementation. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * Creates the default factory implementation. >+ * <!-- begin-user-doc --> <!-- end-user-doc --> > * @generated > */ > public static MangoFactory init() >@@ -55,8 +54,8 @@ > } > > /** >- * Creates an instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * Creates an instance of the factory. >+ * <!-- begin-user-doc --> <!-- end-user-doc --> > * @generated > */ > public MangoFactoryImpl() >@@ -66,7 +65,6 @@ > > /** > * <!-- begin-user-doc --> <!-- end-user-doc --> >- * > * @generated > */ > @Override >@@ -74,12 +72,12 @@ > { > switch (eClass.getClassifierID()) > { >- case MangoPackage.VALUE_LIST: >- return createValueList(); >- case MangoPackage.VALUE: >- return createValue(); >- case MangoPackage.PARAMETER: >- return createParameter(); >+ case MangoPackage.MANGO_VALUE_LIST: >+ return createMangoValueList(); >+ case MangoPackage.MANGO_VALUE: >+ return createMangoValue(); >+ case MangoPackage.MANGO_PARAMETER: >+ return createMangoParameter(); > default: > throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); > } >@@ -87,7 +85,6 @@ > > /** > * <!-- begin-user-doc --> <!-- end-user-doc --> >- * > * @generated > */ > @Override >@@ -104,7 +101,6 @@ > > /** > * <!-- begin-user-doc --> <!-- end-user-doc --> >- * > * @generated > */ > @Override >@@ -120,41 +116,40 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ >- public ValueList createValueList() >+ public MangoValueList createMangoValueList() > { >- ValueListImpl valueList = new ValueListImpl(); >- return valueList; >+ MangoValueListImpl mangoValueList = new MangoValueListImpl(); >+ return mangoValueList; > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ >- public Value createValue() >+ public MangoValue createMangoValue() > { >- ValueImpl value = new ValueImpl(); >- return value; >+ MangoValueImpl mangoValue = new MangoValueImpl(); >+ return mangoValue; > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ >- public Parameter createParameter() >+ public MangoParameter createMangoParameter() > { >- ParameterImpl parameter = new ParameterImpl(); >- return parameter; >+ MangoParameterImpl mangoParameter = new MangoParameterImpl(); >+ return mangoParameter; > } > > /** > * <!-- begin-user-doc --> <!-- end-user-doc --> >- * > * @generated > */ > public ParameterPassing createParameterPassingFromString(EDataType eDataType, String initialValue) >@@ -168,7 +163,6 @@ > > /** > * <!-- begin-user-doc --> <!-- end-user-doc --> >- * > * @generated > */ > public String convertParameterPassingToString(EDataType eDataType, Object instanceValue) >@@ -178,7 +172,6 @@ > > /** > * <!-- begin-user-doc --> <!-- end-user-doc --> >- * > * @generated > */ > public MangoPackage getMangoPackage() >@@ -188,7 +181,6 @@ > > /** > * <!-- begin-user-doc --> <!-- end-user-doc --> >- * > * @deprecated > * @generated > */ >Index: model/mango.ecore >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.mango/model/mango.ecore,v >retrieving revision 1.3 >diff -u -r1.3 mango.ecore >--- model/mango.ecore 12 Jun 2008 17:22:17 -0000 1.3 >+++ model/mango.ecore 14 Nov 2009 18:55:45 -0000 >@@ -3,19 +3,19 @@ > 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="ValueList"> >+ <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" >- eType="#//Value"/> >+ eType="#//MangoValue"/> > </eClassifiers> >- <eClassifiers xsi:type="ecore:EClass" name="Value"> >+ <eClassifiers xsi:type="ecore:EClass" name="MangoValue"> > <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> > </eClassifiers> > <eClassifiers xsi:type="ecore:EEnum" name="ParameterPassing"> > <eLiterals name="ByValue"/> > <eLiterals name="ByReference" value="1"/> > </eClassifiers> >- <eClassifiers xsi:type="ecore:EClass" name="Parameter"> >+ <eClassifiers xsi:type="ecore:EClass" name="MangoParameter"> > <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> > <eStructuralFeatures xsi:type="ecore:EAttribute" name="passing" eType="#//ParameterPassing"/> > </eClassifiers> >Index: src/org/eclipse/emf/cdo/tests/legacy/mango/util/MangoAdapterFactory.java >=================================================================== >RCS file: src/org/eclipse/emf/cdo/tests/legacy/mango/util/MangoAdapterFactory.java >diff -N src/org/eclipse/emf/cdo/tests/legacy/mango/util/MangoAdapterFactory.java >--- src/org/eclipse/emf/cdo/tests/legacy/mango/util/MangoAdapterFactory.java 22 Aug 2009 09:34:42 -0000 1.5 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,176 +0,0 @@ >-/** >- * Copyright (c) 2004 - 2009 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 >- * >- * $Id: MangoAdapterFactory.java,v 1.5 2009/08/22 09:34:42 estepper Exp $ >- */ >-package org.eclipse.emf.cdo.tests.legacy.mango.util; >- >-import org.eclipse.emf.cdo.tests.legacy.mango.MangoPackage; >-import org.eclipse.emf.cdo.tests.legacy.mango.Parameter; >-import org.eclipse.emf.cdo.tests.legacy.mango.Value; >-import org.eclipse.emf.cdo.tests.legacy.mango.ValueList; >- >-import org.eclipse.emf.common.notify.Adapter; >-import org.eclipse.emf.common.notify.Notifier; >-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl; >-import org.eclipse.emf.ecore.EObject; >- >-/** >- * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter <code>createXXX</code> >- * method for each class of the model. <!-- end-user-doc --> >- * >- * @see org.eclipse.emf.cdo.tests.legacy.mango.MangoPackage >- * @generated >- */ >-public class MangoAdapterFactory extends AdapterFactoryImpl >-{ >- /** >- * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- protected static MangoPackage modelPackage; >- >- /** >- * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- public MangoAdapterFactory() >- { >- if (modelPackage == null) >- { >- modelPackage = MangoPackage.eINSTANCE; >- } >- } >- >- /** >- * Returns whether this factory is applicable for the type of the object. <!-- begin-user-doc --> This implementation >- * returns <code>true</code> if the object is either the model's package or is an instance object of the model. <!-- >- * end-user-doc --> >- * >- * @return whether this factory is applicable for the type of the object. >- * @generated >- */ >- @Override >- public boolean isFactoryForType(Object object) >- { >- if (object == modelPackage) >- { >- return true; >- } >- if (object instanceof EObject) >- { >- return ((EObject)object).eClass().getEPackage() == modelPackage; >- } >- return false; >- } >- >- /** >- * The switch that delegates to the <code>createXXX</code> methods. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- protected MangoSwitch<Adapter> modelSwitch = new MangoSwitch<Adapter>() >- { >- @Override >- public Adapter caseValueList(ValueList object) >- { >- return createValueListAdapter(); >- } >- >- @Override >- public Adapter caseValue(Value object) >- { >- return createValueAdapter(); >- } >- >- @Override >- public Adapter caseParameter(Parameter object) >- { >- return createParameterAdapter(); >- } >- >- @Override >- public Adapter defaultCase(EObject object) >- { >- return createEObjectAdapter(); >- } >- }; >- >- /** >- * Creates an adapter for the <code>target</code>. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @param target >- * the object to adapt. >- * @return the adapter for the <code>target</code>. >- * @generated >- */ >- @Override >- public Adapter createAdapter(Notifier target) >- { >- return modelSwitch.doSwitch((EObject)target); >- } >- >- /** >- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.mango.ValueList >- * <em>Value List</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.legacy.mango.ValueList >- * @generated >- */ >- public Adapter createValueListAdapter() >- { >- return null; >- } >- >- /** >- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.mango.Value <em>Value</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.legacy.mango.Value >- * @generated >- */ >- public Adapter createValueAdapter() >- { >- return null; >- } >- >- /** >- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.mango.Parameter >- * <em>Parameter</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.legacy.mango.Parameter >- * @generated >- */ >- public Adapter createParameterAdapter() >- { >- return null; >- } >- >- /** >- * Creates a new adapter for the default case. <!-- begin-user-doc --> This default implementation returns null. <!-- >- * end-user-doc --> >- * >- * @return the new adapter. >- * @generated >- */ >- public Adapter createEObjectAdapter() >- { >- return null; >- } >- >-} // MangoAdapterFactory >Index: src/org/eclipse/emf/cdo/tests/legacy/mango/util/MangoSwitch.java >=================================================================== >RCS file: src/org/eclipse/emf/cdo/tests/legacy/mango/util/MangoSwitch.java >diff -N src/org/eclipse/emf/cdo/tests/legacy/mango/util/MangoSwitch.java >--- src/org/eclipse/emf/cdo/tests/legacy/mango/util/MangoSwitch.java 22 Aug 2009 09:34:42 -0000 1.5 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,189 +0,0 @@ >-/** >- * Copyright (c) 2004 - 2009 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 >- * >- * $Id: MangoSwitch.java,v 1.5 2009/08/22 09:34:42 estepper Exp $ >- */ >-package org.eclipse.emf.cdo.tests.legacy.mango.util; >- >-import org.eclipse.emf.cdo.tests.legacy.mango.MangoPackage; >-import org.eclipse.emf.cdo.tests.legacy.mango.Parameter; >-import org.eclipse.emf.cdo.tests.legacy.mango.Value; >-import org.eclipse.emf.cdo.tests.legacy.mango.ValueList; >- >-import org.eclipse.emf.ecore.EClass; >-import org.eclipse.emf.ecore.EObject; >- >-import java.util.List; >- >-/** >- * <!-- 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, >- * starting with the actual class of the object and proceeding up the inheritance hierarchy until a non-null result is >- * returned, which is the result of the switch. <!-- end-user-doc --> >- * >- * @see org.eclipse.emf.cdo.tests.legacy.mango.MangoPackage >- * @generated >- */ >-public class MangoSwitch<T> >-{ >- /** >- * The cached model package <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- protected static MangoPackage modelPackage; >- >- /** >- * Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- public MangoSwitch() >- { >- if (modelPackage == null) >- { >- modelPackage = MangoPackage.eINSTANCE; >- } >- } >- >- /** >- * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @return the first non-null result returned by a <code>caseXXX</code> call. >- * @generated >- */ >- public T doSwitch(EObject theEObject) >- { >- return doSwitch(theEObject.eClass(), theEObject); >- } >- >- /** >- * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @return the first non-null result returned by a <code>caseXXX</code> call. >- * @generated >- */ >- protected T doSwitch(EClass theEClass, EObject theEObject) >- { >- if (theEClass.eContainer() == modelPackage) >- { >- return doSwitch(theEClass.getClassifierID(), theEObject); >- } >- else >- { >- List<EClass> eSuperTypes = theEClass.getESuperTypes(); >- return eSuperTypes.isEmpty() ? defaultCase(theEObject) : doSwitch(eSuperTypes.get(0), theEObject); >- } >- } >- >- /** >- * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @return the first non-null result returned by a <code>caseXXX</code> call. >- * @generated >- */ >- protected T doSwitch(int classifierID, EObject theEObject) >- { >- switch (classifierID) >- { >- case MangoPackage.VALUE_LIST: >- { >- ValueList valueList = (ValueList)theEObject; >- T result = caseValueList(valueList); >- if (result == null) >- result = defaultCase(theEObject); >- return result; >- } >- case MangoPackage.VALUE: >- { >- Value value = (Value)theEObject; >- T result = caseValue(value); >- if (result == null) >- result = defaultCase(theEObject); >- return result; >- } >- case MangoPackage.PARAMETER: >- { >- Parameter parameter = (Parameter)theEObject; >- T result = caseParameter(parameter); >- if (result == null) >- result = defaultCase(theEObject); >- return result; >- } >- default: >- return defaultCase(theEObject); >- } >- } >- >- /** >- * Returns the result of interpreting the object as an instance of '<em>Value List</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>Value List</em>'. >- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) >- * @generated >- */ >- public T caseValueList(ValueList object) >- { >- return null; >- } >- >- /** >- * Returns the result of interpreting the object as an instance of '<em>Value</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>Value</em>'. >- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) >- * @generated >- */ >- public T caseValue(Value object) >- { >- return null; >- } >- >- /** >- * Returns the result of interpreting the object as an instance of '<em>Parameter</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>Parameter</em>'. >- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) >- * @generated >- */ >- public T caseParameter(Parameter object) >- { >- return null; >- } >- >- /** >- * Returns the result of interpreting the object as an instance of '<em>EObject</em>'. <!-- begin-user-doc --> This >- * implementation returns null; returning a non-null result will terminate the switch, but this is the last case >- * anyway. <!-- end-user-doc --> >- * >- * @param object >- * the target of the switch. >- * @return the result of interpreting the object as an instance of '<em>EObject</em>'. >- * @see #doSwitch(org.eclipse.emf.ecore.EObject) >- * @generated >- */ >- public T defaultCase(EObject object) >- { >- return null; >- } >- >-} // MangoSwitch >Index: src/org/eclipse/emf/cdo/tests/legacy/mango/impl/ValueListImpl.java >=================================================================== >RCS file: src/org/eclipse/emf/cdo/tests/legacy/mango/impl/ValueListImpl.java >diff -N src/org/eclipse/emf/cdo/tests/legacy/mango/impl/ValueListImpl.java >--- src/org/eclipse/emf/cdo/tests/legacy/mango/impl/ValueListImpl.java 22 Aug 2009 09:34:41 -0000 1.5 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,225 +0,0 @@ >-/** >- * Copyright (c) 2004 - 2009 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 >- * >- * $Id: ValueListImpl.java,v 1.5 2009/08/22 09:34:41 estepper Exp $ >- */ >-package org.eclipse.emf.cdo.tests.legacy.mango.impl; >- >-import org.eclipse.emf.cdo.tests.legacy.mango.MangoPackage; >-import org.eclipse.emf.cdo.tests.legacy.mango.Value; >-import org.eclipse.emf.cdo.tests.legacy.mango.ValueList; >- >-import org.eclipse.emf.common.notify.Notification; >-import org.eclipse.emf.common.util.EList; >-import org.eclipse.emf.ecore.EClass; >-import org.eclipse.emf.ecore.impl.ENotificationImpl; >-import org.eclipse.emf.ecore.impl.EObjectImpl; >-import org.eclipse.emf.ecore.util.EObjectResolvingEList; >- >-import java.util.Collection; >- >-/** >- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Value List</b></em>'. <!-- end-user-doc --> >- * <p> >- * The following features are implemented: >- * <ul> >- * <li>{@link org.eclipse.emf.cdo.tests.legacy.mango.impl.ValueListImpl#getName <em>Name</em>}</li> >- * <li>{@link org.eclipse.emf.cdo.tests.legacy.mango.impl.ValueListImpl#getValues <em>Values</em>}</li> >- * </ul> >- * </p> >- * >- * @generated >- */ >-public class ValueListImpl extends EObjectImpl implements ValueList >-{ >- /** >- * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc >- * --> >- * >- * @see #getName() >- * @generated >- * @ordered >- */ >- protected static final String NAME_EDEFAULT = null; >- >- /** >- * The cached value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @see #getName() >- * @generated >- * @ordered >- */ >- protected String name = NAME_EDEFAULT; >- >- /** >- * The cached value of the '{@link #getValues() <em>Values</em>}' reference list. <!-- begin-user-doc --> <!-- >- * end-user-doc --> >- * >- * @see #getValues() >- * @generated >- * @ordered >- */ >- protected EList<Value> values; >- >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- protected ValueListImpl() >- { >- super(); >- } >- >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- @Override >- protected EClass eStaticClass() >- { >- return MangoPackage.Literals.VALUE_LIST; >- } >- >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- public String getName() >- { >- return name; >- } >- >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- public void setName(String newName) >- { >- String oldName = name; >- name = newName; >- if (eNotificationRequired()) >- eNotify(new ENotificationImpl(this, Notification.SET, MangoPackage.VALUE_LIST__NAME, oldName, name)); >- } >- >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- public EList<Value> getValues() >- { >- if (values == null) >- { >- values = new EObjectResolvingEList<Value>(Value.class, this, MangoPackage.VALUE_LIST__VALUES); >- } >- return values; >- } >- >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- @Override >- public Object eGet(int featureID, boolean resolve, boolean coreType) >- { >- switch (featureID) >- { >- case MangoPackage.VALUE_LIST__NAME: >- return getName(); >- case MangoPackage.VALUE_LIST__VALUES: >- return getValues(); >- } >- return super.eGet(featureID, resolve, coreType); >- } >- >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- @SuppressWarnings("unchecked") >- @Override >- public void eSet(int featureID, Object newValue) >- { >- switch (featureID) >- { >- case MangoPackage.VALUE_LIST__NAME: >- setName((String)newValue); >- return; >- case MangoPackage.VALUE_LIST__VALUES: >- getValues().clear(); >- getValues().addAll((Collection<? extends Value>)newValue); >- return; >- } >- super.eSet(featureID, newValue); >- } >- >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- @Override >- public void eUnset(int featureID) >- { >- switch (featureID) >- { >- case MangoPackage.VALUE_LIST__NAME: >- setName(NAME_EDEFAULT); >- return; >- case MangoPackage.VALUE_LIST__VALUES: >- getValues().clear(); >- return; >- } >- super.eUnset(featureID); >- } >- >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- @Override >- public boolean eIsSet(int featureID) >- { >- switch (featureID) >- { >- case MangoPackage.VALUE_LIST__NAME: >- return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); >- case MangoPackage.VALUE_LIST__VALUES: >- return values != null && !values.isEmpty(); >- } >- return super.eIsSet(featureID); >- } >- >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- @Override >- public String toString() >- { >- if (eIsProxy()) >- return super.toString(); >- >- StringBuffer result = new StringBuffer(super.toString()); >- result.append(" (name: "); >- result.append(name); >- result.append(')'); >- return result.toString(); >- } >- >-} // ValueListImpl >Index: src/org/eclipse/emf/cdo/tests/legacy/mango/impl/ValueImpl.java >=================================================================== >RCS file: src/org/eclipse/emf/cdo/tests/legacy/mango/impl/ValueImpl.java >diff -N src/org/eclipse/emf/cdo/tests/legacy/mango/impl/ValueImpl.java >--- src/org/eclipse/emf/cdo/tests/legacy/mango/impl/ValueImpl.java 22 Aug 2009 09:34:41 -0000 1.5 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,183 +0,0 @@ >-/** >- * Copyright (c) 2004 - 2009 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 >- * >- * $Id: ValueImpl.java,v 1.5 2009/08/22 09:34:41 estepper Exp $ >- */ >-package org.eclipse.emf.cdo.tests.legacy.mango.impl; >- >-import org.eclipse.emf.cdo.tests.legacy.mango.MangoPackage; >-import org.eclipse.emf.cdo.tests.legacy.mango.Value; >- >-import org.eclipse.emf.common.notify.Notification; >-import org.eclipse.emf.ecore.EClass; >-import org.eclipse.emf.ecore.impl.ENotificationImpl; >-import org.eclipse.emf.ecore.impl.EObjectImpl; >- >-/** >- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Value</b></em>'. <!-- end-user-doc --> >- * <p> >- * The following features are implemented: >- * <ul> >- * <li>{@link org.eclipse.emf.cdo.tests.legacy.mango.impl.ValueImpl#getName <em>Name</em>}</li> >- * </ul> >- * </p> >- * >- * @generated >- */ >-public class ValueImpl extends EObjectImpl implements Value >-{ >- /** >- * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc >- * --> >- * >- * @see #getName() >- * @generated >- * @ordered >- */ >- protected static final String NAME_EDEFAULT = null; >- >- /** >- * The cached value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @see #getName() >- * @generated >- * @ordered >- */ >- protected String name = NAME_EDEFAULT; >- >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- protected ValueImpl() >- { >- super(); >- } >- >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- @Override >- protected EClass eStaticClass() >- { >- return MangoPackage.Literals.VALUE; >- } >- >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- public String getName() >- { >- return name; >- } >- >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- public void setName(String newName) >- { >- String oldName = name; >- name = newName; >- if (eNotificationRequired()) >- eNotify(new ENotificationImpl(this, Notification.SET, MangoPackage.VALUE__NAME, oldName, name)); >- } >- >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- @Override >- public Object eGet(int featureID, boolean resolve, boolean coreType) >- { >- switch (featureID) >- { >- case MangoPackage.VALUE__NAME: >- return getName(); >- } >- return super.eGet(featureID, resolve, coreType); >- } >- >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- @Override >- public void eSet(int featureID, Object newValue) >- { >- switch (featureID) >- { >- case MangoPackage.VALUE__NAME: >- setName((String)newValue); >- return; >- } >- super.eSet(featureID, newValue); >- } >- >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- @Override >- public void eUnset(int featureID) >- { >- switch (featureID) >- { >- case MangoPackage.VALUE__NAME: >- setName(NAME_EDEFAULT); >- return; >- } >- super.eUnset(featureID); >- } >- >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- @Override >- public boolean eIsSet(int featureID) >- { >- switch (featureID) >- { >- case MangoPackage.VALUE__NAME: >- return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); >- } >- return super.eIsSet(featureID); >- } >- >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- @Override >- public String toString() >- { >- if (eIsProxy()) >- return super.toString(); >- >- StringBuffer result = new StringBuffer(super.toString()); >- result.append(" (name: "); >- result.append(name); >- result.append(')'); >- return result.toString(); >- } >- >-} // ValueImpl >Index: src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoFactoryImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoFactoryImpl.java,v >retrieving revision 1.5 >diff -u -r1.5 MangoFactoryImpl.java >--- src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoFactoryImpl.java 22 Aug 2009 09:34:41 -0000 1.5 >+++ src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoFactoryImpl.java 14 Nov 2009 18:55:45 -0000 >@@ -12,12 +12,12 @@ > */ > package org.eclipse.emf.cdo.tests.legacy.mango.impl; > >-import org.eclipse.emf.cdo.tests.legacy.mango.MangoFactory; >-import org.eclipse.emf.cdo.tests.legacy.mango.MangoPackage; >-import org.eclipse.emf.cdo.tests.legacy.mango.Parameter; >-import org.eclipse.emf.cdo.tests.legacy.mango.ParameterPassing; >-import org.eclipse.emf.cdo.tests.legacy.mango.Value; >-import org.eclipse.emf.cdo.tests.legacy.mango.ValueList; >+import org.eclipse.emf.cdo.tests.mango.MangoFactory; >+import org.eclipse.emf.cdo.tests.mango.MangoPackage; >+import org.eclipse.emf.cdo.tests.mango.MangoParameter; >+import org.eclipse.emf.cdo.tests.mango.MangoValue; >+import org.eclipse.emf.cdo.tests.mango.MangoValueList; >+import org.eclipse.emf.cdo.tests.mango.ParameterPassing; > > import org.eclipse.emf.ecore.EClass; > import org.eclipse.emf.ecore.EDataType; >@@ -34,17 +34,22 @@ > public class MangoFactoryImpl extends EFactoryImpl implements MangoFactory > { > /** >+ * @ADDED >+ */ >+ public static final MangoFactory eINSTANCE = org.eclipse.emf.cdo.tests.legacy.mango.impl.MangoFactoryImpl.init(); >+ >+ /** > * Creates the default factory implementation. <!-- begin-user-doc --> <!-- end-user-doc --> > * >- * @generated >+ * @generated NOT > */ >- public static MangoFactory init() >+ public static org.eclipse.emf.cdo.tests.mango.MangoFactory init() > { > try > { > MangoFactory theMangoFactory = (MangoFactory)EPackage.Registry.INSTANCE > .getEFactory("http://www.eclipse.org/emf/CDO/tests/mango"); >- if (theMangoFactory != null) >+ if (theMangoFactory instanceof MangoFactoryImpl) > { > return theMangoFactory; > } >@@ -53,7 +58,11 @@ > { > EcorePlugin.INSTANCE.log(exception); > } >- return new MangoFactoryImpl(); >+ >+ MangoFactoryImpl factory = new MangoFactoryImpl(); >+ // EPackage.Registry.INSTANCE.put(factory.getEPackage().getNsURI(), factory); >+ EPackage.Registry.INSTANCE.put("http://www.eclipse.org/emf/CDO/tests/mango", factory); >+ return factory; > } > > /** >@@ -76,12 +85,12 @@ > { > switch (eClass.getClassifierID()) > { >- case MangoPackage.VALUE_LIST: >- return createValueList(); >- case MangoPackage.VALUE: >- return createValue(); >- case MangoPackage.PARAMETER: >- return createParameter(); >+ case MangoPackage.MANGO_VALUE_LIST: >+ return createMangoValueList(); >+ case MangoPackage.MANGO_VALUE: >+ return createMangoValue(); >+ case MangoPackage.MANGO_PARAMETER: >+ return createMangoParameter(); > default: > throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); > } >@@ -126,10 +135,10 @@ > * > * @generated > */ >- public ValueList createValueList() >+ public MangoValueList createMangoValueList() > { >- ValueListImpl valueList = new ValueListImpl(); >- return valueList; >+ MangoValueListImpl mangoValueList = new MangoValueListImpl(); >+ return mangoValueList; > } > > /** >@@ -137,10 +146,10 @@ > * > * @generated > */ >- public Value createValue() >+ public MangoValue createMangoValue() > { >- ValueImpl value = new ValueImpl(); >- return value; >+ MangoValueImpl mangoValue = new MangoValueImpl(); >+ return mangoValue; > } > > /** >@@ -148,10 +157,10 @@ > * > * @generated > */ >- public Parameter createParameter() >+ public MangoParameter createMangoParameter() > { >- ParameterImpl parameter = new ParameterImpl(); >- return parameter; >+ MangoParameterImpl mangoParameter = new MangoParameterImpl(); >+ return mangoParameter; > } > > /** >Index: src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoPackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoPackageImpl.java,v >retrieving revision 1.5 >diff -u -r1.5 MangoPackageImpl.java >--- src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoPackageImpl.java 22 Aug 2009 09:34:41 -0000 1.5 >+++ src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoPackageImpl.java 14 Nov 2009 18:55:45 -0000 >@@ -12,12 +12,13 @@ > */ > package org.eclipse.emf.cdo.tests.legacy.mango.impl; > >-import org.eclipse.emf.cdo.tests.legacy.mango.MangoFactory; >-import org.eclipse.emf.cdo.tests.legacy.mango.MangoPackage; >-import org.eclipse.emf.cdo.tests.legacy.mango.Parameter; >-import org.eclipse.emf.cdo.tests.legacy.mango.ParameterPassing; >-import org.eclipse.emf.cdo.tests.legacy.mango.Value; >-import org.eclipse.emf.cdo.tests.legacy.mango.ValueList; >+ >+import org.eclipse.emf.cdo.tests.mango.MangoFactory; >+import org.eclipse.emf.cdo.tests.mango.MangoPackage; >+import org.eclipse.emf.cdo.tests.mango.MangoParameter; >+import org.eclipse.emf.cdo.tests.mango.MangoValue; >+import org.eclipse.emf.cdo.tests.mango.MangoValueList; >+import org.eclipse.emf.cdo.tests.mango.ParameterPassing; > > import org.eclipse.emf.ecore.EAttribute; > import org.eclipse.emf.ecore.EClass; >@@ -28,35 +29,37 @@ > > /** > * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc --> >- * > * @generated > */ > public class MangoPackageImpl extends EPackageImpl implements MangoPackage > { > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * @ADDED >+ */ >+ public static final MangoPackage eINSTANCE = org.eclipse.emf.cdo.tests.legacy.mango.impl.MangoPackageImpl.init(); >+ /** >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ >- private EClass valueListEClass = null; >+ private EClass mangoValueListEClass = null; > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ >- private EClass valueEClass = null; >+ private EClass mangoValueEClass = null; > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ >- private EClass parameterEClass = null; >+ private EClass mangoParameterEClass = null; > > /** > * <!-- begin-user-doc --> <!-- end-user-doc --> >- * > * @generated > */ > private EEnum parameterPassingEEnum = null; >@@ -81,18 +84,17 @@ > > /** > * <!-- begin-user-doc --> <!-- end-user-doc --> >- * > * @generated > */ > private static boolean isInited = false; > > /** > * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends. >- * <p> >- * This method is used to initialize {@link MangoPackage#eINSTANCE} when that field is accessed. Clients should not >- * invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc --> >- * <!-- end-user-doc --> > * >+ * <p>This method is used to initialize {@link MangoPackage#eINSTANCE} when that field is accessed. >+ * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @see #eNS_URI > * @see #createPackageContents() > * @see #initializePackageContents() >@@ -125,88 +127,87 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ >- public EClass getValueList() >+ public EClass getMangoValueList() > { >- return valueListEClass; >+ return mangoValueListEClass; > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ >- public EAttribute getValueList_Name() >+ public EAttribute getMangoValueList_Name() > { >- return (EAttribute)valueListEClass.getEStructuralFeatures().get(0); >+ return (EAttribute)mangoValueListEClass.getEStructuralFeatures().get(0); > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ >- public EReference getValueList_Values() >+ public EReference getMangoValueList_Values() > { >- return (EReference)valueListEClass.getEStructuralFeatures().get(1); >+ return (EReference)mangoValueListEClass.getEStructuralFeatures().get(1); > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ >- public EClass getValue() >+ public EClass getMangoValue() > { >- return valueEClass; >+ return mangoValueEClass; > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ >- public EAttribute getValue_Name() >+ public EAttribute getMangoValue_Name() > { >- return (EAttribute)valueEClass.getEStructuralFeatures().get(0); >+ return (EAttribute)mangoValueEClass.getEStructuralFeatures().get(0); > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ >- public EClass getParameter() >+ public EClass getMangoParameter() > { >- return parameterEClass; >+ return mangoParameterEClass; > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ >- public EAttribute getParameter_Name() >+ public EAttribute getMangoParameter_Name() > { >- return (EAttribute)parameterEClass.getEStructuralFeatures().get(0); >+ return (EAttribute)mangoParameterEClass.getEStructuralFeatures().get(0); > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ >- public EAttribute getParameter_Passing() >+ public EAttribute getMangoParameter_Passing() > { >- return (EAttribute)parameterEClass.getEStructuralFeatures().get(1); >+ return (EAttribute)mangoParameterEClass.getEStructuralFeatures().get(1); > } > > /** > * <!-- begin-user-doc --> <!-- end-user-doc --> >- * > * @generated > */ > public EEnum getParameterPassing() >@@ -216,7 +217,6 @@ > > /** > * <!-- begin-user-doc --> <!-- end-user-doc --> >- * > * @generated > */ > public MangoFactory getMangoFactory() >@@ -226,15 +226,14 @@ > > /** > * <!-- begin-user-doc --> <!-- end-user-doc --> >- * > * @generated > */ > private boolean isCreated = false; > > /** >- * Creates the meta-model objects for the package. This method is guarded to have no affect on any invocation but its >- * first. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * Creates the meta-model objects for the package. This method is >+ * guarded to have no affect on any invocation but its first. >+ * <!-- begin-user-doc --> <!-- end-user-doc --> > * @generated > */ > public void createPackageContents() >@@ -244,16 +243,16 @@ > isCreated = true; > > // Create classes and their features >- valueListEClass = createEClass(VALUE_LIST); >- createEAttribute(valueListEClass, VALUE_LIST__NAME); >- createEReference(valueListEClass, VALUE_LIST__VALUES); >- >- valueEClass = createEClass(VALUE); >- createEAttribute(valueEClass, VALUE__NAME); >- >- parameterEClass = createEClass(PARAMETER); >- createEAttribute(parameterEClass, PARAMETER__NAME); >- createEAttribute(parameterEClass, PARAMETER__PASSING); >+ mangoValueListEClass = createEClass(MANGO_VALUE_LIST); >+ createEAttribute(mangoValueListEClass, MANGO_VALUE_LIST__NAME); >+ createEReference(mangoValueListEClass, MANGO_VALUE_LIST__VALUES); >+ >+ mangoValueEClass = createEClass(MANGO_VALUE); >+ createEAttribute(mangoValueEClass, MANGO_VALUE__NAME); >+ >+ mangoParameterEClass = createEClass(MANGO_PARAMETER); >+ createEAttribute(mangoParameterEClass, MANGO_PARAMETER__NAME); >+ createEAttribute(mangoParameterEClass, MANGO_PARAMETER__PASSING); > > // Create enums > parameterPassingEEnum = createEEnum(PARAMETER_PASSING); >@@ -261,15 +260,14 @@ > > /** > * <!-- begin-user-doc --> <!-- end-user-doc --> >- * > * @generated > */ > private boolean isInitialized = false; > > /** >- * Complete the initialization of the package and its meta-model. This method is guarded to have no affect on any >- * invocation but its first. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * Complete the initialization of the package and its meta-model. This >+ * method is guarded to have no affect on any invocation but its first. >+ * <!-- begin-user-doc --> <!-- end-user-doc --> > * @generated > */ > public void initializePackageContents() >@@ -290,22 +288,26 @@ > // Add supertypes to classes > > // Initialize classes and features; add operations and parameters >- initEClass(valueListEClass, ValueList.class, "ValueList", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); >- initEAttribute(getValueList_Name(), ecorePackage.getEString(), "name", null, 0, 1, ValueList.class, !IS_TRANSIENT, >- !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); >- initEReference(getValueList_Values(), this.getValue(), null, "values", null, 0, -1, ValueList.class, !IS_TRANSIENT, >- !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, >- IS_ORDERED); >- >- initEClass(valueEClass, Value.class, "Value", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); >- initEAttribute(getValue_Name(), ecorePackage.getEString(), "name", null, 0, 1, Value.class, !IS_TRANSIENT, >- !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); >- >- initEClass(parameterEClass, Parameter.class, "Parameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); >- initEAttribute(getParameter_Name(), ecorePackage.getEString(), "name", null, 0, 1, Parameter.class, !IS_TRANSIENT, >- !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); >- initEAttribute(getParameter_Passing(), this.getParameterPassing(), "passing", null, 0, 1, Parameter.class, >+ initEClass(mangoValueListEClass, MangoValueList.class, "MangoValueList", !IS_ABSTRACT, !IS_INTERFACE, >+ IS_GENERATED_INSTANCE_CLASS); >+ initEAttribute(getMangoValueList_Name(), ecorePackage.getEString(), "name", null, 0, 1, MangoValueList.class, >+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); >+ initEReference(getMangoValueList_Values(), this.getMangoValue(), null, "values", null, 0, -1, MangoValueList.class, >+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, >+ !IS_DERIVED, IS_ORDERED); >+ >+ initEClass(mangoValueEClass, MangoValue.class, "MangoValue", !IS_ABSTRACT, !IS_INTERFACE, >+ IS_GENERATED_INSTANCE_CLASS); >+ initEAttribute(getMangoValue_Name(), ecorePackage.getEString(), "name", null, 0, 1, MangoValue.class, >+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); >+ >+ initEClass(mangoParameterEClass, MangoParameter.class, "MangoParameter", !IS_ABSTRACT, !IS_INTERFACE, >+ IS_GENERATED_INSTANCE_CLASS); >+ initEAttribute(getMangoParameter_Name(), ecorePackage.getEString(), "name", null, 0, 1, MangoParameter.class, > !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); >+ initEAttribute(getMangoParameter_Passing(), this.getParameterPassing(), "passing", null, 0, 1, >+ MangoParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, >+ !IS_DERIVED, IS_ORDERED); > > // Initialize enums and add enum literals > initEEnum(parameterPassingEEnum, ParameterPassing.class, "ParameterPassing"); >Index: src/org/eclipse/emf/cdo/tests/legacy/mango/impl/ParameterImpl.java >=================================================================== >RCS file: src/org/eclipse/emf/cdo/tests/legacy/mango/impl/ParameterImpl.java >diff -N src/org/eclipse/emf/cdo/tests/legacy/mango/impl/ParameterImpl.java >--- src/org/eclipse/emf/cdo/tests/legacy/mango/impl/ParameterImpl.java 22 Aug 2009 09:34:41 -0000 1.5 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,240 +0,0 @@ >-/** >- * Copyright (c) 2004 - 2009 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 >- * >- * $Id: ParameterImpl.java,v 1.5 2009/08/22 09:34:41 estepper Exp $ >- */ >-package org.eclipse.emf.cdo.tests.legacy.mango.impl; >- >-import org.eclipse.emf.cdo.tests.legacy.mango.MangoPackage; >-import org.eclipse.emf.cdo.tests.legacy.mango.Parameter; >-import org.eclipse.emf.cdo.tests.legacy.mango.ParameterPassing; >- >-import org.eclipse.emf.common.notify.Notification; >-import org.eclipse.emf.ecore.EClass; >-import org.eclipse.emf.ecore.impl.ENotificationImpl; >-import org.eclipse.emf.ecore.impl.EObjectImpl; >- >-/** >- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Parameter</b></em>'. <!-- end-user-doc --> >- * <p> >- * The following features are implemented: >- * <ul> >- * <li>{@link org.eclipse.emf.cdo.tests.legacy.mango.impl.ParameterImpl#getName <em>Name</em>}</li> >- * <li>{@link org.eclipse.emf.cdo.tests.legacy.mango.impl.ParameterImpl#getPassing <em>Passing</em>}</li> >- * </ul> >- * </p> >- * >- * @generated >- */ >-public class ParameterImpl extends EObjectImpl implements Parameter >-{ >- /** >- * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc >- * --> >- * >- * @see #getName() >- * @generated >- * @ordered >- */ >- protected static final String NAME_EDEFAULT = null; >- >- /** >- * The cached value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @see #getName() >- * @generated >- * @ordered >- */ >- protected String name = NAME_EDEFAULT; >- >- /** >- * The default value of the '{@link #getPassing() <em>Passing</em>}' attribute. <!-- begin-user-doc --> <!-- >- * end-user-doc --> >- * >- * @see #getPassing() >- * @generated >- * @ordered >- */ >- protected static final ParameterPassing PASSING_EDEFAULT = ParameterPassing.BY_VALUE; >- >- /** >- * The cached value of the '{@link #getPassing() <em>Passing</em>}' attribute. <!-- begin-user-doc --> <!-- >- * end-user-doc --> >- * >- * @see #getPassing() >- * @generated >- * @ordered >- */ >- protected ParameterPassing passing = PASSING_EDEFAULT; >- >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- protected ParameterImpl() >- { >- super(); >- } >- >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- @Override >- protected EClass eStaticClass() >- { >- return MangoPackage.Literals.PARAMETER; >- } >- >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- public String getName() >- { >- return name; >- } >- >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- public void setName(String newName) >- { >- String oldName = name; >- name = newName; >- if (eNotificationRequired()) >- eNotify(new ENotificationImpl(this, Notification.SET, MangoPackage.PARAMETER__NAME, oldName, name)); >- } >- >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- public ParameterPassing getPassing() >- { >- return passing; >- } >- >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- public void setPassing(ParameterPassing newPassing) >- { >- ParameterPassing oldPassing = passing; >- passing = newPassing == null ? PASSING_EDEFAULT : newPassing; >- if (eNotificationRequired()) >- eNotify(new ENotificationImpl(this, Notification.SET, MangoPackage.PARAMETER__PASSING, oldPassing, passing)); >- } >- >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- @Override >- public Object eGet(int featureID, boolean resolve, boolean coreType) >- { >- switch (featureID) >- { >- case MangoPackage.PARAMETER__NAME: >- return getName(); >- case MangoPackage.PARAMETER__PASSING: >- return getPassing(); >- } >- return super.eGet(featureID, resolve, coreType); >- } >- >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- @Override >- public void eSet(int featureID, Object newValue) >- { >- switch (featureID) >- { >- case MangoPackage.PARAMETER__NAME: >- setName((String)newValue); >- return; >- case MangoPackage.PARAMETER__PASSING: >- setPassing((ParameterPassing)newValue); >- return; >- } >- super.eSet(featureID, newValue); >- } >- >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- @Override >- public void eUnset(int featureID) >- { >- switch (featureID) >- { >- case MangoPackage.PARAMETER__NAME: >- setName(NAME_EDEFAULT); >- return; >- case MangoPackage.PARAMETER__PASSING: >- setPassing(PASSING_EDEFAULT); >- return; >- } >- super.eUnset(featureID); >- } >- >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- @Override >- public boolean eIsSet(int featureID) >- { >- switch (featureID) >- { >- case MangoPackage.PARAMETER__NAME: >- return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); >- case MangoPackage.PARAMETER__PASSING: >- return passing != PASSING_EDEFAULT; >- } >- return super.eIsSet(featureID); >- } >- >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- @Override >- public String toString() >- { >- if (eIsProxy()) >- return super.toString(); >- >- StringBuffer result = new StringBuffer(super.toString()); >- result.append(" (name: "); >- result.append(name); >- result.append(", passing: "); >- result.append(passing); >- result.append(')'); >- return result.toString(); >- } >- >-} // ParameterImpl >Index: META-INF/MANIFEST.MF >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.mango/META-INF/MANIFEST.MF,v >retrieving revision 1.10 >diff -u -r1.10 MANIFEST.MF >--- META-INF/MANIFEST.MF 27 Jun 2009 07:23:51 -0000 1.10 >+++ META-INF/MANIFEST.MF 14 Nov 2009 18:55:45 -0000 >@@ -10,7 +10,8 @@ > Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", > org.eclipse.emf.ecore;bundle-version="[2.4.0,3.0.0)";visibility:=reexport, > org.eclipse.emf.cdo;bundle-version="[3.0.0,4.0.0)";visibility:=reexport >-Export-Package: org.eclipse.emf.cdo.tests.mango;version="3.0.0", >+Export-Package: org.eclipse.emf.cdo.tests.legacy.mango.impl;version="3.0.0", >+ org.eclipse.emf.cdo.tests.mango;version="3.0.0", > org.eclipse.emf.cdo.tests.mango.impl;version="3.0.0", > org.eclipse.emf.cdo.tests.mango.util;version="3.0.0" > >Index: src/org/eclipse/emf/cdo/tests/mango/util/MangoSwitch.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/util/MangoSwitch.java,v >retrieving revision 1.12 >diff -u -r1.12 MangoSwitch.java >--- src/org/eclipse/emf/cdo/tests/mango/util/MangoSwitch.java 22 Aug 2009 09:34:42 -0000 1.12 >+++ src/org/eclipse/emf/cdo/tests/mango/util/MangoSwitch.java 14 Nov 2009 18:55:45 -0000 >@@ -11,9 +11,9 @@ > package org.eclipse.emf.cdo.tests.mango.util; > > import org.eclipse.emf.cdo.tests.mango.MangoPackage; >-import org.eclipse.emf.cdo.tests.mango.Parameter; >-import org.eclipse.emf.cdo.tests.mango.Value; >-import org.eclipse.emf.cdo.tests.mango.ValueList; >+import org.eclipse.emf.cdo.tests.mango.MangoParameter; >+import org.eclipse.emf.cdo.tests.mango.MangoValue; >+import org.eclipse.emf.cdo.tests.mango.MangoValueList; > > import org.eclipse.emf.ecore.EClass; > import org.eclipse.emf.ecore.EObject; >@@ -25,22 +25,21 @@ > * {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model, > * starting with the actual class of the object and proceeding up the inheritance hierarchy until a non-null result is > * returned, which is the result of the switch. <!-- end-user-doc --> >- * > * @see org.eclipse.emf.cdo.tests.mango.MangoPackage > * @generated > */ > public class MangoSwitch<T> > { > /** >- * The cached model package <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * The cached model package >+ * <!-- begin-user-doc --> <!-- end-user-doc --> > * @generated > */ > protected static MangoPackage modelPackage; > > /** >- * Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * Creates an instance of the switch. >+ * <!-- begin-user-doc --> <!-- end-user-doc --> > * @generated > */ > public MangoSwitch() >@@ -54,7 +53,6 @@ > /** > * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. > * <!-- begin-user-doc --> <!-- end-user-doc --> >- * > * @return the first non-null result returned by a <code>caseXXX</code> call. > * @generated > */ >@@ -66,7 +64,6 @@ > /** > * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. > * <!-- begin-user-doc --> <!-- end-user-doc --> >- * > * @return the first non-null result returned by a <code>caseXXX</code> call. > * @generated > */ >@@ -86,7 +83,6 @@ > /** > * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. > * <!-- begin-user-doc --> <!-- end-user-doc --> >- * > * @return the first non-null result returned by a <code>caseXXX</code> call. > * @generated > */ >@@ -94,26 +90,26 @@ > { > switch (classifierID) > { >- case MangoPackage.VALUE_LIST: >+ case MangoPackage.MANGO_VALUE_LIST: > { >- ValueList valueList = (ValueList)theEObject; >- T result = caseValueList(valueList); >+ MangoValueList mangoValueList = (MangoValueList)theEObject; >+ T result = caseMangoValueList(mangoValueList); > if (result == null) > result = defaultCase(theEObject); > return result; > } >- case MangoPackage.VALUE: >+ case MangoPackage.MANGO_VALUE: > { >- Value value = (Value)theEObject; >- T result = caseValue(value); >+ MangoValue mangoValue = (MangoValue)theEObject; >+ T result = caseMangoValue(mangoValue); > if (result == null) > result = defaultCase(theEObject); > return result; > } >- case MangoPackage.PARAMETER: >+ case MangoPackage.MANGO_PARAMETER: > { >- Parameter parameter = (Parameter)theEObject; >- T result = caseParameter(parameter); >+ MangoParameter mangoParameter = (MangoParameter)theEObject; >+ T result = caseMangoParameter(mangoParameter); > if (result == null) > result = defaultCase(theEObject); > return result; >@@ -124,57 +120,59 @@ > } > > /** >- * Returns the result of interpreting the object as an instance of '<em>Value List</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. >+ * Returns the result of interpreting the object as an instance of '<em>Value List</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>Value List</em>'. > * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) > * @generated > */ >- public T caseValueList(ValueList object) >+ public T caseMangoValueList(MangoValueList object) > { > return null; > } > > /** >- * Returns the result of interpreting the object as an instance of '<em>Value</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. >+ * Returns the result of interpreting the object as an instance of '<em>Value</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>Value</em>'. > * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) > * @generated > */ >- public T caseValue(Value object) >+ public T caseMangoValue(MangoValue object) > { > return null; > } > > /** >- * Returns the result of interpreting the object as an instance of '<em>Parameter</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. >+ * Returns the result of interpreting the object as an instance of '<em>Parameter</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>Parameter</em>'. > * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) > * @generated > */ >- public T caseParameter(Parameter object) >+ public T caseMangoParameter(MangoParameter object) > { > return null; > } > > /** >- * Returns the result of interpreting the object as an instance of '<em>EObject</em>'. <!-- begin-user-doc --> This >+ * Returns the result of interpreting the object as an instance of '<em>EObject</em>'. >+ * <!-- begin-user-doc --> This > * implementation returns null; returning a non-null result will terminate the switch, but this is the last case > * anyway. <!-- end-user-doc --> >- * >- * @param object >- * the target of the switch. >+ * @param object the target of the switch. > * @return the result of interpreting the object as an instance of '<em>EObject</em>'. > * @see #doSwitch(org.eclipse.emf.ecore.EObject) > * @generated >Index: src/org/eclipse/emf/cdo/tests/mango/util/MangoAdapterFactory.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/util/MangoAdapterFactory.java,v >retrieving revision 1.11 >diff -u -r1.11 MangoAdapterFactory.java >--- src/org/eclipse/emf/cdo/tests/mango/util/MangoAdapterFactory.java 22 Aug 2009 09:34:41 -0000 1.11 >+++ src/org/eclipse/emf/cdo/tests/mango/util/MangoAdapterFactory.java 14 Nov 2009 18:55:45 -0000 >@@ -11,9 +11,9 @@ > package org.eclipse.emf.cdo.tests.mango.util; > > import org.eclipse.emf.cdo.tests.mango.MangoPackage; >-import org.eclipse.emf.cdo.tests.mango.Parameter; >-import org.eclipse.emf.cdo.tests.mango.Value; >-import org.eclipse.emf.cdo.tests.mango.ValueList; >+import org.eclipse.emf.cdo.tests.mango.MangoParameter; >+import org.eclipse.emf.cdo.tests.mango.MangoValue; >+import org.eclipse.emf.cdo.tests.mango.MangoValueList; > > import org.eclipse.emf.common.notify.Adapter; > import org.eclipse.emf.common.notify.Notifier; >@@ -23,22 +23,21 @@ > /** > * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter <code>createXXX</code> > * method for each class of the model. <!-- end-user-doc --> >- * > * @see org.eclipse.emf.cdo.tests.mango.MangoPackage > * @generated > */ > public class MangoAdapterFactory extends AdapterFactoryImpl > { > /** >- * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * The cached model package. >+ * <!-- begin-user-doc --> <!-- end-user-doc --> > * @generated > */ > protected static MangoPackage modelPackage; > > /** >- * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * Creates an instance of the adapter factory. >+ * <!-- begin-user-doc --> <!-- end-user-doc --> > * @generated > */ > public MangoAdapterFactory() >@@ -50,10 +49,10 @@ > } > > /** >- * Returns whether this factory is applicable for the type of the object. <!-- begin-user-doc --> This implementation >+ * Returns whether this factory is applicable for the type of the object. >+ * <!-- begin-user-doc --> This implementation > * returns <code>true</code> if the object is either the model's package or is an instance object of the model. <!-- > * end-user-doc --> >- * > * @return whether this factory is applicable for the type of the object. > * @generated > */ >@@ -72,28 +71,28 @@ > } > > /** >- * The switch that delegates to the <code>createXXX</code> methods. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * The switch that delegates to the <code>createXXX</code> methods. >+ * <!-- begin-user-doc --> <!-- end-user-doc --> > * @generated > */ > protected MangoSwitch<Adapter> modelSwitch = new MangoSwitch<Adapter>() > { > @Override >- public Adapter caseValueList(ValueList object) >+ public Adapter caseMangoValueList(MangoValueList object) > { >- return createValueListAdapter(); >+ return createMangoValueListAdapter(); > } > > @Override >- public Adapter caseValue(Value object) >+ public Adapter caseMangoValue(MangoValue object) > { >- return createValueAdapter(); >+ return createMangoValueAdapter(); > } > > @Override >- public Adapter caseParameter(Parameter object) >+ public Adapter caseMangoParameter(MangoParameter object) > { >- return createParameterAdapter(); >+ return createMangoParameterAdapter(); > } > > @Override >@@ -104,10 +103,9 @@ > }; > > /** >- * Creates an adapter for the <code>target</code>. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @param target >- * the object to adapt. >+ * Creates an adapter for the <code>target</code>. >+ * <!-- begin-user-doc --> <!-- end-user-doc --> >+ * @param target the object to adapt. > * @return the adapter for the <code>target</code>. > * @generated > */ >@@ -118,51 +116,54 @@ > } > > /** >- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.mango.ValueList <em>Value List</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 --> >- * >+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.mango.MangoValueList <em>Value List</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.mango.ValueList >+ * @see org.eclipse.emf.cdo.tests.mango.MangoValueList > * @generated > */ >- public Adapter createValueListAdapter() >+ public Adapter createMangoValueListAdapter() > { > return null; > } > > /** >- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.mango.Value <em>Value</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 --> >- * >+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.mango.MangoValue <em>Value</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.mango.Value >+ * @see org.eclipse.emf.cdo.tests.mango.MangoValue > * @generated > */ >- public Adapter createValueAdapter() >+ public Adapter createMangoValueAdapter() > { > return null; > } > > /** >- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.mango.Parameter <em>Parameter</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 --> >- * >+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.mango.MangoParameter <em>Parameter</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.mango.Parameter >+ * @see org.eclipse.emf.cdo.tests.mango.MangoParameter > * @generated > */ >- public Adapter createParameterAdapter() >+ public Adapter createMangoParameterAdapter() > { > return null; > } > > /** >- * Creates a new adapter for the default case. <!-- begin-user-doc --> This default implementation returns null. <!-- >+ * Creates a new adapter for the default case. >+ * <!-- begin-user-doc --> This default implementation returns null. <!-- > * end-user-doc --> >- * > * @return the new adapter. > * @generated > */ >Index: src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoValueImpl.java >=================================================================== >RCS file: src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoValueImpl.java >diff -N src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoValueImpl.java >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoValueImpl.java 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,174 @@ >+/** >+ * Copyright (c) 2004 - 2009 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 >+ * >+ * $Id: ValueImpl.java,v 1.5 2009/08/22 09:34:41 estepper Exp $ >+ */ >+package org.eclipse.emf.cdo.tests.legacy.mango.impl; >+ >+import org.eclipse.emf.cdo.tests.mango.MangoPackage; >+import org.eclipse.emf.cdo.tests.mango.MangoValue; >+ >+import org.eclipse.emf.common.notify.Notification; >+import org.eclipse.emf.ecore.EClass; >+import org.eclipse.emf.ecore.impl.ENotificationImpl; >+import org.eclipse.emf.ecore.impl.EObjectImpl; >+ >+/** >+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Value</b></em>'. <!-- end-user-doc --> >+ * <p> >+ * The following features are implemented: >+ * <ul> >+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.mango.impl.MangoValueImpl#getName <em>Name</em>}</li> >+ * </ul> >+ * </p> >+ * >+ * @generated >+ */ >+public class MangoValueImpl extends EObjectImpl implements MangoValue >+{ >+ /** >+ * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc >+ * --> >+ * >+ * @see #getName() >+ * @generated >+ * @ordered >+ */ >+ protected static final String NAME_EDEFAULT = null; >+ >+ /** >+ * The cached value of the '{@link #getName() <em>Name</em>}' attribute. >+ * <!-- begin-user-doc --> <!-- end-user-doc --> >+ * @see #getName() >+ * @generated >+ * @ordered >+ */ >+ protected String name = NAME_EDEFAULT; >+ >+ /** >+ * <!-- begin-user-doc --> <!-- end-user-doc --> >+ * @generated >+ */ >+ protected MangoValueImpl() >+ { >+ super(); >+ } >+ >+ /** >+ * <!-- begin-user-doc --> <!-- end-user-doc --> >+ * @generated >+ */ >+ @Override >+ protected EClass eStaticClass() >+ { >+ return MangoPackage.Literals.MANGO_VALUE; >+ } >+ >+ /** >+ * <!-- begin-user-doc --> <!-- end-user-doc --> >+ * @generated >+ */ >+ public String getName() >+ { >+ return name; >+ } >+ >+ /** >+ * <!-- begin-user-doc --> <!-- end-user-doc --> >+ * @generated >+ */ >+ public void setName(String newName) >+ { >+ String oldName = name; >+ name = newName; >+ if (eNotificationRequired()) >+ eNotify(new ENotificationImpl(this, Notification.SET, MangoPackage.MANGO_VALUE__NAME, oldName, name)); >+ } >+ >+ /** >+ * <!-- begin-user-doc --> <!-- end-user-doc --> >+ * @generated >+ */ >+ @Override >+ public Object eGet(int featureID, boolean resolve, boolean coreType) >+ { >+ switch (featureID) >+ { >+ case MangoPackage.MANGO_VALUE__NAME: >+ return getName(); >+ } >+ return super.eGet(featureID, resolve, coreType); >+ } >+ >+ /** >+ * <!-- begin-user-doc --> <!-- end-user-doc --> >+ * @generated >+ */ >+ @Override >+ public void eSet(int featureID, Object newValue) >+ { >+ switch (featureID) >+ { >+ case MangoPackage.MANGO_VALUE__NAME: >+ setName((String)newValue); >+ return; >+ } >+ super.eSet(featureID, newValue); >+ } >+ >+ /** >+ * <!-- begin-user-doc --> <!-- end-user-doc --> >+ * @generated >+ */ >+ @Override >+ public void eUnset(int featureID) >+ { >+ switch (featureID) >+ { >+ case MangoPackage.MANGO_VALUE__NAME: >+ setName(NAME_EDEFAULT); >+ return; >+ } >+ super.eUnset(featureID); >+ } >+ >+ /** >+ * <!-- begin-user-doc --> <!-- end-user-doc --> >+ * @generated >+ */ >+ @Override >+ public boolean eIsSet(int featureID) >+ { >+ switch (featureID) >+ { >+ case MangoPackage.MANGO_VALUE__NAME: >+ return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); >+ } >+ return super.eIsSet(featureID); >+ } >+ >+ /** >+ * <!-- begin-user-doc --> <!-- end-user-doc --> >+ * @generated >+ */ >+ @Override >+ public String toString() >+ { >+ if (eIsProxy()) >+ return super.toString(); >+ >+ StringBuffer result = new StringBuffer(super.toString()); >+ result.append(" (name: "); >+ result.append(name); >+ result.append(')'); >+ return result.toString(); >+ } >+ >+} // ValueImpl >Index: src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoParameterImpl.java >=================================================================== >RCS file: src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoParameterImpl.java >diff -N src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoParameterImpl.java >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoParameterImpl.java 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,229 @@ >+/** >+ * Copyright (c) 2004 - 2009 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 >+ * >+ * $Id: ParameterImpl.java,v 1.5 2009/08/22 09:34:41 estepper Exp $ >+ */ >+package org.eclipse.emf.cdo.tests.legacy.mango.impl; >+ >+import org.eclipse.emf.cdo.tests.mango.MangoPackage; >+import org.eclipse.emf.cdo.tests.mango.MangoParameter; >+import org.eclipse.emf.cdo.tests.mango.ParameterPassing; >+ >+import org.eclipse.emf.common.notify.Notification; >+import org.eclipse.emf.ecore.EClass; >+import org.eclipse.emf.ecore.impl.ENotificationImpl; >+import org.eclipse.emf.ecore.impl.EObjectImpl; >+ >+/** >+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Parameter</b></em>'. <!-- end-user-doc --> >+ * <p> >+ * The following features are implemented: >+ * <ul> >+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.mango.impl.MangoParameterImpl#getName <em>Name</em>}</li> >+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.mango.impl.MangoParameterImpl#getPassing <em>Passing</em>}</li> >+ * </ul> >+ * </p> >+ * >+ * @generated >+ */ >+public class MangoParameterImpl extends EObjectImpl implements MangoParameter >+{ >+ /** >+ * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc >+ * --> >+ * >+ * @see #getName() >+ * @generated >+ * @ordered >+ */ >+ protected static final String NAME_EDEFAULT = null; >+ >+ /** >+ * The cached value of the '{@link #getName() <em>Name</em>}' attribute. >+ * <!-- begin-user-doc --> <!-- end-user-doc --> >+ * @see #getName() >+ * @generated >+ * @ordered >+ */ >+ protected String name = NAME_EDEFAULT; >+ >+ /** >+ * The default value of the '{@link #getPassing() <em>Passing</em>}' attribute. >+ * <!-- begin-user-doc --> <!-- >+ * end-user-doc --> >+ * @see #getPassing() >+ * @generated >+ * @ordered >+ */ >+ protected static final ParameterPassing PASSING_EDEFAULT = ParameterPassing.BY_VALUE; >+ >+ /** >+ * The cached value of the '{@link #getPassing() <em>Passing</em>}' attribute. >+ * <!-- begin-user-doc --> <!-- >+ * end-user-doc --> >+ * @see #getPassing() >+ * @generated >+ * @ordered >+ */ >+ protected ParameterPassing passing = PASSING_EDEFAULT; >+ >+ /** >+ * <!-- begin-user-doc --> <!-- end-user-doc --> >+ * @generated >+ */ >+ protected MangoParameterImpl() >+ { >+ super(); >+ } >+ >+ /** >+ * <!-- begin-user-doc --> <!-- end-user-doc --> >+ * @generated >+ */ >+ @Override >+ protected EClass eStaticClass() >+ { >+ return MangoPackage.Literals.MANGO_PARAMETER; >+ } >+ >+ /** >+ * <!-- begin-user-doc --> <!-- end-user-doc --> >+ * @generated >+ */ >+ public String getName() >+ { >+ return name; >+ } >+ >+ /** >+ * <!-- begin-user-doc --> <!-- end-user-doc --> >+ * @generated >+ */ >+ public void setName(String newName) >+ { >+ String oldName = name; >+ name = newName; >+ if (eNotificationRequired()) >+ eNotify(new ENotificationImpl(this, Notification.SET, MangoPackage.MANGO_PARAMETER__NAME, oldName, name)); >+ } >+ >+ /** >+ * <!-- begin-user-doc --> <!-- end-user-doc --> >+ * @generated >+ */ >+ public ParameterPassing getPassing() >+ { >+ return passing; >+ } >+ >+ /** >+ * <!-- begin-user-doc --> <!-- end-user-doc --> >+ * @generated >+ */ >+ public void setPassing(ParameterPassing newPassing) >+ { >+ ParameterPassing oldPassing = passing; >+ passing = newPassing == null ? PASSING_EDEFAULT : newPassing; >+ if (eNotificationRequired()) >+ eNotify(new ENotificationImpl(this, Notification.SET, MangoPackage.MANGO_PARAMETER__PASSING, oldPassing, passing)); >+ } >+ >+ /** >+ * <!-- begin-user-doc --> <!-- end-user-doc --> >+ * @generated >+ */ >+ @Override >+ public Object eGet(int featureID, boolean resolve, boolean coreType) >+ { >+ switch (featureID) >+ { >+ case MangoPackage.MANGO_PARAMETER__NAME: >+ return getName(); >+ case MangoPackage.MANGO_PARAMETER__PASSING: >+ return getPassing(); >+ } >+ return super.eGet(featureID, resolve, coreType); >+ } >+ >+ /** >+ * <!-- begin-user-doc --> <!-- end-user-doc --> >+ * @generated >+ */ >+ @Override >+ public void eSet(int featureID, Object newValue) >+ { >+ switch (featureID) >+ { >+ case MangoPackage.MANGO_PARAMETER__NAME: >+ setName((String)newValue); >+ return; >+ case MangoPackage.MANGO_PARAMETER__PASSING: >+ setPassing((ParameterPassing)newValue); >+ return; >+ } >+ super.eSet(featureID, newValue); >+ } >+ >+ /** >+ * <!-- begin-user-doc --> <!-- end-user-doc --> >+ * @generated >+ */ >+ @Override >+ public void eUnset(int featureID) >+ { >+ switch (featureID) >+ { >+ case MangoPackage.MANGO_PARAMETER__NAME: >+ setName(NAME_EDEFAULT); >+ return; >+ case MangoPackage.MANGO_PARAMETER__PASSING: >+ setPassing(PASSING_EDEFAULT); >+ return; >+ } >+ super.eUnset(featureID); >+ } >+ >+ /** >+ * <!-- begin-user-doc --> <!-- end-user-doc --> >+ * @generated >+ */ >+ @Override >+ public boolean eIsSet(int featureID) >+ { >+ switch (featureID) >+ { >+ case MangoPackage.MANGO_PARAMETER__NAME: >+ return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); >+ case MangoPackage.MANGO_PARAMETER__PASSING: >+ return passing != PASSING_EDEFAULT; >+ } >+ return super.eIsSet(featureID); >+ } >+ >+ /** >+ * <!-- begin-user-doc --> <!-- end-user-doc --> >+ * @generated >+ */ >+ @Override >+ public String toString() >+ { >+ if (eIsProxy()) >+ return super.toString(); >+ >+ StringBuffer result = new StringBuffer(super.toString()); >+ result.append(" (name: "); >+ result.append(name); >+ result.append(", passing: "); >+ result.append(passing); >+ result.append(')'); >+ return result.toString(); >+ } >+ >+} // ParameterImpl >Index: src/org/eclipse/emf/cdo/tests/mango/impl/MangoValueListImpl.java >=================================================================== >RCS file: src/org/eclipse/emf/cdo/tests/mango/impl/MangoValueListImpl.java >diff -N src/org/eclipse/emf/cdo/tests/mango/impl/MangoValueListImpl.java >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ src/org/eclipse/emf/cdo/tests/mango/impl/MangoValueListImpl.java 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,93 @@ >+/** >+ * Copyright (c) 2004 - 2009 Eike Stepper (Berlin, Germany) and others. >+ * All rights reserved. This program and the accompanying materials >+ * are made available under the terms of the Eclipse Public License v1.0 >+ * which accompanies this distribution, and is available at >+ * http://www.eclipse.org/legal/epl-v10.html >+ * >+ * Contributors: >+ * Eike Stepper - initial API and implementation >+ */ >+package org.eclipse.emf.cdo.tests.mango.impl; >+ >+import org.eclipse.emf.cdo.tests.mango.MangoPackage; >+import org.eclipse.emf.cdo.tests.mango.MangoValue; >+import org.eclipse.emf.cdo.tests.mango.MangoValueList; >+ >+import org.eclipse.emf.internal.cdo.CDOObjectImpl; >+ >+import org.eclipse.emf.common.util.EList; >+import org.eclipse.emf.ecore.EClass; >+ >+/** >+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Value List</b></em>'. <!-- end-user-doc --> >+ * <p> >+ * The following features are implemented: >+ * <ul> >+ * <li>{@link org.eclipse.emf.cdo.tests.mango.impl.MangoValueListImpl#getName <em>Name</em>}</li> >+ * <li>{@link org.eclipse.emf.cdo.tests.mango.impl.MangoValueListImpl#getValues <em>Values</em>}</li> >+ * </ul> >+ * </p> >+ * >+ * @generated >+ */ >+public class MangoValueListImpl extends CDOObjectImpl implements MangoValueList >+{ >+ /** >+ * <!-- begin-user-doc --> <!-- end-user-doc --> >+ * @generated >+ */ >+ protected MangoValueListImpl() >+ { >+ super(); >+ } >+ >+ /** >+ * <!-- begin-user-doc --> <!-- end-user-doc --> >+ * @generated >+ */ >+ @Override >+ protected EClass eStaticClass() >+ { >+ return MangoPackage.Literals.MANGO_VALUE_LIST; >+ } >+ >+ /** >+ * <!-- begin-user-doc --> <!-- end-user-doc --> >+ * @generated >+ */ >+ @Override >+ protected int eStaticFeatureCount() >+ { >+ return 0; >+ } >+ >+ /** >+ * <!-- begin-user-doc --> <!-- end-user-doc --> >+ * @generated >+ */ >+ public String getName() >+ { >+ return (String)eGet(MangoPackage.Literals.MANGO_VALUE_LIST__NAME, true); >+ } >+ >+ /** >+ * <!-- begin-user-doc --> <!-- end-user-doc --> >+ * @generated >+ */ >+ public void setName(String newName) >+ { >+ eSet(MangoPackage.Literals.MANGO_VALUE_LIST__NAME, newName); >+ } >+ >+ /** >+ * <!-- begin-user-doc --> <!-- end-user-doc --> >+ * @generated >+ */ >+ @SuppressWarnings("unchecked") >+ public EList<MangoValue> getValues() >+ { >+ return (EList<MangoValue>)eGet(MangoPackage.Literals.MANGO_VALUE_LIST__VALUES, true); >+ } >+ >+} // ValueListImpl >Index: src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoValueListImpl.java >=================================================================== >RCS file: src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoValueListImpl.java >diff -N src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoValueListImpl.java >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoValueListImpl.java 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,215 @@ >+/** >+ * Copyright (c) 2004 - 2009 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 >+ * >+ * $Id: ValueListImpl.java,v 1.5 2009/08/22 09:34:41 estepper Exp $ >+ */ >+package org.eclipse.emf.cdo.tests.legacy.mango.impl; >+ >+import org.eclipse.emf.cdo.tests.mango.MangoPackage; >+import org.eclipse.emf.cdo.tests.mango.MangoValue; >+import org.eclipse.emf.cdo.tests.mango.MangoValueList; >+ >+import org.eclipse.emf.common.notify.Notification; >+import org.eclipse.emf.common.util.EList; >+import org.eclipse.emf.ecore.EClass; >+import org.eclipse.emf.ecore.impl.ENotificationImpl; >+import org.eclipse.emf.ecore.impl.EObjectImpl; >+import org.eclipse.emf.ecore.util.EObjectResolvingEList; >+ >+import java.util.Collection; >+ >+/** >+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Value List</b></em>'. <!-- end-user-doc --> >+ * <p> >+ * The following features are implemented: >+ * <ul> >+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.mango.impl.MangoValueListImpl#getName <em>Name</em>}</li> >+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.mango.impl.MangoValueListImpl#getValues <em>Values</em>}</li> >+ * </ul> >+ * </p> >+ * >+ * @generated >+ */ >+public class MangoValueListImpl extends EObjectImpl implements MangoValueList >+{ >+ /** >+ * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc >+ * --> >+ * >+ * @see #getName() >+ * @generated >+ * @ordered >+ */ >+ protected static final String NAME_EDEFAULT = null; >+ >+ /** >+ * The cached value of the '{@link #getName() <em>Name</em>}' attribute. >+ * <!-- begin-user-doc --> <!-- end-user-doc --> >+ * @see #getName() >+ * @generated >+ * @ordered >+ */ >+ protected String name = NAME_EDEFAULT; >+ >+ /** >+ * The cached value of the '{@link #getValues() <em>Values</em>}' reference list. >+ * <!-- begin-user-doc --> <!-- >+ * end-user-doc --> >+ * @see #getValues() >+ * @generated >+ * @ordered >+ */ >+ protected EList<MangoValue> values; >+ >+ /** >+ * <!-- begin-user-doc --> <!-- end-user-doc --> >+ * @generated >+ */ >+ protected MangoValueListImpl() >+ { >+ super(); >+ } >+ >+ /** >+ * <!-- begin-user-doc --> <!-- end-user-doc --> >+ * @generated >+ */ >+ @Override >+ protected EClass eStaticClass() >+ { >+ return MangoPackage.Literals.MANGO_VALUE_LIST; >+ } >+ >+ /** >+ * <!-- begin-user-doc --> <!-- end-user-doc --> >+ * @generated >+ */ >+ public String getName() >+ { >+ return name; >+ } >+ >+ /** >+ * <!-- begin-user-doc --> <!-- end-user-doc --> >+ * @generated >+ */ >+ public void setName(String newName) >+ { >+ String oldName = name; >+ name = newName; >+ if (eNotificationRequired()) >+ eNotify(new ENotificationImpl(this, Notification.SET, MangoPackage.MANGO_VALUE_LIST__NAME, oldName, name)); >+ } >+ >+ /** >+ * <!-- begin-user-doc --> <!-- end-user-doc --> >+ * @generated >+ */ >+ public EList<MangoValue> getValues() >+ { >+ if (values == null) >+ { >+ values = new EObjectResolvingEList<MangoValue>(MangoValue.class, this, MangoPackage.MANGO_VALUE_LIST__VALUES); >+ } >+ return values; >+ } >+ >+ /** >+ * <!-- begin-user-doc --> <!-- end-user-doc --> >+ * @generated >+ */ >+ @Override >+ public Object eGet(int featureID, boolean resolve, boolean coreType) >+ { >+ switch (featureID) >+ { >+ case MangoPackage.MANGO_VALUE_LIST__NAME: >+ return getName(); >+ case MangoPackage.MANGO_VALUE_LIST__VALUES: >+ return getValues(); >+ } >+ return super.eGet(featureID, resolve, coreType); >+ } >+ >+ /** >+ * <!-- begin-user-doc --> <!-- end-user-doc --> >+ * @generated >+ */ >+ @SuppressWarnings("unchecked") >+ @Override >+ public void eSet(int featureID, Object newValue) >+ { >+ switch (featureID) >+ { >+ case MangoPackage.MANGO_VALUE_LIST__NAME: >+ setName((String)newValue); >+ return; >+ case MangoPackage.MANGO_VALUE_LIST__VALUES: >+ getValues().clear(); >+ getValues().addAll((Collection<? extends MangoValue>)newValue); >+ return; >+ } >+ super.eSet(featureID, newValue); >+ } >+ >+ /** >+ * <!-- begin-user-doc --> <!-- end-user-doc --> >+ * @generated >+ */ >+ @Override >+ public void eUnset(int featureID) >+ { >+ switch (featureID) >+ { >+ case MangoPackage.MANGO_VALUE_LIST__NAME: >+ setName(NAME_EDEFAULT); >+ return; >+ case MangoPackage.MANGO_VALUE_LIST__VALUES: >+ getValues().clear(); >+ return; >+ } >+ super.eUnset(featureID); >+ } >+ >+ /** >+ * <!-- begin-user-doc --> <!-- end-user-doc --> >+ * @generated >+ */ >+ @Override >+ public boolean eIsSet(int featureID) >+ { >+ switch (featureID) >+ { >+ case MangoPackage.MANGO_VALUE_LIST__NAME: >+ return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); >+ case MangoPackage.MANGO_VALUE_LIST__VALUES: >+ return values != null && !values.isEmpty(); >+ } >+ return super.eIsSet(featureID); >+ } >+ >+ /** >+ * <!-- begin-user-doc --> <!-- end-user-doc --> >+ * @generated >+ */ >+ @Override >+ public String toString() >+ { >+ if (eIsProxy()) >+ return super.toString(); >+ >+ StringBuffer result = new StringBuffer(super.toString()); >+ result.append(" (name: "); >+ result.append(name); >+ result.append(')'); >+ return result.toString(); >+ } >+ >+} // ValueListImpl >Index: src/org/eclipse/emf/cdo/tests/mango/MangoValueList.java >=================================================================== >RCS file: src/org/eclipse/emf/cdo/tests/mango/MangoValueList.java >diff -N src/org/eclipse/emf/cdo/tests/mango/MangoValueList.java >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ src/org/eclipse/emf/cdo/tests/mango/MangoValueList.java 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,75 @@ >+/** >+ * Copyright (c) 2004 - 2009 Eike Stepper (Berlin, Germany) and others. >+ * All rights reserved. This program and the accompanying materials >+ * are made available under the terms of the Eclipse Public License v1.0 >+ * which accompanies this distribution, and is available at >+ * http://www.eclipse.org/legal/epl-v10.html >+ * >+ * Contributors: >+ * Eike Stepper - initial API and implementation >+ */ >+package org.eclipse.emf.cdo.tests.mango; >+ >+import org.eclipse.emf.common.util.EList; >+import org.eclipse.emf.ecore.EObject; >+ >+/** >+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Value List</b></em>'. <!-- end-user-doc --> >+ * >+ * <p> >+ * The following features are supported: >+ * <ul> >+ * <li>{@link org.eclipse.emf.cdo.tests.mango.MangoValueList#getName <em>Name</em>}</li> >+ * <li>{@link org.eclipse.emf.cdo.tests.mango.MangoValueList#getValues <em>Values</em>}</li> >+ * </ul> >+ * </p> >+ * >+ * @see org.eclipse.emf.cdo.tests.mango.MangoPackage#getMangoValueList() >+ * @model >+ * @generated >+ */ >+public interface MangoValueList extends EObject >+{ >+ /** >+ * Returns the value of the '<em><b>Name</b></em>' attribute. >+ * <!-- begin-user-doc --> >+ * <p> >+ * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here... >+ * </p> >+ * <!-- end-user-doc --> >+ * @return the value of the '<em>Name</em>' attribute. >+ * @see #setName(String) >+ * @see org.eclipse.emf.cdo.tests.mango.MangoPackage#getMangoValueList_Name() >+ * @model >+ * @generated >+ */ >+ String getName(); >+ >+ /** >+ * Sets the value of the '{@link org.eclipse.emf.cdo.tests.mango.MangoValueList#getName <em>Name</em>}' attribute. <!-- >+ * begin-user-doc --> <!-- end-user-doc --> >+ * >+ * @param value >+ * the new value of the '<em>Name</em>' attribute. >+ * @see #getName() >+ * @generated >+ */ >+ void setName(String value); >+ >+ /** >+ * Returns the value of the '<em><b>Values</b></em>' reference list. >+ * The list contents are of type {@link org.eclipse.emf.cdo.tests.mango.MangoValue}. >+ * <!-- begin-user-doc --> >+ * <p> >+ * If the meaning of the '<em>Values</em>' reference list isn't clear, there really should be more of a description >+ * here... >+ * </p> >+ * <!-- end-user-doc --> >+ * @return the value of the '<em>Values</em>' reference list. >+ * @see org.eclipse.emf.cdo.tests.mango.MangoPackage#getMangoValueList_Values() >+ * @model >+ * @generated >+ */ >+ EList<MangoValue> getValues(); >+ >+} // ValueList >Index: src/org/eclipse/emf/cdo/tests/mango/MangoValue.java >=================================================================== >RCS file: src/org/eclipse/emf/cdo/tests/mango/MangoValue.java >diff -N src/org/eclipse/emf/cdo/tests/mango/MangoValue.java >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ src/org/eclipse/emf/cdo/tests/mango/MangoValue.java 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,57 @@ >+/** >+ * Copyright (c) 2004 - 2009 Eike Stepper (Berlin, Germany) and others. >+ * All rights reserved. This program and the accompanying materials >+ * are made available under the terms of the Eclipse Public License v1.0 >+ * which accompanies this distribution, and is available at >+ * http://www.eclipse.org/legal/epl-v10.html >+ * >+ * Contributors: >+ * Eike Stepper - initial API and implementation >+ */ >+package org.eclipse.emf.cdo.tests.mango; >+ >+import org.eclipse.emf.ecore.EObject; >+ >+/** >+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Value</b></em>'. <!-- end-user-doc --> >+ * >+ * <p> >+ * The following features are supported: >+ * <ul> >+ * <li>{@link org.eclipse.emf.cdo.tests.mango.MangoValue#getName <em>Name</em>}</li> >+ * </ul> >+ * </p> >+ * >+ * @see org.eclipse.emf.cdo.tests.mango.MangoPackage#getMangoValue() >+ * @model >+ * @generated >+ */ >+public interface MangoValue extends EObject >+{ >+ /** >+ * Returns the value of the '<em><b>Name</b></em>' attribute. >+ * <!-- begin-user-doc --> >+ * <p> >+ * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here... >+ * </p> >+ * <!-- end-user-doc --> >+ * @return the value of the '<em>Name</em>' attribute. >+ * @see #setName(String) >+ * @see org.eclipse.emf.cdo.tests.mango.MangoPackage#getMangoValue_Name() >+ * @model >+ * @generated >+ */ >+ String getName(); >+ >+ /** >+ * Sets the value of the '{@link org.eclipse.emf.cdo.tests.mango.MangoValue#getName <em>Name</em>}' attribute. <!-- >+ * begin-user-doc --> <!-- end-user-doc --> >+ * >+ * @param value >+ * the new value of the '<em>Name</em>' attribute. >+ * @see #getName() >+ * @generated >+ */ >+ void setName(String value); >+ >+} // Value >Index: src/org/eclipse/emf/cdo/tests/mango/impl/MangoValueImpl.java >=================================================================== >RCS file: src/org/eclipse/emf/cdo/tests/mango/impl/MangoValueImpl.java >diff -N src/org/eclipse/emf/cdo/tests/mango/impl/MangoValueImpl.java >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ src/org/eclipse/emf/cdo/tests/mango/impl/MangoValueImpl.java 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,80 @@ >+/** >+ * Copyright (c) 2004 - 2009 Eike Stepper (Berlin, Germany) and others. >+ * All rights reserved. This program and the accompanying materials >+ * are made available under the terms of the Eclipse Public License v1.0 >+ * which accompanies this distribution, and is available at >+ * http://www.eclipse.org/legal/epl-v10.html >+ * >+ * Contributors: >+ * Eike Stepper - initial API and implementation >+ */ >+package org.eclipse.emf.cdo.tests.mango.impl; >+ >+import org.eclipse.emf.cdo.tests.mango.MangoPackage; >+import org.eclipse.emf.cdo.tests.mango.MangoValue; >+ >+import org.eclipse.emf.internal.cdo.CDOObjectImpl; >+ >+import org.eclipse.emf.ecore.EClass; >+ >+/** >+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Value</b></em>'. <!-- end-user-doc --> >+ * <p> >+ * The following features are implemented: >+ * <ul> >+ * <li>{@link org.eclipse.emf.cdo.tests.mango.impl.MangoValueImpl#getName <em>Name</em>}</li> >+ * </ul> >+ * </p> >+ * >+ * @generated >+ */ >+public class MangoValueImpl extends CDOObjectImpl implements MangoValue >+{ >+ /** >+ * <!-- begin-user-doc --> <!-- end-user-doc --> >+ * @generated >+ */ >+ protected MangoValueImpl() >+ { >+ super(); >+ } >+ >+ /** >+ * <!-- begin-user-doc --> <!-- end-user-doc --> >+ * @generated >+ */ >+ @Override >+ protected EClass eStaticClass() >+ { >+ return MangoPackage.Literals.MANGO_VALUE; >+ } >+ >+ /** >+ * <!-- begin-user-doc --> <!-- end-user-doc --> >+ * @generated >+ */ >+ @Override >+ protected int eStaticFeatureCount() >+ { >+ return 0; >+ } >+ >+ /** >+ * <!-- begin-user-doc --> <!-- end-user-doc --> >+ * @generated >+ */ >+ public String getName() >+ { >+ return (String)eGet(MangoPackage.Literals.MANGO_VALUE__NAME, true); >+ } >+ >+ /** >+ * <!-- begin-user-doc --> <!-- end-user-doc --> >+ * @generated >+ */ >+ public void setName(String newName) >+ { >+ eSet(MangoPackage.Literals.MANGO_VALUE__NAME, newName); >+ } >+ >+} // ValueImpl >Index: src/org/eclipse/emf/cdo/tests/mango/impl/MangoParameterImpl.java >=================================================================== >RCS file: src/org/eclipse/emf/cdo/tests/mango/impl/MangoParameterImpl.java >diff -N src/org/eclipse/emf/cdo/tests/mango/impl/MangoParameterImpl.java >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ src/org/eclipse/emf/cdo/tests/mango/impl/MangoParameterImpl.java 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,100 @@ >+/** >+ * Copyright (c) 2004 - 2009 Eike Stepper (Berlin, Germany) and others. >+ * All rights reserved. This program and the accompanying materials >+ * are made available under the terms of the Eclipse Public License v1.0 >+ * which accompanies this distribution, and is available at >+ * http://www.eclipse.org/legal/epl-v10.html >+ * >+ * Contributors: >+ * Eike Stepper - initial API and implementation >+ */ >+package org.eclipse.emf.cdo.tests.mango.impl; >+ >+import org.eclipse.emf.cdo.tests.mango.MangoPackage; >+import org.eclipse.emf.cdo.tests.mango.MangoParameter; >+import org.eclipse.emf.cdo.tests.mango.ParameterPassing; >+ >+import org.eclipse.emf.internal.cdo.CDOObjectImpl; >+ >+import org.eclipse.emf.ecore.EClass; >+ >+/** >+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Parameter</b></em>'. <!-- end-user-doc --> >+ * <p> >+ * The following features are implemented: >+ * <ul> >+ * <li>{@link org.eclipse.emf.cdo.tests.mango.impl.MangoParameterImpl#getName <em>Name</em>}</li> >+ * <li>{@link org.eclipse.emf.cdo.tests.mango.impl.MangoParameterImpl#getPassing <em>Passing</em>}</li> >+ * </ul> >+ * </p> >+ * >+ * @generated >+ */ >+public class MangoParameterImpl extends CDOObjectImpl implements MangoParameter >+{ >+ /** >+ * <!-- begin-user-doc --> <!-- end-user-doc --> >+ * @generated >+ */ >+ protected MangoParameterImpl() >+ { >+ super(); >+ } >+ >+ /** >+ * <!-- begin-user-doc --> <!-- end-user-doc --> >+ * @generated >+ */ >+ @Override >+ protected EClass eStaticClass() >+ { >+ return MangoPackage.Literals.MANGO_PARAMETER; >+ } >+ >+ /** >+ * <!-- begin-user-doc --> <!-- end-user-doc --> >+ * @generated >+ */ >+ @Override >+ protected int eStaticFeatureCount() >+ { >+ return 0; >+ } >+ >+ /** >+ * <!-- begin-user-doc --> <!-- end-user-doc --> >+ * @generated >+ */ >+ public String getName() >+ { >+ return (String)eGet(MangoPackage.Literals.MANGO_PARAMETER__NAME, true); >+ } >+ >+ /** >+ * <!-- begin-user-doc --> <!-- end-user-doc --> >+ * @generated >+ */ >+ public void setName(String newName) >+ { >+ eSet(MangoPackage.Literals.MANGO_PARAMETER__NAME, newName); >+ } >+ >+ /** >+ * <!-- begin-user-doc --> <!-- end-user-doc --> >+ * @generated >+ */ >+ public ParameterPassing getPassing() >+ { >+ return (ParameterPassing)eGet(MangoPackage.Literals.MANGO_PARAMETER__PASSING, true); >+ } >+ >+ /** >+ * <!-- begin-user-doc --> <!-- end-user-doc --> >+ * @generated >+ */ >+ public void setPassing(ParameterPassing newPassing) >+ { >+ eSet(MangoPackage.Literals.MANGO_PARAMETER__PASSING, newPassing); >+ } >+ >+} // ParameterImpl >Index: src/org/eclipse/emf/cdo/tests/mango/MangoParameter.java >=================================================================== >RCS file: src/org/eclipse/emf/cdo/tests/mango/MangoParameter.java >diff -N src/org/eclipse/emf/cdo/tests/mango/MangoParameter.java >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ src/org/eclipse/emf/cdo/tests/mango/MangoParameter.java 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,86 @@ >+/** >+ * Copyright (c) 2004 - 2009 Eike Stepper (Berlin, Germany) and others. >+ * All rights reserved. This program and the accompanying materials >+ * are made available under the terms of the Eclipse Public License v1.0 >+ * which accompanies this distribution, and is available at >+ * http://www.eclipse.org/legal/epl-v10.html >+ * >+ * Contributors: >+ * Eike Stepper - initial API and implementation >+ */ >+package org.eclipse.emf.cdo.tests.mango; >+ >+import org.eclipse.emf.ecore.EObject; >+ >+/** >+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Parameter</b></em>'. <!-- end-user-doc --> >+ * >+ * <p> >+ * The following features are supported: >+ * <ul> >+ * <li>{@link org.eclipse.emf.cdo.tests.mango.MangoParameter#getName <em>Name</em>}</li> >+ * <li>{@link org.eclipse.emf.cdo.tests.mango.MangoParameter#getPassing <em>Passing</em>}</li> >+ * </ul> >+ * </p> >+ * >+ * @see org.eclipse.emf.cdo.tests.mango.MangoPackage#getMangoParameter() >+ * @model >+ * @generated >+ */ >+public interface MangoParameter extends EObject >+{ >+ /** >+ * Returns the value of the '<em><b>Name</b></em>' attribute. >+ * <!-- begin-user-doc --> >+ * <p> >+ * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here... >+ * </p> >+ * <!-- end-user-doc --> >+ * @return the value of the '<em>Name</em>' attribute. >+ * @see #setName(String) >+ * @see org.eclipse.emf.cdo.tests.mango.MangoPackage#getMangoParameter_Name() >+ * @model >+ * @generated >+ */ >+ String getName(); >+ >+ /** >+ * Sets the value of the '{@link org.eclipse.emf.cdo.tests.mango.MangoParameter#getName <em>Name</em>}' attribute. <!-- >+ * begin-user-doc --> <!-- end-user-doc --> >+ * >+ * @param value >+ * the new value of the '<em>Name</em>' attribute. >+ * @see #getName() >+ * @generated >+ */ >+ void setName(String value); >+ >+ /** >+ * Returns the value of the '<em><b>Passing</b></em>' attribute. >+ * The literals are from the enumeration {@link org.eclipse.emf.cdo.tests.mango.ParameterPassing}. >+ * <!-- begin-user-doc --> >+ * <p> >+ * If the meaning of the '<em>Passing</em>' attribute isn't clear, there really should be more of a description >+ * here... >+ * </p> >+ * <!-- end-user-doc --> >+ * @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.MangoPackage#getMangoParameter_Passing() >+ * @model >+ * @generated >+ */ >+ ParameterPassing getPassing(); >+ >+ /** >+ * Sets the value of the '{@link org.eclipse.emf.cdo.tests.mango.MangoParameter#getPassing <em>Passing</em>}' attribute. >+ * <!-- begin-user-doc --> <!-- end-user-doc --> >+ * @param value the new value of the '<em>Passing</em>' attribute. >+ * @see org.eclipse.emf.cdo.tests.mango.ParameterPassing >+ * @see #getPassing() >+ * @generated >+ */ >+ void setPassing(ParameterPassing value); >+ >+} // Parameter >#P org.eclipse.emf.cdo.tests.model1 >Index: src/org/eclipse/emf/cdo/tests/legacy/model1/impl/OrderDetailImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/OrderDetailImpl.java,v >retrieving revision 1.5 >diff -u -r1.5 OrderDetailImpl.java >--- src/org/eclipse/emf/cdo/tests/legacy/model1/impl/OrderDetailImpl.java 22 Aug 2009 09:35:30 -0000 1.5 >+++ src/org/eclipse/emf/cdo/tests/legacy/model1/impl/OrderDetailImpl.java 14 Nov 2009 18:55:50 -0000 >@@ -8,14 +8,14 @@ > * Contributors: > * Eike Stepper - initial API and implementation > * >- * $Id: OrderDetailImpl.java,v 1.5 2009/08/22 09:35:30 estepper Exp $ >+ * $Id$ > */ > package org.eclipse.emf.cdo.tests.legacy.model1.impl; > > import org.eclipse.emf.cdo.tests.legacy.model1.Model1Package; >-import org.eclipse.emf.cdo.tests.legacy.model1.Order; >-import org.eclipse.emf.cdo.tests.legacy.model1.OrderDetail; >-import org.eclipse.emf.cdo.tests.legacy.model1.Product1; >+import org.eclipse.emf.cdo.tests.model1.Order; >+import org.eclipse.emf.cdo.tests.model1.OrderDetail; >+import org.eclipse.emf.cdo.tests.model1.Product1; > > import org.eclipse.emf.common.notify.Notification; > import org.eclipse.emf.common.notify.NotificationChain; >@@ -26,31 +26,33 @@ > import org.eclipse.emf.ecore.util.EcoreUtil; > > /** >- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Order Detail</b></em>'. <!-- end-user-doc --> >+ * <!-- begin-user-doc --> >+ * An implementation of the model object '<em><b>Order Detail</b></em>'. >+ * <!-- end-user-doc --> > * <p> > * The following features are implemented: > * <ul> >- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderDetailImpl#getOrder <em>Order</em>}</li> >- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderDetailImpl#getProduct <em>Product</em>}</li> >- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderDetailImpl#getPrice <em>Price</em>}</li> >+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderDetailImpl#getOrder <em>Order</em>}</li> >+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderDetailImpl#getProduct <em>Product</em>}</li> >+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderDetailImpl#getPrice <em>Price</em>}</li> > * </ul> > * </p> >- * >+ * > * @generated > */ > public class OrderDetailImpl extends EObjectImpl implements OrderDetail > { > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > public static final String copyright = "Copyright (c) 2004 - 2009 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation"; > > /** >- * The cached value of the '{@link #getProduct() <em>Product</em>}' reference. <!-- begin-user-doc --> <!-- >- * end-user-doc --> >- * >+ * The cached value of the '{@link #getProduct() <em>Product</em>}' reference. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @see #getProduct() > * @generated > * @ordered >@@ -58,9 +60,9 @@ > protected Product1 product; > > /** >- * The default value of the '{@link #getPrice() <em>Price</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc >- * --> >- * >+ * The default value of the '{@link #getPrice() <em>Price</em>}' attribute. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @see #getPrice() > * @generated > * @ordered >@@ -68,9 +70,9 @@ > protected static final float PRICE_EDEFAULT = 0.0F; > > /** >- * The cached value of the '{@link #getPrice() <em>Price</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc >- * --> >- * >+ * The cached value of the '{@link #getPrice() <em>Price</em>}' attribute. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @see #getPrice() > * @generated > * @ordered >@@ -78,8 +80,8 @@ > protected float price = PRICE_EDEFAULT; > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > protected OrderDetailImpl() >@@ -88,8 +90,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > @Override >@@ -99,8 +101,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > public Order getOrder() >@@ -111,8 +113,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > public NotificationChain basicSetOrder(Order newOrder, NotificationChain msgs) >@@ -122,8 +124,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > public void setOrder(Order newOrder) >@@ -147,8 +149,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > public Product1 getProduct() >@@ -168,8 +170,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > public Product1 basicGetProduct() >@@ -178,8 +180,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > public NotificationChain basicSetProduct(Product1 newProduct, NotificationChain msgs) >@@ -199,8 +201,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > public void setProduct(Product1 newProduct) >@@ -223,8 +225,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > public float getPrice() >@@ -233,8 +235,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > public void setPrice(float newPrice) >@@ -246,8 +248,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > @Override >@@ -269,8 +271,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > @Override >@@ -287,8 +289,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > @Override >@@ -303,8 +305,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > @Override >@@ -325,8 +327,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > @Override >@@ -348,8 +350,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > @Override >@@ -371,8 +373,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > @Override >@@ -391,8 +393,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > @Override >@@ -408,4 +410,4 @@ > return result.toString(); > } > >-} // OrderDetailImpl >+} //OrderDetailImpl >Index: src/org/eclipse/emf/cdo/tests/legacy/model1/impl/OrderImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/OrderImpl.java,v >retrieving revision 1.5 >diff -u -r1.5 OrderImpl.java >--- src/org/eclipse/emf/cdo/tests/legacy/model1/impl/OrderImpl.java 22 Aug 2009 09:35:30 -0000 1.5 >+++ src/org/eclipse/emf/cdo/tests/legacy/model1/impl/OrderImpl.java 14 Nov 2009 18:55:50 -0000 >@@ -8,13 +8,13 @@ > * Contributors: > * Eike Stepper - initial API and implementation > * >- * $Id: OrderImpl.java,v 1.5 2009/08/22 09:35:30 estepper Exp $ >+ * $Id$ > */ > package org.eclipse.emf.cdo.tests.legacy.model1.impl; > > import org.eclipse.emf.cdo.tests.legacy.model1.Model1Package; >-import org.eclipse.emf.cdo.tests.legacy.model1.Order; >-import org.eclipse.emf.cdo.tests.legacy.model1.OrderDetail; >+import org.eclipse.emf.cdo.tests.model1.Order; >+import org.eclipse.emf.cdo.tests.model1.OrderDetail; > > import org.eclipse.emf.common.notify.NotificationChain; > import org.eclipse.emf.common.util.EList; >@@ -27,29 +27,31 @@ > import java.util.Collection; > > /** >- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Order</b></em>'. <!-- end-user-doc --> >+ * <!-- begin-user-doc --> >+ * An implementation of the model object '<em><b>Order</b></em>'. >+ * <!-- end-user-doc --> > * <p> > * The following features are implemented: > * <ul> >- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderImpl#getOrderDetails <em>Order Details</em>}</li> >+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderImpl#getOrderDetails <em>Order Details</em>}</li> > * </ul> > * </p> >- * >+ * > * @generated > */ > public class OrderImpl extends EObjectImpl implements Order > { > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > public static final String copyright = "Copyright (c) 2004 - 2009 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation"; > > /** >- * The cached value of the '{@link #getOrderDetails() <em>Order Details</em>}' containment reference list. <!-- >- * begin-user-doc --> <!-- end-user-doc --> >- * >+ * The cached value of the '{@link #getOrderDetails() <em>Order Details</em>}' containment reference list. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @see #getOrderDetails() > * @generated > * @ordered >@@ -57,8 +59,8 @@ > protected EList<OrderDetail> orderDetails; > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > protected OrderImpl() >@@ -67,8 +69,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > @Override >@@ -78,8 +80,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > public EList<OrderDetail> getOrderDetails() >@@ -93,8 +95,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > @SuppressWarnings("unchecked") >@@ -110,8 +112,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > @Override >@@ -126,8 +128,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > @Override >@@ -142,8 +144,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > @SuppressWarnings("unchecked") >@@ -161,8 +163,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > @Override >@@ -178,8 +180,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > @Override >@@ -193,4 +195,4 @@ > return super.eIsSet(featureID); > } > >-} // OrderImpl >+} //OrderImpl >Index: src/org/eclipse/emf/cdo/tests/legacy/model1/impl/CompanyImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/CompanyImpl.java,v >retrieving revision 1.5 >diff -u -r1.5 CompanyImpl.java >--- src/org/eclipse/emf/cdo/tests/legacy/model1/impl/CompanyImpl.java 22 Aug 2009 09:35:30 -0000 1.5 >+++ src/org/eclipse/emf/cdo/tests/legacy/model1/impl/CompanyImpl.java 14 Nov 2009 18:55:49 -0000 >@@ -8,17 +8,17 @@ > * Contributors: > * Eike Stepper - initial API and implementation > * >- * $Id: CompanyImpl.java,v 1.5 2009/08/22 09:35:30 estepper Exp $ >+ * $Id$ > */ > package org.eclipse.emf.cdo.tests.legacy.model1.impl; > >-import org.eclipse.emf.cdo.tests.legacy.model1.Category; >-import org.eclipse.emf.cdo.tests.legacy.model1.Company; >-import org.eclipse.emf.cdo.tests.legacy.model1.Customer; > import org.eclipse.emf.cdo.tests.legacy.model1.Model1Package; >-import org.eclipse.emf.cdo.tests.legacy.model1.PurchaseOrder; >-import org.eclipse.emf.cdo.tests.legacy.model1.SalesOrder; >-import org.eclipse.emf.cdo.tests.legacy.model1.Supplier; >+import org.eclipse.emf.cdo.tests.model1.Category; >+import org.eclipse.emf.cdo.tests.model1.Company; >+import org.eclipse.emf.cdo.tests.model1.Customer; >+import org.eclipse.emf.cdo.tests.model1.PurchaseOrder; >+import org.eclipse.emf.cdo.tests.model1.SalesOrder; >+import org.eclipse.emf.cdo.tests.model1.Supplier; > > import org.eclipse.emf.common.notify.NotificationChain; > import org.eclipse.emf.common.util.EList; >@@ -30,33 +30,35 @@ > import java.util.Collection; > > /** >- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Company</b></em>'. <!-- end-user-doc --> >+ * <!-- begin-user-doc --> >+ * An implementation of the model object '<em><b>Company</b></em>'. >+ * <!-- end-user-doc --> > * <p> > * The following features are implemented: > * <ul> >- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CompanyImpl#getCategories <em>Categories</em>}</li> >- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CompanyImpl#getSuppliers <em>Suppliers</em>}</li> >- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CompanyImpl#getCustomers <em>Customers</em>}</li> >- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CompanyImpl#getPurchaseOrders <em>Purchase Orders</em>}</li> >- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CompanyImpl#getSalesOrders <em>Sales Orders</em>}</li> >+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CompanyImpl#getCategories <em>Categories</em>}</li> >+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CompanyImpl#getSuppliers <em>Suppliers</em>}</li> >+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CompanyImpl#getCustomers <em>Customers</em>}</li> >+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CompanyImpl#getPurchaseOrders <em>Purchase Orders</em>}</li> >+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CompanyImpl#getSalesOrders <em>Sales Orders</em>}</li> > * </ul> > * </p> >- * >+ * > * @generated > */ > public class CompanyImpl extends AddressImpl implements Company > { > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > public static final String copyright = "Copyright (c) 2004 - 2009 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation"; > > /** >- * The cached value of the '{@link #getCategories() <em>Categories</em>}' containment reference list. <!-- >- * begin-user-doc --> <!-- end-user-doc --> >- * >+ * The cached value of the '{@link #getCategories() <em>Categories</em>}' containment reference list. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @see #getCategories() > * @generated > * @ordered >@@ -64,9 +66,9 @@ > protected EList<Category> categories; > > /** >- * The cached value of the '{@link #getSuppliers() <em>Suppliers</em>}' containment reference list. <!-- >- * begin-user-doc --> <!-- end-user-doc --> >- * >+ * The cached value of the '{@link #getSuppliers() <em>Suppliers</em>}' containment reference list. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @see #getSuppliers() > * @generated > * @ordered >@@ -74,9 +76,9 @@ > protected EList<Supplier> suppliers; > > /** >- * The cached value of the '{@link #getCustomers() <em>Customers</em>}' containment reference list. <!-- >- * begin-user-doc --> <!-- end-user-doc --> >- * >+ * The cached value of the '{@link #getCustomers() <em>Customers</em>}' containment reference list. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @see #getCustomers() > * @generated > * @ordered >@@ -84,9 +86,9 @@ > protected EList<Customer> customers; > > /** >- * The cached value of the '{@link #getPurchaseOrders() <em>Purchase Orders</em>}' containment reference list. <!-- >- * begin-user-doc --> <!-- end-user-doc --> >- * >+ * The cached value of the '{@link #getPurchaseOrders() <em>Purchase Orders</em>}' containment reference list. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @see #getPurchaseOrders() > * @generated > * @ordered >@@ -94,9 +96,9 @@ > protected EList<PurchaseOrder> purchaseOrders; > > /** >- * The cached value of the '{@link #getSalesOrders() <em>Sales Orders</em>}' containment reference list. <!-- >- * begin-user-doc --> <!-- end-user-doc --> >- * >+ * The cached value of the '{@link #getSalesOrders() <em>Sales Orders</em>}' containment reference list. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @see #getSalesOrders() > * @generated > * @ordered >@@ -104,8 +106,8 @@ > protected EList<SalesOrder> salesOrders; > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > protected CompanyImpl() >@@ -114,8 +116,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > @Override >@@ -125,8 +127,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > public EList<Category> getCategories() >@@ -139,8 +141,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > public EList<Supplier> getSuppliers() >@@ -153,8 +155,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > public EList<Customer> getCustomers() >@@ -167,8 +169,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > public EList<PurchaseOrder> getPurchaseOrders() >@@ -182,8 +184,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > public EList<SalesOrder> getSalesOrders() >@@ -196,8 +198,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > @Override >@@ -220,8 +222,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > @Override >@@ -244,8 +246,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > @SuppressWarnings("unchecked") >@@ -279,8 +281,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > @Override >@@ -308,8 +310,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > @Override >@@ -331,4 +333,4 @@ > return super.eIsSet(featureID); > } > >-} // CompanyImpl >+} //CompanyImpl >Index: src/org/eclipse/emf/cdo/tests/legacy/model1/impl/SupplierImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/SupplierImpl.java,v >retrieving revision 1.5 >diff -u -r1.5 SupplierImpl.java >--- src/org/eclipse/emf/cdo/tests/legacy/model1/impl/SupplierImpl.java 22 Aug 2009 09:35:30 -0000 1.5 >+++ src/org/eclipse/emf/cdo/tests/legacy/model1/impl/SupplierImpl.java 14 Nov 2009 18:55:51 -0000 >@@ -8,13 +8,13 @@ > * Contributors: > * Eike Stepper - initial API and implementation > * >- * $Id: SupplierImpl.java,v 1.5 2009/08/22 09:35:30 estepper Exp $ >+ * $Id$ > */ > package org.eclipse.emf.cdo.tests.legacy.model1.impl; > > import org.eclipse.emf.cdo.tests.legacy.model1.Model1Package; >-import org.eclipse.emf.cdo.tests.legacy.model1.PurchaseOrder; >-import org.eclipse.emf.cdo.tests.legacy.model1.Supplier; >+import org.eclipse.emf.cdo.tests.model1.PurchaseOrder; >+import org.eclipse.emf.cdo.tests.model1.Supplier; > > import org.eclipse.emf.common.notify.Notification; > import org.eclipse.emf.common.notify.NotificationChain; >@@ -28,30 +28,32 @@ > import java.util.Collection; > > /** >- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Supplier</b></em>'. <!-- end-user-doc --> >+ * <!-- begin-user-doc --> >+ * An implementation of the model object '<em><b>Supplier</b></em>'. >+ * <!-- end-user-doc --> > * <p> > * The following features are implemented: > * <ul> >- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.SupplierImpl#getPurchaseOrders <em>Purchase Orders</em>}</li> >- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.SupplierImpl#isPreferred <em>Preferred</em>}</li> >+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.SupplierImpl#getPurchaseOrders <em>Purchase Orders</em>}</li> >+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.SupplierImpl#isPreferred <em>Preferred</em>}</li> > * </ul> > * </p> >- * >+ * > * @generated > */ > public class SupplierImpl extends AddressImpl implements Supplier > { > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > public static final String copyright = "Copyright (c) 2004 - 2009 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation"; > > /** >- * The cached value of the '{@link #getPurchaseOrders() <em>Purchase Orders</em>}' reference list. <!-- begin-user-doc >- * --> <!-- end-user-doc --> >- * >+ * The cached value of the '{@link #getPurchaseOrders() <em>Purchase Orders</em>}' reference list. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @see #getPurchaseOrders() > * @generated > * @ordered >@@ -59,9 +61,9 @@ > protected EList<PurchaseOrder> purchaseOrders; > > /** >- * The default value of the '{@link #isPreferred() <em>Preferred</em>}' attribute. <!-- begin-user-doc --> <!-- >- * end-user-doc --> >- * >+ * The default value of the '{@link #isPreferred() <em>Preferred</em>}' attribute. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @see #isPreferred() > * @generated > * @ordered >@@ -69,9 +71,9 @@ > protected static final boolean PREFERRED_EDEFAULT = true; > > /** >- * The cached value of the '{@link #isPreferred() <em>Preferred</em>}' attribute. <!-- begin-user-doc --> <!-- >- * end-user-doc --> >- * >+ * The cached value of the '{@link #isPreferred() <em>Preferred</em>}' attribute. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @see #isPreferred() > * @generated > * @ordered >@@ -79,8 +81,8 @@ > protected boolean preferred = PREFERRED_EDEFAULT; > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > protected SupplierImpl() >@@ -89,8 +91,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > @Override >@@ -100,8 +102,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > public EList<PurchaseOrder> getPurchaseOrders() >@@ -115,8 +117,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > public boolean isPreferred() >@@ -125,8 +127,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > public void setPreferred(boolean newPreferred) >@@ -138,8 +140,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > @SuppressWarnings("unchecked") >@@ -155,8 +157,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > @Override >@@ -171,8 +173,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > @Override >@@ -189,8 +191,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > @SuppressWarnings("unchecked") >@@ -211,8 +213,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > @Override >@@ -231,8 +233,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > @Override >@@ -249,8 +251,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > @Override >@@ -266,4 +268,4 @@ > return result.toString(); > } > >-} // SupplierImpl >+} //SupplierImpl >Index: src/org/eclipse/emf/cdo/tests/legacy/model1/impl/SalesOrderImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/SalesOrderImpl.java,v >retrieving revision 1.5 >diff -u -r1.5 SalesOrderImpl.java >--- src/org/eclipse/emf/cdo/tests/legacy/model1/impl/SalesOrderImpl.java 22 Aug 2009 09:35:30 -0000 1.5 >+++ src/org/eclipse/emf/cdo/tests/legacy/model1/impl/SalesOrderImpl.java 14 Nov 2009 18:55:50 -0000 >@@ -8,13 +8,13 @@ > * Contributors: > * Eike Stepper - initial API and implementation > * >- * $Id: SalesOrderImpl.java,v 1.5 2009/08/22 09:35:30 estepper Exp $ >+ * $Id$ > */ > package org.eclipse.emf.cdo.tests.legacy.model1.impl; > >-import org.eclipse.emf.cdo.tests.legacy.model1.Customer; > import org.eclipse.emf.cdo.tests.legacy.model1.Model1Package; >-import org.eclipse.emf.cdo.tests.legacy.model1.SalesOrder; >+import org.eclipse.emf.cdo.tests.model1.Customer; >+import org.eclipse.emf.cdo.tests.model1.SalesOrder; > > import org.eclipse.emf.common.notify.Notification; > import org.eclipse.emf.common.notify.NotificationChain; >@@ -23,29 +23,32 @@ > import org.eclipse.emf.ecore.impl.ENotificationImpl; > > /** >- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Sales Order</b></em>'. <!-- end-user-doc --> >+ * <!-- begin-user-doc --> >+ * An implementation of the model object '<em><b>Sales Order</b></em>'. >+ * <!-- end-user-doc --> > * <p> > * The following features are implemented: > * <ul> >- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.SalesOrderImpl#getId <em>Id</em>}</li> >- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.SalesOrderImpl#getCustomer <em>Customer</em>}</li> >+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.SalesOrderImpl#getId <em>Id</em>}</li> >+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.SalesOrderImpl#getCustomer <em>Customer</em>}</li> > * </ul> > * </p> >- * >+ * > * @generated > */ > public class SalesOrderImpl extends OrderImpl implements SalesOrder > { > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > public static final String copyright = "Copyright (c) 2004 - 2009 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 default value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * The default value of the '{@link #getId() <em>Id</em>}' attribute. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @see #getId() > * @generated > * @ordered >@@ -53,8 +56,9 @@ > protected static final int ID_EDEFAULT = 0; > > /** >- * The cached value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * The cached value of the '{@link #getId() <em>Id</em>}' attribute. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @see #getId() > * @generated > * @ordered >@@ -62,9 +66,9 @@ > protected int id = ID_EDEFAULT; > > /** >- * The cached value of the '{@link #getCustomer() <em>Customer</em>}' reference. <!-- begin-user-doc --> <!-- >- * end-user-doc --> >- * >+ * The cached value of the '{@link #getCustomer() <em>Customer</em>}' reference. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @see #getCustomer() > * @generated > * @ordered >@@ -72,8 +76,8 @@ > protected Customer customer; > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > protected SalesOrderImpl() >@@ -82,8 +86,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > @Override >@@ -93,8 +97,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > public int getId() >@@ -103,8 +107,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > public void setId(int newId) >@@ -116,8 +120,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > public Customer getCustomer() >@@ -137,8 +141,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > public Customer basicGetCustomer() >@@ -147,8 +151,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > public NotificationChain basicSetCustomer(Customer newCustomer, NotificationChain msgs) >@@ -168,8 +172,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > public void setCustomer(Customer newCustomer) >@@ -193,8 +197,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > @Override >@@ -212,8 +216,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > @Override >@@ -228,8 +232,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > @Override >@@ -248,8 +252,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > @Override >@@ -268,8 +272,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > @Override >@@ -288,8 +292,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > @Override >@@ -306,8 +310,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > @Override >@@ -323,4 +327,4 @@ > return result.toString(); > } > >-} // SalesOrderImpl >+} //SalesOrderImpl >Index: src/org/eclipse/emf/cdo/tests/legacy/model1/impl/OrderAddressImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/OrderAddressImpl.java,v >retrieving revision 1.5 >diff -u -r1.5 OrderAddressImpl.java >--- src/org/eclipse/emf/cdo/tests/legacy/model1/impl/OrderAddressImpl.java 22 Aug 2009 09:35:30 -0000 1.5 >+++ src/org/eclipse/emf/cdo/tests/legacy/model1/impl/OrderAddressImpl.java 14 Nov 2009 18:55:50 -0000 >@@ -8,15 +8,15 @@ > * Contributors: > * Eike Stepper - initial API and implementation > * >- * $Id: OrderAddressImpl.java,v 1.5 2009/08/22 09:35:30 estepper Exp $ >+ * $Id$ > */ > package org.eclipse.emf.cdo.tests.legacy.model1.impl; > > import org.eclipse.emf.cdo.tests.legacy.model1.Model1Package; >-import org.eclipse.emf.cdo.tests.legacy.model1.Order; >-import org.eclipse.emf.cdo.tests.legacy.model1.OrderAddress; >-import org.eclipse.emf.cdo.tests.legacy.model1.OrderDetail; >-import org.eclipse.emf.cdo.tests.legacy.model1.Product1; >+import org.eclipse.emf.cdo.tests.model1.Order; >+import org.eclipse.emf.cdo.tests.model1.OrderAddress; >+import org.eclipse.emf.cdo.tests.model1.OrderDetail; >+import org.eclipse.emf.cdo.tests.model1.Product1; > > import org.eclipse.emf.common.notify.Notification; > import org.eclipse.emf.common.notify.NotificationChain; >@@ -31,33 +31,35 @@ > import java.util.Collection; > > /** >- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Order Address</b></em>'. <!-- end-user-doc --> >+ * <!-- begin-user-doc --> >+ * An implementation of the model object '<em><b>Order Address</b></em>'. >+ * <!-- end-user-doc --> > * <p> > * The following features are implemented: > * <ul> >- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderAddressImpl#getOrderDetails <em>Order Details</em>}</li> >- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderAddressImpl#getOrder <em>Order</em>}</li> >- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderAddressImpl#getProduct <em>Product</em>}</li> >- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderAddressImpl#getPrice <em>Price</em>}</li> >- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderAddressImpl#isTestAttribute <em>Test Attribute</em>}</li> >+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderAddressImpl#getOrderDetails <em>Order Details</em>}</li> >+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderAddressImpl#getOrder <em>Order</em>}</li> >+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderAddressImpl#getProduct <em>Product</em>}</li> >+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderAddressImpl#getPrice <em>Price</em>}</li> >+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderAddressImpl#isTestAttribute <em>Test Attribute</em>}</li> > * </ul> > * </p> >- * >+ * > * @generated > */ > public class OrderAddressImpl extends AddressImpl implements OrderAddress > { > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > public static final String copyright = "Copyright (c) 2004 - 2009 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation"; > > /** >- * The cached value of the '{@link #getOrderDetails() <em>Order Details</em>}' containment reference list. <!-- >- * begin-user-doc --> <!-- end-user-doc --> >- * >+ * The cached value of the '{@link #getOrderDetails() <em>Order Details</em>}' containment reference list. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @see #getOrderDetails() > * @generated > * @ordered >@@ -65,9 +67,9 @@ > protected EList<OrderDetail> orderDetails; > > /** >- * The cached value of the '{@link #getProduct() <em>Product</em>}' reference. <!-- begin-user-doc --> <!-- >- * end-user-doc --> >- * >+ * The cached value of the '{@link #getProduct() <em>Product</em>}' reference. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @see #getProduct() > * @generated > * @ordered >@@ -75,9 +77,9 @@ > protected Product1 product; > > /** >- * The default value of the '{@link #getPrice() <em>Price</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc >- * --> >- * >+ * The default value of the '{@link #getPrice() <em>Price</em>}' attribute. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @see #getPrice() > * @generated > * @ordered >@@ -85,9 +87,9 @@ > protected static final float PRICE_EDEFAULT = 0.0F; > > /** >- * The cached value of the '{@link #getPrice() <em>Price</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc >- * --> >- * >+ * The cached value of the '{@link #getPrice() <em>Price</em>}' attribute. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @see #getPrice() > * @generated > * @ordered >@@ -95,9 +97,9 @@ > protected float price = PRICE_EDEFAULT; > > /** >- * The default value of the '{@link #isTestAttribute() <em>Test Attribute</em>}' attribute. <!-- begin-user-doc --> >+ * The default value of the '{@link #isTestAttribute() <em>Test Attribute</em>}' attribute. >+ * <!-- begin-user-doc --> > * <!-- end-user-doc --> >- * > * @see #isTestAttribute() > * @generated > * @ordered >@@ -105,9 +107,9 @@ > protected static final boolean TEST_ATTRIBUTE_EDEFAULT = false; > > /** >- * The cached value of the '{@link #isTestAttribute() <em>Test Attribute</em>}' attribute. <!-- begin-user-doc --> >+ * The cached value of the '{@link #isTestAttribute() <em>Test Attribute</em>}' attribute. >+ * <!-- begin-user-doc --> > * <!-- end-user-doc --> >- * > * @see #isTestAttribute() > * @generated > * @ordered >@@ -115,8 +117,8 @@ > protected boolean testAttribute = TEST_ATTRIBUTE_EDEFAULT; > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > protected OrderAddressImpl() >@@ -125,8 +127,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > @Override >@@ -136,8 +138,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > public EList<OrderDetail> getOrderDetails() >@@ -151,8 +153,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > public Order getOrder() >@@ -163,8 +165,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > public NotificationChain basicSetOrder(Order newOrder, NotificationChain msgs) >@@ -174,8 +176,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > public void setOrder(Order newOrder) >@@ -199,8 +201,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > public Product1 getProduct() >@@ -220,8 +222,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > public Product1 basicGetProduct() >@@ -230,8 +232,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > public NotificationChain basicSetProduct(Product1 newProduct, NotificationChain msgs) >@@ -251,8 +253,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > public void setProduct(Product1 newProduct) >@@ -276,8 +278,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > public float getPrice() >@@ -286,8 +288,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > public void setPrice(float newPrice) >@@ -299,8 +301,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > public boolean isTestAttribute() >@@ -309,8 +311,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > public void setTestAttribute(boolean newTestAttribute) >@@ -323,8 +325,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > @SuppressWarnings("unchecked") >@@ -349,8 +351,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > @Override >@@ -369,8 +371,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > @Override >@@ -385,8 +387,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > @Override >@@ -411,8 +413,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > @SuppressWarnings("unchecked") >@@ -442,8 +444,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > @Override >@@ -471,8 +473,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > @Override >@@ -495,8 +497,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > @Override >@@ -530,8 +532,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > @Override >@@ -565,8 +567,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > @Override >@@ -584,4 +586,4 @@ > return result.toString(); > } > >-} // OrderAddressImpl >+} //OrderAddressImpl >Index: src/org/eclipse/emf/cdo/tests/legacy/model1/impl/Product1Impl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/Product1Impl.java,v >retrieving revision 1.5 >diff -u -r1.5 Product1Impl.java >--- src/org/eclipse/emf/cdo/tests/legacy/model1/impl/Product1Impl.java 22 Aug 2009 09:35:30 -0000 1.5 >+++ src/org/eclipse/emf/cdo/tests/legacy/model1/impl/Product1Impl.java 14 Nov 2009 18:55:50 -0000 >@@ -8,14 +8,14 @@ > * Contributors: > * Eike Stepper - initial API and implementation > * >- * $Id: Product1Impl.java,v 1.5 2009/08/22 09:35:30 estepper Exp $ >+ * $Id$ > */ > package org.eclipse.emf.cdo.tests.legacy.model1.impl; > > import org.eclipse.emf.cdo.tests.legacy.model1.Model1Package; >-import org.eclipse.emf.cdo.tests.legacy.model1.OrderDetail; >-import org.eclipse.emf.cdo.tests.legacy.model1.Product1; >-import org.eclipse.emf.cdo.tests.legacy.model1.VAT; >+import org.eclipse.emf.cdo.tests.model1.OrderDetail; >+import org.eclipse.emf.cdo.tests.model1.Product1; >+import org.eclipse.emf.cdo.tests.model1.VAT; > > import org.eclipse.emf.common.notify.Notification; > import org.eclipse.emf.common.notify.NotificationChain; >@@ -30,32 +30,34 @@ > import java.util.Collection; > > /** >- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Product1</b></em>'. <!-- end-user-doc --> >+ * <!-- begin-user-doc --> >+ * An implementation of the model object '<em><b>Product1</b></em>'. >+ * <!-- end-user-doc --> > * <p> > * The following features are implemented: > * <ul> >- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.Product1Impl#getName <em>Name</em>}</li> >- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.Product1Impl#getOrderDetails <em>Order Details</em>}</li> >- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.Product1Impl#getVat <em>Vat</em>}</li> >- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.Product1Impl#getDescription <em>Description</em>}</li> >+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.Product1Impl#getName <em>Name</em>}</li> >+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.Product1Impl#getOrderDetails <em>Order Details</em>}</li> >+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.Product1Impl#getVat <em>Vat</em>}</li> >+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.Product1Impl#getDescription <em>Description</em>}</li> > * </ul> > * </p> >- * >+ * > * @generated > */ > public class Product1Impl extends EObjectImpl implements Product1 > { > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > public static final String copyright = "Copyright (c) 2004 - 2009 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 default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc >- * --> >- * >+ * The default value of the '{@link #getName() <em>Name</em>}' attribute. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @see #getName() > * @generated > * @ordered >@@ -63,8 +65,9 @@ > protected static final String NAME_EDEFAULT = null; > > /** >- * The cached value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * The cached value of the '{@link #getName() <em>Name</em>}' attribute. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @see #getName() > * @generated > * @ordered >@@ -72,9 +75,9 @@ > protected String name = NAME_EDEFAULT; > > /** >- * The cached value of the '{@link #getOrderDetails() <em>Order Details</em>}' reference list. <!-- begin-user-doc --> >+ * The cached value of the '{@link #getOrderDetails() <em>Order Details</em>}' reference list. >+ * <!-- begin-user-doc --> > * <!-- end-user-doc --> >- * > * @see #getOrderDetails() > * @generated > * @ordered >@@ -82,8 +85,9 @@ > protected EList<OrderDetail> orderDetails; > > /** >- * The default value of the '{@link #getVat() <em>Vat</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * The default value of the '{@link #getVat() <em>Vat</em>}' attribute. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @see #getVat() > * @generated > * @ordered >@@ -91,8 +95,9 @@ > protected static final VAT VAT_EDEFAULT = VAT.VAT15; > > /** >- * The cached value of the '{@link #getVat() <em>Vat</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * The cached value of the '{@link #getVat() <em>Vat</em>}' attribute. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @see #getVat() > * @generated > * @ordered >@@ -100,9 +105,9 @@ > protected VAT vat = VAT_EDEFAULT; > > /** >- * The default value of the '{@link #getDescription() <em>Description</em>}' attribute. <!-- begin-user-doc --> <!-- >- * end-user-doc --> >- * >+ * The default value of the '{@link #getDescription() <em>Description</em>}' attribute. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @see #getDescription() > * @generated > * @ordered >@@ -110,9 +115,9 @@ > protected static final String DESCRIPTION_EDEFAULT = null; > > /** >- * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute. <!-- begin-user-doc --> <!-- >- * end-user-doc --> >- * >+ * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @see #getDescription() > * @generated > * @ordered >@@ -120,8 +125,8 @@ > protected String description = DESCRIPTION_EDEFAULT; > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > protected Product1Impl() >@@ -130,8 +135,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > @Override >@@ -141,8 +146,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > public String getName() >@@ -151,8 +156,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > public void setName(String newName) >@@ -164,8 +169,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > public EList<OrderDetail> getOrderDetails() >@@ -179,8 +184,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > public VAT getVat() >@@ -189,8 +194,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > public void setVat(VAT newVat) >@@ -202,8 +207,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > public String getDescription() >@@ -212,8 +217,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > public void setDescription(String newDescription) >@@ -226,8 +231,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > @SuppressWarnings("unchecked") >@@ -243,8 +248,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > @Override >@@ -259,8 +264,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > @Override >@@ -281,8 +286,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > @SuppressWarnings("unchecked") >@@ -309,8 +314,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > @Override >@@ -335,8 +340,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > @Override >@@ -357,8 +362,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > @Override >@@ -378,4 +383,4 @@ > return result.toString(); > } > >-} // Product1Impl >+} //Product1Impl >Index: src/org/eclipse/emf/cdo/tests/legacy/model1/impl/AddressImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/AddressImpl.java,v >retrieving revision 1.5 >diff -u -r1.5 AddressImpl.java >--- src/org/eclipse/emf/cdo/tests/legacy/model1/impl/AddressImpl.java 22 Aug 2009 09:35:30 -0000 1.5 >+++ src/org/eclipse/emf/cdo/tests/legacy/model1/impl/AddressImpl.java 14 Nov 2009 18:55:49 -0000 >@@ -8,12 +8,12 @@ > * Contributors: > * Eike Stepper - initial API and implementation > * >- * $Id: AddressImpl.java,v 1.5 2009/08/22 09:35:30 estepper Exp $ >+ * $Id$ > */ > package org.eclipse.emf.cdo.tests.legacy.model1.impl; > >-import org.eclipse.emf.cdo.tests.legacy.model1.Address; > import org.eclipse.emf.cdo.tests.legacy.model1.Model1Package; >+import org.eclipse.emf.cdo.tests.model1.Address; > > import org.eclipse.emf.common.notify.Notification; > import org.eclipse.emf.ecore.EClass; >@@ -141,7 +141,9 @@ > String oldName = name; > name = newName; > if (eNotificationRequired()) >+ { > eNotify(new ENotificationImpl(this, Notification.SET, Model1Package.ADDRESS__NAME, oldName, name)); >+ } > } > > /** >@@ -164,7 +166,9 @@ > String oldStreet = street; > street = newStreet; > if (eNotificationRequired()) >+ { > eNotify(new ENotificationImpl(this, Notification.SET, Model1Package.ADDRESS__STREET, oldStreet, street)); >+ } > } > > /** >@@ -187,7 +191,9 @@ > String oldCity = city; > city = newCity; > if (eNotificationRequired()) >+ { > eNotify(new ENotificationImpl(this, Notification.SET, Model1Package.ADDRESS__CITY, oldCity, city)); >+ } > } > > /** >@@ -285,7 +291,9 @@ > public String toString() > { > if (eIsProxy()) >+ { > return super.toString(); >+ } > > StringBuffer result = new StringBuffer(super.toString()); > result.append(" (name: "); >Index: src/org/eclipse/emf/cdo/tests/legacy/model1/impl/CustomerImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/CustomerImpl.java,v >retrieving revision 1.5 >diff -u -r1.5 CustomerImpl.java >--- src/org/eclipse/emf/cdo/tests/legacy/model1/impl/CustomerImpl.java 22 Aug 2009 09:35:30 -0000 1.5 >+++ src/org/eclipse/emf/cdo/tests/legacy/model1/impl/CustomerImpl.java 14 Nov 2009 18:55:49 -0000 >@@ -8,19 +8,23 @@ > * Contributors: > * Eike Stepper - initial API and implementation > * >- * $Id: CustomerImpl.java,v 1.5 2009/08/22 09:35:30 estepper Exp $ >+ * $Id$ > */ > package org.eclipse.emf.cdo.tests.legacy.model1.impl; > >-import org.eclipse.emf.cdo.tests.legacy.model1.Customer; > import org.eclipse.emf.cdo.tests.legacy.model1.Model1Package; >-import org.eclipse.emf.cdo.tests.legacy.model1.SalesOrder; >+import org.eclipse.emf.cdo.tests.model1.Customer; >+import org.eclipse.emf.cdo.tests.model1.Product1; >+import org.eclipse.emf.cdo.tests.model1.SalesOrder; > > import org.eclipse.emf.common.notify.NotificationChain; > import org.eclipse.emf.common.util.EList; >+import org.eclipse.emf.common.util.EMap; > import org.eclipse.emf.ecore.EClass; >+import org.eclipse.emf.ecore.EStructuralFeature; > import org.eclipse.emf.ecore.InternalEObject; > import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList; >+import org.eclipse.emf.ecore.util.EcoreEMap; > import org.eclipse.emf.ecore.util.InternalEList; > > import java.util.Collection; >@@ -31,6 +35,7 @@ > * The following features are implemented: > * <ul> > * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CustomerImpl#getSalesOrders <em>Sales Orders</em>}</li> >+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CustomerImpl#getOrderByProduct <em>Order By Product</em>}</li> > * </ul> > * </p> > * >@@ -56,6 +61,16 @@ > protected EList<SalesOrder> salesOrders; > > /** >+ * The cached value of the '{@link #getOrderByProduct() <em>Order By Product</em>}' map. <!-- begin-user-doc --> <!-- >+ * end-user-doc --> >+ * >+ * @see #getOrderByProduct() >+ * @generated >+ * @ordered >+ */ >+ protected EMap<Product1, SalesOrder> orderByProduct; >+ >+ /** > * <!-- begin-user-doc --> <!-- end-user-doc --> > * > * @generated >@@ -96,6 +111,21 @@ > * > * @generated > */ >+ public EMap<Product1, SalesOrder> getOrderByProduct() >+ { >+ if (orderByProduct == null) >+ { >+ orderByProduct = new EcoreEMap<Product1, SalesOrder>(Model1Package.Literals.PRODUCT_TO_ORDER, >+ ProductToOrderImpl.class, this, Model1Package.CUSTOMER__ORDER_BY_PRODUCT); >+ } >+ return orderByProduct; >+ } >+ >+ /** >+ * <!-- begin-user-doc --> <!-- end-user-doc --> >+ * >+ * @generated >+ */ > @SuppressWarnings("unchecked") > @Override > public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) >@@ -120,6 +150,8 @@ > { > case Model1Package.CUSTOMER__SALES_ORDERS: > return ((InternalEList<?>)getSalesOrders()).basicRemove(otherEnd, msgs); >+ case Model1Package.CUSTOMER__ORDER_BY_PRODUCT: >+ return ((InternalEList<?>)getOrderByProduct()).basicRemove(otherEnd, msgs); > } > return super.eInverseRemove(otherEnd, featureID, msgs); > } >@@ -136,6 +168,15 @@ > { > case Model1Package.CUSTOMER__SALES_ORDERS: > return getSalesOrders(); >+ case Model1Package.CUSTOMER__ORDER_BY_PRODUCT: >+ if (coreType) >+ { >+ return getOrderByProduct(); >+ } >+ else >+ { >+ return getOrderByProduct().map(); >+ } > } > return super.eGet(featureID, resolve, coreType); > } >@@ -155,6 +196,9 @@ > getSalesOrders().clear(); > getSalesOrders().addAll((Collection<? extends SalesOrder>)newValue); > return; >+ case Model1Package.CUSTOMER__ORDER_BY_PRODUCT: >+ ((EStructuralFeature.Setting)getOrderByProduct()).set(newValue); >+ return; > } > super.eSet(featureID, newValue); > } >@@ -172,6 +216,9 @@ > case Model1Package.CUSTOMER__SALES_ORDERS: > getSalesOrders().clear(); > return; >+ case Model1Package.CUSTOMER__ORDER_BY_PRODUCT: >+ getOrderByProduct().clear(); >+ return; > } > super.eUnset(featureID); > } >@@ -188,6 +235,8 @@ > { > case Model1Package.CUSTOMER__SALES_ORDERS: > return salesOrders != null && !salesOrders.isEmpty(); >+ case Model1Package.CUSTOMER__ORDER_BY_PRODUCT: >+ return orderByProduct != null && !orderByProduct.isEmpty(); > } > return super.eIsSet(featureID); > } >Index: src/org/eclipse/emf/cdo/tests/legacy/model1/impl/Model1PackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/Model1PackageImpl.java,v >retrieving revision 1.5 >diff -u -r1.5 Model1PackageImpl.java >--- src/org/eclipse/emf/cdo/tests/legacy/model1/impl/Model1PackageImpl.java 22 Aug 2009 09:35:30 -0000 1.5 >+++ src/org/eclipse/emf/cdo/tests/legacy/model1/impl/Model1PackageImpl.java 14 Nov 2009 18:55:50 -0000 >@@ -8,23 +8,23 @@ > * Contributors: > * Eike Stepper - initial API and implementation > * >- * $Id: Model1PackageImpl.java,v 1.5 2009/08/22 09:35:30 estepper Exp $ >+ * $Id$ > */ > package org.eclipse.emf.cdo.tests.legacy.model1.impl; > >-import org.eclipse.emf.cdo.tests.legacy.model1.Address; >-import org.eclipse.emf.cdo.tests.legacy.model1.Category; >-import org.eclipse.emf.cdo.tests.legacy.model1.Company; >-import org.eclipse.emf.cdo.tests.legacy.model1.Customer; > import org.eclipse.emf.cdo.tests.legacy.model1.Model1Factory; > import org.eclipse.emf.cdo.tests.legacy.model1.Model1Package; >-import org.eclipse.emf.cdo.tests.legacy.model1.Order; >-import org.eclipse.emf.cdo.tests.legacy.model1.OrderAddress; >-import org.eclipse.emf.cdo.tests.legacy.model1.OrderDetail; >-import org.eclipse.emf.cdo.tests.legacy.model1.Product1; >-import org.eclipse.emf.cdo.tests.legacy.model1.PurchaseOrder; >-import org.eclipse.emf.cdo.tests.legacy.model1.SalesOrder; >-import org.eclipse.emf.cdo.tests.legacy.model1.Supplier; >+import org.eclipse.emf.cdo.tests.model1.Address; >+import org.eclipse.emf.cdo.tests.model1.Category; >+import org.eclipse.emf.cdo.tests.model1.Company; >+import org.eclipse.emf.cdo.tests.model1.Customer; >+import org.eclipse.emf.cdo.tests.model1.Order; >+import org.eclipse.emf.cdo.tests.model1.OrderAddress; >+import org.eclipse.emf.cdo.tests.model1.OrderDetail; >+import org.eclipse.emf.cdo.tests.model1.Product1; >+import org.eclipse.emf.cdo.tests.model1.PurchaseOrder; >+import org.eclipse.emf.cdo.tests.model1.SalesOrder; >+import org.eclipse.emf.cdo.tests.model1.Supplier; > > import org.eclipse.emf.ecore.EAttribute; > import org.eclipse.emf.ecore.EClass; >@@ -33,6 +33,8 @@ > import org.eclipse.emf.ecore.EReference; > import org.eclipse.emf.ecore.impl.EPackageImpl; > >+import java.util.Map; >+ > /** > * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc --> > * >@@ -129,6 +131,13 @@ > * > * @generated > */ >+ private EClass productToOrderEClass = null; >+ >+ /** >+ * <!-- begin-user-doc --> <!-- end-user-doc --> >+ * >+ * @generated >+ */ > private EEnum vatEEnum = null; > > /** >@@ -171,7 +180,9 @@ > public static Model1Package init() > { > if (isInited) >+ { > return (Model1Package)EPackage.Registry.INSTANCE.getEPackage(Model1Package.eNS_URI); >+ } > > // Obtain or create and register package > Model1PackageImpl theModel1Package = (Model1PackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Model1PackageImpl ? EPackage.Registry.INSTANCE >@@ -349,6 +360,16 @@ > * > * @generated > */ >+ public EReference getCustomer_OrderByProduct() >+ { >+ return (EReference)customerEClass.getEStructuralFeatures().get(1); >+ } >+ >+ /** >+ * <!-- begin-user-doc --> <!-- end-user-doc --> >+ * >+ * @generated >+ */ > public EClass getOrder() > { > return orderEClass; >@@ -579,6 +600,36 @@ > * > * @generated > */ >+ public EClass getProductToOrder() >+ { >+ return productToOrderEClass; >+ } >+ >+ /** >+ * <!-- begin-user-doc --> <!-- end-user-doc --> >+ * >+ * @generated >+ */ >+ public EReference getProductToOrder_Key() >+ { >+ return (EReference)productToOrderEClass.getEStructuralFeatures().get(0); >+ } >+ >+ /** >+ * <!-- begin-user-doc --> <!-- end-user-doc --> >+ * >+ * @generated >+ */ >+ public EReference getProductToOrder_Value() >+ { >+ return (EReference)productToOrderEClass.getEStructuralFeatures().get(1); >+ } >+ >+ /** >+ * <!-- begin-user-doc --> <!-- end-user-doc --> >+ * >+ * @generated >+ */ > public EEnum getVAT() > { > return vatEEnum; >@@ -610,7 +661,9 @@ > public void createPackageContents() > { > if (isCreated) >+ { > return; >+ } > isCreated = true; > > // Create classes and their features >@@ -632,6 +685,7 @@ > > customerEClass = createEClass(CUSTOMER); > createEReference(customerEClass, CUSTOMER__SALES_ORDERS); >+ createEReference(customerEClass, CUSTOMER__ORDER_BY_PRODUCT); > > orderEClass = createEClass(ORDER); > createEReference(orderEClass, ORDER__ORDER_DETAILS); >@@ -663,6 +717,10 @@ > orderAddressEClass = createEClass(ORDER_ADDRESS); > createEAttribute(orderAddressEClass, ORDER_ADDRESS__TEST_ATTRIBUTE); > >+ productToOrderEClass = createEClass(PRODUCT_TO_ORDER); >+ createEReference(productToOrderEClass, PRODUCT_TO_ORDER__KEY); >+ createEReference(productToOrderEClass, PRODUCT_TO_ORDER__VALUE); >+ > // Create enums > vatEEnum = createEEnum(VAT); > } >@@ -683,7 +741,9 @@ > public void initializePackageContents() > { > if (isInitialized) >+ { > return; >+ } > isInitialized = true; > > // Initialize package >@@ -696,14 +756,14 @@ > // Set bounds for type parameters > > // Add supertypes to classes >- 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()); >+ 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()); > > // Initialize classes and features; add operations and parameters > initEClass(addressEClass, Address.class, "Address", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); >@@ -715,46 +775,49 @@ > !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(), 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(), this.getSupplier(), null, "suppliers", null, 0, -1, Company.class, >+ initEReference(getCompany_Categories(), 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_Customers(), this.getCustomer(), null, "customers", null, 0, -1, Company.class, >+ 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, > !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, >+ initEReference(getCompany_SalesOrders(), 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(), 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); >+ 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); > 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(), 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_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, >+ 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(), 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); >+ 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); > > initEClass(orderDetailEClass, OrderDetail.class, "OrderDetail", !IS_ABSTRACT, !IS_INTERFACE, > IS_GENERATED_INSTANCE_CLASS); >- 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, >+ 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, > !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); >@@ -763,35 +826,35 @@ > 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(), this.getSupplier(), this.getSupplier_PurchaseOrders(), "supplier", >- null, 1, 1, PurchaseOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, >+ initEReference(getPurchaseOrder_Supplier(), getSupplier(), 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(), this.getCustomer(), this.getCustomer_SalesOrders(), "customer", null, 1, >- 1, SalesOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, >+ initEReference(getSalesOrder_Customer(), getCustomer(), 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(), 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, >+ initEReference(getCategory_Categories(), 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(), 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(), 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, >+ 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, > 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); >@@ -802,11 +865,20 @@ > OrderAddress.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, > IS_ORDERED); > >+ 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, >+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, >+ !IS_DERIVED, IS_ORDERED); >+ > // Initialize enums and add enum literals >- initEEnum(vatEEnum, org.eclipse.emf.cdo.tests.legacy.model1.VAT.class, "VAT"); >- addEEnumLiteral(vatEEnum, org.eclipse.emf.cdo.tests.legacy.model1.VAT.VAT0); >- addEEnumLiteral(vatEEnum, org.eclipse.emf.cdo.tests.legacy.model1.VAT.VAT7); >- addEEnumLiteral(vatEEnum, org.eclipse.emf.cdo.tests.legacy.model1.VAT.VAT15); >+ initEEnum(vatEEnum, org.eclipse.emf.cdo.tests.model1.VAT.class, "VAT"); >+ addEEnumLiteral(vatEEnum, org.eclipse.emf.cdo.tests.model1.VAT.VAT0); >+ addEEnumLiteral(vatEEnum, org.eclipse.emf.cdo.tests.model1.VAT.VAT7); >+ addEEnumLiteral(vatEEnum, org.eclipse.emf.cdo.tests.model1.VAT.VAT15); > > // Create resource > createResource(eNS_URI); >Index: src/org/eclipse/emf/cdo/tests/legacy/model1/impl/Model1FactoryImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/Model1FactoryImpl.java,v >retrieving revision 1.5 >diff -u -r1.5 Model1FactoryImpl.java >--- src/org/eclipse/emf/cdo/tests/legacy/model1/impl/Model1FactoryImpl.java 22 Aug 2009 09:35:30 -0000 1.5 >+++ src/org/eclipse/emf/cdo/tests/legacy/model1/impl/Model1FactoryImpl.java 14 Nov 2009 18:55:50 -0000 >@@ -8,24 +8,24 @@ > * Contributors: > * Eike Stepper - initial API and implementation > * >- * $Id: Model1FactoryImpl.java,v 1.5 2009/08/22 09:35:30 estepper Exp $ >+ * $Id$ > */ > package org.eclipse.emf.cdo.tests.legacy.model1.impl; > >-import org.eclipse.emf.cdo.tests.legacy.model1.Address; >-import org.eclipse.emf.cdo.tests.legacy.model1.Category; >-import org.eclipse.emf.cdo.tests.legacy.model1.Company; >-import org.eclipse.emf.cdo.tests.legacy.model1.Customer; > import org.eclipse.emf.cdo.tests.legacy.model1.Model1Factory; > import org.eclipse.emf.cdo.tests.legacy.model1.Model1Package; >-import org.eclipse.emf.cdo.tests.legacy.model1.Order; >-import org.eclipse.emf.cdo.tests.legacy.model1.OrderAddress; >-import org.eclipse.emf.cdo.tests.legacy.model1.OrderDetail; >-import org.eclipse.emf.cdo.tests.legacy.model1.Product1; >-import org.eclipse.emf.cdo.tests.legacy.model1.PurchaseOrder; >-import org.eclipse.emf.cdo.tests.legacy.model1.SalesOrder; >-import org.eclipse.emf.cdo.tests.legacy.model1.Supplier; >-import org.eclipse.emf.cdo.tests.legacy.model1.VAT; >+import org.eclipse.emf.cdo.tests.model1.Address; >+import org.eclipse.emf.cdo.tests.model1.Category; >+import org.eclipse.emf.cdo.tests.model1.Company; >+import org.eclipse.emf.cdo.tests.model1.Customer; >+import org.eclipse.emf.cdo.tests.model1.Order; >+import org.eclipse.emf.cdo.tests.model1.OrderAddress; >+import org.eclipse.emf.cdo.tests.model1.OrderDetail; >+import org.eclipse.emf.cdo.tests.model1.Product1; >+import org.eclipse.emf.cdo.tests.model1.PurchaseOrder; >+import org.eclipse.emf.cdo.tests.model1.SalesOrder; >+import org.eclipse.emf.cdo.tests.model1.Supplier; >+import org.eclipse.emf.cdo.tests.model1.VAT; > > import org.eclipse.emf.ecore.EClass; > import org.eclipse.emf.ecore.EDataType; >@@ -34,6 +34,8 @@ > import org.eclipse.emf.ecore.impl.EFactoryImpl; > import org.eclipse.emf.ecore.plugin.EcorePlugin; > >+import java.util.Map; >+ > /** > * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc --> > * >@@ -113,6 +115,8 @@ > return createProduct1(); > case Model1Package.ORDER_ADDRESS: > return createOrderAddress(); >+ case Model1Package.PRODUCT_TO_ORDER: >+ return (EObject)createProductToOrder(); > default: > throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); > } >@@ -278,12 +282,25 @@ > * > * @generated > */ >+ public Map.Entry<Product1, SalesOrder> createProductToOrder() >+ { >+ ProductToOrderImpl productToOrder = new ProductToOrderImpl(); >+ return productToOrder; >+ } >+ >+ /** >+ * <!-- begin-user-doc --> <!-- end-user-doc --> >+ * >+ * @generated >+ */ > public VAT createVATFromString(EDataType eDataType, String initialValue) > { > VAT result = VAT.get(initialValue); > if (result == null) >+ { > throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" > + eDataType.getName() + "'"); >+ } > return result; > } > >Index: src/org/eclipse/emf/cdo/tests/legacy/model1/impl/CategoryImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/CategoryImpl.java,v >retrieving revision 1.5 >diff -u -r1.5 CategoryImpl.java >--- src/org/eclipse/emf/cdo/tests/legacy/model1/impl/CategoryImpl.java 22 Aug 2009 09:35:30 -0000 1.5 >+++ src/org/eclipse/emf/cdo/tests/legacy/model1/impl/CategoryImpl.java 14 Nov 2009 18:55:49 -0000 >@@ -8,13 +8,13 @@ > * Contributors: > * Eike Stepper - initial API and implementation > * >- * $Id: CategoryImpl.java,v 1.5 2009/08/22 09:35:30 estepper Exp $ >+ * $Id$ > */ > package org.eclipse.emf.cdo.tests.legacy.model1.impl; > >-import org.eclipse.emf.cdo.tests.legacy.model1.Category; > import org.eclipse.emf.cdo.tests.legacy.model1.Model1Package; >-import org.eclipse.emf.cdo.tests.legacy.model1.Product1; >+import org.eclipse.emf.cdo.tests.model1.Category; >+import org.eclipse.emf.cdo.tests.model1.Product1; > > import org.eclipse.emf.common.notify.Notification; > import org.eclipse.emf.common.notify.NotificationChain; >@@ -29,31 +29,33 @@ > import java.util.Collection; > > /** >- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Category</b></em>'. <!-- end-user-doc --> >+ * <!-- begin-user-doc --> >+ * An implementation of the model object '<em><b>Category</b></em>'. >+ * <!-- end-user-doc --> > * <p> > * The following features are implemented: > * <ul> >- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CategoryImpl#getName <em>Name</em>}</li> >- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CategoryImpl#getCategories <em>Categories</em>}</li> >- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CategoryImpl#getProducts <em>Products</em>}</li> >+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CategoryImpl#getName <em>Name</em>}</li> >+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CategoryImpl#getCategories <em>Categories</em>}</li> >+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CategoryImpl#getProducts <em>Products</em>}</li> > * </ul> > * </p> >- * >+ * > * @generated > */ > public class CategoryImpl extends EObjectImpl implements Category > { > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > public static final String copyright = "Copyright (c) 2004 - 2009 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 default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc >- * --> >- * >+ * The default value of the '{@link #getName() <em>Name</em>}' attribute. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @see #getName() > * @generated > * @ordered >@@ -61,8 +63,9 @@ > protected static final String NAME_EDEFAULT = null; > > /** >- * The cached value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * The cached value of the '{@link #getName() <em>Name</em>}' attribute. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @see #getName() > * @generated > * @ordered >@@ -70,9 +73,9 @@ > protected String name = NAME_EDEFAULT; > > /** >- * The cached value of the '{@link #getCategories() <em>Categories</em>}' containment reference list. <!-- >- * begin-user-doc --> <!-- end-user-doc --> >- * >+ * The cached value of the '{@link #getCategories() <em>Categories</em>}' containment reference list. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @see #getCategories() > * @generated > * @ordered >@@ -80,9 +83,9 @@ > protected EList<Category> categories; > > /** >- * The cached value of the '{@link #getProducts() <em>Products</em>}' containment reference list. <!-- begin-user-doc >- * --> <!-- end-user-doc --> >- * >+ * The cached value of the '{@link #getProducts() <em>Products</em>}' containment reference list. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @see #getProducts() > * @generated > * @ordered >@@ -90,8 +93,8 @@ > protected EList<Product1> products; > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > protected CategoryImpl() >@@ -100,8 +103,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > @Override >@@ -111,8 +114,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > public String getName() >@@ -121,8 +124,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > public void setName(String newName) >@@ -134,8 +137,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > public EList<Category> getCategories() >@@ -148,8 +151,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > public EList<Product1> getProducts() >@@ -162,8 +165,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > @Override >@@ -180,8 +183,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > @Override >@@ -200,8 +203,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > @SuppressWarnings("unchecked") >@@ -226,8 +229,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > @Override >@@ -249,8 +252,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > @Override >@@ -269,8 +272,8 @@ > } > > /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> > * @generated > */ > @Override >@@ -286,4 +289,4 @@ > return result.toString(); > } > >-} // CategoryImpl >+} //CategoryImpl >Index: src/org/eclipse/emf/cdo/tests/legacy/model1/impl/PurchaseOrderImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/PurchaseOrderImpl.java,v >retrieving revision 1.5 >diff -u -r1.5 PurchaseOrderImpl.java >--- src/org/eclipse/emf/cdo/tests/legacy/model1/impl/PurchaseOrderImpl.java 22 Aug 2009 09:35:30 -0000 1.5 >+++ src/org/eclipse/emf/cdo/tests/legacy/model1/impl/PurchaseOrderImpl.java 14 Nov 2009 18:55:50 -0000 >@@ -1,20 +1,8 @@ >-/** >- * Copyright (c) 2004 - 2009 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 >- * >- * $Id: PurchaseOrderImpl.java,v 1.5 2009/08/22 09:35:30 estepper Exp $ >- */ > package org.eclipse.emf.cdo.tests.legacy.model1.impl; > > import org.eclipse.emf.cdo.tests.legacy.model1.Model1Package; >-import org.eclipse.emf.cdo.tests.legacy.model1.PurchaseOrder; >-import org.eclipse.emf.cdo.tests.legacy.model1.Supplier; >+import org.eclipse.emf.cdo.tests.model1.PurchaseOrder; >+import org.eclipse.emf.cdo.tests.model1.Supplier; > > import org.eclipse.emf.common.notify.Notification; > import org.eclipse.emf.common.notify.NotificationChain; >@@ -25,7 +13,16 @@ > import java.util.Date; > > /** >- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Purchase Order</b></em>'. <!-- end-user-doc --> >+ * Copyright (c) 2004 - 2009 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 $Id: PurchaseOrderImpl.java,v 1.5 2009/08/22 09:35:30 estepper Exp >+ * $.emf.cdo.tests.legacy.model1.impl; import org.eclipse.emf.cdimport org.eclipse.emf.cdo.tests.model1.PurchaseOrder; >+ * import org.eclipse.emf.cdo.tests.model1.Supplier; cdsts.model1.Supplier; import >+ * org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.noty.NotificationChain; import >+ * org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ece.InternalEObject; import org.eclipse.emf.ecore.impl. import >+ * java.util.Date; ENotificationImpl; import java.util.Date; /** <!-- begin-user-doc --> An implementation of the model >+ * object '<em><b>Purchase Order</b></em>'. <!-- end-user-doc --> > * <p> > * The following features are implemented: > * <ul> >@@ -115,7 +112,9 @@ > Date oldDate = date; > date = newDate; > if (eNotificationRequired()) >+ { > eNotify(new ENotificationImpl(this, Notification.SET, Model1Package.PURCHASE_ORDER__DATE, oldDate, date)); >+ } > } > > /** >@@ -132,8 +131,10 @@ > if (supplier != oldSupplier) > { > if (eNotificationRequired()) >+ { > eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model1Package.PURCHASE_ORDER__SUPPLIER, > oldSupplier, supplier)); >+ } > } > } > return supplier; >@@ -163,9 +164,13 @@ > ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, > Model1Package.PURCHASE_ORDER__SUPPLIER, oldSupplier, newSupplier); > if (msgs == null) >+ { > msgs = notification; >+ } > else >+ { > msgs.add(notification); >+ } > } > return msgs; > } >@@ -181,18 +186,26 @@ > { > NotificationChain msgs = null; > if (supplier != null) >+ { > msgs = ((InternalEObject)supplier).eInverseRemove(this, Model1Package.SUPPLIER__PURCHASE_ORDERS, > Supplier.class, msgs); >+ } > if (newSupplier != null) >+ { > msgs = ((InternalEObject)newSupplier).eInverseAdd(this, Model1Package.SUPPLIER__PURCHASE_ORDERS, > Supplier.class, msgs); >+ } > msgs = basicSetSupplier(newSupplier, msgs); > if (msgs != null) >+ { > msgs.dispatch(); >+ } > } > else if (eNotificationRequired()) >+ { > eNotify(new ENotificationImpl(this, Notification.SET, Model1Package.PURCHASE_ORDER__SUPPLIER, newSupplier, > newSupplier)); >+ } > } > > /** >@@ -207,8 +220,10 @@ > { > case Model1Package.PURCHASE_ORDER__SUPPLIER: > if (supplier != null) >+ { > msgs = ((InternalEObject)supplier).eInverseRemove(this, Model1Package.SUPPLIER__PURCHASE_ORDERS, > Supplier.class, msgs); >+ } > return basicSetSupplier((Supplier)otherEnd, msgs); > } > return super.eInverseAdd(otherEnd, featureID, msgs); >@@ -244,7 +259,9 @@ > return getDate(); > case Model1Package.PURCHASE_ORDER__SUPPLIER: > if (resolve) >+ { > return getSupplier(); >+ } > return basicGetSupplier(); > } > return super.eGet(featureID, resolve, coreType); >@@ -317,7 +334,9 @@ > public String toString() > { > if (eIsProxy()) >+ { > return super.toString(); >+ } > > StringBuffer result = new StringBuffer(super.toString()); > result.append(" (date: "); >Index: src/org/eclipse/emf/cdo/tests/legacy/model1/Address.java >=================================================================== >RCS file: src/org/eclipse/emf/cdo/tests/legacy/model1/Address.java >diff -N src/org/eclipse/emf/cdo/tests/legacy/model1/Address.java >--- src/org/eclipse/emf/cdo/tests/legacy/model1/Address.java 22 Aug 2009 09:35:29 -0000 1.2 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,119 +0,0 @@ >-/** >- * Copyright (c) 2004 - 2009 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 >- * >- * $Id: Address.java,v 1.2 2009/08/22 09:35:29 estepper Exp $ >- */ >-package org.eclipse.emf.cdo.tests.legacy.model1; >- >-import org.eclipse.emf.ecore.EObject; >- >-/** >- * <!-- begin-user-doc --> A representation of the model object '<em><b>Address</b></em>'. <!-- end-user-doc --> >- * <p> >- * The following features are supported: >- * <ul> >- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.Address#getName <em>Name</em>}</li> >- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.Address#getStreet <em>Street</em>}</li> >- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.Address#getCity <em>City</em>}</li> >- * </ul> >- * </p> >- * >- * @see org.eclipse.emf.cdo.tests.legacy.model1.Model1Package#getAddress() >- * @model >- * @generated >- */ >-public interface Address extends EObject >-{ >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- String copyright = "Copyright (c) 2004 - 2009 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> >- * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here... >- * </p> >- * <!-- end-user-doc --> >- * >- * @return the value of the '<em>Name</em>' attribute. >- * @see #setName(String) >- * @see org.eclipse.emf.cdo.tests.legacy.model1.Model1Package#getAddress_Name() >- * @model >- * @generated >- */ >- String getName(); >- >- /** >- * Sets the value of the '{@link org.eclipse.emf.cdo.tests.legacy.model1.Address#getName <em>Name</em>}' attribute. >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @param value >- * the new value of the '<em>Name</em>' attribute. >- * @see #getName() >- * @generated >- */ >- void setName(String value); >- >- /** >- * Returns the value of the '<em><b>Street</b></em>' attribute. <!-- begin-user-doc --> >- * <p> >- * If the meaning of the '<em>Street</em>' attribute isn't clear, there really should be more of a description here... >- * </p> >- * <!-- end-user-doc --> >- * >- * @return the value of the '<em>Street</em>' attribute. >- * @see #setStreet(String) >- * @see org.eclipse.emf.cdo.tests.legacy.model1.Model1Package#getAddress_Street() >- * @model >- * @generated >- */ >- String getStreet(); >- >- /** >- * Sets the value of the '{@link org.eclipse.emf.cdo.tests.legacy.model1.Address#getStreet <em>Street</em>}' >- * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @param value >- * the new value of the '<em>Street</em>' attribute. >- * @see #getStreet() >- * @generated >- */ >- void setStreet(String value); >- >- /** >- * Returns the value of the '<em><b>City</b></em>' attribute. <!-- begin-user-doc --> >- * <p> >- * If the meaning of the '<em>City</em>' attribute isn't clear, there really should be more of a description here... >- * </p> >- * <!-- end-user-doc --> >- * >- * @return the value of the '<em>City</em>' attribute. >- * @see #setCity(String) >- * @see org.eclipse.emf.cdo.tests.legacy.model1.Model1Package#getAddress_City() >- * @model >- * @generated >- */ >- String getCity(); >- >- /** >- * Sets the value of the '{@link org.eclipse.emf.cdo.tests.legacy.model1.Address#getCity <em>City</em>}' attribute. >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @param value >- * the new value of the '<em>City</em>' attribute. >- * @see #getCity() >- * @generated >- */ >- void setCity(String value); >- >-} // Address >Index: src/org/eclipse/emf/cdo/tests/legacy/model1/Customer.java >=================================================================== >RCS file: src/org/eclipse/emf/cdo/tests/legacy/model1/Customer.java >diff -N src/org/eclipse/emf/cdo/tests/legacy/model1/Customer.java >--- src/org/eclipse/emf/cdo/tests/legacy/model1/Customer.java 22 Aug 2009 09:35:29 -0000 1.2 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,57 +0,0 @@ >-/** >- * Copyright (c) 2004 - 2009 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 >- * >- * $Id: Customer.java,v 1.2 2009/08/22 09:35:29 estepper Exp $ >- */ >-package org.eclipse.emf.cdo.tests.legacy.model1; >- >-import org.eclipse.emf.common.util.EList; >- >-/** >- * <!-- begin-user-doc --> A representation of the model object '<em><b>Customer</b></em>'. <!-- end-user-doc --> >- * <p> >- * The following features are supported: >- * <ul> >- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.Customer#getSalesOrders <em>Sales Orders</em>}</li> >- * </ul> >- * </p> >- * >- * @see org.eclipse.emf.cdo.tests.legacy.model1.Model1Package#getCustomer() >- * @model >- * @generated >- */ >-public interface Customer extends Address >-{ >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- String copyright = "Copyright (c) 2004 - 2009 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.legacy.model1.SalesOrder}. It is bidirectional and its opposite is ' >- * {@link org.eclipse.emf.cdo.tests.legacy.model1.SalesOrder#getCustomer <em>Customer</em>}'. <!-- begin-user-doc --> >- * <p> >- * If the meaning of the '<em>Sales Orders</em>' reference list isn't clear, there really should be more of a >- * description here... >- * </p> >- * <!-- end-user-doc --> >- * >- * @return the value of the '<em>Sales Orders</em>' reference list. >- * @see org.eclipse.emf.cdo.tests.legacy.model1.Model1Package#getCustomer_SalesOrders() >- * @see org.eclipse.emf.cdo.tests.legacy.model1.SalesOrder#getCustomer >- * @model opposite="customer" >- * @generated >- */ >- EList<SalesOrder> getSalesOrders(); >- >-} // Customer >Index: src/org/eclipse/emf/cdo/tests/legacy/model1/PurchaseOrder.java >=================================================================== >RCS file: src/org/eclipse/emf/cdo/tests/legacy/model1/PurchaseOrder.java >diff -N src/org/eclipse/emf/cdo/tests/legacy/model1/PurchaseOrder.java >--- src/org/eclipse/emf/cdo/tests/legacy/model1/PurchaseOrder.java 22 Aug 2009 09:35:29 -0000 1.2 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,96 +0,0 @@ >-/** >- * Copyright (c) 2004 - 2009 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 >- * >- * $Id: PurchaseOrder.java,v 1.2 2009/08/22 09:35:29 estepper Exp $ >- */ >-package org.eclipse.emf.cdo.tests.legacy.model1; >- >-import java.util.Date; >- >-/** >- * <!-- begin-user-doc --> A representation of the model object '<em><b>Purchase Order</b></em>'. <!-- end-user-doc --> >- * <p> >- * The following features are supported: >- * <ul> >- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.PurchaseOrder#getDate <em>Date</em>}</li> >- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.PurchaseOrder#getSupplier <em>Supplier</em>}</li> >- * </ul> >- * </p> >- * >- * @see org.eclipse.emf.cdo.tests.legacy.model1.Model1Package#getPurchaseOrder() >- * @model >- * @generated >- */ >-public interface PurchaseOrder extends Order >-{ >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- String copyright = "Copyright (c) 2004 - 2009 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> >- * If the meaning of the '<em>Date</em>' attribute isn't clear, there really should be more of a description here... >- * </p> >- * <!-- end-user-doc --> >- * >- * @return the value of the '<em>Date</em>' attribute. >- * @see #setDate(Date) >- * @see org.eclipse.emf.cdo.tests.legacy.model1.Model1Package#getPurchaseOrder_Date() >- * @model >- * @generated >- */ >- Date getDate(); >- >- /** >- * Sets the value of the '{@link org.eclipse.emf.cdo.tests.legacy.model1.PurchaseOrder#getDate <em>Date</em>}' >- * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @param value >- * the new value of the '<em>Date</em>' attribute. >- * @see #getDate() >- * @generated >- */ >- void setDate(Date value); >- >- /** >- * Returns the value of the '<em><b>Supplier</b></em>' reference. It is bidirectional and its opposite is ' >- * {@link org.eclipse.emf.cdo.tests.legacy.model1.Supplier#getPurchaseOrders <em>Purchase Orders</em>}'. <!-- >- * begin-user-doc --> >- * <p> >- * If the meaning of the '<em>Supplier</em>' reference isn't clear, there really should be more of a description >- * here... >- * </p> >- * <!-- end-user-doc --> >- * >- * @return the value of the '<em>Supplier</em>' reference. >- * @see #setSupplier(Supplier) >- * @see org.eclipse.emf.cdo.tests.legacy.model1.Model1Package#getPurchaseOrder_Supplier() >- * @see org.eclipse.emf.cdo.tests.legacy.model1.Supplier#getPurchaseOrders >- * @model opposite="purchaseOrders" required="true" >- * @generated >- */ >- Supplier getSupplier(); >- >- /** >- * Sets the value of the '{@link org.eclipse.emf.cdo.tests.legacy.model1.PurchaseOrder#getSupplier <em>Supplier</em>}' >- * reference. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @param value >- * the new value of the '<em>Supplier</em>' reference. >- * @see #getSupplier() >- * @generated >- */ >- void setSupplier(Supplier value); >- >-} // PurchaseOrder >Index: src/org/eclipse/emf/cdo/tests/legacy/model1/Company.java >=================================================================== >RCS file: src/org/eclipse/emf/cdo/tests/legacy/model1/Company.java >diff -N src/org/eclipse/emf/cdo/tests/legacy/model1/Company.java >--- src/org/eclipse/emf/cdo/tests/legacy/model1/Company.java 22 Aug 2009 09:35:29 -0000 1.2 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,123 +0,0 @@ >-/** >- * Copyright (c) 2004 - 2009 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 >- * >- * $Id: Company.java,v 1.2 2009/08/22 09:35:29 estepper Exp $ >- */ >-package org.eclipse.emf.cdo.tests.legacy.model1; >- >-import org.eclipse.emf.common.util.EList; >- >-/** >- * <!-- begin-user-doc --> A representation of the model object '<em><b>Company</b></em>'. <!-- end-user-doc --> >- * <p> >- * The following features are supported: >- * <ul> >- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.Company#getCategories <em>Categories</em>}</li> >- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.Company#getSuppliers <em>Suppliers</em>}</li> >- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.Company#getCustomers <em>Customers</em>}</li> >- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.Company#getPurchaseOrders <em>Purchase Orders</em>}</li> >- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.Company#getSalesOrders <em>Sales Orders</em>}</li> >- * </ul> >- * </p> >- * >- * @see org.eclipse.emf.cdo.tests.legacy.model1.Model1Package#getCompany() >- * @model >- * @generated >- */ >-public interface Company extends Address >-{ >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- String copyright = "Copyright (c) 2004 - 2009 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.legacy.model1.Category}. <!-- begin-user-doc --> >- * <p> >- * If the meaning of the '<em>Categories</em>' containment reference list isn't clear, there really should be more of >- * a description here... >- * </p> >- * <!-- end-user-doc --> >- * >- * @return the value of the '<em>Categories</em>' containment reference list. >- * @see org.eclipse.emf.cdo.tests.legacy.model1.Model1Package#getCompany_Categories() >- * @model containment="true" >- * @generated >- */ >- EList<Category> getCategories(); >- >- /** >- * Returns the value of the '<em><b>Suppliers</b></em>' containment reference list. The list contents are of type >- * {@link org.eclipse.emf.cdo.tests.legacy.model1.Supplier}. <!-- begin-user-doc --> >- * <p> >- * If the meaning of the '<em>Suppliers</em>' containment reference list isn't clear, there really should be more of a >- * description here... >- * </p> >- * <!-- end-user-doc --> >- * >- * @return the value of the '<em>Suppliers</em>' containment reference list. >- * @see org.eclipse.emf.cdo.tests.legacy.model1.Model1Package#getCompany_Suppliers() >- * @model containment="true" >- * @generated >- */ >- EList<Supplier> getSuppliers(); >- >- /** >- * Returns the value of the '<em><b>Customers</b></em>' containment reference list. The list contents are of type >- * {@link org.eclipse.emf.cdo.tests.legacy.model1.Customer}. <!-- begin-user-doc --> >- * <p> >- * If the meaning of the '<em>Customers</em>' containment reference list isn't clear, there really should be more of a >- * description here... >- * </p> >- * <!-- end-user-doc --> >- * >- * @return the value of the '<em>Customers</em>' containment reference list. >- * @see org.eclipse.emf.cdo.tests.legacy.model1.Model1Package#getCompany_Customers() >- * @model containment="true" >- * @generated >- */ >- EList<Customer> getCustomers(); >- >- /** >- * Returns the value of the '<em><b>Purchase Orders</b></em>' containment reference list. The list contents are of >- * type {@link org.eclipse.emf.cdo.tests.legacy.model1.PurchaseOrder}. <!-- begin-user-doc --> >- * <p> >- * If the meaning of the '<em>Purchase Orders</em>' containment reference list isn't clear, there really should be >- * more of a description here... >- * </p> >- * <!-- end-user-doc --> >- * >- * @return the value of the '<em>Purchase Orders</em>' containment reference list. >- * @see org.eclipse.emf.cdo.tests.legacy.model1.Model1Package#getCompany_PurchaseOrders() >- * @model containment="true" >- * @generated >- */ >- EList<PurchaseOrder> getPurchaseOrders(); >- >- /** >- * Returns the value of the '<em><b>Sales Orders</b></em>' containment reference list. The list contents are of type >- * {@link org.eclipse.emf.cdo.tests.legacy.model1.SalesOrder}. <!-- begin-user-doc --> >- * <p> >- * If the meaning of the '<em>Sales Orders</em>' containment reference list isn't clear, there really should be more >- * of a description here... >- * </p> >- * <!-- end-user-doc --> >- * >- * @return the value of the '<em>Sales Orders</em>' containment reference list. >- * @see org.eclipse.emf.cdo.tests.legacy.model1.Model1Package#getCompany_SalesOrders() >- * @model containment="true" >- * @generated >- */ >- EList<SalesOrder> getSalesOrders(); >- >-} // Company >Index: src/org/eclipse/emf/cdo/tests/legacy/model1/OrderDetail.java >=================================================================== >RCS file: src/org/eclipse/emf/cdo/tests/legacy/model1/OrderDetail.java >diff -N src/org/eclipse/emf/cdo/tests/legacy/model1/OrderDetail.java >--- src/org/eclipse/emf/cdo/tests/legacy/model1/OrderDetail.java 22 Aug 2009 09:35:29 -0000 1.2 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,127 +0,0 @@ >-/** >- * Copyright (c) 2004 - 2009 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 >- * >- * $Id: OrderDetail.java,v 1.2 2009/08/22 09:35:29 estepper Exp $ >- */ >-package org.eclipse.emf.cdo.tests.legacy.model1; >- >-import org.eclipse.emf.ecore.EObject; >- >-/** >- * <!-- begin-user-doc --> A representation of the model object '<em><b>Order Detail</b></em>'. <!-- end-user-doc --> >- * <p> >- * The following features are supported: >- * <ul> >- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.OrderDetail#getOrder <em>Order</em>}</li> >- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.OrderDetail#getProduct <em>Product</em>}</li> >- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.OrderDetail#getPrice <em>Price</em>}</li> >- * </ul> >- * </p> >- * >- * @see org.eclipse.emf.cdo.tests.legacy.model1.Model1Package#getOrderDetail() >- * @model >- * @generated >- */ >-public interface OrderDetail extends EObject >-{ >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- String copyright = "Copyright (c) 2004 - 2009 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.legacy.model1.Order#getOrderDetails <em>Order Details</em>}'. <!-- begin-user-doc >- * --> >- * <p> >- * If the meaning of the '<em>Order</em>' container reference isn't clear, there really should be more of a >- * description here... >- * </p> >- * <!-- end-user-doc --> >- * >- * @return the value of the '<em>Order</em>' container reference. >- * @see #setOrder(Order) >- * @see org.eclipse.emf.cdo.tests.legacy.model1.Model1Package#getOrderDetail_Order() >- * @see org.eclipse.emf.cdo.tests.legacy.model1.Order#getOrderDetails >- * @model opposite="orderDetails" required="true" transient="false" >- * @generated >- */ >- Order getOrder(); >- >- /** >- * Sets the value of the '{@link org.eclipse.emf.cdo.tests.legacy.model1.OrderDetail#getOrder <em>Order</em>}' >- * container reference. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @param value >- * the new value of the '<em>Order</em>' container reference. >- * @see #getOrder() >- * @generated >- */ >- void setOrder(Order value); >- >- /** >- * Returns the value of the '<em><b>Product</b></em>' reference. It is bidirectional and its opposite is ' >- * {@link org.eclipse.emf.cdo.tests.legacy.model1.Product1#getOrderDetails <em>Order Details</em>}'. <!-- >- * begin-user-doc --> >- * <p> >- * If the meaning of the '<em>Product</em>' reference isn't clear, there really should be more of a description >- * here... >- * </p> >- * <!-- end-user-doc --> >- * >- * @return the value of the '<em>Product</em>' reference. >- * @see #setProduct(Product1) >- * @see org.eclipse.emf.cdo.tests.legacy.model1.Model1Package#getOrderDetail_Product() >- * @see org.eclipse.emf.cdo.tests.legacy.model1.Product1#getOrderDetails >- * @model opposite="orderDetails" >- * @generated >- */ >- Product1 getProduct(); >- >- /** >- * Sets the value of the '{@link org.eclipse.emf.cdo.tests.legacy.model1.OrderDetail#getProduct <em>Product</em>}' >- * reference. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @param value >- * the new value of the '<em>Product</em>' reference. >- * @see #getProduct() >- * @generated >- */ >- void setProduct(Product1 value); >- >- /** >- * Returns the value of the '<em><b>Price</b></em>' attribute. <!-- begin-user-doc --> >- * <p> >- * If the meaning of the '<em>Price</em>' attribute isn't clear, there really should be more of a description here... >- * </p> >- * <!-- end-user-doc --> >- * >- * @return the value of the '<em>Price</em>' attribute. >- * @see #setPrice(float) >- * @see org.eclipse.emf.cdo.tests.legacy.model1.Model1Package#getOrderDetail_Price() >- * @model >- * @generated >- */ >- float getPrice(); >- >- /** >- * Sets the value of the '{@link org.eclipse.emf.cdo.tests.legacy.model1.OrderDetail#getPrice <em>Price</em>}' >- * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @param value >- * the new value of the '<em>Price</em>' attribute. >- * @see #getPrice() >- * @generated >- */ >- void setPrice(float value); >- >-} // OrderDetail >Index: src/org/eclipse/emf/cdo/tests/legacy/model1/Supplier.java >=================================================================== >RCS file: src/org/eclipse/emf/cdo/tests/legacy/model1/Supplier.java >diff -N src/org/eclipse/emf/cdo/tests/legacy/model1/Supplier.java >--- src/org/eclipse/emf/cdo/tests/legacy/model1/Supplier.java 22 Aug 2009 09:35:29 -0000 1.2 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,87 +0,0 @@ >-/** >- * Copyright (c) 2004 - 2009 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 >- * >- * $Id: Supplier.java,v 1.2 2009/08/22 09:35:29 estepper Exp $ >- */ >-package org.eclipse.emf.cdo.tests.legacy.model1; >- >-import org.eclipse.emf.common.util.EList; >- >-/** >- * <!-- begin-user-doc --> A representation of the model object '<em><b>Supplier</b></em>'. <!-- end-user-doc --> >- * <p> >- * The following features are supported: >- * <ul> >- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.Supplier#getPurchaseOrders <em>Purchase Orders</em>}</li> >- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.Supplier#isPreferred <em>Preferred</em>}</li> >- * </ul> >- * </p> >- * >- * @see org.eclipse.emf.cdo.tests.legacy.model1.Model1Package#getSupplier() >- * @model >- * @generated >- */ >-public interface Supplier extends Address >-{ >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- String copyright = "Copyright (c) 2004 - 2009 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.legacy.model1.PurchaseOrder}. It is bidirectional and its opposite is ' >- * {@link org.eclipse.emf.cdo.tests.legacy.model1.PurchaseOrder#getSupplier <em>Supplier</em>}'. <!-- begin-user-doc >- * --> >- * <p> >- * If the meaning of the '<em>Purchase Orders</em>' reference list isn't clear, there really should be more of a >- * description here... >- * </p> >- * <!-- end-user-doc --> >- * >- * @return the value of the '<em>Purchase Orders</em>' reference list. >- * @see org.eclipse.emf.cdo.tests.legacy.model1.Model1Package#getSupplier_PurchaseOrders() >- * @see org.eclipse.emf.cdo.tests.legacy.model1.PurchaseOrder#getSupplier >- * @model opposite="supplier" >- * @generated >- */ >- EList<PurchaseOrder> getPurchaseOrders(); >- >- /** >- * Returns the value of the '<em><b>Preferred</b></em>' attribute. The default value is <code>"true"</code>. <!-- >- * begin-user-doc --> >- * <p> >- * If the meaning of the '<em>Preferred</em>' attribute isn't clear, there really should be more of a description >- * here... >- * </p> >- * <!-- end-user-doc --> >- * >- * @return the value of the '<em>Preferred</em>' attribute. >- * @see #setPreferred(boolean) >- * @see org.eclipse.emf.cdo.tests.legacy.model1.Model1Package#getSupplier_Preferred() >- * @model default="true" >- * @generated >- */ >- boolean isPreferred(); >- >- /** >- * Sets the value of the '{@link org.eclipse.emf.cdo.tests.legacy.model1.Supplier#isPreferred <em>Preferred</em>}' >- * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @param value >- * the new value of the '<em>Preferred</em>' attribute. >- * @see #isPreferred() >- * @generated >- */ >- void setPreferred(boolean value); >- >-} // Supplier >Index: src/org/eclipse/emf/cdo/tests/legacy/model1/OrderAddress.java >=================================================================== >RCS file: src/org/eclipse/emf/cdo/tests/legacy/model1/OrderAddress.java >diff -N src/org/eclipse/emf/cdo/tests/legacy/model1/OrderAddress.java >--- src/org/eclipse/emf/cdo/tests/legacy/model1/OrderAddress.java 22 Aug 2009 09:35:29 -0000 1.2 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,64 +0,0 @@ >-/** >- * Copyright (c) 2004 - 2009 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 >- * >- * $Id: OrderAddress.java,v 1.2 2009/08/22 09:35:29 estepper Exp $ >- */ >-package org.eclipse.emf.cdo.tests.legacy.model1; >- >-/** >- * <!-- begin-user-doc --> A representation of the model object '<em><b>Order Address</b></em>'. <!-- end-user-doc --> >- * <p> >- * The following features are supported: >- * <ul> >- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.OrderAddress#isTestAttribute <em>Test Attribute</em>}</li> >- * </ul> >- * </p> >- * >- * @see org.eclipse.emf.cdo.tests.legacy.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 - 2009 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> >- * If the meaning of the '<em>Test Attribute</em>' attribute isn't clear, there really should be more of a description >- * here... >- * </p> >- * <!-- end-user-doc --> >- * >- * @return the value of the '<em>Test Attribute</em>' attribute. >- * @see #setTestAttribute(boolean) >- * @see org.eclipse.emf.cdo.tests.legacy.model1.Model1Package#getOrderAddress_TestAttribute() >- * @model >- * @generated >- */ >- boolean isTestAttribute(); >- >- /** >- * Sets the value of the '{@link org.eclipse.emf.cdo.tests.legacy.model1.OrderAddress#isTestAttribute >- * <em>Test Attribute</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @param value >- * the new value of the '<em>Test Attribute</em>' attribute. >- * @see #isTestAttribute() >- * @generated >- */ >- void setTestAttribute(boolean value); >- >-} // OrderAddress >Index: src/org/eclipse/emf/cdo/tests/legacy/model1/Product1.java >=================================================================== >RCS file: src/org/eclipse/emf/cdo/tests/legacy/model1/Product1.java >diff -N src/org/eclipse/emf/cdo/tests/legacy/model1/Product1.java >--- src/org/eclipse/emf/cdo/tests/legacy/model1/Product1.java 22 Aug 2009 09:35:29 -0000 1.2 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,143 +0,0 @@ >-/** >- * Copyright (c) 2004 - 2009 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 >- * >- * $Id: Product1.java,v 1.2 2009/08/22 09:35:29 estepper Exp $ >- */ >-package org.eclipse.emf.cdo.tests.legacy.model1; >- >-import org.eclipse.emf.common.util.EList; >-import org.eclipse.emf.ecore.EObject; >- >-/** >- * <!-- begin-user-doc --> A representation of the model object '<em><b>Product1</b></em>'. <!-- end-user-doc --> >- * <p> >- * The following features are supported: >- * <ul> >- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.Product1#getName <em>Name</em>}</li> >- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.Product1#getOrderDetails <em>Order Details</em>}</li> >- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.Product1#getVat <em>Vat</em>}</li> >- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.Product1#getDescription <em>Description</em>}</li> >- * </ul> >- * </p> >- * >- * @see org.eclipse.emf.cdo.tests.legacy.model1.Model1Package#getProduct1() >- * @model >- * @generated >- */ >-public interface Product1 extends EObject >-{ >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- String copyright = "Copyright (c) 2004 - 2009 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> >- * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here... >- * </p> >- * <!-- end-user-doc --> >- * >- * @return the value of the '<em>Name</em>' attribute. >- * @see #setName(String) >- * @see org.eclipse.emf.cdo.tests.legacy.model1.Model1Package#getProduct1_Name() >- * @model annotation="teneo.jpa value='@Id'" >- * @generated >- */ >- String getName(); >- >- /** >- * Sets the value of the '{@link org.eclipse.emf.cdo.tests.legacy.model1.Product1#getName <em>Name</em>}' attribute. >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @param value >- * the new value of the '<em>Name</em>' attribute. >- * @see #getName() >- * @generated >- */ >- void setName(String value); >- >- /** >- * Returns the value of the '<em><b>Order Details</b></em>' reference list. The list contents are of type >- * {@link org.eclipse.emf.cdo.tests.legacy.model1.OrderDetail}. It is bidirectional and its opposite is ' >- * {@link org.eclipse.emf.cdo.tests.legacy.model1.OrderDetail#getProduct <em>Product</em>}'. <!-- begin-user-doc --> >- * <p> >- * If the meaning of the '<em>Order Details</em>' reference list isn't clear, there really should be more of a >- * description here... >- * </p> >- * <!-- end-user-doc --> >- * >- * @return the value of the '<em>Order Details</em>' reference list. >- * @see org.eclipse.emf.cdo.tests.legacy.model1.Model1Package#getProduct1_OrderDetails() >- * @see org.eclipse.emf.cdo.tests.legacy.model1.OrderDetail#getProduct >- * @model opposite="product" >- * @generated >- */ >- EList<OrderDetail> getOrderDetails(); >- >- /** >- * Returns the value of the '<em><b>Vat</b></em>' attribute. The default value is <code>"vat15"</code>. The literals >- * are from the enumeration {@link org.eclipse.emf.cdo.tests.legacy.model1.VAT}. <!-- begin-user-doc --> >- * <p> >- * If the meaning of the '<em>Vat</em>' attribute isn't clear, there really should be more of a description here... >- * </p> >- * <!-- end-user-doc --> >- * >- * @return the value of the '<em>Vat</em>' attribute. >- * @see org.eclipse.emf.cdo.tests.legacy.model1.VAT >- * @see #setVat(VAT) >- * @see org.eclipse.emf.cdo.tests.legacy.model1.Model1Package#getProduct1_Vat() >- * @model default="vat15" >- * @generated >- */ >- VAT getVat(); >- >- /** >- * Sets the value of the '{@link org.eclipse.emf.cdo.tests.legacy.model1.Product1#getVat <em>Vat</em>}' attribute. >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @param value >- * the new value of the '<em>Vat</em>' attribute. >- * @see org.eclipse.emf.cdo.tests.legacy.model1.VAT >- * @see #getVat() >- * @generated >- */ >- void setVat(VAT value); >- >- /** >- * Returns the value of the '<em><b>Description</b></em>' attribute. <!-- begin-user-doc --> >- * <p> >- * If the meaning of the '<em>Description</em>' attribute isn't clear, there really should be more of a description >- * here... >- * </p> >- * <!-- end-user-doc --> >- * >- * @return the value of the '<em>Description</em>' attribute. >- * @see #setDescription(String) >- * @see org.eclipse.emf.cdo.tests.legacy.model1.Model1Package#getProduct1_Description() >- * @model transient="true" >- * @generated >- */ >- String getDescription(); >- >- /** >- * Sets the value of the '{@link org.eclipse.emf.cdo.tests.legacy.model1.Product1#getDescription <em>Description</em>} >- * ' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @param value >- * the new value of the '<em>Description</em>' attribute. >- * @see #getDescription() >- * @generated >- */ >- void setDescription(String value); >- >-} // Product1 >Index: src/org/eclipse/emf/cdo/tests/legacy/model1/Category.java >=================================================================== >RCS file: src/org/eclipse/emf/cdo/tests/legacy/model1/Category.java >diff -N src/org/eclipse/emf/cdo/tests/legacy/model1/Category.java >--- src/org/eclipse/emf/cdo/tests/legacy/model1/Category.java 22 Aug 2009 09:35:29 -0000 1.2 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,100 +0,0 @@ >-/** >- * Copyright (c) 2004 - 2009 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 >- * >- * $Id: Category.java,v 1.2 2009/08/22 09:35:29 estepper Exp $ >- */ >-package org.eclipse.emf.cdo.tests.legacy.model1; >- >-import org.eclipse.emf.common.util.EList; >-import org.eclipse.emf.ecore.EObject; >- >-/** >- * <!-- begin-user-doc --> A representation of the model object '<em><b>Category</b></em>'. <!-- end-user-doc --> >- * <p> >- * The following features are supported: >- * <ul> >- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.Category#getName <em>Name</em>}</li> >- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.Category#getCategories <em>Categories</em>}</li> >- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.Category#getProducts <em>Products</em>}</li> >- * </ul> >- * </p> >- * >- * @see org.eclipse.emf.cdo.tests.legacy.model1.Model1Package#getCategory() >- * @model >- * @generated >- */ >-public interface Category extends EObject >-{ >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- String copyright = "Copyright (c) 2004 - 2009 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> >- * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here... >- * </p> >- * <!-- end-user-doc --> >- * >- * @return the value of the '<em>Name</em>' attribute. >- * @see #setName(String) >- * @see org.eclipse.emf.cdo.tests.legacy.model1.Model1Package#getCategory_Name() >- * @model >- * @generated >- */ >- String getName(); >- >- /** >- * Sets the value of the '{@link org.eclipse.emf.cdo.tests.legacy.model1.Category#getName <em>Name</em>}' attribute. >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @param value >- * the new value of the '<em>Name</em>' attribute. >- * @see #getName() >- * @generated >- */ >- void setName(String value); >- >- /** >- * Returns the value of the '<em><b>Categories</b></em>' containment reference list. The list contents are of type >- * {@link org.eclipse.emf.cdo.tests.legacy.model1.Category}. <!-- begin-user-doc --> >- * <p> >- * If the meaning of the '<em>Categories</em>' containment reference list isn't clear, there really should be more of >- * a description here... >- * </p> >- * <!-- end-user-doc --> >- * >- * @return the value of the '<em>Categories</em>' containment reference list. >- * @see org.eclipse.emf.cdo.tests.legacy.model1.Model1Package#getCategory_Categories() >- * @model containment="true" >- * @generated >- */ >- EList<Category> getCategories(); >- >- /** >- * Returns the value of the '<em><b>Products</b></em>' containment reference list. The list contents are of type >- * {@link org.eclipse.emf.cdo.tests.legacy.model1.Product1}. <!-- begin-user-doc --> >- * <p> >- * If the meaning of the '<em>Products</em>' containment reference list isn't clear, there really should be more of a >- * description here... >- * </p> >- * <!-- end-user-doc --> >- * >- * @return the value of the '<em>Products</em>' containment reference list. >- * @see org.eclipse.emf.cdo.tests.legacy.model1.Model1Package#getCategory_Products() >- * @model containment="true" >- * @generated >- */ >- EList<Product1> getProducts(); >- >-} // Category >Index: src/org/eclipse/emf/cdo/tests/legacy/model1/Order.java >=================================================================== >RCS file: src/org/eclipse/emf/cdo/tests/legacy/model1/Order.java >diff -N src/org/eclipse/emf/cdo/tests/legacy/model1/Order.java >--- src/org/eclipse/emf/cdo/tests/legacy/model1/Order.java 22 Aug 2009 09:35:29 -0000 1.2 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,58 +0,0 @@ >-/** >- * Copyright (c) 2004 - 2009 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 >- * >- * $Id: Order.java,v 1.2 2009/08/22 09:35:29 estepper Exp $ >- */ >-package org.eclipse.emf.cdo.tests.legacy.model1; >- >-import org.eclipse.emf.common.util.EList; >-import org.eclipse.emf.ecore.EObject; >- >-/** >- * <!-- begin-user-doc --> A representation of the model object '<em><b>Order</b></em>'. <!-- end-user-doc --> >- * <p> >- * The following features are supported: >- * <ul> >- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.Order#getOrderDetails <em>Order Details</em>}</li> >- * </ul> >- * </p> >- * >- * @see org.eclipse.emf.cdo.tests.legacy.model1.Model1Package#getOrder() >- * @model annotation="teneo.jpa value='@Entity(name=\"BaseOrder\")'" >- * @generated >- */ >-public interface Order extends EObject >-{ >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- String copyright = "Copyright (c) 2004 - 2009 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.legacy.model1.OrderDetail}. It is bidirectional and its opposite is ' >- * {@link org.eclipse.emf.cdo.tests.legacy.model1.OrderDetail#getOrder <em>Order</em>}'. <!-- begin-user-doc --> >- * <p> >- * If the meaning of the '<em>Order Details</em>' containment reference list isn't clear, there really should be more >- * of a description here... >- * </p> >- * <!-- end-user-doc --> >- * >- * @return the value of the '<em>Order Details</em>' containment reference list. >- * @see org.eclipse.emf.cdo.tests.legacy.model1.Model1Package#getOrder_OrderDetails() >- * @see org.eclipse.emf.cdo.tests.legacy.model1.OrderDetail#getOrder >- * @model opposite="order" containment="true" >- * @generated >- */ >- EList<OrderDetail> getOrderDetails(); >- >-} // Order >Index: src/org/eclipse/emf/cdo/tests/legacy/model1/Model1Package.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/Model1Package.java,v >retrieving revision 1.5 >diff -u -r1.5 Model1Package.java >--- src/org/eclipse/emf/cdo/tests/legacy/model1/Model1Package.java 22 Aug 2009 09:35:29 -0000 1.5 >+++ src/org/eclipse/emf/cdo/tests/legacy/model1/Model1Package.java 14 Nov 2009 18:55:49 -0000 >@@ -8,7 +8,7 @@ > * Contributors: > * Eike Stepper - initial API and implementation > * >- * $Id: Model1Package.java,v 1.5 2009/08/22 09:35:29 estepper Exp $ >+ * $Id$ > */ > package org.eclipse.emf.cdo.tests.legacy.model1; > >@@ -32,7 +32,7 @@ > * @model kind="package" > * @generated > */ >-public interface Model1Package extends EPackage >+public interface Model1Package extends EPackage, org.eclipse.emf.cdo.tests.model1.Model1Package > { > /** > * <!-- begin-user-doc --> <!-- end-user-doc --> >@@ -300,12 +300,20 @@ > int CUSTOMER__SALES_ORDERS = ADDRESS_FEATURE_COUNT + 0; > > /** >+ * The feature id for the '<em><b>Order By Product</b></em>' map. <!-- begin-user-doc --> <!-- end-user-doc --> >+ * >+ * @generated >+ * @ordered >+ */ >+ int CUSTOMER__ORDER_BY_PRODUCT = ADDRESS_FEATURE_COUNT + 1; >+ >+ /** > * The number of structural features of the '<em>Customer</em>' class. <!-- begin-user-doc --> <!-- end-user-doc --> > * > * @generated > * @ordered > */ >- int CUSTOMER_FEATURE_COUNT = ADDRESS_FEATURE_COUNT + 1; >+ int CUSTOMER_FEATURE_COUNT = ADDRESS_FEATURE_COUNT + 2; > > /** > * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderImpl <em>Order</em>}' class. >@@ -645,6 +653,41 @@ > int ORDER_ADDRESS_FEATURE_COUNT = ADDRESS_FEATURE_COUNT + 5; > > /** >+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.ProductToOrderImpl >+ * <em>Product To Order</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> >+ * >+ * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.ProductToOrderImpl >+ * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getProductToOrder() >+ * @generated >+ */ >+ int PRODUCT_TO_ORDER = 11; >+ >+ /** >+ * The feature id for the '<em><b>Key</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc --> >+ * >+ * @generated >+ * @ordered >+ */ >+ int PRODUCT_TO_ORDER__KEY = 0; >+ >+ /** >+ * The feature id for the '<em><b>Value</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc --> >+ * >+ * @generated >+ * @ordered >+ */ >+ int PRODUCT_TO_ORDER__VALUE = 1; >+ >+ /** >+ * The number of structural features of the '<em>Product To Order</em>' class. <!-- begin-user-doc --> <!-- >+ * end-user-doc --> >+ * >+ * @generated >+ * @ordered >+ */ >+ int PRODUCT_TO_ORDER_FEATURE_COUNT = 2; >+ >+ /** > * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.VAT <em>VAT</em>}' enum. <!-- > * begin-user-doc --> <!-- end-user-doc --> > * >@@ -652,7 +695,7 @@ > * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getVAT() > * @generated > */ >- int VAT = 11; >+ int VAT = 12; > > /** > * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model1.Address <em>Address</em>}'. <!-- >@@ -823,6 +866,17 @@ > EReference getCustomer_SalesOrders(); > > /** >+ * Returns the meta object for the map '{@link org.eclipse.emf.cdo.tests.legacy.model1.Customer#getOrderByProduct >+ * <em>Order By Product</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> >+ * >+ * @return the meta object for the map '<em>Order By Product</em>'. >+ * @see org.eclipse.emf.cdo.tests.legacy.model1.Customer#getOrderByProduct() >+ * @see #getCustomer() >+ * @generated >+ */ >+ EReference getCustomer_OrderByProduct(); >+ >+ /** > * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model1.Order <em>Order</em>}'. <!-- > * begin-user-doc --> <!-- end-user-doc --> > * >@@ -1076,6 +1130,40 @@ > EAttribute getOrderAddress_TestAttribute(); > > /** >+ * Returns the meta object for class '{@link java.util.Map.Entry <em>Product To Order</em>}'. <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * >+ * @return the meta object for class '<em>Product To Order</em>'. >+ * @see java.util.Map.Entry >+ * @model keyType="org.eclipse.emf.cdo.tests.legacy.model1.Product1" >+ * valueType="org.eclipse.emf.cdo.tests.legacy.model1.SalesOrder" >+ * @generated >+ */ >+ EClass getProductToOrder(); >+ >+ /** >+ * Returns the meta object for the reference '{@link java.util.Map.Entry <em>Key</em>}'. <!-- begin-user-doc --> <!-- >+ * end-user-doc --> >+ * >+ * @return the meta object for the reference '<em>Key</em>'. >+ * @see java.util.Map.Entry >+ * @see #getProductToOrder() >+ * @generated >+ */ >+ EReference getProductToOrder_Key(); >+ >+ /** >+ * Returns the meta object for the reference '{@link java.util.Map.Entry <em>Value</em>}'. <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * >+ * @return the meta object for the reference '<em>Value</em>'. >+ * @see java.util.Map.Entry >+ * @see #getProductToOrder() >+ * @generated >+ */ >+ EReference getProductToOrder_Value(); >+ >+ /** > * Returns the meta object for enum '{@link org.eclipse.emf.cdo.tests.legacy.model1.VAT <em>VAT</em>}'. <!-- > * begin-user-doc --> <!-- end-user-doc --> > * >@@ -1236,6 +1324,14 @@ > EReference CUSTOMER__SALES_ORDERS = eINSTANCE.getCustomer_SalesOrders(); > > /** >+ * The meta object literal for the '<em><b>Order By Product</b></em>' map feature. <!-- begin-user-doc --> <!-- >+ * end-user-doc --> >+ * >+ * @generated >+ */ >+ EReference CUSTOMER__ORDER_BY_PRODUCT = eINSTANCE.getCustomer_OrderByProduct(); >+ >+ /** > * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderImpl <em>Order</em>}' > * class. <!-- begin-user-doc --> <!-- end-user-doc --> > * >@@ -1434,6 +1530,32 @@ > EAttribute ORDER_ADDRESS__TEST_ATTRIBUTE = eINSTANCE.getOrderAddress_TestAttribute(); > > /** >+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.ProductToOrderImpl >+ * <em>Product To Order</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> >+ * >+ * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.ProductToOrderImpl >+ * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getProductToOrder() >+ * @generated >+ */ >+ EClass PRODUCT_TO_ORDER = eINSTANCE.getProductToOrder(); >+ >+ /** >+ * The meta object literal for the '<em><b>Key</b></em>' reference feature. <!-- begin-user-doc --> <!-- >+ * end-user-doc --> >+ * >+ * @generated >+ */ >+ EReference PRODUCT_TO_ORDER__KEY = eINSTANCE.getProductToOrder_Key(); >+ >+ /** >+ * The meta object literal for the '<em><b>Value</b></em>' reference feature. <!-- begin-user-doc --> <!-- >+ * end-user-doc --> >+ * >+ * @generated >+ */ >+ EReference PRODUCT_TO_ORDER__VALUE = eINSTANCE.getProductToOrder_Value(); >+ >+ /** > * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.VAT <em>VAT</em>}' enum. <!-- > * begin-user-doc --> <!-- end-user-doc --> > * >Index: src/org/eclipse/emf/cdo/tests/legacy/model1/VAT.java >=================================================================== >RCS file: src/org/eclipse/emf/cdo/tests/legacy/model1/VAT.java >diff -N src/org/eclipse/emf/cdo/tests/legacy/model1/VAT.java >--- src/org/eclipse/emf/cdo/tests/legacy/model1/VAT.java 22 Aug 2009 09:35:29 -0000 1.2 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,256 +0,0 @@ >-/** >- * Copyright (c) 2004 - 2009 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 >- * >- * $Id: VAT.java,v 1.2 2009/08/22 09:35:29 estepper Exp $ >- */ >-package org.eclipse.emf.cdo.tests.legacy.model1; >- >-import org.eclipse.emf.common.util.Enumerator; >- >-import java.util.Arrays; >-import java.util.Collections; >-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.legacy.model1.Model1Package#getVAT() >- * @model >- * @generated >- */ >-public enum VAT implements Enumerator >-{ >- /** >- * The '<em><b>Vat0</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @see #VAT0_VALUE >- * @generated >- * @ordered >- */ >- VAT0(0, "vat0", "vat0"), >- >- /** >- * The '<em><b>Vat7</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @see #VAT7_VALUE >- * @generated >- * @ordered >- */ >- VAT7(7, "vat7", "vat7"), >- >- /** >- * The '<em><b>Vat15</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @see #VAT15_VALUE >- * @generated >- * @ordered >- */ >- VAT15(15, "vat15", "vat15"); >- >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- public static final String copyright = "Copyright (c) 2004 - 2009 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> >- * If the meaning of '<em><b>Vat0</b></em>' literal object isn't clear, there really should be more of a description >- * here... >- * </p> >- * <!-- end-user-doc --> >- * >- * @see #VAT0 >- * @model name="vat0" >- * @generated >- * @ordered >- */ >- public static final int VAT0_VALUE = 0; >- >- /** >- * The '<em><b>Vat7</b></em>' literal value. <!-- begin-user-doc --> >- * <p> >- * If the meaning of '<em><b>Vat7</b></em>' literal object isn't clear, there really should be more of a description >- * here... >- * </p> >- * <!-- end-user-doc --> >- * >- * @see #VAT7 >- * @model name="vat7" >- * @generated >- * @ordered >- */ >- public static final int VAT7_VALUE = 7; >- >- /** >- * The '<em><b>Vat15</b></em>' literal value. <!-- begin-user-doc --> >- * <p> >- * If the meaning of '<em><b>Vat15</b></em>' literal object isn't clear, there really should be more of a description >- * here... >- * </p> >- * <!-- end-user-doc --> >- * >- * @see #VAT15 >- * @model name="vat15" >- * @generated >- * @ordered >- */ >- public static final int VAT15_VALUE = 15; >- >- /** >- * An array of all the '<em><b>VAT</b></em>' enumerators. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- private static final VAT[] VALUES_ARRAY = new VAT[] { VAT0, VAT7, VAT15, }; >- >- /** >- * A public read-only list of all the '<em><b>VAT</b></em>' enumerators. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- public static final List<VAT> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY)); >- >- /** >- * Returns the '<em><b>VAT</b></em>' literal with the specified literal value. <!-- begin-user-doc --> <!-- >- * end-user-doc --> >- * >- * @generated >- */ >- public static VAT get(String literal) >- { >- for (int i = 0; i < VALUES_ARRAY.length; ++i) >- { >- VAT result = VALUES_ARRAY[i]; >- if (result.toString().equals(literal)) >- { >- return result; >- } >- } >- return null; >- } >- >- /** >- * Returns the '<em><b>VAT</b></em>' literal with the specified name. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- public static VAT getByName(String name) >- { >- for (int i = 0; i < VALUES_ARRAY.length; ++i) >- { >- VAT result = VALUES_ARRAY[i]; >- if (result.getName().equals(name)) >- { >- return result; >- } >- } >- return null; >- } >- >- /** >- * Returns the '<em><b>VAT</b></em>' literal with the specified integer value. <!-- begin-user-doc --> <!-- >- * end-user-doc --> >- * >- * @generated >- */ >- public static VAT get(int value) >- { >- switch (value) >- { >- case VAT0_VALUE: >- return VAT0; >- case VAT7_VALUE: >- return VAT7; >- case VAT15_VALUE: >- return VAT15; >- } >- return null; >- } >- >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- private final int value; >- >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- private final String name; >- >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- private final String literal; >- >- /** >- * Only this class can construct instances. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- private VAT(int value, String name, String literal) >- { >- this.value = value; >- this.name = name; >- this.literal = literal; >- } >- >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- public int getValue() >- { >- return value; >- } >- >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- public String getName() >- { >- return name; >- } >- >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- public String getLiteral() >- { >- return literal; >- } >- >- /** >- * Returns the literal value of the enumerator, which is its string representation. <!-- begin-user-doc --> <!-- >- * end-user-doc --> >- * >- * @generated >- */ >- @Override >- public String toString() >- { >- return literal; >- } >- >-} // VAT >Index: src/org/eclipse/emf/cdo/tests/legacy/model1/SalesOrder.java >=================================================================== >RCS file: src/org/eclipse/emf/cdo/tests/legacy/model1/SalesOrder.java >diff -N src/org/eclipse/emf/cdo/tests/legacy/model1/SalesOrder.java >--- src/org/eclipse/emf/cdo/tests/legacy/model1/SalesOrder.java 22 Aug 2009 09:35:29 -0000 1.2 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,94 +0,0 @@ >-/** >- * Copyright (c) 2004 - 2009 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 >- * >- * $Id: SalesOrder.java,v 1.2 2009/08/22 09:35:29 estepper Exp $ >- */ >-package org.eclipse.emf.cdo.tests.legacy.model1; >- >-/** >- * <!-- begin-user-doc --> A representation of the model object '<em><b>Sales Order</b></em>'. <!-- end-user-doc --> >- * <p> >- * The following features are supported: >- * <ul> >- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.SalesOrder#getId <em>Id</em>}</li> >- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.SalesOrder#getCustomer <em>Customer</em>}</li> >- * </ul> >- * </p> >- * >- * @see org.eclipse.emf.cdo.tests.legacy.model1.Model1Package#getSalesOrder() >- * @model >- * @generated >- */ >-public interface SalesOrder extends Order >-{ >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- String copyright = "Copyright (c) 2004 - 2009 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> >- * If the meaning of the '<em>Id</em>' attribute isn't clear, there really should be more of a description here... >- * </p> >- * <!-- end-user-doc --> >- * >- * @return the value of the '<em>Id</em>' attribute. >- * @see #setId(int) >- * @see org.eclipse.emf.cdo.tests.legacy.model1.Model1Package#getSalesOrder_Id() >- * @model >- * @generated >- */ >- int getId(); >- >- /** >- * Sets the value of the '{@link org.eclipse.emf.cdo.tests.legacy.model1.SalesOrder#getId <em>Id</em>}' attribute. >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @param value >- * the new value of the '<em>Id</em>' attribute. >- * @see #getId() >- * @generated >- */ >- void setId(int value); >- >- /** >- * Returns the value of the '<em><b>Customer</b></em>' reference. It is bidirectional and its opposite is ' >- * {@link org.eclipse.emf.cdo.tests.legacy.model1.Customer#getSalesOrders <em>Sales Orders</em>}'. <!-- begin-user-doc >- * --> >- * <p> >- * If the meaning of the '<em>Customer</em>' reference isn't clear, there really should be more of a description >- * here... >- * </p> >- * <!-- end-user-doc --> >- * >- * @return the value of the '<em>Customer</em>' reference. >- * @see #setCustomer(Customer) >- * @see org.eclipse.emf.cdo.tests.legacy.model1.Model1Package#getSalesOrder_Customer() >- * @see org.eclipse.emf.cdo.tests.legacy.model1.Customer#getSalesOrders >- * @model opposite="salesOrders" required="true" >- * @generated >- */ >- Customer getCustomer(); >- >- /** >- * Sets the value of the '{@link org.eclipse.emf.cdo.tests.legacy.model1.SalesOrder#getCustomer <em>Customer</em>}' >- * reference. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @param value >- * the new value of the '<em>Customer</em>' reference. >- * @see #getCustomer() >- * @generated >- */ >- void setCustomer(Customer value); >- >-} // SalesOrder >Index: src/org/eclipse/emf/cdo/tests/legacy/model1/Model1Factory.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/Model1Factory.java,v >retrieving revision 1.5 >diff -u -r1.5 Model1Factory.java >--- src/org/eclipse/emf/cdo/tests/legacy/model1/Model1Factory.java 22 Aug 2009 09:35:29 -0000 1.5 >+++ src/org/eclipse/emf/cdo/tests/legacy/model1/Model1Factory.java 14 Nov 2009 18:55:49 -0000 >@@ -8,10 +8,22 @@ > * Contributors: > * Eike Stepper - initial API and implementation > * >- * $Id: Model1Factory.java,v 1.5 2009/08/22 09:35:29 estepper Exp $ >+ * $Id$ > */ > package org.eclipse.emf.cdo.tests.legacy.model1; > >+import org.eclipse.emf.cdo.tests.model1.Address; >+import org.eclipse.emf.cdo.tests.model1.Category; >+import org.eclipse.emf.cdo.tests.model1.Company; >+import org.eclipse.emf.cdo.tests.model1.Customer; >+import org.eclipse.emf.cdo.tests.model1.Order; >+import org.eclipse.emf.cdo.tests.model1.OrderAddress; >+import org.eclipse.emf.cdo.tests.model1.OrderDetail; >+import org.eclipse.emf.cdo.tests.model1.Product1; >+import org.eclipse.emf.cdo.tests.model1.PurchaseOrder; >+import org.eclipse.emf.cdo.tests.model1.SalesOrder; >+import org.eclipse.emf.cdo.tests.model1.Supplier; >+ > import org.eclipse.emf.ecore.EFactory; > > /** >@@ -21,7 +33,7 @@ > * @see org.eclipse.emf.cdo.tests.legacy.model1.Model1Package > * @generated > */ >-public interface Model1Factory extends EFactory >+public interface Model1Factory extends EFactory, org.eclipse.emf.cdo.tests.model1.Model1Factory > { > /** > * <!-- begin-user-doc --> <!-- end-user-doc --> >Index: META-INF/MANIFEST.MF >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model1/META-INF/MANIFEST.MF,v >retrieving revision 1.15 >diff -u -r1.15 MANIFEST.MF >--- META-INF/MANIFEST.MF 27 Jun 2009 07:24:47 -0000 1.15 >+++ META-INF/MANIFEST.MF 14 Nov 2009 18:55:49 -0000 >@@ -9,7 +9,8 @@ > Bundle-ClassPath: . > Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", > org.eclipse.emf.cdo;bundle-version="[3.0.0,4.0.0)";visibility:=reexport >-Export-Package: org.eclipse.emf.cdo.tests.model1;version="3.0.0", >+Export-Package: org.eclipse.emf.cdo.tests.legacy.model1, >+ org.eclipse.emf.cdo.tests.model1;version="3.0.0", > org.eclipse.emf.cdo.tests.model1.impl;version="3.0.0", > org.eclipse.emf.cdo.tests.model1.util;version="3.0.0", > org.eclipse.emf.cdo.tests.model1.validation;version="3.0.0" >Index: src/org/eclipse/emf/cdo/tests/legacy/model1/util/Model1AdapterFactory.java >=================================================================== >RCS file: src/org/eclipse/emf/cdo/tests/legacy/model1/util/Model1AdapterFactory.java >diff -N src/org/eclipse/emf/cdo/tests/legacy/model1/util/Model1AdapterFactory.java >--- src/org/eclipse/emf/cdo/tests/legacy/model1/util/Model1AdapterFactory.java 22 Aug 2009 09:35:30 -0000 1.5 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,351 +0,0 @@ >-/** >- * Copyright (c) 2004 - 2009 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 >- * >- * $Id: Model1AdapterFactory.java,v 1.5 2009/08/22 09:35:30 estepper Exp $ >- */ >-package org.eclipse.emf.cdo.tests.legacy.model1.util; >- >-import org.eclipse.emf.cdo.tests.legacy.model1.Address; >-import org.eclipse.emf.cdo.tests.legacy.model1.Category; >-import org.eclipse.emf.cdo.tests.legacy.model1.Company; >-import org.eclipse.emf.cdo.tests.legacy.model1.Customer; >-import org.eclipse.emf.cdo.tests.legacy.model1.Model1Package; >-import org.eclipse.emf.cdo.tests.legacy.model1.Order; >-import org.eclipse.emf.cdo.tests.legacy.model1.OrderAddress; >-import org.eclipse.emf.cdo.tests.legacy.model1.OrderDetail; >-import org.eclipse.emf.cdo.tests.legacy.model1.Product1; >-import org.eclipse.emf.cdo.tests.legacy.model1.PurchaseOrder; >-import org.eclipse.emf.cdo.tests.legacy.model1.SalesOrder; >-import org.eclipse.emf.cdo.tests.legacy.model1.Supplier; >- >-import org.eclipse.emf.common.notify.Adapter; >-import org.eclipse.emf.common.notify.Notifier; >-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl; >-import org.eclipse.emf.ecore.EObject; >- >-/** >- * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter <code>createXXX</code> >- * method for each class of the model. <!-- end-user-doc --> >- * >- * @see org.eclipse.emf.cdo.tests.legacy.model1.Model1Package >- * @generated >- */ >-public class Model1AdapterFactory extends AdapterFactoryImpl >-{ >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- public static final String copyright = "Copyright (c) 2004 - 2009 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation"; >- >- /** >- * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- protected static Model1Package modelPackage; >- >- /** >- * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- public Model1AdapterFactory() >- { >- if (modelPackage == null) >- { >- modelPackage = Model1Package.eINSTANCE; >- } >- } >- >- /** >- * Returns whether this factory is applicable for the type of the object. <!-- begin-user-doc --> This implementation >- * returns <code>true</code> if the object is either the model's package or is an instance object of the model. <!-- >- * end-user-doc --> >- * >- * @return whether this factory is applicable for the type of the object. >- * @generated >- */ >- @Override >- public boolean isFactoryForType(Object object) >- { >- if (object == modelPackage) >- { >- return true; >- } >- if (object instanceof EObject) >- { >- return ((EObject)object).eClass().getEPackage() == modelPackage; >- } >- return false; >- } >- >- /** >- * The switch that delegates to the <code>createXXX</code> methods. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- protected Model1Switch<Adapter> modelSwitch = new Model1Switch<Adapter>() >- { >- @Override >- public Adapter caseAddress(Address object) >- { >- return createAddressAdapter(); >- } >- >- @Override >- public Adapter caseCompany(Company object) >- { >- return createCompanyAdapter(); >- } >- >- @Override >- public Adapter caseSupplier(Supplier object) >- { >- return createSupplierAdapter(); >- } >- >- @Override >- public Adapter caseCustomer(Customer object) >- { >- return createCustomerAdapter(); >- } >- >- @Override >- public Adapter caseOrder(Order object) >- { >- return createOrderAdapter(); >- } >- >- @Override >- public Adapter caseOrderDetail(OrderDetail object) >- { >- return createOrderDetailAdapter(); >- } >- >- @Override >- public Adapter casePurchaseOrder(PurchaseOrder object) >- { >- return createPurchaseOrderAdapter(); >- } >- >- @Override >- public Adapter caseSalesOrder(SalesOrder object) >- { >- return createSalesOrderAdapter(); >- } >- >- @Override >- public Adapter caseCategory(Category object) >- { >- return createCategoryAdapter(); >- } >- >- @Override >- public Adapter caseProduct1(Product1 object) >- { >- return createProduct1Adapter(); >- } >- >- @Override >- public Adapter caseOrderAddress(OrderAddress object) >- { >- return createOrderAddressAdapter(); >- } >- >- @Override >- public Adapter defaultCase(EObject object) >- { >- return createEObjectAdapter(); >- } >- }; >- >- /** >- * Creates an adapter for the <code>target</code>. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @param target >- * the object to adapt. >- * @return the adapter for the <code>target</code>. >- * @generated >- */ >- @Override >- public Adapter createAdapter(Notifier target) >- { >- return modelSwitch.doSwitch((EObject)target); >- } >- >- /** >- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model1.Address >- * <em>Address</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.legacy.model1.Address >- * @generated >- */ >- public Adapter createAddressAdapter() >- { >- return null; >- } >- >- /** >- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model1.Company >- * <em>Company</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.legacy.model1.Company >- * @generated >- */ >- public Adapter createCompanyAdapter() >- { >- return null; >- } >- >- /** >- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model1.Supplier >- * <em>Supplier</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.legacy.model1.Supplier >- * @generated >- */ >- public Adapter createSupplierAdapter() >- { >- return null; >- } >- >- /** >- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model1.Customer >- * <em>Customer</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.legacy.model1.Customer >- * @generated >- */ >- public Adapter createCustomerAdapter() >- { >- return null; >- } >- >- /** >- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.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.legacy.model1.Order >- * @generated >- */ >- public Adapter createOrderAdapter() >- { >- return null; >- } >- >- /** >- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model1.OrderDetail >- * <em>Order Detail</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.legacy.model1.OrderDetail >- * @generated >- */ >- public Adapter createOrderDetailAdapter() >- { >- return null; >- } >- >- /** >- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model1.PurchaseOrder >- * <em>Purchase 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.legacy.model1.PurchaseOrder >- * @generated >- */ >- public Adapter createPurchaseOrderAdapter() >- { >- return null; >- } >- >- /** >- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model1.SalesOrder >- * <em>Sales 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.legacy.model1.SalesOrder >- * @generated >- */ >- public Adapter createSalesOrderAdapter() >- { >- return null; >- } >- >- /** >- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model1.Category >- * <em>Category</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.legacy.model1.Category >- * @generated >- */ >- public Adapter createCategoryAdapter() >- { >- return null; >- } >- >- /** >- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model1.Product1 >- * <em>Product1</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.legacy.model1.Product1 >- * @generated >- */ >- public Adapter createProduct1Adapter() >- { >- return null; >- } >- >- /** >- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model1.OrderAddress >- * <em>Order Address</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.legacy.model1.OrderAddress >- * @generated >- */ >- public Adapter createOrderAddressAdapter() >- { >- return null; >- } >- >- /** >- * Creates a new adapter for the default case. <!-- begin-user-doc --> This default implementation returns null. <!-- >- * end-user-doc --> >- * >- * @return the new adapter. >- * @generated >- */ >- public Adapter createEObjectAdapter() >- { >- return null; >- } >- >-} // Model1AdapterFactory >Index: src/org/eclipse/emf/cdo/tests/legacy/model1/util/Model1Switch.java >=================================================================== >RCS file: src/org/eclipse/emf/cdo/tests/legacy/model1/util/Model1Switch.java >diff -N src/org/eclipse/emf/cdo/tests/legacy/model1/util/Model1Switch.java >--- src/org/eclipse/emf/cdo/tests/legacy/model1/util/Model1Switch.java 22 Aug 2009 09:35:30 -0000 1.5 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,404 +0,0 @@ >-/** >- * Copyright (c) 2004 - 2009 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 >- * >- * $Id: Model1Switch.java,v 1.5 2009/08/22 09:35:30 estepper Exp $ >- */ >-package org.eclipse.emf.cdo.tests.legacy.model1.util; >- >-import org.eclipse.emf.cdo.tests.legacy.model1.Address; >-import org.eclipse.emf.cdo.tests.legacy.model1.Category; >-import org.eclipse.emf.cdo.tests.legacy.model1.Company; >-import org.eclipse.emf.cdo.tests.legacy.model1.Customer; >-import org.eclipse.emf.cdo.tests.legacy.model1.Model1Package; >-import org.eclipse.emf.cdo.tests.legacy.model1.Order; >-import org.eclipse.emf.cdo.tests.legacy.model1.OrderAddress; >-import org.eclipse.emf.cdo.tests.legacy.model1.OrderDetail; >-import org.eclipse.emf.cdo.tests.legacy.model1.Product1; >-import org.eclipse.emf.cdo.tests.legacy.model1.PurchaseOrder; >-import org.eclipse.emf.cdo.tests.legacy.model1.SalesOrder; >-import org.eclipse.emf.cdo.tests.legacy.model1.Supplier; >- >-import org.eclipse.emf.ecore.EClass; >-import org.eclipse.emf.ecore.EObject; >- >-import java.util.List; >- >-/** >- * <!-- 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, >- * starting with the actual class of the object and proceeding up the inheritance hierarchy until a non-null result is >- * returned, which is the result of the switch. <!-- end-user-doc --> >- * >- * @see org.eclipse.emf.cdo.tests.legacy.model1.Model1Package >- * @generated >- */ >-public class Model1Switch<T> >-{ >- /** >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- public static final String copyright = "Copyright (c) 2004 - 2009 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation"; >- >- /** >- * The cached model package <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- protected static Model1Package modelPackage; >- >- /** >- * Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @generated >- */ >- public Model1Switch() >- { >- if (modelPackage == null) >- { >- modelPackage = Model1Package.eINSTANCE; >- } >- } >- >- /** >- * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @return the first non-null result returned by a <code>caseXXX</code> call. >- * @generated >- */ >- public T doSwitch(EObject theEObject) >- { >- return doSwitch(theEObject.eClass(), theEObject); >- } >- >- /** >- * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @return the first non-null result returned by a <code>caseXXX</code> call. >- * @generated >- */ >- protected T doSwitch(EClass theEClass, EObject theEObject) >- { >- if (theEClass.eContainer() == modelPackage) >- { >- return doSwitch(theEClass.getClassifierID(), theEObject); >- } >- else >- { >- List<EClass> eSuperTypes = theEClass.getESuperTypes(); >- return eSuperTypes.isEmpty() ? defaultCase(theEObject) : doSwitch(eSuperTypes.get(0), theEObject); >- } >- } >- >- /** >- * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. >- * <!-- begin-user-doc --> <!-- end-user-doc --> >- * >- * @return the first non-null result returned by a <code>caseXXX</code> call. >- * @generated >- */ >- protected T doSwitch(int classifierID, EObject theEObject) >- { >- switch (classifierID) >- { >- case Model1Package.ADDRESS: >- { >- Address address = (Address)theEObject; >- T result = caseAddress(address); >- if (result == null) >- result = defaultCase(theEObject); >- return result; >- } >- case Model1Package.COMPANY: >- { >- 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: >- { >- 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: >- { >- 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: >- { >- Order order = (Order)theEObject; >- T result = caseOrder(order); >- if (result == null) >- result = defaultCase(theEObject); >- return result; >- } >- case Model1Package.ORDER_DETAIL: >- { >- OrderDetail orderDetail = (OrderDetail)theEObject; >- T result = caseOrderDetail(orderDetail); >- if (result == null) >- result = defaultCase(theEObject); >- return result; >- } >- case Model1Package.PURCHASE_ORDER: >- { >- 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: >- { >- 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: >- { >- Category category = (Category)theEObject; >- T result = caseCategory(category); >- if (result == null) >- result = defaultCase(theEObject); >- return result; >- } >- case Model1Package.PRODUCT1: >- { >- Product1 product1 = (Product1)theEObject; >- T result = caseProduct1(product1); >- if (result == null) >- result = defaultCase(theEObject); >- return result; >- } >- case Model1Package.ORDER_ADDRESS: >- { >- 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; >- } >- default: >- return defaultCase(theEObject); >- } >- } >- >- /** >- * Returns the result of interpreting the object as an instance of '<em>Address</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>Address</em>'. >- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) >- * @generated >- */ >- public T caseAddress(Address object) >- { >- return null; >- } >- >- /** >- * Returns the result of interpreting the object as an instance of '<em>Company</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>Company</em>'. >- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) >- * @generated >- */ >- public T caseCompany(Company object) >- { >- return null; >- } >- >- /** >- * Returns the result of interpreting the object as an instance of '<em>Supplier</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>Supplier</em>'. >- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) >- * @generated >- */ >- public T caseSupplier(Supplier object) >- { >- return null; >- } >- >- /** >- * Returns the result of interpreting the object as an instance of '<em>Customer</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>Customer</em>'. >- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) >- * @generated >- */ >- public T caseCustomer(Customer object) >- { >- return null; >- } >- >- /** >- * Returns the result of interpreting the object as an instance of '<em>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>Order</em>'. >- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) >- * @generated >- */ >- public T caseOrder(Order object) >- { >- return null; >- } >- >- /** >- * Returns the result of interpreting the object as an instance of '<em>Order Detail</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>Order Detail</em>'. >- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) >- * @generated >- */ >- public T caseOrderDetail(OrderDetail object) >- { >- return null; >- } >- >- /** >- * Returns the result of interpreting the object as an instance of '<em>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>Purchase Order</em>'. >- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) >- * @generated >- */ >- public T casePurchaseOrder(PurchaseOrder object) >- { >- return null; >- } >- >- /** >- * Returns the result of interpreting the object as an instance of '<em>Sales 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>Sales Order</em>'. >- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) >- * @generated >- */ >- public T caseSalesOrder(SalesOrder object) >- { >- return null; >- } >- >- /** >- * Returns the result of interpreting the object as an instance of '<em>Category</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>Category</em>'. >- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) >- * @generated >- */ >- public T caseCategory(Category object) >- { >- return null; >- } >- >- /** >- * Returns the result of interpreting the object as an instance of '<em>Product1</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>Product1</em>'. >- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) >- * @generated >- */ >- public T caseProduct1(Product1 object) >- { >- return null; >- } >- >- /** >- * Returns the result of interpreting the object as an instance of '<em>Order Address</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>Order Address</em>'. >- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) >- * @generated >- */ >- public T caseOrderAddress(OrderAddress object) >- { >- return null; >- } >- >- /** >- * Returns the result of interpreting the object as an instance of '<em>EObject</em>'. <!-- begin-user-doc --> This >- * implementation returns null; returning a non-null result will terminate the switch, but this is the last case >- * anyway. <!-- end-user-doc --> >- * >- * @param object >- * the target of the switch. >- * @return the result of interpreting the object as an instance of '<em>EObject</em>'. >- * @see #doSwitch(org.eclipse.emf.ecore.EObject) >- * @generated >- */ >- public T defaultCase(EObject object) >- { >- return null; >- } >- >-} // Model1Switch >Index: src/org/eclipse/emf/cdo/tests/legacy/model1/impl/ProductToOrderImpl.java >=================================================================== >RCS file: src/org/eclipse/emf/cdo/tests/legacy/model1/impl/ProductToOrderImpl.java >diff -N src/org/eclipse/emf/cdo/tests/legacy/model1/impl/ProductToOrderImpl.java >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ src/org/eclipse/emf/cdo/tests/legacy/model1/impl/ProductToOrderImpl.java 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,345 @@ >+/** >+ * Copyright (c) 2004 - 2009 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 >+ * >+ * $Id$ >+ */ >+package org.eclipse.emf.cdo.tests.legacy.model1.impl; >+ >+import org.eclipse.emf.cdo.tests.legacy.model1.Model1Package; >+import org.eclipse.emf.cdo.tests.model1.Product1; >+import org.eclipse.emf.cdo.tests.model1.SalesOrder; >+ >+import org.eclipse.emf.common.notify.Notification; >+import org.eclipse.emf.common.util.BasicEMap; >+import org.eclipse.emf.common.util.EMap; >+import org.eclipse.emf.ecore.EClass; >+import org.eclipse.emf.ecore.EObject; >+import org.eclipse.emf.ecore.InternalEObject; >+import org.eclipse.emf.ecore.impl.ENotificationImpl; >+import org.eclipse.emf.ecore.impl.EObjectImpl; >+ >+/** >+ * <!-- begin-user-doc --> >+ * An implementation of the model object '<em><b>Product To Order</b></em>'. >+ * <!-- end-user-doc --> >+ * <p> >+ * The following features are implemented: >+ * <ul> >+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.ProductToOrderImpl#getTypedKey <em>Key</em>}</li> >+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.ProductToOrderImpl#getTypedValue <em>Value</em>}</li> >+ * </ul> >+ * </p> >+ * >+ * @generated >+ */ >+public class ProductToOrderImpl extends EObjectImpl implements BasicEMap.Entry<Product1, SalesOrder> >+{ >+ /** >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ public static final String copyright = "Copyright (c) 2004 - 2009 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation"; >+ >+ /** >+ * The cached value of the '{@link #getTypedKey() <em>Key</em>}' reference. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @see #getTypedKey() >+ * @generated >+ * @ordered >+ */ >+ protected Product1 key; >+ >+ /** >+ * The cached value of the '{@link #getTypedValue() <em>Value</em>}' reference. >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @see #getTypedValue() >+ * @generated >+ * @ordered >+ */ >+ protected SalesOrder value; >+ >+ /** >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ protected ProductToOrderImpl() >+ { >+ super(); >+ } >+ >+ /** >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ @Override >+ protected EClass eStaticClass() >+ { >+ return Model1Package.Literals.PRODUCT_TO_ORDER; >+ } >+ >+ /** >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ public Product1 getTypedKey() >+ { >+ if (key != null && key.eIsProxy()) >+ { >+ InternalEObject oldKey = (InternalEObject)key; >+ key = (Product1)eResolveProxy(oldKey); >+ if (key != oldKey) >+ { >+ if (eNotificationRequired()) >+ eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model1Package.PRODUCT_TO_ORDER__KEY, oldKey, key)); >+ } >+ } >+ return key; >+ } >+ >+ /** >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ public Product1 basicGetTypedKey() >+ { >+ return key; >+ } >+ >+ /** >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ public void setTypedKey(Product1 newKey) >+ { >+ Product1 oldKey = key; >+ key = newKey; >+ if (eNotificationRequired()) >+ eNotify(new ENotificationImpl(this, Notification.SET, Model1Package.PRODUCT_TO_ORDER__KEY, oldKey, key)); >+ } >+ >+ /** >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ public SalesOrder getTypedValue() >+ { >+ if (value != null && value.eIsProxy()) >+ { >+ InternalEObject oldValue = (InternalEObject)value; >+ value = (SalesOrder)eResolveProxy(oldValue); >+ if (value != oldValue) >+ { >+ if (eNotificationRequired()) >+ eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model1Package.PRODUCT_TO_ORDER__VALUE, oldValue, >+ value)); >+ } >+ } >+ return value; >+ } >+ >+ /** >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ public SalesOrder basicGetTypedValue() >+ { >+ return value; >+ } >+ >+ /** >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ public void setTypedValue(SalesOrder newValue) >+ { >+ SalesOrder oldValue = value; >+ value = newValue; >+ if (eNotificationRequired()) >+ eNotify(new ENotificationImpl(this, Notification.SET, Model1Package.PRODUCT_TO_ORDER__VALUE, oldValue, value)); >+ } >+ >+ /** >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ @Override >+ public Object eGet(int featureID, boolean resolve, boolean coreType) >+ { >+ switch (featureID) >+ { >+ case Model1Package.PRODUCT_TO_ORDER__KEY: >+ if (resolve) >+ return getTypedKey(); >+ return basicGetTypedKey(); >+ case Model1Package.PRODUCT_TO_ORDER__VALUE: >+ if (resolve) >+ return getTypedValue(); >+ return basicGetTypedValue(); >+ } >+ return super.eGet(featureID, resolve, coreType); >+ } >+ >+ /** >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ @Override >+ public void eSet(int featureID, Object newValue) >+ { >+ switch (featureID) >+ { >+ case Model1Package.PRODUCT_TO_ORDER__KEY: >+ setTypedKey((Product1)newValue); >+ return; >+ case Model1Package.PRODUCT_TO_ORDER__VALUE: >+ setTypedValue((SalesOrder)newValue); >+ return; >+ } >+ super.eSet(featureID, newValue); >+ } >+ >+ /** >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ @Override >+ public void eUnset(int featureID) >+ { >+ switch (featureID) >+ { >+ case Model1Package.PRODUCT_TO_ORDER__KEY: >+ setTypedKey((Product1)null); >+ return; >+ case Model1Package.PRODUCT_TO_ORDER__VALUE: >+ setTypedValue((SalesOrder)null); >+ return; >+ } >+ super.eUnset(featureID); >+ } >+ >+ /** >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ @Override >+ public boolean eIsSet(int featureID) >+ { >+ switch (featureID) >+ { >+ case Model1Package.PRODUCT_TO_ORDER__KEY: >+ return key != null; >+ case Model1Package.PRODUCT_TO_ORDER__VALUE: >+ return value != null; >+ } >+ return super.eIsSet(featureID); >+ } >+ >+ /** >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ protected int hash = -1; >+ >+ /** >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ public int getHash() >+ { >+ if (hash == -1) >+ { >+ Object theKey = getKey(); >+ hash = (theKey == null ? 0 : theKey.hashCode()); >+ } >+ return hash; >+ } >+ >+ /** >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ public void setHash(int hash) >+ { >+ this.hash = hash; >+ } >+ >+ /** >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ public Product1 getKey() >+ { >+ return getTypedKey(); >+ } >+ >+ /** >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ public void setKey(Product1 key) >+ { >+ setTypedKey(key); >+ } >+ >+ /** >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ public SalesOrder getValue() >+ { >+ return getTypedValue(); >+ } >+ >+ /** >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ public SalesOrder setValue(SalesOrder value) >+ { >+ SalesOrder oldValue = getValue(); >+ setTypedValue(value); >+ return oldValue; >+ } >+ >+ /** >+ * <!-- begin-user-doc --> >+ * <!-- end-user-doc --> >+ * @generated >+ */ >+ @SuppressWarnings("unchecked") >+ public EMap<Product1, SalesOrder> getEMap() >+ { >+ EObject container = eContainer(); >+ return container == null ? null : (EMap<Product1, SalesOrder>)container.eGet(eContainmentFeature()); >+ } >+ >+} //ProductToOrderImpl >Index: model/model1.martin.legacy.genmodel >=================================================================== >RCS file: model/model1.martin.legacy.genmodel >diff -N model/model1.martin.legacy.genmodel >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ model/model1.martin.legacy.genmodel 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,69 @@ >+<?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" >+ modelPluginID="org.eclipse.emf.cdo.tests.model1" modelName="Model1.martin" importerID="org.eclipse.emf.importer.ecore" >+ complianceLevel="5.0" copyrightFields="false"> >+ <foreignModel>model1.ecore</foreignModel> >+ <genPackages prefix="Model1" disposableProviderFactory="true" ecorePackage="model1.ecore#/"> >+ <genEnums typeSafeEnumCompatible="false" ecoreEnum="model1.ecore#//VAT"> >+ <genEnumLiterals ecoreEnumLiteral="model1.ecore#//VAT/vat0"/> >+ <genEnumLiterals ecoreEnumLiteral="model1.ecore#//VAT/vat7"/> >+ <genEnumLiterals ecoreEnumLiteral="model1.ecore#//VAT/vat15"/> >+ </genEnums> >+ <genClasses ecoreClass="model1.ecore#//Address"> >+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model1.ecore#//Address/name"/> >+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model1.ecore#//Address/street"/> >+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model1.ecore#//Address/city"/> >+ </genClasses> >+ <genClasses ecoreClass="model1.ecore#//Company"> >+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model1.ecore#//Company/categories"/> >+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model1.ecore#//Company/suppliers"/> >+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model1.ecore#//Company/customers"/> >+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model1.ecore#//Company/purchaseOrders"/> >+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model1.ecore#//Company/salesOrders"/> >+ </genClasses> >+ <genClasses ecoreClass="model1.ecore#//Supplier"> >+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model1.ecore#//Supplier/purchaseOrders"/> >+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model1.ecore#//Supplier/preferred"/> >+ </genClasses> >+ <genClasses ecoreClass="model1.ecore#//Customer"> >+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model1.ecore#//Customer/salesOrders"/> >+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model1.ecore#//Customer/orderByProduct"/> >+ </genClasses> >+ <genClasses ecoreClass="model1.ecore#//Order"> >+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model1.ecore#//Order/orderDetails"/> >+ </genClasses> >+ <genClasses ecoreClass="model1.ecore#//OrderDetail"> >+ <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference model1.ecore#//OrderDetail/order"/> >+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model1.ecore#//OrderDetail/product"/> >+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model1.ecore#//OrderDetail/price"/> >+ </genClasses> >+ <genClasses ecoreClass="model1.ecore#//PurchaseOrder"> >+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model1.ecore#//PurchaseOrder/date"/> >+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model1.ecore#//PurchaseOrder/supplier"/> >+ </genClasses> >+ <genClasses ecoreClass="model1.ecore#//SalesOrder"> >+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model1.ecore#//SalesOrder/id"/> >+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model1.ecore#//SalesOrder/customer"/> >+ </genClasses> >+ <genClasses ecoreClass="model1.ecore#//Category"> >+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model1.ecore#//Category/name"/> >+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model1.ecore#//Category/categories"/> >+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model1.ecore#//Category/products"/> >+ </genClasses> >+ <genClasses ecoreClass="model1.ecore#//Product1"> >+ <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/description"/> >+ </genClasses> >+ <genClasses ecoreClass="model1.ecore#//OrderAddress"> >+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model1.ecore#//OrderAddress/testAttribute"/> >+ </genClasses> >+ <genClasses ecoreClass="model1.ecore#//ProductToOrder"> >+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model1.ecore#//ProductToOrder/key"/> >+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model1.ecore#//ProductToOrder/value"/> >+ </genClasses> >+ </genPackages> >+</genmodel:GenModel> >#P org.eclipse.emf.cdo >Index: src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java,v >retrieving revision 1.81 >diff -u -r1.81 CDOResourceImpl.java >--- src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java 23 Oct 2009 09:09:50 -0000 1.81 >+++ src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java 14 Nov 2009 18:55:54 -0000 >@@ -11,6 +11,7 @@ > */ > package org.eclipse.emf.cdo.eresource.impl; > >+import org.eclipse.emf.cdo.CDOObject; > import org.eclipse.emf.cdo.CDOState; > import org.eclipse.emf.cdo.common.id.CDOID; > import org.eclipse.emf.cdo.common.id.CDOIDUtil; >@@ -21,6 +22,7 @@ > import org.eclipse.emf.cdo.view.CDOView; > import org.eclipse.emf.cdo.view.CDOViewProviderRegistry; > >+import org.eclipse.emf.internal.cdo.CDOObjectWrapper; > import org.eclipse.emf.internal.cdo.CDOStateMachine; > import org.eclipse.emf.internal.cdo.util.FSMUtil; > >@@ -529,7 +531,9 @@ > > if (cdoID.isObject()) > { >- return cdoView().getObject(cdoID, true); >+ // return cdoView().getObject(cdoID, true); >+ CDOObject object = cdoView().getObject(cdoID, true); >+ return object instanceof CDOObjectWrapper ? ((CDOObjectWrapper)object).cdoInternalInstance() : object; > } > } > catch (Exception ex) >Index: src/org/eclipse/emf/internal/cdo/CDOObjectWrapper.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectWrapper.java,v >retrieving revision 1.18 >diff -u -r1.18 CDOObjectWrapper.java >--- src/org/eclipse/emf/internal/cdo/CDOObjectWrapper.java 8 Nov 2009 17:03:32 -0000 1.18 >+++ src/org/eclipse/emf/internal/cdo/CDOObjectWrapper.java 14 Nov 2009 18:55:54 -0000 >@@ -93,7 +93,9 @@ > { > if (id == null || id.isNull()) > { >- throw new IllegalArgumentException("id is null"); //$NON-NLS-1$ >+ // TODO Martin: Exception should not be throw because CDOStateMachine sets ID to null in detach Method. Should >+ // Discuss this with Eike >+ // throw new IllegalArgumentException("id is null"); //$NON-NLS-1$ > } > > if (TRACER.isEnabled()) >#P org.eclipse.emf.cdo.tests >Index: src/org/eclipse/emf/cdo/tests/MangoTest.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MangoTest.java,v >retrieving revision 1.6 >diff -u -r1.6 MangoTest.java >--- src/org/eclipse/emf/cdo/tests/MangoTest.java 11 Jan 2009 09:23:48 -0000 1.6 >+++ src/org/eclipse/emf/cdo/tests/MangoTest.java 14 Nov 2009 18:55:56 -0000 >@@ -13,8 +13,8 @@ > import org.eclipse.emf.cdo.CDOState; > import org.eclipse.emf.cdo.eresource.CDOResource; > import org.eclipse.emf.cdo.session.CDOSession; >-import org.eclipse.emf.cdo.tests.mango.Value; >-import org.eclipse.emf.cdo.tests.mango.ValueList; >+import org.eclipse.emf.cdo.tests.mango.MangoValue; >+import org.eclipse.emf.cdo.tests.mango.MangoValueList; > import org.eclipse.emf.cdo.transaction.CDOTransaction; > import org.eclipse.emf.cdo.util.CDOUtil; > >@@ -29,15 +29,15 @@ > CDOTransaction transaction = session.openTransaction(); > CDOResource resource = transaction.createResource("/test1"); > >- Value v1 = getMangoFactory().createValue(); >+ MangoValue v1 = getMangoFactory().createMangoValue(); > v1.setName("v1"); > resource.getContents().add(v1); > >- Value v2 = getMangoFactory().createValue(); >+ MangoValue v2 = getMangoFactory().createMangoValue(); > v2.setName("v2"); > resource.getContents().add(v2); > >- ValueList list = getMangoFactory().createValueList(); >+ MangoValueList list = getMangoFactory().createMangoValueList(); > list.setName("List"); > list.getValues().add(v1); > list.getValues().add(v2); >Index: src/org/eclipse/emf/cdo/tests/InvalidationTest.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/InvalidationTest.java,v >retrieving revision 1.34 >diff -u -r1.34 InvalidationTest.java >--- src/org/eclipse/emf/cdo/tests/InvalidationTest.java 31 Jul 2009 09:51:08 -0000 1.34 >+++ src/org/eclipse/emf/cdo/tests/InvalidationTest.java 14 Nov 2009 18:55:56 -0000 >@@ -687,7 +687,10 @@ > msg("Attaching viewB"); > final CDOView viewB = sessionB.openTransaction(); > >- final Category category1B = (Category)viewB.getResourceSet().getEObject(uriCategory1, true); >+ // final Category category1B = (Category)viewB.getResourceSet().getEObject(uriCategory1, true); >+ >+ EObject eObject = viewB.getResourceSet().getEObject(uriCategory1, true); >+ final Category category1B = (Category)eObject; > > // ************************************************************* // > msg("Opening sessionB"); >Index: src/org/eclipse/emf/cdo/tests/PackageRegistryTest.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PackageRegistryTest.java,v >retrieving revision 1.42 >diff -u -r1.42 PackageRegistryTest.java >--- src/org/eclipse/emf/cdo/tests/PackageRegistryTest.java 10 Jul 2009 18:16:13 -0000 1.42 >+++ src/org/eclipse/emf/cdo/tests/PackageRegistryTest.java 14 Nov 2009 18:55:56 -0000 >@@ -18,7 +18,7 @@ > import org.eclipse.emf.cdo.session.CDOSession; > import org.eclipse.emf.cdo.tests.bundle.OM; > import org.eclipse.emf.cdo.tests.config.IRepositoryConfig; >-import org.eclipse.emf.cdo.tests.mango.Value; >+import org.eclipse.emf.cdo.tests.mango.MangoValue; > import org.eclipse.emf.cdo.tests.model1.Company; > import org.eclipse.emf.cdo.tests.model1.Model1Package; > import org.eclipse.emf.cdo.tests.model1.PurchaseOrder; >@@ -114,7 +114,7 @@ > CDOTransaction transaction = session.openTransaction(); > CDOResource res = transaction.getResource("/res"); > >- Value value = getMangoFactory().createValue(); >+ MangoValue value = getMangoFactory().createMangoValue(); > value.setName("V0"); > res.getContents().add(value); > >Index: src/org/eclipse/emf/cdo/tests/config/impl/ModelConfig.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/ModelConfig.java,v >retrieving revision 1.7 >diff -u -r1.7 ModelConfig.java >--- src/org/eclipse/emf/cdo/tests/config/impl/ModelConfig.java 5 May 2009 11:11:28 -0000 1.7 >+++ src/org/eclipse/emf/cdo/tests/config/impl/ModelConfig.java 14 Nov 2009 18:55:56 -0000 >@@ -131,74 +131,95 @@ > } > } > >- // TODO LEGACY >- // /** >- // * @author Eike Stepper >- // */ >- // public static final class Legacy extends ModelConfig >- // { >- // public static final String NAME = "Legacy"; >- // >- // public static final Legacy INSTANCE = new Legacy(); >- // >- // public Legacy() >- // { >- // super(NAME); >- // } >- // >- // public MangoFactory getMangoFactory() >- // { >- // return org.eclipse.emf.cdo.tests.legacy.mango.MangoFactory.eINSTANCE; >- // } >- // >- // public MangoPackage getMangoPackage() >- // { >- // return org.eclipse.emf.cdo.tests.legacy.mango.MangoPackage.eINSTANCE; >- // } >- // >- // public Model1Factory getModel1Factory() >- // { >- // return org.eclipse.emf.cdo.tests.legacy.model1.Model1Factory.eINSTANCE; >- // } >- // >- // public Model1Package getModel1Package() >- // { >- // return org.eclipse.emf.cdo.tests.legacy.model1.Model1Package.eINSTANCE; >- // } >- // >- // public Model2Factory getModel2Factory() >- // { >- // return org.eclipse.emf.cdo.tests.legacy.model2.Model2Factory.eINSTANCE; >- // } >- // >- // public Model2Package getModel2Package() >- // { >- // return org.eclipse.emf.cdo.tests.legacy.model2.Model2Package.eINSTANCE; >- // } >- // >- // public Model3Factory getModel3Factory() >- // { >- // return org.eclipse.emf.cdo.tests.legacy.model3.Model3Factory.eINSTANCE; >- // } >- // >- // public Model3Package getModel3Package() >- // { >- // return org.eclipse.emf.cdo.tests.legacy.model3.Model3Package.eINSTANCE; >- // } >- // >- // public model4Factory getModel4Factory() >- // { >- // return org.eclipse.emf.cdo.tests.legacy.model4.model4Factory.eINSTANCE; >- // } >- // >- // public model4Package getModel4Package() >- // { >- // return org.eclipse.emf.cdo.tests.legacy.model4.model4Package.eINSTANCE; >- // } >- // >- // public model4interfacesPackage getModel4InterfacesPackage() >- // { >- // return org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage.eINSTANCE; >- // } >- // } >+ /** >+ * @author Eike Stepper >+ */ >+ public static final class Legacy extends ModelConfig >+ { >+ private static final long serialVersionUID = 1L; >+ >+ public static final String NAME = "Legacy"; >+ >+ public static final Legacy INSTANCE = new Legacy(); >+ >+ public Legacy() >+ { >+ super(NAME); >+ } >+ >+ public MangoFactory getMangoFactory() >+ { >+ return org.eclipse.emf.cdo.tests.legacy.mango.impl.MangoFactoryImpl.eINSTANCE; >+ } >+ >+ public MangoPackage getMangoPackage() >+ { >+ return org.eclipse.emf.cdo.tests.legacy.mango.impl.MangoPackageImpl.eINSTANCE; >+ } >+ >+ public Model1Factory getModel1Factory() >+ { >+ return org.eclipse.emf.cdo.tests.legacy.model1.Model1Factory.eINSTANCE; >+ } >+ >+ public Model1Package getModel1Package() >+ { >+ return org.eclipse.emf.cdo.tests.legacy.model1.Model1Package.eINSTANCE; >+ } >+ >+ public Model2Factory getModel2Factory() >+ { >+ return org.eclipse.emf.cdo.tests.legacy.model2.Model2Factory.eINSTANCE; >+ } >+ >+ public Model2Package getModel2Package() >+ { >+ return org.eclipse.emf.cdo.tests.legacy.model2.Model2Package.eINSTANCE; >+ } >+ >+ public Model3Factory getModel3Factory() >+ { >+ return org.eclipse.emf.cdo.tests.legacy.model3.Model3Factory.eINSTANCE; >+ } >+ >+ public Model3Package getModel3Package() >+ { >+ return org.eclipse.emf.cdo.tests.legacy.model3.Model3Package.eINSTANCE; >+ } >+ >+ public SubpackageFactory getModel3SubPackageFactory() >+ { >+ return org.eclipse.emf.cdo.tests.legacy.model3.subpackage.SubpackageFactory.eINSTANCE; >+ } >+ >+ public SubpackagePackage getModel3SubPackagePackage() >+ { >+ return org.eclipse.emf.cdo.tests.legacy.model3.subpackage.SubpackagePackage.eINSTANCE; >+ } >+ >+ public model4Factory getModel4Factory() >+ { >+ return org.eclipse.emf.cdo.tests.legacy.model4.model4Factory.eINSTANCE; >+ } >+ >+ public model4Package getModel4Package() >+ { >+ return org.eclipse.emf.cdo.tests.legacy.model4.model4Package.eINSTANCE; >+ } >+ >+ public model4interfacesPackage getModel4InterfacesPackage() >+ { >+ return org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage.eINSTANCE; >+ } >+ >+ public Model5Factory getModel5Factory() >+ { >+ return org.eclipse.emf.cdo.tests.legacy.model5.Model5Factory.eINSTANCE; >+ } >+ >+ public Model5Package getModel5Package() >+ { >+ return org.eclipse.emf.cdo.tests.legacy.model5.Model5Package.eINSTANCE; >+ } >+ } > } >Index: src/org/eclipse/emf/cdo/tests/config/IConstants.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/IConstants.java,v >retrieving revision 1.11 >diff -u -r1.11 IConstants.java >--- src/org/eclipse/emf/cdo/tests/config/IConstants.java 10 Jul 2009 18:42:16 -0000 1.11 >+++ src/org/eclipse/emf/cdo/tests/config/IConstants.java 14 Nov 2009 18:55:56 -0000 >@@ -33,4 +33,6 @@ > public static final SessionConfig TCP = SessionConfig.TCP.INSTANCE; > > public static final ModelConfig NATIVE = ModelConfig.Native.INSTANCE; >+ >+ public static final ModelConfig LEGACY = ModelConfig.Legacy.INSTANCE; > } >Index: src/org/eclipse/emf/cdo/tests/AllTestsLegacy.java >=================================================================== >RCS file: src/org/eclipse/emf/cdo/tests/AllTestsLegacy.java >diff -N src/org/eclipse/emf/cdo/tests/AllTestsLegacy.java >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ src/org/eclipse/emf/cdo/tests/AllTestsLegacy.java 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,42 @@ >+/** >+ * Copyright (c) 2004 - 2009 Eike Stepper (Berlin, Germany) and others. >+ * All rights reserved. This program and the accompanying materials >+ * are made available under the terms of the Eclipse Public License v1.0 >+ * which accompanies this distribution, and is available at >+ * http://www.eclipse.org/legal/epl-v10.html >+ * >+ * Contributors: >+ * Eike Stepper - initial API and implementation >+ */ >+package org.eclipse.emf.cdo.tests; >+ >+import org.eclipse.emf.cdo.tests.config.impl.ConfigTest; >+ >+import java.util.List; >+ >+import junit.framework.Test; >+import junit.framework.TestSuite; >+ >+/** >+ * @author Eike Stepper >+ */ >+public class AllTestsLegacy extends AllTestsAllConfigs >+{ >+ public static Test suite() >+ { >+ return new AllTestsLegacy().getTestSuite(AllTestsAllConfigs.class.getName()); >+ } >+ >+ @Override >+ protected void initTestClasses(List<Class<? extends ConfigTest>> testClasses) >+ { >+ testClasses.add(MangoTest.class); >+ testClasses.add(InvalidationTest.class); >+ } >+ >+ @Override >+ protected void initConfigSuites(TestSuite parent) >+ { >+ addScenario(parent, COMBINED, MEM, JVM, LEGACY); >+ } >+}
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 247226
:
112514
|
112894
|
134866
|
151009
|
151634
|
151651
|
152232
|
153867
|
153868
|
155030
|
155031
|
155181
|
155182
|
155400
|
163497
|
163499