wisplite/distant-horizons-core-sharded
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename MetaDataFile -> AbstractMetaDataFile

Browse Source
This commit is contained in:
James Seibel
2022-12-25 21:42:27 -06:00
parent e26ac63dff
commit b02a2d0008
4 changed files with 12 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/seibel/lod/core/file/datafile/DataMetaFile.java
+2 -2
View File
@@ -13,7 +13,7 @@ import com.seibel.lod.core.datatype.AbstractDataSourceLoader;
import com.seibel.lod.core.datatype.full.ChunkSizedData;
import com.seibel.lod.core.file.metaData.MetaData;
import com.seibel.lod.core.pos.DhLodPos;
import com.seibel.lod.core.file.metaData.MetaDataFile;
import com.seibel.lod.core.file.metaData.AbstractMetaDataFile;
import com.seibel.lod.core.level.IDhLevel;
import com.seibel.lod.core.pos.DhSectionPos;
import com.seibel.lod.core.logging.DhLoggerBuilder;
@@ -21,7 +21,7 @@ import com.seibel.lod.core.util.AtomicsUtil;
import com.seibel.lod.core.util.LodUtil;
import org.apache.logging.log4j.Logger;
public class DataMetaFile extends MetaDataFile
public class DataMetaFile extends AbstractMetaDataFile
{
private static final Logger LOGGER = DhLoggerBuilder.getLogger(DataMetaFile.class.getSimpleName());
core/src/main/java/com/seibel/lod/core/file/metaData/MetaDataFile.java → core/src/main/java/com/seibel/lod/core/file/metaData/AbstractMetaDataFile.java
+7 -8
View File
@@ -8,7 +8,6 @@ import java.nio.file.FileAlreadyExistsException;
import java.nio.file.Files;
import java.nio.file.StandardCopyOption;
import java.nio.file.StandardOpenOption;
import java.util.concurrent.atomic.AtomicLong;
import java.util.zip.Adler32;
import java.util.zip.CheckedOutputStream;
@@ -41,7 +40,7 @@ import org.apache.logging.log4j.Logger;
*
* 8 bytes: data version
*/
public abstract class MetaDataFile
public abstract class AbstractMetaDataFile
{
private static final Logger LOGGER = DhLoggerBuilder.getLogger();
@@ -58,7 +57,7 @@ public abstract class MetaDataFile
public volatile MetaData metaData = null;
/** also defined in {@link MetaDataFile#metaData} */
/** also defined in {@link AbstractMetaDataFile#metaData} */
public final DhSectionPos pos;
public File path;
@@ -70,7 +69,7 @@ public abstract class MetaDataFile
//==============//
/** Create a metaFile in this path. If the path has a file, throws FileAlreadyExistsException */
protected MetaDataFile(File path, DhSectionPos pos) throws IOException
protected AbstractMetaDataFile(File path, DhSectionPos pos) throws IOException
{
this.path = path;
this.pos = pos;
@@ -81,11 +80,11 @@ public abstract class MetaDataFile
}
/**
* Creates a {@link MetaDataFile} with the file at the given path.
* Creates a {@link AbstractMetaDataFile} with the file at the given path.
* @throws IOException if the file was formatted incorrectly
* @throws FileNotFoundException if no file exists for the given path
*/
protected MetaDataFile(File path) throws IOException, FileNotFoundException
protected AbstractMetaDataFile(File path) throws IOException, FileNotFoundException
{
this.path = path;
if (!path.exists())
@@ -98,7 +97,7 @@ public abstract class MetaDataFile
this.pos = this.metaData.pos;
}
/**
* Attempts to create a new {@link MetaDataFile} from the given file.
* Attempts to create a new {@link AbstractMetaDataFile} from the given file.
* @throws IOException if the file was formatted incorrectly
*/
private static MetaData readMetaDataFromFile(File file) throws IOException
@@ -148,7 +147,7 @@ public abstract class MetaDataFile
if (!file.canWrite()) throw new IOException("File not writable");
}
/** Sets this object's {@link MetaDataFile#metaData} using the set {@link MetaDataFile#path} */
/** Sets this object's {@link AbstractMetaDataFile#metaData} using the set {@link AbstractMetaDataFile#path} */
protected void loadMetaData() throws IOException
{
validateMetaDataFile(this.path);
core/src/main/java/com/seibel/lod/core/file/metaData/MetaData.java
+1 -15
View File
@@ -1,25 +1,11 @@
package com.seibel.lod.core.file.metaData;
import com.seibel.lod.core.logging.DhLoggerBuilder;
import com.seibel.lod.core.pos.DhSectionPos;
import com.seibel.lod.core.util.LodUtil;
import com.seibel.lod.core.util.objects.UnclosableOutputStream;
import org.apache.logging.log4j.Logger;
import java.io.*;
import java.nio.ByteBuffer;
import java.nio.channels.Channels;
import java.nio.channels.FileChannel;
import java.nio.file.FileAlreadyExistsException;
import java.nio.file.Files;
import java.nio.file.StandardCopyOption;
import java.nio.file.StandardOpenOption;
import java.util.concurrent.atomic.AtomicLong;
import java.util.zip.Adler32;
import java.util.zip.CheckedOutputStream;
/**
* See {@link MetaDataFile} for a byte map inorder to see the currently used bytes
* See {@link AbstractMetaDataFile} for a byte map inorder to see the currently used bytes
*/
public class MetaData
{
core/src/main/java/com/seibel/lod/core/file/renderfile/RenderMetaDataFile.java
+2 -2
View File
@@ -7,7 +7,7 @@ import com.seibel.lod.core.file.metaData.MetaData;
import com.seibel.lod.core.level.IDhClientLevel;
import com.seibel.lod.core.level.IDhLevel;
import com.seibel.lod.core.pos.DhLodPos;
import com.seibel.lod.core.file.metaData.MetaDataFile;
import com.seibel.lod.core.file.metaData.AbstractMetaDataFile;
import com.seibel.lod.core.pos.DhSectionPos;
import com.seibel.lod.core.logging.DhLoggerBuilder;
import com.seibel.lod.core.util.LodUtil;
@@ -20,7 +20,7 @@ import java.lang.ref.SoftReference;
import java.util.concurrent.*;
import java.util.concurrent.atomic.AtomicReference;
public class RenderMetaDataFile extends MetaDataFile
public class RenderMetaDataFile extends AbstractMetaDataFile
{
private static final Logger LOGGER = DhLoggerBuilder.getLogger();