WIP: Message Renderer Helper

* Created a generic message renderer helper class.
* Renamed "msg" to "message" in session rendering methods.

4 files changed, 92 insertions, 8 deletions

diff --git a/src/core/imap/MCIMAPSession.cc b/src/core/imap/MCIMAPSession.cc
index 784def6e..5afb8702 100644
--- a/src/core/imap/MCIMAPSession.cc
+++ b/src/core/imap/MCIMAPSession.cc
@@ -16,6 +16,8 @@
 #include "MCIMAPFolderStatus.h"
 #include "MCConnectionLogger.h"
 #include "MCConnectionLoggerUtils.h"
+#include "MCHTMLRenderer.h"
+#include "MCMessageRendererHelper.h"
 
 using namespace mailcore;
 
@@ -2999,22 +3001,24 @@ ConnectionLogger * IMAPSession::connectionLogger()
     return mConnectionLogger;
 }
 
-String * htmlRendering(IMAPMessage * msg, String * folder)
+String * htmlRendering(IMAPMessage * message, String * folder)
 {
+    MessageRendererHelper * messageRendererHelper = new MessageRendererHelper;
     
+    HTMLRenderer::htmlForIMAPMessage(folder, message, messageRendererHelper->dataCallback, messageRendererHelper->htmlCallback);
 }
 
-String * htmlBodyRendering(IMAPMessage * msg, String * folder)
+String * htmlBodyRendering(IMAPMessage * message, String * folder)
 {
     
 }
 
-String * plainTextRendering(IMAPMessage * msg, String * folder)
+String * plainTextRendering(IMAPMessage * message, String * folder)
 {
     
 }
 
-String * plainTextBodyRendering(IMAPMessage * msg, String * folder)
+String * plainTextBodyRendering(IMAPMessage * message, String * folder)
 {
     
 }
diff --git a/src/core/imap/MCIMAPSession.h b/src/core/imap/MCIMAPSession.h
index 9d1cf0a2..5d72f551 100644
--- a/src/core/imap/MCIMAPSession.h
+++ b/src/core/imap/MCIMAPSession.h
@@ -136,11 +136,11 @@ namespace mailcore {
         virtual void setConnectionLogger(ConnectionLogger * logger);
         virtual ConnectionLogger * connectionLogger();
         
-        virtual String * htmlRendering(IMAPMessage * msg, String * folder);
-        virtual String * htmlBodyRendering(IMAPMessage * msg, String * folder);
+        virtual String * htmlRendering(IMAPMessage * message, String * folder);
+        virtual String * htmlBodyRendering(IMAPMessage * message, String * folder);
         
-        virtual String * plainTextRendering(IMAPMessage * msg, String * folder);
-        virtual String * plainTextBodyRendering(IMAPMessage * msg, String * folder);
+        virtual String * plainTextRendering(IMAPMessage * message, String * folder);
+        virtual String * plainTextBodyRendering(IMAPMessage * message, String * folder);
         
     public: // private
         virtual void loginIfNeeded(ErrorCode * pError);
diff --git a/src/core/renderer/MCMessageRendererHelper.cpp b/src/core/renderer/MCMessageRendererHelper.cpp
new file mode 100644
index 00000000..46392e8f
--- /dev/null
+++ b/src/core/renderer/MCMessageRendererHelper.cpp
@@ -0,0 +1,41 @@
+//
+//  MCMessageRendererHelper.cpp
+//  mailcore2
+//
+//  Created by Paul Young on 28/06/2013.
+//  Copyright (c) 2013 MailCore. All rights reserved.
+//
+
+#include "MCMessageRendererHelper.h"
+
+using namespace mailcore;
+
+MessageRendererHelper::MessageRendererHelper()
+{
+    mSession = NULL;
+}
+
+MessageRendererHelper::~MessageRendererHelper()
+{
+    MC_SAFE_RELEASE(mSession);
+}
+
+void MessageRendererHelper::setSession(IMAPSession * session)
+{
+    mSession = session;
+}
+
+IMAPSession MessageRendererHelper::session()
+{
+    return mSession;
+}
+
+HTMLRendererIMAPCallback * MessageRendererHelper::dataCallback()
+{
+
+}
+
+HTMLRendererTemplateCallback * MessageRendererHelper::htmlCallback()
+{
+    
+}
diff --git a/src/core/renderer/MCMessageRendererHelper.h b/src/core/renderer/MCMessageRendererHelper.h
new file mode 100644
index 00000000..54c2952f
--- /dev/null
+++ b/src/core/renderer/MCMessageRendererHelper.h
@@ -0,0 +1,39 @@
+//
+//  MCMessageRendererHelper.h
+//  mailcore2
+//
+//  Created by Paul Young on 28/06/2013.
+//  Copyright (c) 2013 MailCore. All rights reserved.
+//
+
+#ifndef __MAILCORE_MCMESSAGERENDERERHELPER_H_
+
+#define __MAILCORE_MCMESSAGERENDERERHELPER_H_
+
+#include "MCHTMLRendererCallback.h"
+#include "MCIMAPSession.h"
+
+#ifdef __cplusplus
+
+namespace mailcore {
+    
+    class MessageRendererHelper {
+    public:
+        MessageRendererHelper();
+        virtual ~MessageRendererHelper();
+        
+        virtual void setSession(IMAPSession * session);
+        virtual IMAPSession session();
+        
+        virtual HTMLRendererIMAPCallback * dataCallback();
+        virtual HTMLRendererTemplateCallback * htmlCallback();
+    
+    private:
+        IMAPSession * mSession;
+        
+    }
+}
+
+#endif
+
+#endif