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 00:04:19 UTC
svn commit: r776114 - in /incubator/rat/main/trunk:
apache-rat-core/src/main/java/org/apache/rat/document/impl/
apache-rat-core/src/main/java/org/apache/rat/document/impl/zip/
apache-rat-core/src/test/java/org/apache/rat/document/impl/zip/
apache-rat-p...
Author: rdonkin
Date: Mon May 18 22:04:19 2009
New Revision: 776114
URL: http://svn.apache.org/viewvc?rev=776114&view=rev
Log:
No need for a package for a single function
Removed:
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/zip/
incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/document/impl/zip/
Modified:
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/DocumentImplUtils.java
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/FileDocument.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/DocumentImplUtils.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/DocumentImplUtils.java?rev=776114&r1=776113&r2=776114&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/DocumentImplUtils.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/DocumentImplUtils.java Mon May 18 22:04:19 2009
@@ -19,6 +19,9 @@
package org.apache.rat.document.impl;
import java.io.File;
+import java.io.IOException;
+import java.util.zip.ZipException;
+import java.util.zip.ZipFile;
public class DocumentImplUtils {
@@ -28,4 +31,25 @@
return normalisedPath;
}
+ public static final boolean isZip(File file) {
+ ZipFile zip = null;
+ try {
+ zip = new ZipFile(file);
+ zip.entries();
+ return true;
+ } catch (ZipException e) {
+ return false;
+ } catch (IOException e) {
+ return false;
+ } finally {
+ if (zip != null) {
+ try {
+ zip.close();
+ } catch (Throwable t) {
+ // Swallow
+ }
+ }
+ }
+ }
+
}
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=776114&r1=776113&r2=776114&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 22:04:19 2009
@@ -24,7 +24,6 @@
import java.io.Reader;
import org.apache.rat.document.IDocument;
-import org.apache.rat.document.impl.zip.ZipDocumentFactory;
/**
* Document wrapping a file of undetermined composition.
@@ -42,7 +41,7 @@
}
public boolean isComposite() {
- return ZipDocumentFactory.isZip(file);
+ return DocumentImplUtils.isZip(file);
}
public Reader reader() throws IOException {
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=776114&r1=776113&r2=776114&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 Mon May 18 22:04:19 2009
@@ -29,7 +29,6 @@
import org.apache.rat.document.IDocument;
import org.apache.rat.document.IDocumentCollection;
import org.apache.rat.document.impl.DocumentImplUtils;
-import org.apache.rat.document.impl.zip.ZipDocumentFactory;
import org.apache.rat.report.IReportable;
import org.apache.rat.report.RatReport;
import org.apache.rat.report.RatReportFailedException;
@@ -80,7 +79,7 @@
}
public boolean isComposite() {
- return ZipDocumentFactory.isZip(file);
+ return DocumentImplUtils.isZip(file);
}
public Reader reader() throws IOException
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=776114&r1=776113&r2=776114&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 Mon May 18 22:04:19 2009
@@ -33,7 +33,6 @@
import org.apache.rat.document.IDocumentCollection;
import org.apache.rat.document.UnreadableArchiveException;
import org.apache.rat.document.impl.DocumentImplUtils;
-import org.apache.rat.document.impl.zip.ZipDocumentFactory;
import org.apache.rat.report.IReportable;
import org.apache.rat.report.RatReport;
import org.apache.rat.report.RatReportFailedException;
@@ -96,7 +95,7 @@
if (resource instanceof FileResource) {
final FileResource fileResource = (FileResource) resource;
final File file = fileResource.getFile();
- return ZipDocumentFactory.isZip(file);
+ return DocumentImplUtils.isZip(file);
}
return false;
}