From: Sasha Sherstnev <a.sherstnev@dundee.ac.uk>
Date: Fri, 6 Sep 2013 15:25:23 +0000 (+0100)
Subject: Different code style
X-Git-Url: http://source.jalview.org/gitweb/?p=jabaws.git;a=commitdiff_plain;h=a3accd78d0649772c6692f159d0ec712d4f86708

Different code style
---

diff --git a/webservices/compbio/ws/server/ProbconsWS.java b/webservices/compbio/ws/server/ProbconsWS.java
index 71f4730..d4fa3df 100644
--- a/webservices/compbio/ws/server/ProbconsWS.java
+++ b/webservices/compbio/ws/server/ProbconsWS.java
@@ -52,27 +52,23 @@ public class ProbconsWS implements MsaWS<Probcons> {
 
 	private static Logger log = Logger.getLogger(ProbconsWS.class);
 
-	private static final RunnerConfig<Probcons> probconsOptions = Util
-			.getSupportedOptions(Probcons.class);
-
-	private static final LimitsManager<Probcons> limitMan = compbio.engine.client.Util
-			.getLimits(new Probcons().getType());
+	private static final RunnerConfig<Probcons> probconsOptions = Util.getSupportedOptions(Probcons.class);
+	private static final LimitsManager<Probcons> limitMan = compbio.engine.client.Util.getLimits(new Probcons().getType());
 
 	@Override
 	public String align(List<FastaSequence> sequences)
 			throws JobSubmissionException {
 		WSUtil.validateFastaInput(sequences);
 		ConfiguredExecutable<Probcons> confProbcons = init(sequences);
-		return WSUtil
-				.align(sequences, confProbcons, log, "align", getLimit(""));
+		return WSUtil.align(sequences, confProbcons, log, "align", getLimit(""));
 	}
 
 	ConfiguredExecutable<Probcons> init(List<FastaSequence> dataSet)
 			throws JobSubmissionException {
 		Probcons probcons = new Probcons();
-		probcons.setInput(SkeletalExecutable.INPUT)
-				.setOutput(SkeletalExecutable.OUTPUT)
-				.setError(SkeletalExecutable.ERROR);
+		probcons.setInput(SkeletalExecutable.INPUT);
+		probcons.setOutput(SkeletalExecutable.OUTPUT);
+		probcons.setError(SkeletalExecutable.ERROR);
 		return Configurator.configureExecutable(probcons, dataSet);
 	}
 
@@ -82,12 +78,10 @@ public class ProbconsWS implements MsaWS<Probcons> {
 			WrongParameterException {
 		WSUtil.validateFastaInput(sequences);
 		ConfiguredExecutable<Probcons> confProbcons = init(sequences);
-		List<String> params = WSUtil.getCommands(options,
-				Probcons.KEY_VALUE_SEPARATOR);
+		List<String> params = WSUtil.getCommands(options, Probcons.KEY_VALUE_SEPARATOR);
 		log.info("Setting parameters:" + params);
 		confProbcons.addParameters(params);
-		return WSUtil.align(sequences, confProbcons, log, "customAlign",
-				getLimit(""));
+		return WSUtil.align(sequences, confProbcons, log, "customAlign",getLimit(""));
 	}
 
 	@Override
@@ -109,8 +103,7 @@ public class ProbconsWS implements MsaWS<Probcons> {
 	public Alignment getResult(String jobId) throws ResultNotAvailableException {
 		WSUtil.validateJobId(jobId);
 		AsyncExecutor asyncEngine = Configurator.getAsyncEngine(jobId);
-		ConfiguredExecutable<Probcons> probcons = (ConfiguredExecutable<Probcons>) asyncEngine
-				.getResults(jobId);
+		ConfiguredExecutable<Probcons> probcons = (ConfiguredExecutable<Probcons>) asyncEngine.getResults(jobId);
 		Alignment al = probcons.getResults();
 		// log(jobId, "getResults");
 		return al;
@@ -134,8 +127,7 @@ public class ProbconsWS implements MsaWS<Probcons> {
 	public ChunkHolder pullExecStatistics(String jobId, long position) {
 		WSUtil.validateJobId(jobId);
 		// TODO check if output is the one to return
-		String file = Configurator.getWorkDirectory(jobId) + File.separator
-				+ new Probcons().getError();
+		String file = Configurator.getWorkDirectory(jobId) + File.separator + new Probcons().getError();
 		return WSUtil.pullFile(file, position);
 	}