Author: amilas
Date: Thu Dec 20 21:17:44 2007
New Revision: 606099
URL: http://svn.apache.org/viewvc?rev=606099&view=rev
Log:
fixed the issue Axis2-3412
Modified:
webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/writer/JavaBeanWriter.java
Modified:
webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/writer/JavaBeanWriter.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/writer/JavaBeanWriter.java?rev=606099&r1=606098&r2=606099&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/writer/JavaBeanWriter.java
(original)
+++
webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/writer/JavaBeanWriter.java
Thu Dec 20 21:17:44 2007
@@ -60,6 +60,8 @@
private Templates templateCache;
+ private List nameList;
+
private Map packageNameToClassNamesMap;
private static int count = 0;
@@ -313,7 +315,7 @@
} else {
this.rootDir = rootDir;
}
-
+ this.nameList = new ArrayList();
this.packageNameToClassNamesMap = new HashMap();
javaBeanTemplateName = SchemaPropertyLoader.getBeanTemplate();
}
@@ -333,12 +335,20 @@
String packageName = getPackage(namespaceURI);
String originalName = qName.getLocalPart();
+ String className = null;
- if (!this.packageNameToClassNamesMap.containsKey(packageName)){
- this.packageNameToClassNamesMap.put(packageName, new ArrayList());
+ // when wrapping classes all the data binding and exception class
should have
+ // a unique name since package name is not being applied.
+ // otherewise we can make unique with the package name
+ if (!wrapClasses){
+ className = makeUniqueJavaClassName(this.nameList, originalName);
+ } else {
+ if (!this.packageNameToClassNamesMap.containsKey(packageName)) {
+ this.packageNameToClassNamesMap.put(packageName, new
ArrayList());
+ }
+ className = makeUniqueJavaClassName((List)
this.packageNameToClassNamesMap.get(packageName), originalName);
}
- String className =
- makeUniqueJavaClassName((List)
this.packageNameToClassNamesMap.get(packageName), originalName);
+
String packagePrefix = null;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
