Fixes to test cases

[jabaws.git] / datamodel / compbio / data / sequence / ScoreManager.java

diff --git a/datamodel/compbio/data/sequence/ScoreManager.java b/datamodel/compbio/data/sequence/ScoreManager.java
index b0305e6..f384308 100644 (file)
--- a/datamodel/compbio/data/sequence/ScoreManager.java
+++ b/datamodel/compbio/data/sequence/ScoreManager.java
@@ -104,6 +104,35 @@ public class ScoreManager {
                }\r
                writer.flush();\r
        }\r
+       \r
+\r
+       @Override\r
+       public int hashCode() {\r
+               final int prime = 31;\r
+               int result = 1;\r
+               result = prime * result\r
+                               + ((seqScores == null) ? 0 : seqScores.hashCode());\r
+               return result;\r
+       }\r
+\r
+       @Override\r
+       public boolean equals(Object obj) {\r
+               if (this == obj)\r
+                       return true;\r
+               if (obj == null)\r
+                       return false;\r
+               if (getClass() != obj.getClass())\r
+                       return false;\r
+               ScoreManager other = (ScoreManager) obj;\r
+               if (seqScores == null) {\r
+                       if (other.seqScores != null)\r
+                               return false;\r
+               } else if (!seqScores.equals(other.seqScores))\r
+                       return false;\r
+               return true;\r
+       }\r
+\r
+\r
 \r
        @XmlAccessorType(XmlAccessType.FIELD)\r
        public static class ScoreHolder {\r
@@ -139,5 +168,39 @@ public class ScoreManager {
                public int getNumberOfScores() {\r
                        return scores.size();\r
                }\r
+\r
+               @Override\r
+               public int hashCode() {\r
+                       final int prime = 17;\r
+                       int result = 1;\r
+                       result = prime * result + ((id == null) ? 0 : id.hashCode());\r
+                       result = prime * result\r
+                                       + ((scores == null) ? 0 : scores.hashCode());\r
+                       return result;\r
+               }\r
+\r
+               @Override\r
+               public boolean equals(Object obj) {\r
+                       if (this == obj)\r
+                               return true;\r
+                       if (obj == null)\r
+                               return false;\r
+                       if (getClass() != obj.getClass())\r
+                               return false;\r
+                       ScoreHolder other = (ScoreHolder) obj;\r
+                       if (id == null) {\r
+                               if (other.id != null)\r
+                                       return false;\r
+                       } else if (!id.equals(other.id))\r
+                               return false;\r
+                       if (scores == null) {\r
+                               if (other.scores != null)\r
+                                       return false;\r
+                       } else if (!scores.equals(other.scores))\r
+                               return false;\r
+                       return true;\r
+               }\r
+               \r
+               \r
        }\r
 }\r