Author: amilas
Date: Tue Mar 27 08:12:24 2007
New Revision: 522949
URL: http://svn.apache.org/viewvc?view=rev&rev=522949
Log:
put attribute type support only to simple restriction
Modified:
webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java
webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate.xsl
Modified:
webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java?view=diff&rev=522949&r1=522948&r2=522949
==============================================================================
---
webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java
(original)
+++
webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java
Tue Mar 27 08:12:24 2007
@@ -1521,20 +1521,25 @@
XmlSchemaType type = getType(parentSchema, schemaTypeName);
if (type instanceof XmlSchemaSimpleType) {
XmlSchemaSimpleType simpleType = (XmlSchemaSimpleType)
type;
- // we only support simple type restriction
- if (!isAlreadyProcessed(schemaTypeName)) {
- //process simple type
- processSimpleSchemaType(simpleType, null,
parentSchema, null);
- }
- metainf.registerMapping(att.getQName(),
- schemaTypeName,
-
processedTypemap.get(schemaTypeName).toString(),
- SchemaConstants.ATTRIBUTE_TYPE);
- // add optional attribute status if set
- String use = att.getUse().getValue();
- if (use.indexOf("optional") != -1) {
- metainf.addtStatus(att.getQName(),
SchemaConstants.OPTIONAL_TYPE);
+
+ if ((simpleType != null) &&
+ (simpleType.getContent() instanceof
XmlSchemaSimpleTypeRestriction)) {
+ // we only support simple type restriction
+ if (!isAlreadyProcessed(schemaTypeName)) {
+ //process simple type
+ processSimpleSchemaType(simpleType, null,
parentSchema, null);
+ }
+ metainf.registerMapping(att.getQName(),
+ schemaTypeName,
+
processedTypemap.get(schemaTypeName).toString(),
+ SchemaConstants.ATTRIBUTE_TYPE);
+ // add optional attribute status if set
+ String use = att.getUse().getValue();
+ if (use.indexOf("optional") != -1) {
+ metainf.addtStatus(att.getQName(),
SchemaConstants.OPTIONAL_TYPE);
+ }
}
+
}
}
}
Modified:
webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate.xsl
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate.xsl?view=diff&rev=522949&r1=522948&r2=522949
==============================================================================
---
webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate.xsl
(original)
+++
webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate.xsl
Tue Mar 27 08:12:24 2007
@@ -2164,7 +2164,7 @@
public static <xsl:value-of select="$name"/>
fromValue(<xsl:value-of select="$propertyType"/> value)
throws java.lang.IllegalArgumentException {
<xsl:value-of select="$name"/> enumeration =
(<xsl:value-of select="$name"/>)
- <xsl:choose>
+ <xsl:choose>
<xsl:when test="@primitive">
_table_.get(value + "");
</xsl:when>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
