From 5526ec75a101792930fee452e7e58213478f479d Mon Sep 17 00:00:00 2001
From: David E Jones <dej@dejc.com>
Date: Mon, 5 Sep 2016 10:37:22 -0700
Subject: [PATCH] Updated for moqui-framework internal class changes; resolves
 issue #1

---
 .../groovy/org/moqui/wikitext/FtlCwikiTemplateRenderer.groovy | 2 +-
 .../groovy/org/moqui/wikitext/WikiTemplateRenderer.groovy     | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/groovy/org/moqui/wikitext/FtlCwikiTemplateRenderer.groovy b/src/main/groovy/org/moqui/wikitext/FtlCwikiTemplateRenderer.groovy
index fa80c4c..1e124c7 100644
--- a/src/main/groovy/org/moqui/wikitext/FtlCwikiTemplateRenderer.groovy
+++ b/src/main/groovy/org/moqui/wikitext/FtlCwikiTemplateRenderer.groovy
@@ -49,7 +49,7 @@ class FtlCwikiTemplateRenderer implements TemplateRenderer {
         Template theTemplate;
         if (templateFtlLocationCache instanceof MCache) {
             MCache<String, Template> mCache = (MCache) templateFtlLocationCache;
-            ResourceReference rr = ecfi.getResourceFacade().getLocationReference(location);
+            ResourceReference rr = ecfi.resourceFacade.getLocationReference(location);
             long lastModified = rr != null ? rr.getLastModified() : 0L;
             theTemplate = mCache.get(location, lastModified);
         } else {
diff --git a/src/main/groovy/org/moqui/wikitext/WikiTemplateRenderer.groovy b/src/main/groovy/org/moqui/wikitext/WikiTemplateRenderer.groovy
index bc9d9e0..53dd6c7 100644
--- a/src/main/groovy/org/moqui/wikitext/WikiTemplateRenderer.groovy
+++ b/src/main/groovy/org/moqui/wikitext/WikiTemplateRenderer.groovy
@@ -13,6 +13,7 @@
  */
 package org.moqui.wikitext
 
+import groovy.transform.CompileStatic
 import org.eclipse.mylyn.wikitext.confluence.core.ConfluenceLanguage
 import org.eclipse.mylyn.wikitext.core.parser.MarkupParser
 import org.eclipse.mylyn.wikitext.core.parser.builder.HtmlDocumentBuilder
@@ -33,6 +34,7 @@ import org.slf4j.LoggerFactory
 
 import javax.cache.Cache
 
+@CompileStatic
 class WikiTemplateRenderer implements TemplateRenderer {
     protected final static Logger logger = LoggerFactory.getLogger(WikiTemplateRenderer.class)
 
@@ -51,7 +53,7 @@ class WikiTemplateRenderer implements TemplateRenderer {
         String wikiText;
         if (templateWikiLocationCache instanceof MCache) {
             MCache<String, String> mCache = (MCache) templateWikiLocationCache;
-            ResourceReference rr = ecfi.getResourceFacade().getLocationReference(location);
+            ResourceReference rr = ecfi.resourceFacade.getLocationReference(location);
             long lastModified = rr != null ? rr.getLastModified() : 0L;
             wikiText = mCache.get(location, lastModified);
         } else {