1 files changed, 4 insertions, 5 deletions
diff --git a/project2/cgi/cgiAppEngine.h b/project2/cgi/cgiAppEngine.h
index cebb294..db4d696 100644
--- a/project2/cgi/cgiAppEngine.h
+++ b/project2/cgi/cgiAppEngine.h
@@ -5,6 +5,7 @@
 #include "../task.h"
 #include "../paramChecker.h"
 #include "../presenter.h"
+#include "../commonObjects.h"
 #include <boost/intrusive_ptr.hpp>
 #include <boost/uuid/uuid.hpp>
 #include <libxml++/document.h>
@@ -30,13 +31,13 @@ class CgiApplicationEngine : public ApplicationEngine {
 		}
 		const Environment * env() const;
 		SessionPtr session() const;
-		PresenterPtr getPresenter(const std::string & group, const std::string & id) const;
+		void addAppData(const Presenter * p) const;
 		const CgiEnvironment * _env;
 	protected:
 		mutable cgicc::HTTPContentHeader * header;
 	private:
 		mutable boost::shared_ptr<xmlpp::Document> doc;
-		class Stage {
+		class Stage : public CommonObjects {
 			public:
 				Stage(const CgiApplicationEngine *);
 				virtual ~Stage() = 0;
@@ -54,14 +55,12 @@ class CgiApplicationEngine : public ApplicationEngine {
 				OrderedParamCheckers parameterChecks;
 				NoOutputExecutes tasks;
 		};
-		class PresentStage : public Stage, public Presenter {
+		class PresentStage : public Stage, public XmlPresenter {
 			public:
 				PresentStage(const CgiApplicationEngine *, const std::string & id);
 				PresentStage(const CgiApplicationEngine *, const std::string & group, const std::string & id);
 				virtual ~PresentStage();
 				virtual Stage * run();
-			protected:
-				XmlDocumentPtr getDataDocument() const;
 		};
 		mutable Stage * currentStage;
 		mutable boost::uuids::uuid sessionID;