X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=webservices%2Fcompbio%2Fws%2Fserver%2FDisemblWS.java;h=2eac30d61f6c34bd22956cd7cadc98ffb1f5ad41;hb=3644426ec0e9e9ceb798bd426085d8d9dd8dbb56;hp=00f3f697b381586e83478b7a1da8da614f50bba7;hpb=a17f3c38045ca4509dc891722ea98143005119f6;p=jabaws.git

diff --git a/webservices/compbio/ws/server/DisemblWS.java b/webservices/compbio/ws/server/DisemblWS.java
index 00f3f69..2eac30d 100644
--- a/webservices/compbio/ws/server/DisemblWS.java
+++ b/webservices/compbio/ws/server/DisemblWS.java
@@ -1,7 +1,5 @@
 package compbio.ws.server;
 
-import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 
 import javax.annotation.Resource;
@@ -12,7 +10,7 @@ import org.apache.log4j.Logger;
 
 import compbio.data.msa.SequenceAnnotation;
 import compbio.data.sequence.FastaSequence;
-import compbio.data.sequence.Score;
+import compbio.data.sequence.ScoreManager;
 import compbio.engine.AsyncExecutor;
 import compbio.engine.Configurator;
 import compbio.engine.client.ConfiguredExecutable;
@@ -57,14 +55,14 @@ public class DisemblWS implements SequenceAnnotation<Disembl> {
 	}
 
 	@Override
-	public HashMap<String, HashSet<Score>> getAnnotation(String jobId)
+	public ScoreManager getAnnotation(String jobId)
 			throws ResultNotAvailableException {
 		WSUtil.validateJobId(jobId);
 		AsyncExecutor asyncEngine = Configurator.getAsyncEngine(jobId);
-		ConfiguredExecutable<Disembl> aacon = (ConfiguredExecutable<Disembl>) asyncEngine
+		ConfiguredExecutable<Disembl> disembl = (ConfiguredExecutable<Disembl>) asyncEngine
 				.getResults(jobId);
-		HashMap<String, HashSet<Score>> mas = aacon.getResults();
-		log.trace(jobId + " getConservation : " + mas);
+		ScoreManager mas = disembl.getResults();
+		log.trace(jobId + " getDisorder : " + mas);
 		return mas;
 	}