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/19 09:46:22 UTC
svn commit: r776222 - in /incubator/rat/main/trunk:
apache-rat-core/src/main/java/org/apache/rat/document/
apache-rat-core/src/main/java/org/apache/rat/document/impl/
apache-rat-core/src/test/java/org/apache/rat/document/
apache-rat-core/src/test/java/...
Author: rdonkin
Date: Tue May 19 07:46:21 2009
New Revision: 776222
URL: http://svn.apache.org/viewvc?rev=776222&view=rev
Log:
Simpify code by removing IDocumentCollection
Removed:
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/IDocumentCollection.java
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/UnreadableArchiveException.java
incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/document/MockDocumentCollection.java
incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/report/analyser/ReadableArchiveAnalyserTest.java
Modified:
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/MonolithicFileDocument.java
incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/document/MockArchiveDocument.java
incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/document/MockDocument.java
incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/document/impl/SingularFileDocumentTest.java
incubator/rat/main/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/FilesReportable.java
incubator/rat/main/trunk/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/ResourceCollectionContainer.java
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/MonolithicFileDocument.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/MonolithicFileDocument.java?rev=776222&r1=776221&r2=776222&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/MonolithicFileDocument.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/MonolithicFileDocument.java Tue May 19 07:46:21 2009
@@ -26,8 +26,6 @@
import java.net.URL;
import org.apache.rat.document.IDocument;
-import org.apache.rat.document.IDocumentCollection;
-import org.apache.rat.document.UnreadableArchiveException;
public class MonolithicFileDocument extends AbstractMonolithicDocument {
@@ -54,10 +52,6 @@
this.file = file;
}
- public IDocumentCollection readArchive() throws IOException {
- throw new UnreadableArchiveException("This file is not an archive");
- }
-
public Reader reader() throws IOException {
return new FileReader(file);
}
Modified: incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/document/MockArchiveDocument.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/document/MockArchiveDocument.java?rev=776222&r1=776221&r2=776222&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/document/MockArchiveDocument.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/document/MockArchiveDocument.java Tue May 19 07:46:21 2009
@@ -23,7 +23,6 @@
public class MockArchiveDocument implements IDocument {
- public IDocumentCollection contents;
public String name;
public MockArchiveDocument() {}
@@ -31,16 +30,6 @@
this.name = name;
}
- public MockArchiveDocument(String name, IDocumentCollection contents) {
- super();
- this.contents = contents;
- this.name = name;
- }
-
- public IDocumentCollection readArchive() throws IOException {
- return contents;
- }
-
public Reader reader() throws IOException {
throw new CompositeDocumentException();
}
@@ -50,7 +39,7 @@
}
public boolean isComposite() {
- return contents != null;
+ return false;
}
}
Modified: incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/document/MockDocument.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/document/MockDocument.java?rev=776222&r1=776221&r2=776222&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/document/MockDocument.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/document/MockDocument.java Tue May 19 07:46:21 2009
@@ -25,7 +25,6 @@
public Reader reader;
public String name;
- public IDocumentCollection documentCollection;
public MockDocument() {
this(null, "name");
@@ -49,11 +48,7 @@
return name;
}
- public IDocumentCollection readArchive() throws IOException {
- return documentCollection;
- }
-
public boolean isComposite() {
- return documentCollection != null;
+ return false;
}
}
Modified: incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/document/impl/SingularFileDocumentTest.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/document/impl/SingularFileDocumentTest.java?rev=776222&r1=776221&r2=776222&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/document/impl/SingularFileDocumentTest.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/document/impl/SingularFileDocumentTest.java Tue May 19 07:46:21 2009
@@ -25,7 +25,6 @@
import junit.framework.TestCase;
import org.apache.rat.document.IDocument;
-import org.apache.rat.document.UnreadableArchiveException;
import org.apache.rat.test.utils.Resources;
public class SingularFileDocumentTest extends TestCase {
Modified: incubator/rat/main/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/FilesReportable.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/FilesReportable.java?rev=776222&r1=776221&r2=776222&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/FilesReportable.java (original)
+++ incubator/rat/main/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/FilesReportable.java Tue May 19 07:46:21 2009
@@ -27,7 +27,6 @@
import java.io.Reader;
import org.apache.rat.document.IDocument;
-import org.apache.rat.document.IDocumentCollection;
import org.apache.rat.document.impl.DocumentImplUtils;
import org.apache.rat.report.IReportable;
import org.apache.rat.report.RatReport;
Modified: incubator/rat/main/trunk/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/ResourceCollectionContainer.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/ResourceCollectionContainer.java?rev=776222&r1=776221&r2=776222&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/ResourceCollectionContainer.java (original)
+++ incubator/rat/main/trunk/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/ResourceCollectionContainer.java Tue May 19 07:46:21 2009
@@ -25,17 +25,14 @@
import java.io.Reader;
import java.util.Iterator;
-import org.apache.tools.ant.types.Resource;
-import org.apache.tools.ant.types.ResourceCollection;
-import org.apache.tools.ant.types.resources.FileResource;
-
import org.apache.rat.document.IDocument;
-import org.apache.rat.document.IDocumentCollection;
-import org.apache.rat.document.UnreadableArchiveException;
import org.apache.rat.document.impl.DocumentImplUtils;
import org.apache.rat.report.IReportable;
import org.apache.rat.report.RatReport;
import org.apache.rat.report.RatReportFailedException;
+import org.apache.tools.ant.types.Resource;
+import org.apache.tools.ant.types.ResourceCollection;
+import org.apache.tools.ant.types.resources.FileResource;
/**
* Implementation of IElement that traverses over a resource