From 4e6d69860bb5fade202c8f7319b5366955e3490d Mon Sep 17 00:00:00 2001
From: James Seibel <jeseibel@gondtc.com>
Date: Fri, 17 Feb 2023 14:35:24 -0600
Subject: [PATCH] refactor RenderFile classes

---
 .../file/renderfile/RenderFileHandler.java    |  7 ++--
 .../file/renderfile/RenderMetaDataFile.java   | 40 +++++++++----------
 2 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/core/src/main/java/com/seibel/lod/core/file/renderfile/RenderFileHandler.java b/core/src/main/java/com/seibel/lod/core/file/renderfile/RenderFileHandler.java
index f0b87bd6b..c8133fa9f 100644
--- a/core/src/main/java/com/seibel/lod/core/file/renderfile/RenderFileHandler.java
+++ b/core/src/main/java/com/seibel/lod/core/file/renderfile/RenderFileHandler.java
@@ -308,13 +308,14 @@ public class RenderFileHandler implements ILodRenderSourceProvider
 				).thenRun(() -> this.cacheUpdateLockBySectionPos.remove(file.pos));
 	}
 	
-    public IRenderSource onRenderFileLoaded(IRenderSource data, RenderMetaDataFile file)
+    public IRenderSource onRenderFileLoaded(IRenderSource renderSource, RenderMetaDataFile file)
 	{
         if (!this.fullDataSourceProvider.isCacheVersionValid(file.pos, file.metaData.dataVersion.get()))
 		{
-			this.updateCache(data, file);
+			this.updateCache(renderSource, file);
         }
-        return data;
+		
+        return renderSource;
     }
 	
     private void write(IRenderSource currentRenderSource, RenderMetaDataFile file,
diff --git a/core/src/main/java/com/seibel/lod/core/file/renderfile/RenderMetaDataFile.java b/core/src/main/java/com/seibel/lod/core/file/renderfile/RenderMetaDataFile.java
index 7c68eccdb..483bd4b7d 100644
--- a/core/src/main/java/com/seibel/lod/core/file/renderfile/RenderMetaDataFile.java
+++ b/core/src/main/java/com/seibel/lod/core/file/renderfile/RenderMetaDataFile.java
@@ -56,7 +56,7 @@ public class RenderMetaDataFile extends AbstractMetaDataFile
 		super(fileHandler.computeRenderFilePath(pos), pos);
 		this.fileHandler = fileHandler;
 		LodUtil.assertTrue(this.metaData == null);
-		this.doesFileExist = false;
+		this.doesFileExist = this.path.exists();
 	}
 	
 	/** Uses the existing metaFile */
@@ -72,7 +72,8 @@ public class RenderMetaDataFile extends AbstractMetaDataFile
 					+ this.metaData.dataTypeId + "(v" + this.metaData.loaderVersion + ")");
 		}
 		this.dataType = this.loader.renderSourceClass;
-		this.doesFileExist = true;
+		
+		this.doesFileExist = this.path.exists();
 	}
 	
 	
@@ -170,20 +171,20 @@ public class RenderMetaDataFile extends AbstractMetaDataFile
 						this.metaData = makeMetaData(data);
 						return data;
 					})
-					.thenApply((d) -> this.fileHandler.onRenderFileLoaded(d, this))
-					.whenComplete((v, e) -> 
+					.thenApply((renderSource) -> this.fileHandler.onRenderFileLoaded(renderSource, this))
+					.whenComplete((renderSource, exception) -> 
 					{
-						if (e != null)
+						if (exception != null)
 						{
-							LOGGER.error("Uncaught error on creation {}: ", this.path, e);
+							LOGGER.error("Uncaught error on creation {}: ", this.path, exception);
 							future.complete(null);
 							this.data.set(null);
 						}
 						else
 						{
-							future.complete(v);
+							future.complete(renderSource);
 							//new DataObjTracker(v); //TODO: Obj Tracker??? For debug?
-							this.data.set(new SoftReference<>(v));
+							this.data.set(new SoftReference<>(renderSource));
 						}
 					});
 		}
@@ -197,21 +198,18 @@ public class RenderMetaDataFile extends AbstractMetaDataFile
 						}
 						
 						// Load the file.
-						IRenderSource data;
-						data = this.fileHandler.onLoadingRenderFile(this);
-						if (data == null)
+						IRenderSource renderSource;
+						try (FileInputStream fio = this.getDataContent())
 						{
-							try (FileInputStream fio = this.getDataContent())
-							{
-								data = this.loader.loadRenderSource(this, fio, level);
-							}
-							catch (IOException e)
-							{
-								throw new CompletionException(e);
-							}
+							renderSource = this.loader.loadRenderSource(this, fio, level);
 						}
-						data = this.fileHandler.onRenderFileLoaded(data, this);
-						return data;
+						catch (IOException e)
+						{
+							throw new CompletionException(e);
+						}
+						
+						renderSource = this.fileHandler.onRenderFileLoaded(renderSource, this);
+						return renderSource;
 					}, fileReaderThreads)
 					.whenComplete((f, e) -> 
 					{