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

Fix repo castring for AbstractNewDataSourceHandler

Browse Source
This commit is contained in:
James Seibel
2024-03-10 21:38:41 -05:00
parent d569ae4052
commit 64fce77a0a
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/seibel/distanthorizons/core/file/AbstractNewDataSourceHandler.java
+4 -3
View File
@@ -22,7 +22,8 @@ import java.util.concurrent.locks.ReentrantLock;
public abstract class AbstractNewDataSourceHandler
<TDataSource extends IDataSource<TDhLevel>,
TDTO extends IBaseDTO<DhSectionPos>,
TDTO extends IBaseDTO<DhSectionPos>,
TRepo extends AbstractDhRepo<DhSectionPos, TDTO>,
TDhLevel extends IDhLevel>
implements ISourceProvider<TDataSource, TDhLevel>
{
@@ -58,7 +59,7 @@ public abstract class AbstractNewDataSourceHandler
protected final TDhLevel level;
protected final File saveDir;
public final AbstractDhRepo<DhSectionPos, TDTO> repo;
public final TRepo repo;
public final ArrayList<IDataSourceUpdateFunc<TDataSource>> dateSourceUpdateListeners = new ArrayList<>();
@@ -89,7 +90,7 @@ public abstract class AbstractNewDataSourceHandler
//==================//
/** When this is called the parent folders should be created */
protected abstract AbstractDhRepo<DhSectionPos, TDTO> createRepo();
protected abstract TRepo createRepo();
protected abstract TDataSource createDataSourceFromDto(TDTO dto) throws InterruptedException, IOException;
protected abstract TDTO createDtoFromDataSource(TDataSource dataSource);
core/src/main/java/com/seibel/distanthorizons/core/file/fullDatafile/NewFullDataFileHandler.java
+4 -4
View File
@@ -46,7 +46,7 @@ import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.locks.ReentrantLock;
public class NewFullDataFileHandler
extends AbstractNewDataSourceHandler<NewFullDataSource, NewFullDataSourceDTO, IDhLevel>
extends AbstractNewDataSourceHandler<NewFullDataSource, NewFullDataSourceDTO, NewFullDataSourceRepo, IDhLevel>
implements IFullDataSourceProvider, IDebugRenderable
{
private static final Logger LOGGER = DhLoggerBuilder.getLogger();
@@ -93,7 +93,7 @@ public class NewFullDataFileHandler
//====================//
@Override
protected AbstractDhRepo<DhSectionPos, NewFullDataSourceDTO> createRepo()
protected NewFullDataSourceRepo createRepo()
{
try
{
@@ -161,7 +161,7 @@ public class NewFullDataFileHandler
&& this.parentUpdatingPosSet.size() < MAX_UPDATE_TASK_COUNT)
{
// get the positions that need to be applied to their parents
ArrayList<DhSectionPos> parentUpdatePosList = ((NewFullDataSourceRepo) this.repo).getPositionsToUpdate(MAX_UPDATE_TASK_COUNT);
ArrayList<DhSectionPos> parentUpdatePosList = this.repo.getPositionsToUpdate(MAX_UPDATE_TASK_COUNT);
HashMap<DhSectionPos, HashSet<DhSectionPos>> updatePosByParentPos = new HashMap<>();
for (DhSectionPos pos : parentUpdatePosList)
@@ -217,7 +217,7 @@ public class NewFullDataFileHandler
NewFullDataSource dataSource = this.get(childPos);
this.updateDataSourceAtPos(parentUpdatePos, dataSource, false);
((NewFullDataSourceRepo) this.repo).setApplyToParent(childPos, false);
this.repo.setApplyToParent(childPos, false);
}
catch (Exception e)
{
core/src/main/java/com/seibel/distanthorizons/core/file/fullDatafile/NewGeneratedFullDataFileHandler.java
+1 -2
View File
@@ -31,7 +31,6 @@ import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
import com.seibel.distanthorizons.core.pos.DhSectionPos;
import com.seibel.distanthorizons.core.render.renderer.DebugRenderer;
import com.seibel.distanthorizons.core.render.renderer.IDebugRenderable;
import com.seibel.distanthorizons.core.sql.repo.NewFullDataSourceRepo;
import com.seibel.distanthorizons.core.util.LodUtil;
import com.seibel.distanthorizons.core.util.threading.ThreadPoolUtil;
import com.seibel.distanthorizons.coreapi.util.BitShiftUtil;
@@ -233,7 +232,7 @@ public class NewGeneratedFullDataFileHandler extends NewFullDataFileHandler impl
}
else
{
byte[] columnGenerationSteps = ((NewFullDataSourceRepo)this.repo).getColumnGenerationStepForPos(genPos);
byte[] columnGenerationSteps = this.repo.getColumnGenerationStepForPos(genPos);
if (columnGenerationSteps == null)
{
// shouldn't happen, but just in case