From ae52141dee0973415a0d9c79f5407c51753d9336 Mon Sep 17 00:00:00 2001
From: Vojtech Moravec <vojtech.moravec.st@vsb.cz>
Date: Thu, 3 Dec 2020 10:12:37 +0100
Subject: [PATCH] Move Qvc* classes to fileformat package.

---
 .../java/cz/it4i/qcmp/cache/QuantizationCacheManager.java    | 3 +--
 src/main/java/cz/it4i/qcmp/cache/QvcFileReader.java          | 5 +----
 .../java/cz/it4i/qcmp/compression/CompressionOptions.java    | 2 +-
 src/main/java/cz/it4i/qcmp/compression/IImageCompressor.java | 2 +-
 .../java/cz/it4i/qcmp/compression/IImageDecompressor.java    | 2 +-
 src/main/java/cz/it4i/qcmp/compression/ImageCompressor.java  | 2 +-
 .../java/cz/it4i/qcmp/compression/ImageDecompressor.java     | 2 +-
 .../java/cz/it4i/qcmp/compression/SQImageCompressor.java     | 4 ++--
 .../java/cz/it4i/qcmp/compression/SQImageDecompressor.java   | 4 ++--
 .../java/cz/it4i/qcmp/compression/VQImageCompressor.java     | 4 ++--
 .../java/cz/it4i/qcmp/compression/VQImageDecompressor.java   | 4 ++--
 .../java/cz/it4i/qcmp/{cache => fileformat}/IQvcFile.java    | 4 +---
 .../java/cz/it4i/qcmp/{cache => fileformat}/SqQvcFile.java   | 4 +---
 .../java/cz/it4i/qcmp/{cache => fileformat}/VqQvcFile.java   | 4 +---
 14 files changed, 18 insertions(+), 28 deletions(-)
 rename src/main/java/cz/it4i/qcmp/{cache => fileformat}/IQvcFile.java (87%)
 rename src/main/java/cz/it4i/qcmp/{cache => fileformat}/SqQvcFile.java (97%)
 rename src/main/java/cz/it4i/qcmp/{cache => fileformat}/VqQvcFile.java (97%)

diff --git a/src/main/java/cz/it4i/qcmp/cache/QuantizationCacheManager.java b/src/main/java/cz/it4i/qcmp/cache/QuantizationCacheManager.java
index 6142f1e..b63d0ac 100644
--- a/src/main/java/cz/it4i/qcmp/cache/QuantizationCacheManager.java
+++ b/src/main/java/cz/it4i/qcmp/cache/QuantizationCacheManager.java
@@ -2,8 +2,7 @@ package cz.it4i.qcmp.cache;
 
 import cz.it4i.qcmp.compression.CompressionOptions;
 import cz.it4i.qcmp.data.V3i;
-import cz.it4i.qcmp.fileformat.QuantizationType;
-import cz.it4i.qcmp.fileformat.QvcHeaderV2;
+import cz.it4i.qcmp.fileformat.*;
 import cz.it4i.qcmp.quantization.scalar.SQCodebook;
 import cz.it4i.qcmp.quantization.vector.VQCodebook;
 
diff --git a/src/main/java/cz/it4i/qcmp/cache/QvcFileReader.java b/src/main/java/cz/it4i/qcmp/cache/QvcFileReader.java
index 3587714..0c34937 100644
--- a/src/main/java/cz/it4i/qcmp/cache/QvcFileReader.java
+++ b/src/main/java/cz/it4i/qcmp/cache/QvcFileReader.java
@@ -1,9 +1,6 @@
 package cz.it4i.qcmp.cache;
 
-import cz.it4i.qcmp.fileformat.IQvcHeader;
-import cz.it4i.qcmp.fileformat.QuantizationType;
-import cz.it4i.qcmp.fileformat.QvcHeaderV1;
-import cz.it4i.qcmp.fileformat.QvcHeaderV2;
+import cz.it4i.qcmp.fileformat.*;
 import cz.it4i.qcmp.io.RawDataIO;
 
 import java.io.DataInputStream;
