Refactor for a central include directory

include/icsneo/communication/message/callback/canmessagecallback.h

@@ -0,0 +1,23 @@
+#ifndef __CANMESSAGECALLBACK_H_
+#define __CANMESSAGECALLBACK_H_
+
+#include "icsneo/communication/message/callback/messagecallback.h"
+#include "icsneo/communication/message/canmessage.h"
+#include "icsneo/communication/message/filter/canmessagefilter.h"
+#include <memory>
+
+namespace icsneo {
+
+class CANMessageCallback : public MessageCallback {
+public:
+	CANMessageCallback(fn_messageCallback cb, std::shared_ptr<CANMessageFilter> f) : MessageCallback(cb, f) {}
+	CANMessageCallback(fn_messageCallback cb, CANMessageFilter f = CANMessageFilter()) : MessageCallback(cb, std::make_shared<CANMessageFilter>(f)) {}
+
+	// Allow the filter to be placed first if the user wants (maybe in the case of a lambda)
+	CANMessageCallback(std::shared_ptr<CANMessageFilter> f, fn_messageCallback cb) : MessageCallback(cb, f) {}
+	CANMessageCallback(CANMessageFilter f, fn_messageCallback cb) : MessageCallback(cb, std::make_shared<CANMessageFilter>(f)) {}
+};
+
+};
+
+#endif

include/icsneo/communication/message/callback/main51messagecallback.h

@@ -0,0 +1,23 @@
+#ifndef __MAIN51MESSAGECALLBACK_H_
+#define __MAIN51MESSAGECALLBACK_H_
+
+#include "icsneo/communication/message/callback/messagecallback.h"
+#include "icsneo/communication/message/main51message.h"
+#include "icsneo/communication/message/filter/main51messagefilter.h"
+#include <memory>
+
+namespace icsneo {
+
+class Main51MessageCallback : public MessageCallback {
+public:
+	Main51MessageCallback(fn_messageCallback cb, std::shared_ptr<Main51MessageFilter> f) : MessageCallback(cb, f) {}
+	Main51MessageCallback(fn_messageCallback cb, Main51MessageFilter f = Main51MessageFilter()) : MessageCallback(cb, std::make_shared<Main51MessageFilter>(f)) {}
+
+	// Allow the filter to be placed first if the user wants (maybe in the case of a lambda)
+	Main51MessageCallback(std::shared_ptr<Main51MessageFilter> f, fn_messageCallback cb) : MessageCallback(cb, f) {}
+	Main51MessageCallback(Main51MessageFilter f, fn_messageCallback cb) : MessageCallback(cb, std::make_shared<Main51MessageFilter>(f)) {}
+};
+
+};
+
+#endif

include/icsneo/communication/message/callback/messagecallback.h

@@ -0,0 +1,38 @@
+#ifndef __MESSAGECALLBACK_H_
+#define __MESSAGECALLBACK_H_
+
+#include "icsneo/communication/message/message.h"
+#include "icsneo/communication/message/filter/messagefilter.h"
+#include <memory>
+#include <functional>
+
+namespace icsneo {
+
+class MessageCallback {
+public:
+	typedef std::function< void( std::shared_ptr<Message> ) > fn_messageCallback;
+
+	MessageCallback(fn_messageCallback cb, std::shared_ptr<MessageFilter> f) : callback(cb), filter(f) {}
+	MessageCallback(fn_messageCallback cb, MessageFilter f = MessageFilter()) : callback(cb), filter(std::make_shared<MessageFilter>(f)) {}
+	
+	// Allow the filter to be placed first if the user wants (maybe in the case of a lambda)
+	MessageCallback(std::shared_ptr<MessageFilter> f, fn_messageCallback cb) : callback(cb), filter(f) {}
+	MessageCallback(MessageFilter f, fn_messageCallback cb) : callback(cb), filter(std::make_shared<MessageFilter>(f)) {}
+	
+	virtual bool callIfMatch(const std::shared_ptr<Message>& message) const {
+		bool ret = filter->match(message);
+		if(ret)
+			callback(message);
+		return ret;
+	}
+	const MessageFilter& getFilter() const { return *filter; }
+	const fn_messageCallback& getCallback() const { return callback; }
+
+protected:
+	fn_messageCallback callback;
+	std::shared_ptr<MessageFilter> filter;
+};
+
+}
+
+#endif