From c4b2ac159c4c349683f10425d347b18a50a83216 Mon Sep 17 00:00:00 2001
From: Sergey Prigogin <eclipse.sprigogin@gmail.com>
Date: Sat, 30 Mar 2013 15:11:28 -0700
Subject: [PATCH] Cosmetics.

---
 .../eclipse/cdt/core/testplugin/CProjectHelper.java   | 11 ++++-------
 .../cdt/core/testplugin/util/TestSourceReader.java    |  2 +-
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/CProjectHelper.java b/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/CProjectHelper.java
index f183bcd36b6..55334c3ee27 100644
--- a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/CProjectHelper.java
+++ b/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/CProjectHelper.java
@@ -84,7 +84,6 @@ public class CProjectHelper {
 		final IWorkspace ws = ResourcesPlugin.getWorkspace();
 		final ICProject newProject[] = new ICProject[1];
 		ws.run(new IWorkspaceRunnable() {
-
 			@Override
 			public void run(IProgressMonitor monitor) throws CoreException {
 				IWorkspaceRoot root = ws.getRoot();
@@ -166,7 +165,6 @@ public class CProjectHelper {
 		
 		final String finalCfgProviderId = cfgProviderId;
 		ws.run(new IWorkspaceRunnable() {
-
 			@Override
 			public void run(IProgressMonitor monitor) throws CoreException {
 				IWorkspaceRoot root = ws.getRoot();
@@ -221,7 +219,6 @@ public class CProjectHelper {
 		final IWorkspace ws = ResourcesPlugin.getWorkspace();
 		final ICProject newProject[] = new ICProject[1];
 		ws.run(new IWorkspaceRunnable() {
-
 			@Override
 			public void run(IProgressMonitor monitor) throws CoreException {
 				ICProject cproject = createCProject(projectName, binFolderName, indexerID);
@@ -309,12 +306,12 @@ public class CProjectHelper {
 		archCont = testProject.getArchiveContainer();
 		myArchives = archCont.getArchives();
 		if (myArchives.length < 1)
-			return (null);
+			return null;
 		for (x = 0; x < myArchives.length; x++) {
 			if (myArchives[x].getElementName().equals(name))
 				return (myArchives[x]);
 		}
-		return (null);
+		return null;
 	}
 
 	/**
@@ -327,12 +324,12 @@ public class CProjectHelper {
 		binCont = testProject.getBinaryContainer();
 		myBinaries = binCont.getBinaries();
 		if (myBinaries.length < 1)
-			return (null);
+			return null;
 		for (x = 0; x < myBinaries.length; x++) {
 			if (myBinaries[x].getElementName().equals(name))
 				return (myBinaries[x]);
 		}
-		return (null);
+		return null;
 	}
 
 	/**
diff --git a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/util/TestSourceReader.java b/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/util/TestSourceReader.java
index 7295d0ef6c7..8fb7e036c43 100644
--- a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/util/TestSourceReader.java
+++ b/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/util/TestSourceReader.java
@@ -381,7 +381,7 @@ public class TestSourceReader {
 			Thread.sleep(50);
 			timeLeft= (int) (endTime - System.currentTimeMillis());
 		}
-		Assert.fail("Indexing " + file.getFullPath() + " did not complete in " + maxmillis / 1000. + " sec");
+		Assert.fail("Indexing of " + file.getFullPath() + " did not complete in " + maxmillis / 1000. + " sec");
 	}
 
 	private static boolean areAllFilesNotOlderThan(IIndexFile[] files, long timestamp) throws CoreException {