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

[jabaws.git] / webservices / compbio / ws / server / JronnWS.java

diff --git a/webservices/compbio/ws/server/JronnWS.java b/webservices/compbio/ws/server/JronnWS.java
index 13fe708..e9070d5 100644 (file)
--- a/webservices/compbio/ws/server/JronnWS.java
+++ b/webservices/compbio/ws/server/JronnWS.java
@@ -1,8 +1,6 @@
 package compbio.ws.server;\r
 \r
 import java.io.File;\r
-import java.util.HashMap;\r
-import java.util.HashSet;\r
 import java.util.List;\r
 \r
 import javax.annotation.Resource;\r
@@ -13,7 +11,7 @@ import org.apache.log4j.Logger;
 \r
 import compbio.data.msa.SequenceAnnotation;\r
 import compbio.data.sequence.FastaSequence;\r
-import compbio.data.sequence.Score;\r
+import compbio.data.sequence.ScoreManager;\r
 import compbio.engine.AsyncExecutor;\r
 import compbio.engine.Configurator;\r
 import compbio.engine.client.ConfiguredExecutable;\r
@@ -59,13 +57,13 @@ public class JronnWS implements SequenceAnnotation<Jronn> {
        }\r
 \r
        @Override\r
-       public HashMap<String, HashSet<Score>> getAnnotation(String jobId)\r
+       public ScoreManager getAnnotation(String jobId)\r
                        throws ResultNotAvailableException {\r
                WSUtil.validateJobId(jobId);\r
                AsyncExecutor asyncEngine = Configurator.getAsyncEngine(jobId);\r
                ConfiguredExecutable<Jronn> jronn = (ConfiguredExecutable<Jronn>) asyncEngine\r
                                .getResults(jobId);\r
-               HashMap<String, HashSet<Score>> mas = jronn.getResults();\r
+               ScoreManager mas = jronn.getResults();\r
                log.trace(jobId + " getConservation : " + mas);\r
                return mas;\r
        }\r