Merge branch 'develop' into update_212_Dec_merge_with_21125_chamges

[jalview.git] / src / jalview / hmmer / HmmerCommand.java

diff --git a/src/jalview/hmmer/HmmerCommand.java b/src/jalview/hmmer/HmmerCommand.java
index 0240352..9db0ae1 100644 (file)
--- a/src/jalview/hmmer/HmmerCommand.java
+++ b/src/jalview/hmmer/HmmerCommand.java
@@ -1,7 +1,9 @@
 package jalview.hmmer;
 
 import jalview.analysis.SeqsetUtils;
+import jalview.analysis.SeqsetUtils.SequenceInfo;
 import jalview.bin.Cache;
+import jalview.bin.Console;
 import jalview.datamodel.Alignment;
 import jalview.datamodel.AlignmentAnnotation;
 import jalview.datamodel.AlignmentI;
@@ -30,6 +32,7 @@ import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Hashtable;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Base class for hmmbuild, hmmalign and hmmsearch
@@ -127,7 +130,7 @@ public abstract class HmmerCommand implements Runnable
    * 
    * @param seqs
    */
-  protected Hashtable stashSequences(SequenceI[] seqs)
+  protected Map<String, SequenceInfo> stashSequences(SequenceI[] seqs)
   {
     return SeqsetUtils.uniquify(seqs, true);
   }
@@ -135,12 +138,12 @@ public abstract class HmmerCommand implements Runnable
   /**
    * Restores the sequence data lost by uniquifying
    * 
-   * @param hashtable
+   * @param sequencesHash
    * @param seqs
    */
-  protected void recoverSequences(Hashtable hashtable, SequenceI[] seqs)
+  protected void recoverSequences(Map<String, SequenceInfo> sequencesHash, SequenceI[] seqs)
   {
-    SeqsetUtils.deuniquify(hashtable, seqs);
+    SeqsetUtils.deuniquify(sequencesHash, seqs);
   }
 
   /**
@@ -194,8 +197,8 @@ public abstract class HmmerCommand implements Runnable
       int exitValue = p.exitValue();
       if (exitValue != 0)
       {
-        Cache.log.error("Command failed, return code = " + exitValue);
-        Cache.log.error("Command/args were: " + args.toString());
+        Console.error("Command failed, return code = " + exitValue);
+        Console.error("Command/args were: " + args.toString());
       }
       return exitValue == 0; // 0 is success, by convention
     } catch (Exception e)
@@ -218,7 +221,7 @@ public abstract class HmmerCommand implements Runnable
             Cache.getProperty(Preferences.CYGWIN_PATH));
     if (bash == null)
     {
-      Cache.log.error("Cygwin shell not found");
+      Console.error("Cygwin shell not found");
       return commands;
     }