import jalview.analysis.*;\r
import jalview.datamodel.*;\r
import jalview.gui.*;\r
+import jalview.io.FormatAdapter;\r
\r
public class JPredClient\r
extends WSClient\r
"Timed out when communicating with server\nTry again later.\n"));\r
}\r
if (result.getState()==0)\r
- jalview.bin.Jalview.log.debug("Finished "+jobId);\r
+ jalview.bin.Cache.log.debug("Finished "+jobId);\r
if (result.isRunning())\r
{\r
wsInfo.setStatus(WebserviceInfo.STATE_RUNNING);\r
}\r
catch (Exception e)\r
{\r
- wsInfo.setStatus(WebserviceInfo.STATE_STOPPED_SERVERERROR);\r
+ if (e.getMessage().indexOf("Exception")>-1) {\r
+ wsInfo.setStatus(WebserviceInfo.STATE_STOPPED_SERVERERROR);\r
+ wsInfo.setProgressText(\r
+ "Failed to submit the prediction. (Just close the window)\n"\r
+ +\r
+ "It is most likely that there is a problem with the server.\n");\r
+ System.err.println(\r
+ "JPredWS Client: Failed to submit the prediction. Quite possibly because of a server error - see below)\n" +\r
+ e.getMessage() + "\n");\r
+\r
+ jalview.bin.Cache.log.warn("Server Exception",e);\r
+ } else {\r
+ wsInfo.setStatus(WebserviceInfo.STATE_STOPPED_ERROR);\r
+ // JBPNote - this could be a popup informing the user of the problem.\r
+ wsInfo.setProgressText("Failed to submit the prediction:\n"\r
+ +e.getMessage()+\r
+ wsInfo.getProgressText());\r
+\r
+ jalview.bin.Cache.log.debug("Failed Submission",e);\r
+\r
+ }\r
allowedServerExceptions = -1;\r
jobComplete = true;\r
\r
- wsInfo.setProgressText("Failed to submit the prediction. (Just close the window)\n"\r
- + ((e.getMessage().indexOf("Exception")>-1) ? (\r
- "It is most likely that there is a problem with the server.\n")\r
- : e.getMessage())\r
- +wsInfo.getProgressText());\r
- System.err.println(\r
- "JPredWS Client: Failed to submit the prediction (Possibly a server error - see below)\n" +\r
- e.getMessage() + "\n");\r
-\r
- jalview.bin.Jalview.log.debug("Failed Submission",e);\r
}\r
}\r
\r
\r
try\r
{\r
- jalview.bin.Jalview.log.debug("Parsing output from JNet job.");\r
+ jalview.bin.Cache.log.debug("Parsing output from JNet job.");\r
// JPredFile prediction = new JPredFile("C:/JalviewX/files/jpred.txt", "File");\r
jalview.io.JPredFile prediction = new jalview.io.JPredFile(result.\r
getPredfile(),\r
"Paste");\r
SequenceI[] preds = prediction.getSeqsAsArray();\r
- jalview.bin.Jalview.log.debug("Got prediction profile.");\r
+ jalview.bin.Cache.log.debug("Got prediction profile.");\r
Alignment al;\r
int FirstSeq; // the position of the query sequence in Alignment al\r
boolean noMsa = true; // set if no MSA has been returned by JPred\r
\r
if ( (this.msa != null) && (result.getAligfile() != null))\r
{\r
- jalview.bin.Jalview.log.debug("Getting associated alignment.");\r
+ jalview.bin.Cache.log.debug("Getting associated alignment.");\r
// we ignore the returned alignment if we only predicted on a single sequence\r
String format = jalview.io.IdentifyFile.Identify(result.getAligfile(),\r
"Paste");\r
\r
if (jalview.io.FormatAdapter.formats.contains(format))\r
{\r
- al = new Alignment(jalview.io.FormatAdapter.readFile(\r
+ al = new Alignment(new FormatAdapter().readFile(\r
result.getAligfile(), "Paste", format));\r
for (int i=0, j=al.getHeight(); i<j; i++) {\r
SequenceI sq = al.getSequenceAt(i);\r
*/\r
\r
wsInfo.setProgressText(OutputHeader);\r
- jalview.bin.Jalview.log.debug("Finished parsing output.");\r
+ jalview.bin.Cache.log.debug("Finished parsing output.");\r
AlignFrame af = new AlignFrame(al);\r
\r
Desktop.addInternalFrame(af, altitle,\r
}\r
catch (Exception ex)\r
{\r
- jalview.bin.Jalview.log.warn("Exception whilst parsing JNet style secondary structure prediction.");\r
- jalview.bin.Jalview.log.debug("Exception: ",ex);\r
+ jalview.bin.Cache.log.warn("Exception whilst parsing JNet style secondary structure prediction.");\r
+ jalview.bin.Cache.log.debug("Exception: ",ex);\r
}\r
}\r
}\r