AAConWS is working

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

diff --git a/webservices/compbio/ws/server/AAConWS.java b/webservices/compbio/ws/server/AAConWS.java
index d65827e..27b85f3 100644 (file)
--- a/webservices/compbio/ws/server/AAConWS.java
+++ b/webservices/compbio/ws/server/AAConWS.java
@@ -2,6 +2,7 @@ package compbio.ws.server;
 \r
 import java.io.File;\r
 import java.util.Arrays;\r
+import java.util.HashSet;\r
 import java.util.List;\r
 \r
 import javax.annotation.Resource;\r
@@ -12,6 +13,7 @@ import org.apache.log4j.Logger;
 \r
 import compbio.data.msa.Annotation;\r
 import compbio.data.sequence.FastaSequence;\r
+import compbio.data.sequence.Score;\r
 import compbio.engine.AsyncExecutor;\r
 import compbio.engine.Configurator;\r
 import compbio.engine.client.ConfiguredExecutable;\r
@@ -55,18 +57,17 @@ public class AAConWS implements Annotation<AACon> {
                return Configurator.configureExecutable(aacon, sequences);\r
        }\r
 \r
-       // HashMap<Method, float[]>\r
-       @SuppressWarnings("unchecked")\r
-       public String getResult(String jobId) throws ResultNotAvailableException {\r
+       @Override\r
+       public HashSet<Score> getConservation(String jobId)\r
+                       throws ResultNotAvailableException {\r
                WSUtil.validateJobId(jobId);\r
                AsyncExecutor asyncEngine = Configurator.getAsyncEngine(jobId);\r
                ConfiguredExecutable<AACon> aacon = (ConfiguredExecutable<AACon>) asyncEngine\r
                                .getResults(jobId);\r
-               // MultiAnnotatedSequence<Method> mas = aacon.getResults();\r
-               // log(jobId, "getResults");\r
-               return "";// new HashMap<Method, float[]>();\r
+               HashSet<Score> mas = aacon.getResults();\r
+               log.info(jobId + " getConservation : " + mas);\r
+               return mas;\r
        }\r
-\r
        /*\r
         * @SuppressWarnings("unchecked") public JalviewAnnotation\r
         * getJalviewAnnotation(String jobId) throws ResultNotAvailableException {\r