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 0c3eea382986d962f9af0be9d36143be5599d590..3e365afe0822c6f28b51f3f835d89189a6fd7328 100644 (file)
--- 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>();\r
        private SortedMap<TreeSPath, StructureElement> elements = new TreeMap<TreeSPath, StructureElement>();\r
 \r
-       private SortedMap<String, String> attributes = new TreeMap<String, String>();\r
+       private Map<String, String> attributes = new TreeMap<String, String>();\r
 \r
        /** Sets the list of listeners. */\r
        public void setListeners(List<TestResultListener<TreeTestResult>> listeners) {\r
@@ -204,11 +204,11 @@ public class TreeTestResult implements TestResult, StructureAware<TreeSPath>,
                }\r
        }\r
 \r
-       public SortedMap<String, String> getAttributes() {\r
+       public Map<String, String> getAttributes() {\r
                return attributes;\r
        }\r
 \r
-       public void setAttributes(SortedMap<String, String> attributes) {\r
+       public void setAttributes(Map<String, String> attributes) {\r
                this.attributes = attributes;\r
        }\r
 \r

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 e7582a869b6606ddc8e00c5699445983d97d6434..70db087908d51b4de2334356d4d6ff60e97f88bf 100644 (file)
--- 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;
 \r
 import java.util.List;\r
 import java.util.Map;\r
-import java.util.SortedMap;\r
 \r
 import org.argeo.slc.core.structure.StructureElement;\r
 import org.argeo.slc.core.structure.tree.TreeSPath;\r
@@ -19,5 +18,5 @@ public interface TreeTestResultDao extends TestResultDao<TreeTestResult> {
                        Map<TreeSPath, StructureElement> relatedElements);\r
 \r
        public void updateAttributes(String testResultId,\r
-                       SortedMap<String, String> attributes);\r
+                       Map<String, String> attributes);\r
 }\r

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 09acea56a3da2721e2412c61c05d240a173b3c7a..0b4278f34d5ff1483856320567fcc8f102841342 100644 (file)
--- 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;\r
        private Map<TreeSPath, StructureElement> relatedElements;\r
        private TestRunDescriptor testRunDescriptor;\r
-       private SortedMap<String, String> attributes;\r
+       private Map<String, String> attributes;\r
 \r
        public ResultPartRequest() {\r
 \r
@@ -92,7 +92,7 @@ public class ResultPartRequest {
                this.relatedElements = relatedElements;\r
        }\r
 \r
-       public SortedMap<String, String> getAttributes() {\r
+       public Map<String, String> getAttributes() {\r
                return attributes;\r
        }\r
 \r

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 98517081c43073c6f236606b842993ece60362b1..2f54085c01e00e8c97b2d436465b2d07a291fb53 100644 (file)
--- 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 f6dfbf984db5f5a889773601ec0dfddf7119cd32..5b6384dddac0760924a0a7863d676a59df808c4c 100644 (file)
--- 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