auto-format code using project formatter

14 files changed, 52 insertions, 103 deletions

diff --git a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/cfg/ControlFlowGraphTest.java b/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/cfg/ControlFlowGraphTest.java
index 231292c9d6e..63d226ae0ca 100644
--- a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/cfg/ControlFlowGraphTest.java
+++ b/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/cfg/ControlFlowGraphTest.java
@@ -51,8 +51,7 @@ public class ControlFlowGraphTest extends CodanFastCxxAstTestCase {
 			@Override
 			public int visit(IASTDeclaration decl) {
 				if (decl instanceof IASTFunctionDefinition) {
-					graph = new ControlFlowGraphBuilder()
-							.build((IASTFunctionDefinition) decl);
+					graph = new ControlFlowGraphBuilder().build((IASTFunctionDefinition) decl);
 					return PROCESS_ABORT;
 				}
 				return PROCESS_CONTINUE;
@@ -72,8 +71,7 @@ public class ControlFlowGraphTest extends CodanFastCxxAstTestCase {
 		assertNotNull(graph);
 		assertNotNull(graph.getStartNode());
 		Collection<IBasicBlock> nodes = graph.getNodes();
-		for (Iterator<IBasicBlock> iterator = nodes.iterator(); iterator
-				.hasNext();) {
+		for (Iterator<IBasicBlock> iterator = nodes.iterator(); iterator.hasNext();) {
 			IBasicBlock node = iterator.next();
 			checkNode(node, decision);
 		}
@@ -88,8 +86,7 @@ public class ControlFlowGraphTest extends CodanFastCxxAstTestCase {
 			IBasicBlock b = incomingNodes[i];
 			if (b == null) {
 				// check if dead node
-				Iterator<IBasicBlock> iterator = graph
-						.getUnconnectedNodeIterator();
+				Iterator<IBasicBlock> iterator = graph.getUnconnectedNodeIterator();
 				boolean dead = false;
 				for (; iterator.hasNext();) {
 					IBasicBlock d = iterator.next();
@@ -112,8 +109,7 @@ public class ControlFlowGraphTest extends CodanFastCxxAstTestCase {
 				fail("Block " + node + " inconsitent next/prev " + b);
 		}
 		if (node instanceof IDecisionNode && decision) {
-			assertTrue("decision node outgoing size " + node.getOutgoingSize(),
-					node.getOutgoingSize() > 1);
+			assertTrue("decision node outgoing size " + node.getOutgoingSize(), node.getOutgoingSize() > 1);
 			assertNotNull(((IDecisionNode) node).getMergeNode());
 		}
 	}
diff --git a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/cxx/CxxAstUtilsTest.java b/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/cxx/CxxAstUtilsTest.java
index 8ab4ee946b6..4d8a8d4ab14 100644
--- a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/cxx/CxxAstUtilsTest.java
+++ b/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/cxx/CxxAstUtilsTest.java
@@ -63,8 +63,7 @@ public class CxxAstUtilsTest extends CodanFastCxxAstTestCase {
 					IASTSimpleDeclaration sdecl = (IASTSimpleDeclaration) decl;
 					IASTDeclSpecifier spec = sdecl.getDeclSpecifier();
 					if (spec instanceof IASTNamedTypeSpecifier) {
-						IASTName tname = ((IASTNamedTypeSpecifier) spec)
-								.getName();
+						IASTName tname = ((IASTNamedTypeSpecifier) spec).getName();
 						IType typeName = (IType) tname.resolveBinding();
 						result[0] = instance.unwindTypedef(typeName);
 					}
@@ -96,9 +95,7 @@ public class CxxAstUtilsTest extends CodanFastCxxAstTestCase {
 			@Override
 			public int visit(IASTStatement stmt) {
 				if (stmt instanceof IASTExpressionStatement) {
-					boolean check = instance
-							.isInMacro(((IASTExpressionStatement) stmt)
-									.getExpression());
+					boolean check = instance.isInMacro(((IASTExpressionStatement) stmt).getExpression());
 					result[i] = check;
 					i++;
 				}
diff --git a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/CaseBreakCheckerTest.java b/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/CaseBreakCheckerTest.java
index 09dda958973..2f17be29d93 100644
--- a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/CaseBreakCheckerTest.java
+++ b/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/CaseBreakCheckerTest.java
@@ -309,8 +309,7 @@ public class CaseBreakCheckerTest extends CheckerTestCase {
 	public void testGeneral1() {
 		setEmpty(true);
 		loadCodeAndRun(getAboveComment());
-		checkErrorLines(4, 6, 7, 11, 14, 16, 19, 20, 24, 27, 32, 37, 41, 46,
-				49, 51);
+		checkErrorLines(4, 6, 7, 11, 14, 16, 19, 20, 24, 27, 32, 37, 41, 46, 49, 51);
 	}
 
 	// void foo(void) {
@@ -429,14 +428,12 @@ public class CaseBreakCheckerTest extends CheckerTestCase {
 	}
 
 	private void setLast(boolean val) {
-		IProblemPreference pref = getPreference(CaseBreakChecker.ER_ID,
-				CaseBreakChecker.PARAM_LAST_CASE);
+		IProblemPreference pref = getPreference(CaseBreakChecker.ER_ID, CaseBreakChecker.PARAM_LAST_CASE);
 		pref.setValue(val);
 	}
 
 	private void setEmpty(boolean val) {
-		IProblemPreference pref = getPreference(CaseBreakChecker.ER_ID,
-				CaseBreakChecker.PARAM_EMPTY_CASE);
+		IProblemPreference pref = getPreference(CaseBreakChecker.ER_ID, CaseBreakChecker.PARAM_EMPTY_CASE);
 		pref.setValue(val);
 	}
 
diff --git a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/CatchByReferenceTest.java b/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/CatchByReferenceTest.java
index 58237fa62c0..a0a239d063c 100644
--- a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/CatchByReferenceTest.java
+++ b/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/CatchByReferenceTest.java
@@ -108,8 +108,7 @@ public class CatchByReferenceTest extends CheckerTestCase {
 	//		}
 	//	}
 	public void test_class_unknown() {
-		setPreferenceValue(CatchByReference.ER_ID,
-				CatchByReference.PARAM_UNKNOWN_TYPE, false);
+		setPreferenceValue(CatchByReference.ER_ID, CatchByReference.PARAM_UNKNOWN_TYPE, false);
 		loadCodeAndRun(getAboveComment());
 		checkNoErrors();
 	}
@@ -121,8 +120,7 @@ public class CatchByReferenceTest extends CheckerTestCase {
 	//		}
 	//	}
 	public void test_class_unknown_on() {
-		setPreferenceValue(CatchByReference.ER_ID,
-				CatchByReference.PARAM_UNKNOWN_TYPE, true);
+		setPreferenceValue(CatchByReference.ER_ID, CatchByReference.PARAM_UNKNOWN_TYPE, true);
 		loadCodeAndRun(getAboveComment());
 		checkErrorLine(4);
 	}
diff --git a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/ReturnCheckerTest.java b/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/ReturnCheckerTest.java
index 4939dab5789..d048137826c 100644
--- a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/ReturnCheckerTest.java
+++ b/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/ReturnCheckerTest.java
@@ -132,8 +132,7 @@ public class ReturnCheckerTest extends CheckerTestCase {
 	//		}
 	//	};
 	public void testContructor_Bug323602() {
-		IProblemPreference macro = getPreference(ReturnChecker.RET_NO_VALUE_ID,
-				ReturnChecker.PARAM_IMPLICIT);
+		IProblemPreference macro = getPreference(ReturnChecker.RET_NO_VALUE_ID, ReturnChecker.PARAM_IMPLICIT);
 		macro.setValue(Boolean.TRUE);
 		loadCodeAndRunCpp(getAboveComment());
 		checkNoErrors();
diff --git a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/ReturnStyleCheckerTest.java b/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/ReturnStyleCheckerTest.java
index 3adfc6b00cd..e8d2af590c0 100644
--- a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/ReturnStyleCheckerTest.java
+++ b/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/ReturnStyleCheckerTest.java
@@ -13,7 +13,6 @@ package org.eclipse.cdt.codan.core.internal.checkers;
 import org.eclipse.cdt.codan.core.test.CheckerTestCase;
 
 public class ReturnStyleCheckerTest extends CheckerTestCase {
-
 	@Override
 	public void setUp() throws Exception {
 		super.setUp();
diff --git a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/StatementHasNoEffectCheckerTest.java b/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/StatementHasNoEffectCheckerTest.java
index 7d36d0e5db4..5eee2a5f565 100644
--- a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/StatementHasNoEffectCheckerTest.java
+++ b/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/StatementHasNoEffectCheckerTest.java
@@ -151,9 +151,7 @@ public class StatementHasNoEffectCheckerTest extends CheckerTestCase {
 	// }
 	@SuppressWarnings("restriction")
 	public void testInMacro() {
-		IProblemPreference macro = getPreference(
-				StatementHasNoEffectChecker.ER_ID,
-				StatementHasNoEffectChecker.PARAM_MACRO_ID);
+		IProblemPreference macro = getPreference(StatementHasNoEffectChecker.ER_ID, StatementHasNoEffectChecker.PARAM_MACRO_ID);
 		macro.setValue(Boolean.TRUE);
 		loadCodeAndRun(getAboveComment());
 		checkErrorLine(4);
@@ -177,9 +175,7 @@ public class StatementHasNoEffectCheckerTest extends CheckerTestCase {
 	// }
 	@SuppressWarnings("restriction")
 	public void testInMacroParamOff() {
-		IProblemPreference macro = getPreference(
-				StatementHasNoEffectChecker.ER_ID,
-				StatementHasNoEffectChecker.PARAM_MACRO_ID);
+		IProblemPreference macro = getPreference(StatementHasNoEffectChecker.ER_ID, StatementHasNoEffectChecker.PARAM_MACRO_ID);
 		macro.setValue(Boolean.FALSE);
 		loadCodeAndRun(getAboveComment());
 		checkNoErrors();
diff --git a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/SuggestedParenthesisCheckerTest.java b/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/SuggestedParenthesisCheckerTest.java
index 2fcad7ad081..e988b1c060d 100644
--- a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/SuggestedParenthesisCheckerTest.java
+++ b/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/SuggestedParenthesisCheckerTest.java
@@ -24,9 +24,7 @@ public class SuggestedParenthesisCheckerTest extends CheckerTestCase {
 	//	   if (!a<10) b=4; // error here on line 3
 	//	 }	
 	public void test1() {
-		IProblemPreference macro = getPreference(
-				SuggestedParenthesisChecker.ER_ID,
-				SuggestedParenthesisChecker.PARAM_NOT);
+		IProblemPreference macro = getPreference(SuggestedParenthesisChecker.ER_ID, SuggestedParenthesisChecker.PARAM_NOT);
 		macro.setValue(Boolean.TRUE);
 		loadCodeAndRun(getAboveComment());
 		checkErrorLine(3);
diff --git a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/test/CheckerTestCase.java b/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/test/CheckerTestCase.java
index f16c16fd660..beb283f3395 100644
--- a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/test/CheckerTestCase.java
+++ b/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/test/CheckerTestCase.java
@@ -67,9 +67,7 @@ public class CheckerTestCase extends CodanTestCase {
 			m = markers[j];
 			line = getLine(m);
 			mfile = m.getResource().getName();
-			if (line.equals(expectedLine)
-					&& (problemId == null || problemId
-							.equals(CodanProblemMarker.getProblemId(m)))) {
+			if (line.equals(expectedLine) && (problemId == null || problemId.equals(CodanProblemMarker.getProblemId(m)))) {
 				found = true;
 				if (file != null && !file.getName().equals(mfile))
 					found = false;
@@ -111,8 +109,7 @@ public class CheckerTestCase extends CodanTestCase {
 			// all good
 		} else {
 			IMarker m = markers[0];
-			fail("Found " + markers.length + " errors but should not. First "
-					+ CodanProblemMarker.getProblemId(m) + " at line "
+			fail("Found " + markers.length + " errors but should not. First " + CodanProblemMarker.getProblemId(m) + " at line "
 					+ getLine(m));
 		}
 	}
@@ -143,16 +140,9 @@ public class CheckerTestCase extends CodanTestCase {
 	 *
 	 */
 	protected void runCodan() {
-		CodanRuntime
-				.getInstance()
-				.getBuilder()
-				.processResource(cproject.getProject(),
-						new NullProgressMonitor());
+		CodanRuntime.getInstance().getBuilder().processResource(cproject.getProject(), new NullProgressMonitor());
 		try {
-			markers = cproject.getProject()
-					.findMarkers(
-							IProblemReporter.GENERIC_CODE_ANALYSIS_MARKER_TYPE,
-							true, 1);
+			markers = cproject.getProject().findMarkers(IProblemReporter.GENERIC_CODE_ANALYSIS_MARKER_TYPE, true, 1);
 		} catch (CoreException e) {
 			fail(e.getMessage());
 		}
@@ -164,16 +154,13 @@ public class CheckerTestCase extends CodanTestCase {
 	 * @return
 	 */
 	protected IProblemPreference getPreference(String problemId, String paramId) {
-		IProblem problem = CodanRuntime.getInstance().getCheckersRegistry()
-				.getResourceProfile(cproject.getResource())
+		IProblem problem = CodanRuntime.getInstance().getCheckersRegistry().getResourceProfile(cproject.getResource())
 				.findProblem(problemId);
-		IProblemPreference pref = ((MapProblemPreference) problem
-				.getPreference()).getChildDescriptor(paramId);
+		IProblemPreference pref = ((MapProblemPreference) problem.getPreference()).getChildDescriptor(paramId);
 		return pref;
 	}
 
-	protected IProblemPreference setPreferenceValue(String problemId,
-			String paramId, Object value) {
+	protected IProblemPreference setPreferenceValue(String problemId, String paramId, Object value) {
 		IProblemPreference param = getPreference(problemId, paramId);
 		param.setValue(value);
 		return param;
@@ -196,8 +183,7 @@ public class CheckerTestCase extends CodanTestCase {
 	}
 
 	protected void enableProblems(String... ids) {
-		IProblemProfile profile = CodanRuntime.getInstance()
-				.getCheckersRegistry().getWorkspaceProfile();
+		IProblemProfile profile = CodanRuntime.getInstance().getCheckersRegistry().getWorkspaceProfile();
 		IProblem[] problems = profile.getProblems();
 		for (int i = 0; i < problems.length; i++) {
 			IProblem p = problems[i];
@@ -210,8 +196,7 @@ public class CheckerTestCase extends CodanTestCase {
 				}
 			}
 		}
-		CodanRuntime.getInstance().getCheckersRegistry()
-				.updateProfile(cproject.getProject(), profile);
+		CodanRuntime.getInstance().getCheckersRegistry().updateProfile(cproject.getProject(), profile);
 		return;
 	}
 }
diff --git a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/test/CodanCoreTestActivator.java b/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/test/CodanCoreTestActivator.java
index 94ac5ab8539..4ad8daca883 100644
--- a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/test/CodanCoreTestActivator.java
+++ b/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/test/CodanCoreTestActivator.java
@@ -19,7 +19,6 @@ import org.osgi.framework.BundleContext;
 public class CodanCoreTestActivator extends Plugin {
 	// The plug-in ID
 	public static final String PLUGIN_ID = "org.eclipse.cdt.codan.core.test"; //$NON-NLS-1$
-
 	// The shared instance
 	private static CodanCoreTestActivator plugin;
 
@@ -31,7 +30,9 @@ public class CodanCoreTestActivator extends Plugin {
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
+	 * 
+	 * @see
+	 * org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
 	 */
 	@Override
 	public void start(BundleContext context) throws Exception {
@@ -41,7 +42,9 @@ public class CodanCoreTestActivator extends Plugin {
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
+	 * 
+	 * @see
+	 * org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
 	 */
 	@Override
 	public void stop(BundleContext context) throws Exception {
@@ -51,7 +54,7 @@ public class CodanCoreTestActivator extends Plugin {
 
 	/**
 	 * Returns the shared instance
-	 *
+	 * 
 	 * @return the shared instance
 	 */
 	public static CodanCoreTestActivator getDefault() {
diff --git a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/test/CodanFastCxxAstTestCase.java b/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/test/CodanFastCxxAstTestCase.java
index b6a488efd42..1bf928bd0a0 100644
--- a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/test/CodanFastCxxAstTestCase.java
+++ b/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/test/CodanFastCxxAstTestCase.java
@@ -57,9 +57,7 @@ public abstract class CodanFastCxxAstTestCase extends TestCase {
 	protected StringBuffer[] getContents(int sections) {
 		try {
 			CodanCoreTestActivator plugin = CodanCoreTestActivator.getDefault();
-			return TestSourceReader.getContentsForTest(plugin == null ? null
-					: plugin.getBundle(), "src", getClass(), getName(),
-					sections);
+			return TestSourceReader.getContentsForTest(plugin == null ? null : plugin.getBundle(), "src", getClass(), getName(), sections);
 		} catch (IOException e) {
 			fail(e.getMessage());
 			return null;
@@ -73,18 +71,16 @@ public abstract class CodanFastCxxAstTestCase extends TestCase {
 
 	/**
 	 * @return
-	 *
+	 * 
 	 */
 	public IASTTranslationUnit parse(String code) {
-		return parse(code, isCpp() ? ParserLanguage.CPP : ParserLanguage.C,
-				true);
+		return parse(code, isCpp() ? ParserLanguage.CPP : ParserLanguage.C, true);
 	}
 
 	protected IASTTranslationUnit parse(String code, ParserLanguage lang, boolean gcc) {
 		FileContent codeReader = FileContent.create("code.c", code.toCharArray());
 		IScannerInfo scannerInfo = new ScannerInfo();
-		IScanner scanner = AST2BaseTest.createScanner(codeReader, lang,
-				ParserMode.COMPLETE_PARSE, scannerInfo);
+		IScanner scanner = AST2BaseTest.createScanner(codeReader, lang, ParserMode.COMPLETE_PARSE, scannerInfo);
 		ISourceCodeParser parser2 = null;
 		if (lang == ParserLanguage.CPP) {
 			ICPPParserExtensionConfiguration config = null;
@@ -92,8 +88,7 @@ public abstract class CodanFastCxxAstTestCase extends TestCase {
 				config = new GPPParserExtensionConfiguration();
 			else
 				config = new ANSICPPParserExtensionConfiguration();
-			parser2 = new GNUCPPSourceParser(scanner,
-					ParserMode.COMPLETE_PARSE, NULL_LOG, config);
+			parser2 = new GNUCPPSourceParser(scanner, ParserMode.COMPLETE_PARSE, NULL_LOG, config);
 		} else {
 			ICParserExtensionConfiguration config = null;
 			if (gcc)
@@ -121,7 +116,7 @@ public abstract class CodanFastCxxAstTestCase extends TestCase {
 	/**
 	 * Override if any of code that test tried to parse has errors, otherwise
 	 * parse method would assert
-	 *
+	 * 
 	 * @return
 	 */
 	protected boolean hasCodeErrors() {
@@ -152,7 +147,7 @@ public abstract class CodanFastCxxAstTestCase extends TestCase {
 	}
 
 	void runCodan(IASTTranslationUnit tu) {
-		IProblemReporter problemReporter = CodanRuntime.getInstance() .getProblemReporter();
+		IProblemReporter problemReporter = CodanRuntime.getInstance().getProblemReporter();
 		CodanRuntime.getInstance().setProblemReporter(new IProblemReporter() {
 			public void reportProblem(String problemId, IProblemLocation loc, Object... args) {
 				codanproblems.add(new ProblemInstance(problemId, loc, args));
diff --git a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/test/CodanTestCase.java b/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/test/CodanTestCase.java
index 3c5aaccd6bb..c4301c907a4 100644
--- a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/test/CodanTestCase.java
+++ b/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/test/CodanTestCase.java
@@ -63,7 +63,7 @@ public class CodanTestCase extends BaseTestCase {
 
 	/**
 	 * Override for c++ (i.e. at least one c++ test)
-	 *
+	 * 
 	 * @return is c++ tests
 	 */
 	public boolean isCpp() {
@@ -82,9 +82,7 @@ public class CodanTestCase extends BaseTestCase {
 	public void tearDown() throws CoreException {
 		if (cproject != null) {
 			try {
-				cproject.getProject().delete(
-						IResource.FORCE | IResource.ALWAYS_DELETE_PROJECT_CONTENT,
-						new NullProgressMonitor());
+				cproject.getProject().delete(IResource.FORCE | IResource.ALWAYS_DELETE_PROJECT_CONTENT, new NullProgressMonitor());
 			} catch (CoreException e) {
 				throw e;
 			}
@@ -100,8 +98,7 @@ public class CodanTestCase extends BaseTestCase {
 		for (int i = 0; i < projects.length; i++) {
 			IProject p = projects[i];
 			if (p.getName().startsWith("Codan")) {
-				p.delete(IResource.FORCE | IResource.ALWAYS_DELETE_PROJECT_CONTENT,
-						new NullProgressMonitor());
+				p.delete(IResource.FORCE | IResource.ALWAYS_DELETE_PROJECT_CONTENT, new NullProgressMonitor());
 			}
 		}
 	}
@@ -116,10 +113,8 @@ public class CodanTestCase extends BaseTestCase {
 			workspace.run(new IWorkspaceRunnable() {
 				public void run(IProgressMonitor monitor) throws CoreException {
 					// Create the cproject
-					ICProject cproject = cpp ? CProjectHelper.createCCProject(
-							projectName, null, IPDOMManager.ID_NO_INDEXER)
-							: CProjectHelper.createCProject(projectName, null,
-									IPDOMManager.ID_NO_INDEXER);
+					ICProject cproject = cpp ? CProjectHelper.createCCProject(projectName, null, IPDOMManager.ID_NO_INDEXER)
+							: CProjectHelper.createCProject(projectName, null, IPDOMManager.ID_NO_INDEXER);
 					cprojects[0] = cproject;
 				}
 			}, null);
@@ -138,8 +133,7 @@ public class CodanTestCase extends BaseTestCase {
 			}
 		}, null);
 		// Index the cproject
-		CCorePlugin.getIndexManager().setIndexerId(cproject,
-				IPDOMManager.ID_FAST_INDEXER);
+		CCorePlugin.getIndexManager().setIndexerId(cproject, IPDOMManager.ID_FAST_INDEXER);
 		CCorePlugin.getIndexManager().reindex(cproject);
 		// wait until the indexer is done
 		assertTrue(CCorePlugin.getIndexManager().joinIndexer(1000 * 60, // 1 min
@@ -178,8 +172,7 @@ public class CodanTestCase extends BaseTestCase {
 	protected StringBuffer[] getContents(int sections) {
 		try {
 			CodanCoreTestActivator plugin = CodanCoreTestActivator.getDefault();
-			return TestSourceReader.getContentsForTest(plugin.getBundle(),
-					"src", getClass(), getName(), sections);
+			return TestSourceReader.getContentsForTest(plugin.getBundle(), "src", getClass(), getName(), sections);
 		} catch (IOException e) {
 			fail(e.getMessage());
 			return null;
@@ -194,8 +187,7 @@ public class CodanTestCase extends BaseTestCase {
 			if (sep != -1) {
 				String line = code.substring(0, sep);
 				code = code.substring(sep + 1);
-				String fileName = line.substring(indf + fileKey.length())
-						.trim();
+				String fileName = line.substring(indf + fileKey.length()).trim();
 				return loadcode(code, new File(tmpDir, fileName));
 			}
 		}
@@ -218,8 +210,7 @@ public class CodanTestCase extends BaseTestCase {
 	private File loadcode(String code, File testFile) {
 		try {
 			tempFiles.add(testFile);
-			TestUtils.saveFile(
-					new ByteArrayInputStream(code.trim().getBytes()), testFile);
+			TestUtils.saveFile(new ByteArrayInputStream(code.trim().getBytes()), testFile);
 			currentFile = testFile;
 			try {
 				cproject.getProject().refreshLocal(1, null);
diff --git a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/test/TestUtils.java b/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/test/TestUtils.java
index 581cd677e1e..020c60bb21f 100644
--- a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/test/TestUtils.java
+++ b/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/test/TestUtils.java
@@ -24,8 +24,7 @@ import java.net.URL;
  */
 @SuppressWarnings("nls")
 public class TestUtils {
-	public static File saveFile(InputStream st, File testFile)
-			throws FileNotFoundException, IOException {
+	public static File saveFile(InputStream st, File testFile) throws FileNotFoundException, IOException {
 		BufferedReader r = new BufferedReader(new InputStreamReader(st));
 		String line;
 		PrintStream wr = new PrintStream(testFile);
diff --git a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/QuickFixTestCase.java b/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/QuickFixTestCase.java
index 947a4262516..0782edc5472 100644
--- a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/QuickFixTestCase.java
+++ b/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/QuickFixTestCase.java
@@ -57,8 +57,7 @@ public abstract class QuickFixTestCase extends CheckerTestCase {
 
 	public static void closeWelcome() {
 		try {
-			IWorkbenchWindow window = PlatformUI.getWorkbench()
-					.getActiveWorkbenchWindow();
+			IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
 			IWorkbenchPage activePage = window.getActivePage();
 			IWorkbenchPart activePart = activePage.getActivePart();
 			if (activePart.getTitle().equals("Welcome")) {
@@ -77,16 +76,14 @@ public abstract class QuickFixTestCase extends CheckerTestCase {
 		quickFix = createQuickFix();
 		display = PlatformUI.getWorkbench().getDisplay();
 		closeWelcome();
-		IPreferenceStore store = CodanUIActivator.getDefault()
-				.getPreferenceStore(cproject.getProject());
+		IPreferenceStore store = CodanUIActivator.getDefault().getPreferenceStore(cproject.getProject());
 		// turn off editor reconsiler
 		store.setValue(PreferenceConstants.P_RUN_IN_EDITOR, false);
 	}
 
 	@Override
 	public void tearDown() throws CoreException {
-		IWorkbenchPage[] pages = PlatformUI.getWorkbench()
-				.getActiveWorkbenchWindow().getPages();
+		IWorkbenchPage[] pages = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getPages();
 		for (IWorkbenchPage page : pages) {
 			page.closeAllEditors(false);
 			dispatch(200);
@@ -147,7 +144,6 @@ public abstract class QuickFixTestCase extends CheckerTestCase {
 	 * @param expected
 	 */
 	public void assertContainedIn(String expected, String result) {
-		assertTrue(
-				"Text <" + expected + "> not found in <" + result + ">", result.contains(expected)); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
+		assertTrue("Text <" + expected + "> not found in <" + result + ">", result.contains(expected)); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
 	}
 }