You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by kr...@apache.org on 2015/01/02 23:21:33 UTC
svn commit: r1649142 - in /commons/proper/compress/trunk: ./
src/main/java/org/apache/commons/compress/archivers/sevenz/
src/main/java/org/apache/commons/compress/archivers/zip/
src/main/java/org/apache/commons/compress/compressors/deflate/
Author: krosenvold
Date: Fri Jan 2 22:21:32 2015
New Revision: 1649142
URL: http://svn.apache.org/r1649142
Log:
Made site build on jdk8. Fixed stricter javadoc requirements
Modified:
commons/proper/compress/trunk/pom.xml
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZMethodConfiguration.java
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ParallelScatterZipCreator.java
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ScatterZipOutputStream.java
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/deflate/DeflateCompressorInputStream.java
Modified: commons/proper/compress/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/pom.xml?rev=1649142&r1=1649141&r2=1649142&view=diff
==============================================================================
--- commons/proper/compress/trunk/pom.xml (original)
+++ commons/proper/compress/trunk/pom.xml Fri Jan 2 22:21:32 2015
@@ -279,7 +279,7 @@ Unix Compress, DEFLATE and ar, cpio, jar
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
- <version>2.5.5</version>
+ <version>3.0.0</version>
<configuration>
<threshold>Normal</threshold>
<effort>Default</effort>
Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZMethodConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZMethodConfiguration.java?rev=1649142&r1=1649141&r2=1649142&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZMethodConfiguration.java (original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZMethodConfiguration.java Fri Jan 2 22:21:32 2015
@@ -23,7 +23,7 @@ package org.apache.commons.compress.arch
* <p>The exact type and interpretation of options depends on the
* method being configured. Currently supported are:</p>
*
- * <table>
+ * <table summary="Options">
* <tr><th>Method</th><th>Option Type</th><th>Description</th></tr>
* <tr><td>BZIP2</td><td>Number</td><td>Block Size - an number between 1 and 9</td></tr>
* <tr><td>DEFLATE</td><td>Number</td><td>Compression Level - an number between 1 and 9</td></tr>
Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ParallelScatterZipCreator.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ParallelScatterZipCreator.java?rev=1649142&r1=1649141&r2=1649142&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ParallelScatterZipCreator.java (original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ParallelScatterZipCreator.java Fri Jan 2 22:21:32 2015
@@ -31,11 +31,11 @@ import java.util.zip.Deflater;
/**
* Creates a zip in parallel by using multiple threadlocal #ScatterZipOutputStream instances.
- * <p/>
+ * <p>
* Note that this class generally makes no guarantees about the order of things written to
* the output file. Things that need to come in a specific order (manifests, directories)
* must be handled by the client of this class, usually by writing these things to the
- * #ZipArchiveOutputStream *before* calling #writeTo on this class.
+ * #ZipArchiveOutputStream *before* calling #writeTo on this class.</p>
*/
public class ParallelScatterZipCreator {
private List<ScatterZipOutputStream> streams = Collections.synchronizedList(new ArrayList<ScatterZipOutputStream>());
@@ -95,8 +95,9 @@ public class ParallelScatterZipCreator {
/**
* Adds an archive entry to this archive.
- * <p/>
+ * <p>
* This method is expected to be called from a single client thread
+ * </p>
*
* @param zipArchiveEntry The entry to add. Compression method
* @param source The source input stream supplier
@@ -119,9 +120,10 @@ public class ParallelScatterZipCreator {
/**
* Write the contents this to the target #ZipArchiveOutputStream.
- * <p/>
+ * <p>
* It may be beneficial to write things like directories and manifest files to the targetStream
* before calling this method.
+ * </p>
*
* @param targetStream The ZipArchiveOutputStream to receive the contents of the scatter streams
* @throws IOException If writing fails
Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ScatterZipOutputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ScatterZipOutputStream.java?rev=1649142&r1=1649141&r2=1649142&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ScatterZipOutputStream.java (original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ScatterZipOutputStream.java Fri Jan 2 22:21:32 2015
@@ -30,13 +30,13 @@ import java.util.zip.Deflater;
/**
* A zip output stream that is optimized for multi-threaded scatter/gather construction of zip files.
- * <p/>
+ * <p>
* The internal data format of the entries used by this class are entirely private to this class
* and are not part of any public api whatsoever.
- * <p/>
- * It is possible to extend this class to support different kinds of backing storage, the default
+ * </p>
+ * <p>It is possible to extend this class to support different kinds of backing storage, the default
* implementation only supports file-based backing.
- * <p/>
+ * </p>
* Thread safety: This class supports multiple threads. But the "writeTo" method must be called
* by the thread that originally created the ZipArchiveEntry.
*
Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/deflate/DeflateCompressorInputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/deflate/DeflateCompressorInputStream.java?rev=1649142&r1=1649141&r2=1649142&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/deflate/DeflateCompressorInputStream.java (original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/deflate/DeflateCompressorInputStream.java Fri Jan 2 22:21:32 2015
@@ -48,7 +48,7 @@ public class DeflateCompressorInputStrea
* from the specified input stream.
*
* @param inputStream where to read the compressed data
- * @param compressor parameters
+ * @param parameters parameters
*/
public DeflateCompressorInputStream(InputStream inputStream,
DeflateParameters parameters) {