From 8d2e7df796e500b1f9a486ada13b1b8b4c343709 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vojt=C4=9Bch=20Moravec?= <theazgra@gmail.com>
Date: Sun, 26 Jul 2020 21:25:04 +0200
Subject: [PATCH] Rename the reportProgressListeners ->
reportProgressToListeners
---
.../compression/CompressorDecompressorBase.java | 12 ++++++------
.../azgracompress/compression/SQImageCompressor.java | 2 +-
.../compression/SQImageDecompressor.java | 3 +--
.../azgracompress/compression/VQImageCompressor.java | 2 +-
.../compression/VQImageDecompressor.java | 6 ++----
5 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/src/main/java/azgracompress/compression/CompressorDecompressorBase.java b/src/main/java/azgracompress/compression/CompressorDecompressorBase.java
index 5389514..4cc9fe9 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 77760d8..241377e 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 fefc9b0..e4f7edb 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 6c02329..05539c6 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 ed2935a..0643722 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);
}
}
--
GitLab