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

5 files changed, 20 insertions, 17 deletions

diff --git a/build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/ClangToolChain.java b/build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/ClangToolChain.java
index 27fd5a8b3b1..7cf3223e60a 100644
--- a/build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/ClangToolChain.java
+++ b/build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/ClangToolChain.java
@@ -18,7 +18,7 @@ import org.eclipse.cdt.core.envvar.IEnvironmentVariable;
 /**
  * The Clang toolchain. There's little different from the GCC toolchain other
  * than the toolchain type and name.
- * 
+ *
  * @author dschaefer
  *
  */
diff --git a/build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/GCCToolChain.java b/build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/GCCToolChain.java
index a17b44fdc8e..3b6ce717f42 100644
--- a/build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/GCCToolChain.java
+++ b/build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/GCCToolChain.java
@@ -127,7 +127,7 @@ public class GCCToolChain extends PlatformObject implements IToolChain {
 				}
 			}
 		}
-		
+
 		if (pathVar == null && this.path != null) {
 			// Make one with the directory containing out tool
 			pathVar = new EnvironmentVariable("PATH", this.path.getParent().toString(), //$NON-NLS-1$
@@ -219,7 +219,7 @@ public class GCCToolChain extends PlatformObject implements IToolChain {
 	public void setProperty(String key, String value) {
 		properties.put(key, value);
 	}
-	
+
 	@Override
 	public String getBinaryParserId() {
 		// Assume local builds
@@ -261,12 +261,12 @@ public class GCCToolChain extends PlatformObject implements IToolChain {
 
 			int offset = 0;
 			Path command = Paths.get(commandStrings.get(offset));
-			
+
 			// look for ccache being used
 			if (command.toString().contains("ccache")) { //$NON-NLS-1$
 				command = Paths.get(commandStrings.get(++offset));
 			}
-			
+
 			List<String> commandLine = new ArrayList<>();
 			if (command.isAbsolute()) {
 				commandLine.add(command.toString());
@@ -415,7 +415,7 @@ public class GCCToolChain extends PlatformObject implements IToolChain {
 						commandLine.add("-I" + includePath); //$NON-NLS-1$
 					}
 				}
-				
+
 				if (baseScannerInfo.getDefinedSymbols() != null) {
 					for (Map.Entry<String, String> macro : baseScannerInfo.getDefinedSymbols().entrySet()) {
 						if (macro.getValue() != null && !macro.getValue().isEmpty()) {
@@ -460,15 +460,15 @@ public class GCCToolChain extends PlatformObject implements IToolChain {
 
 		// Startup the command
 		ProcessBuilder processBuilder = new ProcessBuilder(commandLine).directory(buildDirectory.toFile());
-		CCorePlugin.getDefault().getBuildEnvironmentManager().setEnvironment(processBuilder.environment(),
-				buildConfig, true);
+		CCorePlugin.getDefault().getBuildEnvironmentManager().setEnvironment(processBuilder.environment(), buildConfig,
+				true);
 		Process process = processBuilder.start();
 
 		// Scan for the scanner info
 		Map<String, String> symbols = new HashMap<>();
 		List<String> includePath = new ArrayList<>();
 		Pattern definePattern = Pattern.compile("#define ([^\\s]*)\\s(.*)"); //$NON-NLS-1$
-		
+
 		// First the include path off the error stream
 		Thread includePathReaderThread = new Thread("Include Path Reader") {
 			@Override
@@ -498,7 +498,7 @@ public class GCCToolChain extends PlatformObject implements IToolChain {
 			}
 		};
 		includePathReaderThread.start();
-		
+
 		Thread macroReaderThread = new Thread("Macro reader") {
 			public void run() {
 				// Now the defines off the output stream
diff --git a/build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/GCCUserToolChainProvider.java b/build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/GCCUserToolChainProvider.java
index 8bb87acc47c..fa2b499fcab 100644
--- a/build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/GCCUserToolChainProvider.java
+++ b/build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/GCCUserToolChainProvider.java
@@ -131,14 +131,16 @@ public class GCCUserToolChainProvider implements IUserToolChainProvider {
 				}
 			}
 		} catch (IOException | IllegalStateException e) {
-			throw new CoreException(new Status(IStatus.ERROR, Activator.getId(), Messages.GCCUserToolChainProvider_Loading, e));
+			throw new CoreException(
+					new Status(IStatus.ERROR, Activator.getId(), Messages.GCCUserToolChainProvider_Loading, e));
 		}
 	}
 
 	@Override
 	public void addToolChain(IToolChain toolChain) throws CoreException {
 		if (!(toolChain instanceof GCCToolChain)) {
-			throw new CoreException(new Status(IStatus.ERROR, Activator.getId(), Messages.GCCUserToolChainProvider_NotOurs));
+			throw new CoreException(
+					new Status(IStatus.ERROR, Activator.getId(), Messages.GCCUserToolChainProvider_NotOurs));
 		}
 
 		GCCToolChain gcc = (GCCToolChain) toolChain;
@@ -192,7 +194,8 @@ public class GCCUserToolChainProvider implements IUserToolChainProvider {
 		try {
 			saveJsonFile();
 		} catch (IOException e) {
-			throw new CoreException(new Status(IStatus.ERROR, Activator.getId(), Messages.GCCUserToolChainProvider_Saving, e));
+			throw new CoreException(
+					new Status(IStatus.ERROR, Activator.getId(), Messages.GCCUserToolChainProvider_Saving, e));
 		}
 
 		manager.addToolChain(toolChain);
@@ -214,7 +217,8 @@ public class GCCUserToolChainProvider implements IUserToolChainProvider {
 			try {
 				saveJsonFile();
 			} catch (IOException e) {
-				throw new CoreException(new Status(IStatus.ERROR, Activator.getId(), Messages.GCCUserToolChainProvider_Saving1, e));
+				throw new CoreException(
+						new Status(IStatus.ERROR, Activator.getId(), Messages.GCCUserToolChainProvider_Saving1, e));
 			}
 		}
 		manager.removeToolChain(toolChain);
diff --git a/build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/internal/GCCPathToolChainProvider.java b/build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/internal/GCCPathToolChainProvider.java
index fe83d64648f..3ba8b73df42 100644
--- a/build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/internal/GCCPathToolChainProvider.java
+++ b/build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/internal/GCCPathToolChainProvider.java
@@ -102,7 +102,7 @@ public class GCCPathToolChainProvider implements IToolChainProvider {
 							}
 						} catch (IOException e) {
 							Activator.log(e);
-						}						
+						}
 					} else {
 						matcher = clangPattern.matcher(file.getName());
 						if (matcher.matches()) {
diff --git a/build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/internal/Msys2ToolChainProvider.java b/build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/internal/Msys2ToolChainProvider.java
index aa97e315d1f..bafc645fbb6 100644
--- a/build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/internal/Msys2ToolChainProvider.java
+++ b/build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/internal/Msys2ToolChainProvider.java
@@ -87,8 +87,7 @@ public class Msys2ToolChainProvider implements IToolChainProvider {
 			pathVar.append("\\bin"); //$NON-NLS-1$
 			IEnvironmentVariable[] vars = new IEnvironmentVariable[] {
 					new EnvironmentVariable("PATH", pathVar.toString(), IEnvironmentVariable.ENVVAR_PREPEND, //$NON-NLS-1$
-							File.pathSeparator)
-			};
+							File.pathSeparator) };
 			GCCToolChain toolChain = new GCCToolChain(this, gccPath, Platform.ARCH_X86_64, vars);
 			toolChain.setProperty(IToolChain.ATTR_PACKAGE, "msys2"); //$NON-NLS-1$
 			manager.addToolChain(toolChain);