From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 14 Oct 2008 21:29:28 +0000 (+0000)
Subject: Fix the format of tree test result attributes.
X-Git-Tag: argeo-slc-2.1.7~2456
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=bf1609d0771d4dd49cf11670f130c66b2d8d658f;p=gpl%2Fargeo-slc.git

Fix the format of tree test result attributes.

git-svn-id: https://svn.argeo.org/slc/trunk@1742 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/TreeTestResult.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/TreeTestResult.java
index 0c3eea382..3e365afe0 100644
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/TreeTestResult.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/TreeTestResult.java
@@ -44,7 +44,7 @@ public class TreeTestResult implements TestResult, StructureAware<TreeSPath>,
 	private SortedMap<TreeSPath, PartSubList> resultParts = new TreeMap<TreeSPath, PartSubList>();
 	private SortedMap<TreeSPath, StructureElement> elements = new TreeMap<TreeSPath, StructureElement>();
 
-	private SortedMap<String, String> attributes = new TreeMap<String, String>();
+	private Map<String, String> attributes = new TreeMap<String, String>();
 
 	/** Sets the list of listeners. */
 	public void setListeners(List<TestResultListener<TreeTestResult>> listeners) {
@@ -204,11 +204,11 @@ public class TreeTestResult implements TestResult, StructureAware<TreeSPath>,
 		}
 	}
 
-	public SortedMap<String, String> getAttributes() {
+	public Map<String, String> getAttributes() {
 		return attributes;
 	}
 
-	public void setAttributes(SortedMap<String, String> attributes) {
+	public void setAttributes(Map<String, String> attributes) {
 		this.attributes = attributes;
 	}
 
diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/dao/test/tree/TreeTestResultDao.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/dao/test/tree/TreeTestResultDao.java
index e7582a869..70db08790 100644
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/dao/test/tree/TreeTestResultDao.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/dao/test/tree/TreeTestResultDao.java
@@ -2,7 +2,6 @@ package org.argeo.slc.dao.test.tree;
 
 import java.util.List;
 import java.util.Map;
-import java.util.SortedMap;
 
 import org.argeo.slc.core.structure.StructureElement;
 import org.argeo.slc.core.structure.tree.TreeSPath;
@@ -19,5 +18,5 @@ public interface TreeTestResultDao extends TestResultDao<TreeTestResult> {
 			Map<TreeSPath, StructureElement> relatedElements);
 
 	public void updateAttributes(String testResultId,
-			SortedMap<String, String> attributes);
+			Map<String, String> attributes);
 }
diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/msg/test/tree/ResultPartRequest.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/msg/test/tree/ResultPartRequest.java
index 09acea56a..0b4278f34 100644
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/msg/test/tree/ResultPartRequest.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/msg/test/tree/ResultPartRequest.java
@@ -17,7 +17,7 @@ public class ResultPartRequest {
 	private TreeSPath path;
 	private Map<TreeSPath, StructureElement> relatedElements;
 	private TestRunDescriptor testRunDescriptor;
-	private SortedMap<String, String> attributes;
+	private Map<String, String> attributes;
 
 	public ResultPartRequest() {
 
@@ -92,7 +92,7 @@ public class ResultPartRequest {
 		this.relatedElements = relatedElements;
 	}
 
-	public SortedMap<String, String> getAttributes() {
+	public Map<String, String> getAttributes() {
 		return attributes;
 	}
 
diff --git a/org.argeo.slc.core/src/main/resources/org/argeo/slc/castor/msg/mapping.xml b/org.argeo.slc.core/src/main/resources/org/argeo/slc/castor/msg/mapping.xml
index 98517081c..2f54085c0 100644
--- a/org.argeo.slc.core/src/main/resources/org/argeo/slc/castor/msg/mapping.xml
+++ b/org.argeo.slc.core/src/main/resources/org/argeo/slc/castor/msg/mapping.xml
@@ -52,7 +52,7 @@
             <bind-xml auto-naming="deriveByClass" />
         </field>
         <field name="testRunDescriptor" />
-        <field name="attributes" collection="sortedmap">
+        <field name="attributes" collection="hashtable">
             <bind-xml name="attribute" location="attributes">
                 <class name="org.exolab.castor.mapping.MapItem">
                     <map-to
diff --git a/org.argeo.slc.core/src/main/resources/org/argeo/slc/castor/test/mapping.xml b/org.argeo.slc.core/src/main/resources/org/argeo/slc/castor/test/mapping.xml
index f6dfbf984..5b6384ddd 100644
--- a/org.argeo.slc.core/src/main/resources/org/argeo/slc/castor/test/mapping.xml
+++ b/org.argeo.slc.core/src/main/resources/org/argeo/slc/castor/test/mapping.xml
@@ -22,7 +22,7 @@
 			<bind-xml name="uuid" node="attribute" />
 		</field>
 		<field name="closeDate" />
-		<field name="attributes" collection="sortedmap">
+		<field name="attributes" collection="map">
 			<bind-xml name="attribute" location="attributes">
 				<class name="org.exolab.castor.mapping.MapItem">
 					<map-to