diff --git a/src/main/java/cz/it4i/qcmp/compression/CompressionOptions.java b/src/main/java/cz/it4i/qcmp/compression/CompressionOptions.java
index 02e987b..6888241 100644
--- a/src/main/java/cz/it4i/qcmp/compression/CompressionOptions.java
+++ b/src/main/java/cz/it4i/qcmp/compression/CompressionOptions.java
@@ -1,7 +1,7 @@
 package cz.it4i.qcmp.compression;
 
-import cz.it4i.qcmp.cache.IQvcFile;
 import cz.it4i.qcmp.data.V3i;
+import cz.it4i.qcmp.fileformat.IQvcFile;
 import cz.it4i.qcmp.fileformat.QuantizationType;
 import cz.it4i.qcmp.io.InputData;
 
diff --git a/src/main/java/cz/it4i/qcmp/compression/IImageCompressor.java b/src/main/java/cz/it4i/qcmp/compression/IImageCompressor.java
index c93e3db..780c295 100644
--- a/src/main/java/cz/it4i/qcmp/compression/IImageCompressor.java
+++ b/src/main/java/cz/it4i/qcmp/compression/IImageCompressor.java
@@ -1,7 +1,7 @@
 package cz.it4i.qcmp.compression;
 
-import cz.it4i.qcmp.cache.IQvcFile;
 import cz.it4i.qcmp.compression.exception.ImageCompressionException;
+import cz.it4i.qcmp.fileformat.IQvcFile;
 import cz.it4i.qcmp.io.InputData;
 
 import java.io.DataOutputStream;
diff --git a/src/main/java/cz/it4i/qcmp/compression/IImageDecompressor.java b/src/main/java/cz/it4i/qcmp/compression/IImageDecompressor.java
index d10870f..19740c1 100644
--- a/src/main/java/cz/it4i/qcmp/compression/IImageDecompressor.java
+++ b/src/main/java/cz/it4i/qcmp/compression/IImageDecompressor.java
@@ -1,7 +1,7 @@
 package cz.it4i.qcmp.compression;
 
-import cz.it4i.qcmp.cache.IQvcFile;
 import cz.it4i.qcmp.compression.exception.ImageDecompressionException;
+import cz.it4i.qcmp.fileformat.IQvcFile;
 import cz.it4i.qcmp.fileformat.QCMPFileHeader;
 
 import java.io.DataInputStream;
diff --git a/src/main/java/cz/it4i/qcmp/compression/ImageCompressor.java b/src/main/java/cz/it4i/qcmp/compression/ImageCompressor.java
index 7ff58e1..fbaa6ed 100644
--- a/src/main/java/cz/it4i/qcmp/compression/ImageCompressor.java
+++ b/src/main/java/cz/it4i/qcmp/compression/ImageCompressor.java
@@ -1,9 +1,9 @@
 package cz.it4i.qcmp.compression;
 
 import cz.it4i.qcmp.U16;
-import cz.it4i.qcmp.cache.IQvcFile;
 import cz.it4i.qcmp.compression.exception.ImageCompressionException;
 import cz.it4i.qcmp.data.Range;
+import cz.it4i.qcmp.fileformat.IQvcFile;
 import cz.it4i.qcmp.fileformat.QCMPFileHeader;
 import cz.it4i.qcmp.io.InputData;
 
diff --git a/src/main/java/cz/it4i/qcmp/compression/ImageDecompressor.java b/src/main/java/cz/it4i/qcmp/compression/ImageDecompressor.java
index 02ce028..ea8062d 100644
--- a/src/main/java/cz/it4i/qcmp/compression/ImageDecompressor.java
+++ b/src/main/java/cz/it4i/qcmp/compression/ImageDecompressor.java
@@ -1,8 +1,8 @@
 package cz.it4i.qcmp.compression;
 
-import cz.it4i.qcmp.cache.IQvcFile;
 import cz.it4i.qcmp.compression.exception.ImageDecompressionException;
 import cz.it4i.qcmp.data.ImageU16Dataset;
