From 31ffe119c81af7e25c2262509916c517b053e22d Mon Sep 17 00:00:00 2001
From: Vojtech Moravec <vojtech.moravec.st@vsb.cz>
Date: Wed, 2 Dec 2020 12:07:37 +0100
Subject: [PATCH] Rename cache file classes
---
.../cz/it4i/qcmp/cache/{ICacheFile.java => IQvcFile.java} | 6 ++++--
.../it4i/qcmp/cache/{SQCacheFile.java => SqQvcFile.java} | 7 +------
.../it4i/qcmp/cache/{VQCacheFile.java => VqQvcFile.java} | 7 +------
3 files changed, 6 insertions(+), 14 deletions(-)
rename src/main/java/cz/it4i/qcmp/cache/{ICacheFile.java => IQvcFile.java} (68%)
rename src/main/java/cz/it4i/qcmp/cache/{SQCacheFile.java => SqQvcFile.java} (94%)
rename src/main/java/cz/it4i/qcmp/cache/{VQCacheFile.java => VqQvcFile.java} (95%)
diff --git a/src/main/java/cz/it4i/qcmp/cache/ICacheFile.java b/src/main/java/cz/it4i/qcmp/cache/IQvcFile.java
similarity index 68%
rename from src/main/java/cz/it4i/qcmp/cache/ICacheFile.java
rename to src/main/java/cz/it4i/qcmp/cache/IQvcFile.java
index 80f4c2a..7238c77 100644
--- a/src/main/java/cz/it4i/qcmp/cache/ICacheFile.java
+++ b/src/main/java/cz/it4i/qcmp/cache/IQvcFile.java
@@ -1,20 +1,22 @@
package cz.it4i.qcmp.cache;
+import cz.it4i.qcmp.fileformat.IQvcHeader;
import cz.it4i.qcmp.fileformat.QvcHeaderV1;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
+// TODO(Moravec): Rename to IQvcFile
public interface ICacheFile {
void writeToStream(DataOutputStream outputStream) throws IOException;
- void readFromStream(DataInputStream inputStream) throws IOException;
+ void readFromStream(DataInputStream inputStream, IQvcHeader header) throws IOException;
void readFromStream(DataInputStream inputStream, QvcHeaderV1 header) throws IOException;
- QvcHeaderV1 getHeader();
+ IQvcHeader getHeader();
void report(StringBuilder builder);
diff --git a/src/main/java/cz/it4i/qcmp/cache/SQCacheFile.java b/src/main/java/cz/it4i/qcmp/cache/SqQvcFile.java
similarity index 94%
rename from src/main/java/cz/it4i/qcmp/cache/SQCacheFile.java
rename to src/main/java/cz/it4i/qcmp/cache/SqQvcFile.java
index 5815ed0..1565ef3 100644
--- a/src/main/java/cz/it4i/qcmp/cache/SQCacheFile.java
+++ b/src/main/java/cz/it4i/qcmp/cache/SqQvcFile.java
@@ -7,7 +7,7 @@ import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-public class SQCacheFile implements ICacheFile {
+public class SQCacheFile implements IQvcFile {
private QvcHeaderV1 header;
private SQCodebook codebook;
@@ -74,9 +74,4 @@ public class SQCacheFile implements ICacheFile {
}
}
}
-
- @Override
- public String klass() {
- return "SQCacheFile";
- }
}
diff --git a/src/main/java/cz/it4i/qcmp/cache/VQCacheFile.java b/src/main/java/cz/it4i/qcmp/cache/VqQvcFile.java
similarity index 95%
rename from src/main/java/cz/it4i/qcmp/cache/VQCacheFile.java
rename to src/main/java/cz/it4i/qcmp/cache/VqQvcFile.java
index ef7c26a..1eb1359 100644
--- a/src/main/java/cz/it4i/qcmp/cache/VQCacheFile.java
+++ b/src/main/java/cz/it4i/qcmp/cache/VqQvcFile.java
@@ -7,7 +7,7 @@ import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-public class VQCacheFile implements ICacheFile {
+public class VQCacheFile implements IQvcFile {
private QvcHeaderV1 header;
private VQCodebook codebook;
@@ -83,9 +83,4 @@ public class VQCacheFile implements ICacheFile {
builder.append("\n- - - - - - - - - - - - - - - - - - - - - - - - -\n");
}
}
-
- @Override
- public String klass() {
- return "VQCacheFile";
- }
}
--
GitLab