You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by ro...@apache.org on 2006/12/13 11:11:35 UTC
svn commit: r486581 - in
/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo: SDOXMLWriter.cpp
SDOXMLWriter.h
Author: robbinspg
Date: Wed Dec 13 02:11:34 2006
New Revision: 486581
URL: http://svn.apache.org/viewvc?view=rev&rev=486581
Log:
Write references with the correct attribute/element name
Modified:
incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOXMLWriter.cpp
incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOXMLWriter.h
Modified: incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOXMLWriter.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOXMLWriter.cpp?view=diff&rev=486581&r1=486580&r2=486581
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOXMLWriter.cpp (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOXMLWriter.cpp Wed Dec 13 02:11:34 2006
@@ -865,7 +865,7 @@
// Handle non-containment reference to DataObject
if (pl[i].isReference())
{
- writeReference(dataObject, pl[i], false);
+ writeReference(propertyName, dataObject, pl[i], false);
}
}
}
@@ -946,7 +946,7 @@
// Handle non-containment reference to DataObject
if (seqProp.isReference())
{
- writeReference(dataObject, seqProp, true, doValue);
+ writeReference(seqPropName, dataObject, seqProp, true, doValue);
}
else
{
@@ -1036,7 +1036,7 @@
// Handle non-containment reference to DataObject
if (pl[i].isReference() )
{
- writeReference(dataObject, pl[i], true, dol[j]);
+ writeReference(propertyName, dataObject, pl[i], true, dol[j]);
}
else
{
@@ -1056,7 +1056,7 @@
if (pl[i].isReference())
{
if (pi)
- writeReference(dataObject, pl[i], true);
+ writeReference(propertyName, dataObject, pl[i], true);
}
else
{
@@ -1125,7 +1125,9 @@
return (XSDPropertyInfo*)((DASProperty*)&property)->getDASValue("XMLDAS::PropertyInfo");
}
+
void SDOXMLWriter::writeReference(
+ const SDOXMLString& propertyName,
DataObjectPtr dataObject,
const Property& property,
bool isElement,
@@ -1162,13 +1164,13 @@
{
// Set the IDREF value
xmlTextWriterWriteElement(writer,
- SDOXMLString(property.getName()), refValue);
+ propertyName, refValue);
}
else
{
// Set the IDREF value
xmlTextWriterWriteAttribute(writer,
- SDOXMLString(property.getName()), refValue);
+ propertyName, refValue);
}
}
}
Modified: incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOXMLWriter.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOXMLWriter.h?view=diff&rev=486581&r1=486580&r2=486581
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOXMLWriter.h (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOXMLWriter.h Wed Dec 13 02:11:34 2006
@@ -111,6 +111,7 @@
void writeReference(
+ const SDOXMLString& propertyName,
DataObjectPtr dataObject,
const Property& property,
bool isElement,
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org