X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fcore%2Ftest%2Ftree%2FTreeTestResult.java;h=fb1b0130c951027a29f576381bd38357d47d5476;hb=5469796ed10ab0ddb8f7bf1cb7ba663676b7d73d;hp=3134e1aaad2cec82cd7a21587edd694a1d479ef1;hpb=7756b44bff90cc8cb20e16e426c39f82ba89705e;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/core/test/tree/TreeTestResult.java b/org.argeo.slc/src/main/java/org/argeo/slc/core/test/tree/TreeTestResult.java
index 3134e1aaa..fb1b0130c 100644
--- a/org.argeo.slc/src/main/java/org/argeo/slc/core/test/tree/TreeTestResult.java
+++ b/org.argeo.slc/src/main/java/org/argeo/slc/core/test/tree/TreeTestResult.java
@@ -5,72 +5,133 @@ import java.util.SortedMap;
 import java.util.TreeMap;
 import java.util.Vector;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 import org.argeo.slc.core.SlcException;
 import org.argeo.slc.core.structure.StructureAware;
 import org.argeo.slc.core.structure.StructurePath;
 import org.argeo.slc.core.structure.StructureRegistry;
 import org.argeo.slc.core.structure.tree.TreeSPath;
+import org.argeo.slc.core.test.NumericTRId;
 import org.argeo.slc.core.test.TestResult;
 import org.argeo.slc.core.test.TestResultId;
 import org.argeo.slc.core.test.TestResultListener;
 import org.argeo.slc.core.test.TestResultPart;
 
+/**
+ * Complex implementation of a test result compatible with a tree based
+ * structure.
+ */
 public class TreeTestResult implements TestResult, StructureAware {
-	private TestResultId testResultId;
-	private List<TestResultListener> listeners;
+	private Log log = LogFactory.getLog(TreeTestResult.class);
+	/** For ORM */
+	private Long tid;
+
+	private NumericTRId testResultId;
+	private List<TestResultListener> listeners = new Vector<TestResultListener>();
 
 	private TreeSPath currentPath;
 
-	private SortedMap<TreeSPath, List<TestResultPart>> resultParts = new TreeMap<TreeSPath, List<TestResultPart>>();
+	private boolean isClosed = false;
 
+	private SortedMap<TreeSPath, PartSubList> resultParts = new TreeMap<TreeSPath, PartSubList>();
+
+	private StructureRegistry registry;
+	
 	public TestResultId getTestResultId() {
 		return testResultId;
 	}
 
-	public void setTestResultId(TestResultId testResultId) {
+	/**
+	 * Use of a <code>NumericTRId</code> is required by Hibernate. <b>It may
+	 * change in the future.</b>
+	 */
+	public NumericTRId getNumericResultId() {
+		return testResultId;
+	}
+
+	/** Sets the test result id as a numeric test result id.*/
+	public void setNumericResultId(NumericTRId testResultId) {
 		this.testResultId = testResultId;
 	}
 
+	/** Sets the list of listeners.*/
 	public void setListeners(List<TestResultListener> listeners) {
 		this.listeners = listeners;
 	}
-	
+
 	public void addResultPart(TestResultPart part) {
-		if(currentPath==null){
+		if (currentPath == null) {
 			throw new SlcException("No current path set.");
 		}
-		List<TestResultPart> list = resultParts.get(currentPath);
-		if(list == null){
-			list = new Vector<TestResultPart>();
-			resultParts.put(currentPath, list);
-		}
-		list.add(part);
-		
-		// notify listeners
-		for(TestResultListener listener: listeners){
-			listener.resultPartAdded(this, part);
+		PartSubList subList = resultParts.get(currentPath);
+		if (subList == null) {
+			subList = new PartSubList();
+			resultParts.put(currentPath, subList);
 		}
-	}
+		subList.getParts().add(part);
 
-	public List<TestResultPart> listResultParts() {
-		List<TestResultPart> all = new Vector<TestResultPart>();
-		for(TreeSPath path:resultParts.keySet()){
-			all.addAll(resultParts.get(path));
+		// notify listeners
+		synchronized (listeners) {
+			for (TestResultListener listener : listeners) {
+				listener.resultPartAdded(this, part);
+			}
 		}
-		return all;
 	}
 
 	public void notifyCurrentPath(StructureRegistry registry, StructurePath path) {
 		currentPath = (TreeSPath) path;
+		this.registry = registry;
 	}
 
+	/** Gets the current path.*/
 	public TreeSPath getCurrentPath() {
 		return currentPath;
 	}
 
-	public SortedMap<TreeSPath, List<TestResultPart>> getResultParts() {
+	/** Gets all the results structured as a map of <code>PartSubList<code>s. */
+	public SortedMap<TreeSPath, PartSubList> getResultParts() {
 		return resultParts;
 	}
 
-	
+	/** Used by ORM systems. */
+	void setResultParts(SortedMap<TreeSPath, PartSubList> resultParts) {
+		this.resultParts = resultParts;
+	}
+
+	public void close() {
+		if (isClosed) {
+			throw new SlcException("Test Result #" + getTestResultId()
+					+ " alredy closed.");
+		}
+
+		synchronized (listeners) {
+			for (TestResultListener listener : listeners) {
+				listener.close();
+			}
+			listeners.clear();
+		}
+		isClosed = true;
+		log.info("Test Result #" + getTestResultId() + " closed.");
+	}
+
+	Long getTid() {
+		return tid;
+	}
+
+	void setTid(Long tid) {
+		this.tid = tid;
+	}
+
+	/** Gets the related registry (can be null).*/
+	public StructureRegistry getRegistry() {
+		return registry;
+	}
+
+	/** Sets the related registry.*/
+	public void setRegistry(StructureRegistry registry) {
+		this.registry = registry;
+	}
+
 }