You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by ve...@apache.org on 2009/07/04 00:48:12 UTC
svn commit: r791034 - in
/webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template:
ADBBeanTemplate-bean.xsl ADBBeanTemplate-helpermode.xsl
Author: veithen
Date: Fri Jul 3 22:48:12 2009
New Revision: 791034
URL: http://svn.apache.org/viewvc?rev=791034&view=rev
Log:
Formatting changes only.
Modified:
webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl
webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-helpermode.xsl
Modified: webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl?rev=791034&r1=791033&r2=791034&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl (original)
+++ webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl Fri Jul 3 22:48:12 2009
@@ -39,7 +39,8 @@
<xsl:variable name="particleClass" select="@particleClass"/>
<xsl:variable name="hasParticleType" select="@hasParticleType"/>
<xsl:variable name="usewrapperclasses" select="@usewrapperclasses"/>
- <!-- write the class header. this should be done only when unwrapped -->
+
+ <!-- write the class header. this should be done only when unwrapped -->
<xsl:if test="not(not(@unwrapped) or (@skip-write))">
/**
@@ -48,6 +49,7 @@
* This file was auto-generated from WSDL
* by the Apache Axis2 version: #axisVersion# #today#
*/
+
<xsl:if test="string-length(normalize-space(@package)) > 0">
package <xsl:value-of select="@package"/>;
</xsl:if>
@@ -160,12 +162,12 @@
* Overridden from <xsl:value-of select="$restriction"/>
*/
protected void validate<xsl:value-of select="$javaName"/>(<xsl:value-of select="$propertyType"/> param){
- <xsl:if test="not(@unbound) and @array">
+ <xsl:if test="not(@unbound) and @array">
if ((param != null) && (param.length > <xsl:value-of select="@maxOccurs"/>)){
throw new java.lang.RuntimeException();
}
</xsl:if>
- <xsl:if test="$min!=0 and @array">
+ <xsl:if test="$min!=0 and @array">
if ((param != null) && (param.length < <xsl:value-of select="$min"/>)){
throw new java.lang.RuntimeException();
}
@@ -564,7 +566,6 @@
throw new java.lang.RuntimeException();
}
</xsl:if>
-
</xsl:when>
<xsl:otherwise>
this.<xsl:value-of select="$varName"/>=param;
@@ -661,11 +662,11 @@
}
</xsl:if>
- /**
+ /**
* isReaderMTOMAware
* @return true if the reader supports MTOM
*/
- public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+ public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
boolean isReaderMTOMAware = false;
<!-- workaround for the issues in the wstx reader!-->
try{
@@ -674,7 +675,7 @@
isReaderMTOMAware = false;
}
return isReaderMTOMAware;
- }
+ }
<!-- ######################################################################################### -->
<!-- get OMElement methods that allows direct writing -->
/**
@@ -1241,7 +1242,7 @@
<xsl:if test="not($simple)">
namespace = "<xsl:value-of select="$namespace"/>";
writeStartElement(null, namespace, "<xsl:value-of select="$propertyName"/>", xmlWriter);
- </xsl:if>
+ </xsl:if>
<xsl:choose>
<!-- handle the binary case -->
<xsl:when test="@binary">
@@ -1477,7 +1478,6 @@
}
</xsl:if>
xmlWriter.writeEndElement();
-
</xsl:otherwise>
</xsl:choose>
</xsl:otherwise>
@@ -1506,36 +1506,30 @@
}
}
- /**
- * Util method to write an attribute with the ns prefix
- */
- private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
- java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
- if (xmlWriter.getPrefix(namespace) == null) {
- xmlWriter.writeNamespace(prefix, namespace);
- xmlWriter.setPrefix(prefix, namespace);
-
- }
-
- xmlWriter.writeAttribute(namespace,attName,attValue);
-
- }
+ /**
+ * Util method to write an attribute with the ns prefix
+ */
+ private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+ java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+ if (xmlWriter.getPrefix(namespace) == null) {
+ xmlWriter.writeNamespace(prefix, namespace);
+ xmlWriter.setPrefix(prefix, namespace);
+ }
+ xmlWriter.writeAttribute(namespace,attName,attValue);
+ }
/**
- * Util method to write an attribute without the ns prefix
- */
- private void writeAttribute(java.lang.String namespace,java.lang.String attName,
- java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
- if (namespace.equals(""))
- {
- xmlWriter.writeAttribute(attName,attValue);
- }
- else
- {
- registerPrefix(xmlWriter, namespace);
- xmlWriter.writeAttribute(namespace,attName,attValue);
- }
- }
+ * Util method to write an attribute without the ns prefix
+ */
+ private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+ java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+ if (namespace.equals("")) {
+ xmlWriter.writeAttribute(attName,attValue);
+ } else {
+ registerPrefix(xmlWriter, namespace);
+ xmlWriter.writeAttribute(namespace,attName,attValue);
+ }
+ }
/**
@@ -1628,25 +1622,21 @@
}
- /**
+ /**
* Register a namespace prefix
*/
- private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
- java.lang.String prefix = xmlWriter.getPrefix(namespace);
-
- if (prefix == null) {
- prefix = generatePrefix(namespace);
-
- while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
- prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
- }
-
- xmlWriter.writeNamespace(prefix, namespace);
- xmlWriter.setPrefix(prefix, namespace);
+ private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+ java.lang.String prefix = xmlWriter.getPrefix(namespace);
+ if (prefix == null) {
+ prefix = generatePrefix(namespace);
+ while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+ prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
}
-
- return prefix;
+ xmlWriter.writeNamespace(prefix, namespace);
+ xmlWriter.setPrefix(prefix, namespace);
}
+ return prefix;
+ }
<!-- ######################################################################################### -->
@@ -2336,7 +2326,7 @@
java.util.Vector handledAttributes = new java.util.Vector();
<!-- if this is an enumeration then we have to read attributes after-->
- <xsl:for-each select="property[@attribute]">
+ <xsl:for-each select="property[@attribute]">
<xsl:variable name="propertyName" select="@name"/>
<xsl:variable name="propertyType" select="@type"/>
<xsl:variable name="shortTypeNameUncapped" select="@shorttypename"/>
@@ -2468,7 +2458,6 @@
</xsl:for-each>
-
<xsl:if test="($isType or $anon) and not($simple) and not($particleClass)">
<!-- Skip the outer start element in order to process the subelements. -->
reader.next();
@@ -3289,5 +3278,5 @@
}
<!-- end of main template -->
- </xsl:template>
+ </xsl:template>
</xsl:stylesheet>
\ No newline at end of file
Modified: webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-helpermode.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-helpermode.xsl?rev=791034&r1=791033&r2=791034&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-helpermode.xsl (original)
+++ webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-helpermode.xsl Fri Jul 3 22:48:12 2009
@@ -36,7 +36,8 @@
<xsl:variable name="mapperClass" select="@mapperClass"/>
<xsl:variable name="package" select="@package"/>
<xsl:variable name="helpername"><xsl:value-of select="$name"/>Helper</xsl:variable>
- <!-- write the class header. this should be done only when unwrapped -->
+
+ <!-- write the class header. this should be done only when unwrapped -->
<xsl:if test="not(not(@unwrapped) or (@skip-write))">
/**
@@ -47,6 +48,7 @@
*/
package <xsl:value-of select="@package"/>;
+
/**
* <xsl:value-of select="$name"/> bean class
*/
@@ -146,7 +148,7 @@
</xsl:when>
<xsl:otherwise>
<xsl:choose>
- <xsl:when test="(@restricted) and (@occuranceChanged) and (not(@typeChanged)) and (not(@rewrite))">
+ <xsl:when test="(@restricted) and (@occuranceChanged) and (not(@typeChanged)) and (not(@rewrite))">
<xsl:variable name="basePropertyType"><xsl:value-of select="@arrayBaseType"/></xsl:variable>
@@ -461,53 +463,51 @@
</xsl:if>
<xsl:choose>
- <xsl:when test="(@restrictionBaseType)">
- <xsl:choose>
- <xsl:when test="(@patternFacet)">
- if ( param.matches( "<xsl:value-of select="$patternFacet"/>" )) {
- this.<xsl:value-of select="$varName"/>=param;
- }
- else {
- throw new org.apache.axis2.databinding.ADBException();
- }
- </xsl:when>
- <xsl:when test="(@lenFacet)">
- if ( param.length() == <xsl:value-of select="@lenFacet"/> ) {
- this.<xsl:value-of select="$varName"/>=param;
- }
- else {
- throw new org.apache.axis2.databinding.ADBException();
- }
- </xsl:when>
- <xsl:when test="(@maxLenFacet) or (@minLenFacet)">
-
- if ( <xsl:if test="(@minLenFacet)"> (<xsl:value-of select="$minLenFacet"/> < param.length()) </xsl:if>
- <xsl:if test="(@maxLenFacet)"> <xsl:if test="(@minLenFacet)"> && </xsl:if> (param.length() >= <xsl:value-of select="$maxLenFacet"/>) </xsl:if> ) {
- this.<xsl:value-of select="$varName"/>=param;
- }
- else {
- throw new org.apache.axis2.databinding.ADBException();
- }
- </xsl:when>
- <xsl:when test="(@maxExFacet) or (@minExFacet) or (@maxInFacet) or (@minInFacet)">
- if ( <xsl:if test="(@minExFacet)"> <xsl:value-of select="$minExFacet"/> < </xsl:if> <xsl:if test="(@minInFacet)"> <xsl:value-of select="$minInFacet"/> <= </xsl:if> param <xsl:if test="(@maxExFacet)"> > <xsl:value-of select="$maxExFacet"/> </xsl:if> <xsl:if test="(@maxInFacet)"> >= <xsl:value-of select="$maxInFacet"/> </xsl:if> ) {
-
- this.<xsl:value-of select="$varName"/>=param;
- }
- else {
- throw new org.apache.axis2.databinding.ADBException();
- }
- </xsl:when>
- <xsl:otherwise>
- this.<xsl:value-of select="$varName"/>=param;
- </xsl:otherwise>
- </xsl:choose>
- </xsl:when>
+ <xsl:when test="(@restrictionBaseType)">
+ <xsl:choose>
+ <xsl:when test="(@patternFacet)">
+ if ( param.matches( "<xsl:value-of select="$patternFacet"/>" )) {
+ this.<xsl:value-of select="$varName"/>=param;
+ }
+ else {
+ throw new org.apache.axis2.databinding.ADBException();
+ }
+ </xsl:when>
+ <xsl:when test="(@lenFacet)">
+ if ( param.length() == <xsl:value-of select="@lenFacet"/> ) {
+ this.<xsl:value-of select="$varName"/>=param;
+ }
+ else {
+ throw new org.apache.axis2.databinding.ADBException();
+ }
+ </xsl:when>
+ <xsl:when test="(@maxLenFacet) or (@minLenFacet)">
+ if ( <xsl:if test="(@minLenFacet)"> (<xsl:value-of select="$minLenFacet"/> < param.length()) </xsl:if>
+ <xsl:if test="(@maxLenFacet)"> <xsl:if test="(@minLenFacet)"> && </xsl:if> (param.length() >= <xsl:value-of select="$maxLenFacet"/>) </xsl:if> ) {
+ this.<xsl:value-of select="$varName"/>=param;
+ }
+ else {
+ throw new org.apache.axis2.databinding.ADBException();
+ }
+ </xsl:when>
+ <xsl:when test="(@maxExFacet) or (@minExFacet) or (@maxInFacet) or (@minInFacet)">
+ if ( <xsl:if test="(@minExFacet)"> <xsl:value-of select="$minExFacet"/> < </xsl:if> <xsl:if test="(@minInFacet)"> <xsl:value-of select="$minInFacet"/> <= </xsl:if> param <xsl:if test="(@maxExFacet)"> > <xsl:value-of select="$maxExFacet"/> </xsl:if> <xsl:if test="(@maxInFacet)"> >= <xsl:value-of select="$maxInFacet"/> </xsl:if> ) {
+ this.<xsl:value-of select="$varName"/>=param;
+ }
+ else {
+ throw new org.apache.axis2.databinding.ADBException();
+ }
+ </xsl:when>
+ <xsl:otherwise>
+ this.<xsl:value-of select="$varName"/>=param;
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:when>
- <xsl:otherwise>
- this.<xsl:value-of select="$varName"/>=param;
- </xsl:otherwise>
- </xsl:choose>
+ <xsl:otherwise>
+ this.<xsl:value-of select="$varName"/>=param;
+ </xsl:otherwise>
+ </xsl:choose>
}
</xsl:otherwise>
@@ -542,20 +542,20 @@
return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
}
- /**
- * isReaderMTOMAware
- * @return true if the reader supports MTOM
- */
- public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
- boolean isReaderMTOMAware = false;
- <!-- workaround for the issues in the wstx reader!-->
- try{
- isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
- }catch(java.lang.IllegalArgumentException e){
- isReaderMTOMAware = false;
- }
- return isReaderMTOMAware;
- }
+ /**
+ * isReaderMTOMAware
+ * @return true if the reader supports MTOM
+ */
+ public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) {
+ boolean isReaderMTOMAware = false;
+ <!-- workaround for the issues in the wstx reader!-->
+ try{
+ isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
+ }catch(java.lang.IllegalArgumentException e){
+ isReaderMTOMAware = false;
+ }
+ return isReaderMTOMAware;
+ }
<!-- ######################################################################################### -->
<!-- get OMElement methods that allows direct writing -->
/**
@@ -1129,7 +1129,7 @@
</xsl:when>
<!-- handle all other cases -->
<xsl:otherwise>
- <xsl:if test="not($simple)">
+ <xsl:if test="not($simple)">
namespace = "<xsl:value-of select="$namespace"/>";
if (! namespace.equals("")) {
prefix = xmlWriter.getPrefix(namespace);
@@ -1148,18 +1148,16 @@
} else {
xmlWriter.writeStartElement("<xsl:value-of select="$propertyName"/>");
}
- </xsl:if>
+ </xsl:if>
<xsl:choose>
<!-- handle the binary case -->
<xsl:when test="@binary">
-
<!-- Handling the null byte array -->
if (<xsl:value-of select="$varName"/>!=null)
{
org.apache.axiom.om.impl.llom.OMTextImpl <xsl:value-of select="$javaname"/>_binary = new org.apache.axiom.om.impl.llom.OMTextImpl( <xsl:value-of select="$varName"/>, org.apache.axiom.om.OMAbstractFactory.getOMFactory());
<xsl:value-of select="$javaname"/>_binary.internalSerializeAndConsume(xmlWriter);
}
-
</xsl:when>
<xsl:otherwise>
<xsl:if test="not(@primitive)">
@@ -1236,7 +1234,6 @@
<xsl:when test="$nillable">
if (<xsl:value-of select="$varName"/>==null){
java.lang.String namespace = "<xsl:value-of select="property/@nsuri"/>";
-
if (! namespace.equals("")) {
java.lang.String prefix = xmlWriter.getPrefix(namespace);
@@ -1332,7 +1329,7 @@
<xsl:if test="$primitive">
xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(<xsl:value-of select="$varName"/>));
</xsl:if>
- xmlWriter.writeEndElement();
+ xmlWriter.writeEndElement();
</xsl:otherwise>
</xsl:choose>
</xsl:otherwise>
@@ -1341,55 +1338,45 @@
}
/**
- * Util method to write an attribute with the ns prefix
- */
- private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
- java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
- if (xmlWriter.getPrefix(namespace) == null) {
- xmlWriter.writeNamespace(prefix, namespace);
- xmlWriter.setPrefix(prefix, namespace);
-
- }
-
- xmlWriter.writeAttribute(namespace,attName,attValue);
-
- }
-
- /**
- * Util method to write an attribute without the ns prefix
- */
- private void writeAttribute(java.lang.String namespace,java.lang.String attName,
- java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
- if (namespace.equals(""))
- {
- xmlWriter.writeAttribute(attName,attValue);
- }
- else
- {
- registerPrefix(xmlWriter, namespace);
- xmlWriter.writeAttribute(namespace,attName,attValue);
- }
- }
-
- /**
- * Register a namespace prefix
- */
- private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
- java.lang.String prefix = xmlWriter.getPrefix(namespace);
-
- if (prefix == null) {
- prefix = createPrefix();
-
- while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
- prefix = createPrefix();
- }
+ * Util method to write an attribute with the ns prefix
+ */
+ private void writeAttribute(java.lang.String prefix,java.lang.String namespace,java.lang.String attName,
+ java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+ if (xmlWriter.getPrefix(namespace) == null) {
+ xmlWriter.writeNamespace(prefix, namespace);
+ xmlWriter.setPrefix(prefix, namespace);
+ }
+ xmlWriter.writeAttribute(namespace,attName,attValue);
+ }
- xmlWriter.writeNamespace(prefix, namespace);
- xmlWriter.setPrefix(prefix, namespace);
- }
+ /**
+ * Util method to write an attribute without the ns prefix
+ */
+ private void writeAttribute(java.lang.String namespace,java.lang.String attName,
+ java.lang.String attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException{
+ if (namespace.equals("")) {
+ xmlWriter.writeAttribute(attName,attValue);
+ } else {
+ registerPrefix(xmlWriter, namespace);
+ xmlWriter.writeAttribute(namespace,attName,attValue);
+ }
+ }
- return prefix;
- }
+ /**
+ * Register a namespace prefix
+ */
+ private java.lang.String registerPrefix(javax.xml.stream.XMLStreamWriter xmlWriter, java.lang.String namespace) throws javax.xml.stream.XMLStreamException {
+ java.lang.String prefix = xmlWriter.getPrefix(namespace);
+ if (prefix == null) {
+ prefix = createPrefix();
+ while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+ prefix = createPrefix();
+ }
+ xmlWriter.writeNamespace(prefix, namespace);
+ xmlWriter.setPrefix(prefix, namespace);
+ }
+ return prefix;
+ }
/**
* Create a prefix
@@ -1437,7 +1424,7 @@
}
</xsl:if>
- <xsl:if test="$isType or $anon">
+ <xsl:if test="$isType or $anon">
if (reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance","type")!=null){
java.lang.String fullTypeName = reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance",
"type");
@@ -2080,7 +2067,7 @@
int index = content.indexOf(":");
java.lang.String prefix ="";
java.lang.String namespaceuri ="";
- if(index >0){
+ if(index > 0){
prefix = content.substring(0,index);
namespaceuri = reader.getNamespaceURI(prefix);
}
@@ -2096,7 +2083,7 @@
</xsl:when>
<xsl:otherwise>
object.set<xsl:value-of select="$javaName"/>(
- org.apache.axis2.databinding.utils.ConverterUtil.convertTo<xsl:value-of select="$shortTypeName"/>(content));
+ org.apache.axis2.databinding.utils.ConverterUtil.convertTo<xsl:value-of select="$shortTypeName"/>(content));
</xsl:otherwise>
</xsl:choose>
</xsl:if>
@@ -2435,5 +2422,5 @@
</xsl:otherwise>
</xsl:choose>
<!-- end of main template -->
- </xsl:template>
+ </xsl:template>
</xsl:stylesheet>
\ No newline at end of file