X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fws%2Fjws2%2FAbstractJabaCalcWorker.java;h=b33df0cc5c8f2d51dd8e38493216803155ddf7ad;hb=163ed5b997bbda48e4cdd950e87a8fe01baae7fb;hp=a7cc5b630ec120aab32c6277824de962a2b61109;hpb=2b8cf92a2483d206d9e574bbe8306ad845a308d8;p=jalview.git
diff --git a/src/jalview/ws/jws2/AbstractJabaCalcWorker.java b/src/jalview/ws/jws2/AbstractJabaCalcWorker.java
index a7cc5b6..b33df0c 100644
--- a/src/jalview/ws/jws2/AbstractJabaCalcWorker.java
+++ b/src/jalview/ws/jws2/AbstractJabaCalcWorker.java
@@ -1,3 +1,23 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ *
+ * This file is part of Jalview.
+ *
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *
+ * Jalview is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
package jalview.ws.jws2;
import jalview.analysis.AlignSeq;
@@ -311,23 +331,23 @@ public abstract class AbstractJabaCalcWorker extends AlignCalcWorker
System.err.println("submission error with " + getServiceActionText()
+ " :");
x.printStackTrace();
- calcMan.workerCannotRun(this);
+ calcMan.disableWorker(this);
} catch (ResultNotAvailableException x)
{
System.err.println("collection error:\nJob ID: " + rslt);
x.printStackTrace();
- calcMan.workerCannotRun(this);
+ calcMan.disableWorker(this);
} catch (OutOfMemoryError error)
{
- calcMan.workerCannotRun(this);
+ calcMan.disableWorker(this);
// consensus = null;
// hconsensus = null;
ap.raiseOOMWarning(getServiceActionText(), error);
} catch (Exception x)
{
- calcMan.workerCannotRun(this);
+ calcMan.disableWorker(this);
// consensus = null;
// hconsensus = null;
@@ -364,11 +384,13 @@ public abstract class AbstractJabaCalcWorker extends AlignCalcWorker
/**
* validate input for dynamic/non-dynamic update context
+ *
* @param dynamic
* @param seqs
* @return true if input is valid
*/
- abstract boolean checkValidInputSeqs(boolean dynamic, List seqs);
+ abstract boolean checkValidInputSeqs(boolean dynamic,
+ List seqs);
abstract String submitToService(
List seqs)
@@ -390,11 +412,11 @@ public abstract class AbstractJabaCalcWorker extends AlignCalcWorker
String id = rslt;
if (cancelJob(rslt))
{
- System.err.println("Cancelled job "+id);
+ System.err.println("Cancelled job " + id);
}
- else
+ else
{
- System.err.println("Job "+id+" couldn't be cancelled.");
+ System.err.println("Job " + id + " couldn't be cancelled.");
}
} catch (Exception q)
{