Replace Map<String, HashSet<Score>> with ScoreManager and ScoreHolder classes to...

[jabaws.git] / webservices / compbio / data / msa / SequenceAnnotation.java

diff --git a/webservices/compbio/data/msa/SequenceAnnotation.java b/webservices/compbio/data/msa/SequenceAnnotation.java
index d238d6b..c52c030 100644 (file)
--- a/webservices/compbio/data/msa/SequenceAnnotation.java
+++ b/webservices/compbio/data/msa/SequenceAnnotation.java
@@ -1,8 +1,6 @@
 package compbio.data.msa;\r
 \r
 import java.security.InvalidParameterException;\r
-import java.util.HashMap;\r
-import java.util.HashSet;\r
 import java.util.List;\r
 \r
 import javax.jws.WebMethod;\r
@@ -10,7 +8,7 @@ import javax.jws.WebParam;
 import javax.jws.WebService;\r
 \r
 import compbio.data.sequence.FastaSequence;\r
-import compbio.data.sequence.Score;\r
+import compbio.data.sequence.ScoreManager;\r
 import compbio.metadata.JobSubmissionException;\r
 import compbio.metadata.LimitExceededException;\r
 import compbio.metadata.Option;\r
@@ -194,8 +192,7 @@ public interface SequenceAnnotation<T>
         * \r
         */\r
        @WebMethod\r
-       HashMap<String, HashSet<Score>> getAnnotation(\r
-                       @WebParam(name = "jobId") String jobId)\r
+       ScoreManager getAnnotation(@WebParam(name = "jobId") String jobId)\r
                        throws ResultNotAvailableException;\r
        /*\r
         * The method should really return Map and Set, but unfortunately JAXB\r