X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fjws1%2FJPredClient.java;fp=src%2Fjalview%2Fws%2Fjws1%2FJPredClient.java;h=4af83f1cdab58a8fea538600830a28471e5fe02a;hb=ca9ab48d85c35112da4d9bf6273a41e734d0872b;hp=1c625fa4b7670bc1e64c17512166179486b62ffa;hpb=5d28c907a598716ca90eaa8a625420e2c0c694f0;p=jalview.git diff --git a/src/jalview/ws/jws1/JPredClient.java b/src/jalview/ws/jws1/JPredClient.java index 1c625fa..4af83f1 100644 --- a/src/jalview/ws/jws1/JPredClient.java +++ b/src/jalview/ws/jws1/JPredClient.java @@ -21,6 +21,7 @@ package jalview.ws.jws1; import jalview.analysis.AlignSeq; +import jalview.analysis.SeqsetUtils.SequenceInfo; import jalview.bin.Cache; import jalview.datamodel.AlignmentView; import jalview.datamodel.SeqCigar; @@ -34,6 +35,7 @@ import jalview.util.MessageManager; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.util.Hashtable; +import java.util.Map; import javax.swing.JMenu; import javax.swing.JMenuItem; @@ -127,8 +129,8 @@ public class JPredClient extends WS1Client aln[i] = msf[i].getSeq('-'); } - Hashtable SequenceInfo = jalview.analysis.SeqsetUtils.uniquify(aln, - true); + Map SequenceInfo = + jalview.analysis.SeqsetUtils.uniquify(aln, true); if (viewonly) { // Remove hidden regions from sequence objects. @@ -161,7 +163,7 @@ public class JPredClient extends WS1Client + (viewonly ? "visible " : "") + "sequence " + seq.getName() + " from " + title; String seqname = seq.getName(); - Hashtable SequenceInfo = jalview.analysis.SeqsetUtils + SequenceInfo SequenceInfo = jalview.analysis.SeqsetUtils .SeqCharacterHash(seq); if (viewonly) { @@ -249,8 +251,8 @@ public class JPredClient extends WS1Client aln[i] = new jalview.datamodel.Sequence(msf[i]); } - Hashtable SequenceInfo = jalview.analysis.SeqsetUtils.uniquify(aln, - true); + Map SequenceInfo = + jalview.analysis.SeqsetUtils.uniquify(aln, true); Jpred server = locateWebService(); if (server == null) @@ -278,7 +280,7 @@ public class JPredClient extends WS1Client String altitle = "JPred prediction for sequence " + seq.getName() + " from " + title; - Hashtable SequenceInfo = jalview.analysis.SeqsetUtils + SequenceInfo SequenceInfo = jalview.analysis.SeqsetUtils .SeqCharacterHash(seq); Jpred server = locateWebService();