2006/unicorn/src/org/w3c/unicorn/tasklist TaskListUnmarshallerBeans.java,1.4,1.5 Task.java,1.3,1.4

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

Modified Files:
	TaskListUnmarshallerBeans.java Task.java 
Log Message:
added group elements to output with special behavior (type=firstPassed will output only the first passed observation child)

Index: TaskListUnmarshallerBeans.java
===================================================================
RCS file: /sources/public/2006/unicorn/src/org/w3c/unicorn/tasklist/TaskListUnmarshallerBeans.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- TaskListUnmarshallerBeans.java	2 Sep 2009 13:50:54 -0000	1.4
+++ TaskListUnmarshallerBeans.java	2 Sep 2009 15:45:42 -0000	1.5
@@ -93,7 +93,7 @@
 		aTaskCurrent.setTree(this.expandTree(aTask, aTask.getRoutine()));
 		
 		// Add the OutputList
-		aTaskCurrent.setOutputList(aTask.getOutput().getObservationList());
+		aTaskCurrent.setOutput(aTask.getOutput());
 		
 		// parameters
 		final ParametersType aParameters = aTask.getParameters();

Index: Task.java
===================================================================
RCS file: /sources/public/2006/unicorn/src/org/w3c/unicorn/tasklist/Task.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Task.java	2 Sep 2009 13:50:54 -0000	1.3
+++ Task.java	2 Sep 2009 15:45:42 -0000	1.4
@@ -12,6 +12,7 @@
 
 import javax.activation.MimeType;
 
+import org.w3.unicorn.tasklist.OutputType;
 import org.w3c.unicorn.contract.Observer;
 import org.w3c.unicorn.tasklist.parameters.Parameter;
 import org.w3c.unicorn.tasklisttree.TLTCond;
@@ -56,7 +57,9 @@
 	 */
 	private TLTNode root;
 
-	private List<String> listOfOutput;
+	//private List<String> listOfOutput;
+
+	private OutputType output;
 
 	/**
 	 * Creates a new Task.
@@ -417,14 +420,20 @@
 		return aStringBuffer.toString();
 	}
 
-	public void setOutputList(List<String> observationList) {
+	/*public void setOutputList(List<String> observationList) {
 		this.listOfOutput = observationList;
 	}
 
 	public List<String> getListOfOutput() {
 		return listOfOutput;
+	}*/
+
+	public void setOutput(OutputType output) {
+		this.output = output;
+	}
+
+	public OutputType getOutput() {
+		return output;
 	}
-	
-	
 
 }

Received on Wednesday, 2 September 2009 15:46:00 UTC