You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2010/09/29 09:10:58 UTC
svn commit: r1002496 [3/8] - in /tuscany/sdo-java/branches/emf-2.5: ./
impl/model/ impl/src/main/java/org/apache/tuscany/sdo/
impl/src/main/java/org/apache/tuscany/sdo/helper/
impl/src/main/java/org/apache/tuscany/sdo/impl/
impl/src/main/java/org/apach...
Modified: tuscany/sdo-java/branches/emf-2.5/impl/src/main/java/org/apache/tuscany/sdo/helper/BaseSDOExtendedMetaDataImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sdo-java/branches/emf-2.5/impl/src/main/java/org/apache/tuscany/sdo/helper/BaseSDOExtendedMetaDataImpl.java?rev=1002496&r1=1002493&r2=1002496&view=diff
==============================================================================
--- tuscany/sdo-java/branches/emf-2.5/impl/src/main/java/org/apache/tuscany/sdo/helper/BaseSDOExtendedMetaDataImpl.java (original)
+++ tuscany/sdo-java/branches/emf-2.5/impl/src/main/java/org/apache/tuscany/sdo/helper/BaseSDOExtendedMetaDataImpl.java Wed Sep 29 07:10:57 2010
@@ -19,6 +19,8 @@
*/
package org.apache.tuscany.sdo.helper;
+import org.apache.tuscany.sdo.SDOPackage;
+import org.apache.tuscany.sdo.impl.SDOPackageImpl;
import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EClassifier;
@@ -33,135 +35,144 @@ import org.eclipse.emf.ecore.util.Extend
import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
/**
- * A BasicExtendedMetaData that uses a supplied (SDO) ecore factory to create properties and types.
+ * A BasicExtendedMetaData that uses a supplied (SDO) ecore factory to create
+ * properties and types.
*/
-public class BaseSDOExtendedMetaDataImpl extends BasicExtendedMetaData
-{
- protected EcoreFactory ecoreFactory = EcoreFactory.eINSTANCE;
- protected DemandMetaData demandMetaData = new DemandMetaData();
-
- public static class DemandMetaData {
- EClassifier getEObject() { return EcorePackage.eINSTANCE.getEObject(); }
- EClassifier getAnyType() { return XMLTypePackage.eINSTANCE.getAnyType(); }
- EClassifier getAnySimpleType() { return XMLTypePackage.eINSTANCE.getAnySimpleType(); }
- EClassifier getXMLTypeDocumentRoot() { return XMLTypePackage.eINSTANCE.getXMLTypeDocumentRoot(); }
- }
-
- public BaseSDOExtendedMetaDataImpl(EPackage.Registry registry)
- {
- super(registry);
- }
-
- public EPackage demandPackage(String namespace)
- {
- EPackage ePackage = demandRegistry.getEPackage(namespace);
- if (ePackage == null)
- {
- ePackage = ecoreFactory.createEPackage();
- ePackage.setNsURI(namespace);
- setQualified(ePackage, namespace != null);
- if (namespace != null)
- {
- ePackage.setNsPrefix
- (namespace.equals(ExtendedMetaData.XMLNS_URI) ?
- namespace.equals(ExtendedMetaData.XML_URI) ?
- "xml" :
- "xmlns" :
- computePrefix(namespace));
- }
- demandRegistry.put(namespace, ePackage);
-
- // demandDocumentRoot(ePackage);
-
- EClass documentRootEClass = ecoreFactory.createEClass();
- documentRootEClass.getESuperTypes().add(demandMetaData.getXMLTypeDocumentRoot());
- documentRootEClass.setName("DocumentRoot");
- ePackage.getEClassifiers().add(documentRootEClass);
- setDocumentRoot(documentRootEClass);
- }
- return ePackage;
- }
-
- public EClassifier demandType(String namespace, String name)
- {
- EPackage ePackage = demandPackage(namespace);
- EClassifier eClassifier = getType(ePackage, name);
- if (eClassifier != null)
- {
- return eClassifier;
- }
- else
- {
- EClass eClass = ecoreFactory.createEClass();
- eClass.setName(name);
- eClass.getESuperTypes().add(demandMetaData.getAnyType());
- setContentKind(eClass, MIXED_CONTENT);
- ePackage.getEClassifiers().add(eClass);
- return eClass;
- }
- }
-
- public EStructuralFeature demandFeature(String namespace, String name, boolean isElement, boolean isReference)
- {
- EPackage ePackage = demandPackage(namespace);
- EClass documentRootEClass = getDocumentRoot(ePackage);
- EStructuralFeature eStructuralFeature =
- isElement ?
- getLocalElement(documentRootEClass, namespace, name) :
- getLocalAttribute(documentRootEClass, namespace, name);
- if (eStructuralFeature != null)
- {
- return eStructuralFeature;
- }
- else
- {
- if (isReference)
- {
- EReference eReference = ecoreFactory.createEReference();
- eReference.setContainment(isElement);
- eReference.setEType(demandMetaData.getEObject());
- eReference.setName(name);
- eReference.setDerived(true);
- eReference.setTransient(true);
- eReference.setVolatile(true);
- documentRootEClass.getEStructuralFeatures().add(eReference);
-
- setFeatureKind(eReference, isElement ? ELEMENT_FEATURE : ATTRIBUTE_FEATURE);
- setNamespace(eReference, namespace);
-
- // Mark the bound as unspecified so that it won't be considered many
- // but can nevertheless be recognized as being unspecified and perhaps still be treat as many.
- //
- if (isElement)
- {
- eReference.setUpperBound(ETypedElement.UNSPECIFIED_MULTIPLICITY);
- }
-
- return eReference;
- }
- else
- {
- EAttribute eAttribute = ecoreFactory.createEAttribute();
- eAttribute.setName(name);
- eAttribute.setEType(demandMetaData.getAnySimpleType());
- eAttribute.setDerived(true);
- eAttribute.setTransient(true);
- eAttribute.setVolatile(true);
- documentRootEClass.getEStructuralFeatures().add(eAttribute);
-
- setFeatureKind(eAttribute, isElement ? ELEMENT_FEATURE : ATTRIBUTE_FEATURE);
- setNamespace(eAttribute, namespace);
-
- // Mark the bound as unspecified so that it won't be considered many
- // but can nevertheless be recognized as being unspecified and perhaps still be treat as many.
- //
- if (isElement)
- {
- eAttribute.setUpperBound(ETypedElement.UNSPECIFIED_MULTIPLICITY);
- }
-
- return eAttribute;
- }
- }
- }
+public class BaseSDOExtendedMetaDataImpl extends BasicExtendedMetaData {
+ protected EcoreFactory ecoreFactory = EcoreFactory.eINSTANCE;
+ protected DemandMetaData demandMetaData = new DemandMetaData();
+
+ public static class DemandMetaData {
+ EClassifier getEObject() {
+ return EcorePackage.eINSTANCE.getEObject();
+ }
+
+ EClass getAnyType() {
+ return XMLTypePackage.eINSTANCE.getAnyType();
+ }
+
+ EClassifier getAnySimpleType() {
+ return XMLTypePackage.eINSTANCE.getAnySimpleType();
+ }
+
+ EClass getXMLTypeDocumentRoot() {
+ return XMLTypePackage.eINSTANCE.getXMLTypeDocumentRoot();
+ }
+ }
+
+ public BaseSDOExtendedMetaDataImpl(EPackage.Registry registry) {
+ super(registry);
+ }
+
+ public EPackage demandPackage(String namespace) {
+ EPackage ePackage = demandRegistry.getEPackage(namespace);
+ if (ePackage == null) {
+ ePackage = ecoreFactory.createEPackage();
+ ePackage.setNsURI(namespace);
+ setQualified(ePackage, namespace != null);
+ if (namespace != null) {
+ ePackage.setNsPrefix(namespace
+ .equals(ExtendedMetaData.XMLNS_URI) ? namespace
+ .equals(ExtendedMetaData.XML_URI) ? "xml" : "xmlns"
+ : computePrefix(namespace));
+ }
+ demandRegistry.put(namespace, ePackage);
+
+ // demandDocumentRoot(ePackage);
+
+ EClass documentRootEClass = ecoreFactory.createEClass();
+ documentRootEClass.getESuperTypes().add(
+ demandMetaData.getXMLTypeDocumentRoot());
+ documentRootEClass.setName("DocumentRoot");
+ ePackage.getEClassifiers().add(documentRootEClass);
+ setDocumentRoot(documentRootEClass);
+ }
+ return ePackage;
+ }
+
+ public EClassifier demandType(String namespace, String name) {
+ EPackage ePackage = demandPackage(namespace);
+ EClassifier eClassifier = getType(ePackage, name);
+ if (eClassifier != null) {
+ return eClassifier;
+ } else {
+ // if it is a DataObject I need to put the SDOPackage DataObject
+ // Class...
+ EClass eClass = null;
+ //if ("DataObject".equals(name)) {
+ // eClass = SDOPackage.eINSTANCE.getAnyTypeDataObject();
+ //} else {
+ eClass = ecoreFactory.createEClass();
+ eClass.setName(name);
+ eClass.getESuperTypes().add(demandMetaData.getAnyType());
+ setContentKind(eClass, MIXED_CONTENT);
+ //}
+
+ ePackage.getEClassifiers().add(eClass);
+ return eClass;
+ }
+ }
+
+ public EStructuralFeature demandFeature(String namespace, String name,
+ boolean isElement, boolean isReference) {
+ EPackage ePackage = demandPackage(namespace);
+ EClass documentRootEClass = getDocumentRoot(ePackage);
+ EStructuralFeature eStructuralFeature = isElement ? getLocalElement(
+ documentRootEClass, namespace, name) : getLocalAttribute(
+ documentRootEClass, namespace, name);
+ if (eStructuralFeature != null) {
+ return eStructuralFeature;
+ } else {
+ if (isReference) {
+ EReference eReference = ecoreFactory.createEReference();
+ eReference.setContainment(isElement);
+ eReference.setEType(demandMetaData.getEObject());
+ eReference.setName(name);
+ eReference.setDerived(true);
+ eReference.setTransient(true);
+ eReference.setVolatile(true);
+ documentRootEClass.getEStructuralFeatures().add(eReference);
+
+ setFeatureKind(eReference, isElement ? ELEMENT_FEATURE
+ : ATTRIBUTE_FEATURE);
+ setNamespace(eReference, namespace);
+
+ // Mark the bound as unspecified so that it won't be considered
+ // many
+ // but can nevertheless be recognized as being unspecified and
+ // perhaps still be treat as many.
+ //
+ if (isElement) {
+ eReference
+ .setUpperBound(ETypedElement.UNSPECIFIED_MULTIPLICITY);
+ }
+
+ return eReference;
+ } else {
+ EAttribute eAttribute = ecoreFactory.createEAttribute();
+ eAttribute.setName(name);
+ eAttribute.setEType(demandMetaData.getAnySimpleType());
+ eAttribute.setDerived(true);
+ eAttribute.setTransient(true);
+ eAttribute.setVolatile(true);
+ documentRootEClass.getEStructuralFeatures().add(eAttribute);
+
+ setFeatureKind(eAttribute, isElement ? ELEMENT_FEATURE
+ : ATTRIBUTE_FEATURE);
+ setNamespace(eAttribute, namespace);
+
+ // Mark the bound as unspecified so that it won't be considered
+ // many
+ // but can nevertheless be recognized as being unspecified and
+ // perhaps still be treat as many.
+ //
+ if (isElement) {
+ eAttribute
+ .setUpperBound(ETypedElement.UNSPECIFIED_MULTIPLICITY);
+ }
+
+ return eAttribute;
+ }
+ }
+ }
}
Modified: tuscany/sdo-java/branches/emf-2.5/impl/src/main/java/org/apache/tuscany/sdo/helper/BaseSDOXSDEcoreBuilder.java
URL: http://svn.apache.org/viewvc/tuscany/sdo-java/branches/emf-2.5/impl/src/main/java/org/apache/tuscany/sdo/helper/BaseSDOXSDEcoreBuilder.java?rev=1002496&r1=1002493&r2=1002496&view=diff
==============================================================================
--- tuscany/sdo-java/branches/emf-2.5/impl/src/main/java/org/apache/tuscany/sdo/helper/BaseSDOXSDEcoreBuilder.java (original)
+++ tuscany/sdo-java/branches/emf-2.5/impl/src/main/java/org/apache/tuscany/sdo/helper/BaseSDOXSDEcoreBuilder.java Wed Sep 29 07:10:57 2010
@@ -467,7 +467,7 @@ public class BaseSDOXSDEcoreBuilder exte
EClassifier mixinType = getEClassifier(mixin);
if (mixinType instanceof EClass && mixinType != ecorePackage.getEObject())
{
- eClass.getESuperTypes().add(mixinType);
+ eClass.getESuperTypes().add((EClass) mixinType);
}
}
}
Modified: tuscany/sdo-java/branches/emf-2.5/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOExtendedMetaDataImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sdo-java/branches/emf-2.5/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOExtendedMetaDataImpl.java?rev=1002496&r1=1002493&r2=1002496&view=diff
==============================================================================
--- tuscany/sdo-java/branches/emf-2.5/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOExtendedMetaDataImpl.java (original)
+++ tuscany/sdo-java/branches/emf-2.5/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOExtendedMetaDataImpl.java Wed Sep 29 07:10:57 2010
@@ -25,6 +25,7 @@ import java.util.List;
import java.util.StringTokenizer;
import org.apache.tuscany.sdo.SDOExtendedMetaData;
+import org.apache.tuscany.sdo.SDOPackage;
import org.apache.tuscany.sdo.impl.SDOFactoryImpl.SDOEcoreFactory;
import org.apache.tuscany.sdo.model.ModelFactory;
import org.apache.tuscany.sdo.model.impl.ModelFactoryImpl;
@@ -52,6 +53,8 @@ public class SDOExtendedMetaDataImpl
super(registry);
ecoreFactory = new SDOEcoreFactory();
demandMetaData = new SDODemandMetaData();
+
+ //demandRegistry.put("commonj.sdo", SDOPackage.eINSTANCE);
}
public static class SDODemandMetaData extends DemandMetaData {
Modified: tuscany/sdo-java/branches/emf-2.5/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOHelperImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sdo-java/branches/emf-2.5/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOHelperImpl.java?rev=1002496&r1=1002493&r2=1002496&view=diff
==============================================================================
--- tuscany/sdo-java/branches/emf-2.5/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOHelperImpl.java (original)
+++ tuscany/sdo-java/branches/emf-2.5/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOHelperImpl.java Wed Sep 29 07:10:57 2010
@@ -329,7 +329,7 @@ public class SDOHelperImpl extends SDOHe
}
public void addBaseType(Type type, Type baseType) {
- ((EClass)type).getESuperTypes().add(baseType);
+ ((EClass)type).getESuperTypes().add((EClass) baseType);
}
public void addAliasName(Type type, String aliasName) {
@@ -519,7 +519,7 @@ public class SDOHelperImpl extends SDOHe
public void addChangeListener(DataObject dob, EventListener listener) {
// Adapter l = (Adapter)listener;
- ((Notifier)dob).eAdapters().add(listener);
+ ((Notifier)dob).eAdapters().add((Adapter) listener);
}
public void removeChangeListener(DataObject dob, EventListener listener) {
Modified: tuscany/sdo-java/branches/emf-2.5/impl/src/main/java/org/apache/tuscany/sdo/impl/AnyTypeDataObjectImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sdo-java/branches/emf-2.5/impl/src/main/java/org/apache/tuscany/sdo/impl/AnyTypeDataObjectImpl.java?rev=1002496&r1=1002493&r2=1002496&view=diff
==============================================================================
--- tuscany/sdo-java/branches/emf-2.5/impl/src/main/java/org/apache/tuscany/sdo/impl/AnyTypeDataObjectImpl.java (original)
+++ tuscany/sdo-java/branches/emf-2.5/impl/src/main/java/org/apache/tuscany/sdo/impl/AnyTypeDataObjectImpl.java Wed Sep 29 07:10:57 2010
@@ -23,10 +23,12 @@ import org.apache.tuscany.sdo.AnyTypeDat
import org.apache.tuscany.sdo.SDOPackage;
import org.apache.tuscany.sdo.util.BasicSequence;
import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
import org.eclipse.emf.ecore.util.BasicFeatureMap;
import org.eclipse.emf.ecore.util.FeatureMap;
+import org.eclipse.emf.ecore.util.FeatureMapUtil;
import org.eclipse.emf.ecore.util.InternalEList;
import org.eclipse.emf.ecore.xml.type.AnyType;
import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
@@ -49,44 +51,44 @@ import org.eclipse.emf.ecore.xml.type.XM
public class AnyTypeDataObjectImpl extends DataObjectImpl implements AnyTypeDataObject
{
/**
- * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list.
- * <!-- begin-user-doc -->
+ * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list.
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getMixed()
- * @generated
- * @ordered
- */
- protected FeatureMap mixed = null;
+ * @see #getMixed()
+ * @generated
+ * @ordered
+ */
+ protected FeatureMap mixed;
/**
- * The cached value of the '{@link #getAnyAttribute() <em>Any Attribute</em>}' attribute list.
- * <!-- begin-user-doc -->
+ * The cached value of the '{@link #getAnyAttribute() <em>Any Attribute</em>}' attribute list.
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getAnyAttribute()
- * @generated
- * @ordered
- */
- protected FeatureMap anyAttribute = null;
+ * @see #getAnyAttribute()
+ * @generated
+ * @ordered
+ */
+ protected FeatureMap anyAttribute;
/**
- * <!-- begin-user-doc -->
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
- */
+ * @generated
+ */
protected AnyTypeDataObjectImpl()
{
- super();
- }
+ super();
+ }
/**
- * <!-- begin-user-doc -->
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
- */
+ * @generated
+ */
protected EClass eStaticClass()
{
- return SDOPackage.eINSTANCE.getAnyTypeDataObject();
- }
+ return SDOPackage.Literals.ANY_TYPE_DATA_OBJECT;
+ }
/**
* <!-- begin-user-doc -->
@@ -111,8 +113,8 @@ public class AnyTypeDataObjectImpl exten
public FeatureMap getAny()
{
//return (FeatureMap)((FeatureMap)getMixed()).list(XMLTypePackage.eINSTANCE.getAnyType_Any());
- return new BasicSequence((FeatureMap.Internal)((FeatureMap)getMixed()).list(XMLTypePackage.eINSTANCE.getAnyType_Any())).featureMap();
- }
+ return new BasicSequence((FeatureMap.Internal)(EList<?>)((FeatureMap)getMixed()).list(XMLTypePackage.eINSTANCE.getAnyType_Any())).featureMap();
+ }
/**
* <!-- begin-user-doc -->
@@ -130,170 +132,155 @@ public class AnyTypeDataObjectImpl exten
}
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs)
- {
- if (featureID >= 0)
- {
- switch (eDerivedStructuralFeatureID(featureID, baseClass))
- {
- case SDOPackage.ANY_TYPE_DATA_OBJECT__MIXED:
- return ((InternalEList)getMixed()).basicRemove(otherEnd, msgs);
- case SDOPackage.ANY_TYPE_DATA_OBJECT__ANY:
- return ((InternalEList)getAny()).basicRemove(otherEnd, msgs);
- case SDOPackage.ANY_TYPE_DATA_OBJECT__ANY_ATTRIBUTE:
- return ((InternalEList)getAnyAttribute()).basicRemove(otherEnd, msgs);
- default:
- return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
- }
- }
- return eBasicSetContainer(null, featureID, msgs);
- }
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+ switch (featureID) {
+ case SDOPackage.ANY_TYPE_DATA_OBJECT__MIXED:
+ return ((InternalEList)getMixed()).basicRemove(otherEnd, msgs);
+ case SDOPackage.ANY_TYPE_DATA_OBJECT__ANY:
+ return ((InternalEList)getAny()).basicRemove(otherEnd, msgs);
+ case SDOPackage.ANY_TYPE_DATA_OBJECT__ANY_ATTRIBUTE:
+ return ((InternalEList)getAnyAttribute()).basicRemove(otherEnd, msgs);
+ }
+ return super.eInverseRemove(otherEnd, featureID, msgs);
+ }
- /**
- * <!-- begin-user-doc -->
+ /**
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
- */
+ * @generated
+ */
public Object eGet(int featureID, boolean resolve, boolean coreType)
{
- switch (featureID)
- {
- case SDOPackage.ANY_TYPE_DATA_OBJECT__MIXED:
- if (coreType) return getMixed();
- return ((FeatureMap.Internal)getMixed()).getWrapper();
- case SDOPackage.ANY_TYPE_DATA_OBJECT__ANY:
- if (coreType) return getAny();
- return ((FeatureMap.Internal)getAny()).getWrapper();
- case SDOPackage.ANY_TYPE_DATA_OBJECT__ANY_ATTRIBUTE:
- if (coreType) return getAnyAttribute();
- return ((FeatureMap.Internal)getAnyAttribute()).getWrapper();
- }
- return eDynamicGet(featureID, resolve, coreType);
- }
+ switch (featureID) {
+ case SDOPackage.ANY_TYPE_DATA_OBJECT__MIXED:
+ if (coreType) return getMixed();
+ return ((FeatureMap.Internal)getMixed()).getWrapper();
+ case SDOPackage.ANY_TYPE_DATA_OBJECT__ANY:
+ if (coreType) return getAny();
+ return ((FeatureMap.Internal)getAny()).getWrapper();
+ case SDOPackage.ANY_TYPE_DATA_OBJECT__ANY_ATTRIBUTE:
+ if (coreType) return getAnyAttribute();
+ return ((FeatureMap.Internal)getAnyAttribute()).getWrapper();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
/**
- * <!-- begin-user-doc -->
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
- */
+ * @generated
+ */
public void eSet(int featureID, Object newValue)
{
- switch (featureID)
- {
- case SDOPackage.ANY_TYPE_DATA_OBJECT__MIXED:
- ((FeatureMap.Internal)getMixed()).set(newValue);
- return;
- case SDOPackage.ANY_TYPE_DATA_OBJECT__ANY:
- ((FeatureMap.Internal)getAny()).set(newValue);
- return;
- case SDOPackage.ANY_TYPE_DATA_OBJECT__ANY_ATTRIBUTE:
- ((FeatureMap.Internal)getAnyAttribute()).set(newValue);
- return;
- }
- eDynamicSet(featureID, newValue);
- }
+ switch (featureID) {
+ case SDOPackage.ANY_TYPE_DATA_OBJECT__MIXED:
+ ((FeatureMap.Internal)getMixed()).set(newValue);
+ return;
+ case SDOPackage.ANY_TYPE_DATA_OBJECT__ANY:
+ ((FeatureMap.Internal)getAny()).set(newValue);
+ return;
+ case SDOPackage.ANY_TYPE_DATA_OBJECT__ANY_ATTRIBUTE:
+ ((FeatureMap.Internal)getAnyAttribute()).set(newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
/**
- * <!-- begin-user-doc -->
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
- */
+ * @generated
+ */
public void eUnset(int featureID)
{
- switch (featureID)
- {
- case SDOPackage.ANY_TYPE_DATA_OBJECT__MIXED:
- getMixed().clear();
- return;
- case SDOPackage.ANY_TYPE_DATA_OBJECT__ANY:
- getAny().clear();
- return;
- case SDOPackage.ANY_TYPE_DATA_OBJECT__ANY_ATTRIBUTE:
- getAnyAttribute().clear();
- return;
- }
- eDynamicUnset(featureID);
- }
+ switch (featureID) {
+ case SDOPackage.ANY_TYPE_DATA_OBJECT__MIXED:
+ getMixed().clear();
+ return;
+ case SDOPackage.ANY_TYPE_DATA_OBJECT__ANY:
+ getAny().clear();
+ return;
+ case SDOPackage.ANY_TYPE_DATA_OBJECT__ANY_ATTRIBUTE:
+ getAnyAttribute().clear();
+ return;
+ }
+ super.eUnset(featureID);
+ }
/**
- * <!-- begin-user-doc -->
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
- */
+ * @generated
+ */
public boolean eIsSet(int featureID)
{
- switch (featureID)
- {
- case SDOPackage.ANY_TYPE_DATA_OBJECT__MIXED:
- return mixed != null && !mixed.isEmpty();
- case SDOPackage.ANY_TYPE_DATA_OBJECT__ANY:
- return !getAny().isEmpty();
- case SDOPackage.ANY_TYPE_DATA_OBJECT__ANY_ATTRIBUTE:
- return anyAttribute != null && !anyAttribute.isEmpty();
- }
- return eDynamicIsSet(featureID);
- }
+ switch (featureID) {
+ case SDOPackage.ANY_TYPE_DATA_OBJECT__MIXED:
+ return mixed != null && !mixed.isEmpty();
+ case SDOPackage.ANY_TYPE_DATA_OBJECT__ANY:
+ return !getAny().isEmpty();
+ case SDOPackage.ANY_TYPE_DATA_OBJECT__ANY_ATTRIBUTE:
+ return anyAttribute != null && !anyAttribute.isEmpty();
+ }
+ return super.eIsSet(featureID);
+ }
/**
- * <!-- begin-user-doc -->
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
- */
+ * @generated
+ */
public int eBaseStructuralFeatureID(int derivedFeatureID, Class baseClass)
{
- if (baseClass == AnyType.class)
- {
- switch (derivedFeatureID)
- {
- case SDOPackage.ANY_TYPE_DATA_OBJECT__MIXED: return XMLTypePackage.ANY_TYPE__MIXED;
- case SDOPackage.ANY_TYPE_DATA_OBJECT__ANY: return XMLTypePackage.ANY_TYPE__ANY;
- case SDOPackage.ANY_TYPE_DATA_OBJECT__ANY_ATTRIBUTE: return XMLTypePackage.ANY_TYPE__ANY_ATTRIBUTE;
- default: return -1;
- }
- }
- return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
- }
+ if (baseClass == AnyType.class) {
+ switch (derivedFeatureID) {
+ case SDOPackage.ANY_TYPE_DATA_OBJECT__MIXED: return XMLTypePackage.ANY_TYPE__MIXED;
+ case SDOPackage.ANY_TYPE_DATA_OBJECT__ANY: return XMLTypePackage.ANY_TYPE__ANY;
+ case SDOPackage.ANY_TYPE_DATA_OBJECT__ANY_ATTRIBUTE: return XMLTypePackage.ANY_TYPE__ANY_ATTRIBUTE;
+ default: return -1;
+ }
+ }
+ return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+ }
/**
- * <!-- begin-user-doc -->
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
- */
+ * @generated
+ */
public int eDerivedStructuralFeatureID(int baseFeatureID, Class baseClass)
{
- if (baseClass == AnyType.class)
- {
- switch (baseFeatureID)
- {
- case XMLTypePackage.ANY_TYPE__MIXED: return SDOPackage.ANY_TYPE_DATA_OBJECT__MIXED;
- case XMLTypePackage.ANY_TYPE__ANY: return SDOPackage.ANY_TYPE_DATA_OBJECT__ANY;
- case XMLTypePackage.ANY_TYPE__ANY_ATTRIBUTE: return SDOPackage.ANY_TYPE_DATA_OBJECT__ANY_ATTRIBUTE;
- default: return -1;
- }
- }
- return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
- }
+ if (baseClass == AnyType.class) {
+ switch (baseFeatureID) {
+ case XMLTypePackage.ANY_TYPE__MIXED: return SDOPackage.ANY_TYPE_DATA_OBJECT__MIXED;
+ case XMLTypePackage.ANY_TYPE__ANY: return SDOPackage.ANY_TYPE_DATA_OBJECT__ANY;
+ case XMLTypePackage.ANY_TYPE__ANY_ATTRIBUTE: return SDOPackage.ANY_TYPE_DATA_OBJECT__ANY_ATTRIBUTE;
+ default: return -1;
+ }
+ }
+ return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+ }
/**
- * <!-- begin-user-doc -->
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
- */
+ * @generated
+ */
public String toString()
{
- if (eIsProxy()) return super.toString();
+ if (eIsProxy()) return super.toString();
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (mixed: ");
- result.append(mixed);
- result.append(", anyAttribute: ");
- result.append(anyAttribute);
- result.append(')');
- return result.toString();
- }
+ StringBuffer result = new StringBuffer(super.toString());
+ result.append(" (mixed: ");
+ result.append(mixed);
+ result.append(", anyAttribute: ");
+ result.append(anyAttribute);
+ result.append(')');
+ return result.toString();
+ }
} //EDataObjectAnyTypeImpl
Modified: tuscany/sdo-java/branches/emf-2.5/impl/src/main/java/org/apache/tuscany/sdo/impl/AttributeImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sdo-java/branches/emf-2.5/impl/src/main/java/org/apache/tuscany/sdo/impl/AttributeImpl.java?rev=1002496&r1=1002493&r2=1002496&view=diff
==============================================================================
--- tuscany/sdo-java/branches/emf-2.5/impl/src/main/java/org/apache/tuscany/sdo/impl/AttributeImpl.java (original)
+++ tuscany/sdo-java/branches/emf-2.5/impl/src/main/java/org/apache/tuscany/sdo/impl/AttributeImpl.java Wed Sep 29 07:10:57 2010
@@ -51,17 +51,17 @@ import commonj.sdo.Type;
*
* @generated
*/
-public class AttributeImpl extends EAttributeImpl implements Property, org.apache.tuscany.sdo.model.Property/*, DataObject*/
+public class AttributeImpl extends EAttributeImpl implements Property
{
/**
- * <!-- begin-user-doc -->
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
- */
+ * @generated
+ */
protected AttributeImpl()
{
- super();
- }
+ super();
+ }
/**
* <!-- begin-user-doc -->
Modified: tuscany/sdo-java/branches/emf-2.5/impl/src/main/java/org/apache/tuscany/sdo/impl/ChangeSummaryImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sdo-java/branches/emf-2.5/impl/src/main/java/org/apache/tuscany/sdo/impl/ChangeSummaryImpl.java?rev=1002496&r1=1002493&r2=1002496&view=diff
==============================================================================
--- tuscany/sdo-java/branches/emf-2.5/impl/src/main/java/org/apache/tuscany/sdo/impl/ChangeSummaryImpl.java (original)
+++ tuscany/sdo-java/branches/emf-2.5/impl/src/main/java/org/apache/tuscany/sdo/impl/ChangeSummaryImpl.java Wed Sep 29 07:10:57 2010
@@ -57,6 +57,7 @@ import org.eclipse.emf.ecore.util.Featur
import org.eclipse.emf.ecore.util.InternalEList;
import commonj.sdo.ChangeSummary;
+import commonj.sdo.ChangeSummary.Setting;
import commonj.sdo.DataGraph;
import commonj.sdo.DataObject;
import commonj.sdo.Property;
@@ -79,14 +80,14 @@ import commonj.sdo.Sequence;
public class ChangeSummaryImpl extends ChangeDescriptionImpl implements ChangeSummary
{
/**
- * The cached value of the '{@link #getEDataGraph() <em>EData Graph</em>}' reference.
- * <!-- begin-user-doc -->
+ * The cached value of the '{@link #getEDataGraph() <em>EData Graph</em>}' reference.
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getEDataGraph()
- * @generated
- * @ordered
- */
- protected DataGraph eDataGraph = null;
+ * @see #getEDataGraph()
+ * @generated
+ * @ordered
+ */
+ protected DataGraph eDataGraph;
protected DataObject dataObject = null;
protected SDOChangeRecorder changeRecorder = null;
@@ -97,25 +98,24 @@ public class ChangeSummaryImpl extends C
protected boolean isStale = false;
/**
- * <!-- begin-user-doc -->
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
- */
+ */
protected ChangeSummaryImpl()
{
- super();
- cachedSDOObjectChanges = createThreadSafeMap();
- }
+ super();
+ cachedSDOObjectChanges = createThreadSafeMap();
+ }
/**
- * <!-- begin-user-doc -->
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
- */
+ * @generated
+ */
protected EClass eStaticClass()
{
- return SDOPackage.eINSTANCE.getChangeSummary();
- }
+ return SDOPackage.Literals.CHANGE_SUMMARY;
+ }
/**
* <!-- begin-user-doc -->
@@ -128,52 +128,50 @@ public class ChangeSummaryImpl extends C
}
/**
- * <!-- begin-user-doc -->
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
- */
+ * @generated
+ */
public DataGraph getEDataGraph()
{
- return eDataGraph;
- }
+ return eDataGraph;
+ }
/**
- * <!-- begin-user-doc -->
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
- */
+ * @generated
+ */
public NotificationChain basicSetEDataGraph(DataGraph newEDataGraph, NotificationChain msgs)
{
- DataGraph oldEDataGraph = eDataGraph;
- eDataGraph = newEDataGraph;
- if (eNotificationRequired())
- {
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SDOPackage.CHANGE_SUMMARY__EDATA_GRAPH, oldEDataGraph, newEDataGraph);
- if (msgs == null) msgs = notification; else msgs.add(notification);
- }
- return msgs;
- }
+ DataGraph oldEDataGraph = eDataGraph;
+ eDataGraph = newEDataGraph;
+ if (eNotificationRequired()) {
+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SDOPackage.CHANGE_SUMMARY__EDATA_GRAPH, oldEDataGraph, newEDataGraph);
+ if (msgs == null) msgs = notification; else msgs.add(notification);
+ }
+ return msgs;
+ }
/**
- * <!-- begin-user-doc -->
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
- */
+ * @generated
+ */
public void setEDataGraph(DataGraph newEDataGraph)
{
- if (newEDataGraph != eDataGraph)
- {
- NotificationChain msgs = null;
- if (eDataGraph != null)
- msgs = ((InternalEObject)eDataGraph).eInverseRemove(this, SDOPackage.DATA_GRAPH__ECHANGE_SUMMARY, DataGraph.class, msgs);
- if (newEDataGraph != null)
- msgs = ((InternalEObject)newEDataGraph).eInverseAdd(this, SDOPackage.DATA_GRAPH__ECHANGE_SUMMARY, DataGraph.class, msgs);
- msgs = basicSetEDataGraph(newEDataGraph, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, SDOPackage.CHANGE_SUMMARY__EDATA_GRAPH, newEDataGraph, newEDataGraph));
- }
+ if (newEDataGraph != eDataGraph) {
+ NotificationChain msgs = null;
+ if (eDataGraph != null)
+ msgs = ((InternalEObject)eDataGraph).eInverseRemove(this, SDOPackage.DATA_GRAPH__ECHANGE_SUMMARY, DataGraph.class, msgs);
+ if (newEDataGraph != null)
+ msgs = ((InternalEObject)newEDataGraph).eInverseAdd(this, SDOPackage.DATA_GRAPH__ECHANGE_SUMMARY, DataGraph.class, msgs);
+ msgs = basicSetEDataGraph(newEDataGraph, msgs);
+ if (msgs != null) msgs.dispatch();
+ }
+ else if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, SDOPackage.CHANGE_SUMMARY__EDATA_GRAPH, newEDataGraph, newEDataGraph));
+ }
public DataObject getDataObject()
{
@@ -246,162 +244,62 @@ public class ChangeSummaryImpl extends C
}
/**
- * <!-- begin-user-doc -->
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs)
- {
- if (featureID >= 0)
- {
- switch (eDerivedStructuralFeatureID(featureID, baseClass))
- {
- case SDOPackage.CHANGE_SUMMARY__EDATA_GRAPH:
- if (eDataGraph != null)
- msgs = ((InternalEObject)eDataGraph).eInverseRemove(this, SDOPackage.DATA_GRAPH__ECHANGE_SUMMARY, DataGraph.class, msgs);
- return basicSetEDataGraph((DataGraph)otherEnd, msgs);
- default:
- return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
- }
- }
- if (eInternalContainer() != null)
- msgs = eBasicRemoveFromContainer(msgs);
- return eBasicSetContainer(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs)
- {
- if (featureID >= 0)
- {
- switch (eDerivedStructuralFeatureID(featureID, baseClass))
- {
- case SDOPackage.CHANGE_SUMMARY__OBJECT_CHANGES:
- return ((InternalEList)getObjectChanges()).basicRemove(otherEnd, msgs);
- case SDOPackage.CHANGE_SUMMARY__OBJECTS_TO_ATTACH:
- return ((InternalEList)getObjectsToAttach()).basicRemove(otherEnd, msgs);
- case SDOPackage.CHANGE_SUMMARY__RESOURCE_CHANGES:
- return ((InternalEList)getResourceChanges()).basicRemove(otherEnd, msgs);
- case SDOPackage.CHANGE_SUMMARY__EDATA_GRAPH:
- return basicSetEDataGraph(null, msgs);
- default:
- return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
- }
- }
- return eBasicSetContainer(null, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
+ * @generated
+ */
public Object eGet(int featureID, boolean resolve, boolean coreType)
{
- switch (featureID)
- {
- case SDOPackage.CHANGE_SUMMARY__OBJECT_CHANGES:
- if (coreType) return getObjectChanges();
- else return getObjectChanges().map();
- case SDOPackage.CHANGE_SUMMARY__OBJECTS_TO_DETACH:
- return getObjectsToDetach();
- case SDOPackage.CHANGE_SUMMARY__OBJECTS_TO_ATTACH:
- return getObjectsToAttach();
- case SDOPackage.CHANGE_SUMMARY__RESOURCE_CHANGES:
- return getResourceChanges();
- case SDOPackage.CHANGE_SUMMARY__EDATA_GRAPH:
- return getEDataGraph();
-// case SDOPackage.CHANGE_SUMMARY__EDATA_OBJECT:
-// return getEDataObject();
- }
- return eDynamicGet(featureID, resolve, coreType);
- }
+ switch (featureID) {
+ case SDOPackage.CHANGE_SUMMARY__EDATA_GRAPH:
+ return getEDataGraph();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
/**
- * <!-- begin-user-doc -->
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
- */
+ * @generated
+ */
public void eSet(int featureID, Object newValue)
{
- switch (featureID)
- {
- case SDOPackage.CHANGE_SUMMARY__OBJECT_CHANGES:
- ((EStructuralFeature.Setting)getObjectChanges()).set(newValue);
- return;
- case SDOPackage.CHANGE_SUMMARY__OBJECTS_TO_DETACH:
- getObjectsToDetach().clear();
- getObjectsToDetach().addAll((Collection)newValue);
- return;
- case SDOPackage.CHANGE_SUMMARY__OBJECTS_TO_ATTACH:
- getObjectsToAttach().clear();
- getObjectsToAttach().addAll((Collection)newValue);
- return;
- case SDOPackage.CHANGE_SUMMARY__RESOURCE_CHANGES:
- getResourceChanges().clear();
- getResourceChanges().addAll((Collection)newValue);
- return;
- case SDOPackage.CHANGE_SUMMARY__EDATA_GRAPH:
- setEDataGraph((DataGraph)newValue);
- return;
- }
- eDynamicSet(featureID, newValue);
- }
+ switch (featureID) {
+ case SDOPackage.CHANGE_SUMMARY__EDATA_GRAPH:
+ setEDataGraph((DataGraph)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
/**
- * <!-- begin-user-doc -->
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
- */
+ * @generated
+ */
public void eUnset(int featureID)
{
- switch (featureID)
- {
- case SDOPackage.CHANGE_SUMMARY__OBJECT_CHANGES:
- getObjectChanges().clear();
- return;
- case SDOPackage.CHANGE_SUMMARY__OBJECTS_TO_DETACH:
- getObjectsToDetach().clear();
- return;
- case SDOPackage.CHANGE_SUMMARY__OBJECTS_TO_ATTACH:
- getObjectsToAttach().clear();
- return;
- case SDOPackage.CHANGE_SUMMARY__RESOURCE_CHANGES:
- getResourceChanges().clear();
- return;
- case SDOPackage.CHANGE_SUMMARY__EDATA_GRAPH:
- setEDataGraph((DataGraph)null);
- return;
- }
- eDynamicUnset(featureID);
- }
+ switch (featureID) {
+ case SDOPackage.CHANGE_SUMMARY__EDATA_GRAPH:
+ setEDataGraph((DataGraph)null);
+ return;
+ }
+ super.eUnset(featureID);
+ }
/**
- * <!-- begin-user-doc -->
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
- */
+ * @generated
+ */
public boolean eIsSet(int featureID)
{
- switch (featureID)
- {
- case SDOPackage.CHANGE_SUMMARY__OBJECT_CHANGES:
- return objectChanges != null && !objectChanges.isEmpty();
- case SDOPackage.CHANGE_SUMMARY__OBJECTS_TO_DETACH:
- return objectsToDetach != null && !objectsToDetach.isEmpty();
- case SDOPackage.CHANGE_SUMMARY__OBJECTS_TO_ATTACH:
- return objectsToAttach != null && !objectsToAttach.isEmpty();
- case SDOPackage.CHANGE_SUMMARY__RESOURCE_CHANGES:
- return resourceChanges != null && !resourceChanges.isEmpty();
- case SDOPackage.CHANGE_SUMMARY__EDATA_GRAPH:
- return eDataGraph != null;
- }
- return eDynamicIsSet(featureID);
- }
+ switch (featureID) {
+ case SDOPackage.CHANGE_SUMMARY__EDATA_GRAPH:
+ return eDataGraph != null;
+ }
+ return super.eIsSet(featureID);
+ }
protected void uncache()
{
@@ -732,7 +630,18 @@ public class ChangeSummaryImpl extends C
return getEDataGraph();
}
- protected Map getOldContainmentInformation()
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public List getChangedObjects() {
+ // TODO: implement this method
+ // Ensure that you remove @generated or mark it @generated NOT
+ throw new UnsupportedOperationException();
+ }
+
+ protected Map getOldContainmentInformation()
{
if (oldContainmentInformation == null)
{
@@ -765,7 +674,35 @@ public class ChangeSummaryImpl extends C
return null;
}
- static protected boolean isContainmentReference(Object feature)
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+ switch (featureID) {
+ case SDOPackage.CHANGE_SUMMARY__EDATA_GRAPH:
+ if (eDataGraph != null)
+ msgs = ((InternalEObject)eDataGraph).eInverseRemove(this, SDOPackage.DATA_GRAPH__ECHANGE_SUMMARY, DataGraph.class, msgs);
+ return basicSetEDataGraph((DataGraph)otherEnd, msgs);
+ }
+ return super.eInverseAdd(otherEnd, featureID, msgs);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+ switch (featureID) {
+ case SDOPackage.CHANGE_SUMMARY__EDATA_GRAPH:
+ return basicSetEDataGraph(null, msgs);
+ }
+ return super.eInverseRemove(otherEnd, featureID, msgs);
+ }
+
+ static protected boolean isContainmentReference(Object feature)
{
return feature instanceof EReference && ((EReference) feature).isContainment();
}
Modified: tuscany/sdo-java/branches/emf-2.5/impl/src/main/java/org/apache/tuscany/sdo/impl/ChangeSummarySettingImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sdo-java/branches/emf-2.5/impl/src/main/java/org/apache/tuscany/sdo/impl/ChangeSummarySettingImpl.java?rev=1002496&r1=1002493&r2=1002496&view=diff
==============================================================================
--- tuscany/sdo-java/branches/emf-2.5/impl/src/main/java/org/apache/tuscany/sdo/impl/ChangeSummarySettingImpl.java (original)
+++ tuscany/sdo-java/branches/emf-2.5/impl/src/main/java/org/apache/tuscany/sdo/impl/ChangeSummarySettingImpl.java Wed Sep 29 07:10:57 2010
@@ -43,14 +43,14 @@ import commonj.sdo.Property;
public class ChangeSummarySettingImpl extends FeatureChangeImpl implements ChangeSummary.Setting
{
/**
- * <!-- begin-user-doc -->
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
- */
+ * @generated
+ */
protected ChangeSummarySettingImpl()
{
- super();
- }
+ super();
+ }
protected ChangeSummarySettingImpl(EStructuralFeature feature, Object value, boolean isSet)
{
@@ -58,14 +58,14 @@ public class ChangeSummarySettingImpl ex
}
/**
- * <!-- begin-user-doc -->
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
- */
+ * @generated
+ */
protected EClass eStaticClass()
{
- return SDOPackage.eINSTANCE.getChangeSummarySetting();
- }
+ return SDOPackage.Literals.CHANGE_SUMMARY_SETTING;
+ }
/**
* <!-- begin-user-doc -->