AAConWS further work

[jabaws.git] / runner / compbio / runner / conservation / AACon.java

diff --git a/runner/compbio/runner/conservation/AACon.java b/runner/compbio/runner/conservation/AACon.java
index f514e24..5a1d752 100644 (file)
--- a/runner/compbio/runner/conservation/AACon.java
+++ b/runner/compbio/runner/conservation/AACon.java
@@ -20,11 +20,12 @@ import java.io.FileNotFoundException;
 import java.io.IOException;\r
 import java.io.InputStream;\r
 import java.util.Arrays;\r
+import java.util.HashMap;\r
 import java.util.List;\r
-import java.util.Map;\r
 \r
 import org.apache.log4j.Logger;\r
 \r
+import compbio.conservation.Method;\r
 import compbio.engine.client.CommandBuilder;\r
 import compbio.engine.client.Executable;\r
 import compbio.engine.client.SkeletalExecutable;\r
@@ -63,10 +64,9 @@ public class AACon extends SkeletalExecutable<AACon> {
                addParameters(Arrays.asList("-jar", getLibPath(), "-d=" + STAT_FILE,\r
                                "-f=RESULT_NO_ALIGNMENT"));\r
        }\r
-\r
-       @SuppressWarnings("unchecked")\r
+       // HashMap<Method, float[]>\r
        @Override\r
-       public Map getResults(String workDirectory)\r
+       public HashMap<Method, float[]> getResults(String workDirectory)\r
                        throws ResultNotAvailableException {\r
                // MultiAnnotatedSequence<Method> annotations = null;\r
                try {\r