From 251802657b8b7b557c9e40cd8df522528cec8c21 Mon Sep 17 00:00:00 2001
From: Sasha Sherstnev <a.sherstnev@dundee.ac.uk>
Date: Tue, 30 Jul 2013 11:03:08 +0100
Subject: [PATCH] change code style

---
 testsrc/compbio/metadata/AllTestSuit.java     |   58 +++++++++----------------
 testsrc/compbio/ws/client/WSTesterTester.java |    3 --
 2 files changed, 20 insertions(+), 41 deletions(-)

diff --git a/testsrc/compbio/metadata/AllTestSuit.java b/testsrc/compbio/metadata/AllTestSuit.java
index 92f1748..3cef5ef 100644
--- a/testsrc/compbio/metadata/AllTestSuit.java
+++ b/testsrc/compbio/metadata/AllTestSuit.java
@@ -28,26 +28,17 @@ import compbio.util.SysPrefs;
 
 public class AllTestSuit {
 
-	public static final PresetManager<ClustalW> CLUSTAL_PRESETS = Util
-			.getPresets(ClustalW.class);
-	public static final RunnerConfig<ClustalW> CLUSTAL_PARAMETERS = Util
-			.getSupportedOptions(ClustalW.class);
-	public static final LimitsManager<ClustalW> CLUSTAL_LIMITS = compbio.engine.client.Util
-			.getLimits(new ClustalW().getType());
-
-	public static final PresetManager<Tcoffee> TCOFFEE_PRESETS = Util
-			.getPresets(Tcoffee.class);
-	public static final RunnerConfig<Tcoffee> TCOFFEE_PARAMETERS = Util
-			.getSupportedOptions(Tcoffee.class);
-	public static final LimitsManager<Tcoffee> TCOFFEE_LIMITS = compbio.engine.client.Util
-			.getLimits(new Tcoffee().getType());
-
-	public static final PresetManager<Muscle> MUSCLE_PRESETS = Util
-			.getPresets(Muscle.class);
-	public static final RunnerConfig<Muscle> MUSCLE_PARAMETERS = Util
-			.getSupportedOptions(Muscle.class);
-	public static final LimitsManager<Muscle> MUSCLE_LIMITS = compbio.engine.client.Util
-			.getLimits(new Muscle().getType());
+	public static final PresetManager<ClustalW> CLUSTAL_PRESETS = Util.getPresets(ClustalW.class);
+	public static final RunnerConfig<ClustalW> CLUSTAL_PARAMETERS = Util.getSupportedOptions(ClustalW.class);
+	public static final LimitsManager<ClustalW> CLUSTAL_LIMITS = compbio.engine.client.Util.getLimits(new ClustalW().getType());
+
+	public static final PresetManager<Tcoffee> TCOFFEE_PRESETS = Util.getPresets(Tcoffee.class);
+	public static final RunnerConfig<Tcoffee> TCOFFEE_PARAMETERS = Util.getSupportedOptions(Tcoffee.class);
+	public static final LimitsManager<Tcoffee> TCOFFEE_LIMITS = compbio.engine.client.Util.getLimits(new Tcoffee().getType());
+
+	public static final PresetManager<Muscle> MUSCLE_PRESETS = Util.getPresets(Muscle.class);
+	public static final RunnerConfig<Muscle> MUSCLE_PARAMETERS = Util.getSupportedOptions(Muscle.class);
+	public static final LimitsManager<Muscle> MUSCLE_LIMITS = compbio.engine.client.Util.getLimits(new Muscle().getType());
 
 	public final static String test_group_cluster = "cluster";
 	public final static String test_group_runner = "runner";
@@ -60,35 +51,26 @@ public class AllTestSuit {
 	/*
 	 * For this to work execution must start from the project directory!
 	 */
-	public static final String CURRENT_DIRECTORY = SysPrefs
-			.getCurrentDirectory() + File.separator;
+	public static final String CURRENT_DIRECTORY = SysPrefs.getCurrentDirectory() + File.separator;
 
-	public static final String TEST_DATA_PATH = "testsrc" + File.separator
-			+ "testdata" + File.separator;
+	public static final String TEST_DATA_PATH = "testsrc" + File.separator + "testdata" + File.separator;
 
-	public static final String TEST_DATA_PATH_ABSOLUTE = AllTestSuit.CURRENT_DIRECTORY
-			+ TEST_DATA_PATH;
+	public static final String TEST_DATA_PATH_ABSOLUTE = AllTestSuit.CURRENT_DIRECTORY + TEST_DATA_PATH;
 
 	// For cluster execution paths MUST BE ABSOLUTE as cluster hosts will not be
 	// able to access the task otherwise
-	public static final String OUTPUT_DIR_ABSOLUTE = AllTestSuit.CURRENT_DIRECTORY
-			+ File.separator + "local_jobsout" + File.separator;
+	public static final String OUTPUT_DIR_ABSOLUTE = AllTestSuit.CURRENT_DIRECTORY + File.separator + "local_jobsout" + File.separator;
 
 	public static final String RUNNER_TEST_LOGGER = "RunnerLogger";
 
-	public static final String test_input = AllTestSuit.TEST_DATA_PATH_ABSOLUTE
-			+ "TO1381.fasta";
+	public static final String test_input = AllTestSuit.TEST_DATA_PATH_ABSOLUTE + "TO1381.fasta";
 
-	public static final String test_alignment_input = AllTestSuit.TEST_DATA_PATH_ABSOLUTE
-			+ "TO1381.fasta.aln";
+	public static final String test_alignment_input = AllTestSuit.TEST_DATA_PATH_ABSOLUTE + "TO1381.fasta.aln";
 
-	public static final String test_input_real = AllTestSuit.TEST_DATA_PATH_ABSOLUTE
-			+ "50x500Protein.fasta";
+	public static final String test_input_real = AllTestSuit.TEST_DATA_PATH_ABSOLUTE + "50x500Protein.fasta";
 
-	public static final String test_input_dna = AllTestSuit.TEST_DATA_PATH_ABSOLUTE
-			+ "3dnaseqs.fasta";
+	public static final String test_input_dna = AllTestSuit.TEST_DATA_PATH_ABSOLUTE + "3dnaseqs.fasta";
 
-	public static final String test_input_large = AllTestSuit.TEST_DATA_PATH_ABSOLUTE
-			+ "1000x3000Dna.fasta";
+	public static final String test_input_large = AllTestSuit.TEST_DATA_PATH_ABSOLUTE + "1000x3000Dna.fasta";
 
 }
diff --git a/testsrc/compbio/ws/client/WSTesterTester.java b/testsrc/compbio/ws/client/WSTesterTester.java
index 22ad229..3671e1b 100644
--- a/testsrc/compbio/ws/client/WSTesterTester.java
+++ b/testsrc/compbio/ws/client/WSTesterTester.java
@@ -5,11 +5,8 @@ import static org.testng.Assert.fail;
 
 import java.io.PrintWriter;
 import java.net.ConnectException;
-
 import javax.xml.ws.WebServiceException;
-
 import org.testng.annotations.Test;
-
 import compbio.metadata.AllTestSuit;
 
 public class WSTesterTester {
-- 
1.7.10.2