Different code style
authorSasha Sherstnev <a.sherstnev@dundee.ac.uk>
Fri, 6 Sep 2013 15:25:23 +0000 (16:25 +0100)
committerSasha Sherstnev <a.sherstnev@dundee.ac.uk>
Fri, 6 Sep 2013 15:25:23 +0000 (16:25 +0100)
webservices/compbio/ws/server/ProbconsWS.java

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