diff --git a/src/main/java/azgracompress/compression/CompressorDecompressorBase.java b/src/main/java/azgracompress/compression/CompressorDecompressorBase.java index 538951438eb0276e7deb1f5ccb0eb1f324f5e132..4cc9fe917ff5ec554a5f031921c3617ed5b24138 100644 --- a/src/main/java/azgracompress/compression/CompressorDecompressorBase.java +++ b/src/main/java/azgracompress/compression/CompressorDecompressorBase.java @@ -71,7 +71,7 @@ public abstract class CompressorDecompressorBase { reportStatusToListeners(String.format(format, args)); } - protected void reportProgressListeners(final int index, final int finalIndex, final String message) { + protected void reportProgressToListeners(final int index, final int finalIndex, final String message) { if (this.progressListeners != null) { for (final IProgressListener listener : this.progressListeners) { listener.sendProgress(message, index, finalIndex); @@ -79,11 +79,11 @@ public abstract class CompressorDecompressorBase { } } - protected void reportProgressListeners(final int index, - final int finalIndex, - final String message, - final Object... args) { - reportProgressListeners(index, finalIndex, String.format(message, args)); + protected void reportProgressToListeners(final int index, + final int finalIndex, + final String message, + final Object... args) { + reportProgressToListeners(index, finalIndex, String.format(message, args)); } protected int[] createHuffmanSymbols(final int codebookSize) { diff --git a/src/main/java/azgracompress/compression/SQImageCompressor.java b/src/main/java/azgracompress/compression/SQImageCompressor.java index 77760d8667a5f1d30dd730d589a63b1f5b41dd86..241377e636f00cbfae632a4f31cf2f80cb297d73 100644 --- a/src/main/java/azgracompress/compression/SQImageCompressor.java +++ b/src/main/java/azgracompress/compression/SQImageCompressor.java @@ -165,7 +165,7 @@ public class SQImageCompressor extends CompressorDecompressorBase implements IIm planeDataSizes[planeCounter++] = writeHuffmanEncodedIndices(compressStream, huffman, indices); stopwatch.stop(); - reportProgressListeners(planeIndex, planeIndices.length, + reportProgressToListeners(planeIndex, planeIndices.length, "Compressed plane %d in %s.", planeIndex, stopwatch.getElapsedTimeString()); } return planeDataSizes; diff --git a/src/main/java/azgracompress/compression/SQImageDecompressor.java b/src/main/java/azgracompress/compression/SQImageDecompressor.java index fefc9b0b1bc9c77803e59b2b9a31e06011b993c9..e4f7edbe02adedb143353ce9de8a3cd785eadbb6 100644 --- a/src/main/java/azgracompress/compression/SQImageDecompressor.java +++ b/src/main/java/azgracompress/compression/SQImageDecompressor.java @@ -1,6 +1,5 @@ package azgracompress.compression; -import azgracompress.cli.ParsedCliOptions; import azgracompress.compression.exception.ImageDecompressionException; import azgracompress.fileformat.QCMPFileHeader; import azgracompress.huffman.Huffman; @@ -141,7 +140,7 @@ public class SQImageDecompressor extends CompressorDecompressorBase implements I } for (int planeIndex = 0; planeIndex < planeCountForDecompression; planeIndex++) { - reportProgressListeners(planeIndex, planeCountForDecompression, "Decompressing plane %d", planeIndex); + reportProgressToListeners(planeIndex, planeCountForDecompression, "Decompressing plane %d", planeIndex); if (header.isCodebookPerPlane()) { codebook = readScalarQuantizationValues(compressedStream, codebookSize); huffman = createHuffmanCoder(huffmanSymbols, codebook.getSymbolFrequencies()); diff --git a/src/main/java/azgracompress/compression/VQImageCompressor.java b/src/main/java/azgracompress/compression/VQImageCompressor.java index 6c023293f23bae1dc1a142f6dcf096286f21af38..05539c6f994ba04f0ce8ca5327701d2607b7187c 100644 --- a/src/main/java/azgracompress/compression/VQImageCompressor.java +++ b/src/main/java/azgracompress/compression/VQImageCompressor.java @@ -170,7 +170,7 @@ public class VQImageCompressor extends CompressorDecompressorBase implements IIm planeDataSizes[planeCounter++] = writeHuffmanEncodedIndices(compressStream, huffman, indices); stopwatch.stop(); - reportProgressListeners(planeIndex, planeIndices.length, + reportProgressToListeners(planeIndex, planeIndices.length, "Finished compression of plane %d in %s.", planeIndex, stopwatch.getElapsedTimeString()); } return planeDataSizes; diff --git a/src/main/java/azgracompress/compression/VQImageDecompressor.java b/src/main/java/azgracompress/compression/VQImageDecompressor.java index ed2935af2253a265042b3c3823bbfbd1662fb8ba..064372278ab10f3f9bcab485eec1bc8fa62edcce 100644 --- a/src/main/java/azgracompress/compression/VQImageDecompressor.java +++ b/src/main/java/azgracompress/compression/VQImageDecompressor.java @@ -1,6 +1,5 @@ package azgracompress.compression; -import azgracompress.cli.ParsedCliOptions; import azgracompress.compression.exception.ImageDecompressionException; import azgracompress.data.*; import azgracompress.fileformat.QCMPFileHeader; @@ -15,7 +14,6 @@ import azgracompress.utilities.TypeConverter; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import java.lang.reflect.Type; // TODO(Moravec): Handle huffman decoding. @@ -174,7 +172,7 @@ public class VQImageDecompressor extends CompressorDecompressorBase implements I } stopwatch.stop(); - reportProgressListeners(planeIndex, planeCountForDecompression, + reportProgressToListeners(planeIndex, planeCountForDecompression, "Decompressed plane %d in %s", planeIndex, stopwatch.getElapsedTimeString()); } } @@ -239,7 +237,7 @@ public class VQImageDecompressor extends CompressorDecompressorBase implements I } catch (Exception ex) { throw new ImageDecompressionException("Unable to read indices from InBitStream.", ex); } - reportProgressListeners(planeIndex, planeCountForDecompression, + reportProgressToListeners(planeIndex, planeCountForDecompression, "Decompressed plane %d.", planeIndex); } }