svn commit: r1462914 - in /creadur/tentacles/trunk/src/main/java/org/apache/creadur/tentacles: Main.java filter/Filters.java

[rdonkin]

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<File> 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<File> 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<File> 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<File> legal =
                     Main.this.fileSystem.collect(jarContents, Main.this.filters
-                            .undeclaredLegalDocumentsIn(jarContents));
+                            .legalDocumentsUndeclaredIn(jarContents));
 
             final Map<URI, URI> map = new LinkedHashMap<URI, URI>();
             for (final File file : legal) {
@@ -651,7 +651,7 @@ public class Main {
             final File jarContents = contents(this.file);
             final List<File> legal =
                     Main.this.fileSystem.collect(jarContents, Main.this.filters
-                            .declaredLegalDocumentsIn(jarContents));
+                            .legalDocumentsDeclaredIn(jarContents));
 
             final Map<URI, URI> map = new LinkedHashMap<URI, URI>();
             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);
     }
 }