More work on language bindings and C# examples

4 files changed, 14 insertions, 14 deletions

diff --git a/embedding/java/src/org/uscxml/datamodel/ecmascript/ECMAScriptDataModel.java b/embedding/java/src/org/uscxml/datamodel/ecmascript/ECMAScriptDataModel.java
index dcafcb9..152f5e3 100644
--- a/embedding/java/src/org/uscxml/datamodel/ecmascript/ECMAScriptDataModel.java
+++ b/embedding/java/src/org/uscxml/datamodel/ecmascript/ECMAScriptDataModel.java
@@ -11,14 +11,14 @@ import org.mozilla.javascript.Scriptable;
 import org.mozilla.javascript.ScriptableObject;
 import org.mozilla.javascript.Undefined;
 import org.uscxml.Data;
+import org.uscxml.DataModel;
 import org.uscxml.DataNative;
 import org.uscxml.Event;
 import org.uscxml.Interpreter;
 import org.uscxml.StringList;
 import org.uscxml.StringVector;
-import org.uscxml.WrappedDataModel;
 
-public class ECMAScriptDataModel extends WrappedDataModel {
+public class ECMAScriptDataModel extends DataModel {
 
 	public static boolean debug = true;
 	
@@ -77,7 +77,7 @@ public class ECMAScriptDataModel extends WrappedDataModel {
 	}
 
 	@Override
-	public WrappedDataModel create(Interpreter interpreter) {
+	public DataModel create(Interpreter interpreter) {
 		/**
 		 * Called when an SCXML interpreter wants an instance of this datamodel
 		 * Be careful to instantiate attributes of instance returned and not
diff --git a/embedding/java/src/org/uscxml/tests/execContent/TestCustomExecContent.java b/embedding/java/src/org/uscxml/tests/execContent/TestCustomExecContent.java
index dd5e39a..92d7ed3 100644
--- a/embedding/java/src/org/uscxml/tests/execContent/TestCustomExecContent.java
+++ b/embedding/java/src/org/uscxml/tests/execContent/TestCustomExecContent.java
@@ -5,9 +5,9 @@ import org.uscxml.Event;
 import org.uscxml.Factory;
 import org.uscxml.Interpreter;
 import org.uscxml.InterpreterException;
-import org.uscxml.WrappedExecutableContent;
+import org.uscxml.ExecutableContent;
 
-public class TestCustomExecContent extends WrappedExecutableContent {
+public class TestCustomExecContent extends ExecutableContent {
 
 	static int instanceId = 0;
 	public int id = 0;
@@ -43,7 +43,7 @@ public class TestCustomExecContent extends WrappedExecutableContent {
 	}
 
 	@Override
-	public WrappedExecutableContent create(Interpreter interpreter) {
+	public ExecutableContent create(Interpreter interpreter) {
 		return new TestCustomExecContent();
 	}
 
diff --git a/embedding/java/src/org/uscxml/tests/invoker/TestCustomInvoker.java b/embedding/java/src/org/uscxml/tests/invoker/TestCustomInvoker.java
index 9343c65..b17b52e 100644
--- a/embedding/java/src/org/uscxml/tests/invoker/TestCustomInvoker.java
+++ b/embedding/java/src/org/uscxml/tests/invoker/TestCustomInvoker.java
@@ -7,12 +7,11 @@ import org.uscxml.Factory;
 import org.uscxml.Interpreter;
 import org.uscxml.InterpreterException;
 import org.uscxml.InvokeRequest;
-import org.uscxml.StringList;
-import org.uscxml.WrappedInvoker;
+import org.uscxml.Invoker;
 import org.uscxml.SendRequest;
-import org.uscxml.StringSet;
+import org.uscxml.StringList;
 
-public class TestCustomInvoker extends WrappedInvoker {
+public class TestCustomInvoker extends Invoker {
 
 	@Override
 	public StringList getNames() {
@@ -46,7 +45,7 @@ public class TestCustomInvoker extends WrappedInvoker {
 	}
 
 	@Override
-	public WrappedInvoker create(Interpreter interpreter) {
+	public Invoker create(Interpreter interpreter) {
 		return new TestCustomInvoker();
 	}
 
diff --git a/embedding/java/src/org/uscxml/tests/ioprocessor/TestCustomIOProc.java b/embedding/java/src/org/uscxml/tests/ioprocessor/TestCustomIOProc.java
index 37b31a3..cc4d332 100644
--- a/embedding/java/src/org/uscxml/tests/ioprocessor/TestCustomIOProc.java
+++ b/embedding/java/src/org/uscxml/tests/ioprocessor/TestCustomIOProc.java
@@ -3,13 +3,13 @@ package org.uscxml.tests.ioprocessor;
 import org.uscxml.Data;
 import org.uscxml.DataNative;
 import org.uscxml.Factory;
+import org.uscxml.IOProcessor;
 import org.uscxml.Interpreter;
 import org.uscxml.InterpreterException;
 import org.uscxml.SendRequest;
 import org.uscxml.StringList;
-import org.uscxml.WrappedIOProcessor;
 
-public class TestCustomIOProc extends WrappedIOProcessor {
+public class TestCustomIOProc extends IOProcessor {
 
 	@Override
 	public StringList getNames() {
@@ -31,7 +31,7 @@ public class TestCustomIOProc extends WrappedIOProcessor {
 	}
 
 	@Override
-	public WrappedIOProcessor create(Interpreter interpreter) {
+	public IOProcessor create(Interpreter interpreter) {
 		return new TestCustomIOProc();
 	}
 
@@ -47,6 +47,7 @@ public class TestCustomIOProc extends WrappedIOProcessor {
 
 		Interpreter interpreter = Interpreter
 				.fromURI("/Users/sradomski/Documents/TK/Code/uscxml/test/samples/uscxml/test-java-invoker.scxml");
+		
 		while (true)
 			interpreter.interpret();
 	}