X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fjws1%2FJPredClient.java;h=65847e6db6a06e2d9f80ed70fde474f5c8997295;hb=4decc3e365ce990f54773d24bb9583df48d2797a;hp=38226dcf2fc1c672d8c28d94e16327fe942bfadd;hpb=c19d2a91ca05e052e3408bf5852d88eb5d0608f1;p=jalview.git diff --git a/src/jalview/ws/jws1/JPredClient.java b/src/jalview/ws/jws1/JPredClient.java index 38226dc..65847e6 100644 --- a/src/jalview/ws/jws1/JPredClient.java +++ b/src/jalview/ws/jws1/JPredClient.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2) - * Copyright (C) 2015 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * * This file is part of Jalview. * @@ -27,6 +27,7 @@ import jalview.datamodel.SeqCigar; import jalview.datamodel.SequenceI; import jalview.gui.AlignFrame; import jalview.gui.Desktop; +import jalview.gui.JvOptionPane; import jalview.gui.WebserviceInfo; import jalview.util.MessageManager; @@ -36,7 +37,6 @@ import java.util.Hashtable; import javax.swing.JMenu; import javax.swing.JMenuItem; -import javax.swing.JOptionPane; import ext.vamsas.Jpred; import ext.vamsas.JpredServiceLocator; @@ -238,7 +238,7 @@ public class JPredClient extends WS1Client SequenceI seq = msf[0]; - String altitle = "JNet prediction on " + seq.getName() + String altitle = "JPred prediction on " + seq.getName() + " using alignment from " + title; wsInfo.setProgressText("Job details for MSA based prediction (" + title @@ -275,7 +275,7 @@ public class JPredClient extends WS1Client wsInfo.setProgressText("Job details for prediction on sequence :\n>" + seq.getName() + "\n" + AlignSeq.extractGaps("-. ", seq.getSequenceAsString()) + "\n"); - String altitle = "JNet prediction for sequence " + seq.getName() + String altitle = "JPred prediction for sequence " + seq.getName() + " from " + title; Hashtable SequenceInfo = jalview.analysis.SeqsetUtils @@ -323,7 +323,7 @@ public class JPredClient extends WS1Client } catch (Exception ex) { - JOptionPane + JvOptionPane .showMessageDialog( Desktop.desktop, MessageManager @@ -332,7 +332,7 @@ public class JPredClient extends WS1Client new String[] { WebServiceName, WsURL }), MessageManager .getString("label.internal_jalview_error"), - JOptionPane.WARNING_MESSAGE); + JvOptionPane.WARNING_MESSAGE); wsInfo.setProgressText(MessageManager .formatMessage( "label.secondary_structure_prediction_service_couldnt_be_located", @@ -345,6 +345,7 @@ public class JPredClient extends WS1Client return server; } + @Override public void attachWSMenuEntry(JMenu wsmenu, final ServiceHandle sh, final AlignFrame af) { @@ -352,6 +353,7 @@ public class JPredClient extends WS1Client method.setToolTipText(sh.getEndpointURL()); method.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { AlignmentView msa = af.gatherSeqOrMsaForSecStrPrediction();