From 2a2c26b841359eb93a16246f25c9ecc720216157 Mon Sep 17 00:00:00 2001
From: James Adams <james.adams@stfc.ac.uk>
Date: Fri, 13 Apr 2018 14:45:43 +0100
Subject: [PATCH] Include changes to allow use with latest javacc

These were missed due to order in which the PRs were merged into master.
---
 .../main/java/org/quattor/pan/dml/functions/JsonDecode.java   | 4 ++--
 .../main/java/org/quattor/pan/dml/functions/JsonEncode.java   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/panc/src/main/java/org/quattor/pan/dml/functions/JsonDecode.java b/panc/src/main/java/org/quattor/pan/dml/functions/JsonDecode.java
index 3a9ce502..a13dbc1d 100644
--- a/panc/src/main/java/org/quattor/pan/dml/functions/JsonDecode.java
+++ b/panc/src/main/java/org/quattor/pan/dml/functions/JsonDecode.java
@@ -8,8 +8,8 @@
 import org.quattor.pan.dml.data.StringProperty;
 import org.quattor.pan.exceptions.EvaluationException;
 import org.quattor.pan.exceptions.SyntaxException;
-import org.quattor.pan.template.Context;
-import org.quattor.pan.template.SourceRange;
+import org.quattor.pan.ttemplate.Context;
+import org.quattor.pan.ttemplate.SourceRange;
 import org.quattor.pan.utils.JsonUtils;
 import org.quattor.pan.utils.MessageUtils;
 
diff --git a/panc/src/main/java/org/quattor/pan/dml/functions/JsonEncode.java b/panc/src/main/java/org/quattor/pan/dml/functions/JsonEncode.java
index 19b611a4..0a1472c0 100644
--- a/panc/src/main/java/org/quattor/pan/dml/functions/JsonEncode.java
+++ b/panc/src/main/java/org/quattor/pan/dml/functions/JsonEncode.java
@@ -9,8 +9,8 @@
 import org.quattor.pan.dml.data.Undef;
 import org.quattor.pan.exceptions.EvaluationException;
 import org.quattor.pan.exceptions.SyntaxException;
-import org.quattor.pan.template.Context;
-import org.quattor.pan.template.SourceRange;
+import org.quattor.pan.ttemplate.Context;
+import org.quattor.pan.ttemplate.SourceRange;
 import org.quattor.pan.utils.JsonUtils;
 import org.quattor.pan.utils.MessageUtils;