diff options
| author | lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> | 2009-01-22 00:06:40 +0000 |
|---|---|---|
| committer | lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> | 2009-01-22 00:06:40 +0000 |
| commit | dafcdfe0b8d36340d315222385be0389beaf2804 (patch) | |
| tree | a8c4a24408c691b7fc2fa0acb876604554e1522d /java/sca/modules/contribution/src | |
| parent | 700c96eb31b6a088c0c3fd37b491cc2abea82cd7 (diff) | |
TUSCANY-2463 - Merging latest code to support extended attributes to 2.x development stream
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@736501 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/sca/modules/contribution/src')
| -rw-r--r-- | java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXAttributeProcessor.java | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXAttributeProcessor.java b/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXAttributeProcessor.java index 48e80a073a..c336cb3431 100644 --- a/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXAttributeProcessor.java +++ b/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXAttributeProcessor.java @@ -51,7 +51,7 @@ public class ExtensibleStAXAttributeProcessor private static final Logger logger = Logger.getLogger(ExtensibleStAXAttributeProcessor.class.getName()); - private static final QName UNKNOWN_ATTRIBUTE = new QName(Constants.SCA10_TUSCANY_NS, "unknown"); + private static final QName ANY_ATTRIBUTE = new QName(Constants.XMLSCHEMA_NS, "anyAttribute"); private XMLInputFactory inputFactory; private XMLOutputFactory outputFactory; @@ -122,7 +122,6 @@ public class ExtensibleStAXAttributeProcessor public Object read(QName attributeName, XMLStreamReader source) throws ContributionReadException, XMLStreamException { - // Delegate to the processor associated with the attribute QName int event = source.getEventType(); if (event == XMLStreamConstants.START_DOCUMENT) { @@ -145,13 +144,13 @@ public class ExtensibleStAXAttributeProcessor //handle extension attributes without processors - processor = (StAXAttributeProcessor<?>)processors.getProcessor(UNKNOWN_ATTRIBUTE); + processor = (StAXAttributeProcessor<?>)processors.getProcessor(ANY_ATTRIBUTE); if (processor == null) { Location location = source.getLocation(); if (logger.isLoggable(Level.WARNING)) { logger.warning("Could not find Default Attribute processor !"); } - warning("DefaultAttributeProcessorNotAvailable", processors, UNKNOWN_ATTRIBUTE, location); + warning("DefaultAttributeProcessorNotAvailable", processors, ANY_ATTRIBUTE, location); } return processor == null ? null : processor.read(attributeName, source); @@ -159,7 +158,7 @@ public class ExtensibleStAXAttributeProcessor @SuppressWarnings("unchecked") public void write(Object model, XMLStreamWriter outputSource) throws ContributionWriteException, XMLStreamException { - + if(model == null) { return; } @@ -177,7 +176,7 @@ public class ExtensibleStAXAttributeProcessor } //handle extension attributes without processors - processor = (StAXAttributeProcessor<?>)processors.getProcessor(UNKNOWN_ATTRIBUTE); + processor = (StAXAttributeProcessor<?>)processors.getProcessor(ANY_ATTRIBUTE); if(processor == null) { if (logger.isLoggable(Level.WARNING)) { logger.warning("No Default StAX processor is configured to handle " + model.getClass()); |