Author: frankb
Date: Fri Dec 8 11:37:52 2006
New Revision: 484708
URL: http://svn.apache.org/viewvc?view=rev&rev=484708
Log:
Fix for TUSCANY-931
Modified:
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/SDOUtil.java
Modified:
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/SDOUtil.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/SDOUtil.java?view=diff&rev=484708&r1=484707&r2=484708
==============================================================================
---
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/SDOUtil.java
(original)
+++
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/SDOUtil.java
Fri Dec 8 11:37:52 2006
@@ -525,12 +525,8 @@
eStructuralFeature.setEType((EClassifier)propertyType);
((EClass)containingType).getEStructuralFeatures().add(eStructuralFeature);
- //if (containingType.getName() == null)
if ("".equals(ExtendedMetaData.INSTANCE.getName((EClass)containingType)))
// DocumentRoot containingType?
{
- //FB TBD ... figure out how to decide whether to use ELEMENT_FEATURE or
ATTRIBUTE_FEATURE
- ExtendedMetaData.INSTANCE.setFeatureKind(eStructuralFeature,
ExtendedMetaData.ELEMENT_FEATURE);
-
ExtendedMetaData.INSTANCE.setNamespace(eStructuralFeature,
containingType.getURI());
//FB???eStructuralFeature.setUnique(false);
//FB???eStructuralFeature.setUpperBound(ETypedElement.UNSPECIFIED_MULTIPLICITY);
@@ -540,6 +536,12 @@
eStructuralFeature.setDerived(true);
eStructuralFeature.setTransient(true);
eStructuralFeature.setVolatile(true);
+ ExtendedMetaData.INSTANCE.setFeatureKind(eStructuralFeature,
ExtendedMetaData.ELEMENT_FEATURE);
+ }
+ else
+ {
+ //FB TBD ... figure out how to decide whether to use ELEMENT_FEATURE or
ATTRIBUTE_FEATURE
+ //ExtendedMetaData.INSTANCE.setFeatureKind(eStructuralFeature,
ExtendedMetaData.ELEMENT_FEATURE);
}
return (Property)eStructuralFeature;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
