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/09/04 15:49:28 UTC
svn commit: r811402 - in /cxf/branches/2.2.x-fixes: ./
testutils/src/main/java/org/apache/locator_test/LocatorServiceImpl.java
tools/common/src/main/java/org/apache/cxf/tools/common/model/JAnnotationElement.java
Author: dkulp
Date: Fri Sep 4 13:49:28 2009
New Revision: 811402
URL: http://svn.apache.org/viewvc?rev=811402&view=rev
Log:
Merged revisions 811387 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r811387 | dkulp | 2009-09-04 09:27:03 -0400 (Fri, 04 Sep 2009) | 2 lines
[CXF-2416] Remove compiler warning from generated code for annotations
using enums
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/testutils/src/main/java/org/apache/locator_test/LocatorServiceImpl.java
cxf/branches/2.2.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/model/JAnnotationElement.java
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 4 13:49:28 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-797583,797587,797640,797651,797699,797882-797883,798344-798346,798363,798461,798479,798533,798551,798557,798561-798562,798570,798573,79858
4,798654,798748-798749,798816,798891,798929-798930,799245,799267,799439,799448,799637,799723-799724,799792,800453,800497-800498,801380-801381,801447,801962,802892,803056,803129,803174,803419,803460,803493,803689,804002,804175,804276,805784,805907,805909,806020-806021,806023,806405-806406,806576,806602-806604,806620,806627,806631,806633,806638,806687,806876,806922,806979-806982,807181,807205,807295,807748,807807,808035,808069,808085,808107,808464,808488,808731,808885,808925,809082-809083,809162,809190,809417-809626,809631,809663,809706,809738,809962,810090,810143,810349,810376,810513,810526,810927,811013,811148-811149,811175,811183
+/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-797583,797587,797640,797651,797699,797882-797883,798344-798346,798363,798461,798479,798533,798551,798557,798561-798562,798570,798573,79858
4,798654,798748-798749,798816,798891,798929-798930,799245,799267,799439,799448,799637,799723-799724,799792,800453,800497-800498,801380-801381,801447,801962,802892,803056,803129,803174,803419,803460,803493,803689,804002,804175,804276,805784,805907,805909,806020-806021,806023,806405-806406,806576,806602-806604,806620,806627,806631,806633,806638,806687,806876,806922,806979-806982,807181,807205,807295,807748,807807,808035,808069,808085,808107,808464,808488,808731,808885,808925,809082-809083,809162,809190,809417-809626,809631,809663,809706,809738,809962,810090,810143,810349,810376,810513,810526,810927,811013,811148-811149,811175,811183,811387
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.2.x-fixes/testutils/src/main/java/org/apache/locator_test/LocatorServiceImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/testutils/src/main/java/org/apache/locator_test/LocatorServiceImpl.java?rev=811402&r1=811401&r2=811402&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/testutils/src/main/java/org/apache/locator_test/LocatorServiceImpl.java (original)
+++ cxf/branches/2.2.x-fixes/testutils/src/main/java/org/apache/locator_test/LocatorServiceImpl.java Fri Sep 4 13:49:28 2009
@@ -84,8 +84,7 @@
}
- public java.util.List<
- Endpoint> listEndpoints() {
+ public List<Endpoint> listEndpoints() {
LOG.info("Executing operation listEndpoints");
return new ArrayList<Endpoint>();
}
Modified: cxf/branches/2.2.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/model/JAnnotationElement.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/model/JAnnotationElement.java?rev=811402&r1=811401&r2=811402&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/model/JAnnotationElement.java (original)
+++ cxf/branches/2.2.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/model/JAnnotationElement.java Fri Sep 4 13:49:28 2009
@@ -119,9 +119,11 @@
Enum e = (Enum) obj;
String clzName = e.getClass().getName();
-
- imports.add(obj.getClass().getName().replace("$", "."));
-
+ if (clzName.contains("$")) {
+ imports.add(obj.getClass().getName().substring(0, clzName.lastIndexOf("$")));
+ } else {
+ imports.add(obj.getClass().getName());
+ }
sb.append(clzName.substring(clzName.lastIndexOf(".") + 1).replace("$", "."));
sb.append(".");
sb.append(e.name());