You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2006/02/25 18:02:58 UTC
svn commit: r380949 -
/incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/scdl/loader/impl/SCDLModelContentHandlerImpl.java
Author: jsdelfino
Date: Sat Feb 25 09:02:56 2006
New Revision: 380949
URL: http://svn.apache.org/viewcvs?rev=380949&view=rev
Log:
Removed workaround for a bug with AnyDataObject returning Ecore FeatureMap instead of SDO Sequence
Modified:
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/scdl/loader/impl/SCDLModelContentHandlerImpl.java
Modified: incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/scdl/loader/impl/SCDLModelContentHandlerImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/scdl/loader/impl/SCDLModelContentHandlerImpl.java?rev=380949&r1=380948&r2=380949&view=diff
==============================================================================
--- incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/scdl/loader/impl/SCDLModelContentHandlerImpl.java (original)
+++ incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/scdl/loader/impl/SCDLModelContentHandlerImpl.java Sat Feb 25 09:02:56 2006
@@ -64,8 +64,8 @@
import org.apache.tuscany.model.types.wsdl.WSDLServiceContract;
import org.apache.tuscany.model.types.wsdl.impl.WSDLServiceContractImpl;
import org.apache.tuscany.model.util.ModelContentHandler;
+//FIXME remove this EMF dependency
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.FeatureMap;
import commonj.sdo.DataObject;
import commonj.sdo.Sequence;
@@ -426,10 +426,8 @@
}
// Get the property value text and convert to the expected java type
- //FIXME just handle string for now
- //FIXME SDO returns a featuremap instead of a sequence
- //Sequence text = propertyElement.getSequence(0);
- FeatureMap text = (FeatureMap)propertyElement.get(0);
+ //FIXME just handle strings for now
+ Sequence text = propertyElement.getSequence(0);
if (text != null && text.size() != 0) {
Object rawValue = text.getValue(0);
configuredProperty.setValue(rawValue);
@@ -469,9 +467,7 @@
ServiceURI referenceURI=factory.createServiceURI(null, configuredReference);
// Get the reference value text
- //FIXME SDO returns a featuremap instead of a sequence
- //Sequence text = propertyElement.getSequence(0);
- FeatureMap text = (FeatureMap)referenceElement.get(0);
+ Sequence text = referenceElement.getSequence(0);
if (text != null && text.size() != 0) {
String uri = text.getValue(0).toString();
ServiceURI serviceURI=factory.createServiceURI(null, uri);