X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fjws1%2FJPredClient.java;h=076d71e13dc3020767457b28015272ee6f14f669;hb=49db0dff1da16c3355b43a41498c1fc93ef47e91;hp=2b133a7938871ea81bfb18348a2aef4f927e07fd;hpb=304e64fb34b32659be1bbfd39fb4e15b2f79586e;p=jalview.git diff --git a/src/jalview/ws/jws1/JPredClient.java b/src/jalview/ws/jws1/JPredClient.java index 2b133a7..076d71e 100644 --- a/src/jalview/ws/jws1/JPredClient.java +++ b/src/jalview/ws/jws1/JPredClient.java @@ -23,6 +23,7 @@ package jalview.ws.jws1; import java.util.Locale; import jalview.analysis.AlignSeq; +import jalview.analysis.SeqsetUtils.SequenceInfo; import jalview.bin.Cache; import jalview.datamodel.AlignmentView; import jalview.datamodel.SeqCigar; @@ -36,6 +37,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; @@ -129,8 +131,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. @@ -163,7 +165,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) { @@ -251,8 +253,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) @@ -280,7 +282,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();