X-Git-Url: http://plrg.eecs.uci.edu/git/?p=iot2.git;a=blobdiff_plain;f=iotjava%2Fiotrmi%2FJava%2Fbasics%2FTestClass.java;fp=iotjava%2Fiotrmi%2FJava%2Fbasics%2FTestClass.java;h=1bfe8e24cb2045decb77fa21c3b19057567c99ed;hp=411e7db16d9f6902ee259cb9662481d742761c87;hb=ae77f0f97f70a6d3bef0faee0b7db27fb5e2849f;hpb=09bf1cf8e98526878b4732bf8d3077eb2d1c16e3

diff --git a/iotjava/iotrmi/Java/basics/TestClass.java b/iotjava/iotrmi/Java/basics/TestClass.java
index 411e7db..1bfe8e2 100644
--- a/iotjava/iotrmi/Java/basics/TestClass.java
+++ b/iotjava/iotrmi/Java/basics/TestClass.java
@@ -288,6 +288,32 @@ public class TestClass implements TestClassInterface {
 	}
 
 
+	public Enum[] handleEnumTwo(Enum en1[], Enum en2[]) {
+
+		for (Enum e : en1) {
+			System.out.println("Enum1: " + e);
+		}
+		for (Enum e : en2) {
+			System.out.println("Enum2: " + e);
+		}
+		
+		return en1;
+	}
+
+
+	public Enum[] handleEnumThree(Enum en1[], Enum en2[], List<Struct> str1, List<Struct> str2) {
+
+		for (Enum e : en1) {
+			System.out.println("Enum1: " + e);
+		}
+		for (Enum e : en2) {
+			System.out.println("Enum2: " + e);
+		}
+		
+		return en1;
+	}
+
+
 	// Struct
 	public Struct handleStruct(Struct str) {
 
@@ -394,6 +420,30 @@ public class TestClass implements TestClassInterface {
 	}
 
 
+	public List<Struct> handleStructTwo(List<Struct> str1, List<Struct> str2) {
+
+		for (Struct st : str1) {
+			System.out.println("Name: " + st.name);
+			System.out.println("Value: " + st.value);
+			System.out.println("Year: " + st.year);
+		}
+
+		return str1;
+	}
+
+
+	public List<Struct> handleStructThree(List<Struct> str1, List<Struct> str2, List<Struct> str3) {
+
+		for (Struct st : str1) {
+			System.out.println("Name: " + st.name);
+			System.out.println("Value: " + st.value);
+			System.out.println("Year: " + st.year);
+		}
+
+		return str2;
+	}
+
+
 	public Enum[] handleAll(Enum en[], List<Struct> str, char c, List<CallBackInterfaceWithCallBack> _cb) {
 
 		for (CallBackInterfaceWithCallBack cb : _cb) {
@@ -426,6 +476,25 @@ public class TestClass implements TestClassInterface {
 	}
 
 
+	public Enum[] handleAllTwo(Enum en1[], Enum en2[], List<Struct> str1, List<Struct> str2, char c, List<CallBackInterfaceWithCallBack> _cb1, List<CallBackInterfaceWithCallBack> _cb2) {
+
+		for (CallBackInterfaceWithCallBack cb : _cb1) {
+			cblist.add(cb);
+			System.out.println("Registering callback objects in list!");
+		}
+
+		for (Struct st : str1) {
+			System.out.println("Name: " + st.name);
+			System.out.println("Value: " + st.value);
+			System.out.println("Year: " + st.year);
+		}
+
+		System.out.println("Char: " + c);
+
+		return en1;
+	}
+
+
 	// Getters
 	public String sumArray(String[] newA) {