Progress on the apache-commons wrapper

5 files changed, 86 insertions, 1 deletions

diff --git a/src/bindings/swig/java/uscxml.i b/src/bindings/swig/java/uscxml.i
index 03d8232..db3b221 100644
--- a/src/bindings/swig/java/uscxml.i
+++ b/src/bindings/swig/java/uscxml.i
@@ -68,6 +68,7 @@ typedef uscxml::InterpreterIssue InterpreterIssue;
 
 #include "../wrapped/WrappedInvoker.h"
 #include "../wrapped/WrappedDataModel.h"
+#include "../wrapped/WrappedActionLanguage.h"
 #include "../wrapped/WrappedExecutableContent.h"
 #include "../wrapped/WrappedIOProcessor.h"
 #include "../wrapped/WrappedInterpreterMonitor.h"
@@ -78,6 +79,7 @@ using namespace XERCESC_NS;
 // the wrapped* C++ classes get rid of DOM nodes and provide more easily wrapped base classes
 #include "../wrapped/WrappedInvoker.cpp"
 #include "../wrapped/WrappedDataModel.cpp"
+#include "../wrapped/WrappedActionLanguage.cpp"
 #include "../wrapped/WrappedExecutableContent.cpp"
 #include "../wrapped/WrappedIOProcessor.cpp"
 #include "../wrapped/WrappedInterpreterMonitor.cpp"
@@ -268,6 +270,7 @@ BEAUTIFY_NATIVE(uscxml::Event, Event, EventNative);
 
 %include "../wrapped/WrappedInvoker.h"
 %include "../wrapped/WrappedDataModel.h"
+%include "../wrapped/WrappedActionLanguage.h"
 %include "../wrapped/WrappedExecutableContent.h"
 %include "../wrapped/WrappedIOProcessor.h"
 %include "../wrapped/WrappedInterpreterMonitor.h"
diff --git a/src/bindings/swig/uscxml_beautify.i b/src/bindings/swig/uscxml_beautify.i
index 52c8ec5..0c17e2a 100644
--- a/src/bindings/swig/uscxml_beautify.i
+++ b/src/bindings/swig/uscxml_beautify.i
@@ -1,3 +1,5 @@
+%rename(NativeActionLanguage) ActionLanguage;
+%rename(ActionLanguage) WrappedActionLanguage;
 %rename(NativeDataModel) DataModel;
 %rename(DataModel) WrappedDataModel;
 %rename(NativeDataModelExtension) DataModelExtension;
diff --git a/src/bindings/swig/uscxml_ignores.i b/src/bindings/swig/uscxml_ignores.i
index 4146a35..0679bc0 100644
--- a/src/bindings/swig/uscxml_ignores.i
+++ b/src/bindings/swig/uscxml_ignores.i
@@ -3,7 +3,6 @@
 %ignore uscxml::InterpreterImpl;
 %ignore uscxml::BlobImpl;
 %ignore uscxml::StateTransitionMonitor;
-%ignore uscxml::ActionLanguage;
 
 #if 0
 %ignore uscxml::EventHandlerImpl;
diff --git a/src/bindings/swig/wrapped/WrappedActionLanguage.cpp b/src/bindings/swig/wrapped/WrappedActionLanguage.cpp
new file mode 100644
index 0000000..1876333
--- /dev/null
+++ b/src/bindings/swig/wrapped/WrappedActionLanguage.cpp
@@ -0,0 +1,33 @@
+/**
+ *  @file
+ *  @author     2012-2014 Stefan Radomski (stefan.radomski@cs.tu-darmstadt.de)
+ *  @copyright  Simplified BSD
+ *
+ *  @cond
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the FreeBSD license as published by the FreeBSD
+ *  project.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ *  You should have received a copy of the FreeBSD license along with this
+ *  program. If not, see <http://www.opensource.org/licenses/bsd-license>.
+ *  @endcond
+ */
+
+#include "WrappedActionLanguage.h"
+#include "../../../uscxml/plugins/DataModelImpl.h"
+
+namespace uscxml {
+
+WrappedActionLanguage::WrappedActionLanguage() {}
+WrappedActionLanguage::~WrappedActionLanguage() {}
+
+void WrappedActionLanguage::setDataModel(DataModelImpl* dm) {
+	std::shared_ptr<DataModelImpl> dmPtr(dm);
+	this->dataModel = DataModel(dmPtr);
+}
+
+}
\ No newline at end of file
diff --git a/src/bindings/swig/wrapped/WrappedActionLanguage.h b/src/bindings/swig/wrapped/WrappedActionLanguage.h
new file mode 100644
index 0000000..f26329e
--- /dev/null
+++ b/src/bindings/swig/wrapped/WrappedActionLanguage.h
@@ -0,0 +1,48 @@
+/**
+ *  @file
+ *  @author     2012-2014 Stefan Radomski (stefan.radomski@cs.tu-darmstadt.de)
+ *  @copyright  Simplified BSD
+ *
+ *  @cond
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the FreeBSD license as published by the FreeBSD
+ *  project.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ *  You should have received a copy of the FreeBSD license along with this
+ *  program. If not, see <http://www.opensource.org/licenses/bsd-license>.
+ *  @endcond
+ */
+
+#ifndef WRAPPEDACTIONLANGUAGE_H_020AFC96
+#define WRAPPEDACTIONLANGUAGE_H_020AFC96
+	
+#include <vector>
+#include <list>
+#include <ostream>
+#include <string>
+#include <iostream>
+
+#include <xercesc/dom/DOM.hpp>
+
+#include "../../../uscxml/Interpreter.h"
+
+namespace uscxml {
+
+class DataModelImpl;
+
+class WrappedActionLanguage : public ActionLanguage {
+public:
+
+		WrappedActionLanguage();
+		virtual ~WrappedActionLanguage();
+
+		void setDataModel(DataModelImpl* dm);
+};
+
+}
+
+#endif /* end of include guard: WRAPPEDACTIONLANGUAGE_H_020AFC96 */