Skip to content
Snippets Groups Projects
Commit 8d2e7df7 authored by Vojtěch Moravec's avatar Vojtěch Moravec
Browse files

Rename the reportProgressListeners -> reportProgressToListeners

parent 30d72fa8
No related branches found
No related tags found
No related merge requests found
...@@ -71,7 +71,7 @@ public abstract class CompressorDecompressorBase { ...@@ -71,7 +71,7 @@ public abstract class CompressorDecompressorBase {
reportStatusToListeners(String.format(format, args)); 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) { if (this.progressListeners != null) {
for (final IProgressListener listener : this.progressListeners) { for (final IProgressListener listener : this.progressListeners) {
listener.sendProgress(message, index, finalIndex); listener.sendProgress(message, index, finalIndex);
...@@ -79,11 +79,11 @@ public abstract class CompressorDecompressorBase { ...@@ -79,11 +79,11 @@ public abstract class CompressorDecompressorBase {
} }
} }
protected void reportProgressListeners(final int index, protected void reportProgressToListeners(final int index,
final int finalIndex, final int finalIndex,
final String message, final String message,
final Object... args) { final Object... args) {
reportProgressListeners(index, finalIndex, String.format(message, args)); reportProgressToListeners(index, finalIndex, String.format(message, args));
} }
protected int[] createHuffmanSymbols(final int codebookSize) { protected int[] createHuffmanSymbols(final int codebookSize) {
......
...@@ -165,7 +165,7 @@ public class SQImageCompressor extends CompressorDecompressorBase implements IIm ...@@ -165,7 +165,7 @@ public class SQImageCompressor extends CompressorDecompressorBase implements IIm
planeDataSizes[planeCounter++] = writeHuffmanEncodedIndices(compressStream, huffman, indices); planeDataSizes[planeCounter++] = writeHuffmanEncodedIndices(compressStream, huffman, indices);
stopwatch.stop(); stopwatch.stop();
reportProgressListeners(planeIndex, planeIndices.length, reportProgressToListeners(planeIndex, planeIndices.length,
"Compressed plane %d in %s.", planeIndex, stopwatch.getElapsedTimeString()); "Compressed plane %d in %s.", planeIndex, stopwatch.getElapsedTimeString());
} }
return planeDataSizes; return planeDataSizes;
......
package azgracompress.compression; package azgracompress.compression;
import azgracompress.cli.ParsedCliOptions;
import azgracompress.compression.exception.ImageDecompressionException; import azgracompress.compression.exception.ImageDecompressionException;
import azgracompress.fileformat.QCMPFileHeader; import azgracompress.fileformat.QCMPFileHeader;
import azgracompress.huffman.Huffman; import azgracompress.huffman.Huffman;
...@@ -141,7 +140,7 @@ public class SQImageDecompressor extends CompressorDecompressorBase implements I ...@@ -141,7 +140,7 @@ public class SQImageDecompressor extends CompressorDecompressorBase implements I
} }
for (int planeIndex = 0; planeIndex < planeCountForDecompression; planeIndex++) { for (int planeIndex = 0; planeIndex < planeCountForDecompression; planeIndex++) {
reportProgressListeners(planeIndex, planeCountForDecompression, "Decompressing plane %d", planeIndex); reportProgressToListeners(planeIndex, planeCountForDecompression, "Decompressing plane %d", planeIndex);
if (header.isCodebookPerPlane()) { if (header.isCodebookPerPlane()) {
codebook = readScalarQuantizationValues(compressedStream, codebookSize); codebook = readScalarQuantizationValues(compressedStream, codebookSize);
huffman = createHuffmanCoder(huffmanSymbols, codebook.getSymbolFrequencies()); huffman = createHuffmanCoder(huffmanSymbols, codebook.getSymbolFrequencies());
......
...@@ -170,7 +170,7 @@ public class VQImageCompressor extends CompressorDecompressorBase implements IIm ...@@ -170,7 +170,7 @@ public class VQImageCompressor extends CompressorDecompressorBase implements IIm
planeDataSizes[planeCounter++] = writeHuffmanEncodedIndices(compressStream, huffman, indices); planeDataSizes[planeCounter++] = writeHuffmanEncodedIndices(compressStream, huffman, indices);
stopwatch.stop(); stopwatch.stop();
reportProgressListeners(planeIndex, planeIndices.length, reportProgressToListeners(planeIndex, planeIndices.length,
"Finished compression of plane %d in %s.", planeIndex, stopwatch.getElapsedTimeString()); "Finished compression of plane %d in %s.", planeIndex, stopwatch.getElapsedTimeString());
} }
return planeDataSizes; return planeDataSizes;
......
package azgracompress.compression; package azgracompress.compression;
import azgracompress.cli.ParsedCliOptions;
import azgracompress.compression.exception.ImageDecompressionException; import azgracompress.compression.exception.ImageDecompressionException;
import azgracompress.data.*; import azgracompress.data.*;
import azgracompress.fileformat.QCMPFileHeader; import azgracompress.fileformat.QCMPFileHeader;
...@@ -15,7 +14,6 @@ import azgracompress.utilities.TypeConverter; ...@@ -15,7 +14,6 @@ import azgracompress.utilities.TypeConverter;
import java.io.DataInputStream; import java.io.DataInputStream;
import java.io.DataOutputStream; import java.io.DataOutputStream;
import java.io.IOException; import java.io.IOException;
import java.lang.reflect.Type;
// TODO(Moravec): Handle huffman decoding. // TODO(Moravec): Handle huffman decoding.
...@@ -174,7 +172,7 @@ public class VQImageDecompressor extends CompressorDecompressorBase implements I ...@@ -174,7 +172,7 @@ public class VQImageDecompressor extends CompressorDecompressorBase implements I
} }
stopwatch.stop(); stopwatch.stop();
reportProgressListeners(planeIndex, planeCountForDecompression, reportProgressToListeners(planeIndex, planeCountForDecompression,
"Decompressed plane %d in %s", planeIndex, stopwatch.getElapsedTimeString()); "Decompressed plane %d in %s", planeIndex, stopwatch.getElapsedTimeString());
} }
} }
...@@ -239,7 +237,7 @@ public class VQImageDecompressor extends CompressorDecompressorBase implements I ...@@ -239,7 +237,7 @@ public class VQImageDecompressor extends CompressorDecompressorBase implements I
} catch (Exception ex) { } catch (Exception ex) {
throw new ImageDecompressionException("Unable to read indices from InBitStream.", ex); throw new ImageDecompressionException("Unable to read indices from InBitStream.", ex);
} }
reportProgressListeners(planeIndex, planeCountForDecompression, reportProgressToListeners(planeIndex, planeCountForDecompression,
"Decompressed plane %d.", planeIndex); "Decompressed plane %d.", planeIndex);
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment