From 734d1d84e2b097d334bf57331f14af0ee250ca0c Mon Sep 17 00:00:00 2001 From: lresende Date: Wed, 14 Jan 2009 18:40:38 +0000 Subject: Reverting changes from revision #734356 and there was some merge conflicts that were not supposed to get to svn. git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@734475 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'branches/sca-java-1.x/modules/assembly-xml/src/main') diff --git a/branches/sca-java-1.x/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java b/branches/sca-java-1.x/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java index 1a1d285d10..80c5e807fe 100644 --- a/branches/sca-java-1.x/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java +++ b/branches/sca-java-1.x/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java @@ -60,7 +60,6 @@ import org.apache.tuscany.sca.contribution.ContributionFactory; import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor; import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; import org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessor; -import org.apache.tuscany.sca.contribution.processor.xml.AnyAttributeWrapper; import org.apache.tuscany.sca.contribution.resolver.ModelResolver; import org.apache.tuscany.sca.contribution.service.ContributionReadException; import org.apache.tuscany.sca.contribution.service.ContributionResolveException; @@ -137,6 +136,8 @@ abstract class BaseAssemblyProcessor extends BaseStAXArtifactProcessor implement this.extensionProcessor = (StAXArtifactProcessor)extensionProcessor; this.policyProcessor = new PolicyAttachPointProcessor(policyFactory); this.monitor = monitor; + + //TODO - this constructor should take a monitor too. } /** @@ -869,8 +870,8 @@ abstract class BaseAssemblyProcessor extends BaseStAXArtifactProcessor implement QName attributeName = reader.getAttributeName(a); if( attributeName.getNamespaceURI() != null && attributeName.getNamespaceURI().length() > 0) { if( ! elementName.getNamespaceURI().equals(attributeName.getNamespaceURI()) ) { - Object o = extensionAttributeProcessor.read(attributeName, reader); - estensibleElement.getExtensions().add(o); + String attributeExtension = (String) extensionAttributeProcessor.read(attributeName, reader); + estensibleElement.getExtensions().add(attributeExtension); } } } @@ -888,7 +889,8 @@ abstract class BaseAssemblyProcessor extends BaseStAXArtifactProcessor implement */ protected void writeExtendedAttributes(XMLStreamWriter writer, Extensible extensibleElement, StAXAttributeProcessor extensionAttributeProcessor) throws ContributionWriteException, XMLStreamException { for(Object o : extensibleElement.getExtensions()) { - if(o instanceof AnyAttributeWrapper) { + //FIXME How to identify it's a extended attribute ? + if(o instanceof String) { extensionAttributeProcessor.write(o, writer); } } -- cgit v1.2.3