import org.argeo.slc.SlcException;\r
import org.argeo.slc.core.attachment.Attachment;\r
import org.argeo.slc.core.attachment.AttachmentsEnabled;\r
+import org.argeo.slc.core.attachment.SimpleAttachment;\r
import org.argeo.slc.core.structure.tree.TreeSPath;\r
import org.argeo.slc.structure.StructureAware;\r
import org.argeo.slc.structure.StructureElement;\r
\r
private SortedMap<TreeSPath, PartSubList> resultParts = new TreeMap<TreeSPath, PartSubList>();\r
private SortedMap<TreeSPath, StructureElement> elements = new TreeMap<TreeSPath, StructureElement>();\r
- private List<Attachment> attachments = new ArrayList<Attachment>();\r
+ private List<SimpleAttachment> attachments = new ArrayList<SimpleAttachment>();\r
\r
private Map<String, String> attributes = new TreeMap<String, String>();\r
\r
public int compareTo(TreeTestResult ttr2) {\r
TreeTestResult ttr1 = this;\r
if (ttr1.getCloseDate() != null && ttr2.getCloseDate() != null) {\r
- return -ttr1.getCloseDate().compareTo(ttr2.getCloseDate());\r
+ if (ttr1.getCloseDate().equals(ttr2.getCloseDate()))\r
+ return compareUuid(ttr1, ttr2);\r
+ else\r
+ return -ttr1.getCloseDate().compareTo(ttr2.getCloseDate());\r
} else if (ttr1.getCloseDate() != null && ttr2.getCloseDate() == null) {\r
return 1;\r
} else if (ttr1.getCloseDate() == null && ttr2.getCloseDate() != null) {\r
return -1;\r
} else {\r
+ return compareUuid(ttr1, ttr2);\r
+ }\r
+ }\r
+\r
+ protected int compareUuid(TestResult ttr1, TestResult ttr2) {\r
+ if (ttr1.getUuid() == null || ttr2.getUuid() == null)\r
+ throw new SlcException(\r
+ "Cannot compare tree test result with null uuid");\r
+ else {\r
+ if (ttr1.getUuid().equals(ttr2.getUuid()))\r
+ return 0;\r
return ttr1.getUuid().compareTo(ttr2.getUuid());\r
}\r
}\r
\r
+ public boolean equals(Object obj) {\r
+ if (obj instanceof TestResult)\r
+ return compareUuid(this, ((TestResult) obj)) == 0;\r
+ else\r
+ return false;\r
+ }\r
+\r
+ public int hashCode() {\r
+ if (uuid != null)\r
+ return uuid.hashCode();\r
+ else\r
+ return super.hashCode();\r
+ }\r
+\r
public Map<String, String> getAttributes() {\r
return attributes;\r
}\r
this.warnIfAlreadyClosed = warnIfAlreadyClosed;\r
}\r
\r
- public List<Attachment> getAttachments() {\r
+ public List<SimpleAttachment> getAttachments() {\r
return attachments;\r
}\r
\r
- public void setAttachments(List<Attachment> attachments) {\r
+ public void setAttachments(List<SimpleAttachment> attachments) {\r
this.attachments = attachments;\r
}\r
\r
public void addAttachment(Attachment attachment) {\r
- attachments.add(attachment);\r
+ attachments.add((SimpleAttachment) attachment);\r
synchronized (listeners) {\r
for (TestResultListener<TreeTestResult> listener : listeners) {\r
if (listener instanceof TreeTestResultListener)\r