Bug 540373: Cleanup: Format & Remove trailing whitespace

This was done by selecting all projects in Eclipse then
Source -> Clean Up... -> choosing:
- Format source code
- Remove trailing white spaces on all lines
and completing the wizard

Change-Id: I63685372c6bcc67719bcf145123bcb72e5b00394

3 files changed, 17 insertions, 11 deletions

diff --git a/build/org.eclipse.cdt.make.ui.tests/src/org/eclipse/cdt/make/ui/tests/MakeUIImagesTest.java b/build/org.eclipse.cdt.make.ui.tests/src/org/eclipse/cdt/make/ui/tests/MakeUIImagesTest.java
index 17199132e1b..77a06bf9f2e 100644
--- a/build/org.eclipse.cdt.make.ui.tests/src/org/eclipse/cdt/make/ui/tests/MakeUIImagesTest.java
+++ b/build/org.eclipse.cdt.make.ui.tests/src/org/eclipse/cdt/make/ui/tests/MakeUIImagesTest.java
@@ -38,7 +38,8 @@ public class MakeUIImagesTest {
 	// sample image (IMG_ETOOL_MAKEFILE) from MakeUIPlugin bundle
 	private static final String KEY_ETOOL_MAKEFILE = MakeUIImages.IMG_ETOOL_MAKEFILE;
 	private static final IPath PATH_ETOOL_MAKEFILE = new Path("icons/etool16/makefile.gif");
-	private static final URL URL_ETOOL_MAKEFILE= FileLocator.find(MakeUIPlugin.getDefault().getBundle(), PATH_ETOOL_MAKEFILE, null);
+	private static final URL URL_ETOOL_MAKEFILE = FileLocator.find(MakeUIPlugin.getDefault().getBundle(),
+			PATH_ETOOL_MAKEFILE, null);
 
 	/**
 	 * Handling of missing keys.
@@ -93,7 +94,8 @@ public class MakeUIImagesTest {
 			String[] overlayKeys = new String[5];
 			overlayKeys[IDecoration.BOTTOM_LEFT] = MakeUIImages.IMG_OVR_AUTOMATIC;
 			Image imageOver1 = MakeUIImages.getImageOverlaid(KEY_ETOOL_MAKEFILE, overlayKeys);
-			Image imageOver2 = MakeUIImages.getImageOverlaid(KEY_ETOOL_MAKEFILE, MakeUIImages.IMG_OVR_AUTOMATIC, IDecoration.BOTTOM_LEFT);
+			Image imageOver2 = MakeUIImages.getImageOverlaid(KEY_ETOOL_MAKEFILE, MakeUIImages.IMG_OVR_AUTOMATIC,
+					IDecoration.BOTTOM_LEFT);
 			assertSame(imageOver1, imageOver2);
 		}
 	}
@@ -109,12 +111,15 @@ public class MakeUIImagesTest {
 		for (Field field : fields) {
 			String name = field.getName();
 			if (name.startsWith("IMG_")) {
-				assertEquals("MakeUIImages."+name+" is not a String", String.class, field.getType());
-				assertTrue("MakeUIImages."+name+" is not a static field", (field.getModifiers() & Modifier.STATIC) != 0);
-				assertTrue("MakeUIImages."+name+" is not a public field", (field.getModifiers() & Modifier.PUBLIC) != 0);
+				assertEquals("MakeUIImages." + name + " is not a String", String.class, field.getType());
+				assertTrue("MakeUIImages." + name + " is not a static field",
+						(field.getModifiers() & Modifier.STATIC) != 0);
+				assertTrue("MakeUIImages." + name + " is not a public field",
+						(field.getModifiers() & Modifier.PUBLIC) != 0);
 				String imageKey = (String) field.get(null);
 				ImageDescriptor descriptor = MakeUIImages.getImageDescriptor(imageKey);
-				assertTrue("Missing image MakeUIImages."+name+"=\""+imageKey+"\"", descriptor!=MISSING_IMAGE_DESCRIPTOR);
+				assertTrue("Missing image MakeUIImages." + name + "=\"" + imageKey + "\"",
+						descriptor != MISSING_IMAGE_DESCRIPTOR);
 			}
 		}
 	}
diff --git a/build/org.eclipse.cdt.make.ui.tests/src/org/eclipse/cdt/make/ui/tests/MakeUITestBase.java b/build/org.eclipse.cdt.make.ui.tests/src/org/eclipse/cdt/make/ui/tests/MakeUITestBase.java
index 61a77729070..a6eb7f8e9c2 100644
--- a/build/org.eclipse.cdt.make.ui.tests/src/org/eclipse/cdt/make/ui/tests/MakeUITestBase.java
+++ b/build/org.eclipse.cdt.make.ui.tests/src/org/eclipse/cdt/make/ui/tests/MakeUITestBase.java
@@ -36,16 +36,17 @@ public class MakeUITestBase {
 
 	/**
 	 * Constructor.
-	 * 
+	 *
 	 * @param srcRoot - project folder where the test package is rooted.
 	 */
 	protected MakeUITestBase(String srcRoot) {
-		this.commentReader = new TestSourceReader(MakeUITestsPlugin.getDefault().getBundle(), srcRoot, this.getClass(), 1);
+		this.commentReader = new TestSourceReader(MakeUITestsPlugin.getDefault().getBundle(), srcRoot, this.getClass(),
+				1);
 	}
 
 	/**
 	 * Get name of the current test method.
-	 * 
+	 *
 	 * @return Name of the current test method.
 	 */
 	public String getName() {
@@ -54,7 +55,7 @@ public class MakeUITestBase {
 
 	/**
 	 * Retrieve comments above the current test method.
-	 * 
+	 *
 	 * @return First section of comments above the current test method.
 	 *    A sections is defined as a block of comments starting with "//". Sections are separated by empty lines.
 	 * @throws IOException
diff --git a/build/org.eclipse.cdt.make.ui.tests/src/org/eclipse/cdt/make/ui/tests/MakeUITestsPlugin.java b/build/org.eclipse.cdt.make.ui.tests/src/org/eclipse/cdt/make/ui/tests/MakeUITestsPlugin.java
index 94ab2108f34..3a53807ed89 100644
--- a/build/org.eclipse.cdt.make.ui.tests/src/org/eclipse/cdt/make/ui/tests/MakeUITestsPlugin.java
+++ b/build/org.eclipse.cdt.make.ui.tests/src/org/eclipse/cdt/make/ui/tests/MakeUITestsPlugin.java
@@ -25,7 +25,7 @@ public class MakeUITestsPlugin extends AbstractUIPlugin {
 
 	// The shared instance
 	private static MakeUITestsPlugin plugin;
-	
+
 	/**
 	 * The constructor
 	 */