From 7c07ad464ba02dd83a087a5fe2e75525774ce114 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Wed, 3 Jul 2024 17:57:57 -0700
Subject: [PATCH] Improved version template search path

---
 README.md                                       |  2 +-
 .../src/bld/java/com/example/SampleBuild.java   |  3 +--
 .../rife/bld/extension/GeneratedVersion.java    | 17 +++++++++++------
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index c128f29..734cee4 100755
--- a/README.md
+++ b/README.md
@@ -66,7 +66,7 @@ public void genver() throws Exception {
         .projectName("My App")
         .packageName("com.example.myapp")
         .className("MyAppVersion")
-        .classTemplate(new File(workDirectory, "myversion.txt"))
+        .classTemplate("myversion.txt")
         .execute();
 }
 ```
diff --git a/examples/src/bld/java/com/example/SampleBuild.java b/examples/src/bld/java/com/example/SampleBuild.java
index f7db800..0069f8d 100644
--- a/examples/src/bld/java/com/example/SampleBuild.java
+++ b/examples/src/bld/java/com/example/SampleBuild.java
@@ -4,7 +4,6 @@ import rife.bld.BuildCommand;
 import rife.bld.Project;
 import rife.bld.extension.GeneratedVersionOperation;
 
-import java.io.File;
 import java.util.List;
 
 import static rife.bld.dependencies.Repository.MAVEN_CENTRAL;
@@ -47,7 +46,7 @@ public class SampleBuild extends Project {
         new GeneratedVersionOperation()
                 .fromProject(this)
 //                .projectName("My App")
-//                .classTemplate(new File(workDirectory, "myversion.txt"))
+//                .classTemplate("myversion.txt")
                 .execute();
     }
 }
diff --git a/src/main/java/rife/bld/extension/GeneratedVersion.java b/src/main/java/rife/bld/extension/GeneratedVersion.java
index 6c9b5ee..9a79e86 100644
--- a/src/main/java/rife/bld/extension/GeneratedVersion.java
+++ b/src/main/java/rife/bld/extension/GeneratedVersion.java
@@ -26,7 +26,6 @@ import rife.tools.FileUtils;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Path;
-import java.util.Objects;
 
 /**
  * GeneratedVersion data class.
@@ -45,7 +44,7 @@ public class GeneratedVersion {
     private static final String REVISION = "revision";
     private static final String VERSION = "version";
     private File classFile_;
-    private String className_;
+    private String className_ = "GeneratedVersion";
     private File directory_;
     private String extension_ = ".java";
     private String packageName_;
@@ -64,9 +63,15 @@ public class GeneratedVersion {
         if (template_ == null) {
             template = TemplateFactory.TXT.get("version.txt");
         } else {
-            var files = new ResourceFinderDirectories(template_.getParentFile());
-            template = new TemplateFactory(TemplateConfig.TXT, "txtFiles", TemplateFactory.TXT)
-                    .setResourceFinder(files).get(template_.getName());
+            File parent;
+            if (template_.getParentFile() != null) {
+                parent = template_.getParentFile();
+            } else {
+                parent = new File(template_.getAbsolutePath()).getParentFile();
+            }
+            var dirs = new ResourceFinderDirectories(parent);
+            template = new TemplateFactory(TemplateConfig.TXT, "txt", TemplateFactory.TXT)
+                    .setResourceFinder(dirs).get(template_.getName());
         }
 
         if (packageName_ == null) {
@@ -78,7 +83,7 @@ public class GeneratedVersion {
         }
 
         if (template.hasValueId(CLASSNAME)) {
-            template.setValue(CLASSNAME, Objects.requireNonNullElse(className_, "GeneratedVersion"));
+            template.setValue(CLASSNAME, className_);
         }
 
         if (template.hasValueId(PROJECT)) {