Fixes to test cases

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

diff --git a/webservices/compbio/ws/server/DisemblWS.java b/webservices/compbio/ws/server/DisemblWS.java
index 00f3f69..2eac30d 100644 (file)
--- a/webservices/compbio/ws/server/DisemblWS.java
+++ b/webservices/compbio/ws/server/DisemblWS.java
@@ -1,7 +1,5 @@
 package compbio.ws.server;\r
 \r
-import java.util.HashMap;\r
-import java.util.HashSet;\r
 import java.util.List;\r
 \r
 import javax.annotation.Resource;\r
@@ -12,7 +10,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
@@ -57,14 +55,14 @@ public class DisemblWS implements SequenceAnnotation<Disembl> {
        }\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<Disembl> aacon = (ConfiguredExecutable<Disembl>) asyncEngine\r
+               ConfiguredExecutable<Disembl> disembl = (ConfiguredExecutable<Disembl>) asyncEngine\r
                                .getResults(jobId);\r
-               HashMap<String, HashSet<Score>> mas = aacon.getResults();\r
-               log.trace(jobId + " getConservation : " + mas);\r
+               ScoreManager mas = disembl.getResults();\r
+               log.trace(jobId + " getDisorder : " + mas);\r
                return mas;\r
        }\r
 \r