Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 59118 invoked from network); 4 Sep 2009 13:27:34 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 4 Sep 2009 13:27:34 -0000 Received: (qmail 64911 invoked by uid 500); 4 Sep 2009 13:27:34 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 64809 invoked by uid 500); 4 Sep 2009 13:27:33 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 64800 invoked by uid 99); 4 Sep 2009 13:27:33 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Sep 2009 13:27:33 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Sep 2009 13:27:24 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id CAFD023888E6; Fri, 4 Sep 2009 13:27:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r811387 - in /cxf/trunk: testutils/src/main/java/org/apache/locator_test/LocatorServiceImpl.java tools/common/src/main/java/org/apache/cxf/tools/common/model/JAnnotationElement.java Date: Fri, 04 Sep 2009 13:27:03 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090904132703.CAFD023888E6@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Fri Sep 4 13:27:03 2009 New Revision: 811387 URL: http://svn.apache.org/viewvc?rev=811387&view=rev Log: [CXF-2416] Remove compiler warning from generated code for annotations using enums Modified: cxf/trunk/testutils/src/main/java/org/apache/locator_test/LocatorServiceImpl.java cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/JAnnotationElement.java Modified: cxf/trunk/testutils/src/main/java/org/apache/locator_test/LocatorServiceImpl.java URL: http://svn.apache.org/viewvc/cxf/trunk/testutils/src/main/java/org/apache/locator_test/LocatorServiceImpl.java?rev=811387&r1=811386&r2=811387&view=diff ============================================================================== --- cxf/trunk/testutils/src/main/java/org/apache/locator_test/LocatorServiceImpl.java (original) +++ cxf/trunk/testutils/src/main/java/org/apache/locator_test/LocatorServiceImpl.java Fri Sep 4 13:27:03 2009 @@ -84,8 +84,7 @@ } - public java.util.List< - Endpoint> listEndpoints() { + public List listEndpoints() { LOG.info("Executing operation listEndpoints"); return new ArrayList(); } Modified: cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/JAnnotationElement.java URL: http://svn.apache.org/viewvc/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/JAnnotationElement.java?rev=811387&r1=811386&r2=811387&view=diff ============================================================================== --- cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/JAnnotationElement.java (original) +++ cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/JAnnotationElement.java Fri Sep 4 13:27:03 2009 @@ -123,9 +123,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());