Extended Java bindings and OpenAL invoker

1 files changed, 29 insertions, 0 deletions

diff --git a/src/bindings/swig/java/uscxml.i b/src/bindings/swig/java/uscxml.i
index ee7133c..af979d0 100644
--- a/src/bindings/swig/java/uscxml.i
+++ b/src/bindings/swig/java/uscxml.i
@@ -3,8 +3,21 @@
 // import swig typemaps
 //%include <arrays_java.i>
 //%include <inttypes.i>
+
+%include <stl.i>
+%include <std_map.i>
+%include <inttypes.i>
+%include "stl_set.i"
+%include "stl_list.i"
+
 %include <boost_shared_ptr.i>
 
+
+typedef uscxml::Data Data;
+typedef uscxml::Event Event;
+typedef uscxml::InvokeRequest InvokeRequest;
+typedef uscxml::SendRequest SendRequest;
+
 // disable warning related to unknown base class
 #pragma SWIG nowarn=401
 //%ignore boost::enable_shared_from_this;
@@ -32,10 +45,14 @@
 %{
 
 #include "../../../uscxml/Message.h"
+#include "../../../uscxml/Factory.h"
 #include "../../../uscxml/Interpreter.h"
+#include "JavaInvoker.h"
 
 using namespace uscxml;
 
+#include "JavaInvoker.cpp"
+
 %}
 
 %rename(toString) operator<<;
@@ -46,10 +63,22 @@ using namespace uscxml;
 
 %ignore uscxml::Interpreter::getDelayQueue();
 
+%ignore uscxml::JavaInvoker::create(InterpreterImpl*);
+
+%template(DataMap) std::map<std::string, uscxml::Data>;
+%template(DataList) std::list<uscxml::Data>;
+%template(StringSet) std::set<std::string>;
+
+
+%feature("director") uscxml::JavaInvoker;
+
 //***********************************************
 // Parse the header file to generate wrappers
 //***********************************************
 
+#define SWIGIMPORTED 1
+%include "../../../uscxml/Factory.h"
 %include "../../../uscxml/Message.h"
 %include "../../../uscxml/Interpreter.h"
+%include "JavaInvoker.h"