svn commit: r1548136 - in /creadur/rat/branches/gsoc/apache-rat-core/src: main/java/org/apache/rat/analysis/ main/java/org/apache/rat/document/impl/guesser/ test/java/org/apache/rat/document/impl/guesser/

[rdonkin]

Author: rdonkin
Date: Thu Dec  5 13:50:35 2013
New Revision: 1548136

URL: http://svn.apache.org/r1548136
Log:
Inlined static method

Modified:
    
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/analysis/DefaultAnalyserFactory.java
    
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/ArchiveGuesser.java
    
creadur/rat/branches/gsoc/apache-rat-core/src/test/java/org/apache/rat/document/impl/guesser/ArchiveGuesserTest.java

Modified: 
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/analysis/DefaultAnalyserFactory.java
URL: 
http://svn.apache.org/viewvc/creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/analysis/DefaultAnalyserFactory.java?rev=1548136&r1=1548135&r2=1548136&view=diff
==============================================================================
--- 
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/analysis/DefaultAnalyserFactory.java
 (original)
+++ 
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/analysis/DefaultAnalyserFactory.java
 Thu Dec  5 13:50:35 2013
@@ -50,7 +50,7 @@ public class DefaultAnalyserFactory {
             final MetaData.Datum documentCategory;
             if (NoteGuesser.isNote(subject)) {
                 documentCategory = MetaData.RAT_DOCUMENT_CATEGORY_DATUM_NOTICE;
-            } else if (ArchiveGuesser.isArchive(subject)) {
+            } else if (new ArchiveGuesser().isArchive(subject.getName())) {
                 documentCategory = 
MetaData.RAT_DOCUMENT_CATEGORY_DATUM_ARCHIVE;
             } else if (BinaryGuesser.isBinary(subject)) {
                 documentCategory = MetaData.RAT_DOCUMENT_CATEGORY_DATUM_BINARY;

Modified: 
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/ArchiveGuesser.java
URL: 
http://svn.apache.org/viewvc/creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/ArchiveGuesser.java?rev=1548136&r1=1548135&r2=1548136&view=diff
==============================================================================
--- 
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/ArchiveGuesser.java
 (original)
+++ 
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/ArchiveGuesser.java
 Thu Dec  5 13:50:35 2013
@@ -20,20 +20,14 @@ package org.apache.rat.document.impl.gue
 
 import java.util.Locale;
 
-import org.apache.rat.api.Document;
-
 public class ArchiveGuesser {
 
     private static final String[] ARCHIVE_EXTENSIONS = { "jar", "gz", "zip",
             "tar", "bz", "bz2", "rar", "war", };
 
-    public static final boolean isArchive(final Document document) {
-        return new ArchiveGuesser().isArchive(document.getName());
-    }
-
     private final String[] archiveExtensions;
 
-    private ArchiveGuesser() {
+    public ArchiveGuesser() {
         this(ARCHIVE_EXTENSIONS);
     }
 
@@ -45,7 +39,7 @@ public class ArchiveGuesser {
     /**
      * Is a file by that name an archive?
      */
-    private boolean isArchive(final String name) {
+    public boolean isArchive(final String name) {
         if (name == null) {
             return false;
         }
@@ -57,5 +51,4 @@ public class ArchiveGuesser {
         }
         return false;
     }
-
 }

Modified: 
creadur/rat/branches/gsoc/apache-rat-core/src/test/java/org/apache/rat/document/impl/guesser/ArchiveGuesserTest.java
URL: 
http://svn.apache.org/viewvc/creadur/rat/branches/gsoc/apache-rat-core/src/test/java/org/apache/rat/document/impl/guesser/ArchiveGuesserTest.java?rev=1548136&r1=1548135&r2=1548136&view=diff
==============================================================================
--- 
creadur/rat/branches/gsoc/apache-rat-core/src/test/java/org/apache/rat/document/impl/guesser/ArchiveGuesserTest.java
 (original)
+++ 
creadur/rat/branches/gsoc/apache-rat-core/src/test/java/org/apache/rat/document/impl/guesser/ArchiveGuesserTest.java
 Thu Dec  5 13:50:35 2013
@@ -27,11 +27,11 @@ public class ArchiveGuesserTest {
 
     @Test
     public void matches() {
-        assertTrue(ArchiveGuesser.isArchive(new MockDocument("42.jar")));
-        assertTrue(ArchiveGuesser.isArchive(new MockDocument("42.tar.gz")));
-        assertTrue(ArchiveGuesser.isArchive(new MockDocument("42.zip")));
-        assertTrue(ArchiveGuesser.isArchive(new MockDocument("42.tar")));
-        assertTrue(ArchiveGuesser.isArchive(new MockDocument("42.bz")));
-        assertTrue(ArchiveGuesser.isArchive(new MockDocument("42.bz2")));
+        assertTrue(new ArchiveGuesser().isArchive(new 
MockDocument("42.jar").getName()));
+        assertTrue(new ArchiveGuesser().isArchive(new 
MockDocument("42.tar.gz").getName()));
+        assertTrue(new ArchiveGuesser().isArchive(new 
MockDocument("42.zip").getName()));
+        assertTrue(new ArchiveGuesser().isArchive(new 
MockDocument("42.tar").getName()));
+        assertTrue(new ArchiveGuesser().isArchive(new 
MockDocument("42.bz").getName()));
+        assertTrue(new ArchiveGuesser().isArchive(new 
MockDocument("42.bz2").getName()));
     }
 }