Return-Path: Delivered-To: apmail-incubator-rat-commits-archive@minotaur.apache.org Received: (qmail 17042 invoked from network); 18 May 2009 21:37:16 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 18 May 2009 21:37:16 -0000 Received: (qmail 85509 invoked by uid 500); 18 May 2009 21:37:16 -0000 Delivered-To: apmail-incubator-rat-commits-archive@incubator.apache.org Received: (qmail 85489 invoked by uid 500); 18 May 2009 21:37:16 -0000 Mailing-List: contact rat-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: rat-dev@incubator.apache.org Delivered-To: mailing list rat-commits@incubator.apache.org Received: (qmail 85480 invoked by uid 99); 18 May 2009 21:37:16 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 18 May 2009 21:37:16 +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; Mon, 18 May 2009 21:37:14 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1C68D2388898; Mon, 18 May 2009 21:36:54 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r776105 - in /incubator/rat/main/trunk/apache-rat-core/src: main/java/org/apache/rat/document/ test/java/org/apache/rat/document/ test/java/org/apache/rat/test/utils/ Date: Mon, 18 May 2009 21:36:54 -0000 To: rat-commits@incubator.apache.org From: rdonkin@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090518213654.1C68D2388898@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rdonkin Date: Mon May 18 21:36:53 2009 New Revision: 776105 URL: http://svn.apache.org/viewvc?rev=776105&view=rev Log: Reduce complexity Removed: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/DocumentUtils.java incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/document/DocumentUtilsTest.java Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/ToNameTransformer.java incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/test/utils/RATCase.java Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/ToNameTransformer.java URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/ToNameTransformer.java?rev=776105&r1=776104&r2=776105&view=diff ============================================================================== --- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/ToNameTransformer.java (original) +++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/ToNameTransformer.java Mon May 18 21:36:53 2009 @@ -20,8 +20,14 @@ import org.apache.commons.collections.Transformer; -class ToNameTransformer implements Transformer { +public class ToNameTransformer implements Transformer { + private static final Transformer TO_NAME_TRANSFORMER = new ToNameTransformer(); + + public static final Transformer toNameTransformer() { + return TO_NAME_TRANSFORMER; + } + public Object transform(Object subject) { Object result = null; if (subject != null && subject instanceof IResource) { Modified: incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/test/utils/RATCase.java URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/test/utils/RATCase.java?rev=776105&r1=776104&r2=776105&view=diff ============================================================================== --- incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/test/utils/RATCase.java (original) +++ incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/test/utils/RATCase.java Mon May 18 21:36:53 2009 @@ -26,16 +26,16 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.IteratorUtils; -import org.apache.rat.document.DocumentUtils; import org.apache.rat.document.IDocument; import org.apache.rat.document.IDocumentCollection; +import org.apache.rat.document.ToNameTransformer; public abstract class RATCase extends TestCase { protected void checkDummyJar(IDocumentCollection collection) { assertNotNull(collection); Collection documents = IteratorUtils.toList(collection.documentIterator()); - CollectionUtils.transform(documents, DocumentUtils.toNameTransformer()); + CollectionUtils.transform(documents, ToNameTransformer.toNameTransformer()); assertEquals("Six documents in the jar", 6, documents.size()); assertTrue("Document names", documents.contains("Image.png")); assertTrue("Document names", documents.contains("LICENSE"));