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 di...@apache.org on 2008/04/12 08:21:39 UTC
svn commit: r647381 -
/webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/writer/CStructWriter.java
Author: dimuthu
Date: Fri Apr 11 23:21:38 2008
New Revision: 647381
URL: http://svn.apache.org/viewvc?rev=647381&view=rev
Log:
Correcting the "@ours" types
Modified:
webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/writer/CStructWriter.java
Modified: webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/writer/CStructWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/writer/CStructWriter.java?rev=647381&r1=647380&r2=647381&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/writer/CStructWriter.java (original)
+++ webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/writer/CStructWriter.java Fri Apr 11 23:21:38 2008
@@ -91,6 +91,7 @@
public static final String DEFAULT_ATTRIB_CLASS_NAME = "axiom_attribute_t*";
public static final String DEFAULT_ATTRIB_ARRAY_CLASS_NAME = "axiom_attribute_t*";
+ public static final String DEFAULT_TYPE_NS = "http://www.w3.org/2001/XMLSchema";
/**
@@ -653,8 +654,13 @@
}
}
- if (typeMap.containsKey(metainf.getSchemaQNameForQName(name))) {
+ if (typeMap.containsKey(metainf.getSchemaQNameForQName(name)) ||
+ (metainf.getSchemaQNameForQName(name) == null ||
+ !metainf.getSchemaQNameForQName(name).getNamespaceURI().equals(DEFAULT_TYPE_NS))
+ && !CClassNameForElement.equals(DEFAULT_C_CLASS_NAME)
+ && !CClassNameForElement.equals(DEFAULT_ATTRIB_CLASS_NAME)) {
XSLTUtils.addAttribute(model, "ours", "yes", property);
+
}
if (metainf.getAttributeStatusForQName(name)) {
@@ -753,14 +759,18 @@
Element property,
Map typeMap,
Map groupTypeMap,
- String javaClassNameForElement) {
+ String CClassNameForElement) {
// add an attribute that says the type is default
if (metainf.getDefaultStatusForQName(name)) {
XSLTUtils.addAttribute(model, "default", "yes", property);
}
if (typeMap.containsKey(metainf.getSchemaQNameForQName(name)) ||
- groupTypeMap.containsKey(metainf.getSchemaQNameForQName(name))) {
+ groupTypeMap.containsKey(metainf.getSchemaQNameForQName(name)) ||
+ (metainf.getSchemaQNameForQName(name) == null ||
+ !metainf.getSchemaQNameForQName(name).getNamespaceURI().equals(DEFAULT_TYPE_NS))
+ && !CClassNameForElement.equals(DEFAULT_C_CLASS_NAME)
+ && !CClassNameForElement.equals(DEFAULT_ATTRIB_CLASS_NAME)) {
XSLTUtils.addAttribute(model, "ours", "yes", property);
}
@@ -782,10 +792,10 @@
if (baseTypeMap.containsKey(metainf.getSchemaQNameForQName(name))) {
shortTypeName = metainf.getSchemaQNameForQName(name).getLocalPart();
} else {
- shortTypeName = getShortTypeName(javaClassNameForElement);
+ shortTypeName = getShortTypeName(CClassNameForElement);
}
} else {
- shortTypeName = getShortTypeName(javaClassNameForElement);
+ shortTypeName = getShortTypeName(CClassNameForElement);
}
XSLTUtils.addAttribute(model, "shorttypename", shortTypeName, property);
@@ -812,13 +822,13 @@
XSLTUtils.addAttribute(model, "array", "yes", property);
- int endIndex = javaClassNameForElement.indexOf("[");
+ int endIndex = CClassNameForElement.indexOf("[");
if (endIndex >= 0) {
XSLTUtils.addAttribute(model, "arrayBaseType",
- javaClassNameForElement.substring(0, endIndex), property);
+ CClassNameForElement.substring(0, endIndex), property);
} else {
XSLTUtils.addAttribute(model, "arrayBaseType",
- javaClassNameForElement, property);
+ CClassNameForElement, property);
}
long maxOccurs = metainf.getMaxOccurs(name);
@@ -956,12 +966,12 @@
/**
* Test whether the given class name matches the default
*
- * @param javaClassNameForElement
+ * @param CClassNameForElement
* @return bool
*/
- private boolean isDefault(String javaClassNameForElement) {
- return getDefaultClassName().equals(javaClassNameForElement) ||
- getDefaultClassArrayName().equals(javaClassNameForElement);
+ private boolean isDefault(String CClassNameForElement) {
+ return getDefaultClassName().equals(CClassNameForElement) ||
+ getDefaultClassArrayName().equals(CClassNameForElement);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org