+import cz.it4i.qcmp.fileformat.IQvcFile;
 import cz.it4i.qcmp.fileformat.QCMPFileHeader;
 import cz.it4i.qcmp.fileformat.QuantizationType;
 import cz.it4i.qcmp.utilities.Stopwatch;
diff --git a/src/main/java/cz/it4i/qcmp/compression/SQImageCompressor.java b/src/main/java/cz/it4i/qcmp/compression/SQImageCompressor.java
index 2a5e8f0..64391e2 100644
--- a/src/main/java/cz/it4i/qcmp/compression/SQImageCompressor.java
+++ b/src/main/java/cz/it4i/qcmp/compression/SQImageCompressor.java
@@ -1,10 +1,10 @@
 package cz.it4i.qcmp.compression;
 
 import cz.it4i.qcmp.U16;
-import cz.it4i.qcmp.cache.IQvcFile;
 import cz.it4i.qcmp.cache.QuantizationCacheManager;
-import cz.it4i.qcmp.cache.SqQvcFile;
 import cz.it4i.qcmp.compression.exception.ImageCompressionException;
+import cz.it4i.qcmp.fileformat.IQvcFile;
+import cz.it4i.qcmp.fileformat.SqQvcFile;
 import cz.it4i.qcmp.huffman.HuffmanEncoder;
 import cz.it4i.qcmp.io.InputData;
 import cz.it4i.qcmp.io.OutBitStream;
diff --git a/src/main/java/cz/it4i/qcmp/compression/SQImageDecompressor.java b/src/main/java/cz/it4i/qcmp/compression/SQImageDecompressor.java
index a7c3c42..9b2fa95 100644
--- a/src/main/java/cz/it4i/qcmp/compression/SQImageDecompressor.java
+++ b/src/main/java/cz/it4i/qcmp/compression/SQImageDecompressor.java
@@ -1,9 +1,9 @@
 package cz.it4i.qcmp.compression;
 
-import cz.it4i.qcmp.cache.IQvcFile;
-import cz.it4i.qcmp.cache.SqQvcFile;
 import cz.it4i.qcmp.compression.exception.ImageDecompressionException;
+import cz.it4i.qcmp.fileformat.IQvcFile;
 import cz.it4i.qcmp.fileformat.QCMPFileHeader;
+import cz.it4i.qcmp.fileformat.SqQvcFile;
 import cz.it4i.qcmp.huffman.HuffmanDecoder;
 import cz.it4i.qcmp.huffman.HuffmanTreeBuilder;
 import cz.it4i.qcmp.io.InBitStream;
diff --git a/src/main/java/cz/it4i/qcmp/compression/VQImageCompressor.java b/src/main/java/cz/it4i/qcmp/compression/VQImageCompressor.java
index 0c8c112..d1b6ed0 100644
--- a/src/main/java/cz/it4i/qcmp/compression/VQImageCompressor.java
+++ b/src/main/java/cz/it4i/qcmp/compression/VQImageCompressor.java
@@ -1,11 +1,11 @@
 package cz.it4i.qcmp.compression;
 
-import cz.it4i.qcmp.cache.IQvcFile;
 import cz.it4i.qcmp.cache.QuantizationCacheManager;
-import cz.it4i.qcmp.cache.VqQvcFile;
 import cz.it4i.qcmp.compression.exception.ImageCompressionException;
 import cz.it4i.qcmp.data.Range;
+import cz.it4i.qcmp.fileformat.IQvcFile;
 import cz.it4i.qcmp.fileformat.QuantizationType;
+import cz.it4i.qcmp.fileformat.VqQvcFile;
 import cz.it4i.qcmp.huffman.HuffmanEncoder;
 import cz.it4i.qcmp.io.InputData;
 import cz.it4i.qcmp.io.OutBitStream;
