2006/unicorn/src/org/w3c/unicorn/tests TaskTest.java,1.1.2.2,1.1.2.3

Update of /sources/public/2006/unicorn/src/org/w3c/unicorn/tests
In directory hutz:/tmp/cvs-serv5324/src/org/w3c/unicorn/tests

Modified Files:
      Tag: dev2
	TaskTest.java 
Log Message:
Removed ThenType from XML schema (then and else are now RoutineType)

Index: TaskTest.java
===================================================================
RCS file: /sources/public/2006/unicorn/src/org/w3c/unicorn/tests/Attic/TaskTest.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- TaskTest.java	17 Aug 2009 16:38:15 -0000	1.1.2.2
+++ TaskTest.java	17 Aug 2009 17:54:32 -0000	1.1.2.3
@@ -31,12 +31,12 @@
 					.parse(new File("./resources/tasklist/new-tasklist.xml"));
 			TaskListUnmarshallerBeans unmarshaller = new TaskListUnmarshallerBeans();
 			Task aTask = new Task();
-			aTask.setTree(unmarshaller.ExpandTree(tasklist.getTasklist()
-					.getTaskArray(0)));
+			aTask.setTree(unmarshaller.expandTree(tasklist.getTasklist().getTaskArray(0),
+												  tasklist.getTasklist().getTaskArray(0).getRoutine()));
 			Map<String, Task> mapOfTask = new LinkedHashMap<String, Task>();
-			for (TaskType myTask : tasklist.getTasklist().getTaskArray()) {
+			for (TaskType myTask : tasklist.getTasklist().getTaskList()) {
 				Task bTask = new Task();
-				aTask.setTree(unmarshaller.ExpandTree(myTask));
+				aTask.setTree(unmarshaller.expandTree(myTask, myTask.getRoutine()));
 				mapOfTask.put(bTask.getID(), bTask);
 			}
 			aTask.setTree(aTask.expandNode(mapOfTask, aTask.getTree()));
@@ -45,7 +45,10 @@
 			e.printStackTrace();
 		} catch (IOException e) {
 			e.printStackTrace();
+		} catch (UnknownObserverException e) {
+			e.printStackTrace();
 		}
+		
 	}
 
 }

Received on Monday, 17 August 2009 17:54:44 UTC