svn commit: r1548402 - 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: Fri Dec  6 08:09:21 2013
New Revision: 1548402

URL: http://svn.apache.org/r1548402
Log:
Inline static method call

Modified:
    
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/analysis/DefaultAnalyser.java
    
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/BinaryGuesser.java
    
creadur/rat/branches/gsoc/apache-rat-core/src/test/java/org/apache/rat/document/impl/guesser/BinaryGuesserTest.java

Modified: 
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/analysis/DefaultAnalyser.java
URL: 
http://svn.apache.org/viewvc/creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/analysis/DefaultAnalyser.java?rev=1548402&r1=1548401&r2=1548402&view=diff
==============================================================================
--- 
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/analysis/DefaultAnalyser.java
 (original)
+++ 
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/analysis/DefaultAnalyser.java
 Fri Dec  6 08:09:21 2013
@@ -45,7 +45,7 @@ final class DefaultAnalyser implements I
         } else {
             if (this.archiveGuesser.matches(subject)) {
                 documentCategory = 
MetaData.RAT_DOCUMENT_CATEGORY_DATUM_ARCHIVE;
-            } else if (BinaryGuesser.isBinary(subject)) {
+            } else if (new BinaryGuesser().matches(subject)) {
                 documentCategory = MetaData.RAT_DOCUMENT_CATEGORY_DATUM_BINARY;
             } else {
                 documentCategory =

Modified: 
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/BinaryGuesser.java
URL: 
http://svn.apache.org/viewvc/creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/BinaryGuesser.java?rev=1548402&r1=1548401&r2=1548402&view=diff
==============================================================================
--- 
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/BinaryGuesser.java
 (original)
+++ 
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/BinaryGuesser.java
 Fri Dec  6 08:09:21 2013
@@ -52,14 +52,10 @@ public class BinaryGuesser {
     private static final int NON_ASCII_THREASHOLD = 256;
     private static final int ASCII_CHAR_THREASHOLD = 8;
 
-    public static final boolean isBinary(final Document document) {
-        return new BinaryGuesser().matches(document);
-    }
-
     public BinaryGuesser() {
     }
 
-    private boolean matches(final Document document) {
+    public boolean matches(final Document document) {
         // TODO: reimplement the binary test algorithm?
         // TODO: more efficient to move into standard analysis
         // TODO: then use binary as default

Modified: 
creadur/rat/branches/gsoc/apache-rat-core/src/test/java/org/apache/rat/document/impl/guesser/BinaryGuesserTest.java
URL: 
http://svn.apache.org/viewvc/creadur/rat/branches/gsoc/apache-rat-core/src/test/java/org/apache/rat/document/impl/guesser/BinaryGuesserTest.java?rev=1548402&r1=1548401&r2=1548402&view=diff
==============================================================================
--- 
creadur/rat/branches/gsoc/apache-rat-core/src/test/java/org/apache/rat/document/impl/guesser/BinaryGuesserTest.java
 (original)
+++ 
creadur/rat/branches/gsoc/apache-rat-core/src/test/java/org/apache/rat/document/impl/guesser/BinaryGuesserTest.java
 Fri Dec  6 08:09:21 2013
@@ -49,7 +49,7 @@ public class BinaryGuesserTest {
     }
 
     private void assertThatDocumentIsBinary(final String name) {
-        assertTrue(BinaryGuesser.isBinary(new MockDocument(name)));
+        assertTrue(new BinaryGuesser().matches(new MockDocument(name)));
     }
 
     /**
@@ -85,7 +85,7 @@ public class BinaryGuesserTest {
                 r.close();
             }
             r = null;
-            assertTrue(BinaryGuesser.isBinary(doc));
+            assertTrue(new BinaryGuesser().matches(doc));
         } finally {
             if (r != null) {
                 r.close();
@@ -97,20 +97,20 @@ public class BinaryGuesserTest {
     public void realBinaryContent() {
         // This test is not accurate on all platforms
         if (System.getProperty("file.encoding").startsWith("ANSI")) {
-            assertTrue(BinaryGuesser.isBinary(new FileDocument(new File(
-                    "src/test/resources/binaries/Image-png.not"))));
+            assertTrue(new BinaryGuesser().matches(new FileDocument(new File(
+            "src/test/resources/binaries/Image-png.not"))));
         }
     }
 
     @Test
     public void textualContent() {
-        assertFalse(BinaryGuesser.isBinary(new FileDocument(new File(
-                "src/test/resources/elements/Text.txt"))));
+        assertFalse(new BinaryGuesser().matches(new FileDocument(new File(
+        "src/test/resources/elements/Text.txt"))));
     }
 
     @Test
     public void emptyFile() {
-        assertFalse(BinaryGuesser.isBinary(new FileDocument(new File(
-                "src/test/resources/elements/sub/Empty.txt"))));
+        assertFalse(new BinaryGuesser().matches(new FileDocument(new File(
+        "src/test/resources/elements/sub/Empty.txt"))));
     }
 }