Author: veithen
Date: Sat Dec 4 16:31:39 2010
New Revision: 1042210
URL: http://svn.apache.org/viewvc?rev=1042210&view=rev
Log:
ADB: Realigned some helper mode code with the normal mode code.
Modified:
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-helpermode.xsl
Modified:
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl?rev=1042210&r1=1042209&r2=1042210&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl
(original)
+++
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl
Sat Dec 4 16:31:39 2010
@@ -616,16 +616,16 @@
org.apache.axiom.om.OMDataSource dataSource =
new
org.apache.axis2.databinding.ADBDataSource(this,parentQName);
return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
- parentQName,factory,dataSource);
+ parentQName,factory,dataSource);
</xsl:when>
<xsl:otherwise>
- org.apache.axiom.om.OMDataSource dataSource =
+ org.apache.axiom.om.OMDataSource dataSource =
new
org.apache.axis2.databinding.ADBDataSource(this,MY_QNAME);
return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
- MY_QNAME,factory,dataSource);
+ MY_QNAME,factory,dataSource);
</xsl:otherwise>
- </xsl:choose>
- }
+ </xsl:choose>
+ }
public void serialize(final javax.xml.namespace.QName parentQName,
javax.xml.stream.XMLStreamWriter
xmlWriter)
Modified:
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-helpermode.xsl
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-helpermode.xsl?rev=1042210&r1=1042209&r2=1042210&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-helpermode.xsl
(original)
+++
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-helpermode.xsl
Sat Dec 4 16:31:39 2010
@@ -530,20 +530,22 @@ public <xsl:if test="not(@unwrapped) or
final javax.xml.namespace.QName parentQName,
final org.apache.axiom.om.OMFactory factory) throws
org.apache.axis2.databinding.ADBException{
+
+ <xsl:choose>
+ <xsl:when test="@type">
org.apache.axiom.om.OMDataSource dataSource =
new
org.apache.axis2.databinding.ADBHelperDataSource(bean,parentQName,this);
-
- <xsl:choose>
- <xsl:when test="@type">
- return new
org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
- parentQName,factory,dataSource);
- </xsl:when>
- <xsl:otherwise>
- return new
org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
- <xsl:value-of
select="$fullyQualifiedName"/>.MY_QNAME,factory,dataSource);
- </xsl:otherwise>
- </xsl:choose>
- }
+ return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+ parentQName,factory,dataSource);
+ </xsl:when>
+ <xsl:otherwise>
+ org.apache.axiom.om.OMDataSource dataSource =
+ new
org.apache.axis2.databinding.ADBHelperDataSource(bean,<xsl:value-of
select="$fullyQualifiedName"/>.MY_QNAME,this);
+ return new org.apache.axiom.om.impl.llom.OMSourcedElementImpl(
+ <xsl:value-of
select="$fullyQualifiedName"/>.MY_QNAME,factory,dataSource);
+ </xsl:otherwise>
+ </xsl:choose>
+ }
public void serialize(<xsl:value-of select="$fullyQualifiedName"/>
typedBean,
javax.xml.namespace.QName parentQName,
