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

build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/autotools/core/AutotoolsNewProjectNature.java

@@ -134,8 +134,7 @@ public class AutotoolsNewProjectNature implements IProjectNature {
 		backgroundJob.schedule();
 	}
 
-	static boolean checkEquals(ICommand[] commands,
+	static boolean checkEquals(ICommand[] commands, ICommand[] newCommands) {
-			ICommand[] newCommands) {
 		if (newCommands.length != commands.length) {
 			return false;
 		}
@@ -147,8 +146,7 @@ public class AutotoolsNewProjectNature implements IProjectNature {
 		return true;
 	}
 
-	static ICommand[] getBuildCommandsList(IProjectDescription description,
+	static ICommand[] getBuildCommandsList(IProjectDescription description, ICommand[] commands) {
-			ICommand[] commands) {
 		ArrayList<ICommand> commandList = new ArrayList<>();
 
 		// Make sure the Autotools Configuration builder just precedes the Common Builder
@@ -164,8 +162,7 @@ public class AutotoolsNewProjectNature implements IProjectNature {
 				}
 				// Make sure that the Autotools builder precedes the Managed builder
 				// or the Remote Synchronized builder.
-				if (command.getBuilderName().equals(BUILDER_ID) ||
+				if (command.getBuilderName().equals(BUILDER_ID) || command.getBuilderName().equals(REMOTE_BUILDER_ID)) {
-						command.getBuilderName().equals(REMOTE_BUILDER_ID)) {
 					// add Autotools Configuration builder just before builder
 					ICommand newCommand = description.newCommand();
 					newCommand.setBuilderName(AutotoolsConfigurationBuilder.BUILDER_ID);

build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/autotools/core/AutotoolsPlugin.java

@@ -194,8 +194,7 @@ public class AutotoolsPlugin extends AbstractUIPlugin {
 	 * @throws CoreException if project is not valid Autotools project or cfgId does not exist
 	 * @since 1.2
 	 */
-	public Map<String, IAutotoolsOption> getAutotoolCfgOptions(IProject project,
+	public Map<String, IAutotoolsOption> getAutotoolCfgOptions(IProject project, String cfgId) throws CoreException {
-			String cfgId) throws CoreException {
 		return AutotoolsConfigurationManager.getInstance().getAutotoolsCfgOptions(project, cfgId);
 	}
 
@@ -209,8 +208,8 @@ public class AutotoolsPlugin extends AbstractUIPlugin {
 	 *
 	 * @since 1.2
 	 */
-	public void updateAutotoolCfgOptions(IProject project, String cfgId,
+	public void updateAutotoolCfgOptions(IProject project, String cfgId, Map<String, IAutotoolsOption> options)
-			Map<String,IAutotoolsOption> options) throws CoreException {
+			throws CoreException {
 		AutotoolsConfigurationManager.getInstance().updateAutotoolCfgOptions(project, cfgId, options);
 
 	}

build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/autotools/core/IAutotoolsOption.java

@@ -12,7 +12,6 @@ package org.eclipse.cdt.autotools.core;
 
 import org.eclipse.core.runtime.CoreException;
 
-
 /**
  * @since 1.2
  */

build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/AutotoolsConfigurationBuilder.java

@@ -57,8 +57,7 @@ public class AutotoolsConfigurationBuilder extends ACBuilder {
 	}
 
 	@Override
-	protected IProject[] build(int kind, Map<String, String> args, IProgressMonitor monitor)
+	protected IProject[] build(int kind, Map<String, String> args, IProgressMonitor monitor) throws CoreException {
-	throws CoreException {
 		IProject project = getProject();
 		if (!isCdtProjectCreated(project))
 			return project.getReferencedProjects();
@@ -121,11 +120,13 @@ public class AutotoolsConfigurationBuilder extends ACBuilder {
 				IMultiConfiguration mcfg = (IMultiConfiguration) icfg;
 				IConfiguration[] cfgs = (IConfiguration[]) mcfg.getItems();
 				for (int i = 0; i < cfgs.length; ++i) {
-					IAConfiguration cfg = AutotoolsConfigurationManager.getInstance().getConfiguration(project, icfg.getName());
+					IAConfiguration cfg = AutotoolsConfigurationManager.getInstance().getConfiguration(project,
+							icfg.getName());
 					cfg.setDirty(true);
 				}
 			} else {
-				IAConfiguration cfg = AutotoolsConfigurationManager.getInstance().getConfiguration(project, icfg.getName());
+				IAConfiguration cfg = AutotoolsConfigurationManager.getInstance().getConfiguration(project,
+						icfg.getName());
 				cfg.setDirty(true); // Mark Configuration dirty so next build will do full reconfigure
 			}
 		}
@@ -140,8 +141,7 @@ public class AutotoolsConfigurationBuilder extends ACBuilder {
 			result = generator.regenerateMakefiles(false);
 		} catch (CoreException e) {
 			String errMsg = AutotoolsPlugin.getResourceString("MakeGenerator.didnt.generate"); //$NON-NLS-1$
-			result = new MultiStatus(AutotoolsPlugin.getUniqueIdentifier(), IStatus.ERROR,
+			result = new MultiStatus(AutotoolsPlugin.getUniqueIdentifier(), IStatus.ERROR, errMsg, e);
-					errMsg, e);
 		}
 
 		return result;
@@ -174,4 +174,3 @@ public class AutotoolsConfigurationBuilder extends ACBuilder {
 	}
 
 }
-		

build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/AutotoolsEnvironmentVariableSupplier.java

@@ -41,12 +41,14 @@ public class AutotoolsEnvironmentVariableSupplier implements IConfigurationEnvir
 
 		private static boolean isVar(String name) {
 			// Windows has case insensitive env var names
-			return Platform.getOS().equals(Platform.OS_WIN32) ? name.equalsIgnoreCase(VerboseEnvironmentVariable.VERBOSE_VAR_NAME)
+			return Platform.getOS().equals(Platform.OS_WIN32)
+					? name.equalsIgnoreCase(VerboseEnvironmentVariable.VERBOSE_VAR_NAME)
 					: name.equals(VerboseEnvironmentVariable.VERBOSE_VAR_NAME);
 		}
 
 		private static IBuildEnvironmentVariable create() {
-			return new VerboseEnvironmentVariable(VERBOSE_VAR_NAME, VERBOSE_VAR_VALUE, IEnvironmentVariable.ENVVAR_PREPEND, null);
+			return new VerboseEnvironmentVariable(VERBOSE_VAR_NAME, VERBOSE_VAR_VALUE,
+					IEnvironmentVariable.ENVVAR_PREPEND, null);
 		}
 	}
 

build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/AutotoolsNewMakeGenerator.java

@@ -120,7 +120,6 @@ public class AutotoolsNewMakeGenerator extends MarkerGenerator {
 
 	public static final String RUN_IN_CONFIGURE_LAUNCHER = "org.eclipse.cdt.autotools.core.property.launchAutotoolsInContainer"; //$NON-NLS-1$
 
-
 	private IProject project;
 
 	private IProgressMonitor monitor;
@@ -140,8 +139,7 @@ public class AutotoolsNewMakeGenerator extends MarkerGenerator {
 	/**
 	 * @since 2.0
 	 */
-	public MultiStatus generateMakefiles()
+	public MultiStatus generateMakefiles() throws CoreException {
-			throws CoreException {
 		return regenerateMakefiles(false);
 	}
 
@@ -164,8 +162,7 @@ public class AutotoolsNewMakeGenerator extends MarkerGenerator {
 		}
 	}
 
-	public void initialize(IProject project, IManagedBuildInfo info,
+	public void initialize(IProject project, IManagedBuildInfo info, IProgressMonitor monitor) {
-			IProgressMonitor monitor) {
 		this.project = project;
 		ICProjectDescription pdesc = CCorePlugin.getDefault().getProjectDescription(project);
 		this.cdesc = pdesc.getActiveConfiguration();
@@ -300,11 +297,7 @@ public class AutotoolsNewMakeGenerator extends MarkerGenerator {
 				Status rc = regenerateMakefiles(icfg, reconfigure);
 				if (!rc.isOK()) {
 					if (status == null) {
-						status = new MultiStatus(
+						status = new MultiStatus(AutotoolsPlugin.getUniqueIdentifier(), IStatus.ERROR, "", null);
-								AutotoolsPlugin.getUniqueIdentifier(),
-								IStatus.ERROR,
-								"",
-								null);
 					}
 					status.add(rc);
 				}
@@ -313,21 +306,13 @@ public class AutotoolsNewMakeGenerator extends MarkerGenerator {
 			Status rc = regenerateMakefiles(cfg, reconfigure);
 			if (!rc.isOK()) {
 				if (status == null) {
-					status = new MultiStatus(
+					status = new MultiStatus(AutotoolsPlugin.getUniqueIdentifier(), IStatus.ERROR, "", null);
-							AutotoolsPlugin.getUniqueIdentifier(),
-							IStatus.ERROR,
-							"",
-							null);
 				}
 				status.add(rc);
 			}
 		}
 		if (status == null) {
-			status = new MultiStatus(
+			status = new MultiStatus(ManagedBuilderCorePlugin.getUniqueIdentifier(), IStatus.OK, "", null);
-					ManagedBuilderCorePlugin.getUniqueIdentifier(),
-					IStatus.OK,
-					"",
-					null);
 		}
 		return status;
 	}
@@ -357,14 +342,12 @@ public class AutotoolsNewMakeGenerator extends MarkerGenerator {
 			}
 		}
 
-
 		// Create the top-level directory for the build output
 		if (!createDirectory(buildDir)) {
 			rc = IStatus.ERROR;
 			errMsg = AutotoolsPlugin.getFormattedString("MakeGenerator.createdir.error", //$NON-NLS-1$
 					new String[] { buildDir });
-			status = new MultiStatus(AutotoolsPlugin
+			status = new MultiStatus(AutotoolsPlugin.getUniqueIdentifier(), rc, errMsg, null);
-						.getUniqueIdentifier(), rc, errMsg, null);
 		}
 		checkCancel();
 
@@ -414,8 +397,7 @@ public class AutotoolsNewMakeGenerator extends MarkerGenerator {
 					}
 					makeargs[makeargs.length - 1] = target;
 					rc = runCommand(runInCfgLauncher ? configureLauncher : localCommandLauncher, makeCmd,
-							getProjectLocation(),
+							getProjectLocation(), makeargs,
-							makeargs,
 							AutotoolsPlugin.getResourceString("MakeGenerator.clean.topdir"), //$NON-NLS-1$
 							errMsg, console, consoleStart);
 					consoleStart = false;
@@ -450,7 +432,8 @@ public class AutotoolsNewMakeGenerator extends MarkerGenerator {
 							IPath makeCmd = builder.getBuildCommand();
 							String target = null;
 							try {
-								target = getProject().getPersistentProperty(AutotoolsPropertyConstants.CLEAN_MAKE_TARGET);
+								target = getProject()
+										.getPersistentProperty(AutotoolsPropertyConstants.CLEAN_MAKE_TARGET);
 							} catch (CoreException ce) {
 								// do nothing
 							}
@@ -464,9 +447,9 @@ public class AutotoolsNewMakeGenerator extends MarkerGenerator {
 							}
 							makeargs[makeargs.length - 1] = target;
 							rc = runCommand(runInCfgLauncher ? configureLauncher : localCommandLauncher, makeCmd,
-									buildLocation,
+									buildLocation, makeargs,
-									makeargs,
+									AutotoolsPlugin.getFormattedString("MakeGenerator.clean.builddir", //$NON-NLS-1$
-									AutotoolsPlugin.getFormattedString("MakeGenerator.clean.builddir", new String[]{buildDir}), //$NON-NLS-1$
+											new String[] { buildDir }),
 									errMsg, console, consoleStart);
 							consoleStart = false;
 						}
@@ -495,16 +478,15 @@ public class AutotoolsNewMakeGenerator extends MarkerGenerator {
 				// created.
 				if (makefile == null || !makefile.exists()) {
 					rc = runScript(configureLauncher, configfile, buildLocation, null,
-							AutotoolsPlugin.getFormattedString("MakeGenerator.run.config.status", new String[]{buildDir}), //$NON-NLS-1$
+							AutotoolsPlugin.getFormattedString("MakeGenerator.run.config.status", //$NON-NLS-1$
+									new String[] { buildDir }),
 							errMsg, console, null, consoleStart);
 					consoleStart = false;
 				}
 			}
 			// Look for configure and configure from scratch
 			else if (configurePath.toFile().exists()) {
-				rc = runScript(configureLauncher, configurePath,
+				rc = runScript(configureLauncher, configurePath, buildLocation, configArgs,
-						buildLocation,
-						configArgs, 
 						AutotoolsPlugin.getFormattedString("MakeGenerator.gen.makefile", new String[] { buildDir }), //$NON-NLS-1$
 						errMsg, console, configureEnvs, consoleStart);
 				consoleStart = false;
@@ -543,25 +525,25 @@ public class AutotoolsNewMakeGenerator extends MarkerGenerator {
 						if (!configurePath.toFile().exists()) {
 							// no configure script either...try running autoreconf
 							String[] reconfArgs = new String[1];
-							String reconfCmd = project.getPersistentProperty(AutotoolsPropertyConstants.AUTORECONF_TOOL);
+							String reconfCmd = project
+									.getPersistentProperty(AutotoolsPropertyConstants.AUTORECONF_TOOL);
 							if (reconfCmd == null)
 								reconfCmd = DEFAULT_AUTORECONF;
 							IPath reconfCmdPath = new Path(reconfCmd);
 							reconfArgs[0] = "-i"; //$NON-NLS-1$
 							rc = runScript(runInCfgLauncher ? configureLauncher : localCommandLauncher, reconfCmdPath,
-									getSourcePath(),
+									getSourcePath(), reconfArgs,
-									reconfArgs,
+									AutotoolsPlugin.getFormattedString("MakeGenerator.autoreconf", //$NON-NLS-1$
-									AutotoolsPlugin.getFormattedString("MakeGenerator.autoreconf", new String[]{buildDir}), //$NON-NLS-1$
+											new String[] { buildDir }),
 									errMsg, console, null, consoleStart);
 							consoleStart = false;
 							refresh();
 						}
 						// Check if configure generated and if yes, run it.
 						if (rc != IStatus.ERROR && configurePath.toFile().exists()) {
-							rc = runScript(configureLauncher, configurePath,
+							rc = runScript(configureLauncher, configurePath, buildLocation, configArgs,
-									buildLocation,
+									AutotoolsPlugin.getFormattedString("MakeGenerator.gen.makefile", //$NON-NLS-1$
-									configArgs, 
+											new String[] { buildDir }),
-									AutotoolsPlugin.getFormattedString("MakeGenerator.gen.makefile", new String[]{buildDir}), //$NON-NLS-1$
 									errMsg, console, configureEnvs, false);
 							if (rc != IStatus.ERROR) {
 								File makefileFile = buildLocation.append(MAKEFILE).toFile();
@@ -582,8 +564,7 @@ public class AutotoolsNewMakeGenerator extends MarkerGenerator {
 				IPath makeCmd = builder.getBuildCommand();
 				makeargs[0] = "-f" + getMakefileCVSPath().toOSString(); //$NON-NLS-1$
 				rc = runCommand(runInCfgLauncher ? configureLauncher : localCommandLauncher, makeCmd,
-						getProjectLocation().append(buildDir),
+						getProjectLocation().append(buildDir), makeargs,
-						makeargs,
 						AutotoolsPlugin.getFormattedString("MakeGenerator.makefile.cvs", new String[] { buildDir }), //$NON-NLS-1$
 						errMsg, console, consoleStart);
 				consoleStart = false;
@@ -596,7 +577,8 @@ public class AutotoolsNewMakeGenerator extends MarkerGenerator {
 							.equals(configureLauncher.getClass().getName())) {
 						rc = runScript(configureLauncher, configurePath, buildLocation, configArgs,
 								AutotoolsPlugin.getFormattedString("MakeGenerator.gen.makefile", //$NON-NLS-1$
-										new String[] { buildDir }), errMsg, console, configureEnvs, false);
+										new String[] { buildDir }),
+								errMsg, console, configureEnvs, false);
 					}
 				}
 				if (rc != IStatus.ERROR) {
@@ -614,8 +596,7 @@ public class AutotoolsNewMakeGenerator extends MarkerGenerator {
 				IPath reconfCmdPath = new Path(reconfCmd);
 				reconfArgs[0] = "-i"; //$NON-NLS-1$
 				rc = runScript(runInCfgLauncher ? configureLauncher : localCommandLauncher, reconfCmdPath,
-						getSourcePath(),
+						getSourcePath(), reconfArgs,
-						reconfArgs,
 						AutotoolsPlugin.getFormattedString("MakeGenerator.autoreconf", new String[] { buildDir }), //$NON-NLS-1$
 						errMsg, console, null, consoleStart);
 				consoleStart = false;
@@ -623,10 +604,9 @@ public class AutotoolsNewMakeGenerator extends MarkerGenerator {
 				if (rc != IStatus.ERROR) {
 					refresh();
 					if (configurePath.toFile().exists()) {
-						rc = runScript(configureLauncher, configurePath, 
+						rc = runScript(configureLauncher, configurePath, buildLocation, configArgs,
-								buildLocation,
+								AutotoolsPlugin.getFormattedString("MakeGenerator.gen.makefile", //$NON-NLS-1$
-								configArgs, 
+										new String[] { buildDir }),
-								AutotoolsPlugin.getFormattedString("MakeGenerator.gen.makefile", new String[]{buildDir}), //$NON-NLS-1$
 								errMsg, console, configureEnvs, false);
 						if (rc != IStatus.ERROR) {
 							File makefileFile = buildLocation.append(MAKEFILE).toFile();
@@ -649,15 +629,9 @@ public class AutotoolsNewMakeGenerator extends MarkerGenerator {
 			rc = IStatus.ERROR;
 		} finally {
 			// getGenerationProblems().clear();
-			status = new MultiStatus(AutotoolsPlugin
+			status = new MultiStatus(AutotoolsPlugin.getUniqueIdentifier(), rc, errMsg, null);
-					.getUniqueIdentifier(), rc, errMsg, null);
 			if (rc != IStatus.OK)
-				status.add(new Status (
+				status.add(new Status(rc, AutotoolsPlugin.getUniqueIdentifier(), 0, errMsg, null));
-						rc,
-						AutotoolsPlugin.getUniqueIdentifier(),
-						0,
-						errMsg,
-						null));
 		}
 		return status;
 	}
@@ -851,8 +825,8 @@ public class AutotoolsNewMakeGenerator extends MarkerGenerator {
 
 	// Run a command or executable (e.g. make).
 	private int runCommand(ICommandLauncher commandLauncher, IPath commandPath, IPath runPath, String[] args,
-			String jobDescription, String errMsg,
+			String jobDescription, String errMsg, IConsole console, boolean consoleStart)
-			IConsole console, boolean consoleStart) throws CoreException, NullPointerException, IOException {
+			throws CoreException, NullPointerException, IOException {
 
 		int rc = IStatus.OK;
 
@@ -865,13 +839,10 @@ public class AutotoolsNewMakeGenerator extends MarkerGenerator {
 		for (int i = 0; i < configTargets.length; ++i) {
 			// try to resolve the build macros in any argument
 			try {
-				String resolved =
+				String resolved = ManagedBuildManager.getBuildMacroProvider().resolveValueToMakefileFormat(
-					ManagedBuildManager.getBuildMacroProvider().resolveValueToMakefileFormat(
+						configTargets[i], "", //$NON-NLS-1$
-							configTargets[i],
 						" ", //$NON-NLS-1$
-							" ", //$NON-NLS-1$
+						IBuildMacroProvider.CONTEXT_CONFIGURATION, cfg);
-							IBuildMacroProvider.CONTEXT_CONFIGURATION,
-							cfg);
 				configTargets[i] = resolved;
 			} catch (BuildMacroException e) {
 			}
@@ -880,9 +851,7 @@ public class AutotoolsNewMakeGenerator extends MarkerGenerator {
 		String[] msgs = new String[2];
 		msgs[0] = commandPath.toString();
 		msgs[1] = project.getName();
-		monitor.subTask(AutotoolsPlugin.getFormattedString(
+		monitor.subTask(AutotoolsPlugin.getFormattedString("MakeGenerator.make.message", msgs)); //$NON-NLS-1$
-				"MakeGenerator.make.message", msgs)); //$NON-NLS-1$
-
 
 		StringBuilder buf = new StringBuilder();
 
@@ -908,14 +877,13 @@ public class AutotoolsNewMakeGenerator extends MarkerGenerator {
 			ICommandLauncher launcher = new RemoteCommandLauncher(commandLauncher);
 			launcher.setProject(project);
 			// Set the environment
-			IEnvironmentVariable variables[] = 
+			IEnvironmentVariable variables[] = CCorePlugin.getDefault().getBuildEnvironmentManager().getVariables(cdesc,
-					CCorePlugin.getDefault().getBuildEnvironmentManager().getVariables(cdesc, true);
+					true);
 			String[] env = null;
 			ArrayList<String> envList = new ArrayList<>();
 			if (variables != null) {
 				for (int i = 0; i < variables.length; i++) {
-					envList.add(variables[i].getName()
+					envList.add(variables[i].getName() + "=" + variables[i].getValue()); //$NON-NLS-1$
-							+ "=" + variables[i].getValue()); //$NON-NLS-1$
 				}
 				env = envList.toArray(new String[envList.size()]);
 			}
@@ -1038,24 +1006,19 @@ public class AutotoolsNewMakeGenerator extends MarkerGenerator {
 				ByteArrayOutputStream out = new ByteArrayOutputStream();
 				// Fix Bug 423192 - use environment variables when checking the Win OS Type using
 				// a shell command as the path to sh may be specified there
-				IEnvironmentVariable variables[] = 
+				IEnvironmentVariable variables[] = CCorePlugin.getDefault().getBuildEnvironmentManager()
-						CCorePlugin.getDefault().getBuildEnvironmentManager().getVariables(cdesc, true);
+						.getVariables(cdesc, true);
 				String[] env = new String[0];
 				ArrayList<String> envList = new ArrayList<>();
 				if (variables != null) {
 					for (int i = 0; i < variables.length; i++) {
-							envList.add(variables[i].getName()
+						envList.add(variables[i].getName() + "=" + variables[i].getValue()); //$NON-NLS-1$
-									+ "=" + variables[i].getValue()); //$NON-NLS-1$
 					}
 					env = envList.toArray(new String[envList.size()]);
 				}
 
-				launcher.execute(
+				launcher.execute(new Path(SHELL_COMMAND), new String[] { "-c", "echo $OSTYPE" }, //$NON-NLS-1$ //$NON-NLS-2$
-						new Path(SHELL_COMMAND), //$NON-NLS-1$
+						env, buildLocation, SubMonitor.convert(monitor));
-						new String[] { "-c", "echo $OSTYPE" }, //$NON-NLS-1$ //$NON-NLS-2$
-						env,
-						buildLocation,
-						SubMonitor.convert(monitor));
 				if (launcher.waitAndRead(out, out) == ICommandLauncher.OK)
 					winOSType = out.toString().trim();
 			} catch (CoreException e) {
@@ -1118,8 +1081,7 @@ public class AutotoolsNewMakeGenerator extends MarkerGenerator {
 
 	// Run an autotools script (e.g. configure, autogen.sh, config.status).
 	private int runScript(ICommandLauncher commandLauncher, IPath commandPath, IPath runPath, String[] args,
-			String jobDescription, String errMsg,
+			String jobDescription, String errMsg, IConsole console, List<String> additionalEnvs, boolean consoleStart)
-			IConsole console, List<String> additionalEnvs, boolean consoleStart)
 			throws CoreException, NullPointerException, IOException {
 
 		int rc = IStatus.OK;
@@ -1141,8 +1103,7 @@ public class AutotoolsNewMakeGenerator extends MarkerGenerator {
 
 		// Fix for bug #343879
 		String osName = getOSName();
-        if (osName.equals(Platform.OS_WIN32)
+		if (osName.equals(Platform.OS_WIN32) || osName.equals(Platform.OS_MACOSX))
-                || osName.equals(Platform.OS_MACOSX))
 			removePWD = true;
 
 		// Fix for bug #343731 and bug #371277
@@ -1162,13 +1123,10 @@ public class AutotoolsNewMakeGenerator extends MarkerGenerator {
 		for (int i = 0; i < configTargets.length; ++i) {
 			// try to resolve the build macros in any argument
 			try {
-				String resolved =
+				String resolved = ManagedBuildManager.getBuildMacroProvider().resolveValueToMakefileFormat(
-					ManagedBuildManager.getBuildMacroProvider().resolveValueToMakefileFormat(
+						configTargets[i], "", //$NON-NLS-1$
-							configTargets[i],
 						" ", //$NON-NLS-1$
-							" ", //$NON-NLS-1$
+						IBuildMacroProvider.CONTEXT_CONFIGURATION, cfg);
-							IBuildMacroProvider.CONTEXT_CONFIGURATION,
-							cfg);
 				// strip any env-var settings from options
 				// fix for bug #356278
 				if (resolved.length() > 0 && resolved.charAt(0) != '-')
@@ -1181,9 +1139,7 @@ public class AutotoolsNewMakeGenerator extends MarkerGenerator {
 		String[] msgs = new String[2];
 		msgs[0] = commandPath.toString();
 		msgs[1] = project.getName();
-		monitor.subTask(AutotoolsPlugin.getFormattedString(
+		monitor.subTask(AutotoolsPlugin.getFormattedString("MakeGenerator.make.message", msgs)); //$NON-NLS-1$
-				"MakeGenerator.make.message", msgs)); //$NON-NLS-1$
-
 
 		StringBuilder buf = new StringBuilder();
 
@@ -1205,8 +1161,7 @@ public class AutotoolsNewMakeGenerator extends MarkerGenerator {
 			// Display command-line environment variables that have been stripped by us
 			// because launch showCommand won't do this.
 			if (additionalEnvs != null && additionalEnvs.size() > 0) {
-				buf.append(AutotoolsPlugin
+				buf.append(AutotoolsPlugin.getResourceString("MakeGenerator.commandline.envvars"));
-							.getResourceString("MakeGenerator.commandline.envvars"));
 				buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$	//$NON-NLS-2$
 				buf.append("\t");
 				for (int i = 0; i < additionalEnvs.size(); ++i) {
@@ -1223,8 +1178,8 @@ public class AutotoolsNewMakeGenerator extends MarkerGenerator {
 			ICommandLauncher launcher = new RemoteCommandLauncher(commandLauncher);
 			launcher.setProject(project);
 			// Set the environment
-			IEnvironmentVariable variables[] = 
+			IEnvironmentVariable variables[] = CCorePlugin.getDefault().getBuildEnvironmentManager().getVariables(cdesc,
-					CCorePlugin.getDefault().getBuildEnvironmentManager().getVariables(cdesc, true);
+					true);
 			String[] env = null;
 			ArrayList<String> envList = new ArrayList<>();
 			if (variables != null) {
@@ -1243,8 +1198,7 @@ public class AutotoolsNewMakeGenerator extends MarkerGenerator {
 							if (value.charAt(value.length() - 1) == IPath.SEPARATOR)
 								value = value.substring(0, value.length() - 1);
 						}
-						envList.add(variables[i].getName()
+						envList.add(variables[i].getName() + "=" + value); //$NON-NLS-1$
-								+ "=" + value); //$NON-NLS-1$
 					}
 				}
 				if (additionalEnvs != null)
@@ -1369,7 +1323,8 @@ public class AutotoolsNewMakeGenerator extends MarkerGenerator {
 		targetElem.setAttribute(TARGET_ATTR_ID, target.getTargetBuilderID());
 		targetElem.setAttribute(TARGET_ATTR_PATH, target.getContainer().getProjectRelativePath().toString());
 		ICStorageElement elem = targetElem.createChild(TARGET_COMMAND);
-		elem.setValue(target.getBuildAttribute(IMakeCommonBuildInfo.BUILD_COMMAND, builder.getBuildCommand().toOSString()));
+		elem.setValue(
+				target.getBuildAttribute(IMakeCommonBuildInfo.BUILD_COMMAND, builder.getBuildCommand().toOSString()));
 
 		String targetAttr = target.getBuildAttribute(IMakeCommonBuildInfo.BUILD_ARGUMENTS, null);
 		if (targetAttr != null) {
@@ -1446,8 +1401,7 @@ public class AutotoolsNewMakeGenerator extends MarkerGenerator {
 		String statusMsg = AutotoolsPlugin.getResourceString("MakeGenerator.refresh.MakeTargets"); //$NON-NLS-1$
 		monitor.subTask(statusMsg);
 
-		IMakeTargetManager makeTargetManager = 
+		IMakeTargetManager makeTargetManager = MakeCorePlugin.getDefault().getTargetManager();
-			MakeCorePlugin.getDefault().getTargetManager();
 
 		IMakefile makefile = MakeCorePlugin.createMakefile(makefileFile.toURI(), false, null);
 		ITargetRule[] targets = makefile.getTargetRules();
@@ -1473,8 +1427,7 @@ public class AutotoolsNewMakeGenerator extends MarkerGenerator {
 		// create and thus avoid an extraneous event notification on a change to
 		// the MakeTarget.  The dummy target should have an invalid name for
 		// a normal make target.
-		IMakeTarget dummyTarget = makeTargetManager.createTarget(
+		IMakeTarget dummyTarget = makeTargetManager.createTarget(project, "\ndummyTarget\n", targetBuildID); //$NON-NLS-1$
-				project, "\ndummyTarget\n", targetBuildID); //$NON-NLS-1$
 		makeTargetManager.setTargets(project, new IMakeTarget[] { dummyTarget });
 
 		for (int i = 0; i < targets.length; i++) {
@@ -1487,8 +1440,7 @@ public class AutotoolsNewMakeGenerator extends MarkerGenerator {
 				// existing MakeTarget will cause events to occur on every
 				// modification whereas a new MakeTarget not yet added will
 				// not cause this delay.
-				IMakeTarget makeTarget = makeTargetManager.createTarget(
+				IMakeTarget makeTarget = makeTargetManager.createTarget(project, targetName, targetBuildID);
-								project, targetName, targetBuildID);
 				makeTarget.setContainer(project);
 				makeTarget.setStopOnError(isStopOnError);
 				makeTarget.setRunAllBuilders(false);
@@ -1497,12 +1449,10 @@ public class AutotoolsNewMakeGenerator extends MarkerGenerator {
 				makeTarget.setBuildAttribute(IMakeCommonBuildInfo.BUILD_COMMAND, defaultBuildCommand);
 
 				makeTarget.setBuildAttribute(GENERATED_TARGET, "true"); //$NON-NLS-1$
-				makeTarget.setBuildAttribute(IMakeTarget.BUILD_TARGET,
+				makeTarget.setBuildAttribute(IMakeTarget.BUILD_TARGET, targetName);
-						targetName);
 
 				//TODO: should this be raw build directory in macro form?
-				makeTarget.setBuildAttribute(IMakeCommonBuildInfo.BUILD_LOCATION,
+				makeTarget.setBuildAttribute(IMakeCommonBuildInfo.BUILD_LOCATION, buildDir);
-						buildDir);
 				makeTargets.put(makeTarget.getName(), makeTarget);
 			} catch (CoreException e) {
 				// Duplicate target.  Ignore.
@@ -1539,8 +1489,7 @@ public class AutotoolsNewMakeGenerator extends MarkerGenerator {
 		return !(targetName.endsWith("-am") //$NON-NLS-1$
 				|| targetName.endsWith("PROGRAMS") //$NON-NLS-1$
 				|| targetName.endsWith("-generic") //$NON-NLS-1$
-				|| (targetName.indexOf('$') >= 0)
+				|| (targetName.indexOf('$') >= 0) || (targetName.charAt(0) == '.')
-				|| (targetName.charAt(0) == '.')
 				|| targetName.equals(targetName.toUpperCase()));
 	}
 

build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/AutotoolsProblemMarkerInfo.java

@@ -25,15 +25,11 @@ import org.eclipse.core.runtime.IPath;
 public class AutotoolsProblemMarkerInfo {
 
 	public static enum Type {
-		PACKAGE,
+		PACKAGE, HEADER, PROG,
-		HEADER,
-		PROG,
 		/**
 		 * @since 1.2
 		 */
-		LIB,
+		LIB, FILE, GENERIC
-		FILE,
-		GENERIC
 	}
 
 	private ProblemMarkerInfo marker;
@@ -42,12 +38,13 @@ public class AutotoolsProblemMarkerInfo {
 		this(file, -1, description, severity, null, null, name, type);
 	}
 
-	public AutotoolsProblemMarkerInfo(IResource file, int lineNumber, String description, int severity, String variableName, Type type) {
+	public AutotoolsProblemMarkerInfo(IResource file, int lineNumber, String description, int severity,
+			String variableName, Type type) {
 		this(file, lineNumber, description, severity, variableName, null, null, type);
 	}
 
-	public AutotoolsProblemMarkerInfo(IResource file, int lineNumber, String description, int severity, String variableName, 
+	public AutotoolsProblemMarkerInfo(IResource file, int lineNumber, String description, int severity,
-			IPath externalPath, String libraryInfo, Type type) {
+			String variableName, IPath externalPath, String libraryInfo, Type type) {
 		this.marker = new ProblemMarkerInfo(file, lineNumber, description, severity, variableName, externalPath);
 
 		marker.setAttribute(IAutotoolsMarker.MARKER_PROBLEM_TYPE, type.name());

build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/AutotoolsPropertyConstants.java

@@ -16,17 +16,18 @@ package org.eclipse.cdt.internal.autotools.core;
 import org.eclipse.cdt.autotools.core.AutotoolsPlugin;
 import org.eclipse.core.runtime.QualifiedName;
 
-
 public class AutotoolsPropertyConstants {
 
 	static final String PREFIX = AutotoolsPlugin.getUniqueIdentifier() + "."; //$NON-NLS-1$
 	static final String PREFIX_COMPAT = "org.eclipse.linuxtools.cdt.autotools."; //$NON-NLS-1$
 	public static final String AUTOMAKE_VERSION_STRING = "AutoconfEditorAutomakeVersion"; //$NON-NLS-1$
 	public static final QualifiedName AUTOMAKE_VERSION = new QualifiedName(PREFIX, AUTOMAKE_VERSION_STRING);
-	public static final QualifiedName AUTOMAKE_VERSION_COMPAT = new QualifiedName(PREFIX_COMPAT, AUTOMAKE_VERSION_STRING);
+	public static final QualifiedName AUTOMAKE_VERSION_COMPAT = new QualifiedName(PREFIX_COMPAT,
+			AUTOMAKE_VERSION_STRING);
 	public static final String AUTOCONF_VERSION_STRING = "AutoconfEditorAutoconfVersion"; //$NON-NLS-1$
 	public static final QualifiedName AUTOCONF_VERSION = new QualifiedName(PREFIX, AUTOCONF_VERSION_STRING);
-	public static final QualifiedName AUTOCONF_VERSION_COMPAT = new QualifiedName(PREFIX_COMPAT, AUTOCONF_VERSION_STRING);
+	public static final QualifiedName AUTOCONF_VERSION_COMPAT = new QualifiedName(PREFIX_COMPAT,
+			AUTOCONF_VERSION_STRING);
 	public static final String AUTOCONF_MACRO_VERSIONING = "AutoconfEditorMacroVersioning"; //$NON-NLS-1$
 	public static final QualifiedName AUTOCONF_TOOL = new QualifiedName(PREFIX, "AutoconfToolPath"); //$NON-NLS-1$
 	public static final QualifiedName AUTOMAKE_TOOL = new QualifiedName(PREFIX, "AutomakeToolPath"); //$NON-NLS-1$

build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/ErrorParser.java

@@ -36,15 +36,12 @@ import org.eclipse.core.runtime.Path;
 // which is similar to the CDT one.
 public class ErrorParser extends MarkerGenerator implements IErrorParser {
 	public static final String ID = AutotoolsPlugin.PLUGIN_ID + ".errorParser"; //$NON-NLS-1$
-	private Pattern pkgconfigError = 
+	private Pattern pkgconfigError = Pattern
-			Pattern.compile(".*?(configure:\\s+error:\\s+Package requirements\\s+\\((.*?)\\)\\s+were not met).*"); //$NON-NLS-1$
+			.compile(".*?(configure:\\s+error:\\s+Package requirements\\s+\\((.*?)\\)\\s+were not met).*"); //$NON-NLS-1$
-	private Pattern genconfigError = 
+	private Pattern genconfigError = Pattern.compile(".*?configure:\\s+error:\\s+(.*)"); //$NON-NLS-1$
-			Pattern.compile(".*?configure:\\s+error:\\s+(.*)"); //$NON-NLS-1$
+	private Pattern checkingFail = Pattern.compile("checking for (.*)\\.\\.\\. no"); //$NON-NLS-1$
-	private Pattern checkingFail = 
-			Pattern.compile("checking for (.*)\\.\\.\\. no"); //$NON-NLS-1$
 
-	private Pattern changingConfigDirectory = 
+	private Pattern changingConfigDirectory = Pattern.compile("Configuring in (.*)"); //$NON-NLS-1$
-			Pattern.compile("Configuring in (.*)"); //$NON-NLS-1$
 
 	private IPath buildDir;
 	private IPath sourcePath;
@@ -59,8 +56,7 @@ public class ErrorParser extends MarkerGenerator implements IErrorParser {
 	}
 
 	@Override
-	public boolean processLine(String line,
+	public boolean processLine(String line, org.eclipse.cdt.core.ErrorParserManager eoParser) {
-			org.eclipse.cdt.core.ErrorParserManager eoParser) {
 
 		if (this.project == null)
 			this.project = eoParser.getProject();
@@ -114,7 +110,8 @@ public class ErrorParser extends MarkerGenerator implements IErrorParser {
 
 		m = pkgconfigError.matcher(line);
 		if (m.matches()) {
-			return new AutotoolsProblemMarkerInfo(getProject(), -1, m.group(1), SEVERITY_ERROR_BUILD, null, null, m.group(2), AutotoolsProblemMarkerInfo.Type.PACKAGE);
+			return new AutotoolsProblemMarkerInfo(getProject(), -1, m.group(1), SEVERITY_ERROR_BUILD, null, null,
+					m.group(2), AutotoolsProblemMarkerInfo.Type.PACKAGE);
 		}
 
 		m = genconfigError.matcher(line);
@@ -129,7 +126,8 @@ public class ErrorParser extends MarkerGenerator implements IErrorParser {
 			// Find the log file containing this check
 			AutotoolsProblemMarkerInfo.Type type = getCheckType(m.group(1));
 			if (type != null)
-				return new AutotoolsProblemMarkerInfo(getProject(), "Missing " + type + " " + m.group(1), SEVERITY_INFO, m.group(1), type);
+				return new AutotoolsProblemMarkerInfo(getProject(), "Missing " + type + " " + m.group(1), SEVERITY_INFO,
+						m.group(1), type);
 		}
 
 		return null;
@@ -201,8 +199,7 @@ public class ErrorParser extends MarkerGenerator implements IErrorParser {
 		if (!file.exists())
 			return -1;
 		try (LineNumberReader reader = new LineNumberReader(new FileReader(file))) {
-			Pattern errorPattern =
+			Pattern errorPattern = Pattern.compile("configure:(\\d+): checking for " + name); //$NON-NLS-1$
-					Pattern.compile("configure:(\\d+): checking for " + name); //$NON-NLS-1$
 			String line;
 			while ((line = reader.readLine()) != null) {
 				Matcher m = errorPattern.matcher(line);

build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/ErrorParserManager.java

@@ -74,7 +74,6 @@ public class ErrorParserManager extends OutputStream {
 	private OutputStream outputStream;
 	private final StringBuilder currentLine = new StringBuilder();
 
-
 	/**
 	 * Constructor.
 	 *
@@ -85,7 +84,6 @@ public class ErrorParserManager extends OutputStream {
 		this(project, project.getLocationURI(), markerGenerator);
 	}
 
-
 	/**
 	 * URI based constructor.
 	 *
@@ -194,7 +192,6 @@ public class ErrorParserManager extends OutputStream {
 		return fDirectoryStack.size();
 	}
 
-
 	/**
 	 * Parses the input and tries to generate error or warning markers
 	 */
@@ -275,7 +272,6 @@ public class ErrorParserManager extends OutputStream {
 		return lineCounter;
 	}
 
-
 	/**
 	 * Add marker to the list of error markers.
 	 *
@@ -304,10 +300,10 @@ public class ErrorParserManager extends OutputStream {
 	 * @param varName - variable name.
 	 * @param externalPath - external path pointing to a file outside the workspace.
 	 */
-	public void generateExternalMarker(IResource file, int lineNumber, String desc, int severity, 
+	public void generateExternalMarker(IResource file, int lineNumber, String desc, int severity, String varName,
-			String varName, IPath externalPath, String libraryInfo, AutotoolsProblemMarkerInfo.Type type) {
+			IPath externalPath, String libraryInfo, AutotoolsProblemMarkerInfo.Type type) {
-		AutotoolsProblemMarkerInfo problemMarkerInfo = 
+		AutotoolsProblemMarkerInfo problemMarkerInfo = new AutotoolsProblemMarkerInfo(file, lineNumber, desc, severity,
-			new AutotoolsProblemMarkerInfo(file, lineNumber, desc, severity, varName, externalPath, libraryInfo, type);
+				varName, externalPath, libraryInfo, type);
 		addProblemMarker(problemMarkerInfo);
 	}
 
@@ -418,7 +414,6 @@ public class ErrorParserManager extends OutputStream {
 		}
 	}
 
-
 	/**
 	 * Converts a location {@link IPath} to an {@link URI}. Contrary to
 	 * {@link URIUtil#toURI(IPath)} this method does not assume that the path belongs
@@ -443,8 +438,6 @@ public class ErrorParserManager extends OutputStream {
 		return EFSExtensionManager.getDefault().createNewURIFromPath(baseURI, uriString);
 	}
 
-
-
 	/**
 	 * @param ids - array of error parser IDs
 	 * @return error parser IDs delimited with error parser delimiter ";"

build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/MarkerGenerator.java

@@ -69,8 +69,7 @@ public abstract class MarkerGenerator {
 			if (errorVar != null) {
 				marker.setAttribute(IAutotoolsMarker.MARKER_VARIABLE, errorVar);
 			}
-		}
+		} catch (CoreException e) {
-		catch (CoreException e) {
 			AutotoolsPlugin.log(e.getStatus());
 		}
 
@@ -100,7 +99,8 @@ public abstract class MarkerGenerator {
 			if (markerResource == null) {
 				markerResource = getProject();
 			}
-			IMarker[] cur = markerResource.findMarkers(IAutotoolsMarker.AUTOTOOLS_PROBLEM_MARKER, true, IResource.DEPTH_ONE);
+			IMarker[] cur = markerResource.findMarkers(IAutotoolsMarker.AUTOTOOLS_PROBLEM_MARKER, true,
+					IResource.DEPTH_ONE);
 			//			IMarker[] cur = markerResource.findMarkers(ICModelMarker.C_MODEL_PROBLEM_MARKER, true, IResource.DEPTH_ONE);
 			/*
 			 * Try to find matching markers and don't put in duplicates
@@ -110,7 +110,8 @@ public abstract class MarkerGenerator {
 					int line = ((Integer) cur[i].getAttribute(IMarker.LOCATION)).intValue();
 					int sev = ((Integer) cur[i].getAttribute(IMarker.SEVERITY)).intValue();
 					String mesg = (String) cur[i].getAttribute(IMarker.MESSAGE);
-					if (line == info.lineNumber && sev == mapMarkerSeverity(info.severity) && mesg.equals(info.description)) {
+					if (line == info.lineNumber && sev == mapMarkerSeverity(info.severity)
+							&& mesg.equals(info.description)) {
 						return;
 					}
 				}
@@ -139,9 +140,7 @@ public abstract class MarkerGenerator {
 				}
 			}
 
-			
+		} catch (CoreException e) {
-		}
-		catch (CoreException e) {
 			AutotoolsPlugin.log(e.getStatus());
 		}
 	}

build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/PkgconfigErrorResolution.java

@@ -85,13 +85,11 @@ public class PkgconfigErrorResolution implements IMarkerResolution {
 		// Note, that we won't have any pkgconfig path settings from the configure call
 		// so we can't handle the situation where the user doesn't have pkgconfig files
 		// stored in the usual place.
-		IPath pkgconfigPath = 
+		IPath pkgconfigPath = new Path("/usr/lib/pkgconfig").append(pkgName + ".pc"); //$NON-NLS-1$ //$NON-NLS-2$
-			new Path("/usr/lib/pkgconfig").append(pkgName+".pc"); //$NON-NLS-1$ //$NON-NLS-2$
 		// Get a launcher for the config command
 		RemoteCommandLauncher launcher = new RemoteCommandLauncher();
 		IPath commandPath = new Path("rpm"); //$NON-NLS-1$
-		String[] commandArgs = 
+		String[] commandArgs = new String[] { "-q", //$NON-NLS-1$
-			new String[] {"-q", //$NON-NLS-1$
 				"--queryformat", //$NON-NLS-1$
 				"%{NAME}", //$NON-NLS-1$
 				"--whatprovides", //$NON-NLS-1$
@@ -100,8 +98,7 @@ public class PkgconfigErrorResolution implements IMarkerResolution {
 			// Use CDT launcher to run rpm to query the package that provides
 			// the pkgconfig .pc file for the package in question.
 			ConsoleOutputStream output = new ConsoleOutputStream();
-			Process proc = launcher.execute(commandPath, commandArgs, null,
+			Process proc = launcher.execute(commandPath, commandArgs, null, new Path("."), new NullProgressMonitor());
-					new Path("."), new NullProgressMonitor());
 			if (proc != null) {
 				try {
 					// Close the input of the process since we will never write to
@@ -109,8 +106,7 @@ public class PkgconfigErrorResolution implements IMarkerResolution {
 					proc.getOutputStream().close();
 				} catch (IOException e) {
 				}
-				if (launcher.waitAndRead(output, output, new NullProgressMonitor())
+				if (launcher.waitAndRead(output, output, new NullProgressMonitor()) != ICommandLauncher.OK) {
-						!= ICommandLauncher.OK) {
 					AutotoolsPlugin.logErrorMessage(launcher.getErrorMessage());
 				} else {
 					String result = output.readBuffer();

build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/AutotoolsConfiguration.java

@@ -30,7 +30,6 @@ import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
 
-
 public class AutotoolsConfiguration implements IAConfiguration {
 
 	public static class Option {
@@ -125,20 +124,22 @@ public class AutotoolsConfiguration implements IAConfiguration {
 			new Option(AutotoolsOptionConstants.CATEGORY_FILENAMES, IConfigureOption.CATEGORY),
 			new Option(AutotoolsOptionConstants.OPT_PROGRAM_PREFIX, "program_prefix", IConfigureOption.STRING), //$NON-NLS-1$
 			new Option(AutotoolsOptionConstants.OPT_PROGRAM_SUFFIX, "program_suffix", IConfigureOption.STRING), //$NON-NLS-1$
-		new Option(AutotoolsOptionConstants.OPT_PROGRAM_TRANSFORM_NAME, "program_transform_name", IConfigureOption.STRING), //$NON-NLS-1$
+			new Option(AutotoolsOptionConstants.OPT_PROGRAM_TRANSFORM_NAME, "program_transform_name", //$NON-NLS-1$
+					IConfigureOption.STRING),
 			new Option(AutotoolsOptionConstants.CATEGORY_ENVVAR, IConfigureOption.CATEGORY),
 			new Option(AutotoolsOptionConstants.OPT_ENVVAR, IConfigureOption.ENVVAR),
 			new Option(AutotoolsOptionConstants.CATEGORY_FEATURES, IConfigureOption.CATEGORY),
-		new Option(AutotoolsOptionConstants.OPT_ENABLE_MAINTAINER_MODE, "enable_maintainer_mode", IConfigureOption.BIN), //$NON-NLS-1$
+			new Option(AutotoolsOptionConstants.OPT_ENABLE_MAINTAINER_MODE, "enable_maintainer_mode", //$NON-NLS-1$
-		new Option(AutotoolsOptionConstants.FLAG_CFLAGS, "cflags", AutotoolsOptionConstants.FLAG_CFLAGS_FLAGS, IConfigureOption.FLAG), //$NON-NLS-1$
+					IConfigureOption.BIN),
+			new Option(AutotoolsOptionConstants.FLAG_CFLAGS, "cflags", AutotoolsOptionConstants.FLAG_CFLAGS_FLAGS, //$NON-NLS-1$
+					IConfigureOption.FLAG),
 			new Option(AutotoolsOptionConstants.OPT_CFLAGS_DEBUG, "cflags_debug", IConfigureOption.FLAGVALUE), //$NON-NLS-1$ //$NON-NLS-2$
 			new Option(AutotoolsOptionConstants.OPT_CFLAGS_GPROF, "cflags_gprof", IConfigureOption.FLAGVALUE), //$NON-NLS-1$ //$NON-NLS-2$
 			new Option(AutotoolsOptionConstants.OPT_CFLAGS_GCOV, "cflags_gcov", IConfigureOption.FLAGVALUE), //$NON-NLS-1$ //$NON-NLS-2$
 			new Option(AutotoolsOptionConstants.OPT_USER, IConfigureOption.MULTIARG),
 			new Option(AutotoolsOptionConstants.TOOL_AUTOGEN, "autogen", "autogen.sh", IConfigureOption.TOOL), //$NON-NLS-1$
 			new Option(AutotoolsOptionConstants.CATEGORY_OPTIONS, IConfigureOption.CATEGORY),
-		new Option(AutotoolsOptionConstants.OPT_AUTOGENOPTS, IConfigureOption.MULTIARG),
+			new Option(AutotoolsOptionConstants.OPT_AUTOGENOPTS, IConfigureOption.MULTIARG), };
-	};
 
 	private static Option[] toolList;
 
@@ -244,9 +245,8 @@ public class AutotoolsConfiguration implements IAConfiguration {
 				configOptions.put(opt.name, f);
 				break;
 			case IConfigureOption.FLAGVALUE:
-				FlagValueConfigureOption fv 
+				FlagValueConfigureOption fv = new FlagValueConfigureOption(opt.name, opt.transformedName, this,
-					= new FlagValueConfigureOption(opt.name, opt.transformedName, 
+						ConfigureMessages.getParameter(opt.transformedName));
-							this, ConfigureMessages.getParameter(opt.transformedName));
 				if (defaultValue != null)
 					fv.setValue(defaultValue);
 				lastFlag.addChild(opt.name);
@@ -276,8 +276,7 @@ public class AutotoolsConfiguration implements IAConfiguration {
 					for (int j = i + 1; j < configOpts.length; ++j) {
 						Option o = configOpts[j];
 						int type = o.getType();
-						if (type != IConfigureOption.CATEGORY &&
+						if (type != IConfigureOption.CATEGORY && type != IConfigureOption.TOOL)
-								type != IConfigureOption.TOOL)
 							options.add(o);
 						else
 							return options.toArray(new Option[options.size()]);

build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/AutotoolsConfigurationManager.java

@@ -131,7 +131,6 @@ public class AutotoolsConfigurationManager implements IResourceChangeListener {
 		return cfg;
 	}
 
-	
 	public synchronized boolean isConfigurationAlreadySaved(IProject project, ICConfigurationDescription cfgd) {
 		Map<String, IAConfiguration> cfgs = getSavedConfigs(project);
 		if (cfgs != null)
@@ -189,7 +188,8 @@ public class AutotoolsConfigurationManager implements IResourceChangeListener {
 		saveConfigs(project);
 	}
 
-	public synchronized void replaceProjectConfigurations(IProject project, Map<String, IAConfiguration> cfgs, ICConfigurationDescription[] cfgds) {
+	public synchronized void replaceProjectConfigurations(IProject project, Map<String, IAConfiguration> cfgs,
+			ICConfigurationDescription[] cfgds) {
 		String projectName = project.getName();
 		configs.put(projectName, cfgs);
 		saveConfigs(project, cfgds);
@@ -223,8 +223,8 @@ public class AutotoolsConfigurationManager implements IResourceChangeListener {
 							cfgId = cfgIdNode.getNodeValue();
 						else if (nameNode != null) {
 							String cfgName = nameNode.getNodeValue();
-							ICConfigurationDescription cfgd = 
+							ICConfigurationDescription cfgd = CoreModel.getDefault().getProjectDescription(project)
-									CoreModel.getDefault().getProjectDescription(project).getConfigurationByName(cfgName);
+									.getConfigurationByName(cfgName);
 							if (cfgd != null)
 								cfgId = cfgd.getId();
 							else
@@ -339,7 +339,8 @@ public class AutotoolsConfigurationManager implements IResourceChangeListener {
 
 	public synchronized void saveConfigs(IProject project) {
 		synchronized (project) {
-			ICConfigurationDescription[] cfgds = CoreModel.getDefault().getProjectDescription(project).getConfigurations();
+			ICConfigurationDescription[] cfgds = CoreModel.getDefault().getProjectDescription(project)
+					.getConfigurations();
 			saveConfigs(project, cfgds);
 		}
 	}
@@ -353,8 +354,8 @@ public class AutotoolsConfigurationManager implements IResourceChangeListener {
 			for (int j = 0; j < tools.length; ++j) {
 				ITool tool = tools[j];
 				if (tool.getName().equals("configure")) { //$NON-NLS-1$
-					IOption option = 
+					IOption option = tool
-						tool.getOptionBySuperClassId("org.eclipse.linuxtools.cdt.autotools.core.option.configure.name"); //$NON-NLS-1$
+							.getOptionBySuperClassId("org.eclipse.linuxtools.cdt.autotools.core.option.configure.name"); //$NON-NLS-1$
 					IHoldsOptions h = tool;
 					try {
 						IOption optionToSet = h.getOptionToSet(option, false);
@@ -445,8 +446,8 @@ public class AutotoolsConfigurationManager implements IResourceChangeListener {
 			IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
 			IResource res = root.findMember(projectName, false);
 			if (res == null || res.getType() != IResource.PROJECT) {
-				AutotoolsPlugin.logErrorMessage(ConfigureMessages.getFormattedString(CFG_CANT_SAVE,
+				AutotoolsPlugin.logErrorMessage(
-						new String[]{projectName}));
+						ConfigureMessages.getFormattedString(CFG_CANT_SAVE, new String[] { projectName }));
 				return;
 			}
 			IProject project = (IProject) res;
@@ -496,7 +497,8 @@ public class AutotoolsConfigurationManager implements IResourceChangeListener {
 								Option option = optionList[j];
 								IConfigureOption opt = cfg.getOption(option.getName());
 								if (!opt.isCategory())
-									p.println("<option id=\"" + option.getName() + "\" value=\"" + opt.getValue() + "\"/>"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+									p.println("<option id=\"" + option.getName() + "\" value=\"" + opt.getValue() //$NON-NLS-1$//$NON-NLS-2$
+											+ "\"/>"); //$NON-NLS-1$
 							}
 							p.println("</configuration>"); //$NON-NLS-1$
 						}
@@ -553,7 +555,6 @@ public class AutotoolsConfigurationManager implements IResourceChangeListener {
 		private IConfigureOption option;
 		private final static String UNMODIFIABLE_CONFIG_OPTION = "CfgOptions.Unmodifiable.Option"; //$NON-NLS-1$
 
-
 		public AutotoolsOption(IConfigureOption option) {
 			this.option = option;
 		}
@@ -610,8 +611,8 @@ public class AutotoolsConfigurationManager implements IResourceChangeListener {
 	/**
 	 * @since 1.2
 	 */
-	public synchronized Map<String, IAutotoolsOption> getAutotoolsCfgOptions(IProject project,
+	public synchronized Map<String, IAutotoolsOption> getAutotoolsCfgOptions(IProject project, String cfgId)
-			String cfgId) throws CoreException {
+			throws CoreException {
 
 		// Verify project is valid Autotools project
 		if (project == null || !project.hasNature(AutotoolsNewProjectNature.AUTOTOOLS_NATURE_ID)) {
@@ -620,8 +621,8 @@ public class AutotoolsConfigurationManager implements IResourceChangeListener {
 		}
 
 		// Verify configuration id is valid
-		ICConfigurationDescription cfgd = 
+		ICConfigurationDescription cfgd = CoreModel.getDefault().getProjectDescription(project)
-				CoreModel.getDefault().getProjectDescription(project).getConfigurationById(cfgId);
+				.getConfigurationById(cfgId);
 		IConfiguration icfg = ManagedBuildManager.getConfigurationForDescription(cfgd);
 		if (icfg == null) {
 			throw new CoreException(new Status(IStatus.ERROR, AutotoolsPlugin.PLUGIN_ID,
@@ -637,8 +638,8 @@ public class AutotoolsConfigurationManager implements IResourceChangeListener {
 		for (Iterator<Entry<String, IConfigureOption>> i = cfgOptions.entrySet().iterator(); i.hasNext();) {
 			Map.Entry<String, IConfigureOption> entry = i.next();
 			String name = entry.getKey();
-			IAutotoolsOption configOption = 
+			IAutotoolsOption configOption = new AutotoolsOption(
-					new AutotoolsOption(entry.getValue().copy((AutotoolsConfiguration)dummyCfg));
+					entry.getValue().copy((AutotoolsConfiguration) dummyCfg));
 			options.put(name, configOption);
 		}
 

build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/AutotoolsOptionValueHandler.java

@@ -28,8 +28,7 @@ import org.eclipse.cdt.managedbuilder.core.ManagedOptionValueHandler;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
 
-public class AutotoolsOptionValueHandler extends ManagedOptionValueHandler 
+public class AutotoolsOptionValueHandler extends ManagedOptionValueHandler implements IOptionApplicability {
-	implements IOptionApplicability {
 
 	public static final String DEFAULT_BUILD_DIR = "build"; //$NON-NLS-1$
 	public static final String CONFIGURE_TOOL_ID = "org.eclipse.linuxtools.cdt.autotools.core.gnu.toolchain.tool.configure"; //$NON-NLS-1$
@@ -41,16 +40,12 @@ public class AutotoolsOptionValueHandler extends ManagedOptionValueHandler
 
 	//FIXME: Use holder to set option value, not the "option" parameter
 	@Override
-	public boolean handleValue(IBuildObject buildObject, 
+	public boolean handleValue(IBuildObject buildObject, IHoldsOptions holder, IOption option, String extraArgument,
-                   IHoldsOptions holder, 
+			int event) {
-                   IOption option,
-                   String extraArgument, int event)
-	{
 		// Get the current value of the build dir option.
 		String value = (String) option.getValue();
 
-		if (buildObject instanceof IConfiguration &&
+		if (buildObject instanceof IConfiguration && (event == IManagedOptionValueHandler.EVENT_OPEN)) {
-				(event == IManagedOptionValueHandler.EVENT_OPEN)) {
 			//			SortedSet<Integer> nums = new TreeSet<Integer>();
 			IConfiguration configuration = (IConfiguration) buildObject;
 			ICConfigurationDescription cfgd = ManagedBuildManager.getDescriptionForConfiguration(configuration);
@@ -106,22 +101,18 @@ public class AutotoolsOptionValueHandler extends ManagedOptionValueHandler
 	// IOptionApplicability methods
 
 	@Override
-	public boolean isOptionEnabled(IBuildObject configuration,
+	public boolean isOptionEnabled(IBuildObject configuration, IHoldsOptions holder, IOption option) {
-			IHoldsOptions holder, IOption option) {
 		return true;
 	}
 
 	@Override
-	public boolean isOptionUsedInCommandLine(IBuildObject configuration,
+	public boolean isOptionUsedInCommandLine(IBuildObject configuration, IHoldsOptions holder, IOption option) {
-			IHoldsOptions holder, IOption option) {
 		return false;
 	}
 
 	@Override
-	public boolean isOptionVisible(IBuildObject configuration,
+	public boolean isOptionVisible(IBuildObject configuration, IHoldsOptions holder, IOption option) {
-			IHoldsOptions holder, IOption option) {
 		return true;
 	}
 
-
 }

build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/ConfigureMessages.java

@@ -20,8 +20,7 @@ import java.util.ResourceBundle;
 public class ConfigureMessages {
 	private static final String BUNDLE_NAME = ConfigureMessages.class.getName();
 
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
+	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-			.getBundle(BUNDLE_NAME);
 
 	private ConfigureMessages() {
 	}
@@ -37,6 +36,7 @@ public class ConfigureMessages {
 	public static String getParameter(String name) {
 		return getString("Option.configure." + name + ".parm"); //$NON-NLS-1$ //$NON-NLS-2$
 	}
+
 	/**
 	 * Returns the string from the resource bundle,
 	 * or 'key' if not found.

build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/FlagValueConfigureOption.java

@@ -19,14 +19,12 @@ public class FlagValueConfigureOption extends BinConfigureOption implements IFla
 
 	private String flags;
 
-	public FlagValueConfigureOption(String name, String msgName, AutotoolsConfiguration cfg,
+	public FlagValueConfigureOption(String name, String msgName, AutotoolsConfiguration cfg, String flags) {
-			String flags) {
 		super(name, msgName, cfg);
 		this.flags = flags;
 	}
 
-	private FlagValueConfigureOption(String name, AutotoolsConfiguration cfg, String value,
+	private FlagValueConfigureOption(String name, AutotoolsConfiguration cfg, String value, String flags) {
-			String flags) {
 		super(name, cfg);
 		this.setValue(value);
 		this.flags = flags;

build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/InternalConfigureOption.java

@@ -27,8 +27,7 @@ public class InternalConfigureOption extends AbstractConfigurationOption {
 		this.value = ""; //$NON-NLS-1$
 	}
 
-	private InternalConfigureOption(String name, AutotoolsConfiguration cfg,
+	private InternalConfigureOption(String name, AutotoolsConfiguration cfg, String value) {
-			String value) {
 		super(name, cfg);
 		this.value = value;
 	}

build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/MultiArgConfigureOption.java

@@ -16,7 +16,6 @@ package org.eclipse.cdt.internal.autotools.core.configure;
 import java.util.ArrayList;
 import java.util.List;
 
-
 public class MultiArgConfigureOption extends AbstractConfigurationOption {
 
 	private String value;
@@ -33,8 +32,7 @@ public class MultiArgConfigureOption extends AbstractConfigurationOption {
 		this.value = ""; //$NON-NLS-1$
 	}
 
-	private MultiArgConfigureOption(String name, AutotoolsConfiguration cfg,
+	private MultiArgConfigureOption(String name, AutotoolsConfiguration cfg, String value) {
-			String value) {
 		super(name, cfg);
 		this.value = value;
 	}

build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/StringConfigureOption.java

@@ -13,7 +13,6 @@
  *******************************************************************************/
 package org.eclipse.cdt.internal.autotools.core.configure;
 
-
 public class StringConfigureOption extends AbstractConfigurationOption {
 
 	private String value;
@@ -28,8 +27,7 @@ public class StringConfigureOption extends AbstractConfigurationOption {
 		this.value = ""; //$NON-NLS-1$
 	}
 
-	private StringConfigureOption(String name, AutotoolsConfiguration cfg,
+	private StringConfigureOption(String name, AutotoolsConfiguration cfg, String value) {
-			String value) {
 		super(name, cfg);
 		this.value = value;
 	}

build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/wizards/NewAutotoolsProject.java

@@ -40,7 +40,6 @@ import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.Path;
 
-
 /**
  * Creates a new Project in the workspace.
  */
@@ -54,7 +53,8 @@ public class NewAutotoolsProject extends ProcessRunner {
 	}
 
 	@Override
-	public void process(TemplateCore template, ProcessArgument[] args, String processId, IProgressMonitor monitor) throws ProcessFailureException {
+	public void process(TemplateCore template, ProcessArgument[] args, String processId, IProgressMonitor monitor)
+			throws ProcessFailureException {
 		String projectName = args[0].getSimpleValue();
 		String location = args[1].getSimpleValue();
 		String artifactExtension = args[2].getSimpleValue();
@@ -134,7 +134,8 @@ public class NewAutotoolsProject extends ProcessRunner {
 			if (!option.isExtensionElement()) {
 				option.setValue(val);
 			} else {
-				IOption newOption = config.getToolChain().createOption(option, option.getId() + "." + ManagedBuildManager.getRandomNumber(), option.getName(), false); //$NON-NLS-1$
+				IOption newOption = config.getToolChain().createOption(option,
+						option.getId() + "." + ManagedBuildManager.getRandomNumber(), option.getName(), false); //$NON-NLS-1$
 				newOption.setValue(val);
 			}
 		}

build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/wizards/SetAutotoolsStringOptionValue.java

@@ -62,11 +62,10 @@ public class SetAutotoolsStringOptionValue extends ProcessRunner {
 	private void setOptionValue(IProject projectHandle, String id, String value) {
 
 		AutotoolsConfigurationManager.getInstance().syncConfigurations(projectHandle);
-		ICConfigurationDescription[] cfgds =
+		ICConfigurationDescription[] cfgds = CoreModel.getDefault().getProjectDescription(projectHandle)
-			CoreModel.getDefault().getProjectDescription(projectHandle).getConfigurations();
+				.getConfigurations();
 		if (cfgds != null && cfgds.length >= 1) {
-			IAConfiguration iaConfig =
+			IAConfiguration iaConfig = AutotoolsConfigurationManager.getInstance().getConfiguration(projectHandle,
-				AutotoolsConfigurationManager.getInstance().getConfiguration(projectHandle,
 					cfgds[0].getId());
 			iaConfig.setOption(id, value);
 		}

build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/AutomatedIntegrationSuite.java

@@ -19,16 +19,8 @@ import org.junit.runners.Suite;
 
 /** On Windows requires either Cygwin or MinGW to be in PATH */
 @RunWith(Suite.class)
-@Suite.SuiteClasses({
+@Suite.SuiteClasses({ AutotoolsProjectTest0.class, AutotoolsProjectNatureTest.class, AutotoolsProjectTest1.class,
-	AutotoolsProjectTest0.class,
+		AutotoolsProjectTest2.class, AutotoolsVirtualFolderTest.class, AutotoolsEnvironmentVarTest.class,
-	AutotoolsProjectNatureTest.class,
+		LibtoolGCCBuildCommandParserTest.class, UpdateConfigureTest.class, EditorTests.class })
-	AutotoolsProjectTest1.class,
-	AutotoolsProjectTest2.class,
-	AutotoolsVirtualFolderTest.class,
-	AutotoolsEnvironmentVarTest.class,
-	LibtoolGCCBuildCommandParserTest.class,
-	UpdateConfigureTest.class,
-	EditorTests.class
-})
 public class AutomatedIntegrationSuite {
 }

build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/AutotoolsEnvironmentVarTest.java

@@ -88,4 +88,3 @@ public class AutotoolsEnvironmentVarTest {
 		}
 	}
 }
-

build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/AutotoolsProjectNatureTest.java

@@ -28,6 +28,7 @@ public class AutotoolsProjectNatureTest {
 		if (!ProjectTools.setup())
 			fail("could not perform basic project workspace setup");
 	}
+
 	@Test
 	public void testAutotoolsProjectNature() throws Exception {
 		IProject testProject = ProjectTools.createProject("testProject");

build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/AutotoolsProjectTest0.java

@@ -30,6 +30,7 @@ import org.junit.Test;
 public class AutotoolsProjectTest0 {
 
 	private IProject testProject;
+
 	@Before
 	public void setUp() throws Exception {
 		if (!ProjectTools.setup())
@@ -72,6 +73,7 @@ public class AutotoolsProjectTest0 {
 		x = new org.eclipse.core.runtime.Path("sample/Makefile");
 		assertTrue(testProject.exists(x));
 	}
+
 	@After
 	public void tearDown() throws Exception {
 		testProject.refreshLocal(IResource.DEPTH_INFINITE, null);

build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/AutotoolsProjectTest1.java

@@ -30,6 +30,7 @@ import org.junit.Test;
 public class AutotoolsProjectTest1 {
 
 	private IProject testProject;
+
 	@Before
 	public void setUp() throws Exception {
 		if (!ProjectTools.setup())
@@ -75,6 +76,7 @@ public class AutotoolsProjectTest1 {
 		x = new org.eclipse.core.runtime.Path("sample/Makefile");
 		assertTrue(testProject.exists(x));
 	}
+
 	@After
 	public void tearDown() throws Exception {
 		testProject.refreshLocal(IResource.DEPTH_INFINITE, null);

build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/AutotoolsProjectTest2.java

@@ -33,6 +33,7 @@ import org.junit.Test;
 public class AutotoolsProjectTest2 {
 
 	private IProject testProject;
+
 	@Before
 	public void setUp() throws Exception {
 		if (!ProjectTools.setup())
@@ -89,6 +90,7 @@ public class AutotoolsProjectTest2 {
 		x = new org.eclipse.core.runtime.Path("sample/Makefile");
 		assertTrue(testProject.exists(x));
 	}
+
 	@After
 	public void tearDown() throws Exception {
 		testProject.refreshLocal(IResource.DEPTH_INFINITE, null);

build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/ProjectTools.java

@@ -60,7 +60,6 @@ import org.eclipse.ui.wizards.datatransfer.ImportOperation;
 import org.eclipse.ui.wizards.datatransfer.ZipFileStructureProvider;
 import org.osgi.framework.FrameworkUtil;
 
-
 @SuppressWarnings("restriction")
 public class ProjectTools {
 
@@ -155,8 +154,7 @@ public class ProjectTools {
 		else // otherwise, just append to project location
 			args[1] = project.getLocation().append(filePath).toOSString();
 		try {
-			Process proc = launcher.execute(commandPath, args, new String[0],
+			Process proc = launcher.execute(commandPath, args, new String[0], runPath, new NullProgressMonitor());
-					runPath, new NullProgressMonitor());
 			if (proc != null) {
 				try {
 					// Close the input of the process since we will never write to
@@ -198,7 +196,8 @@ public class ProjectTools {
 
 		@Override
 		public IConfiguration[] getSelectedConfigurations() {
-			IProjectType projectType = ManagedBuildManager.getExtensionProjectType("org.eclipse.linuxtools.cdt.autotools.core.projectType"); //$NON-NLS-1$
+			IProjectType projectType = ManagedBuildManager
+					.getExtensionProjectType("org.eclipse.linuxtools.cdt.autotools.core.projectType"); //$NON-NLS-1$
 			return projectType.getConfigurations();
 		}
 	}
@@ -217,7 +216,8 @@ public class ProjectTools {
 		try {
 			testProject.create(monitor);
 			testProject.open(monitor);
-			IProject newProject = CCorePlugin.getDefault().createCDTProject(description, testProject, SubMonitor.convert(monitor,25));
+			IProject newProject = CCorePlugin.getDefault().createCDTProject(description, testProject,
+					SubMonitor.convert(monitor, 25));
 			ConvertToAutotoolsProjectWizardTest wizard = new ConvertToAutotoolsProjectWizardTest();
 			wizard.addPages();
 			ConvertToAutotoolsProjectWizardPage page = new ConvertToAutotoolsProjectWizardPage("test", wizard);
@@ -242,10 +242,12 @@ public class ProjectTools {
 		cfg.setConfigToolDirectory(dir);
 	}
 
-	private static void importFilesFromZip(ZipFile srcZipFile, IPath destPath, IProgressMonitor monitor) throws InvocationTargetException {		
+	private static void importFilesFromZip(ZipFile srcZipFile, IPath destPath, IProgressMonitor monitor)
+			throws InvocationTargetException {
 		ZipFileStructureProvider structureProvider = new ZipFileStructureProvider(srcZipFile);
 		try {
-			ImportOperation op= new ImportOperation(destPath, structureProvider.getRoot(), structureProvider, new ImportOverwriteQuery());
+			ImportOperation op = new ImportOperation(destPath, structureProvider.getRoot(), structureProvider,
+					new ImportOverwriteQuery());
 			op.run(monitor);
 		} catch (InterruptedException e) {
 			// should not happen
@@ -266,8 +268,7 @@ public class ProjectTools {
 		IPath commandPath = new Path("sh");
 		String[] cmdargs = new String[] { "genfiles.sh" };
 		try {
-			Process proc = launcher.execute(commandPath, cmdargs, new String[0],
+			Process proc = launcher.execute(commandPath, cmdargs, new String[0], runPath, new NullProgressMonitor());
-					runPath, new NullProgressMonitor());
 			if (proc != null) {
 				try {
 					// Close the input of the process since we will never write to
@@ -276,8 +277,8 @@ public class ProjectTools {
 				} catch (IOException e) {
 				}
 
-				if (launcher.waitAndRead(stdout, stderr, SubMonitor.convert(
+				if (launcher.waitAndRead(stdout, stderr,
-						monitor, IProgressMonitor.UNKNOWN)) != CommandLauncher.OK) {
+						SubMonitor.convert(monitor, IProgressMonitor.UNKNOWN)) != CommandLauncher.OK) {
 					return false;
 				}
 			} else
@@ -289,7 +290,8 @@ public class ProjectTools {
 		return true;
 	}
 
-	private static void importFilesFromZipAndGenerate(ZipFile srcZipFile, IPath destPath, IProgressMonitor monitor) throws InvocationTargetException {
+	private static void importFilesFromZipAndGenerate(ZipFile srcZipFile, IPath destPath, IProgressMonitor monitor)
+			throws InvocationTargetException {
 		importFilesFromZip(srcZipFile, destPath, monitor);
 		if (!generateFiles(destPath))
 			throw new InvocationTargetException(new Exception("Unsuccessful test file generation"));
@@ -338,7 +340,8 @@ public class ProjectTools {
 	 * @throws CoreException Creation failed
 	 * @throws IOException Creation failed
 	 */
-	public static IContainer addSourceContainerWithImport(IProject project, String containerName, File zipFile, boolean generate) throws InvocationTargetException, CoreException, IOException {
+	public static IContainer addSourceContainerWithImport(IProject project, String containerName, File zipFile,
+			boolean generate) throws InvocationTargetException, CoreException, IOException {
 		try (ZipFile file = new ZipFile(zipFile)) {
 			IContainer root = addSourceContainer(project, containerName);
 			if (generate)
@@ -361,8 +364,10 @@ public class ProjectTools {
 	 * @throws CoreException Creation failed
 	 * @throws IOException Creation failed
 	 */
-	public static IContainer addSourceContainerWithImport(IProject project, String containerName, Path zipFilePath, boolean generate) throws InvocationTargetException, CoreException, IOException {
+	public static IContainer addSourceContainerWithImport(IProject project, String containerName, Path zipFilePath,
-		File zipFile = new File(FileLocator.toFileURL(FileLocator.find(FrameworkUtil.getBundle(ProjectTools.class), zipFilePath, null)).getFile());
+			boolean generate) throws InvocationTargetException, CoreException, IOException {
+		File zipFile = new File(FileLocator
+				.toFileURL(FileLocator.find(FrameworkUtil.getBundle(ProjectTools.class), zipFilePath, null)).getFile());
 		return addSourceContainerWithImport(project, containerName, zipFile, generate);
 	}
 
@@ -377,7 +382,8 @@ public class ProjectTools {
 	 * @throws CoreException Creation failed
 	 * @throws IOException Creation failed
 	 */
-	public static IContainer addSourceContainerWithImport(IProject project, String containerName, Path zipFilePath) throws InvocationTargetException, CoreException, IOException {
+	public static IContainer addSourceContainerWithImport(IProject project, String containerName, Path zipFilePath)
+			throws InvocationTargetException, CoreException, IOException {
 		return addSourceContainerWithImport(project, containerName, zipFilePath, false);
 	}
 
@@ -405,7 +411,8 @@ public class ProjectTools {
 	 * @return
 	 * @throws CoreException
 	 */
-	public static IFolder createLinkedFolder(IProject project, String folderName, final URI linkTarget) throws Exception {
+	public static IFolder createLinkedFolder(IProject project, String folderName, final URI linkTarget)
+			throws Exception {
 		final IFolder folderHandle = root.getFolder(project.getFullPath().append(folderName));
 
 		WorkspaceModifyOperation operation = new WorkspaceModifyOperation() {
@@ -439,7 +446,8 @@ public class ProjectTools {
 	 * <code> org.eclipse.ui.dialogs.ContainerGenerator</code> is too heavy
 	 * (creates a runnable)
 	 */
-	public static void createFolder(IFolder folder, boolean force, boolean local, IProgressMonitor monitor) throws CoreException {
+	public static void createFolder(IFolder folder, boolean force, boolean local, IProgressMonitor monitor)
+			throws CoreException {
 		if (!folder.exists()) {
 			IContainer parent = folder.getParent();
 			if (parent instanceof IFolder) {

build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/UpdateConfigureTest.java

@@ -56,6 +56,7 @@ import org.xml.sax.SAXException;
 public class UpdateConfigureTest {
 
 	private IProject testProject;
+
 	@Before
 	public void setUp() throws Exception {
 		if (!ProjectTools.setup())
@@ -80,10 +81,12 @@ public class UpdateConfigureTest {
 		ProjectTools.setConfigDir(testProject, "src");
 		ProjectTools.markExecutable(testProject, "src/autogen.sh");
 		assertTrue(ProjectTools.build());
-		ICConfigurationDescription cfgDes = CoreModel.getDefault().getProjectDescription(testProject).getActiveConfiguration();
+		ICConfigurationDescription cfgDes = CoreModel.getDefault().getProjectDescription(testProject)
+				.getActiveConfiguration();
 		IConfiguration cfg = ManagedBuildManager.getConfigurationForDescription(cfgDes);
 		assertTrue(cfg.getName().equals("Build (GNU)"));
-		Map<String, IAutotoolsOption> opts = AutotoolsConfigurationManager.getInstance().getAutotoolsCfgOptions(testProject, cfg.getId());
+		Map<String, IAutotoolsOption> opts = AutotoolsConfigurationManager.getInstance()
+				.getAutotoolsCfgOptions(testProject, cfg.getId());
 
 		IAutotoolsOption k = opts.get(AutotoolsOptionConstants.OPT_CFLAGS_GPROF);
 		k.setValue("true");
@@ -168,10 +171,12 @@ public class UpdateConfigureTest {
 		ProjectTools.setConfigDir(testProject, "src");
 		ProjectTools.markExecutable(testProject, "src/autogen.sh");
 		assertTrue(ProjectTools.build());
-		ICConfigurationDescription cfgDes = CoreModel.getDefault().getProjectDescription(testProject).getActiveConfiguration();
+		ICConfigurationDescription cfgDes = CoreModel.getDefault().getProjectDescription(testProject)
+				.getActiveConfiguration();
 		IConfiguration cfg = ManagedBuildManager.getConfigurationForDescription(cfgDes);
 		assertTrue(cfg.getName().equals("Build (GNU)"));
-		Map<String, IAutotoolsOption> opts = AutotoolsConfigurationManager.getInstance().getAutotoolsCfgOptions(testProject, cfg.getId());
+		Map<String, IAutotoolsOption> opts = AutotoolsConfigurationManager.getInstance()
+				.getAutotoolsCfgOptions(testProject, cfg.getId());
 		IAutotoolsOption configdir = opts.get(AutotoolsOptionConstants.OPT_CONFIGDIR);
 		assertEquals(configdir.getType(), IAutotoolsOption.INTERNAL);
 		assertTrue(configdir.getValue().equals("src"));
@@ -399,7 +404,6 @@ public class UpdateConfigureTest {
 		assertEquals(k.getValue(), ""); //$NON-NLS-1$
 		k.setValue("target");
 
-		
 		k = opts.get(AutotoolsOptionConstants.OPT_USER);
 		assertTrue(k.canUpdate());
 		assertEquals(k.getType(), IAutotoolsOption.MULTIARG);
@@ -415,7 +419,8 @@ public class UpdateConfigureTest {
 		// Verify last option changed has changed in our copy, but not
 		// in the actual options
 		assertEquals(k.getValue(), "true");
-		Map<String, IAutotoolsOption> opts2 = AutotoolsConfigurationManager.getInstance().getAutotoolsCfgOptions(testProject, cfg.getId());
+		Map<String, IAutotoolsOption> opts2 = AutotoolsConfigurationManager.getInstance()
+				.getAutotoolsCfgOptions(testProject, cfg.getId());
 		IAutotoolsOption k2 = opts2.get(AutotoolsOptionConstants.OPT_VERSION);
 		assertEquals(k2.getValue(), "false");
 

build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/editors/AutomakeColourizationTests.java

@@ -40,22 +40,14 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-
 public class AutomakeColourizationTests {
 
 	private ProjectTools tools;
 	private IProject project;
 	private IFile makefileAmFile;
 
-	static String makefileAmContents =
+	static String makefileAmContents = "# This is a comment" + "\n" + "if CONDITION" + "\n" + "MACRO = case1" + "\n"
-		"# This is a comment" + "\n" +
+			+ "else" + "\n" + "MACRO = case2" + "\n" + "$(MACRO)" + "\n" + "${MACRO}" + "\n" + "";
-		"if CONDITION" + "\n" +
-		"MACRO = case1" + "\n" +
-		"else" + "\n" +
-		"MACRO = case2" + "\n" +
-		"$(MACRO)" + "\n" +
-		"${MACRO}" + "\n" +
-		"";
 	private IWorkbench workbench;
 	private AutomakefileCodeScanner codeScanner;
 
@@ -100,6 +92,7 @@ public class AutomakeColourizationTests {
 	IToken getNextToken() {
 		return codeScanner.nextToken();
 	}
+
 	@Test
 	public void testAutomakeEditorColourization() {
 		// # This is a comment
@@ -222,6 +215,7 @@ public class AutomakeColourizationTests {
 		attribute = (TextAttribute) token.getData();
 		assertEquals(ColorManager.MAKE_MACRO_REF_RGB, attribute.getForeground().getRGB());
 	}
+
 	@After
 	public void tearDown() throws Exception {
 		project.delete(true, false, ProjectTools.getMonitor());

build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/editors/AutomakeEditorTests.java

@@ -28,7 +28,6 @@ import org.eclipse.ui.PlatformUI;
 import org.junit.Before;
 import org.junit.Test;
 
-
 public class AutomakeEditorTests {
 
 	private ProjectTools tools;

build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/editors/AutomakeTextHoverTest.java

@@ -35,7 +35,6 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-
 public class AutomakeTextHoverTest {
 
 	private ProjectTools tools;
@@ -56,8 +55,7 @@ public class AutomakeTextHoverTest {
 					// 32 is after the M in MACRO
 					"\t" + "echo $(MACRO)" + "\n" +
 					// 38 (before the tab)
-			"\t" + "echo $@" + "\n" +
+					"\t" + "echo $@" + "\n" + "\n" +
-			"\n" +
 					// 48
 					"target2: target1" + "\n" +
 					// 65 (before the tab)
@@ -65,13 +63,11 @@ public class AutomakeTextHoverTest {
 					// 80 (before the tab)
 					"\t" + "echo $@" + "\n" +
 					// 89 (before the tab)
-			"\t" + "echo $<" + "\n" +
+					"\t" + "echo $<" + "\n" + "\n" +
-			"\n" +
 					// 99
 					"target3: target1 target2" + "\n" +
 					// 124 (before the tab)
-			"\t" + "echo $?" + "\n" +
+					"\t" + "echo $?" + "\n" + "";
-			"";
 	private IWorkbench workbench;
 
 	@Before
@@ -131,6 +127,7 @@ public class AutomakeTextHoverTest {
 			assertEquals("target1", textHover.getHoverInfo(automakeEditor.getAutomakeSourceViewer(), hoverRegion));
 		});
 	}
+
 	@Test
 	public void testGetHoverInfoTargetName2() {
 		// hover between the $ and the @ in target2
@@ -149,6 +146,7 @@ public class AutomakeTextHoverTest {
 			assertEquals("target2", textHover.getHoverInfo(automakeEditor.getAutomakeSourceViewer(), hoverRegion));
 		});
 	}
+
 	@Test
 	public void testGetHoverInfoForTargetDependency() {
 		// hover between the $ and the < in target2
@@ -167,6 +165,7 @@ public class AutomakeTextHoverTest {
 			assertEquals("target1", textHover.getHoverInfo(automakeEditor.getAutomakeSourceViewer(), hoverRegion));
 		});
 	}
+
 	@Test
 	public void testGetHoverInfoForTargetDependencies() {
 		// hover between the $ and the ? in target3
@@ -186,6 +185,7 @@ public class AutomakeTextHoverTest {
 					textHover.getHoverInfo(automakeEditor.getAutomakeSourceViewer(), hoverRegion));
 		});
 	}
+
 	@Test
 	public void testGetHoverForMacro1() {
 		Display.getDefault().syncExec(() -> {
@@ -204,6 +204,7 @@ public class AutomakeTextHoverTest {
 			assertEquals("case1", textHover.getHoverInfo(automakeEditor.getAutomakeSourceViewer(), hoverRegion));
 		});
 	}
+
 	@Test
 	public void testGetHoverForMacro2() {
 		// hover between the M and the A in the ${MACRO} reference in target2

build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/editors/EditorTests.java

@@ -17,10 +17,6 @@ import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
 @RunWith(Suite.class)
-@Suite.SuiteClasses({
+@Suite.SuiteClasses({ AutomakeColourizationTests.class, AutomakeTextHoverTest.class, AutomakeEditorTests.class })
-	AutomakeColourizationTests.class,
-	AutomakeTextHoverTest.class,
-	AutomakeEditorTests.class
-})
 public class EditorTests {
 }

build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/AbstractTest.java

@@ -125,8 +125,7 @@ public abstract class AbstractTest {
 		SWTBotShell shell = bot.shell("Preferences");
 		shell.activate();
 		bot.text().setText("Workspace");
-		bot.waitUntil(new NodeAvailableAndSelect(bot.tree(), "General",
+		bot.waitUntil(new NodeAvailableAndSelect(bot.tree(), "General", "Workspace"));
-				"Workspace"));
 		SWTBotCheckBox buildAuto = bot.checkBox("Build automatically");
 		if (buildAuto != null && buildAuto.isChecked()) {
 			buildAuto.click();
@@ -135,10 +134,8 @@ public abstract class AbstractTest {
 		// Ensure that the C/C++ perspective is chosen automatically
 		// and doesn't require user intervention
 		bot.text().setText("Perspectives");
-		bot.waitUntil(new NodeAvailableAndSelect(bot.tree(), "General",
+		bot.waitUntil(new NodeAvailableAndSelect(bot.tree(), "General", "Perspectives"));
-				"Perspectives"));
+		clickRadioButtonInGroup("Always open", "Open the associated perspective when creating a new project");
-		clickRadioButtonInGroup("Always open",
-				"Open the associated perspective when creating a new project");
 		bot.button("OK").click();
 
 		AbstractTest.projectName = projectName;
@@ -146,18 +143,15 @@ public abstract class AbstractTest {
 		shell = bot.shell("New Project");
 		shell.activate();
 		bot.text().setText("C Project");
-		bot.waitUntil(new NodeAvailableAndSelect(bot.tree(), "C/C++",
+		bot.waitUntil(new NodeAvailableAndSelect(bot.tree(), "C/C++", "C Project"));
-				"C Project"));
 		bot.button("Next >").click();
 
 		bot.textWithLabel("Project name:").setText(projectName);
-		bot.tree().expandNode("GNU Autotools")
+		bot.tree().expandNode("GNU Autotools").select("Hello World ANSI C Autotools Project");
-		.select("Hello World ANSI C Autotools Project");
 		bot.button("Finish").click();
 		bot.waitUntil(Conditions.shellCloses(shell));
 
-		IProjectNature nature = checkProject().getNature(
+		IProjectNature nature = checkProject().getNature("org.eclipse.cdt.autotools.core.autotoolsNatureV2");
-				"org.eclipse.cdt.autotools.core.autotoolsNatureV2");
 		assertNotNull(nature);
 
 		projectExplorer = bot.viewByTitle("Project Explorer");
@@ -186,8 +180,7 @@ public abstract class AbstractTest {
 		 * @param node
 		 *			The text of the node to select.
 		 */
-		public NodeAvailableAndSelect(SWTBotTree tree, String parent,
+		public NodeAvailableAndSelect(SWTBotTree tree, String parent, String node) {
-				String node) {
 			this.tree = tree;
 			this.node = node;
 			this.parent = parent;
@@ -215,10 +208,8 @@ public abstract class AbstractTest {
 	 */
 	public static void enterProjectFolder() {
 		projectExplorer.setFocus();
-		projectExplorer.bot().tree().select(projectName).contextMenu("Go Into")
+		projectExplorer.bot().tree().select(projectName).contextMenu("Go Into").click();
-		.click();
+		bot.waitUntil(waitForWidget(WidgetMatcherFactory.withText(projectName), projectExplorer.getWidget()));
-		bot.waitUntil(waitForWidget(WidgetMatcherFactory.withText(projectName),
-				projectExplorer.getWidget()));
 	}
 
 	/**
@@ -233,8 +224,7 @@ public abstract class AbstractTest {
 			// If the "Forward" button is not found, already at the top level.
 			return;
 		}
-		SWTBotToolbarButton backButton = projectExplorer
+		SWTBotToolbarButton backButton = projectExplorer.toolbarPushButton("Back to Workspace");
-				.toolbarPushButton("Back to Workspace");
 		if (backButton.isEnabled()) {
 			backButton.click();
 			bot.waitUntil(widgetIsEnabled(forwardButton));
@@ -247,8 +237,7 @@ public abstract class AbstractTest {
 	 * other radio button in the group that is already selected. Workaround for
 	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=344484
 	 */
-	public static void clickRadioButtonInGroup(String mnemonicText,
+	public static void clickRadioButtonInGroup(String mnemonicText, final String inGroup) {
-			final String inGroup) {
 		UIThreadRunnable.syncExec(() -> {
 			@SuppressWarnings("unchecked")
 			Matcher<Button> matcher = allOf(inGroup(inGroup), widgetOfType(Button.class),
@@ -270,13 +259,11 @@ public abstract class AbstractTest {
 		bot.radioInGroup(mnemonicText, inGroup).click();
 	}
 
-	public static void clickContextMenu(AbstractSWTBot<? extends Control> bot,
+	public static void clickContextMenu(AbstractSWTBot<? extends Control> bot, String... texts) {
-			String... texts) {
 		new SWTBotMenu(ContextMenuHelper.contextMenu(bot, texts)).click();
 	}
 
-	public static void clickVolatileContextMenu(
+	public static void clickVolatileContextMenu(AbstractSWTBot<? extends Control> bot, String... texts) {
-			AbstractSWTBot<? extends Control> bot, String... texts) {
 		int tries = 0;
 		final int maxTries = 2;
 		while (true) {
@@ -292,8 +279,7 @@ public abstract class AbstractTest {
 	}
 
 	public static void clickProjectContextMenu(String... texts) {
-		clickVolatileContextMenu(bot.viewByTitle("Project Explorer").bot()
+		clickVolatileContextMenu(bot.viewByTitle("Project Explorer").bot().tree().select(projectName), texts);
-				.tree().select(projectName), texts);
 	}
 
 	/**
@@ -314,15 +300,12 @@ public abstract class AbstractTest {
 		menu.click();
 	}
 
-	public static SWTBotShell openProperties(String parentCategory,
+	public static SWTBotShell openProperties(String parentCategory, String category) {
-			String category) {
+		clickContextMenu(projectExplorer.bot().tree().select(projectName), "Properties");
-		clickContextMenu(projectExplorer.bot().tree().select(projectName),
-				"Properties");
 		SWTBotShell shell = bot.shell("Properties for " + projectName);
 		shell.activate();
 		bot.text().setText(category);
-		bot.waitUntil(new NodeAvailableAndSelect(bot.tree(), parentCategory,
+		bot.waitUntil(new NodeAvailableAndSelect(bot.tree(), parentCategory, category));
-				category));
 		shell.activate();
 		return shell;
 	}
@@ -340,10 +323,8 @@ public abstract class AbstractTest {
 	public static SWTBotView viewConsole(String consoleType) {
 		SWTBotView view = bot.viewByPartName("Console");
 		view.setFocus();
-		SWTBotToolbarDropDownButton b = view
+		SWTBotToolbarDropDownButton b = view.toolbarDropDownButton("Display Selected Console");
-				.toolbarDropDownButton("Display Selected Console");
+		org.hamcrest.Matcher<MenuItem> withRegex = withRegex(".*" + consoleType + ".*");
-		org.hamcrest.Matcher<MenuItem> withRegex = withRegex(".*" + consoleType
-				+ ".*");
 		focusMainShell();
 		b.menuItem(withRegex).click();
 		try {
@@ -379,8 +360,7 @@ public abstract class AbstractTest {
 		for (final SWTBotShell shell : shells) {
 			if (!shell.equals(mainShell)) {
 				String shellTitle = shell.getText();
-				if (shellTitle.length() > 0
+				if (shellTitle.length() > 0 && !shellTitle.startsWith("Quick Access")) {
-						&& !shellTitle.startsWith("Quick Access")) {
 					UIThreadRunnable.syncExec(() -> {
 						if (shell.widget.getParent() != null && !shell.isOpen()) {
 							shell.close();

build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/AutomatedIntegrationSuite.java

@@ -32,8 +32,7 @@ import org.junit.runners.Suite;
 		 *  TestMakeTargets.class,
 		 *  SetConfigurationParameter.class,
 		 */
-	AutoconfTests.class
+		AutoconfTests.class })
-})
 
 public class AutomatedIntegrationSuite {
 	// needed for this class to compile
@@ -41,9 +40,7 @@ public class AutomatedIntegrationSuite {
 	public static void beforeClassMethod() {
 		// Verify that the necessary binaries are available, and if they are not,
 		// the tests will be ignored.
-		String[] testBinaryCommands = { "libtool --version",
+		String[] testBinaryCommands = { "libtool --version", "autoconf --version", "automake --version" };
-				                        "autoconf --version",
-				                        "automake --version" };
 		try {
 			for (String cmd : testBinaryCommands) {
 				Process process = ProcessFactory.getFactory().exec(cmd);

build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/SetConfigurationParameter.java

@@ -62,8 +62,7 @@ public class SetConfigurationParameter extends AbstractTest {
 		// Set the configure parameters to be --enable-jeff via user-defined
 		// options
 		SWTBotShell shell = openProperties("Autotools", "Configure Settings");
-		bot.treeWithLabel("Configure Settings").expandNode("configure")
+		bot.treeWithLabel("Configure Settings").expandNode("configure").select("Advanced");
-				.select("Advanced");
 		SWTBotText text = bot.textWithLabel("Additional command-line options");
 		text.typeText("--enable-jeff");
 		bot.button("OK").click();
@@ -71,8 +70,7 @@ public class SetConfigurationParameter extends AbstractTest {
 
 		// Create new build configurations that will be used throughout tests
 		projectExplorer.bot().tree().select(projectName);
-		clickContextMenu(projectExplorer.bot().tree().select(projectName),
+		clickContextMenu(projectExplorer.bot().tree().select(projectName), "Build Configurations", "Manage...");
-				"Build Configurations", "Manage...");
 		shell = bot.shell(projectName + ": Manage Configurations");
 		shell.activate();
 		bot.button("New...").click();
@@ -80,8 +78,7 @@ public class SetConfigurationParameter extends AbstractTest {
 		shell.activate();
 		SWTBotText t = bot.textWithLabel("Name:");
 		t.setText("debug");
-		AbstractTest.clickRadioButtonInGroup("Existing configuration",
+		AbstractTest.clickRadioButtonInGroup("Existing configuration", "Copy settings from");
-				"Copy settings from");
 		bot.button("OK").click();
 		shell = bot.shell(projectName + ": Manage Configurations");
 		shell.activate();
@@ -90,8 +87,7 @@ public class SetConfigurationParameter extends AbstractTest {
 		shell.activate();
 		t = bot.textWithLabel("Name:");
 		t.setText("default");
-		AbstractTest.clickRadioButtonInGroup("Default configuration",
+		AbstractTest.clickRadioButtonInGroup("Default configuration", "Copy settings from");
-				"Copy settings from");
 		bot.button("OK").click();
 		shell = bot.shell(projectName + ": Manage Configurations");
 		shell.activate();
@@ -145,8 +141,7 @@ public class SetConfigurationParameter extends AbstractTest {
 	@Test
 	public void t2canBuildWithConfigParm() throws Exception {
 		projectExplorer.bot().tree().select(projectName);
-		clickContextMenu(projectExplorer.bot().tree().select(projectName),
+		clickContextMenu(projectExplorer.bot().tree().select(projectName), "Build Project");
-				"Build Project");
 
 		// Wait until the project is built
 		SWTBotShell shell = bot.shell("Build Project");
@@ -192,8 +187,7 @@ public class SetConfigurationParameter extends AbstractTest {
 
 		String output = viewConsole("Configure").bot().styledText().getText();
 		// Verify we got some help output to the console
-		Pattern p = Pattern.compile(
+		Pattern p = Pattern.compile(".*WARNING:.*unrecognized.*--enable-jeff.*", Pattern.DOTALL);
-				".*WARNING:.*unrecognized.*--enable-jeff.*", Pattern.DOTALL);
 		Matcher m = p.matcher(output);
 		assertTrue(m.matches());
 
@@ -201,8 +195,7 @@ public class SetConfigurationParameter extends AbstractTest {
 		// Verifies fix for bug: #308261
 		long oldDate = f.lastModified();
 		projectExplorer.bot().tree().select(projectName);
-		clickContextMenu(projectExplorer.bot().tree().select(projectName),
+		clickContextMenu(projectExplorer.bot().tree().select(projectName), "Build Project");
-				"Build Project");
 		path = project.getLocation();
 		// We need to wait until the a.out file is created so
 		// sleep a bit and look for it...give up after 120 seconds
@@ -225,8 +218,7 @@ public class SetConfigurationParameter extends AbstractTest {
 	@Test
 	public void t3newConfigCopiesParms() throws Exception {
 		projectExplorer.bot().tree().select(projectName);
-		clickContextMenu(projectExplorer.bot().tree().select(projectName),
+		clickContextMenu(projectExplorer.bot().tree().select(projectName), "Build Configurations", "Manage...");
-				"Build Configurations", "Manage...");
 		SWTBotShell shell = bot.shell(projectName + ": Manage Configurations");
 		shell.activate();
 		shell = bot.shell(projectName + ": Manage Configurations");
@@ -248,8 +240,7 @@ public class SetConfigurationParameter extends AbstractTest {
 			}
 		}
 		assertTrue(configs.getText().contains("debug"));
-		bot.treeWithLabel("Configure Settings").expandNode("configure")
+		bot.treeWithLabel("Configure Settings").expandNode("configure").select("Advanced");
-				.select("Advanced");
 		SWTBotText text = bot.textWithLabel("Additional command-line options");
 		String val = text.getText();
 		assertEquals("--enable-jeff", val);
@@ -266,16 +257,14 @@ public class SetConfigurationParameter extends AbstractTest {
 		bot.tree().expandNode("Autotools").select("Configure Settings");
 		configs = bot.comboBoxWithLabel("Configuration: ");
 		configs.setSelection("default");
-		bot.treeWithLabel("Configure Settings").expandNode("configure")
+		bot.treeWithLabel("Configure Settings").expandNode("configure").select("Advanced");
-				.select("Advanced");
 		text = bot.textWithLabel("Additional command-line options");
 		val = text.getText();
 		assertEquals("", val);
 		bot.button("OK").click();
 		// Build the project again and verify we get a build-debug directory
 		projectExplorer.bot().tree().select(projectName);
-		clickContextMenu(projectExplorer.bot().tree().select(projectName),
+		clickContextMenu(projectExplorer.bot().tree().select(projectName), "Build Project");
-				"Build Project");
 		IWorkspace workspace = ResourcesPlugin.getWorkspace();
 		assertNotNull(workspace);
 		IWorkspaceRoot root = workspace.getRoot();
@@ -362,8 +351,7 @@ public class SetConfigurationParameter extends AbstractTest {
 		}
 		assertEquals(2, foundUser);
 
-		clickContextMenu(projectExplorer.bot().tree().select(projectName),
+		clickContextMenu(projectExplorer.bot().tree().select(projectName), "Build Configurations", "Manage...");
-				"Build Configurations", "Manage...");
 		shell = bot.shell(projectName + ": Manage Configurations");
 		shell.activate();
 		table = bot.table();
@@ -392,15 +380,13 @@ public class SetConfigurationParameter extends AbstractTest {
 		SWTBotShell shell = bot.shell("Properties for " + projectName);
 		shell.activate();
 		configs = bot.comboBoxWithLabel("Configuration: ");
-		bot.treeWithLabel("Configure Settings").expandNode("configure")
+		bot.treeWithLabel("Configure Settings").expandNode("configure").select("Advanced");
-				.select("Advanced");
 		SWTBotText text = bot.textWithLabel("Additional command-line options");
 		String setting = text.getText();
 		assertEquals("--enable-jeff", setting);
 		configs.setFocus();
 		configs.setSelection("debug");
-		bot.treeWithLabel("Configure Settings").expandNode("configure")
+		bot.treeWithLabel("Configure Settings").expandNode("configure").select("Advanced");
-				.select("Advanced");
 		text = bot.textWithLabel("Additional command-line options");
 		setting = text.getText();
 		assertEquals("", setting);
@@ -412,16 +398,14 @@ public class SetConfigurationParameter extends AbstractTest {
 		configs = bot.comboBoxWithLabel("Configuration: ");
 		configs.setSelection("debug");
 		assertTrue(configs.getText().contains("debug"));
-		bot.treeWithLabel("Configure Settings").expandNode("configure")
+		bot.treeWithLabel("Configure Settings").expandNode("configure").select("Advanced");
-				.select("Advanced");
 		text = bot.textWithLabel("Additional command-line options");
 		setting = text.getText();
 		assertEquals("--enable-jeff", setting);
 		configs.setFocus();
 		configs.setSelection("default");
 		assertTrue(configs.getText().contains("default"));
-		bot.treeWithLabel("Configure Settings").expandNode("configure")
+		bot.treeWithLabel("Configure Settings").expandNode("configure").select("Advanced");
-				.select("Advanced");
 		text = bot.textWithLabel("Additional command-line options");
 		setting = text.getText();
 		assertEquals("", setting);
@@ -455,16 +439,14 @@ public class SetConfigurationParameter extends AbstractTest {
 		configs = bot.comboBoxWithLabel("Configuration: ");
 		assertTrue(configs.getText().contains("release"));
 		assertTrue(configs.getText().contains("Active"));
-		bot.treeWithLabel("Configure Settings").expandNode("configure")
+		bot.treeWithLabel("Configure Settings").expandNode("configure").select("Advanced");
-				.select("Advanced");
 		SWTBotText text = bot.textWithLabel("Additional command-line options");
 		String setting = text.getText();
 		assertEquals("--enable-jeff", setting);
 		configs.setFocus();
 		configs.setSelection("debug");
 		assertTrue(configs.getText().contains("debug"));
-		bot.treeWithLabel("Configure Settings").expandNode("configure")
+		bot.treeWithLabel("Configure Settings").expandNode("configure").select("Advanced");
-				.select("Advanced");
 		text = bot.textWithLabel("Additional command-line options");
 		setting = text.getText();
 		assertEquals("", setting);

build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/TestEnvironmentVars.java

@@ -45,15 +45,13 @@ public class TestEnvironmentVars extends AbstractTest {
 		SWTBotShell shell = openProperties("Autotools", "Configure Settings");
 		// Set the configure parameters to be --enable-jeff via user-defined
 		// options
-		bot.treeWithLabel("Configure Settings").expandNode("configure")
+		bot.treeWithLabel("Configure Settings").expandNode("configure").select("Advanced");
-				.select("Advanced");
 		SWTBotText text = bot.textWithLabel("Additional command-line options");
 		text.typeText("${some_var}");
 		bot.button("OK").click();
 		bot.waitUntil(Conditions.shellCloses(shell), 120000);
 
-		clickContextMenu(projectExplorer.bot().tree().select(projectName),
+		clickContextMenu(projectExplorer.bot().tree().select(projectName), "Reconfigure Project");
-				"Reconfigure Project");
 		IPath path = checkProject().getLocation();
 		File f = null;
 		// We need to wait until the config.status file is created so
@@ -96,8 +94,7 @@ public class TestEnvironmentVars extends AbstractTest {
 		shell.activate();
 		bot.button("OK").click();
 		bot.waitUntil(Conditions.shellCloses(shell));
-		clickContextMenu(projectExplorer.bot().tree().select(projectName),
+		clickContextMenu(projectExplorer.bot().tree().select(projectName), "Reconfigure Project");
-				"Reconfigure Project");
 
 		IPath path = checkProject().getLocation();
 		File f = null;
@@ -148,20 +145,16 @@ public class TestEnvironmentVars extends AbstractTest {
 		bot.textWithLabel("Command").setText("");
 		// Choose three different forms, some using quotes to allow blanks in
 		// them
-		bot.textWithLabel("Command")
+		bot.textWithLabel("Command").typeText(
-				.typeText(
 				"some_var1=\"a boat\" some_var2='a train' some_var3=car fake_configure some_var4=\"a wagon\" some_var5='a plane' some_var6=skates");
 		bot.button("OK").click();
 		// Reconfigure the project and make sure the env variables are seen in
 		// the script
-		clickContextMenu(projectExplorer.bot().tree().select(projectName),
+		clickContextMenu(projectExplorer.bot().tree().select(projectName), "Reconfigure Project");
-				"Reconfigure Project");
 		focusMainShell();
 		SWTBotView consoleView = bot.viewByPartName("Console");
 		consoleView.setFocus();
-		Pattern p = Pattern.compile(
+		Pattern p = Pattern.compile(".*a boat.*a train.*car.*a wagon.*a plane.*skates.*", Pattern.DOTALL);
-				".*a boat.*a train.*car.*a wagon.*a plane.*skates.*",
-				Pattern.DOTALL);
 		bot.waitUntil(consoleTextMatches(consoleView, p));
 	}
 

build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/TestMakeTargets.java

@@ -60,8 +60,7 @@ public class TestMakeTargets extends AbstractTest {
 		assertTrue(f.exists());
 
 		projectExplorer.bot().tree().getTreeItem(projectName).select();
-		clickContextMenu(projectExplorer.bot().tree().select(projectName),
+		clickContextMenu(projectExplorer.bot().tree().select(projectName), "Build Targets", "Build...");
-				"Build Targets", "Build...");
 		shell = bot.shell("Build Targets");
 		shell.activate();
 		bot.table().getTableItem("info").select();
@@ -79,8 +78,7 @@ public class TestMakeTargets extends AbstractTest {
 		bot.button("Build").click();
 		consoleView = bot.viewByPartName("Console");
 		consoleView.setFocus();
-		p = Pattern.compile(".*make check.*Making check in src.*",
+		p = Pattern.compile(".*make check.*Making check in src.*", Pattern.DOTALL);
-				Pattern.DOTALL);
 		bot.waitUntil(consoleTextMatches(consoleView, p));
 	}
 

build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/TestToolActions.java

@@ -71,8 +71,8 @@ public class TestToolActions extends AbstractTest {
 		SWTBotView consoleView = bot.viewByPartName("Console");
 		consoleView.setFocus();
 		// Verify we got some help output to the console
-		Pattern p = Pattern.compile(".*Invoking aclocal in.*" + projectName
+		Pattern p = Pattern.compile(".*Invoking aclocal in.*" + projectName + ".*aclocal --help.*Usage: aclocal.*",
-				+ ".*aclocal --help.*Usage: aclocal.*", Pattern.DOTALL);
+				Pattern.DOTALL);
 		bot.waitUntil(consoleTextMatches(consoleView, p));
 		// Verify we still don't have an aclocal.m4 file yet
 		f = new File(path.toOSString());
@@ -85,8 +85,7 @@ public class TestToolActions extends AbstractTest {
 		bot.button("OK").click();
 		consoleView = bot.viewByPartName("Console");
 		consoleView.setFocus();
-		p = Pattern.compile(".*Invoking aclocal in.*" + projectName
+		p = Pattern.compile(".*Invoking aclocal in.*" + projectName + ".*aclocal.*", Pattern.DOTALL);
-				+ ".*aclocal.*", Pattern.DOTALL);
 		bot.waitUntil(consoleTextMatches(consoleView, p));
 		// We need to wait until the aclocal.m4 file is created so
 		// sleep a bit and look for it...give up after 20 seconds
@@ -115,8 +114,7 @@ public class TestToolActions extends AbstractTest {
 		SWTBotView consoleView = bot.viewByPartName("Console");
 		consoleView.setFocus();
 		// Verify we got some help output to the console
-		Pattern p = Pattern.compile(".*Invoking autoconf in.*" + projectName
+		Pattern p = Pattern.compile(".*Invoking autoconf in.*" + projectName + ".*autoconf.*", Pattern.DOTALL);
-				+ ".*autoconf.*", Pattern.DOTALL);
 		bot.waitUntil(consoleTextMatches(consoleView, p));
 		// We need to wait until the configure file is created so
 		// sleep a bit and look for it...give up after 20 seconds
@@ -134,13 +132,11 @@ public class TestToolActions extends AbstractTest {
 		// explorer menu directly from the configure.ac file.
 		assertTrue(f.delete());
 		enterProjectFolder();
-		clickVolatileContextMenu(
+		clickVolatileContextMenu(projectExplorer.bot().tree().select("configure.ac"), "Invoke Autotools",
-				projectExplorer.bot().tree().select("configure.ac"),
+				"Invoke Autoconf");
-				"Invoke Autotools", "Invoke Autoconf");
 		consoleView = bot.viewByPartName("Console");
 		consoleView.setFocus();
-		p = Pattern.compile(".*Invoking autoconf in.*" + projectName
+		p = Pattern.compile(".*Invoking autoconf in.*" + projectName + ".*autoconf.*", Pattern.DOTALL);
-				+ ".*autoconf.*", Pattern.DOTALL);
 		bot.waitUntil(consoleTextMatches(consoleView, p));
 		// We need to wait until the configure file is created so
 		// sleep a bit and look for it...give up after 20 seconds
@@ -181,8 +177,8 @@ public class TestToolActions extends AbstractTest {
 		SWTBotView consoleView = bot.viewByPartName("Console");
 		consoleView.setFocus();
 		// Verify we got some help output to the console
-		Pattern p = Pattern.compile(".*Invoking automake in.*" + projectName
+		Pattern p = Pattern.compile(".*Invoking automake in.*" + projectName + ".*automake --help.*Usage:.*",
-				+ ".*automake --help.*Usage:.*", Pattern.DOTALL);
+				Pattern.DOTALL);
 		bot.waitUntil(consoleTextMatches(consoleView, p));
 		// Verify we still don't have Makefile.in files yet
 		f = new File(path.toOSString());
@@ -201,8 +197,8 @@ public class TestToolActions extends AbstractTest {
 		bot.button("OK").click();
 		consoleView = bot.viewByPartName("Console");
 		consoleView.setFocus();
-		p = Pattern.compile(".*Invoking automake in.*" + projectName
+		p = Pattern.compile(
-				+ ".*automake --add-missing Makefile src/Makefile.*",
+				".*Invoking automake in.*" + projectName + ".*automake --add-missing Makefile src/Makefile.*",
 				Pattern.DOTALL);
 		bot.waitUntil(consoleTextMatches(consoleView, p));
 		// We need to wait until the Makefile.in files are created so
@@ -234,8 +230,9 @@ public class TestToolActions extends AbstractTest {
 		SWTBotView consoleView = bot.viewByPartName("Console");
 		consoleView.setFocus();
 		// Verify we got some help output to the console
-		Pattern p = Pattern.compile(".*Invoking libtoolize in.*" + projectName
+		Pattern p = Pattern.compile(
-				+ ".*libtoolize --help.*Usage: .*libtoolize.*", Pattern.DOTALL);
+				".*Invoking libtoolize in.*" + projectName + ".*libtoolize --help.*Usage: .*libtoolize.*",
+				Pattern.DOTALL);
 		bot.waitUntil(consoleTextMatches(consoleView, p));
 	}
 
@@ -250,8 +247,9 @@ public class TestToolActions extends AbstractTest {
 		SWTBotView consoleView = bot.viewByPartName("Console");
 		consoleView.setFocus();
 		// Verify we got some help output to the console
-		Pattern p = Pattern.compile(".*Invoking autoheader in.*" + projectName
+		Pattern p = Pattern.compile(
-				+ ".*autoheader --help.*Usage:.*autoheader.*", Pattern.DOTALL);
+				".*Invoking autoheader in.*" + projectName + ".*autoheader --help.*Usage:.*autoheader.*",
+				Pattern.DOTALL);
 		bot.waitUntil(consoleTextMatches(consoleView, p));
 	}
 
@@ -288,8 +286,9 @@ public class TestToolActions extends AbstractTest {
 		SWTBotView consoleView = bot.viewByPartName("Console");
 		consoleView.setFocus();
 		// Verify we got some help output to the console
-		Pattern p = Pattern.compile(".*Invoking autoreconf in.*" + projectName
+		Pattern p = Pattern.compile(
-				+ ".*autoreconf --help.*Usage: .*autoreconf.*", Pattern.DOTALL);
+				".*Invoking autoreconf in.*" + projectName + ".*autoreconf --help.*Usage: .*autoreconf.*",
+				Pattern.DOTALL);
 		bot.waitUntil(consoleTextMatches(consoleView, p));
 		clickProjectContextMenu("Invoke Autotools", "Invoke Autoreconf");
 		shell = bot.shell("Autoreconf Options");
@@ -434,8 +433,8 @@ public class TestToolActions extends AbstractTest {
 		SWTBotView consoleView = viewConsole("Autotools");
 		consoleView.setFocus();
 		// Verify we got some help output to the console
-		Pattern p = Pattern.compile(".*Invoking aclocal in.*" + projectName
+		Pattern p = Pattern.compile(".*Invoking aclocal in.*" + projectName + ".*automake --help.*Usage:.*automake.*",
-				+ ".*automake --help.*Usage:.*automake.*", Pattern.DOTALL);
+				Pattern.DOTALL);
 		bot.waitUntil(consoleTextMatches(consoleView, p));
 
 		clickProjectContextMenu("Invoke Autotools", "Invoke Automake");
@@ -446,8 +445,8 @@ public class TestToolActions extends AbstractTest {
 		consoleView = bot.viewByPartName("Console");
 		consoleView.setFocus();
 		// Verify we got some help output to the console
-		p = Pattern.compile(".*Invoking automake in.*" + projectName
+		p = Pattern.compile(".*Invoking automake in.*" + projectName + ".*autoconf --help.*Usage:.*autoconf.*",
-				+ ".*autoconf --help.*Usage:.*autoconf.*", Pattern.DOTALL);
+				Pattern.DOTALL);
 		bot.waitUntil(consoleTextMatches(consoleView, p));
 
 		clickProjectContextMenu("Invoke Autotools", "Invoke Autoheader");
@@ -458,8 +457,8 @@ public class TestToolActions extends AbstractTest {
 		consoleView = bot.viewByPartName("Console");
 		consoleView.setFocus();
 		// Verify we got some help output to the console
-		p = Pattern.compile(".*Invoking autoheader in.*" + projectName
+		p = Pattern.compile(".*Invoking autoheader in.*" + projectName + ".*autoreconf --help.*Usage:.*autoreconf.*",
-				+ ".*autoreconf --help.*Usage:.*autoreconf.*", Pattern.DOTALL);
+				Pattern.DOTALL);
 		bot.waitUntil(consoleTextMatches(consoleView, p));
 
 		clickProjectContextMenu("Invoke Autotools", "Invoke Autoreconf");
@@ -470,8 +469,8 @@ public class TestToolActions extends AbstractTest {
 		consoleView = bot.viewByPartName("Console");
 		consoleView.setFocus();
 		// Verify we got some help output to the console
-		p = Pattern.compile(".*Invoking autoreconf in.*" + projectName
+		p = Pattern.compile(".*Invoking autoreconf in.*" + projectName + ".*libtoolize --help.*Usage:.*libtoolize.*",
-				+ ".*libtoolize --help.*Usage:.*libtoolize.*", Pattern.DOTALL);
+				Pattern.DOTALL);
 		bot.waitUntil(consoleTextMatches(consoleView, p));
 
 		clickProjectContextMenu("Invoke Autotools", "Invoke Libtoolize");
@@ -482,8 +481,8 @@ public class TestToolActions extends AbstractTest {
 		consoleView = bot.viewByPartName("Console");
 		consoleView.setFocus();
 		// Verify we got some help output to the console
-		p = Pattern.compile(".*Invoking libtoolize in.*" + projectName
+		p = Pattern.compile(".*Invoking libtoolize in.*" + projectName + ".*aclocal --help.*Usage:.*aclocal.*",
-				+ ".*aclocal --help.*Usage:.*aclocal.*", Pattern.DOTALL);
+				Pattern.DOTALL);
 		bot.waitUntil(consoleTextMatches(consoleView, p));
 	}
 

build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/autoconf/AutoconfTests.java

@@ -17,11 +17,7 @@ import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
 @RunWith(Suite.class)
-@Suite.SuiteClasses({
+@Suite.SuiteClasses({ TestMacroParser.class, TestTokenizer.class, TestShellParser.class })
-	TestMacroParser.class,
-	TestTokenizer.class,
-	TestShellParser.class
-})
 public class AutoconfTests {
 
 }

build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/autoconf/BaseParserTest.java

@@ -125,8 +125,7 @@ public abstract class BaseParserTest {
 		if (!allowErrors) {
 			if (!errors.isEmpty())
 				fail("got errors" + errors.get(0));
-		}
+		} else
-		else
 			assertFalse(errors.isEmpty());
 
 		return root2;
@@ -160,7 +159,8 @@ public abstract class BaseParserTest {
 		if (possible == null)
 			fail("did not find any error: " + msgKey);
 		else
-			fail("did not find error: " + msgKey + " on line: " + line +", but found one at " + possible.getLineNumber());
+			fail("did not find error: " + msgKey + " on line: " + line + ", but found one at "
+					+ possible.getLineNumber());
 	}
 
 	/**
@@ -176,8 +176,7 @@ public abstract class BaseParserTest {
 		validateSourceElement(element);
 		AutoconfElement[] kids = element.getChildren();
 		for (int i = 0; i < kids.length; i++) {
-			if (kids[i].getStartOffset() < element.getStartOffset() 
+			if (kids[i].getStartOffset() < element.getStartOffset() || kids[i].getEndOffset() > element.getEndOffset())
-					|| kids[i].getEndOffset() > element.getEndOffset())
 				fail(describeElement(kids[i]) + " not inside parent " + describeElement(element));
 			validateSourceTree(kids[i]);
 		}
@@ -226,15 +225,15 @@ public abstract class BaseParserTest {
 		assertEquals(elements.length, assertTreeStructure(tree, elements, 0));
 	}
 
-	private int assertTreeStructure(AutoconfElement tree, String[] elements,
+	private int assertTreeStructure(AutoconfElement tree, String[] elements, int elementIdx) {
-			int elementIdx) {
 		AutoconfElement[] kids = tree.getChildren();
 		for (int j = 0; j < kids.length; j++) {
 			if (elementIdx >= elements.length || elements[elementIdx] == null) {
 				fail("extra children in " + tree + " at " + kids[j]);
 			}
 			if (!kids[j].getName().equals(elements[elementIdx]))
-				fail("did not match " + elements[elementIdx] + ", instead got " + kids[j].getClass().getSimpleName() + "=" + kids[j].getName());
+				fail("did not match " + elements[elementIdx] + ", instead got " + kids[j].getClass().getSimpleName()
+						+ "=" + kids[j].getName());
 
 			elementIdx++;
 			if (kids[j].getChildren().length > 0) {

build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/autoconf/TestMacroParser.java

@@ -25,7 +25,6 @@ import org.eclipse.cdt.autotools.ui.editors.parser.AutoconfMacroElement;
 import org.eclipse.cdt.autotools.ui.editors.parser.AutoconfParser;
 import org.junit.Test;
 
-
 /**
  * Test parsing with macros
  * @author eswartz
@@ -41,9 +40,7 @@ public class TestMacroParser extends BaseParserTest {
 	@Test
 	public void testComments() {
 		//
-		String text = 
+		String text = "dnl first line\n" + "dnl second line\n";
-			"dnl first line\n" +
-			"dnl second line\n";
 		AutoconfElement root = parse(text);
 		Object[] kids = root.getChildren();
 		// these are stripped
@@ -54,9 +51,7 @@ public class TestMacroParser extends BaseParserTest {
 	@Test
 	public void testMacroParsing1() {
 		//
-		String text =
+		String text = "AC_REQUIRE([AM_SANITY_CHECK])\n" + "";
-			"AC_REQUIRE([AM_SANITY_CHECK])\n" + 
-			"";
 		AutoconfElement root = parse(text);
 		assertTreeStructure(root, new String[] { "AC_REQUIRE", "AM_SANITY_CHECK", null });
 
@@ -82,9 +77,7 @@ public class TestMacroParser extends BaseParserTest {
 	@Test
 	public void testMacroParsing2() {
 		//
-		String text =
+		String text = "AC_TWO_ARGS(first,second)\n" + "";
-			"AC_TWO_ARGS(first,second)\n" + 
-			"";
 		AutoconfElement root = parse(text);
 		assertTreeStructure(root, new String[] { "AC_TWO_ARGS", "first", "second", null });
 
@@ -112,9 +105,7 @@ public class TestMacroParser extends BaseParserTest {
 	@Test
 	public void testMacroParsing3() {
 		//
-		String text =
+		String text = "AC_ONE_ARG( [quoted( arg ), second] )\n" + "";
-			"AC_ONE_ARG( [quoted( arg ), second] )\n" + 
-			"";
 		AutoconfElement root = parse(text);
 		assertTreeStructure(root, new String[] { "AC_ONE_ARG", "quoted( arg ), second", null });
 
@@ -140,11 +131,8 @@ public class TestMacroParser extends BaseParserTest {
 	@Test
 	public void testMacroParsing4() {
 		//
-		String text =
+		String text = "AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],\r\n"
-			"AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],\r\n" + 
+				+ "         [AM_AUTOMAKE_VERSION([1.4-p6])])\r\n" + "\r\n" + "";
-			"         [AM_AUTOMAKE_VERSION([1.4-p6])])\r\n" + 
-			"\r\n" + 
-			"";
 		AutoconfElement root = parse(text);
 		AutoconfElement[] kids = root.getChildren();
 		assertEquals(1, kids.length);
@@ -166,30 +154,15 @@ public class TestMacroParser extends BaseParserTest {
 	public void testMacroParsing5() {
 		// check that complex shell constructs don't throw off the
 		// parser, and also that we don't mistake shell tokens in a macro argument
-		String arg2 =
+		String arg2 = "AC_MSG_CHECKING(for working $2)\n"
-			"AC_MSG_CHECKING(for working $2)\n" + 
+				+ "# Run test in a subshell; some versions of sh will print an error if\n"
-			"# Run test in a subshell; some versions of sh will print an error if\n" + 
+				+ "# an executable is not found, even if stderr is redirected.\n"
-			"# an executable is not found, even if stderr is redirected.\n" + 
+				+ "# Redirect stdin to placate older versions of autoconf.  Sigh.\n"
-			"# Redirect stdin to placate older versions of autoconf.  Sigh.\n" + 
+				+ "if ($2 --version) < /dev/null > /dev/null 2>&1; then\n" + "   $1=$2\n" + "   AC_MSG_RESULT(found)\n"
-			"if ($2 --version) < /dev/null > /dev/null 2>&1; then\n" + 
+				+ "else\n" + "   $1=\"$3/missing $2\"\n" + "   AC_MSG_RESULT(missing)\n" + "fi\n" + "AC_SUBST($1)";
-			"   $1=$2\n" + 
+		String text = "AC_DEFUN([AM_MISSING_PROG],\n" + "[" + arg2 + "])\n" + "";
-			"   AC_MSG_RESULT(found)\n" + 
-			"else\n" + 
-			"   $1=\"$3/missing $2\"\n" + 
-			"   AC_MSG_RESULT(missing)\n" + 
-			"fi\n" + 
-			"AC_SUBST($1)";
-		String text =
-			"AC_DEFUN([AM_MISSING_PROG],\n" + 
-			"[" + arg2 + "])\n" + 
-			"";
 		AutoconfElement root = parse(text);
-		assertTreeStructure(root, new String[] {
+		assertTreeStructure(root, new String[] { "AC_DEFUN", "AM_MISSING_PROG", arg2, null, });
-				"AC_DEFUN", 
-					"AM_MISSING_PROG", 
-					arg2, 
-					null,
-		});
 		AutoconfElement[] kids = root.getChildren();
 		assertEquals(1, kids.length);
 		assertTrue(kids[0] instanceof AutoconfMacroElement);
@@ -210,9 +183,7 @@ public class TestMacroParser extends BaseParserTest {
 	@Test
 	public void testMacroParsing6() {
 		// empty arguments
-		String text =
+		String text = "AC_DEFUN( ,\n" + ")\n";
-			"AC_DEFUN( ,\n" +
-			")\n"; 
 		AutoconfElement root = parse(text);
 		AutoconfElement[] kids = root.getChildren();
 		assertEquals(1, kids.length);
@@ -232,32 +203,27 @@ public class TestMacroParser extends BaseParserTest {
 
 	@Test
 	public void testWithErrorUnmatchedLeftParen() {
-		String text =
+		String text = "AC_BAD_MACRO(\n";
-			"AC_BAD_MACRO(\n";
 
 		AutoconfElement root = parse(text, true);
 		assertEquals(1, root.getChildren().length);
 		assertTrue(root.getChildren()[0] instanceof AutoconfMacroElement);
 		checkError(AutoconfEditorMessages.getString(AutoconfParser.UNMATCHED_LEFT_PARENTHESIS));
 	}
+
 	@Test
 	public void testWithErrorUnmatchedRightParen() {
-		String text =
+		String text = "AC_BAD_MACRO())\n";
-			"AC_BAD_MACRO())\n";
 
 		AutoconfElement root = parse(text, true);
 		assertEquals(1, root.getChildren().length);
 		assertTrue(root.getChildren()[0] instanceof AutoconfMacroElement);
 		checkError(AutoconfEditorMessages.getString(AutoconfParser.UNMATCHED_RIGHT_PARENTHESIS));
 	}
+
 	@Test
 	public void testNoFalseUnmatchedRightParen() {
-		String text =
+		String text = "AC_BAD_MACRO()\n" + "(\n" + "cd foo;\n" + "if test -f myfile; then exit 1; fi\n" + ")\n";
-			"AC_BAD_MACRO()\n" +
-			"(\n"+
-			"cd foo;\n"+
-			"if test -f myfile; then exit 1; fi\n"+
-			")\n";
 
 		// nothing but the macro and 'if' is detected as meaningful
 		AutoconfElement root = parse(text);
@@ -268,8 +234,7 @@ public class TestMacroParser extends BaseParserTest {
 
 	@Test
 	public void testNestedMacro() {
-		String text =
+		String text = "AC_1(AC_2())\n";
-			"AC_1(AC_2())\n";
 
 		AutoconfElement root = parse(text);
 		assertEquals(1, root.getChildren().length);

build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/autoconf/TestShellParser.java

@@ -32,31 +32,18 @@ public class TestShellParser extends BaseParserTest {
 
 	@Test
 	public void testHERE() {
-		String HERE_TEXT = 
+		String HERE_TEXT = "\n" + "while true; do \n" + "AM_INIT_AUTOMAKE([confusion], [$2], EOF)\n" + "done\n";
-			"\n"+
+		String text = "cat <<EOF" + HERE_TEXT + "EOF\n" + "blah";
-			"while true; do \n"+
-			"AM_INIT_AUTOMAKE([confusion], [$2], EOF)\n"+
-			"done\n";
-		String text = "cat <<EOF"+
-			HERE_TEXT +
-			"EOF\n" +
-			"blah";
 		AutoconfElement tree = parse(text);
 
 		// only see a macro call, not a loop
 		assertTreeStructure(tree, new String[] { "AM_INIT_AUTOMAKE", "confusion", "$2", "EOF", null });
 	}
+
 	@Test
 	public void testHERE2() {
-		String HERE_TEXT = 
+		String HERE_TEXT = "\n" + "while true; do \n" + "AM_INIT_AUTOMAKE([confusion], [$2], EOF)\n" + "done\n";
-			"\n"+
+		String text = "cat <<-EOF" + HERE_TEXT + "EOF\n" + "blah";
-			"while true; do \n"+
-			"AM_INIT_AUTOMAKE([confusion], [$2], EOF)\n"+
-			"done\n";
-		String text = "cat <<-EOF"+
-			HERE_TEXT +
-			"EOF\n" +
-			"blah";
 		AutoconfElement tree = parse(text);
 
 		// only see a macro call, not a loop
@@ -65,202 +52,149 @@ public class TestShellParser extends BaseParserTest {
 
 	@Test
 	public void testIf0() {
-		String text = "# comment\n"+
+		String text = "# comment\n" + "\tif true; then\n" + "\t\tfoo;\n" + "\tfi\n";
-		"\tif true; then\n" +
-		"\t\tfoo;\n"+
-		"\tfi\n";
 		AutoconfElement tree = parse(text);
 		assertTreeStructure(tree, new String[] { "if" });
 	}
+
 	@Test
 	public void testIf1() {
-		String text = "# comment\n"+
+		String text = "# comment\n" + "\tif true; then\n" + "\t\tAC_SOMETHING();\n" + "\tfi\n";
-		"\tif true; then\n" +
-		"\t\tAC_SOMETHING();\n"+
-		"\tfi\n";
 		AutoconfElement tree = parse(text);
 		assertTreeStructure(tree, new String[] { "if", "AC_SOMETHING", "", null, null });
 	}
 
 	@Test
 	public void testIfElse0() {
-		String text = "# comment\n"+
+		String text = "# comment\n" + "\tif true; then\n" + "\t\tfoo;\n" + "\telse\n" + "\t\tbar;\n" + "\tfi\n";
-		"\tif true; then\n" +
-		"\t\tfoo;\n"+
-		"\telse\n"+
-		"\t\tbar;\n"+
-		"\tfi\n";
 		AutoconfElement tree = parse(text);
 		assertTreeStructure(tree, new String[] { "if", "else", null });
 	}
+
 	@Test
 	public void testIfElse1() {
-		String text = "# comment\n"+
+		String text = "# comment\n" + "\tif true; then\n" + "\t\tAC_ONE(...);\n" + "\telse\n"
-		"\tif true; then\n" +
+				+ "\t\tAC_TWO(AC_THREE());\n" + "\tfi\n";
-		"\t\tAC_ONE(...);\n"+
-		"\telse\n"+
-		"\t\tAC_TWO(AC_THREE());\n"+
-		"\tfi\n";
 		AutoconfElement tree = parse(text);
-		assertTreeStructure(tree, new String[] {
+		assertTreeStructure(tree, new String[] { "if", "AC_ONE", "...", null, "else", "AC_TWO", "AC_THREE", "AC_THREE",
-				"if", 
+				"", null, null, null, null, null });
-					"AC_ONE", 
-						"...", 
-					null,
-					"else", 
-						"AC_TWO", 
-							"AC_THREE",
-								"AC_THREE", 
-									"",
-								null,
-							null,  
-						null, 
-					null,
-				null});
 
 		AutoconfElement[] kids = tree.getChildren();
 		assertEqualSource("AC_ONE(...)", kids[0].getChildren()[0]);
 		assertEqualSource("AC_TWO(AC_THREE())", kids[0].getChildren()[1].getChildren()[0]);
 	}
+
 	@Test
 	public void testIf2() {
-		String text =
+		String text = "if blah\n" + "then fi\n";
-		"if blah\n" +
-		"then fi\n";
 		AutoconfElement tree = parse(text);
 		assertTreeStructure(tree, new String[] { "if" });
 	}
+
 	@Test
 	public void testIfElif() {
-		String text = "# comment\n"+
+		String text = "# comment\n" + "\tif true; then\n" + "\t\tAC_ONE(...);\n" + "\telif false; then \n"
-		"\tif true; then\n" +
+				+ "\t\tAC_TWO(...);\n" + "\tfi\n";
-		"\t\tAC_ONE(...);\n"+
-		"\telif false; then \n"+
-		"\t\tAC_TWO(...);\n"+
-		"\tfi\n";
 		AutoconfElement tree = parse(text);
-		assertTreeStructure(tree, new String[] { 
+		assertTreeStructure(tree,
-				"if", 
+				new String[] { "if", "AC_ONE", "...", null, "elif", "AC_TWO", "...", null, null, null });
-					"AC_ONE", 
-						"...", 
-					null, 
-					"elif", 
-						"AC_TWO", 
-							"...", 
-						null, 
-					null, 
-				null });
 	}
+
 	@Test
 	public void testIfErr1() {
-		String text =
+		String text = "if then fi\n";
-		"if then fi\n";
 		AutoconfElement tree = parse(text, true);
 		assertEquals(1, errors.size());
 		checkError(AutoconfEditorMessages.getFormattedString(AutoconfParser.INVALID_SPECIFIER, "then"));
 		assertTreeStructure(tree, new String[] { "if" });
 	}
+
 	@Test
 	public void testIfErr2() {
-		String text =
+		String text = "if true; do fi\n";
-		"if true; do fi\n";
 		AutoconfElement tree = parse(text, true);
 		assertEquals(1, errors.size());
 		checkError(AutoconfEditorMessages.getString(AutoconfParser.INVALID_DO));
 		assertTreeStructure(tree, new String[] { "if" });
 	}
+
 	@Test
 	public void testIfErr3() {
-		String text =
+		String text = "if; else bar; fi\n";
-		"if; else bar; fi\n";
 		AutoconfElement tree = parse(text, true);
 		assertEquals(1, errors.size());
 		checkError(AutoconfEditorMessages.getFormattedString(AutoconfParser.MISSING_SPECIFIER, "then"));
 		assertTreeStructure(tree, new String[] { "if", "else", null });
 	}
+
 	@Test
 	public void testIfErr4() {
-		String text =
+		String text = "if true; then stmt fi\n";
-		"if true; then stmt fi\n";
 		AutoconfElement tree = parse(text, true);
 		assertEquals(1, errors.size());
 		checkError(AutoconfEditorMessages.getFormattedString(AutoconfParser.INVALID_TERMINATION, "fi"));
 		assertTreeStructure(tree, new String[] { "if" });
 	}
+
 	@Test
 	public void testIfErr5() {
-		String text =
+		String text = "if true; then\n";
-		"if true; then\n";
 		AutoconfElement tree = parse(text, true);
 		assertEquals(1, errors.size());
 		checkError(AutoconfEditorMessages.getFormattedString(AutoconfParser.UNTERMINATED_CONSTRUCT, "if"));
 		assertTreeStructure(tree, new String[] { "if" });
 	}
+
 	@Test
 	public void testIfErr6() {
-		String text =
+		String text = "if true; then foo; else\n";
-		"if true; then foo; else\n";
 		AutoconfElement tree = parse(text, true);
 		assertEquals(2, errors.size());
 		checkError(AutoconfEditorMessages.getFormattedString(AutoconfParser.UNTERMINATED_CONSTRUCT, "if"));
 		checkError(AutoconfEditorMessages.getFormattedString(AutoconfParser.UNTERMINATED_CONSTRUCT, "else"));
 		assertTreeStructure(tree, new String[] { "if", "else", null });
 	}
+
 	@Test
 	public void testWhile() {
-		String text =
+		String text = "while true; do foo; done\n";
-			"while true; do foo; done\n";
 		AutoconfElement tree = parse(text);
 		assertTreeStructure(tree, new String[] { "while" });
 	}
+
 	@Test
 	public void testWhile2() {
-		String text =
+		String text = "while true\n" + "do\n" + "AC_SOMETHING(...); done\n";
-			"while true\n" +
-			"do\n"+
-			"AC_SOMETHING(...); done\n";
 		AutoconfElement tree = parse(text);
 		assertTreeStructure(tree, new String[] { "while", "AC_SOMETHING", "...", null, null });
 	}
+
 	@Test
 	public void testWhileErr() {
-		String text =
+		String text = "while; AC_SOMETHING(...) done\n";
-			"while; AC_SOMETHING(...) done\n";
 		AutoconfElement tree = parse(text, true);
 		assertEquals(2, errors.size());
 		checkError(AutoconfEditorMessages.getFormattedString(AutoconfParser.MISSING_SPECIFIER, "do"));
 		checkError(AutoconfEditorMessages.getFormattedString(AutoconfParser.INVALID_TERMINATION, "done"));
 		assertTreeStructure(tree, new String[] { "while", "AC_SOMETHING", "...", null, null });
 	}
+
 	@Test
 	public void testWhileErr2() {
-		String text =
+		String text = "while true; do AC_SOMETHING(...)\n";
-			"while true; do AC_SOMETHING(...)\n";
 		AutoconfElement tree = parse(text, true);
 		assertEquals(1, errors.size());
 		checkError(AutoconfEditorMessages.getFormattedString(AutoconfParser.UNTERMINATED_CONSTRUCT, "while"));
 		assertTreeStructure(tree, new String[] { "while", "AC_SOMETHING", "...", null, null });
 	}
+
 	@Test
 	public void testCase() {
-		String text = 
+		String text = "case $VAL in\n" + "linux-*-*) AC_FIRST($VAL) ; true ;;\n" + "bsd-* | macosx-*) : ;;\n"
-			"case $VAL in\n"+
+				+ "*) echo \"I dunno $VAL\";;\n" + "esac\n";
-			"linux-*-*) AC_FIRST($VAL) ; true ;;\n"+
-			"bsd-* | macosx-*) : ;;\n"+
-			"*) echo \"I dunno $VAL\";;\n"+
-			"esac\n";
 		AutoconfElement tree = parse(text, false);
-		assertTreeStructure(tree, new String[] { 
+		assertTreeStructure(tree,
-				"case", 
+				new String[] { "case", "linux-*-*", "AC_FIRST", "$VAL", null, null, "bsd-* | macosx-*", "*", null });
-					"linux-*-*", 
-						"AC_FIRST", 
-							"$VAL",
-							null,
-						null,
-					"bsd-* | macosx-*",
-					"*",
-					null
-					});
 
 		AutoconfElement[] kids = tree.getChildren();
 		assertEquals(1, kids.length);
@@ -289,10 +223,10 @@ public class TestShellParser extends BaseParserTest {
 		assertEquals(0, caseCond.getChildren().length);
 
 	}
+
 	@Test
 	public void testCaseErr() {
-		String text = 
+		String text = "case $VAL; linux-*-*) AC_FIRST($VAL) ; true esac\n";
-			"case $VAL; linux-*-*) AC_FIRST($VAL) ; true esac\n";
 		AutoconfElement tree = parse(text, true);
 		assertEquals(2, errors.size());
 		checkError(AutoconfEditorMessages.getString(AutoconfParser.INVALID_IN));
@@ -308,10 +242,10 @@ public class TestShellParser extends BaseParserTest {
 		assertEqualSource("AC_FIRST($VAL)", caseCond.getChildren()[0]);
 
 	}
+
 	@Test
 	public void testCaseErr2() {
-		String text = 
+		String text = "case $VAL in\n";
-			"case $VAL in\n";
 		AutoconfElement tree = parse(text, true);
 		assertEquals(1, errors.size());
 		checkError(AutoconfEditorMessages.getFormattedString(AutoconfParser.UNTERMINATED_CONSTRUCT, "case"));
@@ -319,11 +253,11 @@ public class TestShellParser extends BaseParserTest {
 		assertTreeStructure(tree, new String[] { "case" });
 
 	}
+
 	@Test
 	public void testForIn() {
 		// don't get upset by 'in'
-		String text = 
+		String text = "for VAL in 1 2 3 4; do echo $VAL; done\n";
-			"for VAL in 1 2 3 4; do echo $VAL; done\n";
 		AutoconfElement tree = parse(text, false);
 
 		assertTreeStructure(tree, new String[] { "for" });
@@ -333,123 +267,70 @@ public class TestShellParser extends BaseParserTest {
 		assertEqualSource(text.substring(0, text.length() - 1), forEl);
 
 	}
+
 	@Test
 	public void testForDo() {
 		// don't get upset by parentheses
-		String text = 
+		String text = "for (( AC_1; AC_2(); AC_3(...) )); do echo $VAL; done\n";
-			"for (( AC_1; AC_2(); AC_3(...) )); do echo $VAL; done\n";
 		AutoconfElement tree = parse(text, false);
 
 		assertTreeStructure(tree, new String[] { "for", "AC_1", "AC_2", "", null, "AC_3", "...", null, null });
 
 	}
+
 	@Test
 	public void testUntil() {
-		String text = 
+		String text = "until false; do AC_SOMETHING(...); done\n";
-			"until false; do AC_SOMETHING(...); done\n";
 		AutoconfElement tree = parse(text, false);
 		assertTreeStructure(tree, new String[] { "until", "AC_SOMETHING", "...", null, null });
 	}
+
 	@Test
 	public void testSelect() {
-		String text = 
+		String text = "select VAR in 1 2 3; do AC_SOMETHING(...); done\n" + "select VAR; do AC_SOMETHING; done\n";
-			"select VAR in 1 2 3; do AC_SOMETHING(...); done\n"+
-			"select VAR; do AC_SOMETHING; done\n";
 
 		AutoconfElement tree = parse(text, false);
-		assertTreeStructure(tree, new String[] { 
+		assertTreeStructure(tree,
-				"select", 
+				new String[] { "select", "AC_SOMETHING", "...", null, null, "select", "AC_SOMETHING", null });
-					"AC_SOMETHING", 
-						"...", 
-					null, 
-				null,
-				"select", 
-					"AC_SOMETHING", 
-				null
-		});
 	}
+
 	@Test
 	public void testComplex1() {
-		String text =
+		String text = "AM_INIT_AUTOMAKE([foo1], 1.96)\n" + "while true; do \n" + "	var=shift;\n"
-			"AM_INIT_AUTOMAKE([foo1], 1.96)\n" +
+				+ "	if [ test -f \"$var\"] ; then\n" + "		AC_SOMETHING($var);\n" + "	fi\n" + "done;\n"
-			"while true; do \n" +
+				+ "AM_GENERATE(Makefile)\n";
-			"	var=shift;\n" +
-			"	if [ test -f \"$var\"] ; then\n"+
-			"		AC_SOMETHING($var);\n"+
-			"	fi\n"+
-			"done;\n"+
-			"AM_GENERATE(Makefile)\n";
 		AutoconfElement tree = parse(text, false);
-		assertTreeStructure(tree, new String[] { 
+		assertTreeStructure(tree, new String[] { "AM_INIT_AUTOMAKE", "foo1", "1.96", null, "while", "if",
-				"AM_INIT_AUTOMAKE",
+				"AC_SOMETHING", "$var", null, null, null, "AM_GENERATE", "Makefile", null });
-					"foo1",
-					"1.96",
-				null,
-				"while",
-					"if",
-						"AC_SOMETHING",
-							"$var",
-						null,
-					null,
-				null,
-				"AM_GENERATE",
-					"Makefile",
-				null
-		});
 	}
+
 	@Test
 	public void testComplex2() {
-		String text = 
+		String text = "if true; then\n" + "AC_CANONICAL_HOST\n" + "else\n" + "case foo in \n" + "	3) 1 ;;\n"
-			"if true; then\n" + 
+				+ "esac;\n" + "fi\n";
-			"AC_CANONICAL_HOST\n" + 
-			"else\n" + 
-			"case foo in \n" + 
-			"	3) 1 ;;\n" + 
-			"esac;\n" + 
-			"fi\n";
 		AutoconfElement tree = parse(text, false);
-		assertTreeStructure(tree, new String[] {
+		assertTreeStructure(tree, new String[] { "if", "AC_CANONICAL_HOST", "else", "case", "3", null, null, null });
-				"if",
-					"AC_CANONICAL_HOST",
-					"else",
-						"case",
-							"3",
-						null,
-					null,
-				null
-		});
 	}
+
 	@Test
 	public void testEarlyClose() {
-		String text = 
+		String text = "if true; then foo ; fi\n" + "fi\n" + "while true; do done;\n";
-			"if true; then foo ; fi\n"+
-			"fi\n"+
-			"while true; do done;\n";
 		AutoconfElement tree = parse(text, true);
-		assertTreeStructure(tree, new String[] {
+		assertTreeStructure(tree, new String[] { "if", "while" });
-				"if",
-				"while"
-		});
 	}
+
 	@Test
 	public void testOverlapping() {
-		String text =
+		String text = "for foo\n" + "if bar\n";
-			"for foo\n"+
-			"if bar\n";
 		AutoconfElement tree = parse(text, true);
-		assertTreeStructure(tree, new String[] {
+		assertTreeStructure(tree, new String[] { "for", "if" });
-				"for",
-				"if"
-		});
 	}
+
 	@Test
 	public void testDollar() {
 		// dollars guard keywords
-		String text =
+		String text = "if [ $if == 3 ] ; then $for; fi\n";
-			"if [ $if == 3 ] ; then $for; fi\n";
 		AutoconfElement tree = parse(text);
-		assertTreeStructure(tree, new String[] {
+		assertTreeStructure(tree, new String[] { "if" });
-				"if"
-		});
 	}
 }

build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/autoconf/TestTokenizer.java

@@ -30,7 +30,6 @@ import org.eclipse.jface.text.Document;
 import org.eclipse.jface.text.IDocument;
 import org.junit.Test;
 
-
 /**
  * Test autoconf tokenizer.  The tokenizer mainly is used to detect boundaries and keywords
  * and is not a full shell tokenizer.
@@ -69,6 +68,7 @@ public class TestTokenizer {
 	protected void checkNoErrors() {
 		assertEquals(0, tokenizerErrors.size());
 	}
+
 	@Test
 	public void testEmpty() {
 		IDocument document = createDocument("");
@@ -76,6 +76,7 @@ public class TestTokenizer {
 		checkNoErrors();
 		assertEquals(0, tokens.size());
 	}
+
 	@Test
 	public void testEOL1() {
 		IDocument document = createDocument("\n");
@@ -84,6 +85,7 @@ public class TestTokenizer {
 		assertEquals(1, tokens.size());
 		checkToken(tokens.get(0), document, ITokenConstants.EOL, "\n");
 	}
+
 	@Test
 	public void testEOL2() {
 		IDocument document = createDocument("\r\n");
@@ -92,6 +94,7 @@ public class TestTokenizer {
 		assertEquals(1, tokens.size());
 		checkToken(tokens.get(0), document, ITokenConstants.EOL, "\r\n");
 	}
+
 	@Test
 	public void testEOL3() {
 		IDocument document = createDocument("\n\r\n\n");
@@ -102,6 +105,7 @@ public class TestTokenizer {
 		checkToken(tokens.get(1), document, ITokenConstants.EOL, "\r\n");
 		checkToken(tokens.get(2), document, ITokenConstants.EOL, "\n");
 	}
+
 	@Test
 	public void testShellText() {
 		// default mode is shell
@@ -110,13 +114,12 @@ public class TestTokenizer {
 		List<Token> tokens = tokenize(document, false);
 		checkNoErrors();
 		assertEquals(4, tokens.size());
-		checkToken(tokens.get(0), document, ITokenConstants.WORD,
+		checkToken(tokens.get(0), document, ITokenConstants.WORD, "random");
-				"random");
 		checkToken(tokens.get(1), document, ITokenConstants.EOL, "\n");
-		checkToken(tokens.get(2), document, ITokenConstants.WORD,
+		checkToken(tokens.get(2), document, ITokenConstants.WORD, "stuff");
-				"stuff");
 		checkToken(tokens.get(3), document, ITokenConstants.EOL, "\n");
 	}
+
 	@Test
 	public void testShellTokens() {
 		// default mode is shell
@@ -125,18 +128,16 @@ public class TestTokenizer {
 		List<Token> tokens = tokenize(document, false);
 		checkNoErrors();
 		assertEquals(8, tokens.size());
-		checkToken(tokens.get(0), document, ITokenConstants.SH_WHILE,
+		checkToken(tokens.get(0), document, ITokenConstants.SH_WHILE, "while");
-				"while");
+		checkToken(tokens.get(1), document, ITokenConstants.WORD, "true");
-		checkToken(tokens.get(1), document, ITokenConstants.WORD,
-				"true");
 		checkToken(tokens.get(2), document, ITokenConstants.SEMI, ";");
 		checkToken(tokens.get(3), document, ITokenConstants.SH_DO, "do");
 		checkToken(tokens.get(4), document, ITokenConstants.WORD, "ls");
 		checkToken(tokens.get(5), document, ITokenConstants.SEMI, ";");
-		checkToken(tokens.get(6), document, ITokenConstants.SH_DONE,
+		checkToken(tokens.get(6), document, ITokenConstants.SH_DONE, "done");
-				"done");
 		checkToken(tokens.get(7), document, ITokenConstants.EOL, "\n");
 	}
+
 	@Test
 	public void testShellTokens2() {
 		// don't misread partial tokens
@@ -145,11 +146,10 @@ public class TestTokenizer {
 		List<Token> tokens = tokenize(document, false);
 		checkNoErrors();
 		assertEquals(2, tokens.size());
-		checkToken(tokens.get(0), document, ITokenConstants.WORD,
+		checkToken(tokens.get(0), document, ITokenConstants.WORD, "while_stuff");
-				"while_stuff");
+		checkToken(tokens.get(1), document, ITokenConstants.WORD, "incase");
-		checkToken(tokens.get(1), document, ITokenConstants.WORD,
-				"incase");
 	}
+
 	@Test
 	public void testShellTokens3() {
 		// don't interpret m4 strings in shell mode
@@ -160,6 +160,7 @@ public class TestTokenizer {
 		assertEquals(1, tokens.size());
 		checkToken(tokens.get(0), document, ITokenConstants.SH_STRING_BACKTICK, "foo'", 5);
 	}
+
 	@Test
 	public void testShellTokens4() {
 		String text = "echo $if $((foo)) $\n";
@@ -181,6 +182,7 @@ public class TestTokenizer {
 		checkToken(tokens.get(10), document, ITokenConstants.EOL, "\n");
 
 	}
+
 	@Test
 	public void testShellTokens5() {
 		String text = "while do select for until done\n";
@@ -197,6 +199,7 @@ public class TestTokenizer {
 		checkToken(tokens.get(6), document, ITokenConstants.EOL, "\n");
 
 	}
+
 	@Test
 	public void testShellComments() {
 		// comments are stripped and ignored in the shell mode
@@ -205,10 +208,10 @@ public class TestTokenizer {
 		List<Token> tokens = tokenize(document, false);
 		checkNoErrors();
 		assertEquals(2, tokens.size());
-		checkToken(tokens.get(0), document, ITokenConstants.SH_FOR,
+		checkToken(tokens.get(0), document, ITokenConstants.SH_FOR, "for");
-				"for");
 		checkToken(tokens.get(1), document, ITokenConstants.EOL, "\n");
 	}
+
 	@Test
 	public void testShellComments2() {
 		// comments are stripped and ignored in the shell mode
@@ -221,6 +224,7 @@ public class TestTokenizer {
 		checkToken(tokens.get(1), document, ITokenConstants.EOL, "\n");
 		checkToken(tokens.get(2), document, ITokenConstants.EOL, "\n");
 	}
+
 	@Test
 	public void testM4Tokens0() {
 		String text = "while_stuff incase";
@@ -228,56 +232,49 @@ public class TestTokenizer {
 		List<Token> tokens = tokenize(document, true);
 		checkNoErrors();
 		assertEquals(2, tokens.size());
-		checkToken(tokens.get(0), document, ITokenConstants.WORD,
+		checkToken(tokens.get(0), document, ITokenConstants.WORD, "while_stuff");
-				"while_stuff");
+		checkToken(tokens.get(1), document, ITokenConstants.WORD, "incase");
-		checkToken(tokens.get(1), document, ITokenConstants.WORD,
-				"incase");
 	}
+
 	@Test
 	public void testShellStrings() {
-		String QUOTED = 
+		String QUOTED = "ls -la \"*.c\"";
-			"ls -la \"*.c\"";
 		String text = "echo `" + QUOTED + "`\n";
 		IDocument document = createDocument(text);
 		List<Token> tokens = tokenize(document, false);
 		checkNoErrors();
 		assertEquals(3, tokens.size());
-		checkToken(tokens.get(0), document, ITokenConstants.WORD,
+		checkToken(tokens.get(0), document, ITokenConstants.WORD, "echo");
-				"echo");
+		checkToken(tokens.get(1), document, ITokenConstants.SH_STRING_BACKTICK, QUOTED, QUOTED.length() + 2);
-		checkToken(tokens.get(1), document, ITokenConstants.SH_STRING_BACKTICK,
-				QUOTED, QUOTED.length() + 2);
 		checkToken(tokens.get(2), document, ITokenConstants.EOL, "\n");
 	}
+
 	@Test
 	public void testShellStrings2() {
-		String QUOTED = 
+		String QUOTED = "ls -la 'space file'";
-			"ls -la 'space file'";
 		String text = "echo \"" + QUOTED + "\"\n";
 		IDocument document = createDocument(text);
 		List<Token> tokens = tokenize(document, false);
 		checkNoErrors();
 		assertEquals(3, tokens.size());
-		checkToken(tokens.get(0), document, ITokenConstants.WORD,
+		checkToken(tokens.get(0), document, ITokenConstants.WORD, "echo");
-				"echo");
+		checkToken(tokens.get(1), document, ITokenConstants.SH_STRING_DOUBLE, QUOTED, QUOTED.length() + 2);
-		checkToken(tokens.get(1), document, ITokenConstants.SH_STRING_DOUBLE,
-				QUOTED, QUOTED.length() + 2);
 		checkToken(tokens.get(2), document, ITokenConstants.EOL, "\n");
 	}
+
 	@Test
 	public void testShellStrings3() {
-		String QUOTED = 
+		String QUOTED = "echo \"*.c\" | sed s/[a-z]/[A-Z]/g";
-			"echo \"*.c\" | sed s/[a-z]/[A-Z]/g";
 		String text = "echo '" + QUOTED + "'\n";
 		IDocument document = createDocument(text);
 		List<Token> tokens = tokenize(document, false);
 		checkNoErrors();
 		assertEquals(3, tokens.size());
-		checkToken(tokens.get(0), document, ITokenConstants.WORD,
+		checkToken(tokens.get(0), document, ITokenConstants.WORD, "echo");
-				"echo");
+		checkToken(tokens.get(1), document, ITokenConstants.SH_STRING_SINGLE, QUOTED, QUOTED.length() + 2);
-		checkToken(tokens.get(1), document, ITokenConstants.SH_STRING_SINGLE,
-				QUOTED, QUOTED.length() + 2);
 		checkToken(tokens.get(2), document, ITokenConstants.EOL, "\n");
 	}
+
 	@Test
 	public void testM4Tokens1() {
 		String text = "define(`hi\', `HI\')\n";
@@ -285,18 +282,16 @@ public class TestTokenizer {
 		List<Token> tokens = tokenize(document, true);
 		checkNoErrors();
 		assertEquals(7, tokens.size());
-		checkToken(tokens.get(0), document, ITokenConstants.WORD,
+		checkToken(tokens.get(0), document, ITokenConstants.WORD, "define");
-				"define");
 		checkToken(tokens.get(1), document, ITokenConstants.LPAREN, "(");
 		// strings are unquoted in token text
-		checkToken(tokens.get(2), document, ITokenConstants.M4_STRING,
+		checkToken(tokens.get(2), document, ITokenConstants.M4_STRING, "hi", 4);
-				"hi", 4);
 		checkToken(tokens.get(3), document, ITokenConstants.COMMA, ",");
-		checkToken(tokens.get(4), document, ITokenConstants.M4_STRING,
+		checkToken(tokens.get(4), document, ITokenConstants.M4_STRING, "HI", 4);
-				"HI", 4);
 		checkToken(tokens.get(5), document, ITokenConstants.RPAREN, ")");
 		checkToken(tokens.get(6), document, ITokenConstants.EOL, "\n");
 	}
+
 	@Test
 	public void testM4Comments() {
 		String text = "dnl # comment\n";
@@ -305,9 +300,9 @@ public class TestTokenizer {
 		checkNoErrors();
 		assertEquals(2, tokens.size());
 		checkToken(tokens.get(0), document, ITokenConstants.WORD, "dnl");
-		checkToken(tokens.get(1), document, ITokenConstants.M4_COMMENT,
+		checkToken(tokens.get(1), document, ITokenConstants.M4_COMMENT, "# comment\n");
-				"# comment\n");
 	}
+
 	@Test
 	public void testM4Comments2() {
 		String text = "dnl /* word(`quoted')\n" + "*/\n";
@@ -319,10 +314,10 @@ public class TestTokenizer {
 		List<Token> tokens = tokenize(tokenizer);
 		assertEquals(3, tokens.size());
 		checkToken(tokens.get(0), document, ITokenConstants.WORD, "dnl");
-		checkToken(tokens.get(1), document, ITokenConstants.M4_COMMENT,
+		checkToken(tokens.get(1), document, ITokenConstants.M4_COMMENT, "/* word(`quoted')\n*/");
-				"/* word(`quoted')\n*/");
 		checkToken(tokens.get(2), document, ITokenConstants.EOL, "\n");
 	}
+
 	@Test
 	public void testM4Strings1() {
 		// double quotes only removes one level of quotes
@@ -333,10 +328,10 @@ public class TestTokenizer {
 
 		List<Token> tokens = tokenize(tokenizer);
 		assertEquals(2, tokens.size());
-		checkToken(tokens.get(0), document, ITokenConstants.M4_STRING,
+		checkToken(tokens.get(0), document, ITokenConstants.M4_STRING, "`double'", 8 + 1 + 1);
-				"`double'", 8 + 1 + 1);
 		checkToken(tokens.get(1), document, ITokenConstants.EOL, "\n");
 	}
+
 	@Test
 	public void testM4Strings2() {
 		String text = "myword(!!boundary==)\n";
@@ -347,14 +342,13 @@ public class TestTokenizer {
 
 		List<Token> tokens = tokenize(tokenizer);
 		assertEquals(5, tokens.size());
-		checkToken(tokens.get(0), document, ITokenConstants.WORD,
+		checkToken(tokens.get(0), document, ITokenConstants.WORD, "myword");
-				"myword");
 		checkToken(tokens.get(1), document, ITokenConstants.LPAREN, "(");
-		checkToken(tokens.get(2), document, ITokenConstants.M4_STRING,
+		checkToken(tokens.get(2), document, ITokenConstants.M4_STRING, "boundary", 8 + 2 + 2);
-				"boundary", 8 + 2 + 2);
 		checkToken(tokens.get(3), document, ITokenConstants.RPAREN, ")");
 		checkToken(tokens.get(4), document, ITokenConstants.EOL, "\n");
 	}
+
 	@Test
 	public void testM4Tokens2() {
 		// dollar is not seen in m4 mode (only important when expanding)
@@ -365,8 +359,7 @@ public class TestTokenizer {
 
 		List<Token> tokens = tokenize(tokenizer);
 		assertEquals(8, tokens.size());
-		checkToken(tokens.get(0), document, ITokenConstants.WORD,
+		checkToken(tokens.get(0), document, ITokenConstants.WORD, "define");
-				"define");
 		checkToken(tokens.get(1), document, ITokenConstants.LPAREN, "(");
 		checkToken(tokens.get(2), document, ITokenConstants.WORD, "foo");
 		checkToken(tokens.get(3), document, ITokenConstants.COMMA, ",");
@@ -375,6 +368,7 @@ public class TestTokenizer {
 		checkToken(tokens.get(6), document, ITokenConstants.RPAREN, ")");
 		checkToken(tokens.get(7), document, ITokenConstants.EOL, "\n");
 	}
+
 	@Test
 	public void testM4QuoteNesting() {
 		String quote = "this is `nested\'!";
@@ -385,11 +379,11 @@ public class TestTokenizer {
 
 		List<Token> tokens = tokenize(tokenizer);
 		assertEquals(2, tokens.size());
-		checkToken(tokens.get(0), document, ITokenConstants.M4_STRING,
+		checkToken(tokens.get(0), document, ITokenConstants.M4_STRING, quote, quote.length() + 2);
-				quote, quote.length() + 2);
 		checkToken(tokens.get(1), document, ITokenConstants.EOL, "\n");
 
 	}
+
 	@Test
 	public void testMixedContext() {
 		String text = "AM_INIT([arg])if true\n";
@@ -447,12 +441,11 @@ public class TestTokenizer {
 		assertSame(document, token.getDocument());
 		assertTrue(token.getOffset() >= 0);
 		assertTrue(token.getType() == ITokenConstants.EOF || token.getLength() > 0);
-		assertEquals(document.get().substring(token.getOffset(),
+		assertEquals(document.get().substring(token.getOffset(), token.getOffset() + token.getLength()),
-				token.getOffset() + token.getLength()), token.getText());
+				token.getText());
 	}
 
-	private void checkToken(Token token, IDocument document, int type,
+	private void checkToken(Token token, IDocument document, int type, String text) {
-			String text) {
 		assertEquals(type, token.getType());
 		assertSame(document, token.getDocument());
 		assertTrue(token.getOffset() >= 0);
@@ -460,8 +453,7 @@ public class TestTokenizer {
 		assertEquals(text.length(), token.getLength());
 	}
 
-	private void checkToken(Token token, IDocument document, int type,
+	private void checkToken(Token token, IDocument document, int type, String text, int length) {
-			String text, int length) {
 		assertEquals(type, token.getType());
 		assertSame(document, token.getDocument());
 		assertTrue(token.getOffset() >= 0);

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/AcInitElement.java

@@ -35,8 +35,7 @@ public class AcInitElement extends AutoconfMacroElement {
 		if (this.getChildren().length == 0)
 			return;
 
-		if (VersionComparator.compare(version,
+		if (VersionComparator.compare(version, AutotoolsPropertyConstants.AC_VERSION_2_59) >= 0) {
-				AutotoolsPropertyConstants.AC_VERSION_2_59) >= 0){
 			if (this.getChildren().length < 2)
 				return;
 

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/AutoconfAnnotationHover.java

@@ -34,7 +34,6 @@ import org.eclipse.jface.text.source.ISourceViewer;
 import org.eclipse.jface.text.source.LineRange;
 import org.eclipse.swt.widgets.Shell;
 
-
 public class AutoconfAnnotationHover implements IAnnotationHover, IAnnotationHoverExtension {
 
 	/**
@@ -133,7 +132,6 @@ public class AutoconfAnnotationHover implements IAnnotationHover, IAnnotationHov
 		return null;
 	}
 
-	
 	/*
 	 * Formats a message as HTML text.
 	 */
@@ -151,7 +149,8 @@ public class AutoconfAnnotationHover implements IAnnotationHover, IAnnotationHov
 	private String formatMultipleMessages(List<String> messages) {
 		StringBuilder buffer = new StringBuilder();
 		HTMLPrinter.addPageProlog(buffer);
-		HTMLPrinter.addParagraph(buffer, HTMLPrinter.convertToHTMLContent(AutoconfEditorMessages.getString("AutoconfAnnotationHover.multipleMarkers"))); //$NON-NLS-1$
+		HTMLPrinter.addParagraph(buffer, HTMLPrinter
+				.convertToHTMLContent(AutoconfEditorMessages.getString("AutoconfAnnotationHover.multipleMarkers"))); //$NON-NLS-1$
 
 		HTMLPrinter.startBulletList(buffer);
 		Iterator<String> e = messages.iterator();
@@ -167,7 +166,6 @@ public class AutoconfAnnotationHover implements IAnnotationHover, IAnnotationHov
 	// We need to use the extension to get a Hover Control Creator which
 	// handles html.
 
-	
 	@Override
 	public IInformationControlCreator getHoverControlCreator() {
 		return new IInformationControlCreator() {

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/AutoconfCodeScanner.java

@@ -38,7 +38,6 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.RGB;
 
-
 public class AutoconfCodeScanner extends RuleBasedScanner {
 
 	private Map<String, IToken> fTokenMap = new HashMap<>();
@@ -55,22 +54,16 @@ public class AutoconfCodeScanner extends RuleBasedScanner {
 	 */
 	private String[] fPropertyNamesItalic;
 
-	private static String[] keywords = { 
+	private static String[] keywords = { "case", "do", "done", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		"case", "do", "done", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ 
 			"esac", "if", "elif", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 			"else", "fi", "for", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 			"in", "then" }; //$NON-NLS-1$ //$NON-NLS-2$
 
-	static final String[] fTokenProperties = new String[] {
+	static final String[] fTokenProperties = new String[] { ColorManager.AUTOCONF_COMMENT_COLOR,
-		ColorManager.AUTOCONF_COMMENT_COLOR,
+			ColorManager.AUTOCONF_KEYWORD_COLOR, ColorManager.AUTOCONF_ACMACRO_COLOR,
-		ColorManager.AUTOCONF_KEYWORD_COLOR,
+			ColorManager.AUTOCONF_AMMACRO_COLOR, ColorManager.AUTOCONF_VAR_REF_COLOR,
-		ColorManager.AUTOCONF_ACMACRO_COLOR,
+			ColorManager.AUTOCONF_VAR_SET_COLOR, ColorManager.AUTOCONF_CODESEQ_COLOR,
-		ColorManager.AUTOCONF_AMMACRO_COLOR,
+			ColorManager.AUTOCONF_DEFAULT_COLOR, };
-		ColorManager.AUTOCONF_VAR_REF_COLOR,
-		ColorManager.AUTOCONF_VAR_SET_COLOR,
-		ColorManager.AUTOCONF_CODESEQ_COLOR,
-		ColorManager.AUTOCONF_DEFAULT_COLOR,
-	};
 
 	public AutoconfCodeScanner() {
 
@@ -93,8 +86,7 @@ public class AutoconfCodeScanner extends RuleBasedScanner {
 
 		// Add special recursive rule for strings which allows variable
 		// references to be internally tokenized.
-		RecursiveSingleLineRule stringRule =
+		RecursiveSingleLineRule stringRule = new RecursiveSingleLineRule("\"", "\"", string, '\\'); //$NON-NLS-1$ //$NON-NLS-2$
-			new RecursiveSingleLineRule("\"", "\"", string, '\\'); //$NON-NLS-1$ //$NON-NLS-2$
 		stringRule.addRule(new SingleLineRule("${", "}", varRef)); //$NON-NLS-1$ //$NON-NLS-2$
 		rules.add(stringRule);
 
@@ -155,7 +147,8 @@ public class AutoconfCodeScanner extends RuleBasedScanner {
 		if (property != null) {
 			int length = fPropertyNamesColor.length;
 			for (int i = 0; i < length; i++) {
-				if (property.equals(fPropertyNamesColor[i]) || property.equals(fPropertyNamesBold[i]) || property.equals(fPropertyNamesItalic[i]))
+				if (property.equals(fPropertyNamesColor[i]) || property.equals(fPropertyNamesBold[i])
+						|| property.equals(fPropertyNamesItalic[i]))
 					return i;
 			}
 		}
@@ -189,7 +182,8 @@ public class AutoconfCodeScanner extends RuleBasedScanner {
 
 		if (rgb != null) {
 			TextAttribute attr = (TextAttribute) token.getData();
-			token.setData(new TextAttribute(ColorManager.getDefault().getColor(rgb), attr.getBackground(), attr.getStyle()));
+			token.setData(
+					new TextAttribute(ColorManager.getDefault().getColor(rgb), attr.getBackground(), attr.getStyle()));
 		}
 	}
 
@@ -208,7 +202,8 @@ public class AutoconfCodeScanner extends RuleBasedScanner {
 		TextAttribute attr = (TextAttribute) token.getData();
 		boolean activeValue = (attr.getStyle() & styleAttribute) == styleAttribute;
 		if (activeValue != eventValue) {
-			token.setData(new TextAttribute(attr.getForeground(), attr.getBackground(), eventValue ? attr.getStyle() | styleAttribute : attr.getStyle() & ~styleAttribute));
+			token.setData(new TextAttribute(attr.getForeground(), attr.getBackground(),
+					eventValue ? attr.getStyle() | styleAttribute : attr.getStyle() & ~styleAttribute));
 		}
 	}
 

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/AutoconfDocumentSetupParticipant.java

@@ -19,14 +19,11 @@ import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.IDocumentExtension3;
 import org.eclipse.jface.text.IDocumentListener;
 
-public class AutoconfDocumentSetupParticipant implements
+public class AutoconfDocumentSetupParticipant implements IDocumentSetupParticipant, IDocumentListener {
-		IDocumentSetupParticipant, IDocumentListener {
 
 	@Override
 	public void setup(IDocument document) {
-		AutoconfPartitioner partitioner =
+		AutoconfPartitioner partitioner = new AutoconfPartitioner(new AutoconfPartitionScanner(),
-			new AutoconfPartitioner(
-				new AutoconfPartitionScanner(),
 				AutoconfPartitionScanner.AUTOCONF_PARTITION_TYPES);
 		partitioner.connect(document, 1);
 		if (document instanceof IDocumentExtension3) {

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/AutoconfEditor.java

@@ -86,12 +86,10 @@ import org.eclipse.ui.texteditor.TextEditorAction;
 import org.eclipse.ui.texteditor.TextOperationAction;
 import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
 
-
 public class AutoconfEditor extends TextEditor implements IAutotoolsEditor, IProjectPropertyListener {
 
 	public final static String AUTOCONF_PARTITIONING = "autoconf_partitioning"; //$NON-NLS-1$
 
-
 	private AutoconfPartitionScanner fPartitionScanner;
 	private RuleBasedScanner fCodeScanner;
 	private RuleBasedScanner fMacroCodeScanner;
@@ -116,7 +114,6 @@ public class AutoconfEditor extends TextEditor implements IAutotoolsEditor, IPro
 	 */
 	private ListenerList<IReconcilingParticipant> fReconcilingListeners = new ListenerList<>(ListenerList.IDENTITY);
 
-
 	public AutoconfEditor() {
 		super();
 	}
@@ -158,8 +155,7 @@ public class AutoconfEditor extends TextEditor implements IAutotoolsEditor, IPro
 	}
 
 	@Override
-	protected void doSetInput(IEditorInput newInput) throws CoreException
+	protected void doSetInput(IEditorInput newInput) throws CoreException {
-	{
 		// If this editor is for a project file, remove this editor as a property
 		// change listener.
 		if (fProject != null)
@@ -176,14 +172,11 @@ public class AutoconfEditor extends TextEditor implements IAutotoolsEditor, IPro
 			AutotoolsPropertyManager.getDefault().addProjectPropertyListener(fProject, this);
 		}
 		getOutlinePage().setInput(input);
-		try
+		try {
-		{
 			IDocument document = getInputDocument();
 
 			setRootElement(reparseDocument(document));
-		}
+		} catch (Exception e) {
-		catch (Exception e)
-		{
 			e.printStackTrace();
 		}
 	}
@@ -204,7 +197,6 @@ public class AutoconfEditor extends TextEditor implements IAutotoolsEditor, IPro
 		return super.getAdapter(required);
 	}
 
-
 	public AutoconfContentOutlinePage getOutlinePage() {
 		if (outlinePage == null) {
 			outlinePage = new AutoconfContentOutlinePage(this);
@@ -265,7 +257,8 @@ public class AutoconfEditor extends TextEditor implements IAutotoolsEditor, IPro
 	 * Returns the preference color, identified by the given preference.
 	 */
 	public static Color getPreferenceColor(String key) {
-		return ColorManager.getDefault().getColor(PreferenceConverter.getColor(AutotoolsPlugin.getDefault().getPreferenceStore(), key));
+		return ColorManager.getDefault()
+				.getColor(PreferenceConverter.getColor(AutotoolsPlugin.getDefault().getPreferenceStore(), key));
 	}
 
 	@Override
@@ -291,8 +284,7 @@ public class AutoconfEditor extends TextEditor implements IAutotoolsEditor, IPro
 			IDocument document = getInputDocument();
 
 			setRootElement(reparseDocument(document));
-		}
+		} catch (Exception e) {
-		catch (Exception e) {
 			e.printStackTrace();
 		}
 	}
@@ -320,8 +312,8 @@ public class AutoconfEditor extends TextEditor implements IAutotoolsEditor, IPro
 			}
 		}
 
-        if (AutotoolsEditorPreferenceConstants.AUTOCONF_VERSION.equals(property) ||
+		if (AutotoolsEditorPreferenceConstants.AUTOCONF_VERSION.equals(property)
-        		AutotoolsEditorPreferenceConstants.AUTOMAKE_VERSION.equals(property)) {
+				|| AutotoolsEditorPreferenceConstants.AUTOMAKE_VERSION.equals(property)) {
 			handleVersionChange(sourceViewer);
 		} else if (AutotoolsEditorPreferenceConstants.EDITOR_FOLDING_ENABLED.equals(property)) {
 			if (sourceViewer instanceof ProjectionViewer) {
@@ -345,7 +337,8 @@ public class AutoconfEditor extends TextEditor implements IAutotoolsEditor, IPro
 	 *
 	 * @since 3.1.1
 	 */
-    private static final class InformationProvider implements IInformationProvider, IInformationProviderExtension, IInformationProviderExtension2 {
+	private static final class InformationProvider
+			implements IInformationProvider, IInformationProviderExtension, IInformationProviderExtension2 {
 
 		private IRegion fHoverRegion;
 		private Object fHoverInfo;
@@ -356,10 +349,12 @@ public class AutoconfEditor extends TextEditor implements IAutotoolsEditor, IPro
 			fHoverInfo = hoverInfo;
 			fControlCreator = controlCreator;
 		}
+
 		@Override
 		public IRegion getSubject(ITextViewer textViewer, int invocationOffset) {
 			return fHoverRegion;
 		}
+
 		@Override
 		public String getInformation(ITextViewer textViewer, IRegion subject) {
 			return fHoverInfo.toString();
@@ -369,6 +364,7 @@ public class AutoconfEditor extends TextEditor implements IAutotoolsEditor, IPro
 		public Object getInformation2(ITextViewer textViewer, IRegion subject) {
 			return fHoverInfo;
 		}
+
 		@Override
 		public IInformationControlCreator getInformationPresenterControlCreator() {
 			return fControlCreator;
@@ -394,7 +390,8 @@ public class AutoconfEditor extends TextEditor implements IAutotoolsEditor, IPro
 		 * @param prefix the prefix
 		 * @param textOperationAction the text operation action
 		 */
-    	public InformationDispatchAction(ResourceBundle resourceBundle, String prefix, final TextOperationAction textOperationAction) {
+		public InformationDispatchAction(ResourceBundle resourceBundle, String prefix,
+				final TextOperationAction textOperationAction) {
 			super(resourceBundle, prefix, AutoconfEditor.this);
 			if (textOperationAction == null)
 				throw new IllegalArgumentException();
@@ -457,14 +454,17 @@ public class AutoconfEditor extends TextEditor implements IAutotoolsEditor, IPro
 
 				IInformationControlCreator controlCreator = null;
 				if (textHover instanceof IInformationProviderExtension2)
-    				controlCreator= ((IInformationProviderExtension2)textHover).getInformationPresenterControlCreator();
+					controlCreator = ((IInformationProviderExtension2) textHover)
+							.getInformationPresenterControlCreator();
 
-    			IInformationProvider informationProvider= new InformationProvider(hoverRegion, hoverInfo, controlCreator);
+				IInformationProvider informationProvider = new InformationProvider(hoverRegion, hoverInfo,
+						controlCreator);
 
 				fInformationPresenter.setOffset(offset);
 				fInformationPresenter.setAnchor(AbstractInformationControlManager.ANCHOR_BOTTOM);
 				fInformationPresenter.setMargins(6, 6); // default values from AbstractInformationControlManager
-    			String contentType= TextUtilities.getContentType(sourceViewer.getDocument(), AutoconfPartitionScanner.AUTOCONF_MACRO, offset, true);
+				String contentType = TextUtilities.getContentType(sourceViewer.getDocument(),
+						AutoconfPartitionScanner.AUTOCONF_MACRO, offset, true);
 				fInformationPresenter.setInformationProvider(informationProvider, contentType);
 				fInformationPresenter.showInformation();
 
@@ -506,7 +506,8 @@ public class AutoconfEditor extends TextEditor implements IAutotoolsEditor, IPro
 				// hover region: the beginning of the concerned line to place the control right over the line
 				IDocument document = sourceViewer.getDocument();
 				int offset = document.getLineOffset(line);
-    			String contentType= TextUtilities.getContentType(document, AutoconfPartitionScanner.AUTOCONF_MACRO, offset, true);
+				String contentType = TextUtilities.getContentType(document, AutoconfPartitionScanner.AUTOCONF_MACRO,
+						offset, true);
 
 				IInformationControlCreator controlCreator = null;
 
@@ -525,12 +526,14 @@ public class AutoconfEditor extends TextEditor implements IAutotoolsEditor, IPro
 				//
 				//    			} else {
 				if (annotationHover instanceof IInformationProviderExtension2)
-    				controlCreator= ((IInformationProviderExtension2) annotationHover).getInformationPresenterControlCreator();
+					controlCreator = ((IInformationProviderExtension2) annotationHover)
+							.getInformationPresenterControlCreator();
 				else if (annotationHover instanceof IAnnotationHoverExtension)
 					controlCreator = ((IAnnotationHoverExtension) annotationHover).getHoverControlCreator();
 				//    			}
 
-    			IInformationProvider informationProvider= new InformationProvider(new Region(offset, 0), hoverInfo, controlCreator);
+				IInformationProvider informationProvider = new InformationProvider(new Region(offset, 0), hoverInfo,
+						controlCreator);
 
 				fInformationPresenter.setOffset(offset);
 				fInformationPresenter.setAnchor(AbstractInformationControlManager.ANCHOR_RIGHT);
@@ -613,7 +616,8 @@ public class AutoconfEditor extends TextEditor implements IAutotoolsEditor, IPro
 	 * @return <code>true</code> if folding is enabled, <code>false</code> otherwise.
 	 */
 	boolean isFoldingEnabled() {
-		return AutotoolsPlugin.getDefault().getPreferenceStore().getBoolean(MakefileEditorPreferenceConstants.EDITOR_FOLDING_ENABLED);
+		return AutotoolsPlugin.getDefault().getPreferenceStore()
+				.getBoolean(MakefileEditorPreferenceConstants.EDITOR_FOLDING_ENABLED);
 	}
 
 	@Override
@@ -621,7 +625,6 @@ public class AutoconfEditor extends TextEditor implements IAutotoolsEditor, IPro
 		setKeyBindingScopes(new String[] { AutotoolsUIPlugin.getUniqueIdentifier() + ".editor.scope" }); //$NON-NLS-1$
 	}
 
-
 	@Override
 	protected void createActions() {
 		super.createActions();
@@ -629,14 +632,17 @@ public class AutoconfEditor extends TextEditor implements IAutotoolsEditor, IPro
 		//  	fFoldingGroup= new FoldingActionGroup(this, getSourceViewer());
 
 		// Sticky hover support
-    	ResourceAction resAction= new TextOperationAction(AutoconfEditorMessages.getResourceBundle(), "ShowToolTip.", this, ISourceViewer.INFORMATION, true); //$NON-NLS-1$
+		ResourceAction resAction = new TextOperationAction(AutoconfEditorMessages.getResourceBundle(), "ShowToolTip.", //$NON-NLS-1$
-    	resAction= new InformationDispatchAction(AutoconfEditorMessages.getResourceBundle(), "ShowToolTip.", (TextOperationAction) resAction); //$NON-NLS-1$
+				this, ISourceViewer.INFORMATION, true);
+		resAction = new InformationDispatchAction(AutoconfEditorMessages.getResourceBundle(), "ShowToolTip.", //$NON-NLS-1$
+				(TextOperationAction) resAction);
 		resAction.setActionDefinitionId(IAutotoolEditorActionDefinitionIds.SHOW_TOOLTIP);
 		setAction("ShowToolTip", resAction); //$NON-NLS-1$
 		PlatformUI.getWorkbench().getHelpSystem().setHelp(resAction, IAutotoolHelpContextIds.SHOW_TOOLTIP_ACTION);
 
 		// Content assist
-    	Action action = new ContentAssistAction(AutoconfEditorMessages.getResourceBundle(), "ContentAssistProposal.", this); //$NON-NLS-1$
+		Action action = new ContentAssistAction(AutoconfEditorMessages.getResourceBundle(), "ContentAssistProposal.", //$NON-NLS-1$
+				this);
 		action.setActionDefinitionId(ITextEditorActionDefinitionIds.CONTENT_ASSIST_PROPOSALS);
 		setAction("ContentAssistProposal", action); //$NON-NLS-1$
 		markAsStateDependentAction("ContentAssistProposal", true); //$NON-NLS-1$
@@ -696,7 +702,8 @@ public class AutoconfEditor extends TextEditor implements IAutotoolsEditor, IPro
 
 	@Override
 	protected ISourceViewer createSourceViewer(Composite parent, IVerticalRuler ruler, int styles) {
-    	ISourceViewer viewer = new ProjectionViewer(parent, ruler, getOverviewRuler(), isOverviewRulerVisible(), styles);
+		ISourceViewer viewer = new ProjectionViewer(parent, ruler, getOverviewRuler(), isOverviewRulerVisible(),
+				styles);
 
 		// ensure decoration support has been created and configured.
 		getSourceViewerDecorationSupport(viewer);
@@ -704,7 +711,6 @@ public class AutoconfEditor extends TextEditor implements IAutotoolsEditor, IPro
 		return viewer;
 	}
 
-    
 	@Override
 	public void dispose() {
 		if (fProjectionFileUpdater != null) {

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/AutoconfEditorMacroValidator.java

@@ -29,7 +29,6 @@ import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jface.text.BadLocationException;
 
-
 /**
  *	Validate a macro call by checking against the stored macro prototypes
  */
@@ -44,8 +43,7 @@ public class AutoconfEditorMacroValidator implements IAutoconfMacroValidator {
 	}
 
 	@Override
-	public void validateMacroCall(AutoconfMacroElement macro)
+	public void validateMacroCall(AutoconfMacroElement macro) throws ParseException, InvalidMacroException {
-			throws ParseException, InvalidMacroException {
 		AutoconfPrototype p = AutoconfTextHover.getPrototype(macro.getName(), fEditor);
 		if (p != null) {
 			boolean tooFew = false;
@@ -81,22 +79,16 @@ public class AutoconfEditorMacroValidator implements IAutoconfMacroValidator {
 			if (!justRight) {
 				if (tooFew) {
 					String formatString = AutoconfEditorMessages.getFormattedString(AUTOCONF_MACRO_ARGS_TOO_FEW,
-							AutotoolsPlugin.getDefault().getPreferenceStore().getString(AutotoolsEditorPreferenceConstants.AUTOCONF_VERSION),
+							AutotoolsPlugin.getDefault().getPreferenceStore()
+									.getString(AutotoolsEditorPreferenceConstants.AUTOCONF_VERSION),
 							p.getName(), Integer.toString(minParms));
-					throw new ParseException(
+					throw new ParseException(formatString, start, end, lineNumber, 0, length, IMarker.SEVERITY_WARNING);
-							formatString,
-							start, end,
-							lineNumber, 0, length,
-							IMarker.SEVERITY_WARNING);
 				} else if (tooMany) {
 					String formatString = AutoconfEditorMessages.getFormattedString(AUTOCONF_MACRO_ARGS_TOO_MANY,
-							AutotoolsPlugin.getDefault().getPreferenceStore().getString(AutotoolsEditorPreferenceConstants.AUTOCONF_VERSION),
+							AutotoolsPlugin.getDefault().getPreferenceStore()
+									.getString(AutotoolsEditorPreferenceConstants.AUTOCONF_VERSION),
 							p.getName(), Integer.toString(maxParms));
-					throw new ParseException(
+					throw new ParseException(formatString, start, end, lineNumber, 0, length, IMarker.SEVERITY_WARNING);
-							formatString,
-							start, end,
-							lineNumber, 0, length,
-							IMarker.SEVERITY_WARNING);
 				}
 			}
 

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/AutoconfEditorMessages.java

@@ -18,7 +18,6 @@ import java.text.MessageFormat;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 
-
 /**
  * AutoconfEditorMessages
  */
@@ -42,6 +41,7 @@ public class AutoconfEditorMessages {
 			return "!" + key + "!";//$NON-NLS-2$ //$NON-NLS-1$
 		}
 	}
+
 	/**
 	 * Gets a string from the resource bundle and formats it with the argument
 	 *
@@ -59,6 +59,7 @@ public class AutoconfEditorMessages {
 			arg = ""; //$NON-NLS-1$
 		return MessageFormat.format(format, new Object[] { arg });
 	}
+
 	/**
 	 * Gets a string from the resource bundle and formats it with the arguments
 	 *

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/AutoconfErrorHandler.java

@@ -26,7 +26,6 @@ import org.eclipse.jface.text.source.Annotation;
 import org.eclipse.jface.text.source.AnnotationModel;
 import org.eclipse.ui.IEditorInput;
 
-
 public class AutoconfErrorHandler implements IAutoconfErrorHandler {
 
 	public static final String CDT_ANNOTATION_INFO = "org.eclipse.cdt.ui.info"; //$NON-NLS-1$
@@ -40,7 +39,8 @@ public class AutoconfErrorHandler implements IAutoconfErrorHandler {
 	private AnnotationModel fAnnotationModel;
 
 	public AutoconfErrorHandler(IEditorInput input) {
-		this.fAnnotationModel = (AnnotationModel)AutoconfEditor.getAutoconfDocumentProvider().getAnnotationModel(input);
+		this.fAnnotationModel = (AnnotationModel) AutoconfEditor.getAutoconfDocumentProvider()
+				.getAnnotationModel(input);
 	}
 
 	// TODO: no quickfixes yet implemented, but maybe in the future
@@ -82,14 +82,12 @@ public class AutoconfErrorHandler implements IAutoconfErrorHandler {
 		annotations.put(p, annotation);
 	}
 
-	public void removeAllExistingMarkers()
+	public void removeAllExistingMarkers() {
-	{
 		fAnnotationModel.removeAllAnnotations();
 		annotations.clear();
 	}
 
-	public void removeExistingMarkers(int offset, int length)
+	public void removeExistingMarkers(int offset, int length) {
-	{	
 		Iterator<Annotation> i = fAnnotationModel.getAnnotationIterator();
 		while (i.hasNext()) {
 			Annotation annotation = i.next();

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/AutoconfKeywordDetector.java

@@ -28,4 +28,3 @@ public class AutoconfKeywordDetector implements IWordDetector {
 	}
 
 }
-

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/AutoconfMacroCodeScanner.java

@@ -36,7 +36,6 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.RGB;
 
-
 public class AutoconfMacroCodeScanner extends RuleBasedScanner {
 
 	private Map<String, IToken> fTokenMap = new HashMap<>();
@@ -55,22 +54,16 @@ public class AutoconfMacroCodeScanner extends RuleBasedScanner {
 	 */
 	private String[] fPropertyNamesItalic;
 
-	private static String[] keywords = { 
+	private static String[] keywords = { "case", "do", "done", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		"case", "do", "done", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ 
 			"esac", "if", "elif", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 			"else", "fi", "for", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 			"in", "then" }; //$NON-NLS-1$ //$NON-NLS-2$
 
-	static final String[] fTokenProperties = new String[] {
+	static final String[] fTokenProperties = new String[] { ColorManager.AUTOCONF_COMMENT_COLOR,
-		ColorManager.AUTOCONF_COMMENT_COLOR,
+			ColorManager.AUTOCONF_KEYWORD_COLOR, ColorManager.AUTOCONF_ACMACRO_COLOR,
-		ColorManager.AUTOCONF_KEYWORD_COLOR,
+			ColorManager.AUTOCONF_AMMACRO_COLOR, ColorManager.AUTOCONF_VAR_REF_COLOR,
-		ColorManager.AUTOCONF_ACMACRO_COLOR,
+			ColorManager.AUTOCONF_VAR_SET_COLOR, ColorManager.AUTOCONF_CODESEQ_COLOR,
-		ColorManager.AUTOCONF_AMMACRO_COLOR,
+			ColorManager.AUTOCONF_DEFAULT_COLOR, };
-		ColorManager.AUTOCONF_VAR_REF_COLOR,
-		ColorManager.AUTOCONF_VAR_SET_COLOR,
-		ColorManager.AUTOCONF_CODESEQ_COLOR,
-		ColorManager.AUTOCONF_DEFAULT_COLOR,
-	};
 
 	public AutoconfMacroCodeScanner() {
 
@@ -93,8 +86,7 @@ public class AutoconfMacroCodeScanner extends RuleBasedScanner {
 
 		// Add special recursive rule for strings which allows variable
 		// references to be internally tokenized.
-		RecursiveSingleLineRule stringRule =
+		RecursiveSingleLineRule stringRule = new RecursiveSingleLineRule("\"", "\"", string, '\\'); //$NON-NLS-1$ //$NON-NLS-2$
-			new RecursiveSingleLineRule("\"", "\"", string, '\\'); //$NON-NLS-1$ //$NON-NLS-2$
 		stringRule.addRule(new SingleLineRule("${", "}", varRef)); //$NON-NLS-1$ //$NON-NLS-2$
 		rules.add(stringRule);
 
@@ -164,7 +156,8 @@ public class AutoconfMacroCodeScanner extends RuleBasedScanner {
 		if (property != null) {
 			int length = fPropertyNamesColor.length;
 			for (int i = 0; i < length; i++) {
-				if (property.equals(fPropertyNamesColor[i]) || property.equals(fPropertyNamesBold[i]) || property.equals(fPropertyNamesItalic[i]))
+				if (property.equals(fPropertyNamesColor[i]) || property.equals(fPropertyNamesBold[i])
+						|| property.equals(fPropertyNamesItalic[i]))
 					return i;
 			}
 		}
@@ -214,7 +207,8 @@ public class AutoconfMacroCodeScanner extends RuleBasedScanner {
 
 		if (rgb != null) {
 			TextAttribute attr = (TextAttribute) token.getData();
-			token.setData(new TextAttribute(ColorManager.getDefault().getColor(rgb), attr.getBackground(), attr.getStyle()));
+			token.setData(
+					new TextAttribute(ColorManager.getDefault().getColor(rgb), attr.getBackground(), attr.getStyle()));
 		}
 	}
 
@@ -233,7 +227,8 @@ public class AutoconfMacroCodeScanner extends RuleBasedScanner {
 		TextAttribute attr = (TextAttribute) token.getData();
 		boolean activeValue = (attr.getStyle() & styleAttribute) == styleAttribute;
 		if (activeValue != eventValue) {
-			token.setData(new TextAttribute(attr.getForeground(), attr.getBackground(), eventValue ? attr.getStyle() | styleAttribute : attr.getStyle() & ~styleAttribute));
+			token.setData(new TextAttribute(attr.getForeground(), attr.getBackground(),
+					eventValue ? attr.getStyle() | styleAttribute : attr.getStyle() & ~styleAttribute));
 		}
 	}
 

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/AutoconfMacroContentAssistProcessor.java

@@ -25,9 +25,7 @@ import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
 import org.eclipse.jface.text.contentassist.IContextInformation;
 import org.eclipse.jface.text.contentassist.IContextInformationValidator;
 
-
+public class AutoconfMacroContentAssistProcessor implements IContentAssistProcessor {
-public class AutoconfMacroContentAssistProcessor implements
-		IContentAssistProcessor {
 
 	protected AutoconfEditor editor;
 
@@ -50,8 +48,7 @@ public class AutoconfMacroContentAssistProcessor implements
 	}
 
 	@Override
-	public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer,
+	public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer, int offset) {
-			int offset) {
 
 		IDocument document = viewer.getDocument();
 		String prefix = ""; //$NON-NLS-1$
@@ -80,11 +77,12 @@ public class AutoconfMacroContentAssistProcessor implements
 						if (macros[i].hasParms()) {
 							// Provide parameter info as context information that
 							// is tied to the completion proposal.
-							ci = new AutoconfMacroProposalContextInformation(macros[i].getParms(), macros[i].getParms());
+							ci = new AutoconfMacroProposalContextInformation(macros[i].getParms(),
+									macros[i].getParms());
 							ci.setContextInformationPosition(offset - prefixLen + cursorPos - 1);
 						}
-						ICompletionProposal cp = new CompletionProposal(template, offset - prefixLen, prefixLen, cursorPos, null, 
+						ICompletionProposal cp = new CompletionProposal(template, offset - prefixLen, prefixLen,
-								name, ci, AutoconfTextHover.getIndexedInfo(name, editor));
+								cursorPos, null, name, ci, AutoconfTextHover.getIndexedInfo(name, editor));
 						validList.add(cp);
 					}
 				}
@@ -96,8 +94,7 @@ public class AutoconfMacroContentAssistProcessor implements
 	}
 
 	@Override
-	public IContextInformation[] computeContextInformation(ITextViewer viewer,
+	public IContextInformation[] computeContextInformation(ITextViewer viewer, int offset) {
-			int offset) {
 		// TODO Auto-generated method stub
 		return null;
 	}

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/AutoconfMacroDamagerRepairer.java

@@ -35,5 +35,4 @@ public class AutoconfMacroDamagerRepairer extends DefaultDamagerRepairer {
 		super(scanner);
 	}
 
-	
 }

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/AutoconfMacroParameterListValidator.java

@@ -66,8 +66,8 @@ public class AutoconfMacroParameterListValidator implements IContextInformationV
 		return end;
 	}
 
-	private int getCharCount(IDocument document, int start, int end, 
+	private int getCharCount(IDocument document, int start, int end, char increment, char decrement,
-							 char increment, char decrement, boolean considerNesting) throws BadLocationException {
+			boolean considerNesting) throws BadLocationException {
 
 		Assert.isTrue((increment != 0 || decrement != 0) && increment != decrement);
 
@@ -208,4 +208,3 @@ public class AutoconfMacroParameterListValidator implements IContextInformationV
 		return true;
 	}
 }
-

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/AutoconfMacroPartitionRule.java

@@ -20,7 +20,6 @@ import org.eclipse.jface.text.rules.IWhitespaceDetector;
 import org.eclipse.jface.text.rules.IWordDetector;
 import org.eclipse.jface.text.rules.Token;
 
-
 public class AutoconfMacroPartitionRule implements IPredicateRule {
 	/**
 	 * The default token to be returned on success and if nothing else has been
@@ -61,8 +60,7 @@ public class AutoconfMacroPartitionRule implements IPredicateRule {
 		while (!finished && c != ICharacterScanner.EOF) {
 			if (c == '[') {
 				++quoteDepth;
-			}
+			} else if (c == ']') {
-			else if (c == ']') {
 				--quoteDepth;
 				if (quoteDepth < 0)
 					finished = true;
@@ -72,8 +70,7 @@ public class AutoconfMacroPartitionRule implements IPredicateRule {
 					--depth;
 					if (depth <= 0)
 						finished = true;
-				}
+				} else if (c == '(') {
-				else if (c == '(') {
 					++depth;
 				}
 			}
@@ -116,8 +113,7 @@ public class AutoconfMacroPartitionRule implements IPredicateRule {
 		}
 
 		c = scanner.read();
-		while (c != ICharacterScanner.EOF
+		while (c != ICharacterScanner.EOF && fDetector.isWordPart((char) c)) {
-				&& fDetector.isWordPart((char) c)) {
 			fBuffer.append((char) c);
 			c = scanner.read();
 		}
@@ -125,11 +121,9 @@ public class AutoconfMacroPartitionRule implements IPredicateRule {
 		if (c != ICharacterScanner.EOF) {
 			if (c == ';' || fWsDetector.isWhitespace((char) c)) {
 				// We are done
-			}
+			} else if (c == '(') {
-			else if (c == '(') {
 				matchParentheses(scanner);
-			}
+			} else {
-			else {
 				scanner.unread();
 				unreadBuffer(scanner);
 				return Token.UNDEFINED;

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/AutoconfMacroProposalContextInformation.java

@@ -51,7 +51,8 @@ public class AutoconfMacroProposalContextInformation implements IContextInformat
 	 * @param informationDisplayString the string to be displayed when presenting the context information,
 	 *		may not be <code>null</code>
 	 */
-	public AutoconfMacroProposalContextInformation(Image image, String contextDisplayString, String informationDisplayString) {
+	public AutoconfMacroProposalContextInformation(Image image, String contextDisplayString,
+			String informationDisplayString) {
 		//Assert.isNotNull(informationDisplayString);
 		fImage = image;
 		fContextDisplayString = contextDisplayString;
@@ -62,7 +63,8 @@ public class AutoconfMacroProposalContextInformation implements IContextInformat
 	public boolean equals(Object object) {
 		if (object instanceof IContextInformation) {
 			IContextInformation contextInformation = (IContextInformation) object;
-			boolean equals= fInformationDisplayString.equalsIgnoreCase(contextInformation.getInformationDisplayString());
+			boolean equals = fInformationDisplayString
+					.equalsIgnoreCase(contextInformation.getInformationDisplayString());
 			if (fContextDisplayString != null)
 				equals = equals && fContextDisplayString.equalsIgnoreCase(contextInformation.getContextDisplayString());
 			return equals;

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/AutoconfMacroRule.java

@@ -41,8 +41,7 @@ public class AutoconfMacroRule implements IRule {
 
 	private String fStartingSequence;
 
-	public AutoconfMacroRule(String startingSequence,
+	public AutoconfMacroRule(String startingSequence, IWordDetector detector, IToken inToken) {
-			IWordDetector detector, IToken inToken) {
 		token = inToken;
 		fDetector = detector;
 		fStartingSequence = startingSequence;
@@ -62,14 +61,12 @@ public class AutoconfMacroRule implements IRule {
 			c = scanner.read();
 		}
 
-		while (c != ICharacterScanner.EOF
+		while (c != ICharacterScanner.EOF && fDetector.isWordPart((char) c)) {
-				&& fDetector.isWordPart((char) c)) {
 			fBuffer.append((char) c);
 			c = scanner.read();
 		}
 
-		if (c != ICharacterScanner.EOF && c != '(' && c != ';'
+		if (c != ICharacterScanner.EOF && c != '(' && c != ';' && !fWsDetector.isWhitespace((char) c)) {
-			&& !fWsDetector.isWhitespace((char)c)) {
 			unreadBuffer(scanner);
 			return Token.UNDEFINED;
 		}

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/AutoconfMacroWordDetector.java

@@ -19,8 +19,7 @@ public class AutoconfMacroWordDetector implements IWordDetector {
 
 	@Override
 	public boolean isWordPart(char c) {
-		return ((Character.isLetter(c) && Character.isUpperCase(c)) || 
+		return ((Character.isLetter(c) && Character.isUpperCase(c)) || Character.isDigit(c) || c == '_');
-				Character.isDigit(c) ||	c == '_');
 	}
 
 	@Override

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/AutoconfPKGWordDetector.java

@@ -19,8 +19,7 @@ public class AutoconfPKGWordDetector implements IWordDetector {
 
 	@Override
 	public boolean isWordPart(char c) {
-		return ((Character.isLetter(c) && Character.isUpperCase(c)) || 
+		return ((Character.isLetter(c) && Character.isUpperCase(c)) || Character.isDigit(c) || c == '_');
-				Character.isDigit(c) ||	c == '_');
 	}
 
 	@Override

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/AutoconfPartitionScanner.java

@@ -27,8 +27,7 @@ public class AutoconfPartitionScanner extends RuleBasedPartitionScanner {
 
 	public final static String AUTOCONF_MACRO = "autoconf_macro"; //$NON-NLS-1$
 	public final static String AUTOCONF_COMMENT = "autoconf_comment"; //$NON-NLS-1$
-	final static String[] AUTOCONF_PARTITION_TYPES= 
+	final static String[] AUTOCONF_PARTITION_TYPES = new String[] { AUTOCONF_MACRO, AUTOCONF_COMMENT };
-		new String[] { AUTOCONF_MACRO, AUTOCONF_COMMENT };
 
 	/**
 	 * Creates the partitioner and sets up the appropriate rules.
@@ -43,7 +42,6 @@ public class AutoconfPartitionScanner extends RuleBasedPartitionScanner {
 		// Add rule for target bodies.
 		rules.add(new AutoconfMacroPartitionRule(macro));
 
-
 		rules.add(new EndOfLineRule("dnl", comment)); //$NON-NLS-1$
 		rules.add(new SingleLineRule("\\#", null, Token.UNDEFINED));
 		rules.add(new EndOfLineRule("#", comment, '\\')); //$NON-NLS-1$

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/AutoconfPartitioner.java

@@ -34,29 +34,23 @@ public class AutoconfPartitioner extends FastPartitioner {
 	// method.  We cannot do it at connect time because the document may be zero length
 	// at the time and we will end up getting default partitioning from then on.
 	@Override
-	public ITypedRegion[] computePartitioning(int offset, int length, 
+	public ITypedRegion[] computePartitioning(int offset, int length, boolean includeZeroLength) {
-			boolean includeZeroLength) {
 		ITypedRegion[] regions = super.computePartitioning(offset, length, includeZeroLength);
 		// Uncomment the following line to see partitioning.
 		//		printPartitions(regions);
 		return regions;
 	}
 
-	public void printPartitions(ITypedRegion[] partitions)
+	public void printPartitions(ITypedRegion[] partitions) {
-	{
+		for (int i = 0; i < partitions.length; i++) {
-		for (int i = 0; i < partitions.length; i++)
+			try {
-		{
-			try
-			{
 				System.out.print("Partition type: " + partitions[i].getType() //$NON-NLS-1$
 						+ ", offset: " + partitions[i].getOffset() //$NON-NLS-1$
 						+ ", length: " + partitions[i].getLength() //$NON-NLS-1$
 						+ "\nText:\n" //$NON-NLS-1$
 						+ super.fDocument.get(partitions[i].getOffset(), partitions[i].getLength())
 						+ "\n---------------------------\n\n\n"); //$NON-NLS-1$
-			}
+			} catch (BadLocationException e) {
-			catch (BadLocationException e)
-			{
 				e.printStackTrace();
 			}
 		}

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/AutoconfReconcilingStrategy.java

@@ -21,7 +21,6 @@ import org.eclipse.jface.text.reconciler.DirtyRegion;
 import org.eclipse.jface.text.reconciler.IReconcilingStrategy;
 import org.eclipse.ui.texteditor.IDocumentProvider;
 
-
 public class AutoconfReconcilingStrategy implements IReconcilingStrategy {
 
 	AutoconfContentOutlinePage outline;

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/AutoconfSourceViewerConfiguration.java

@@ -29,9 +29,7 @@ import org.eclipse.jface.text.source.IAnnotationHover;
 import org.eclipse.jface.text.source.ISourceViewer;
 import org.eclipse.ui.editors.text.TextSourceViewerConfiguration;
 
-
+public class AutoconfSourceViewerConfiguration extends TextSourceViewerConfiguration {
-public class AutoconfSourceViewerConfiguration extends
-		TextSourceViewerConfiguration {
 
 	private ITextHover acHover;
 	private IAnnotationHover aaHover;
@@ -65,8 +63,7 @@ public class AutoconfSourceViewerConfiguration extends
 
 	@Override
 	public String[] getConfiguredContentTypes(ISourceViewer sourceViewer) {
-		return new String[] { IDocument.DEFAULT_CONTENT_TYPE,
+		return new String[] { IDocument.DEFAULT_CONTENT_TYPE, AutoconfPartitionScanner.AUTOCONF_MACRO,
-							  AutoconfPartitionScanner.AUTOCONF_MACRO,
 				AutoconfPartitionScanner.AUTOCONF_COMMENT };
 	}
 
@@ -91,6 +88,7 @@ public class AutoconfSourceViewerConfiguration extends
 		reconciler.setProgressMonitor(new NullProgressMonitor());
 		return reconciler;
 	}
+
 	@Override
 	public IPresentationReconciler getPresentationReconciler(ISourceViewer sourceViewer) {
 		return new AutoconfPresentationReconciler();

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/IAutotoolsEditor.java

@@ -13,7 +13,6 @@ package org.eclipse.cdt.autotools.ui.editors;
 import org.eclipse.cdt.internal.autotools.ui.editors.automake.IReconcilingParticipant;
 import org.eclipse.ui.texteditor.ITextEditor;
 
-
 public interface IAutotoolsEditor extends ITextEditor {
 
 	/**

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/InlineDataRule.java

@@ -63,6 +63,7 @@ public class InlineDataRule implements IRule {
 		scanner.unread();
 		return true;
 	}
+
 	@Override
 	public IToken evaluate(ICharacterScanner scanner) {
 		int c = scanner.read();
@@ -88,9 +89,7 @@ public class InlineDataRule implements IRule {
 			c = scanner.read();
 		}
 
-		while (c != ICharacterScanner.EOF &&
+		while (c != ICharacterScanner.EOF && Character.isJavaIdentifierPart((char) c) && c != '\'') {
-				Character.isJavaIdentifierPart((char)c) &&
-				c != '\'') {
 			fBuffer.append((char) c);
 			endMarkerBuffer.append((char) c);
 			c = scanner.read();

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/MultilineRuleDamagerRepairer.java

@@ -21,7 +21,6 @@ import org.eclipse.jface.text.rules.ITokenScanner;
 
 public class MultilineRuleDamagerRepairer extends DefaultDamagerRepairer {
 
-	
 	/**
 	 * Creates a damager/repairer that uses the given scanner. The scanner may not be <code>null</code>
 	 * and is assumed to return only token that carry text attributes.

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/ParseException.java

@@ -21,31 +21,40 @@ public class ParseException extends Exception {
 	int lineNumber;
 	int startColumn;
 	int endColumn;
+
 	public int getEndColumn() {
 		return endColumn;
 	}
+
 	public void setEndColumn(int endColumn) {
 		this.endColumn = endColumn;
 	}
+
 	public int getLineNumber() {
 		return lineNumber;
 	}
+
 	public void setLineNumber(int lineNumber) {
 		this.lineNumber = lineNumber;
 	}
+
 	@Override
 	public String getMessage() {
 		return message;
 	}
+
 	public void setMessage(String message) {
 		this.message = message;
 	}
+
 	public int getStartColumn() {
 		return startColumn;
 	}
+
 	public void setStartColumn(int startColumn) {
 		this.startColumn = startColumn;
 	}
+
 	public ParseException(String message, int lineNumber, int startColumn, int endColumn, int severity) {
 		super();
 		this.message = message;
@@ -54,9 +63,11 @@ public class ParseException extends Exception {
 		this.endColumn = endColumn;
 		this.severity = severity;
 	}
+
 	public int getSeverity() {
 		return severity;
 	}
+
 	public void setSeverity(int severity) {
 		this.severity = severity;
 	}

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/RecursiveSingleLineRule.java

@@ -31,6 +31,7 @@ public class RecursiveSingleLineRule extends SingleLineRule {
 	private int endBoundary;
 	private String startSequence;
 	private String endSequence;
+
 	/**
 	 * Creates a rule for the given starting and ending sequence
 	 * which, if detected, will return the specified token.
@@ -72,7 +73,8 @@ public class RecursiveSingleLineRule extends SingleLineRule {
 	 * @param breaksOnEOF indicates whether the end of the file successfully terminates this rule
 	 * @since 2.1
 	 */
-	public RecursiveSingleLineRule(String startSequence, String endSequence, IToken token, char escapeCharacter, boolean breaksOnEOF) {
+	public RecursiveSingleLineRule(String startSequence, String endSequence, IToken token, char escapeCharacter,
+			boolean breaksOnEOF) {
 		super(startSequence, endSequence, token, escapeCharacter, breaksOnEOF);
 		this.startSequence = startSequence;
 		this.endSequence = endSequence;
@@ -99,7 +101,8 @@ public class RecursiveSingleLineRule extends SingleLineRule {
 	 *        terminate the line, even if <code>breakOnEOL</code> is true
 	 * @since 3.0
 	 */
-	public RecursiveSingleLineRule(String startSequence, String endSequence, IToken token, char escapeCharacter, boolean breaksOnEOF, boolean escapeContinuesLine) {
+	public RecursiveSingleLineRule(String startSequence, String endSequence, IToken token, char escapeCharacter,
+			boolean breaksOnEOF, boolean escapeContinuesLine) {
 		super(startSequence, endSequence, token, escapeCharacter, breaksOnEOF, escapeContinuesLine);
 		this.startSequence = startSequence;
 		this.endSequence = endSequence;
@@ -153,8 +156,7 @@ public class RecursiveSingleLineRule extends SingleLineRule {
 					// Back up scanner to just after start sequence.
 					backupScanner(scanner, startIndex + startSequence.length());
 					return super.getSuccessToken();
-				}
+				} else
-				else
 					// Outer rule doesn't hold.
 					return Token.UNDEFINED;
 			}

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/RestrictedEndOfLineRule.java

@@ -30,6 +30,7 @@ public class RestrictedEndOfLineRule extends EndOfLineRule {
 	private int endIndex;
 	private String startSequence;
 	private String restrictedChars;
+
 	/**
 	 * Creates a rule for the given starting and ending sequence
 	 * which, if detected, will return the specified token.
@@ -71,7 +72,8 @@ public class RestrictedEndOfLineRule extends EndOfLineRule {
 	 * @param breaksOnEOF indicates whether the end of the file successfully terminates this rule
 	 * @since 2.1
 	 */
-	public RestrictedEndOfLineRule(String startSequence, String restrictedChars, IToken token, char escapeCharacter, boolean breaksOnEOF) {
+	public RestrictedEndOfLineRule(String startSequence, String restrictedChars, IToken token, char escapeCharacter,
+			boolean breaksOnEOF) {
 		super(startSequence, token, escapeCharacter, breaksOnEOF);
 		this.startSequence = startSequence;
 		this.restrictedChars = restrictedChars;
@@ -80,12 +82,10 @@ public class RestrictedEndOfLineRule extends EndOfLineRule {
 		endIndex = 0;
 	}
 
-	
 	public void addRule(SingleLineRule rule) {
 		rules.add(rule);
 	}
 
-	
 	protected void backupScanner(ICharacterScanner scanner, int position) {
 		int count = scanner.getColumn() - position;
 		while (count-- > 0)
@@ -108,8 +108,7 @@ public class RestrictedEndOfLineRule extends EndOfLineRule {
 				endIndex = scanner.getColumn();
 				// Back up scanner to just after start sequence.
 				backupScanner(scanner, startIndex + startSequence.length());
-			}
+			} else
-			else
 				// Base rule doesn't hold.
 				return Token.UNDEFINED;
 		}
@@ -121,8 +120,7 @@ public class RestrictedEndOfLineRule extends EndOfLineRule {
 		column = start;
 		while (column < endIndex) {
 			int ch = scanner.read();
-			if (ch == ICharacterScanner.EOF
+			if (ch == ICharacterScanner.EOF || restrictedChars.indexOf(ch) >= 0) {
-					|| restrictedChars.indexOf(ch) >= 0) {
 				scanner.unread();
 				return getSuccessToken();
 			}

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/outline/AutoconfContentOutlinePage.java

@@ -32,7 +32,6 @@ import org.eclipse.ui.part.IPageSite;
 import org.eclipse.ui.texteditor.ITextEditor;
 import org.eclipse.ui.views.contentoutline.ContentOutlinePage;
 
-
 public class AutoconfContentOutlinePage extends ContentOutlinePage {
 
 	private ITextEditor editor;
@@ -69,11 +68,9 @@ public class AutoconfContentOutlinePage extends ContentOutlinePage {
 		//update the tree viewer state
 		final TreeViewer viewer = getTreeViewer();
 
-		if (viewer != null)
+		if (viewer != null) {
-		{
 			final Control control = viewer.getControl();
-			if (control != null && !control.isDisposed())
+			if (control != null && !control.isDisposed()) {
-			{
 				control.getDisplay().asyncExec(() -> {
 					if (!control.isDisposed()) {
 						ISelection sel = viewer.getSelection();
@@ -105,8 +102,7 @@ public class AutoconfContentOutlinePage extends ContentOutlinePage {
 	 * Change in selection
 	 */
 	@Override
-	public void selectionChanged(SelectionChangedEvent event)
+	public void selectionChanged(SelectionChangedEvent event) {
-	{
 		super.selectionChanged(event);
 
 		//find out which item in tree viewer we have selected, and set highlight range accordingly
@@ -114,8 +110,7 @@ public class AutoconfContentOutlinePage extends ContentOutlinePage {
 		if (selection.isEmpty()) {
 			editor.resetHighlightRange();
 		} else {
-			AutoconfElement element = (AutoconfElement) ((IStructuredSelection) selection)
+			AutoconfElement element = (AutoconfElement) ((IStructuredSelection) selection).getFirstElement();
-					.getFirstElement();		
 
 			try {
 				int offset = element.getStartOffset();

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/outline/AutoconfContentProvider.java

@@ -24,7 +24,6 @@ import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.ui.texteditor.IDocumentProvider;
 import org.eclipse.ui.texteditor.ITextEditor;
 
-
 public class AutoconfContentProvider implements ITreeContentProvider {
 
 	private IDocumentProvider documentProvider;
@@ -47,27 +46,20 @@ public class AutoconfContentProvider implements ITreeContentProvider {
 
 	@Override
 	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-		if (oldInput != null)
+		if (oldInput != null) {
-		{
 			IDocument document = documentProvider.getDocument(oldInput);
-			if (document != null)
+			if (document != null) {
-			{
+				try {
-				try
-				{
 					document.removePositionCategory(SECTION_POSITIONS);
-				}
+				} catch (BadPositionCategoryException x) {
-				catch (BadPositionCategoryException x)
-				{
 				}
 				document.removePositionUpdater(positionUpdater);
 			}
 		}
 
-		if (newInput != null)
+		if (newInput != null) {
-		{
 			IDocument document = documentProvider.getDocument(newInput);
-			if (document != null)
+			if (document != null) {
-			{
 				document.addPositionCategory(SECTION_POSITIONS);
 				document.addPositionUpdater(positionUpdater);
 			}

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/outline/AutoconfLabelProvider.java

@@ -31,7 +31,6 @@ import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.ILabelProviderListener;
 import org.eclipse.swt.graphics.Image;
 
-
 public class AutoconfLabelProvider implements ILabelProvider {
 
 	public AutoconfLabelProvider() {

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/parser/AutoconfElement.java

@@ -40,7 +40,6 @@ public class AutoconfElement {
 		this.children = new ArrayList<>();
 	}
 
-
 	@Override
 	public String toString() {
 		String source = getSource();
@@ -95,7 +94,6 @@ public class AutoconfElement {
 		this.name = string;
 	}
 
-	
 	public String getVar() {
 		return var;
 	}

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/parser/AutoconfMacroArgumentElement.java

@@ -26,6 +26,7 @@ public class AutoconfMacroArgumentElement extends AutoconfElement {
 	public AutoconfMacroArgumentElement() {
 		super(""); // //$NON-NLS-N$
 	}
+
 	public AutoconfMacroArgumentElement(String name) {
 		super(name);
 	}

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/parser/AutoconfMacroElement.java

@@ -13,6 +13,7 @@
  *     Ed Swartz (NOKIA Inc) - support standalone parser
  *******************************************************************************/
 package org.eclipse.cdt.autotools.ui.editors.parser;
+
 /**
  * A call to a macro.
  * <p>
@@ -32,6 +33,7 @@ public class AutoconfMacroElement extends AutoconfElement {
 		else
 			return null;
 	}
+
 	public int getParameterCount() {
 		return children.size();
 	}
@@ -47,7 +49,7 @@ public class AutoconfMacroElement extends AutoconfElement {
 	 * @param verions Autoconf to be used to validate this macro.
 	 * @throws InvalidMacroException
 	 */
-	public void validate (String version) throws InvalidMacroException {}
+	public void validate(String version) throws InvalidMacroException {
-
+	}
 
 }

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/parser/AutoconfOutlineErrorHandler.java

@@ -30,17 +30,14 @@ import org.eclipse.jface.text.IDocument;
 import org.eclipse.ui.IStorageEditorInput;
 import org.eclipse.ui.texteditor.MarkerUtilities;
 
-
 public class AutoconfOutlineErrorHandler {
 
-	public static final String PARSE_ERROR_MARKER_ID = AutotoolsUIPlugin.PLUGIN_ID
+	public static final String PARSE_ERROR_MARKER_ID = AutotoolsUIPlugin.PLUGIN_ID + ".outlineparsefileerror"; //$NON-NLS-1$
-	+ ".outlineparsefileerror"; //$NON-NLS-1$
 
 	private IFile file;
 	private IDocument document;
 
-	public AutoconfOutlineErrorHandler(IStorageEditorInput input, IDocument document)
+	public AutoconfOutlineErrorHandler(IStorageEditorInput input, IDocument document) {
-	{
 		this.document = document;
 		IWorkspaceRoot root = CCorePlugin.getWorkspace().getRoot();
 		try {

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/parser/AutoconfParser.java

@@ -24,7 +24,6 @@ import org.eclipse.core.resources.IMarker;
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.IDocument;
 
-
 /**
  * Tokenizing autoconf parser, based on original work by Jeff Johnston
  * @author eswartz
@@ -57,13 +56,11 @@ public class AutoconfParser {
 	private AutoconfTokenizer tokenizer;
 	private IAutoconfMacroDetector macroDetector;
 
-	private static final String M4_BUILTINS =
+	private static final String M4_BUILTINS = "define undefine defn pushdef popdef indir builtin ifdef ifelse shift reverse cond " //$NON-NLS-1$
-		"define undefine defn pushdef popdef indir builtin ifdef ifelse shift reverse cond " + //$NON-NLS-1$
+			+ "dumpdef traceon traceoff debugmode debugfile dnl changequote changecom changeword " + "m4wrap "
-		"dumpdef traceon traceoff debugmode debugfile dnl changequote changecom changeword " + //$NON-NLS-1$
+			+ "include sinclude divert undivert divnum len index regexp substr translit patsubst "
-		"m4wrap " + //$NON-NLS-1$
+			+ "format incr decr eval syscmd esyscmd sysval mkstemp maketemp errprint m4exit "
-		"include sinclude divert undivert divnum len index regexp substr translit patsubst " + //$NON-NLS-1$
+			+ "__file__ __line__ __program__ ";
-		"format incr decr eval syscmd esyscmd sysval mkstemp maketemp errprint m4exit " + //$NON-NLS-1$
-		"__file__ __line__ __program__ "; //$NON-NLS-1$
 
 	private static List<String> m4builtins = new ArrayList<>();
 	static {
@@ -76,8 +73,7 @@ public class AutoconfParser {
 	 * @param macroDetector
 	 * @param macroValidator
 	 */
-	public AutoconfParser(IAutoconfErrorHandler errorHandler,
+	public AutoconfParser(IAutoconfErrorHandler errorHandler, IAutoconfMacroDetector macroDetector,
-			IAutoconfMacroDetector macroDetector,
 			IAutoconfMacroValidator macroValidator) {
 		this.errorHandler = errorHandler;
 		this.macroDetector = macroDetector;
@@ -119,7 +115,6 @@ public class AutoconfParser {
 		return root;
 	}
 
-
 	static class BlockEndCondition extends Exception {
 		/**
 		 *
@@ -211,10 +206,8 @@ public class AutoconfParser {
 	private Token parseBlockExpression(Token open, AutoconfElement block) throws BlockEndCondition {
 		Token token;
 		try {
-			if (block instanceof AutoconfIfElement 
+			if (block instanceof AutoconfIfElement || block instanceof AutoconfElifElement
-					|| block instanceof AutoconfElifElement 
+					|| block instanceof AutoconfCaseElement || block instanceof AutoconfWhileElement) {
-					|| block instanceof AutoconfCaseElement 
-					|| block instanceof AutoconfWhileElement) {
 				token = parseExpression(block);
 			} else if (block instanceof AutoconfForElement) {
 				token = parseForExpression(block);
@@ -239,16 +232,12 @@ public class AutoconfParser {
 		}
 
 		if (token.getType() == ITokenConstants.SH_DO) {
-			checkBlockValidity(block, token, 
+			checkBlockValidity(block, token, new Class[] { AutoconfForElement.class, AutoconfWhileElement.class },
-					new Class[] { AutoconfForElement.class, AutoconfWhileElement.class },
 					INVALID_DO);
-		}
+		} else if (token.getType() == ITokenConstants.SH_THEN) {
-		else if (token.getType() == ITokenConstants.SH_THEN) {
+			checkBlockValidity(block, token, new Class[] { AutoconfIfElement.class, AutoconfElifElement.class },
-			checkBlockValidity(block, token, 
-					new Class[] { AutoconfIfElement.class, AutoconfElifElement.class },
 					INVALID_THEN);
-		} 
+		} else {
-		else {
 			String exp;
 			if (block instanceof AutoconfIfElement || block instanceof AutoconfElifElement)
 				exp = "then";
@@ -372,6 +361,7 @@ public class AutoconfParser {
 
 		return text;
 	}
+
 	private void setSourceStart(AutoconfElement block, Token open) {
 		int offset = open.getOffset();
 		block.setDocument(open.getDocument());
@@ -413,18 +403,17 @@ public class AutoconfParser {
 			case ITokenConstants.EOF:
 				AutoconfElement element = parent;
 				while (element != null && !(element instanceof AutoconfRootElement)) {
-					handleError(token, AutoconfEditorMessages.getFormattedString(UNTERMINATED_CONSTRUCT, element.getName()));
+					handleError(token,
+							AutoconfEditorMessages.getFormattedString(UNTERMINATED_CONSTRUCT, element.getName()));
 					element = element.getParent();
 				}
 				throw new BlockEndCondition(token);
 
-			
 				// 1. Check for end of statement
 			case ITokenConstants.EOL:
 			case ITokenConstants.SEMI:
 				return;
 
-			
 			// 2. Check macro expansions
 			case ITokenConstants.WORD:
 				checkMacro(parent, token);
@@ -452,9 +441,7 @@ public class AutoconfParser {
 
 			case ITokenConstants.SH_ELIF:
 				checkLineStart(token, atStart);
-				checkBlockValidity(
+				checkBlockValidity(parent, token, new Class[] { AutoconfIfElement.class, AutoconfElifElement.class },
-						parent, token, 
-						new Class[] { AutoconfIfElement.class, AutoconfElifElement.class },
 						INVALID_ELIF);
 				parseBlock(parent, token, new AutoconfElifElement());
 				token = tokenizer.peekToken();
@@ -462,9 +449,7 @@ public class AutoconfParser {
 
 			case ITokenConstants.SH_ELSE:
 				checkLineStart(token, atStart);
-				checkBlockValidity(
+				checkBlockValidity(parent, token, new Class[] { AutoconfIfElement.class, AutoconfElifElement.class },
-						parent, token, 
-						new Class[] { AutoconfIfElement.class, AutoconfElifElement.class },
 						INVALID_ELSE);
 				parseBlock(parent, token, new AutoconfElseElement());
 				token = tokenizer.peekToken();
@@ -472,13 +457,11 @@ public class AutoconfParser {
 
 			case ITokenConstants.SH_FI:
 				checkLineStart(token, atStart);
-				checkBlockValidity(
+				checkBlockValidity(parent, token,
-						parent, token, 
 						new Class[] { AutoconfIfElement.class, AutoconfElifElement.class, AutoconfElseElement.class },
 						INVALID_FI);
 				throw new BlockEndCondition(token);
 
-				
 				// 4. Look for for/while loops
 			case ITokenConstants.SH_FOR:
 				checkLineStart(token, atStart);
@@ -502,11 +485,8 @@ public class AutoconfParser {
 
 			case ITokenConstants.SH_DONE:
 				checkLineStart(token, atStart);
-				checkBlockValidity(
+				checkBlockValidity(parent, token, new Class[] { AutoconfForElement.class, AutoconfWhileElement.class,
-						parent, token, 
+						AutoconfUntilElement.class, AutoconfSelectElement.class }, INVALID_DONE);
-						new Class[] { AutoconfForElement.class, AutoconfWhileElement.class,
-								AutoconfUntilElement.class, AutoconfSelectElement.class },
-						INVALID_DONE);
 				throw new BlockEndCondition(token);
 
 				// 5. Look for case statements
@@ -516,22 +496,17 @@ public class AutoconfParser {
 				break;
 
 			case ITokenConstants.SH_CASE_CONDITION_END:
-				checkBlockValidity(
+				checkBlockValidity(parent, token, new Class[] { AutoconfCaseConditionElement.class },
-						parent, token, 
-						new Class[] { AutoconfCaseConditionElement.class },
 						IMPROPER_CASE_CONDITION);
 				throw new BlockEndCondition(token);
 
 			case ITokenConstants.SH_ESAC:
 				checkLineStart(token, atStart);
-				checkBlockValidity(
+				checkBlockValidity(parent, token,
-						parent, token, 
 						// note: we don't strictly recurse here, so accept either parent
-						new Class[] { AutoconfCaseElement.class, AutoconfCaseConditionElement.class },
+						new Class[] { AutoconfCaseElement.class, AutoconfCaseConditionElement.class }, INVALID_ESAC);
-						INVALID_ESAC);
 				throw new BlockEndCondition(token);
 
-			
 				// 6. Check for HERE documents
 			case ITokenConstants.SH_HERE:
 			case ITokenConstants.SH_HERE_DASH:
@@ -566,7 +541,8 @@ public class AutoconfParser {
 			while (true) {
 				token = tokenizer.readToken();
 				if (token.getType() == ITokenConstants.EOF) {
-					handleError(token, AutoconfEditorMessages.getFormattedString(UNTERMINATED_CONSTRUCT, parent.getName()));
+					handleError(token,
+							AutoconfEditorMessages.getFormattedString(UNTERMINATED_CONSTRUCT, parent.getName()));
 					break;
 				} else if (token.getType() == ITokenConstants.EOL) {
 					atEOL = true;
@@ -574,7 +550,8 @@ public class AutoconfParser {
 					if (atEOL && token.getText().equals(hereTag)) {
 						// only the end if it is also followed by EOL without any whitespace
 						Token eol = tokenizer.readToken();
-						if (eol.getType() == ITokenConstants.EOL && eol.getOffset() == token.getOffset() + token.getLength()) {
+						if (eol.getType() == ITokenConstants.EOL
+								&& eol.getOffset() == token.getOffset() + token.getLength()) {
 							break;
 						}
 					}
@@ -624,8 +601,7 @@ public class AutoconfParser {
 
 			case ITokenConstants.SH_IN:
 				// in 'for' or 'select, an 'in' may occur before 'do'
-				if (!(parent instanceof AutoconfForElement)
+				if (!(parent instanceof AutoconfForElement) && !(parent instanceof AutoconfSelectElement))
-						&& !(parent instanceof AutoconfSelectElement)) 
 					return token;
 				// fall through
 
@@ -684,7 +660,8 @@ public class AutoconfParser {
 			}
 
 			// 4. Abort on unexpected tokens
-			else switch (token.getType()) {
+			else
+				switch (token.getType()) {
 				case ITokenConstants.SH_THEN:
 					handleError(token, AutoconfEditorMessages.getFormattedString(INVALID_SPECIFIER, token.getText()));
 					tokenizer.unreadToken(token);
@@ -701,7 +678,8 @@ public class AutoconfParser {
 				case ITokenConstants.SH_ELSE:
 				case ITokenConstants.SH_FI:
 				case ITokenConstants.SH_DONE:
-				handleError(token, AutoconfEditorMessages.getFormattedString(UNTERMINATED_CONSTRUCT, parent.getName()));
+					handleError(token,
+							AutoconfEditorMessages.getFormattedString(UNTERMINATED_CONSTRUCT, parent.getName()));
 					tokenizer.unreadToken(token);
 					throw new BlockEndCondition(token);
 				}
@@ -735,13 +713,13 @@ public class AutoconfParser {
 			// 3. Check expression terminators
 			else if (parent instanceof AutoconfCaseElement && token.getType() == ITokenConstants.SH_IN) {
 				return token;
-			}
+			} else if (parent instanceof AutoconfCaseConditionElement && token.getType() == ITokenConstants.RPAREN) {
-			else if (parent instanceof AutoconfCaseConditionElement && token.getType() == ITokenConstants.RPAREN) {
 				return token;
 			}
 
 			// 4. Abort on unexpected tokens
-			else switch (token.getType()) {
+			else
+				switch (token.getType()) {
 				case ITokenConstants.SEMI:
 				case ITokenConstants.SH_IN:
 				case ITokenConstants.RPAREN:
@@ -763,7 +741,8 @@ public class AutoconfParser {
 				case ITokenConstants.SH_ELSE:
 				case ITokenConstants.SH_FI:
 				case ITokenConstants.SH_DONE:
-				handleError(token, AutoconfEditorMessages.getFormattedString(UNTERMINATED_CONSTRUCT, parent.getName()));
+					handleError(token,
+							AutoconfEditorMessages.getFormattedString(UNTERMINATED_CONSTRUCT, parent.getName()));
 					tokenizer.unreadToken(token);
 					throw new BlockEndCondition(token);
 				}
@@ -779,11 +758,7 @@ public class AutoconfParser {
 	 * @param token
 	 * @param classes
 	 */
-	private void checkBlockValidity(
+	private void checkBlockValidity(AutoconfElement parent, Token token, Class<?>[] classes, String errorMessage) {
-			AutoconfElement parent, 
-			Token token,
-			Class<?>[] classes,
-			String errorMessage) {
 		for (int i = 0; i < classes.length; i++) {
 			if (classes[i].isInstance(parent)) {
 				return;
@@ -875,8 +850,7 @@ public class AutoconfParser {
 		}
 
 		// now validate that the macro is properly terminated
-		if (!(parent instanceof AutoconfMacroArgumentElement) 
+		if (!(parent instanceof AutoconfMacroArgumentElement) && !(parent instanceof AutoconfMacroElement)
-				&& !(parent instanceof AutoconfMacroElement)
 				&& !(parent instanceof AutoconfForElement)) {
 			Token peek = tokenizer.peekToken();
 			if (peek.getType() == ITokenConstants.RPAREN) {
@@ -889,11 +863,11 @@ public class AutoconfParser {
 
 	private void validateMacroParameterCount(AutoconfMacroElement macro, Token token, int count) {
 		if (macro.getParameterCount() < count) {
-			handleError(token, AutoconfEditorMessages.getFormattedString("M4MacroArgsTooFew", 
+			handleError(token, AutoconfEditorMessages.getFormattedString("M4MacroArgsTooFew", macro.getName(),
-					macro.getName(), Integer.valueOf(2))); //$NON-NLS-1$ 
+					Integer.valueOf(2))); //$NON-NLS-1$
 		} else if (macro.getParameterCount() > count) {
-			handleError(token, AutoconfEditorMessages.getFormattedString("M4MacroArgsTooMany", 
+			handleError(token, AutoconfEditorMessages.getFormattedString("M4MacroArgsTooMany", macro.getName(),
-					macro.getName(), Integer.valueOf(2))); //$NON-NLS-1$
+					Integer.valueOf(2))); //$NON-NLS-1$
 		}
 	}
 
@@ -967,8 +941,7 @@ public class AutoconfParser {
 				continue;
 			}
 
-			if (token.getType() == ITokenConstants.COMMA 
+			if (token.getType() == ITokenConstants.COMMA || token.getType() == ITokenConstants.RPAREN
-					|| token.getType() == ITokenConstants.RPAREN
 					|| token.getType() == ITokenConstants.EOF) {
 
 				arg.setName(argBuffer.toString());
@@ -1049,13 +1022,8 @@ public class AutoconfParser {
 			} catch (BadLocationException e) {
 				// Don't care if we blow up trying to issue marker
 			}
-			errorHandler.handleError(new ParseException(
+			errorHandler.handleError(new ParseException(message, token.getOffset(),
-					message,
+					token.getOffset() + token.getLength(), lineNumber, startColumn, endColumn, severity));
-					token.getOffset(),
-					token.getOffset() + token.getLength(),
-					lineNumber, 
-					startColumn, endColumn,
-					severity));
 		}
 	}
 
@@ -1078,13 +1046,8 @@ public class AutoconfParser {
 			} catch (BadLocationException e) {
 				// Don't care if we blow up trying to issue marker
 			}
-			errorHandler.handleError(new ParseException(
+			errorHandler.handleError(new ParseException(exception.getMessage(), element.getStartOffset(),
-					exception.getMessage(),
+					element.getEndOffset(), lineNumber, startColumn, endColumn, IMarker.SEVERITY_ERROR));
-					element.getStartOffset(),
-					element.getEndOffset(),
-					lineNumber, 
-					startColumn, endColumn,
-					IMarker.SEVERITY_ERROR));
 		}
 	}
 
@@ -1092,4 +1055,3 @@ public class AutoconfParser {
 		return errorHandler;
 	}
 }
-

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/parser/AutoconfTokenizer.java

@@ -19,7 +19,6 @@ import org.eclipse.core.resources.IMarker;
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.IDocument;
 
-
 /**
  * This tokenizer traverses autotools-style text (m4 or configure.ac) to support the
  * autoconf parser.  It tracks the current context (m4 macro call or shell commands)
@@ -329,9 +328,11 @@ public class AutoconfTokenizer {
 		}
 
 		if (quoteLevel > 0) {
-			handleError(startOffset, offset, AutoconfEditorMessages.getFormattedString(UNMATCHED_LEFT_QUOTE, m4CloseQuote));
+			handleError(startOffset, offset,
+					AutoconfEditorMessages.getFormattedString(UNMATCHED_LEFT_QUOTE, m4CloseQuote));
 		} else if (quoteLevel < 0) {
-			handleError(startOffset, offset, AutoconfEditorMessages.getFormattedString(UNMATCHED_RIGHT_QUOTE, m4OpenQuote));
+			handleError(startOffset, offset,
+					AutoconfEditorMessages.getFormattedString(UNMATCHED_RIGHT_QUOTE, m4OpenQuote));
 		}
 
 		return makeToken(ITokenConstants.M4_STRING, buffer.toString());
@@ -365,8 +366,7 @@ public class AutoconfTokenizer {
 		return makeToken(type, buffer.toString());
 	}
 
-	private void handleError(int start, int end,
+	private void handleError(int start, int end, String message) {
-			String message) {
 		if (errorHandler != null) {
 			int lineNumber = 0;
 			int startColumn = 0;
@@ -379,11 +379,7 @@ public class AutoconfTokenizer {
 			} catch (BadLocationException e) {
 				// Don't care if we blow up trying to issue marker
 			}
-			errorHandler.handleError(new ParseException(
+			errorHandler.handleError(new ParseException(message, start, end, lineNumber, startColumn, endColumn,
-					message,
-					start, end,
-					lineNumber, 
-					startColumn, endColumn,
 					IMarker.SEVERITY_ERROR));
 		}
 	}
@@ -413,9 +409,8 @@ public class AutoconfTokenizer {
 	}
 
 	private Token makeToken(int type) {
-		return new Token(type,
+		return new Token(type, new String(chars, startOffset, offset - startOffset), document, startOffset,
-				new String(chars, startOffset, offset - startOffset),
+				offset - startOffset);
-				document, startOffset, offset - startOffset);
 	}
 
 	private Token makeToken(int type, String text) {

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/parser/IAutoconfErrorHandler.java

@@ -14,7 +14,6 @@
 
 package org.eclipse.cdt.autotools.ui.editors.parser;
 
-
 /**
  * Clients implement this interface to handle errors encountered while parsing.
  * @author eswartz

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/parser/IAutoconfMacroDetector.java

@@ -14,7 +14,6 @@
 
 package org.eclipse.cdt.autotools.ui.editors.parser;
 
-
 /**
  * Clients implement this interface to identify what identifiers represent
  * macros for the autoconf tree.

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/parser/IAutoconfMacroValidator.java

@@ -14,7 +14,6 @@
 
 package org.eclipse.cdt.autotools.ui.editors.parser;
 
-
 /**
  * Clients implement this interface to validate macro calls.
  * @author eswartz

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/parser/ITokenConstants.java

@@ -93,5 +93,4 @@ public interface ITokenConstants {
 	/** an sh backtick-quoted string */
 	int SH_STRING_BACKTICK = 69;
 
-
 }

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/parser/ParseException.java

@@ -23,34 +23,42 @@ public class ParseException extends Exception {
 	int endColumn;
 	private int startOffset;
 	private int endOffset;
+
 	public int getEndColumn() {
 		return endColumn;
 	}
+
 	public void setEndColumn(int endColumn) {
 		this.endColumn = endColumn;
 	}
+
 	public int getLineNumber() {
 		return lineNumber;
 	}
+
 	public void setLineNumber(int lineNumber) {
 		this.lineNumber = lineNumber;
 	}
+
 	@Override
 	public String getMessage() {
 		return message;
 	}
+
 	public void setMessage(String message) {
 		this.message = message;
 	}
+
 	public int getStartColumn() {
 		return startColumn;
 	}
+
 	public void setStartColumn(int startColumn) {
 		this.startColumn = startColumn;
 	}
-	public ParseException(String message,
+
-			int startOffset, int endOffset,
+	public ParseException(String message, int startOffset, int endOffset, int lineNumber, int startColumn,
-			int lineNumber, int startColumn, int endColumn, int severity) {
+			int endColumn, int severity) {
 		super();
 		this.message = message;
 		this.startOffset = startOffset;
@@ -60,15 +68,19 @@ public class ParseException extends Exception {
 		this.endColumn = endColumn;
 		this.severity = severity;
 	}
+
 	public int getSeverity() {
 		return severity;
 	}
+
 	public void setSeverity(int severity) {
 		this.severity = severity;
 	}
+
 	public int getStartOffset() {
 		return startOffset;
 	}
+
 	public int getEndOffset() {
 		return endOffset;
 	}

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/AbstractAutotoolsCPropertyTab.java

@@ -15,8 +15,7 @@ package org.eclipse.cdt.internal.autotools.ui;
 
 import org.eclipse.cdt.managedbuilder.ui.properties.AbstractCBuildPropertyTab;
 
-public abstract class AbstractAutotoolsCPropertyTab extends
+public abstract class AbstractAutotoolsCPropertyTab extends AbstractCBuildPropertyTab {
-		AbstractCBuildPropertyTab {
 
 	@Override
 	public boolean isIndexerAffected() {

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/AutotoolsUIPluginImages.java

@@ -25,7 +25,6 @@ import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.resource.ImageRegistry;
 import org.eclipse.swt.graphics.Image;
 
-
 /**
  * Bundle of all images used by the C plugin.
  */
@@ -83,7 +82,8 @@ public class AutotoolsUIPluginImages {
 	}
 
 	private static ImageDescriptor createManaged(ImageRegistry registry, String prefix, String name) {
-		ImageDescriptor result= ImageDescriptor.createFromURL(makeIconFileURL(prefix, name.substring(NAME_PREFIX_LENGTH)));
+		ImageDescriptor result = ImageDescriptor
+				.createFromURL(makeIconFileURL(prefix, name.substring(NAME_PREFIX_LENGTH)));
 		registry.put(name, result);
 		return result;
 	}

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/CBuildStepsConsole.java

@@ -14,7 +14,6 @@
  *******************************************************************************/
 package org.eclipse.cdt.internal.autotools.ui;
 
-
 public class CBuildStepsConsole extends Console {
 	private static final String CONTEXT_MENU_ID = "CAutotoolsBuildStepsConsole"; //$NON-NLS-1$
 	private static final String CONSOLE_NAME = ConsoleMessages.getString("BuildStepsConsole.name"); //$NON-NLS-1$

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/CConfigureConsole.java

@@ -13,7 +13,6 @@
  *******************************************************************************/
 package org.eclipse.cdt.internal.autotools.ui;
 
-
 public class CConfigureConsole extends Console {
 	private static final String CONTEXT_MENU_ID = "CAutotoolsConfigureConsole"; //$NON-NLS-1$
 	private static final String CONSOLE_NAME = ConsoleMessages.getString("ConfigureConsole.name"); //$NON-NLS-1$

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/CWordFinder.java

@@ -18,7 +18,6 @@ import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.IRegion;
 import org.eclipse.jface.text.Region;
 
-
 /**
  * This is a helper class for the text editor to be able to determine, given a
  * particular offset in a document, various candidates segments for things like
@@ -233,7 +232,8 @@ public class CWordFinder {
 					if (bracketcount-- == 0) {
 						do {
 							c = document.getChar(pos--);
-							if (c == BRACE_R) return false;
+							if (c == BRACE_R)
+								return false;
 						} while (Character.isWhitespace(c));
 						// container block seems to be not a function or statement body
 						pos++; // step back one symbol
@@ -242,7 +242,8 @@ public class CWordFinder {
 				}
 			}
 
-		} catch (BadLocationException x) { /* Ignore */	}
+		} catch (BadLocationException x) {
+			/* Ignore */ }
 		// return true in case of unknown result or exception
 		return true;
 	}
@@ -266,7 +267,8 @@ public class CWordFinder {
 					lf = c;
 					counter++;
 				}
-			} else if (lf == c) counter++;
+			} else if (lf == c)
+				counter++;
 		}
 		return counter;
 	}
@@ -279,8 +281,9 @@ public class CWordFinder {
 	 * @return  true if curled brace found.
 	 */
 	public static boolean hasCBraces(String s) {
-		if (s.indexOf(CBRACE_L) > -1 || s.indexOf(CBRACE_R) > -1) return true;
+		if (s.indexOf(CBRACE_L) > -1 || s.indexOf(CBRACE_R) > -1)
-		else return false;
+			return true;
+		else
+			return false;
 	}
 }
-

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/Console.java

@@ -25,8 +25,7 @@ public class Console implements IConsole {
 	IBuildConsoleManager fConsoleManager;
 
 	public Console(String consoleName, String contextId) {
-		fConsoleManager = CUIPlugin.getDefault().getConsoleManager(consoleName, 
+		fConsoleManager = CUIPlugin.getDefault().getConsoleManager(consoleName, contextId);
-				contextId);
 	}
 
 	@Override

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/ConsoleMessages.java

@@ -25,6 +25,7 @@ public class ConsoleMessages {
 	private ConsoleMessages() {
 
 	}
+
 	public static String getString(String key) {
 		try {
 			return RESOURCE_BUNDLE.getString(key);

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/ErrorParserBlock.java

@@ -44,7 +44,8 @@ public class ErrorParserBlock extends AbstractErrorParserBlock {
 			Composite composite = ControlFactory.createComposite(parent, 1);
 			setControl(composite);
 			ControlFactory.createEmptySpace(composite);
-			ControlFactory.createLabel(composite, MakeUIMessages.getResourceString("ErrorParserBlock.label.missingBuilderInformation")); //$NON-NLS-1$
+			ControlFactory.createLabel(composite,
+					MakeUIMessages.getResourceString("ErrorParserBlock.label.missingBuilderInformation")); //$NON-NLS-1$
 			return;
 		}
 		super.createControl(parent);
@@ -77,7 +78,6 @@ public class ErrorParserBlock extends AbstractErrorParserBlock {
 		}
 	}
 
-	
 	@Override
 	protected void saveErrorParsers(String[] parserIDs) throws CoreException {
 		fBuildInfo = MakeCorePlugin.createBuildInfo(fPrefs, MakeBuilder.BUILDER_ID, false);

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/HTML2TextReader.java

@@ -14,7 +14,6 @@
  *******************************************************************************/
 package org.eclipse.cdt.internal.autotools.ui;
 
-
 import java.io.IOException;
 import java.io.PushbackReader;
 import java.io.Reader;
@@ -27,14 +26,12 @@ import org.eclipse.jface.text.TextPresentation;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.StyleRange;
 
-
 /**
  * Reads the text contents from a reader of HTML contents and translates
  * the tags or cut them out.
  */
 public class HTML2TextReader extends SubstitutionTextReader {
 
-	
 	private static final String LINE_DELIM = System.getProperty("line.separator", "\n"); //$NON-NLS-1$ //$NON-NLS-2$
 	private static final Map<String, String> fgEntityLookup;
 	private static final Set<String> fgTags;
@@ -96,7 +93,8 @@ public class HTML2TextReader extends SubstitutionTextReader {
 		--fBold;
 		if (fBold == 0) {
 			if (fTextPresentation != null) {
-				fTextPresentation.addStyleRange(new StyleRange(fStartOffset, fCounter - fStartOffset, null, null, SWT.BOLD));
+				fTextPresentation
+						.addStyleRange(new StyleRange(fStartOffset, fCounter - fStartOffset, null, null, SWT.BOLD));
 			}
 			fStartOffset = -1;
 		}

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/HTMLPrinter.java

@@ -17,7 +17,6 @@ package org.eclipse.cdt.internal.autotools.ui;
 import java.io.IOException;
 import java.io.Reader;
 
-
 /**
  * Provides a set of convenience methods for creating HTML pages.
  */
@@ -112,8 +111,7 @@ public class HTMLPrinter {
 		}
 	}
 
-	public static void addParagraph(StringBuilder buffer,
+	public static void addParagraph(StringBuilder buffer, Reader paragraphReader) {
-			Reader paragraphReader) {
 		if (paragraphReader != null)
 			addParagraph(buffer, read(paragraphReader));
 	}

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/HTMLTextPresenter.java

@@ -27,7 +27,6 @@ import org.eclipse.swt.custom.StyleRange;
 import org.eclipse.swt.graphics.GC;
 import org.eclipse.swt.widgets.Display;
 
-
 public class HTMLTextPresenter implements DefaultInformationControl.IInformationPresenter {
 
 	private static final String LINE_DELIM = System.getProperty("line.separator", "\n"); //$NON-NLS-1$ //$NON-NLS-2$
@@ -86,13 +85,15 @@ public class HTMLTextPresenter implements DefaultInformationControl.IInformation
 		int length = line.length();
 
 		int i = 0;
-		while (i < length && Character.isWhitespace(line.charAt(i))) ++i;
+		while (i < length && Character.isWhitespace(line.charAt(i)))
+			++i;
 
 		return (i == length ? line : line.substring(0, i)) + " "; //$NON-NLS-1$
 	}
 
 	@Override
-	public String updatePresentation(Display display, String hoverInfo, TextPresentation presentation, int maxWidth, int maxHeight) {
+	public String updatePresentation(Display display, String hoverInfo, TextPresentation presentation, int maxWidth,
+			int maxHeight) {
 
 		if (hoverInfo == null)
 			return null;
@@ -185,4 +186,3 @@ public class HTMLTextPresenter implements DefaultInformationControl.IInformation
 		return buffer.toString();
 	}
 }
-

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/LineBreakingReader.java

@@ -34,6 +34,7 @@ public class LineBreakingReader {
 	private int fOffset;
 
 	private BreakIterator fLineBreakIterator;
+
 	private int findNextBreakOffset(int currOffset) {
 		int currWidth = 0;
 		int nextOffset = fLineBreakIterator.following(currOffset);
@@ -53,12 +54,14 @@ public class LineBreakingReader {
 		}
 		return nextOffset;
 	}
+
 	private int findWordBegin(int idx) {
 		while (idx < fLine.length() && Character.isWhitespace(fLine.charAt(idx))) {
 			idx++;
 		}
 		return idx;
 	}
+
 	/**
 	 * Creates a reader that breaks an input text to fit in a given width.
 	 * @param reader Reader of the input text

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/LocationAdapter.java

@@ -29,8 +29,11 @@ import org.eclipse.core.runtime.IPath;
 abstract class LocationAdapter<T> {
 
 	public abstract String extractName(T location);
+
 	public abstract IFile[] platformsFindFilesForLocation(T location);
+
 	public abstract String getCanonicalPath(T location);
+
 	public abstract T getLocation(IFile file);
 
 	public static final LocationAdapter<IPath> PATH = new LocationAdapter<IPath>() {