You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@creadur.apache.org by rd...@apache.org on 2009/05/18 23:46:05 UTC
svn commit: r776108 - in
/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat:
DirectoryWalker.java document/IFileUnarchiver.java
document/impl/FileDocument.java document/impl/zip/ZipFileUnarchiver.java
Author: rdonkin
Date: Mon May 18 21:46:05 2009
New Revision: 776108
URL: http://svn.apache.org/viewvc?rev=776108&view=rev
Log:
Inline unnecessary interface
Removed:
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/IFileUnarchiver.java
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/zip/ZipFileUnarchiver.java
Modified:
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/DirectoryWalker.java
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/FileDocument.java
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/DirectoryWalker.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/DirectoryWalker.java?rev=776108&r1=776107&r2=776108&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/DirectoryWalker.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/DirectoryWalker.java Mon May 18 21:46:05 2009
@@ -25,7 +25,6 @@
import org.apache.rat.document.IDocument;
import org.apache.rat.document.impl.FileDocument;
-import org.apache.rat.document.impl.zip.ZipFileUnarchiver;
import org.apache.rat.report.IReportable;
import org.apache.rat.report.RatReport;
import org.apache.rat.report.RatReportFailedException;
@@ -35,7 +34,6 @@
*/
public class DirectoryWalker implements IReportable {
- private static final ZipFileUnarchiver UNARCHIVER = new ZipFileUnarchiver();
private static final FileNameComparator COMPARATOR = new FileNameComparator();
protected final File file;
@@ -164,7 +162,7 @@
*/
private void report(final RatReport report, File file) throws RatReportFailedException {
- IDocument document = new FileDocument(file, UNARCHIVER);
+ IDocument document = new FileDocument(file);
report.report(document);
}
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/FileDocument.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/FileDocument.java?rev=776108&r1=776107&r2=776108&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/FileDocument.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/FileDocument.java Mon May 18 21:46:05 2009
@@ -24,8 +24,7 @@
import java.io.Reader;
import org.apache.rat.document.IDocument;
-import org.apache.rat.document.IDocumentCollection;
-import org.apache.rat.document.IFileUnarchiver;
+import org.apache.rat.document.impl.zip.ZipDocumentFactory;
/**
* Document wrapping a file of undetermined composition.
@@ -35,18 +34,16 @@
private final File file;
private final String name;
- private IFileUnarchiver unarchiver;
- public FileDocument(final File file, IFileUnarchiver unarchiver) {
+ public FileDocument(final File file) {
super();
this.file = file;
- this.unarchiver = unarchiver;
name = DocumentImplUtils.toName(file);
}
public boolean isComposite() {
try {
- unarchiver.unarchive(file);
+ ZipDocumentFactory.load(file);
return true;
} catch (IOException e) {
return false;