Reverted some changes I made for testing back to their original states.

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

diff --git a/webservices/compbio/ws/server/WSUtil.java b/webservices/compbio/ws/server/WSUtil.java
index a3f96d8..e80b1e5 100644 (file)
--- a/webservices/compbio/ws/server/WSUtil.java
+++ b/webservices/compbio/ws/server/WSUtil.java
@@ -27,7 +27,6 @@ import org.apache.log4j.Logger;
 \r
 import compbio.data.sequence.Alignment;\r
 import compbio.data.sequence.FastaSequence;\r
-import compbio.data.sequence.RNAStructScoreManager;\r
 import compbio.data.sequence.ScoreManager;\r
 import compbio.engine.AsyncExecutor;\r
 import compbio.engine.Configurator;\r
@@ -209,9 +208,7 @@ public final class WSUtil {
                }\r
        }\r
 \r
-       // test\r
-       // set return type back to ScoreManager\r
-       public static <T> RNAStructScoreManager getAnnotation(String jobId, Logger log)\r
+       public static <T> ScoreManager getAnnotation(String jobId, Logger log)\r
                        throws ResultNotAvailableException {\r
                WSUtil.validateJobId(jobId);\r
                AsyncExecutor asyncEngine = Configurator.getAsyncEngine(jobId);\r
@@ -219,10 +216,7 @@ public final class WSUtil {
                                .getResults(jobId);\r
                \r
                \r
-               // test RNAalifold\r
-//             ScoreManager mas = aacon.getResults();\r
-               \r
-               RNAStructScoreManager mas = aacon.getResults();\r
+               ScoreManager mas = aacon.getResults();\r
                \r
                log.trace(jobId + " getConservation : " + mas);\r
                return mas;\r