Add elements and tags in tree test result

[gpl/argeo-slc.git] / org.argeo.slc.core / src / main / java / org / argeo / slc / core / test / tree / TreeTestResult.java

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 36233e9942a2d321cb73b39d5d86842638adb275..43a3607108ef7ba18318a888d89109293ae5cf35 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
@@ -45,7 +45,7 @@ public class TreeTestResult implements TestResult, StructureAware<TreeSPath>,
        private boolean isClosed = false;\r
 \r
        private SortedMap<TreeSPath, PartSubList> resultParts = new TreeMap<TreeSPath, PartSubList>();\r
-       private SortedMap<TreeSPath, String> pathNames = new TreeMap<TreeSPath, String>();\r
+       private SortedMap<TreeSPath, StructureElement> elements = new TreeMap<TreeSPath, StructureElement>();\r
 \r
        private StructureRegistry<TreeSPath> registry;\r
 \r
@@ -96,10 +96,14 @@ public class TreeTestResult implements TestResult, StructureAware<TreeSPath>,
                        TreeSPath path) {\r
                if (registry != null) {\r
                        for (TreeSPath p : path.getHierarchyAsList()) {\r
-                               if (!pathNames.containsKey(p)) {\r
+                               if (!elements.containsKey(p)) {\r
                                        StructureElement elem = registry.getElement(p);\r
                                        if (elem != null) {\r
-                                               pathNames.put(p, elem.getLabel());\r
+                                               // elements.put(p, elem.getLabel());\r
+                                               elements.put(p, elem);\r
+                                       } else {\r
+                                               log.warn("An element is already registered for path "\r
+                                                               + p);\r
                                        }\r
                                }\r
                        }\r
@@ -176,12 +180,12 @@ public class TreeTestResult implements TestResult, StructureAware<TreeSPath>,
                }\r
        }\r
 \r
-       public SortedMap<TreeSPath, String> getPathNames() {\r
-               return pathNames;\r
+       public SortedMap<TreeSPath, StructureElement> getElements() {\r
+               return elements;\r
        }\r
 \r
-       public void setPathNames(SortedMap<TreeSPath, String> pathNames) {\r
-               this.pathNames = pathNames;\r
+       public void setElements(SortedMap<TreeSPath, StructureElement> pathNames) {\r
+               this.elements = pathNames;\r
        }\r
 \r
 }\r