See detailled log

- Forcing Data.Type for Data(String) constructor now, default used to be INTERPRETED.
- setDataModel and addIOProcessor on interpreter now
- fixed a bug with Data(bool) constructor
- various smaller fixes

1 files changed, 19 insertions, 1 deletions

diff --git a/src/bindings/swig/java/uscxml.i b/src/bindings/swig/java/uscxml.i
index 688ca6e..036b244 100644
--- a/src/bindings/swig/java/uscxml.i
+++ b/src/bindings/swig/java/uscxml.i
@@ -42,7 +42,7 @@ typedef uscxml::ExecutableContentImpl ExecutableContentImpl;
 
 %javaconst(1);
 
-%rename(equals) operator==; 
+%rename(equals) operator==; // signature is wrong, still useful
 %rename(isValid) operator bool;
 
 //**************************************************
@@ -98,6 +98,15 @@ WRAP_THROW_EXCEPTION(uscxml::Interpreter::step);
 WRAP_THROW_EXCEPTION(uscxml::Interpreter::interpret);
 
 
+%define WRAP_HASHCODE( CLASSNAME )
+%extend CLASSNAME {
+	virtual int hashCode() {
+/*		std::cout << "Calc hashcode as " << (int)(size_t)self->getImpl().get() << std::endl << std::flush;*/
+		return (int)(size_t)self->getImpl().get();
+	}
+};
+%enddef
+
 %define WRAP_TO_STRING( CLASSNAME )
 %extend CLASSNAME {
 	virtual std::string toString() {
@@ -113,6 +122,8 @@ WRAP_TO_STRING(uscxml::Data);
 WRAP_TO_STRING(uscxml::SendRequest);
 WRAP_TO_STRING(uscxml::InvokeRequest);
 
+WRAP_HASHCODE(uscxml::Interpreter);
+
 %include "../uscxml_ignores.i"
 
 #if 0
@@ -240,6 +251,13 @@ import java.net.URL;
 		return invokers;
 	}
 	
+	@Override
+	public boolean equals(Object other) {
+		if (other instanceof Interpreter) {
+			return equals((Interpreter)other);
+		}
+		return hashCode() == other.hashCode();
+	}
 %}
 
 %rename(getCompoundNative) uscxml::Data::getCompound();