Skip to content

Commit

Permalink
rename AbstractCompressedOutputStream to AbstractBlockCompressedOutpu…
Browse files Browse the repository at this point in the history
…tStream
  • Loading branch information
SilinPavel committed Jun 21, 2017
1 parent d0919d5 commit a40a738
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions src/main/java/htsjdk/samtools/BAMFileWriter.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
*/
package htsjdk.samtools;

import htsjdk.samtools.util.AbstractCompressedOutputStream;
import htsjdk.samtools.util.AbstractBlockCompressedOutputStream;
import htsjdk.samtools.util.BinaryCodec;
import htsjdk.samtools.util.BlockCompressedOutputStream;
import htsjdk.samtools.util.ParallelBlockCompressedOutputStream;
Expand All @@ -44,7 +44,7 @@ class BAMFileWriter extends SAMFileWriterImpl {

private final BinaryCodec outputBinaryCodec;
private BAMRecordCodec bamRecordCodec = null;
private final AbstractCompressedOutputStream blockCompressedOutputStream;
private final AbstractBlockCompressedOutputStream blockCompressedOutputStream;
private BAMIndexer bamIndexer = null;

protected BAMFileWriter(final File path, boolean createIndex) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
*
* c.f. http://samtools.sourceforge.net/SAM1.pdf for details of BGZF file format.
*/
public abstract class AbstractCompressedOutputStream extends OutputStream implements LocationAware {
public abstract class AbstractBlockCompressedOutputStream extends OutputStream implements LocationAware {

protected static DeflaterFactory defaultDeflaterFactory = new DeflaterFactory();
protected static int defaultCompressionLevel = BlockCompressedStreamConstants.DEFAULT_COMPRESSION_LEVEL;
Expand Down Expand Up @@ -97,13 +97,13 @@ public static int getDefaultCompressionLevel() {
* Prepare to compress at the given compression level
* @param file file to output
*/
public AbstractCompressedOutputStream(final File file) {
public AbstractBlockCompressedOutputStream(final File file) {
this.file = file;
codec = new BinaryCodec(file, true);
}


public AbstractCompressedOutputStream(final OutputStream os, final File file) {
public AbstractBlockCompressedOutputStream(final OutputStream os, final File file) {
this.file = file;
codec = new BinaryCodec(os);
if (file != null) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@
import java.util.zip.Deflater;

/**
* Single threaded realisation of {@link AbstractCompressedOutputStream}
* Single threaded realisation of {@link AbstractBlockCompressedOutputStream}
* Each block compressed one-by-one synchronously.
*
* @see AbstractCompressedOutputStream
* @see AbstractBlockCompressedOutputStream
*/
public class BlockCompressedOutputStream
extends AbstractCompressedOutputStream {
extends AbstractBlockCompressedOutputStream {

private final byte[] compressedBuffer =
new byte[BlockCompressedStreamConstants.MAX_COMPRESSED_BLOCK_SIZE -
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@
* After compressing each thread save compressed block to the disk in input order.
* <p>
*
* @see AbstractCompressedOutputStream
* @see AbstractBlockCompressedOutputStream
*/
public class ParallelBlockCompressedOutputStream extends AbstractCompressedOutputStream {
public class ParallelBlockCompressedOutputStream extends AbstractBlockCompressedOutputStream {

private static final ExecutorService gzipExecutorService = createThreadPoolBlockingExecutor();
private static final Void NOTHING = null;
Expand Down

0 comments on commit a40a738

Please sign in to comment.