From dcc9e20a1d3c2008b0d7b1a0a295575ff026b27a Mon Sep 17 00:00:00 2001
From: Vojtech Moravec <vojtech.moravec.st@vsb.cz>
Date: Thu, 26 Nov 2020 12:52:28 +0100
Subject: [PATCH] Move CacheFileHeaderV1 out of cache package.

---
 src/main/java/cz/it4i/qcmp/cache/ICacheFile.java              | 2 +-
 .../java/cz/it4i/qcmp/cache/QuantizationCacheManager.java     | 2 +-
 src/main/java/cz/it4i/qcmp/cache/SQCacheFile.java             | 2 +-
 src/main/java/cz/it4i/qcmp/cache/VQCacheFile.java             | 2 +-
 .../it4i/qcmp/fileformat/{cache => }/CacheFileHeaderV1.java   | 4 +---
 5 files changed, 5 insertions(+), 7 deletions(-)
 rename src/main/java/cz/it4i/qcmp/fileformat/{cache => }/CacheFileHeaderV1.java (97%)

diff --git a/src/main/java/cz/it4i/qcmp/cache/ICacheFile.java b/src/main/java/cz/it4i/qcmp/cache/ICacheFile.java
index 5551755..a2cd225 100644
--- a/src/main/java/cz/it4i/qcmp/cache/ICacheFile.java
+++ b/src/main/java/cz/it4i/qcmp/cache/ICacheFile.java
@@ -1,6 +1,6 @@
 package cz.it4i.qcmp.cache;
 
-import cz.it4i.qcmp.fileformat.cache.CacheFileHeaderV1;
+import cz.it4i.qcmp.fileformat.CacheFileHeaderV1;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
diff --git a/src/main/java/cz/it4i/qcmp/cache/QuantizationCacheManager.java b/src/main/java/cz/it4i/qcmp/cache/QuantizationCacheManager.java
index 2cb0968..6fb310e 100644
--- a/src/main/java/cz/it4i/qcmp/cache/QuantizationCacheManager.java
+++ b/src/main/java/cz/it4i/qcmp/cache/QuantizationCacheManager.java
@@ -2,8 +2,8 @@ package cz.it4i.qcmp.cache;
 
 import cz.it4i.qcmp.compression.CompressionOptions;
 import cz.it4i.qcmp.data.V3i;
+import cz.it4i.qcmp.fileformat.CacheFileHeaderV1;
 import cz.it4i.qcmp.fileformat.QuantizationType;
-import cz.it4i.qcmp.fileformat.cache.CacheFileHeaderV1;
 import cz.it4i.qcmp.quantization.scalar.SQCodebook;
 import cz.it4i.qcmp.quantization.vector.VQCodebook;
 
diff --git a/src/main/java/cz/it4i/qcmp/cache/SQCacheFile.java b/src/main/java/cz/it4i/qcmp/cache/SQCacheFile.java
index 1847f5e..db5d68c 100644
--- a/src/main/java/cz/it4i/qcmp/cache/SQCacheFile.java
+++ b/src/main/java/cz/it4i/qcmp/cache/SQCacheFile.java
@@ -1,6 +1,6 @@
 package cz.it4i.qcmp.cache;
 
-import cz.it4i.qcmp.fileformat.cache.CacheFileHeaderV1;
+import cz.it4i.qcmp.fileformat.CacheFileHeaderV1;
 import cz.it4i.qcmp.quantization.scalar.SQCodebook;
 
 import java.io.DataInputStream;
diff --git a/src/main/java/cz/it4i/qcmp/cache/VQCacheFile.java b/src/main/java/cz/it4i/qcmp/cache/VQCacheFile.java
index 6f062a5..e7c8cc6 100644
--- a/src/main/java/cz/it4i/qcmp/cache/VQCacheFile.java
+++ b/src/main/java/cz/it4i/qcmp/cache/VQCacheFile.java
@@ -1,6 +1,6 @@
 package cz.it4i.qcmp.cache;
 
-import cz.it4i.qcmp.fileformat.cache.CacheFileHeaderV1;
+import cz.it4i.qcmp.fileformat.CacheFileHeaderV1;
 import cz.it4i.qcmp.quantization.vector.VQCodebook;
 
 import java.io.DataInputStream;
diff --git a/src/main/java/cz/it4i/qcmp/fileformat/cache/CacheFileHeaderV1.java b/src/main/java/cz/it4i/qcmp/fileformat/CacheFileHeaderV1.java
similarity index 97%
rename from src/main/java/cz/it4i/qcmp/fileformat/cache/CacheFileHeaderV1.java
rename to src/main/java/cz/it4i/qcmp/fileformat/CacheFileHeaderV1.java
index 4538418..988479b 100644
--- a/src/main/java/cz/it4i/qcmp/fileformat/cache/CacheFileHeaderV1.java
+++ b/src/main/java/cz/it4i/qcmp/fileformat/CacheFileHeaderV1.java
@@ -1,9 +1,7 @@
-package cz.it4i.qcmp.fileformat.cache;
+package cz.it4i.qcmp.fileformat;
 
 import cz.it4i.qcmp.data.V2i;
 import cz.it4i.qcmp.data.V3i;
-import cz.it4i.qcmp.fileformat.IFileHeader;
-import cz.it4i.qcmp.fileformat.QuantizationType;
 import cz.it4i.qcmp.io.RawDataIO;
 import cz.it4i.qcmp.utilities.Utils;
 
-- 
GitLab