diff --git a/src/main/java/cz/it4i/qcmp/compression/VQImageDecompressor.java b/src/main/java/cz/it4i/qcmp/compression/VQImageDecompressor.java
index 87bc9c7..47efc54 100644
--- a/src/main/java/cz/it4i/qcmp/compression/VQImageDecompressor.java
+++ b/src/main/java/cz/it4i/qcmp/compression/VQImageDecompressor.java
@@ -1,11 +1,11 @@
 package cz.it4i.qcmp.compression;
 
-import cz.it4i.qcmp.cache.IQvcFile;
-import cz.it4i.qcmp.cache.VqQvcFile;
 import cz.it4i.qcmp.compression.exception.ImageDecompressionException;
 import cz.it4i.qcmp.data.*;
+import cz.it4i.qcmp.fileformat.IQvcFile;
 import cz.it4i.qcmp.fileformat.QCMPFileHeader;
 import cz.it4i.qcmp.fileformat.QuantizationType;
+import cz.it4i.qcmp.fileformat.VqQvcFile;
 import cz.it4i.qcmp.huffman.HuffmanDecoder;
 import cz.it4i.qcmp.huffman.HuffmanTreeBuilder;
 import cz.it4i.qcmp.io.InBitStream;
diff --git a/src/main/java/cz/it4i/qcmp/cache/IQvcFile.java b/src/main/java/cz/it4i/qcmp/fileformat/IQvcFile.java
similarity index 87%
rename from src/main/java/cz/it4i/qcmp/cache/IQvcFile.java
rename to src/main/java/cz/it4i/qcmp/fileformat/IQvcFile.java
index b4d678a..f5a67c7 100644
--- a/src/main/java/cz/it4i/qcmp/cache/IQvcFile.java
+++ b/src/main/java/cz/it4i/qcmp/fileformat/IQvcFile.java
@@ -1,6 +1,4 @@
-package cz.it4i.qcmp.cache;
-
-import cz.it4i.qcmp.fileformat.IQvcHeader;
+package cz.it4i.qcmp.fileformat;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
diff --git a/src/main/java/cz/it4i/qcmp/cache/SqQvcFile.java b/src/main/java/cz/it4i/qcmp/fileformat/SqQvcFile.java
similarity index 97%
rename from src/main/java/cz/it4i/qcmp/cache/SqQvcFile.java
rename to src/main/java/cz/it4i/qcmp/fileformat/SqQvcFile.java
index 9a27713..df75dea 100644
--- a/src/main/java/cz/it4i/qcmp/cache/SqQvcFile.java
+++ b/src/main/java/cz/it4i/qcmp/fileformat/SqQvcFile.java
@@ -1,7 +1,5 @@
-package cz.it4i.qcmp.cache;
+package cz.it4i.qcmp.fileformat;
 
-import cz.it4i.qcmp.fileformat.IQvcHeader;
-import cz.it4i.qcmp.fileformat.QvcHeaderV2;
 import cz.it4i.qcmp.huffman.HuffmanNode;
 import cz.it4i.qcmp.huffman.HuffmanTreeBuilder;
 import cz.it4i.qcmp.io.InBitStream;
diff --git a/src/main/java/cz/it4i/qcmp/cache/VqQvcFile.java b/src/main/java/cz/it4i/qcmp/fileformat/VqQvcFile.java
similarity index 97%
rename from src/main/java/cz/it4i/qcmp/cache/VqQvcFile.java
rename to src/main/java/cz/it4i/qcmp/fileformat/VqQvcFile.java
index ab76c5c..83dcc6a 100644
--- a/src/main/java/cz/it4i/qcmp/cache/VqQvcFile.java
+++ b/src/main/java/cz/it4i/qcmp/fileformat/VqQvcFile.java
@@ -1,7 +1,5 @@
-package cz.it4i.qcmp.cache;
+package cz.it4i.qcmp.fileformat;
 
-import cz.it4i.qcmp.fileformat.IQvcHeader;
-import cz.it4i.qcmp.fileformat.QvcHeaderV2;
 import cz.it4i.qcmp.huffman.HuffmanNode;
 import cz.it4i.qcmp.huffman.HuffmanTreeBuilder;
 import cz.it4i.qcmp.io.InBitStream;
-- 
GitLab