refinement: Simplify usage of ResourceToken

Change-Id: I49ac15255a8f1bca8edc53040b47766899632f97

5 files changed, 14 insertions, 8 deletions

diff --git a/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/OseeDefineResourceTokens.java b/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/OseeDefineResourceTokens.java
index 8250c571214..c591c7f4007 100644
--- a/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/OseeDefineResourceTokens.java
+++ b/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/OseeDefineResourceTokens.java
@@ -32,7 +32,7 @@ public final class OseeDefineResourceTokens {
    // @formatter:on
 
    private static ResourceToken createToken(Long uuid, String name) {
-      ResourceToken token = new ClassBasedResourceToken(uuid, name, OseeDefineResourceTokens.class, "html/");
+      ResourceToken token = new ClassBasedResourceToken(uuid, name, OseeDefineResourceTokens.class);
       tokens.add(token);
       return token;
    }
diff --git a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/type/ClassBasedResourceToken.java b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/type/ClassBasedResourceToken.java
index 1b042600e37..c541583b7b5 100644
--- a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/type/ClassBasedResourceToken.java
+++ b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/type/ClassBasedResourceToken.java
@@ -12,6 +12,7 @@
 package org.eclipse.osee.framework.jdk.core.type;
 
 import java.net.URL;
+import org.eclipse.osee.framework.jdk.core.util.Lib;
 
 /**
  * @author Ryan D. Brooks
@@ -28,7 +29,11 @@ public final class ClassBasedResourceToken extends ResourceToken {
    }
 
    public ClassBasedResourceToken(Long uuid, String name, Class<?> clazz) {
-      this(uuid, name, clazz, "");
+      this(uuid, name, clazz, Lib.getExtension(name) + "/");
+   }
+
+   public ClassBasedResourceToken(String name, Class<?> clazz) {
+      this(-1L, name, clazz);
    }
 
    @Override
diff --git a/plugins/org.eclipse.osee.template.engine.test/src/org/eclipse/osee/template/engine/OseeTemplateTestTokens.java b/plugins/org.eclipse.osee.template.engine.test/src/org/eclipse/osee/template/engine/OseeTemplateTestTokens.java
index 60252c69e5c..650589ef144 100644
--- a/plugins/org.eclipse.osee.template.engine.test/src/org/eclipse/osee/template/engine/OseeTemplateTestTokens.java
+++ b/plugins/org.eclipse.osee.template.engine.test/src/org/eclipse/osee/template/engine/OseeTemplateTestTokens.java
@@ -15,7 +15,6 @@ import java.util.ArrayList;
 import org.eclipse.osee.framework.jdk.core.type.ClassBasedResourceToken;
 import org.eclipse.osee.framework.jdk.core.type.IResourceRegistry;
 import org.eclipse.osee.framework.jdk.core.type.ResourceToken;
-import org.eclipse.osee.framework.jdk.core.util.Lib;
 
 /**
  * @author Ryan D. Brooks
@@ -37,8 +36,7 @@ public final class OseeTemplateTestTokens {
    // @formatter:on
 
    private static ResourceToken createToken(Long uuid, String name) {
-      ResourceToken token =
-         new ClassBasedResourceToken(uuid, name, OseeTemplateTestTokens.class, Lib.getExtension(name) + "/");
+      ResourceToken token = new ClassBasedResourceToken(uuid, name, OseeTemplateTestTokens.class);
       tokens.add(token);
       return token;
    }
diff --git a/plugins/org.eclipse.osee.template.engine/src/org/eclipse/osee/template/engine/OseeTemplateTokens.java b/plugins/org.eclipse.osee.template.engine/src/org/eclipse/osee/template/engine/OseeTemplateTokens.java
index 69ddc2ec0bc..22d4502cc80 100644
--- a/plugins/org.eclipse.osee.template.engine/src/org/eclipse/osee/template/engine/OseeTemplateTokens.java
+++ b/plugins/org.eclipse.osee.template.engine/src/org/eclipse/osee/template/engine/OseeTemplateTokens.java
@@ -16,7 +16,6 @@ import java.util.List;
 import org.eclipse.osee.framework.jdk.core.type.ClassBasedResourceToken;
 import org.eclipse.osee.framework.jdk.core.type.IResourceRegistry;
 import org.eclipse.osee.framework.jdk.core.type.ResourceToken;
-import org.eclipse.osee.framework.jdk.core.util.Lib;
 
 /**
  * @author Ryan D. Brooks
@@ -47,8 +46,7 @@ public final class OseeTemplateTokens {
    // @formatter:on
 
    private static ResourceToken createToken(Long uuid, String name) {
-      ResourceToken token =
-         new ClassBasedResourceToken(uuid, name, OseeTemplateTokens.class, Lib.getExtension(name) + "/");
+      ResourceToken token = new ClassBasedResourceToken(uuid, name, OseeTemplateTokens.class);
       tokens.add(token);
       return token;
    }
diff --git a/plugins/org.eclipse.osee.template.engine/src/org/eclipse/osee/template/engine/PageFactory.java b/plugins/org.eclipse.osee.template.engine/src/org/eclipse/osee/template/engine/PageFactory.java
index c0b0410751c..5ee46b54d40 100644
--- a/plugins/org.eclipse.osee.template.engine/src/org/eclipse/osee/template/engine/PageFactory.java
+++ b/plugins/org.eclipse.osee.template.engine/src/org/eclipse/osee/template/engine/PageFactory.java
@@ -51,6 +51,11 @@ public final class PageFactory {
       return page.realizePage(templateResource);
    }
 
+   public static void realizePage(IResourceRegistry registry, ResourceToken templateResource, Appendable output, String... keyValues) {
+      PageCreator page = newPageCreator(registry, keyValues);
+      page.realizePage(templateResource, output);
+   }
+
    public static String realizePage(IResourceRegistry registry, ResourceToken templateResource, ResourceToken valuesResource, String... keyValues) {
       PageCreator page = newPageCreator(registry, valuesResource, keyValues);
       return page.realizePage(templateResource);