Return-Path: X-Original-To: apmail-creadur-commits-archive@www.apache.org Delivered-To: apmail-creadur-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 016FBFE53 for ; Sun, 31 Mar 2013 10:43:32 +0000 (UTC) Received: (qmail 43579 invoked by uid 500); 31 Mar 2013 10:43:31 -0000 Delivered-To: apmail-creadur-commits-archive@creadur.apache.org Received: (qmail 43505 invoked by uid 500); 31 Mar 2013 10:43:29 -0000 Mailing-List: contact commits-help@creadur.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@creadur.apache.org Delivered-To: mailing list commits@creadur.apache.org Received: (qmail 43479 invoked by uid 99); 31 Mar 2013 10:43:28 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 31 Mar 2013 10:43:28 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Sun, 31 Mar 2013 10:43:27 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 5B75923888FD; Sun, 31 Mar 2013 10:43:07 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1462914 - in /creadur/tentacles/trunk/src/main/java/org/apache/creadur/tentacles: Main.java filter/Filters.java Date: Sun, 31 Mar 2013 10:43:07 -0000 To: commits@creadur.apache.org From: rdonkin@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130331104307.5B75923888FD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rdonkin Date: Sun Mar 31 10:43:06 2013 New Revision: 1462914 URL: http://svn.apache.org/r1462914 Log: Improve names Modified: creadur/tentacles/trunk/src/main/java/org/apache/creadur/tentacles/Main.java creadur/tentacles/trunk/src/main/java/org/apache/creadur/tentacles/filter/Filters.java Modified: creadur/tentacles/trunk/src/main/java/org/apache/creadur/tentacles/Main.java URL: http://svn.apache.org/viewvc/creadur/tentacles/trunk/src/main/java/org/apache/creadur/tentacles/Main.java?rev=1462914&r1=1462913&r2=1462914&view=diff ============================================================================== --- creadur/tentacles/trunk/src/main/java/org/apache/creadur/tentacles/Main.java (original) +++ creadur/tentacles/trunk/src/main/java/org/apache/creadur/tentacles/Main.java Sun Mar 31 10:43:06 2013 @@ -210,7 +210,7 @@ public class Main { final File contents = contents(archive.getFile()); final List files = this.fileSystem.collect(contents, - this.filters.licensesIn(contents)); + this.filters.licensesDeclaredIn(contents)); for (final File file : files) { @@ -248,7 +248,7 @@ public class Main { final File contents = contents(archive.getFile()); final List files = this.fileSystem.collect(contents, - this.filters.noticesIn(contents)); + this.filters.noticesDeclaredIn(contents)); for (final File file : files) { @@ -342,7 +342,7 @@ public class Main { new File(this.configuration.getStagingRepositoryURI()); final List collect = this.fileSystem.collect(file, this.filters - .archiveInPath(this.configuration + .archivesInPath(this.configuration .getFileRepositoryPathNameFilter())); for (final File f : collect) { @@ -634,7 +634,7 @@ public class Main { final File jarContents = contents(this.file); final List legal = Main.this.fileSystem.collect(jarContents, Main.this.filters - .undeclaredLegalDocumentsIn(jarContents)); + .legalDocumentsUndeclaredIn(jarContents)); final Map map = new LinkedHashMap(); for (final File file : legal) { @@ -651,7 +651,7 @@ public class Main { final File jarContents = contents(this.file); final List legal = Main.this.fileSystem.collect(jarContents, Main.this.filters - .declaredLegalDocumentsIn(jarContents)); + .legalDocumentsDeclaredIn(jarContents)); final Map map = new LinkedHashMap(); for (final File file : legal) { Modified: creadur/tentacles/trunk/src/main/java/org/apache/creadur/tentacles/filter/Filters.java URL: http://svn.apache.org/viewvc/creadur/tentacles/trunk/src/main/java/org/apache/creadur/tentacles/filter/Filters.java?rev=1462914&r1=1462913&r2=1462914&view=diff ============================================================================== --- creadur/tentacles/trunk/src/main/java/org/apache/creadur/tentacles/filter/Filters.java (original) +++ creadur/tentacles/trunk/src/main/java/org/apache/creadur/tentacles/filter/Filters.java Sun Mar 31 10:43:06 2013 @@ -51,25 +51,25 @@ public class Filters { return this.legalOnly; } - public FileFilter licensesIn(final File contents) { + public FileFilter licensesDeclaredIn(final File contents) { return new AndFilter(new DeclaredFilter(contents), new LicenseFilter()); } - public FileFilter noticesIn(final File contents) { + public FileFilter noticesDeclaredIn(final File contents) { return new AndFilter(new DeclaredFilter(contents), new NoticeFilter()); } - public FileFilter undeclaredLegalDocumentsIn(final File contents) { + public FileFilter legalDocumentsUndeclaredIn(final File contents) { return new AndFilter(new NotFilter(new DeclaredFilter(contents)), new LegalFilter()); } - public FileFilter declaredLegalDocumentsIn(final File contents) { + public FileFilter legalDocumentsDeclaredIn(final File contents) { return new AndFilter(new DeclaredFilter(contents), new LegalFilter()); } - public FileFilter archiveInPath(final String repositoryPathNameFilter) { + public FileFilter archivesInPath(final String repositoryPathNameFilter) { return new IsArchiveInPathFilter(repositoryPathNameFilter); } }