You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2009/07/24 20:02:44 UTC
svn commit: r797585 - in /cxf/branches/2.2.x-fixes: ./
tools/common/src/main/java/org/apache/cxf/tools/util/ClassCollector.java
tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/ClassNameAllocatorImpl.java
Author: dkulp
Date: Fri Jul 24 18:02:43 2009
New Revision: 797585
URL: http://svn.apache.org/viewvc?rev=797585&view=rev
Log:
Merged revisions 797582 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r797582 | dkulp | 2009-07-24 13:59:19 -0400 (Fri, 24 Jul 2009) | 2 lines
[CXF-2358] make the autoNameResolution handle cases where class names
differ only by case.
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/util/ClassCollector.java
cxf/branches/2.2.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/ClassNameAllocatorImpl.java
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 24 18:02:43 2009
@@ -1 +1 @@
-/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784184,784893,784895,785279-785282,785468,785621,785624,785651,785734,785866,786142,786271-786272,786395,786512,786514,786582-786583,786638,786647,786850,787200,787269,787277-787279,787290-787291,787305,787323,787366,787849,788030,788060,788187,788444,788451,788703,788752,788774,788819-788820,789013,789371,789387,789420,789527-789530,789704-789705,789788,789811,789896-789901,790074,790094,790134,790188,790294,790553,790637-790644,790868,791301,791354,791538,791753,791947,792007,792096,792183,792261-792265,792271,792604,792683-792685,792975,792985,793059,793570,794297,794396,794680,794728,794771,794778-794780,794892,795044,795104,795160,795583,795907,796022-796023,796352,796593,796741,796780,796994-796997,797117,797159,797192,797194,797231-797233,797442,797505,797517,797534,797581
+/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784184,784893,784895,785279-785282,785468,785621,785624,785651,785734,785866,786142,786271-786272,786395,786512,786514,786582-786583,786638,786647,786850,787200,787269,787277-787279,787290-787291,787305,787323,787366,787849,788030,788060,788187,788444,788451,788703,788752,788774,788819-788820,789013,789371,789387,789420,789527-789530,789704-789705,789788,789811,789896-789901,790074,790094,790134,790188,790294,790553,790637-790644,790868,791301,791354,791538,791753,791947,792007,792096,792183,792261-792265,792271,792604,792683-792685,792975,792985,793059,793570,794297,794396,794680,794728,794771,794778-794780,794892,795044,795104,795160,795583,795907,796022-796023,796352,796593,796741,796780,796994-796997,797117,797159,797192,797194,797231-797233,797442,797505,797517,797534,797581-797582
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.2.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/util/ClassCollector.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/util/ClassCollector.java?rev=797585&r1=797584&r2=797585&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/util/ClassCollector.java (original)
+++ cxf/branches/2.2.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/util/ClassCollector.java Fri Jul 24 18:02:43 2009
@@ -82,6 +82,19 @@
return typesClassNames.get(key(packagename, type));
}
+ public boolean containsTypeIgnoreCase(String packagename, String type) {
+ String key = key(packagename, type);
+ if (typesClassNames.containsKey(key)) {
+ //try the common fast case first
+ return true;
+ }
+ for (String s : typesClassNames.keySet()) {
+ if (key.equalsIgnoreCase(s)) {
+ return true;
+ }
+ }
+ return false;
+ }
private String key(String packagename, String type) {
return packagename + "#" + type;
}
Modified: cxf/branches/2.2.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/ClassNameAllocatorImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/ClassNameAllocatorImpl.java?rev=797585&r1=797584&r2=797585&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/ClassNameAllocatorImpl.java (original)
+++ cxf/branches/2.2.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/ClassNameAllocatorImpl.java Fri Jul 24 18:02:43 2009
@@ -20,7 +20,6 @@
package org.apache.cxf.tools.wsdlto.databinding.jaxb;
import com.sun.tools.xjc.api.ClassNameAllocator;
-import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.tools.util.ClassCollector;
public class ClassNameAllocatorImpl implements ClassNameAllocator {
@@ -46,12 +45,9 @@
String fullPckClass = packageName + "." + fullClzName;
if (autoResolveConflicts) {
- String t2 = collector.getTypesFullClassName(packageName, className);
int cnt = 1;
- while (!StringUtils.isEmpty(t2)) {
-
+ while (collector.containsTypeIgnoreCase(packageName, className + (cnt == 1 ? "" : cnt))) {
cnt++;
- t2 = collector.getTypesFullClassName(packageName, className + cnt);
}
if (cnt != 1) {
className = className + cnt;