X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fjws1%2FSeqSearchWSClient.java;fp=src%2Fjalview%2Fws%2Fjws1%2FSeqSearchWSClient.java;h=53338d314b6ea11c5026e7518230c64256d70f8a;hb=be762d8d9c71a7aa3121e845c45911c7192b7827;hp=92d17e869cc9604f4d0c22ffc5da65d27757cdd0;hpb=d1bb7a31fc091606aedbc255a5766ac79e36fa91;p=jalview.git diff --git a/src/jalview/ws/jws1/SeqSearchWSClient.java b/src/jalview/ws/jws1/SeqSearchWSClient.java index 92d17e8..53338d3 100644 --- a/src/jalview/ws/jws1/SeqSearchWSClient.java +++ b/src/jalview/ws/jws1/SeqSearchWSClient.java @@ -84,11 +84,12 @@ public class SeqSearchWSClient extends WS1Client // name to service client name if (!sh.getAbstractName().equals(this.getServiceActionKey())) { - JvOptionPane.showMessageDialog(Desktop.desktop, MessageManager - .formatMessage( + JvOptionPane.showMessageDialog(Desktop.desktop, + MessageManager.formatMessage( "label.service_called_is_not_seq_search_service", - new String[] { sh.getName() }), MessageManager - .getString("label.internal_jalview_error"), + new String[] + { sh.getName() }), + MessageManager.getString("label.internal_jalview_error"), JvOptionPane.WARNING_MESSAGE); return; @@ -96,10 +97,11 @@ public class SeqSearchWSClient extends WS1Client if ((wsInfo = setWebService(sh)) == null) { - JvOptionPane.showMessageDialog(Desktop.desktop, MessageManager - .formatMessage("label.seq_search_service_is_unknown", - new String[] { sh.getName() }), MessageManager - .getString("label.internal_jalview_error"), + JvOptionPane.showMessageDialog(Desktop.desktop, + MessageManager.formatMessage( + "label.seq_search_service_is_unknown", new String[] + { sh.getName() }), + MessageManager.getString("label.internal_jalview_error"), JvOptionPane.WARNING_MESSAGE); return; @@ -138,20 +140,21 @@ public class SeqSearchWSClient extends WS1Client // sequence db boolean profileSearch = msa.getSequences().length > 2 ? true : false; // single sequence or profile from alignment view - wsInfo.setProgressText("Searching " - + visdb - + (!profileSearch ? " with sequence " - + msa.getSequences()[0].getRefSeq().getName() - : " with profile") + " from " + altitle - + "\nJob details\n"); + wsInfo.setProgressText("Searching " + visdb + + (!profileSearch + ? " with sequence " + + msa.getSequences()[0].getRefSeq().getName() + : " with profile") + + " from " + altitle + "\nJob details\n"); String jobtitle = WebServiceName + ((WebServiceName.indexOf("earch") > -1) ? " " : " search ") - + " of " - + visdb - + (!profileSearch ? " with sequence " - + msa.getSequences()[0].getRefSeq().getName() - : " with profile") + " from " + altitle; + + " of " + visdb + + (!profileSearch + ? " with sequence " + + msa.getSequences()[0].getRefSeq().getName() + : " with profile") + + " from " + altitle; SeqSearchWSThread ssthread = new SeqSearchWSThread(server, WsURL, wsInfo, alignFrame, WebServiceName, jobtitle, msa, db, seqdataset); @@ -220,8 +223,8 @@ public class SeqSearchWSClient extends WS1Client if (!locateWebService()) { throw new Exception(MessageManager.formatMessage( - "exception.cannot_contact_service_endpoint_at", - new String[] { WsURL })); + "exception.cannot_contact_service_endpoint_at", new String[] + { WsURL })); } String database = server.getDatabase(); if (database == null) @@ -257,8 +260,8 @@ public class SeqSearchWSClient extends WS1Client JMenu defmenu = (JMenu) dbsrchs.get("Default Database"); if (defmenu == null) { - dbsrchs.put("Default Database", defmenu = new JMenu( - "Default Database")); + dbsrchs.put("Default Database", + defmenu = new JMenu("Default Database")); newdbsrch.addElement(defmenu); } @@ -271,7 +274,8 @@ public class SeqSearchWSClient extends WS1Client { jalview.bin.Cache.log.warn( "Database list request failed, so disabling SeqSearch Service client " - + sh.getName() + " at " + sh.getEndpointURL(), e); + + sh.getName() + " at " + sh.getEndpointURL(), + e); return; } JMenuItem method;