Massive refactor to remove the appEngine and environment complication and instead have an execution context that's passed around from the original call site

1 files changed, 5 insertions, 5 deletions

diff --git a/project2/json/presenter.cpp b/project2/json/presenter.cpp
index 111ae5c..2eabeac 100644
--- a/project2/json/presenter.cpp
+++ b/project2/json/presenter.cpp
@@ -15,7 +15,7 @@ JsonPresenter::JsonPresenter(ScriptNodePtr s, ObjectSource os, const Glib::ustri
 	returnObject(s, "object", Null()) {
 }
 
-JsonPresenter::JsonPresenter(ScriptNodePtr s, ObjectSource os) :
+JsonPresenter::JsonPresenter(ScriptNodePtr s, ObjectSource os, ExecContext *) :
 	TransformSource(s, os),
 	MultiRowSetPresenter(os),
 	ContentPresenter("application/json"),
@@ -25,7 +25,7 @@ JsonPresenter::JsonPresenter(ScriptNodePtr s, ObjectSource os) :
 }
 
 void
-JsonPresenter::init()
+JsonPresenter::init(ExecContext *)
 {
 	while (!curRowSet.empty()) {
 		curRowSet.pop();
@@ -131,13 +131,13 @@ JsonPresenter::getContentClass() const
 }
 
 void
-JsonPresenter::writeTo(std::ostream & o, const std::string & encoding) const
+JsonPresenter::writeTo(std::ostream & o, const std::string & encoding, ExecContext * ec) const
 {
-	if (returnObject().isNull()) {
+	if (returnObject(ec).isNull()) {
 		serializeObject(object, o, encoding);
 	}
 	else {
-		serializeValue(*object[returnObject()], o, encoding);
+		serializeValue(*object[returnObject(ec)], o, encoding);
 	}
 }