From 12904409a3d93f4ef47fb40c47b44eb6c4ead01b Mon Sep 17 00:00:00 2001
From: Alex Blewitt <alex.blewitt@gmail.com>
Date: Sat, 23 Apr 2016 15:33:27 +0100
Subject: [PATCH] Bug 492304 - Fix NLS warnings

Eclipse warns if a String literal does not have a `//$NON-NLS-<n>$`
entry at the end of the line. However, for historic or formatting
reasons, many such occurrences in the CDT source have an intermediate
whitespace, such as `// $NON-NLS-<n>$`

Fix these so that the whitespace is removed between the // and $
characters.

Change-Id: Idc12398fe6e9d619af1d0b1b73fb8b6180da223c
Signed-off-by: Alex Blewitt <alex.blewitt@gmail.com>
---
 .../core/AutotoolsNewProjectNature.java       |  4 +-
 .../core/AutotoolsOptionConstants.java        | 92 +++++++++----------
 .../core/AutotoolsNewMakeGenerator.java       | 10 +-
 .../core/AutotoolsPropertyConstants.java      | 42 ++++-----
 .../configure/AutotoolsConfiguration.java     | 26 +++---
 .../AutotoolsConfigurationManager.java        | 34 +++----
 .../AutotoolsOptionValueHandler.java          |  6 +-
 .../core/configure/BinConfigureOption.java    |  6 +-
 .../core/configure/ConfigureTool.java         |  4 +-
 .../configure/InternalConfigureOption.java    |  6 +-
 .../configure/MultiArgConfigureOption.java    |  6 +-
 .../core/configure/StringConfigureOption.java |  8 +-
 .../configure/VariableConfigureOption.java    |  6 +-
 .../autotools/tests/UpdateConfigureTest.java  | 10 +-
 .../ui/tests/SetConfigurationParameter.java   | 18 ++--
 .../autotools/ui/AutotoolsUIPluginImages.java |  2 +-
 .../autotools/ui/OptionalMessageDialog.java   |  4 +-
 .../ui/actions/AbstractAutotoolsHandler.java  |  4 +-
 .../AutotoolsBuildPropertyPage.java           | 18 ++--
 .../properties/AutotoolsToolsPropertyTab.java | 26 +++---
 .../autotools/ui/wizards/ReferenceBlock.java  |  8 +-
 .../internal/GCCPathToolChainProvider.java    |  4 +-
 .../internal/CMakeBuildConfiguration.java     |  2 +-
 .../cdt/make/core/MakeScannerInfo.java        |  4 +-
 .../internal/core/makefile/NullMakefile.java  |  2 +-
 .../core/makefile/gnu/GNUMakefile.java        |  2 +-
 .../core/scannerconfig/util/CCommandDSC.java  |  6 +-
 .../testplugin/ManagedBuildTestHelper.java    |  2 +-
 .../ManagedBuildCommandLineGenerator.java     |  4 +-
 .../core/tests/ManagedProjectUpdateTests.java |  2 +-
 .../core/tests/ResourceBuildCoreTests.java    |  2 +-
 .../tests/Test30_2_CommandLineGenerator.java  |  4 +-
 .../core/ManagedBuildManager.java             |  2 +-
 .../core/ManagedBuilderCorePlugin.java        |  2 +-
 .../internal/buildmodel/BuildDescription.java |  2 +-
 .../internal/buildmodel/BuildStep.java        |  2 +-
 .../internal/core/AdditionalInput.java        |  2 +-
 .../internal/core/CommonBuilder.java          | 10 +-
 .../internal/core/FolderInfo.java             |  2 +-
 .../core/GeneratedMakefileBuilder.java        |  2 +-
 .../internal/core/ManagedBuildInfo.java       | 22 ++---
 .../internal/core/OptionCategory.java         |  2 +-
 .../internal/core/OptionReference.java        |  8 +-
 .../internal/core/ResourceChangeHandler.java  |  2 +-
 .../internal/core/ResourceConfiguration.java  | 12 +--
 .../managedbuilder/internal/core/Target.java  |  2 +-
 .../internal/core/ToolReference.java          | 24 ++---
 .../enablement/CheckStringExpression.java     |  4 +-
 .../DefaultGnuWinScannerInfoCollector.java    |  2 +-
 ...faultGCCDependencyCalculator3Commands.java |  2 +-
 .../makegen/gnu/GnuMakefileGenerator.java     | 26 +++---
 .../cdt/newmake/core/MakeScannerInfo.java     |  4 +-
 .../BuildOptionComboFieldEditor.java          |  4 +-
 .../ui/properties/BuildStepsTab.java          |  4 +-
 .../NewBuildConfigurationDialog.java          | 10 +-
 .../ui/properties/NewCfgDialog.java           |  4 +-
 .../ui/properties/NewVarDialog.java           |  2 +-
 .../model/util/AbstractEntryStorage.java      |  2 +-
 .../internal/core/model/BinaryFunction.java   |  4 +-
 .../scanner/IncludeSearchPathElement.java     |  4 +-
 .../utils/org/eclipse/cdt/utils/coff/PE.java  |  2 +-
 .../eclipse/cdt/utils/debug/dwarf/Dwarf.java  |  8 +-
 .../eclipse/cdt/utils/debug/stabs/Stabs.java  |  2 +-
 .../cdt/utils/debug/stabs/StabsReader.java    |  2 +-
 .../cdt/utils/debug/stabs/StringField.java    |  2 +-
 .../ui/tests/chelp/CHelpProviderTester.java   |  2 +-
 .../cdt/internal/ui/editor/IndentUtil.java    |  2 +-
 .../CFileTypesPreferenceBlock.java            |  2 +-
 .../cdt/internal/ui/search/CSearchUtil.java   |  2 +-
 .../org/eclipse/cdt/ui/CDTSharedImages.java   | 14 +--
 .../cdt/ui/dialogs/ReferenceBlock.java        |  8 +-
 .../cdt/ui/newui/NewConfigurationDialog.java  | 10 +-
 .../ui/newui/RenameConfigurationDialog.java   |  2 +-
 .../uitree/uiwidgets/UIStringListWidget.java  |  2 +-
 .../uitree/uiwidgets/UITextWidget.java        |  2 +-
 .../application/tests/StandaloneTest.java     |  4 +-
 .../core/breakpoints/CEventBreakpoint.java    |  4 +-
 .../service/command/commands/MICommand.java   |  2 +-
 .../command/commands/MIDataDisassemble.java   |  2 +-
 .../eclipse/cdt/dsf/ui/viewmodel/VMDelta.java |  2 +-
 .../docker/launcher/ContainerTab.java         |  2 +-
 .../docker/launcher/GdbDebuggerPage.java      |  4 +-
 .../cdt/launch/ui/CEnvironmentTab.java        |  4 +-
 .../core/internal/board/ArduinoTool.java      |  6 +-
 84 files changed, 317 insertions(+), 317 deletions(-)

diff --git a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/autotools/core/AutotoolsNewProjectNature.java b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/autotools/core/AutotoolsNewProjectNature.java
index 161985bb075..dee3dad79e4 100644
--- a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/autotools/core/AutotoolsNewProjectNature.java
+++ b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/autotools/core/AutotoolsNewProjectNature.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2015 Red Hat Inc.. and others
+ * Copyright (c) 2008, 2016 Red Hat Inc. and others
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -42,7 +42,7 @@ public class AutotoolsNewProjectNature implements IProjectNature {
 	/**
 	 * @since 1.3
 	 */
-	public static final String REMOTE_BUILDER_ID = "org.eclipse.ptp.rdt.sync.cdt.core.SyncBuilder"; // $NON-NLS-1$
+	public static final String REMOTE_BUILDER_ID = "org.eclipse.ptp.rdt.sync.cdt.core.SyncBuilder"; //$NON-NLS-1$
 	public static final String OLD_AUTOTOOLS_BUILDER_ID = "org.eclipse.linuxtools.cdt.autotools.genmakebuilder"; //$NON-NLS-1$
 
 	private IProject project;
diff --git a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/autotools/core/AutotoolsOptionConstants.java b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/autotools/core/AutotoolsOptionConstants.java
index 171bdb0c0ae..44b916bc931 100644
--- a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/autotools/core/AutotoolsOptionConstants.java
+++ b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/autotools/core/AutotoolsOptionConstants.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2012 Red Hat Inc. and others.
+ * Copyright (c) 2012, 2016 Red Hat Inc. and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,59 +12,59 @@ package org.eclipse.cdt.autotools.core;
  */
 public class AutotoolsOptionConstants {
 	// IAutotoolOption Names
-	public static final String TOOL_CONFIGURE = "configure"; // $NON-NLS-1$
-	public static final String CATEGORY_GENERAL = "general"; // $NON-NLS-1$
-	public static final String OPT_CONFIGDIR = "configdir"; // $NON-NLS-1$
-	public static final String OPT_CACHE_FILE = "cache-file"; // $NON-NLS-1$
-	public static final String OPT_HELP = "help"; // $NON-NLS-1$
-	public static final String OPT_NO_CREATE = "no-create"; // $NON-NLS-1$
-	public static final String OPT_QUIET = "quiet"; // $NON-NLS-1$
-	public static final String OPT_VERSION = "version"; // $NON-NLS-1$
-	public static final String CATEGORY_PLATFORM = "platform"; // $NON-NLS-1$
-	public static final String OPT_HOST = "host"; // $NON-NLS-1$
-	public static final String OPT_BUILD = "build"; // $NON-NLS-1$
-	public static final String OPT_TARGET = "target"; // $NON-NLS-1$
-	public static final String CATEGORY_DIRECTORIES = "directories"; // $NON-NLS-1$
-	public static final String OPT_PREFIX = "prefix"; // $NON-NLS-1$
-	public static final String OPT_EXEC_PREFIX = "exec-prefix"; // $NON-NLS-1$
-	public static final String OPT_LIBDIR = "libdir"; // $NON-NLS-1$
-	public static final String OPT_BINDIR = "bindir"; // $NON-NLS-1$
-	public static final String OPT_SBINDIR = "sbindir"; // $NON-NLS-1$
-	public static final String OPT_INCLUDEDIR = "includedir"; // $NON-NLS-1$
-	public static final String OPT_DATADIR = "datadir"; // $NON-NLS-1$
-	public static final String OPT_SYSCONFDIR = "sysconfdir"; // $NON-NLS-1$
-	public static final String OPT_INFODIR = "infodir"; // $NON-NLS-1$
-	public static final String OPT_MANDIR = "mandir"; // $NON-NLS-1$
-	public static final String OPT_SRCDIR = "srcdir"; // $NON-NLS-1$
-	public static final String OPT_LOCALSTATEDIR = "localstatedir"; // $NON-NLS-1$
-	public static final String OPT_SHAREDSTATEDIR = "sharedstatedir"; // $NON-NLS-1$
-	public static final String OPT_LIBEXECDIR = "libexecdir"; // $NON-NLS-1$
-	public static final String OPT_OLDINCLUDEDIR = "oldincludedir"; // $NON-NLS-1$
-	public static final String CATEGORY_FILENAMES = "filenames"; // $NON-NLS-1$
-	public static final String OPT_PROGRAM_PREFIX = "program-prefix"; // $NON-NLS-1$
-	public static final String OPT_PROGRAM_SUFFIX = "program-suffix"; // $NON-NLS-1$
-	public static final String OPT_PROGRAM_TRANSFORM_NAME = "program-transform-name"; // $NON-NLS-1$
-	public static final String CATEGORY_FEATURES = "features"; // $NON-NLS-1$
-	public static final String OPT_ENABLE_MAINTAINER_MODE = "enable-maintainer-mode"; // $NON-NLS-1$
-	public static final String FLAG_CFLAGS = "CFLAGS"; // $NON-NLS-1$
+	public static final String TOOL_CONFIGURE = "configure"; //$NON-NLS-1$
+	public static final String CATEGORY_GENERAL = "general"; //$NON-NLS-1$
+	public static final String OPT_CONFIGDIR = "configdir"; //$NON-NLS-1$
+	public static final String OPT_CACHE_FILE = "cache-file"; //$NON-NLS-1$
+	public static final String OPT_HELP = "help"; //$NON-NLS-1$
+	public static final String OPT_NO_CREATE = "no-create"; //$NON-NLS-1$
+	public static final String OPT_QUIET = "quiet"; //$NON-NLS-1$
+	public static final String OPT_VERSION = "version"; //$NON-NLS-1$
+	public static final String CATEGORY_PLATFORM = "platform"; //$NON-NLS-1$
+	public static final String OPT_HOST = "host"; //$NON-NLS-1$
+	public static final String OPT_BUILD = "build"; //$NON-NLS-1$
+	public static final String OPT_TARGET = "target"; //$NON-NLS-1$
+	public static final String CATEGORY_DIRECTORIES = "directories"; //$NON-NLS-1$
+	public static final String OPT_PREFIX = "prefix"; //$NON-NLS-1$
+	public static final String OPT_EXEC_PREFIX = "exec-prefix"; //$NON-NLS-1$
+	public static final String OPT_LIBDIR = "libdir"; //$NON-NLS-1$
+	public static final String OPT_BINDIR = "bindir"; //$NON-NLS-1$
+	public static final String OPT_SBINDIR = "sbindir"; //$NON-NLS-1$
+	public static final String OPT_INCLUDEDIR = "includedir"; //$NON-NLS-1$
+	public static final String OPT_DATADIR = "datadir"; //$NON-NLS-1$
+	public static final String OPT_SYSCONFDIR = "sysconfdir"; //$NON-NLS-1$
+	public static final String OPT_INFODIR = "infodir"; //$NON-NLS-1$
+	public static final String OPT_MANDIR = "mandir"; //$NON-NLS-1$
+	public static final String OPT_SRCDIR = "srcdir"; //$NON-NLS-1$
+	public static final String OPT_LOCALSTATEDIR = "localstatedir"; //$NON-NLS-1$
+	public static final String OPT_SHAREDSTATEDIR = "sharedstatedir"; //$NON-NLS-1$
+	public static final String OPT_LIBEXECDIR = "libexecdir"; //$NON-NLS-1$
+	public static final String OPT_OLDINCLUDEDIR = "oldincludedir"; //$NON-NLS-1$
+	public static final String CATEGORY_FILENAMES = "filenames"; //$NON-NLS-1$
+	public static final String OPT_PROGRAM_PREFIX = "program-prefix"; //$NON-NLS-1$
+	public static final String OPT_PROGRAM_SUFFIX = "program-suffix"; //$NON-NLS-1$
+	public static final String OPT_PROGRAM_TRANSFORM_NAME = "program-transform-name"; //$NON-NLS-1$
+	public static final String CATEGORY_FEATURES = "features"; //$NON-NLS-1$
+	public static final String OPT_ENABLE_MAINTAINER_MODE = "enable-maintainer-mode"; //$NON-NLS-1$
+	public static final String FLAG_CFLAGS = "CFLAGS"; //$NON-NLS-1$
 	/**
 	 * @since 1.4
 	 */
-	public static final String FLAG_CFLAGS_FLAGS = "CFLAGS|CXXFLAGS"; // $NON-NLS-1$
-	public static final String OPT_CFLAGS_DEBUG = "cflags-debug"; // $NON-NLS-1$
-	public static final String OPT_CFLAGS_GPROF = "cflags-gprof"; // $NON-NLS-1$
-	public static final String OPT_CFLAGS_GCOV = "cflags-gcov"; // $NON-NLS-1$
-	public static final String OPT_USER = "user"; // $NON-NLS-1$
-	public static final String TOOL_AUTOGEN = "autogen"; // $NON-NLS-1$
-	public static final String CATEGORY_OPTIONS = "options"; // $NON-NLS-1$
-	public static final String OPT_AUTOGENOPTS = "autogenOpts"; // $NON-NLS-1$
+	public static final String FLAG_CFLAGS_FLAGS = "CFLAGS|CXXFLAGS"; //$NON-NLS-1$
+	public static final String OPT_CFLAGS_DEBUG = "cflags-debug"; //$NON-NLS-1$
+	public static final String OPT_CFLAGS_GPROF = "cflags-gprof"; //$NON-NLS-1$
+	public static final String OPT_CFLAGS_GCOV = "cflags-gcov"; //$NON-NLS-1$
+	public static final String OPT_USER = "user"; //$NON-NLS-1$
+	public static final String TOOL_AUTOGEN = "autogen"; //$NON-NLS-1$
+	public static final String CATEGORY_OPTIONS = "options"; //$NON-NLS-1$
+	public static final String OPT_AUTOGENOPTS = "autogenOpts"; //$NON-NLS-1$
 	/**
 	 * @since 2.0
 	 */
-	public static final String CATEGORY_ENVVAR = "cat_envvar"; // $NON-NLS-1$
+	public static final String CATEGORY_ENVVAR = "cat_envvar"; //$NON-NLS-1$
 	/**
 	 * @since 2.0
 	 */
-	public final static String OPT_ENVVAR = "env_vars"; // $NON-NLS-1$
+	public final static String OPT_ENVVAR = "env_vars"; //$NON-NLS-1$
 
 }
diff --git a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/AutotoolsNewMakeGenerator.java b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/AutotoolsNewMakeGenerator.java
index 2076cfd12d5..813fd3b4b50 100644
--- a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/AutotoolsNewMakeGenerator.java
+++ b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/AutotoolsNewMakeGenerator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2016 Red Hat Inc.and others.
+ * Copyright (c) 2009, 2016 Red Hat Inc. and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -777,7 +777,7 @@ public class AutotoolsNewMakeGenerator extends MarkerGenerator {
 	protected IPath getConfigurePath(List<String> envVars, List<String> cmdParms) {
 		IPath configPath;
 		IConfigureOption configOption = toolsCfg.getOption(CONFIGURE_TOOL_ID);
-		String command = "configure"; // $NON-NLS-1$
+		String command = "configure"; //$NON-NLS-1$
 		if (configOption != null)
 			command = stripEnvVars(configOption.getValue().trim(), envVars);
 			
@@ -809,7 +809,7 @@ public class AutotoolsNewMakeGenerator extends MarkerGenerator {
 	protected IPath getAutogenPath(List<String> envVars, List<String> cmdParms) {
 		IPath autogenPath;
 		IConfigureOption autogenOption = toolsCfg.getOption(AUTOGEN_TOOL_ID);
-		String command = "autogen.sh"; // $NON-NLS-1$
+		String command = "autogen.sh"; //$NON-NLS-1$
 		if (autogenOption != null)
 			command = stripEnvVars(autogenOption.getValue().trim(), envVars);
 
@@ -1219,14 +1219,14 @@ public class AutotoolsNewMakeGenerator extends MarkerGenerator {
 					// For Windows/Mac, check for PWD environment variable being passed.
 					// Remove it for now as it is causing errors in configuration.
 					// Fix for bug #343879
-					if (!removePWD || !variables[i].getName().equals("PWD")) { // $NON-NLS-1$
+					if (!removePWD || !variables[i].getName().equals("PWD")) { //$NON-NLS-1$
 						String value = variables[i].getValue();
 						// The following is a work-around for bug #407580.  Configure doesn't recognize
 						// a directory with a trailing separator at the end is equivalent to the same
 						// directory without that trailing separator.  This problem can cause
 						// configure to try and link a file to itself (e.g. projects with a GnuMakefile) and
 						// obliterate the contents.  Thus, we remove the trailing separator to be safe.
-						if (variables[i].getName().equals("PWD")) { // $NON-NLS-1$
+						if (variables[i].getName().equals("PWD")) { //$NON-NLS-1$
 							if (value.charAt(value.length()-1) == IPath.SEPARATOR)
 								value = value.substring(0, value.length() - 1);	
 						}
diff --git a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/AutotoolsPropertyConstants.java b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/AutotoolsPropertyConstants.java
index f66c2c3ab10..2d78a7e4a07 100644
--- a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/AutotoolsPropertyConstants.java
+++ b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/AutotoolsPropertyConstants.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2012 Red Hat Inc.
+ * Copyright (c) 2007, 2016 Red Hat Inc. and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -16,41 +16,41 @@ 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$
+	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 String AUTOCONF_VERSION_STRING = "AutoconfEditorAutoconfVersion"; // $NON-NLS-1$
+	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 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$
-	public static final QualifiedName ACLOCAL_TOOL = new QualifiedName(PREFIX, "AclocalToolPath");  // $NON-NLS-1$
-	public static final QualifiedName AUTOHEADER_TOOL = new QualifiedName(PREFIX, "AutoheaderToolPath");  // $NON-NLS-1$
-	public static final QualifiedName AUTORECONF_TOOL = new QualifiedName(PREFIX, "AutoreconfToolPath");  // $NON-NLS-1$
-	public static final QualifiedName LIBTOOLIZE_TOOL = new QualifiedName(PREFIX, "LibtoolizePath");  // $NON-NLS-1$
-	public static final QualifiedName CLEAN_DELETE = new QualifiedName(PREFIX, "CleanDelete"); // $NON-NLS-1$
-	public static final QualifiedName CLEAN_MAKE_TARGET = new QualifiedName(PREFIX, "CleanMakeTarget"); // $NON-NLS-1$
+	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$
+	public static final QualifiedName ACLOCAL_TOOL = new QualifiedName(PREFIX, "AclocalToolPath");  //$NON-NLS-1$
+	public static final QualifiedName AUTOHEADER_TOOL = new QualifiedName(PREFIX, "AutoheaderToolPath");  //$NON-NLS-1$
+	public static final QualifiedName AUTORECONF_TOOL = new QualifiedName(PREFIX, "AutoreconfToolPath");  //$NON-NLS-1$
+	public static final QualifiedName LIBTOOLIZE_TOOL = new QualifiedName(PREFIX, "LibtoolizePath");  //$NON-NLS-1$
+	public static final QualifiedName CLEAN_DELETE = new QualifiedName(PREFIX, "CleanDelete"); //$NON-NLS-1$
+	public static final QualifiedName CLEAN_MAKE_TARGET = new QualifiedName(PREFIX, "CleanMakeTarget"); //$NON-NLS-1$
 	public static final QualifiedName SCANNER_USE_MAKE_W = new QualifiedName(PREFIX, "ScannerUseMakeW");
-	public static final QualifiedName AUTO_BUILD_NAME = new QualifiedName(PREFIX, "AutoBuildName"); // $NON-NLS-1$
-	public static final QualifiedName OPEN_INCLUDE = new QualifiedName(PREFIX, "IncludeResourceMapping"); // $NON-NLS-1$
+	public static final QualifiedName AUTO_BUILD_NAME = new QualifiedName(PREFIX, "AutoBuildName"); //$NON-NLS-1$
+	public static final QualifiedName OPEN_INCLUDE = new QualifiedName(PREFIX, "IncludeResourceMapping"); //$NON-NLS-1$
 	public static final QualifiedName OPEN_INCLUDE_P = new QualifiedName(PREFIX, "PersistentIncludeResourceMapping"); //$NON-NLS-1$
 	public static final QualifiedName SCANNER_INFO_DIRTY = new QualifiedName(PREFIX, "ScannerInfoDirty"); // $NON-NLSp-1$
 	
-	public static final String[] fACVersions = {"2.13", "2.59", "2.61", "2.68"}; // $NON-NLS-1$
+	public static final String[] fACVersions = {"2.13", "2.59", "2.61", "2.68"}; //$NON-NLS-1$
 	public static final String AC_VERSION_2_13 = fACVersions[0];
 	public static final String AC_VERSION_2_59 = fACVersions[1];
 	public static final String AC_VERSION_2_61 = fACVersions[2];
 	public static final String AC_VERSION_2_68 = fACVersions[3];
 	public static final String LATEST_AC_VERSION = fACVersions[fACVersions.length - 1];
 	
-	public static final String[] fAMVersions = {"1.4-p6", "1.9.5", "1.9.6", "1.11.1"}; // $NON-NLS-1$
+	public static final String[] fAMVersions = {"1.4-p6", "1.9.5", "1.9.6", "1.11.1"}; //$NON-NLS-1$
 	public static final String LATEST_AM_VERSION = fAMVersions[fAMVersions.length - 1];
 	
-	public static final String CLEAN_MAKE_TARGET_DEFAULT = "distclean"; // $NON-NLS-1$
+	public static final String CLEAN_MAKE_TARGET_DEFAULT = "distclean"; //$NON-NLS-1$
 	
-	public static final String TRUE = "true"; // $NON-NLS-1$
-	public static final String FALSE = "false"; // $NON-NLS-1$
+	public static final String TRUE = "true"; //$NON-NLS-1$
+	public static final String FALSE = "false"; //$NON-NLS-1$
 }
diff --git a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/AutotoolsConfiguration.java b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/AutotoolsConfiguration.java
index 065bd712b10..9e26fb89a80 100644
--- a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/AutotoolsConfiguration.java
+++ b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/AutotoolsConfiguration.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2016 Red Hat Inc.
+ * Copyright (c) 2009, 2016 Red Hat Inc. and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -73,9 +73,9 @@ public class AutotoolsConfiguration implements IAConfiguration {
 		new Option(AutotoolsOptionConstants.TOOL_CONFIGURE, IConfigureOption.TOOL),
 		new Option(AutotoolsOptionConstants.CATEGORY_GENERAL, IConfigureOption.CATEGORY),
 		new Option(AutotoolsOptionConstants.OPT_CONFIGDIR, IConfigureOption.INTERNAL),
-		new Option(AutotoolsOptionConstants.OPT_CACHE_FILE, "cache_file", IConfigureOption.STRING), // $NON-NLS-1$
+		new Option(AutotoolsOptionConstants.OPT_CACHE_FILE, "cache_file", IConfigureOption.STRING), //$NON-NLS-1$
 		new Option(AutotoolsOptionConstants.OPT_HELP, IConfigureOption.BIN),
-		new Option(AutotoolsOptionConstants.OPT_NO_CREATE, "no_create", IConfigureOption.BIN), // $NON-NLS-1$
+		new Option(AutotoolsOptionConstants.OPT_NO_CREATE, "no_create", IConfigureOption.BIN), //$NON-NLS-1$
 		new Option(AutotoolsOptionConstants.OPT_QUIET, IConfigureOption.BIN),
 		new Option(AutotoolsOptionConstants.OPT_VERSION, IConfigureOption.BIN),
 		new Option(AutotoolsOptionConstants.CATEGORY_PLATFORM, IConfigureOption.CATEGORY),
@@ -84,7 +84,7 @@ public class AutotoolsConfiguration implements IAConfiguration {
 		new Option(AutotoolsOptionConstants.OPT_TARGET, IConfigureOption.STRING),
 		new Option(AutotoolsOptionConstants.CATEGORY_DIRECTORIES, IConfigureOption.CATEGORY),
 		new Option(AutotoolsOptionConstants.OPT_PREFIX, IConfigureOption.STRING),
-		new Option(AutotoolsOptionConstants.OPT_EXEC_PREFIX, "exec_prefix", IConfigureOption.STRING), // $NON-NLS-1$
+		new Option(AutotoolsOptionConstants.OPT_EXEC_PREFIX, "exec_prefix", IConfigureOption.STRING), //$NON-NLS-1$
 		new Option(AutotoolsOptionConstants.OPT_LIBDIR, IConfigureOption.STRING),
 		new Option(AutotoolsOptionConstants.OPT_BINDIR, IConfigureOption.STRING),
 		new Option(AutotoolsOptionConstants.OPT_SBINDIR, IConfigureOption.STRING),
@@ -99,19 +99,19 @@ public class AutotoolsConfiguration implements IAConfiguration {
 		new Option(AutotoolsOptionConstants.OPT_LIBEXECDIR, IConfigureOption.STRING),
 		new Option(AutotoolsOptionConstants.OPT_OLDINCLUDEDIR, IConfigureOption.STRING),
 		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_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.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.FLAG_CFLAGS, "cflags", AutotoolsOptionConstants.FLAG_CFLAGS_FLAGS, IConfigureOption.FLAG), // $NON-NLS-1$
-		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_ENABLE_MAINTAINER_MODE, "enable_maintainer_mode", IConfigureOption.BIN), //$NON-NLS-1$
+		new Option(AutotoolsOptionConstants.FLAG_CFLAGS, "cflags", AutotoolsOptionConstants.FLAG_CFLAGS_FLAGS, IConfigureOption.FLAG), //$NON-NLS-1$
+		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.TOOL_AUTOGEN, "autogen", "autogen.sh", IConfigureOption.TOOL), //$NON-NLS-1$
 		new Option(AutotoolsOptionConstants.CATEGORY_OPTIONS, IConfigureOption.CATEGORY),
 		new Option(AutotoolsOptionConstants.OPT_AUTOGENOPTS, IConfigureOption.MULTIARG),
 	};
diff --git a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/AutotoolsConfigurationManager.java b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/AutotoolsConfigurationManager.java
index b8e0e3a4f26..fc1428746b5 100644
--- a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/AutotoolsConfigurationManager.java
+++ b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/AutotoolsConfigurationManager.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2015 Red Hat Inc.
+ * Copyright (c) 2009, 2016 Red Hat Inc. and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -202,15 +202,15 @@ public class AutotoolsConfigurationManager implements IResourceChangeListener {
 					Document d = db.parse(dirFile);
 					Element e = d.getDocumentElement();
 					// Get the stored configuration data
-					NodeList cfgs = e.getElementsByTagName("configuration"); // $NON-NLS-1$
+					NodeList cfgs = e.getElementsByTagName("configuration"); //$NON-NLS-1$
 					for (int x = 0; x < cfgs.getLength(); ++x) {
 						Node n = cfgs.item(x);
 						NamedNodeMap attrs = n.getAttributes();
 						// Originally we used the configuration name, but now we use
 						// the ConfigurationDescription id which is unique.  Check for
 						// id first, but fall back to name for older .autotools files.
-						Node nameNode = attrs.getNamedItem("name"); // $NON-NLS-1$
-						Node cfgIdNode = attrs.getNamedItem("id"); // $NON-NLS-1$
+						Node nameNode = attrs.getNamedItem("name"); //$NON-NLS-1$
+						Node cfgIdNode = attrs.getNamedItem("id"); //$NON-NLS-1$
 						String cfgId = null;
 						if (cfgIdNode != null)
 							cfgId = cfgIdNode.getNodeValue();
@@ -227,16 +227,16 @@ public class AutotoolsConfigurationManager implements IResourceChangeListener {
 						NodeList l = n.getChildNodes();
 						for (int y = 0; y < l.getLength(); ++y) {
 							Node child = l.item(y);
-							if (child.getNodeName().equals("option")) { // $NON-NLS-1$
+							if (child.getNodeName().equals("option")) { //$NON-NLS-1$
 								NamedNodeMap optionAttrs = child.getAttributes();
-								Node id = optionAttrs.getNamedItem("id"); // $NON-NLS-1$
-								Node value = optionAttrs.getNamedItem("value"); // $NON-NLS-1$
+								Node id = optionAttrs.getNamedItem("id"); //$NON-NLS-1$
+								Node value = optionAttrs.getNamedItem("value"); //$NON-NLS-1$
 								if (id != null && value != null)
 									cfg.setOption(id.getNodeValue(), value.getNodeValue());
 							} else if (child.getNodeName().equals("flag")) { //$NON-NLS-1$
 								// read in flag values
 								NamedNodeMap optionAttrs = child.getAttributes();
-								Node id = optionAttrs.getNamedItem("id"); // $NON-NLS-1$
+								Node id = optionAttrs.getNamedItem("id"); //$NON-NLS-1$
 								String idValue = id.getNodeValue();
 								IConfigureOption opt = cfg.getOption(idValue);
 								if (opt instanceof FlagConfigureOption) {
@@ -245,8 +245,8 @@ public class AutotoolsConfigurationManager implements IResourceChangeListener {
 										Node flagChild = l2.item(z);
 										if (flagChild.getNodeName().equals("flagvalue")) { //$NON-NLS-1$
 											NamedNodeMap optionAttrs2 = flagChild.getAttributes();
-											Node id2 = optionAttrs2.getNamedItem("id"); // $NON-NLS-1$
-											Node value = optionAttrs2.getNamedItem("value"); // $NON-NLS-1$
+											Node id2 = optionAttrs2.getNamedItem("id"); //$NON-NLS-1$
+											Node value = optionAttrs2.getNamedItem("value"); //$NON-NLS-1$
 											cfg.setOption(id2.getNodeValue(), value.getNodeValue());		
 										}
 									}
@@ -347,7 +347,7 @@ public class AutotoolsConfigurationManager implements IResourceChangeListener {
 				ITool tool = tools[j];
 				if (tool.getName().equals("configure")) { //$NON-NLS-1$
 					IOption option = 
-						tool.getOptionBySuperClassId("org.eclipse.linuxtools.cdt.autotools.core.option.configure.name"); // $NON-NLS-1$
+						tool.getOptionBySuperClassId("org.eclipse.linuxtools.cdt.autotools.core.option.configure.name"); //$NON-NLS-1$
 					IHoldsOptions h = tool;
 					try {
 						IOption optionToSet = h.getOptionToSet(option, false);
@@ -379,7 +379,7 @@ public class AutotoolsConfigurationManager implements IResourceChangeListener {
 				try (PrintWriter p = new PrintWriter(new BufferedWriter(new FileWriter(f)))) {
 					Map<String, IAConfiguration> cfgs = configs.get(projectName);
 					p.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"); //$NON-NLS-1$
-					p.println("<configurations>"); // $NON-NLS-1$
+					p.println("<configurations>"); //$NON-NLS-1$
 					Option[] optionList = AutotoolsConfiguration.getOptionList();
 					// Before saving, force any cloning to occur via the option
 					// value handler.
@@ -409,12 +409,12 @@ public class AutotoolsConfigurationManager implements IResourceChangeListener {
 									String childName = children.get(k);
 									IConfigureOption childopt = cfg.getOption(childName);
 									p.println("<flagvalue id=\"" + childopt.getName() + "\" value=\"" //$NON-NLS-1$ //$NON-NLS-2$
-											+ xmlEscape(childopt.getValue()) + "\"/>"); // $NON-NLS-3$
+											+ xmlEscape(childopt.getValue()) + "\"/>"); //$NON-NLS-3$
 								}
 								p.println("</flag>"); //$NON-NLS-1$
 							} else if (!opt.isCategory() && !opt.isFlagValue())
 								p.println("<option id=\"" + option.getName() + "\" value=\"" + xmlEscape(opt.getValue()) //$NON-NLS-1$ //$NON-NLS-2$
-										+ "\"/>"); // $NON-NLS-3$
+										+ "\"/>"); //$NON-NLS-3$
 						}
 						p.println("</configuration>"); //$NON-NLS-1$
 						// Sync name field as this configuration is now
@@ -453,7 +453,7 @@ public class AutotoolsConfigurationManager implements IResourceChangeListener {
 					if (cfgs == null)
 						return;
 					p.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"); //$NON-NLS-1$
-					p.println("<configurations>"); // $NON-NLS-1$
+					p.println("<configurations>"); //$NON-NLS-1$
 					Option[] optionList = AutotoolsConfiguration.getOptionList();
 					HashSet<String> savedIds = new HashSet<>();
 					setSyncing(true);
@@ -470,7 +470,7 @@ 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-3$
 						}
 						p.println("</configuration>"); //$NON-NLS-1$
 						syncNameField(cfgd);
@@ -489,7 +489,7 @@ 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-3$
 							}
 							p.println("</configuration>"); //$NON-NLS-1$
 						}
diff --git a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/AutotoolsOptionValueHandler.java b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/AutotoolsOptionValueHandler.java
index 84bc34bd41e..5da67fd4e6d 100644
--- a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/AutotoolsOptionValueHandler.java
+++ b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/AutotoolsOptionValueHandler.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2016 Red Hat Inc..
+ * Copyright (c) 2007, 2016 Red Hat Inc. and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -68,8 +68,8 @@ public class AutotoolsOptionValueHandler extends ManagedOptionValueHandler
 						// ignore
 					}
 					if (autoName == null || autoName.equals(AutotoolsPropertyConstants.TRUE)) {
-						autoNameTemplate = "${workspace_loc:/" + project.getName() + // $NON-NLS-1$ 
-							"}/build-" + fixName(configuration.getName()); // $NON-NLS-1$
+						autoNameTemplate = "${workspace_loc:/" + project.getName() + //$NON-NLS-1$ 
+							"}/build-" + fixName(configuration.getName()); //$NON-NLS-1$
 						IBuilder cfgBuilder = configuration.getEditableBuilder();
 						cfgBuilder.setBuildPath(autoNameTemplate);
 					}
diff --git a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/BinConfigureOption.java b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/BinConfigureOption.java
index 4d38fb243f8..0b7ee2a4b82 100644
--- a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/BinConfigureOption.java
+++ b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/BinConfigureOption.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2015 Red Hat Inc.
+ * Copyright (c) 2009, 2016 Red Hat Inc. and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -37,7 +37,7 @@ public class BinConfigureOption extends AbstractConfigurationOption {
 	   if (isParmSet())
 		   return getParameterName();
 	   else
-		   return ""; // $NON-NLS-1$
+		   return ""; //$NON-NLS-1$
 	}
 
 	@Override
@@ -48,7 +48,7 @@ public class BinConfigureOption extends AbstractConfigurationOption {
 	@Override
 	public void setValue(String value) {
 		boolean oldValue = this.value;
-		if (value.equals("true")) // $NON-NLS-1$
+		if (value.equals("true")) //$NON-NLS-1$
 			this.value = true;
 		else
 			this.value = false;
diff --git a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/ConfigureTool.java b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/ConfigureTool.java
index b74e39de36b..d40ba07454b 100644
--- a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/ConfigureTool.java
+++ b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/ConfigureTool.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2015 Red Hat Inc.
+ * Copyright (c) 2009, 2016 Red Hat Inc. and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -51,7 +51,7 @@ public class ConfigureTool extends AbstractConfigurationOption {
 	
 	@Override
 	public String getParameter() {
-		return ""; // $NON-NLS-1$
+		return ""; //$NON-NLS-1$
 	}
 	
 	@Override
diff --git a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/InternalConfigureOption.java b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/InternalConfigureOption.java
index d445373bc9b..ae95529315a 100644
--- a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/InternalConfigureOption.java
+++ b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/InternalConfigureOption.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2015 Red Hat Inc.
+ * Copyright (c) 2009, 2016 Red Hat Inc. and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -16,12 +16,12 @@ public class InternalConfigureOption extends AbstractConfigurationOption {
 	
 	public InternalConfigureOption(String name, AutotoolsConfiguration cfg) {
 		super(name, cfg);
-		this.value = ""; // $NON-NLS-1$
+		this.value = ""; //$NON-NLS-1$
 	}
 	
 	public InternalConfigureOption(String name, String msgName, AutotoolsConfiguration cfg) {
 		super(name, msgName, cfg);
-		this.value = ""; // $NON-NLS-1$
+		this.value = ""; //$NON-NLS-1$
 	}
 	
 	private InternalConfigureOption(String name, AutotoolsConfiguration cfg,
diff --git a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/MultiArgConfigureOption.java b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/MultiArgConfigureOption.java
index 7af4af0bee0..ea184984446 100644
--- a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/MultiArgConfigureOption.java
+++ b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/MultiArgConfigureOption.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2015 Red Hat Inc.
+ * Copyright (c) 2009, 2016 Red Hat Inc. and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -22,12 +22,12 @@ public class MultiArgConfigureOption extends AbstractConfigurationOption {
 	
 	public MultiArgConfigureOption(String name, AutotoolsConfiguration cfg) {
 		super(name, cfg);
-		this.value = ""; // $NON-NLS-1$
+		this.value = ""; //$NON-NLS-1$
 	}
 	
 	public MultiArgConfigureOption(String name, String msgName, AutotoolsConfiguration cfg) {
 		super(name, msgName, cfg);
-		this.value = ""; // $NON-NLS-1$
+		this.value = ""; //$NON-NLS-1$
 	}
 	
 	private MultiArgConfigureOption(String name, AutotoolsConfiguration cfg,
diff --git a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/StringConfigureOption.java b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/StringConfigureOption.java
index 64fa78bce0f..ad6fa15700c 100644
--- a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/StringConfigureOption.java
+++ b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/StringConfigureOption.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2015 Red Hat Inc.
+ * Copyright (c) 2009, 2016 Red Hat Inc. and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,12 +17,12 @@ public class StringConfigureOption extends AbstractConfigurationOption {
 	
 	public StringConfigureOption(String name, AutotoolsConfiguration cfg) {
 		super(name, cfg);
-		this.value = ""; // $NON-NLS-1$
+		this.value = ""; //$NON-NLS-1$
 	}
 	
 	public StringConfigureOption(String name, String msgName, AutotoolsConfiguration cfg) {
 		super(name, msgName, cfg);
-		this.value = ""; // $NON-NLS-1$
+		this.value = ""; //$NON-NLS-1$
 	}
 	
 	private StringConfigureOption(String name, AutotoolsConfiguration cfg,
@@ -52,7 +52,7 @@ public class StringConfigureOption extends AbstractConfigurationOption {
 	@Override
 	public String getParameter() {
 		if (isParmSet())
-			return getParameterName() + "=" + getValue(); // $NON-NLS-1$
+			return getParameterName() + "=" + getValue(); //$NON-NLS-1$
 		return "";
 	}
 	
diff --git a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/VariableConfigureOption.java b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/VariableConfigureOption.java
index 036e3b4f964..add532a4dbf 100644
--- a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/VariableConfigureOption.java
+++ b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/VariableConfigureOption.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2016 IBM Corporation.
+ * Copyright (c) 2016 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -22,12 +22,12 @@ public class VariableConfigureOption extends AbstractConfigurationOption {
 
 	public VariableConfigureOption(String name, AutotoolsConfiguration cfg) {
 		super(name, cfg);
-		this.value = ""; // $NON-NLS-1$
+		this.value = ""; //$NON-NLS-1$
 	}
 
 	public VariableConfigureOption(String name, String transformedName, AutotoolsConfiguration autotoolsConfiguration) {
 		super(name, transformedName, autotoolsConfiguration);
-		this.value = ""; // $NON-NLS-1$
+		this.value = ""; //$NON-NLS-1$
 	}
 
 	public VariableConfigureOption(String name, AutotoolsConfiguration cfg, String value) {
diff --git a/build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/UpdateConfigureTest.java b/build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/UpdateConfigureTest.java
index 7a0011c3a8c..5e0c00a2701 100644
--- a/build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/UpdateConfigureTest.java
+++ b/build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/UpdateConfigureTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2015 Red Hat Inc. and others.
+ * Copyright (c) 2008, 2016 Red Hat Inc. and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -533,16 +533,16 @@ public class UpdateConfigureTest {
 			Document d = db.parse(dirFile);
 			Element e = d.getDocumentElement();
 			// Get the stored configuration data
-			NodeList cfgs = e.getElementsByTagName("configuration"); // $NON-NLS-1$
+			NodeList cfgs = e.getElementsByTagName("configuration"); //$NON-NLS-1$
 			for (int x = 0; x < cfgs.getLength(); ++x) {
 				Node n = cfgs.item(x);
 				NodeList l = n.getChildNodes();
 				for (int y = 0; y < l.getLength(); ++y) {
 					Node child = l.item(y);
-					if (child.getNodeName().equals("option")) { // $NON-NLS-1$
+					if (child.getNodeName().equals("option")) { //$NON-NLS-1$
 						NamedNodeMap optionAttrs = child.getAttributes();
-						Node id = optionAttrs.getNamedItem("id"); // $NON-NLS-1$
-						Node value = optionAttrs.getNamedItem("value"); // $NON-NLS-1$
+						Node id = optionAttrs.getNamedItem("id"); //$NON-NLS-1$
+						Node value = optionAttrs.getNamedItem("value"); //$NON-NLS-1$
 						// Verify the bindir option is updated
 						if (id.equals(AutotoolsOptionConstants.OPT_BINDIR))
 							assertEquals(value, "/usr/bin"); //$NON-NLS-1$
diff --git a/build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/SetConfigurationParameter.java b/build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/SetConfigurationParameter.java
index 6b874aafd34..4720625aea1 100644
--- a/build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/SetConfigurationParameter.java
+++ b/build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/SetConfigurationParameter.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Red Hat Inc..
+ * Copyright (c) 2010, 2016 Red Hat Inc. and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -112,7 +112,7 @@ public class SetConfigurationParameter extends AbstractTest {
 		Document d = db.parse(f);
 		Element e = d.getDocumentElement();
 		// Get the stored configuration data
-		NodeList cfgs = e.getElementsByTagName("configuration"); // $NON-NLS-1$
+		NodeList cfgs = e.getElementsByTagName("configuration"); //$NON-NLS-1$
 		assertTrue(cfgs.getLength() > 0);
 		Node n = cfgs.item(0);
 		NodeList l = n.getChildNodes();
@@ -120,10 +120,10 @@ public class SetConfigurationParameter extends AbstractTest {
 		boolean foundUser = false;
 		for (int y = 0; y < l.getLength(); ++y) {
 			Node child = l.item(y);
-			if (child.getNodeName().equals("option")) { // $NON-NLS-1$
+			if (child.getNodeName().equals("option")) { //$NON-NLS-1$
 				NamedNodeMap optionAttrs = child.getAttributes();
-				Node idNode = optionAttrs.getNamedItem("id"); // $NON-NLS-1$
-				Node valueNode = optionAttrs.getNamedItem("value"); // $NON-NLS-1$
+				Node idNode = optionAttrs.getNamedItem("id"); //$NON-NLS-1$
+				Node valueNode = optionAttrs.getNamedItem("value"); //$NON-NLS-1$
 				assertNotNull(idNode);
 				assertNotNull(valueNode);
 				String id = idNode.getNodeValue();
@@ -331,7 +331,7 @@ public class SetConfigurationParameter extends AbstractTest {
 		Document d = db.parse(f);
 		Element e = d.getDocumentElement();
 		// Get the stored configuration data
-		NodeList cfgs = e.getElementsByTagName("configuration"); // $NON-NLS-1$
+		NodeList cfgs = e.getElementsByTagName("configuration"); //$NON-NLS-1$
 		assertEquals(3, cfgs.getLength());
 		int foundUser = 0;
 		for (int x = 0; x < cfgs.getLength(); ++x) {
@@ -341,10 +341,10 @@ public class SetConfigurationParameter extends AbstractTest {
 			// --enable-jeff
 			for (int y = 0; y < l.getLength(); ++y) {
 				Node child = l.item(y);
-				if (child.getNodeName().equals("option")) { // $NON-NLS-1$
+				if (child.getNodeName().equals("option")) { //$NON-NLS-1$
 					NamedNodeMap optionAttrs = child.getAttributes();
-					Node idNode = optionAttrs.getNamedItem("id"); // $NON-NLS-1$
-					Node valueNode = optionAttrs.getNamedItem("value"); // $NON-NLS-1$
+					Node idNode = optionAttrs.getNamedItem("id"); //$NON-NLS-1$
+					Node valueNode = optionAttrs.getNamedItem("value"); //$NON-NLS-1$
 					assertNotNull(idNode);
 					assertNotNull(valueNode);
 					String id = idNode.getNodeValue();
diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/AutotoolsUIPluginImages.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/AutotoolsUIPluginImages.java
index 1f363256fb5..60faf9803e4 100644
--- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/AutotoolsUIPluginImages.java
+++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/AutotoolsUIPluginImages.java
@@ -56,7 +56,7 @@ public class AutotoolsUIPluginImages {
 	public static final String IMG_OBJS_WHILE= NAME_PREFIX + "while_obj.gif"; //$NON-NLS-1$
 	public static final String IMG_OBJS_ACMACRO= NAME_PREFIX + "acmacro_obj.gif"; //$NON-NLS-1$
 	public static final String IMG_OBJS_AMMACRO= NAME_PREFIX + "ammacro_obj.gif"; //$NON-NLS-1$
-	public static final String IMG_OBJS_ACMACRO_ARG = NAME_PREFIX + "acmacro_arg_obj.gif"; // $NON-NLS-1$
+	public static final String IMG_OBJS_ACMACRO_ARG = NAME_PREFIX + "acmacro_arg_obj.gif"; //$NON-NLS-1$
 	public static final String IMG_BUILD_CONFIG = NAME_PREFIX + "build_configs.gif"; //$NON-NLS-1$
 	public static final String IMG_CFG_CATEGORY = NAME_PREFIX + "config_category.gif"; //$NON-NLS-1$
 	public static final String IMG_CFG_TOOL = NAME_PREFIX + "config_tool.gif"; //$NON-NLS-1$
diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/OptionalMessageDialog.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/OptionalMessageDialog.java
index 853d153d29d..5a7e7ac6eb0 100644
--- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/OptionalMessageDialog.java
+++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/OptionalMessageDialog.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- *  Copyright (c) 2000, 2012 IBM Corporation and others.
+ *  Copyright (c) 2000, 2016 IBM Corporation and others.
  *  All rights reserved. This program and the accompanying materials
  *  are made available under the terms of the Eclipse Public License v1.0
  *  which accompanies this distribution, and is available at
@@ -32,7 +32,7 @@ import org.eclipse.swt.widgets.Shell;
  */ 
 public class OptionalMessageDialog extends MessageDialog {
 	// String constants for widgets
-	private static final String CHECKBOX_TEXT= MakeUIMessages.getResourceString("OptionalMessageDialog_dontShowAgain"); // $NON-NLS-1$  
+	private static final String CHECKBOX_TEXT= MakeUIMessages.getResourceString("OptionalMessageDialog_dontShowAgain"); //$NON-NLS-1$  
 
 	// Dialog store id constants
 	private static final String STORE_ID= "OptionalMessageDialog.hide."; //$NON-NLS-1$
diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/actions/AbstractAutotoolsHandler.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/actions/AbstractAutotoolsHandler.java
index 1de726c5ae2..0dc8e0ce748 100644
--- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/actions/AbstractAutotoolsHandler.java
+++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/actions/AbstractAutotoolsHandler.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2016 Red Hat Inc..
+ * Copyright (c) 2009, 2016 Red Hat Inc. and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -294,7 +294,7 @@ public abstract class AbstractAutotoolsHandler extends AbstractHandler {
 							consoleHeader[2] = project.getName();
 							buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$ //$NON-NLS-2$
 							String invokeMsg = InvokeMessages.getFormattedString("InvokeAction.console.message", //$NON-NLS-1$
-									new String[] { actionName, execDir.toString() }); // $NON-NLS-1$
+									new String[] { actionName, execDir.toString() }); //$NON-NLS-1$
 							buf.append(invokeMsg);
 							buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$ //$NON-NLS-2$
 							buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/properties/AutotoolsBuildPropertyPage.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/properties/AutotoolsBuildPropertyPage.java
index 54af1ce7db9..d5f4d8494c9 100644
--- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/properties/AutotoolsBuildPropertyPage.java
+++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/properties/AutotoolsBuildPropertyPage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2016 Red Hat Inc.
+ * Copyright (c) 2007, 2016 Red Hat Inc. and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -30,14 +30,14 @@ import org.eclipse.swt.widgets.Text;
 
 public class AutotoolsBuildPropertyPage extends AbstractCBuildPropertyTab {
 
-	private String TRUE = "true"; // $NON-NLS-1$
-	private String FALSE = "false"; // $NON-NLS-1$
-	private String CLEAN_DELETE_LABEL = "CleanDelete.label"; // $NON-NLS-1$
-	private String CLEAN_MAKE_LABEL = "CleanMake.label"; // $NON-NLS-1$
-	private String CLEAN_MAKETARGET_LABEL = "CleanMakeTarget.label"; // $NON-NLS-1$
-	private String CLEAN_MAKETARGET_TOOLTIP = "CleanMakeTarget.tooltip"; // $NON-NLS-1$
-	private String AUTO_BUILDNAME_LABEL = "AutoBuildName.label"; // $NON-NLS-1$
-	private String AUTO_BUILDNAME_TOOLTIP = "AutoBuildName.tooltip"; // $NON-NLS-1$
+	private String TRUE = "true"; //$NON-NLS-1$
+	private String FALSE = "false"; //$NON-NLS-1$
+	private String CLEAN_DELETE_LABEL = "CleanDelete.label"; //$NON-NLS-1$
+	private String CLEAN_MAKE_LABEL = "CleanMake.label"; //$NON-NLS-1$
+	private String CLEAN_MAKETARGET_LABEL = "CleanMakeTarget.label"; //$NON-NLS-1$
+	private String CLEAN_MAKETARGET_TOOLTIP = "CleanMakeTarget.tooltip"; //$NON-NLS-1$
+	private String AUTO_BUILDNAME_LABEL = "AutoBuildName.label"; //$NON-NLS-1$
+	private String AUTO_BUILDNAME_TOOLTIP = "AutoBuildName.tooltip"; //$NON-NLS-1$
 	
 	protected Button fCleanDelete;
 	protected Button fCleanMake;
diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/properties/AutotoolsToolsPropertyTab.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/properties/AutotoolsToolsPropertyTab.java
index d53b55e234b..07c57f53f10 100644
--- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/properties/AutotoolsToolsPropertyTab.java
+++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/properties/AutotoolsToolsPropertyTab.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2015 Red Hat Inc.
+ * Copyright (c) 2007, 2016 Red Hat Inc. and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -24,12 +24,12 @@ import org.eclipse.swt.widgets.Text;
 
 public class AutotoolsToolsPropertyTab extends AbstractAutotoolsCPropertyTab {
 
-	public static final String DEFAULT_ACLOCAL = "aclocal"; // $NON-NLS-1$
-	public static final String DEFAULT_AUTOMAKE = "automake"; // $NON-NLS-1$
-	public static final String DEFAULT_AUTOCONF = "autoconf"; // $NON-NLS-1$
-	public static final String DEFAULT_AUTOHEADER = "autoheader"; // $NON-NLS-1$
-	public static final String DEFAULT_AUTORECONF = "autoreconf"; // $NON-NLS-1$
-	public static final String DEFAULT_LIBTOOLIZE = "libtoolize"; // $NON-NLS-1$
+	public static final String DEFAULT_ACLOCAL = "aclocal"; //$NON-NLS-1$
+	public static final String DEFAULT_AUTOMAKE = "automake"; //$NON-NLS-1$
+	public static final String DEFAULT_AUTOCONF = "autoconf"; //$NON-NLS-1$
+	public static final String DEFAULT_AUTOHEADER = "autoheader"; //$NON-NLS-1$
+	public static final String DEFAULT_AUTORECONF = "autoreconf"; //$NON-NLS-1$
+	public static final String DEFAULT_LIBTOOLIZE = "libtoolize"; //$NON-NLS-1$
 	
 	protected Text fAclocalPath;
 	protected Text fAutomakePath;
@@ -73,7 +73,7 @@ public class AutotoolsToolsPropertyTab extends AbstractAutotoolsCPropertyTab {
 		
 		/* text window for aclocal path */
 		fAclocalPath = new Text(composite, SWT.BORDER | SWT.SINGLE);
-		fAclocalPath.setToolTipText(AutotoolsPropertyMessages.getString("Autotools.aclocalPath.tooltip")); // $NON-NLS-1$
+		fAclocalPath.setToolTipText(AutotoolsPropertyMessages.getString("Autotools.aclocalPath.tooltip")); //$NON-NLS-1$
 		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING | GridData.FILL_HORIZONTAL);
 		fAclocalPath.setLayoutData(gd);
 		
@@ -85,7 +85,7 @@ public class AutotoolsToolsPropertyTab extends AbstractAutotoolsCPropertyTab {
 		
 		/* text window for automake path */
 		fAutomakePath = new Text(composite, SWT.BORDER | SWT.SINGLE);
-		fAutomakePath.setToolTipText(AutotoolsPropertyMessages.getString("Autotools.automakePath.tooltip")); // $NON-NLS-1#
+		fAutomakePath.setToolTipText(AutotoolsPropertyMessages.getString("Autotools.automakePath.tooltip")); //$NON-NLS-1#
 		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING | GridData.FILL_HORIZONTAL);
 		fAutomakePath.setLayoutData(gd);
 		
@@ -97,7 +97,7 @@ public class AutotoolsToolsPropertyTab extends AbstractAutotoolsCPropertyTab {
 		
 		/* text window for autoconf path */
 		fAutoconfPath = new Text(composite, SWT.BORDER | SWT.SINGLE);
-		fAutoconfPath.setToolTipText(AutotoolsPropertyMessages.getString("Autotools.autoconfPath.tooltip")); // $NON-NLS-1$
+		fAutoconfPath.setToolTipText(AutotoolsPropertyMessages.getString("Autotools.autoconfPath.tooltip")); //$NON-NLS-1$
 		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING | GridData.FILL_HORIZONTAL);
 		fAutoconfPath.setLayoutData(gd);
 
@@ -109,7 +109,7 @@ public class AutotoolsToolsPropertyTab extends AbstractAutotoolsCPropertyTab {
 		
 		/* text window for autoheader path */
 		fAutoheaderPath = new Text(composite, SWT.BORDER | SWT.SINGLE);
-		fAutoheaderPath.setToolTipText(AutotoolsPropertyMessages.getString("Autotools.autoheaderPath.tooltip")); // $NON-NLS-1$
+		fAutoheaderPath.setToolTipText(AutotoolsPropertyMessages.getString("Autotools.autoheaderPath.tooltip")); //$NON-NLS-1$
 		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING | GridData.FILL_HORIZONTAL);
 		fAutoheaderPath.setLayoutData(gd);
 
@@ -121,7 +121,7 @@ public class AutotoolsToolsPropertyTab extends AbstractAutotoolsCPropertyTab {
 		
 		/* text window for autoreconf path */
 		fAutoreconfPath = new Text(composite, SWT.BORDER | SWT.SINGLE);
-		fAutoreconfPath.setToolTipText(AutotoolsPropertyMessages.getString("Autotools.autoreconfPath.tooltip")); // $NON-NLS-1$
+		fAutoreconfPath.setToolTipText(AutotoolsPropertyMessages.getString("Autotools.autoreconfPath.tooltip")); //$NON-NLS-1$
 		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING | GridData.FILL_HORIZONTAL);
 		fAutoreconfPath.setLayoutData(gd);
 
@@ -133,7 +133,7 @@ public class AutotoolsToolsPropertyTab extends AbstractAutotoolsCPropertyTab {
 		
 		/* text window for libtoolize path */
 		fLibtoolizePath = new Text(composite, SWT.BORDER | SWT.SINGLE);
-		fLibtoolizePath.setToolTipText(AutotoolsPropertyMessages.getString("Autotools.libtoolizePath.tooltip")); // $NON-NLS-1$
+		fLibtoolizePath.setToolTipText(AutotoolsPropertyMessages.getString("Autotools.libtoolizePath.tooltip")); //$NON-NLS-1$
 		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING | GridData.FILL_HORIZONTAL);
 		fLibtoolizePath.setLayoutData(gd);
 
diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/wizards/ReferenceBlock.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/wizards/ReferenceBlock.java
index 43bbf134818..e5271b86fdc 100644
--- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/wizards/ReferenceBlock.java
+++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/wizards/ReferenceBlock.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2003, 2015 IBM Corporation and others.
+ * Copyright (c) 2003, 2016 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -47,9 +47,9 @@ import org.eclipse.ui.model.WorkbenchLabelProvider;
 @Deprecated
 public class ReferenceBlock extends AbstractCOptionPage {
 
-	private static final String PREFIX = "ReferenceBlock"; // $NON-NLS-1$ //$NON-NLS-1$
-	private static final String LABEL = PREFIX + ".label"; // $NON-NLS-1$ //$NON-NLS-1$
-	private static final String DESC = PREFIX + ".desc"; // $NON-NLS-1$ //$NON-NLS-1$
+	private static final String PREFIX = "ReferenceBlock"; //$NON-NLS-1$ //$NON-NLS-1$
+	private static final String LABEL = PREFIX + ".label"; //$NON-NLS-1$ //$NON-NLS-1$
+	private static final String DESC = PREFIX + ".desc"; //$NON-NLS-1$ //$NON-NLS-1$
 
 	private CheckboxTableViewer referenceProjectsViewer;
 
diff --git a/build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/internal/GCCPathToolChainProvider.java b/build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/internal/GCCPathToolChainProvider.java
index 38e530fe318..20bbdb62ced 100644
--- a/build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/internal/GCCPathToolChainProvider.java
+++ b/build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/internal/GCCPathToolChainProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 QNX Software Systems and others.
+ * Copyright (c) 2015, 2016 QNX Software Systems and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -128,7 +128,7 @@ public class GCCPathToolChainProvider implements IToolChainProvider {
 			}
 			if (version != null) {
 				if (target != null) {
-					return version + " " + target; // $NON-NLS-1$
+					return version + " " + target; //$NON-NLS-1$
 				} else {
 					return version;
 				}
diff --git a/build/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeBuildConfiguration.java b/build/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeBuildConfiguration.java
index f1cf77f9070..f618791c387 100644
--- a/build/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeBuildConfiguration.java
+++ b/build/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeBuildConfiguration.java
@@ -63,7 +63,7 @@ public class CMakeBuildConfiguration extends CBuildConfiguration {
 			// TODO need to figure out which builder to call. Hardcoding to make
 			// for now.
 			List<String> command = Arrays.asList("make");
-			ProcessBuilder processBuilder = new ProcessBuilder(command).directory(buildDir.toFile()); // $NON-NLS-1$
+			ProcessBuilder processBuilder = new ProcessBuilder(command).directory(buildDir.toFile()); //$NON-NLS-1$
 			Process process = processBuilder.start();
 			outStream.write(String.join(" ", command) + '\n'); //$NON-NLS-1$
 			
diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeScannerInfo.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeScannerInfo.java
index a1c63bccd0e..70fae84ebd2 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeScannerInfo.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeScannerInfo.java
@@ -92,8 +92,8 @@ public class MakeScannerInfo implements IScannerInfo {
 			if (symbol.length() == 0) {
 				continue;
 			}
-			String key = ""; // $NON-NLS-1$
-			String value = ""; // $NON-NLS-1$
+			String key = ""; //$NON-NLS-1$
+			String value = ""; //$NON-NLS-1$
 			int index = symbol.indexOf("="); //$NON-NLS-1$
 			if (index != -1) {
 				key = symbol.substring(0, index).trim();
diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/NullMakefile.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/NullMakefile.java
index caa586b4f0b..46102b5107b 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/NullMakefile.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/NullMakefile.java
@@ -62,7 +62,7 @@ public class NullMakefile extends AbstractMakefile {
 
 	@Override
 	public String toString() {
-		return ""; // $NON-NLS-1$
+		return ""; //$NON-NLS-1$
 	}
 
 	@Override
diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/gnu/GNUMakefile.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/gnu/GNUMakefile.java
index fba86ce8861..e847ae0dfbc 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/gnu/GNUMakefile.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/gnu/GNUMakefile.java
@@ -625,7 +625,7 @@ public class GNUMakefile extends AbstractMakefile implements IGNUMakefile {
 		}
 		directories = dirs.toArray(new String[0]);
 		if (pattern == null) {
-			pattern = ""; // $NON-NLS-1$
+			pattern = ""; //$NON-NLS-1$
 		}
 		return new VPath(this, pattern, directories);
 	}
diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/util/CCommandDSC.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/util/CCommandDSC.java
index 0e8d9cbbf41..3bbd0b9d22e 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/util/CCommandDSC.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/util/CCommandDSC.java
@@ -108,7 +108,7 @@ public class CCommandDSC {
     
 	@Override
 	public String toString() {
-		String commandAsString = ""; // $NON-NLS-1$
+		String commandAsString = ""; //$NON-NLS-1$
 		for (Iterator<KVStringPair> i = compilerCommand.iterator(); i.hasNext(); ) {
 			KVStringPair optionPair = i.next();
 			String value = optionPair.getValue();
@@ -128,7 +128,7 @@ public class CCommandDSC {
 	 * @return the command line to run the scanner discovery.
 	 */
 	public String getSCDRunnableCommand(boolean quoteIncludePaths, boolean quoteDefines) {
-		String commandAsString = ""; // $NON-NLS-1$
+		String commandAsString = ""; //$NON-NLS-1$
 		for (Iterator<KVStringPair> i = compilerCommand.iterator(); i.hasNext(); ) {
 			KVStringPair optionPair = i.next();
             if (optionPair.getKey().equals(SCDOptionsEnum.COMMAND.toString())) {
@@ -167,7 +167,7 @@ public class CCommandDSC {
 	 * @return the compiler command
 	 */
 	public String getCompilerName() {
-		String compiler = ""; // $NON-NLS-1$
+		String compiler = ""; //$NON-NLS-1$
 		for (Iterator<KVStringPair> i = compilerCommand.iterator(); i.hasNext(); ) {
 			KVStringPair optionPair = i.next();
             if (optionPair.getKey().equals(SCDOptionsEnum.COMMAND.toString())) {
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/testplugin/ManagedBuildTestHelper.java b/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/testplugin/ManagedBuildTestHelper.java
index c5c51af35ab..30dd5c3958d 100644
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/testplugin/ManagedBuildTestHelper.java
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/testplugin/ManagedBuildTestHelper.java
@@ -1071,7 +1071,7 @@ public class ManagedBuildTestHelper {
 			rcbsTool = rcConfig.createTool(null,rcbsToolId + "." + ManagedBuildManager.getRandomNumber(),rcbsToolName,false);	//$NON-NLS-1$
 			rcbsTool.setCustomBuildStep(true);
 			IInputType rcbsToolInputType = rcbsTool.createInputType(null,rcbsToolInputTypeId + "." + ManagedBuildManager.getRandomNumber(),rcbsToolInputTypeName,false);	//$NON-NLS-1$
-			IAdditionalInput rcbsToolInputTypeAdditionalInput = rcbsToolInputType.createAdditionalInput(""); // $NON-NLS-1$
+			IAdditionalInput rcbsToolInputTypeAdditionalInput = rcbsToolInputType.createAdditionalInput(""); //$NON-NLS-1$
 			rcbsToolInputTypeAdditionalInput.setKind(IAdditionalInput.KIND_ADDITIONAL_INPUT_DEPENDENCY);
 			rcbsTool.createOutputType(null,rcbsToolOutputTypeId + "." + ManagedBuildManager.getRandomNumber(),rcbsToolOutputTypeName,false);	//$NON-NLS-1$
 		}
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildCommandLineGenerator.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildCommandLineGenerator.java
index ace33ea19e7..f59f19a7a0f 100644
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildCommandLineGenerator.java
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildCommandLineGenerator.java
@@ -33,7 +33,7 @@ public class ManagedBuildCommandLineGenerator implements
 		//  Concatenate the tool name and the passed in command name
 		info.commandName = tool.getName() + commandName;
 		//  Put out the flags backwards
-		String myflags = ""; // $NON-NLS-1$
+		String myflags = ""; //$NON-NLS-1$
 		for (int i = flags.length - 1; i >= 0; i--) {
 			if (i < flags.length - 1) myflags += " ";
 			myflags += flags[i];
@@ -41,7 +41,7 @@ public class ManagedBuildCommandLineGenerator implements
 		info.commandFlags = myflags;
 		//  Alphabetize the inputs and add foo.cpp
 		String[] inputs = new String[inputResources.length + 1];
-		String myinputs = ""; // $NON-NLS-1$
+		String myinputs = ""; //$NON-NLS-1$
 		for (int i=0; i<inputResources.length; i++) {
 			inputs[i] = inputResources[i];
 		}
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedProjectUpdateTests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedProjectUpdateTests.java
index 77c36998f21..f729fc8567a 100644
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedProjectUpdateTests.java
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedProjectUpdateTests.java
@@ -165,7 +165,7 @@ public class ManagedProjectUpdateTests extends TestCase {
 								IStatus.OK,
 								"org.eclipse.cdt.managedbuilder.core.tests",
 								IStatus.OK,
-								"", // $NON-NLS-1$
+								"", //$NON-NLS-1$
 								null);
 					}
 				};
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ResourceBuildCoreTests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ResourceBuildCoreTests.java
index 99cc2e65044..bb2b5085d39 100644
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ResourceBuildCoreTests.java
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ResourceBuildCoreTests.java
@@ -167,7 +167,7 @@ public class ResourceBuildCoreTests extends TestCase {
 		// Get the project build properties.
 		ITool tools[] = defaultConfig.getFilteredTools();
 		Tool projTool = null;
-		String projBuildProps = ""; // $NON-NLS-1$
+		String projBuildProps = ""; //$NON-NLS-1$
 		for (int i = 0; i < tools.length; i++) {
 			if( tools[i].buildsFileType(extString) ) {
 				// Get the build properties of a project in default configuration
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/Test30_2_CommandLineGenerator.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/Test30_2_CommandLineGenerator.java
index 3217401d838..b39e3dc0907 100644
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/Test30_2_CommandLineGenerator.java
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/Test30_2_CommandLineGenerator.java
@@ -63,12 +63,12 @@ public class Test30_2_CommandLineGenerator implements
 		info.commandOutputPrefix = outputPrefix;
 		info.commandOutput = outputName;
 		info.commandLinePattern = commandLinePattern;
-		info.commandInputs = ""; // $NON-NLS-1$
+		info.commandInputs = ""; //$NON-NLS-1$
 		for (int i = 0; i < inputResources.length; i++) {
 			if (i > 0) info.commandInputs += " ";
 			info.commandInputs += inputResources[i];
 		}
-		info.commandFlags = ""; // $NON-NLS-1$
+		info.commandFlags = ""; //$NON-NLS-1$
 		IOption opt = tool.getOptionBySuperClassId("test30_2.tar-list.filename");
 		String optVal = "";
 		try {
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedBuildManager.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedBuildManager.java
index 4590524825e..ffda1231be9 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedBuildManager.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedBuildManager.java
@@ -1914,7 +1914,7 @@ public class ManagedBuildManager extends AbstractCExtension {
 //			throw new CoreException(new Status(IStatus.ERROR,
 //					ManagedBuilderCorePlugin.PLUGIN_ID,
 //					IStatus.ERROR,
-//					"", // $NON-NLS-1$
+//					"", //$NON-NLS-1$
 //					null));
 //		}
 //
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedBuilderCorePlugin.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedBuilderCorePlugin.java
index 4d027bbbfc5..6353800737a 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedBuilderCorePlugin.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedBuilderCorePlugin.java
@@ -131,7 +131,7 @@ public class ManagedBuilderCorePlugin extends Plugin {
 //							IStatus.OK,
 //							ManagedBuilderCorePlugin.getUniqueIdentifier(),
 //							IStatus.OK,
-//							"", // $NON-NLS-1$
+//							"", //$NON-NLS-1$
 //							null);
 //				}
 //			};
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildDescription.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildDescription.java
index eea92b83e52..a4154aa6305 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildDescription.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildDescription.java
@@ -2242,7 +2242,7 @@ public class BuildDescription implements IBuildDescription {
 		if(!type.isInput()){
 			String var = type.getLinkId();
 			if(var == null)
-				var = ""; // $NON-NLS-1$
+				var = ""; //$NON-NLS-1$
 
 			Set<BuildIOType> set = fVarToAddlInSetMap.get(var);
 			if(set != null){
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildStep.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildStep.java
index 2ac5871c966..5926a36b2ce 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildStep.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildStep.java
@@ -521,7 +521,7 @@ public class BuildStep implements IBuildStep {
 
 	private String listToString(String[] list, String delimiter){
 		if(list == null || list.length == 0)
-			return ""; // $NON-NLS-1$
+			return ""; //$NON-NLS-1$
 
 		StringBuilder buf = new StringBuilder(list[0]);
 
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/AdditionalInput.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/AdditionalInput.java
index 5fa13748435..ed49c353ccf 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/AdditionalInput.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/AdditionalInput.java
@@ -218,7 +218,7 @@ public class AdditionalInput implements IAdditionalInput {
 					str = ADDITIONAL_INPUT_DEPENDENCY;
 					break;
 				default:
-					str = ""; // $NON-NLS-1$
+					str = ""; //$NON-NLS-1$
 					break;
 			}
 			element.setAttribute(IAdditionalInput.KIND, str);
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/CommonBuilder.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/CommonBuilder.java
index 62a9ad867c4..a8b183fed3f 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/CommonBuilder.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/CommonBuilder.java
@@ -621,7 +621,7 @@ public class CommonBuilder extends ACBuilder {
 						status = new MultiStatus(
 								ManagedBuilderCorePlugin.getUniqueIdentifier(),
 								IStatus.ERROR,
-								"", // $NON-NLS-1$
+								"", //$NON-NLS-1$
 								null);
 					}
 
@@ -638,7 +638,7 @@ public class CommonBuilder extends ACBuilder {
 						status = new MultiStatus(
 								ManagedBuilderCorePlugin.getUniqueIdentifier(),
 								IStatus.ERROR,
-								"", // $NON-NLS-1$
+								"", //$NON-NLS-1$
 								null);
 					}
 
@@ -657,7 +657,7 @@ public class CommonBuilder extends ACBuilder {
 			status = new MultiStatus(
 					ManagedBuilderCorePlugin.getUniqueIdentifier(),
 					IStatus.OK,
-					"", // $NON-NLS-1$
+					"", //$NON-NLS-1$
 					null);
 		}
 
@@ -814,7 +814,7 @@ public class CommonBuilder extends ACBuilder {
 		if (buildType == FULL_BUILD || buildType == INCREMENTAL_BUILD) {
 			consoleHeader[0] = ManagedMakeMessages.getResourceString("ManagedMakeBuider.type.incremental"); //$NON-NLS-1$
 		} else {
-			consoleHeader[0] = ""; // $NON-NLS-1$
+			consoleHeader[0] = ""; //$NON-NLS-1$
 			outputError(projName, "The given build type is not supported in this context");	//$NON-NLS-1$
 		}
 		consoleHeader[1] = configName;
@@ -1015,7 +1015,7 @@ public class CommonBuilder extends ACBuilder {
 //		return new MultiStatus(
 //				ManagedBuilderCorePlugin.getUniqueIdentifier(),
 //				severity,
-//				"", // $NON-NLS-1$
+//				"", //$NON-NLS-1$
 //				null);
 //	}
 
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/FolderInfo.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/FolderInfo.java
index 7f74755c62d..a35ec0e728b 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/FolderInfo.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/FolderInfo.java
@@ -86,7 +86,7 @@ public class FolderInfo extends ResourceInfo implements IFolderInfo {
 		toolChain.setUnusedChildren(parTc.getUnusedChildren());
 
 		ITool tools[] = parTc.getTools();
-		String subId = ""; // $NON-NLS-1$
+		String subId = ""; //$NON-NLS-1$
 		for (ITool tool : tools) {
 			ITool extTool = ManagedBuildManager.getExtensionTool(tool);
 			if(extTool == null)
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/GeneratedMakefileBuilder.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/GeneratedMakefileBuilder.java
index 3f36ef9006a..fd280ddfb5c 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/GeneratedMakefileBuilder.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/GeneratedMakefileBuilder.java
@@ -369,7 +369,7 @@ public class GeneratedMakefileBuilder extends ACBuilder {
 			if (buildType == FULL_BUILD || buildType == INCREMENTAL_BUILD) {
 				consoleHeader[0] = ManagedMakeMessages.getResourceString(TYPE_INC);
 			} else {
-				consoleHeader[0] = ""; // $NON-NLS-1$
+				consoleHeader[0] = ""; //$NON-NLS-1$
 				outputError(getProject().getName(), "The given build type is not supported in this context");	//$NON-NLS-1$
 			}
 			consoleHeader[1] = configName;
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ManagedBuildInfo.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ManagedBuildInfo.java
index 8a3d79333e8..3985ffcf31c 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ManagedBuildInfo.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ManagedBuildInfo.java
@@ -157,7 +157,7 @@ public class ManagedBuildInfo implements IManagedBuildInfo, IScannerInfo {
 	 */
 	@Override
 	public String getBuildArtifactExtension() {
-		String ext = ""; // $NON-NLS-1$
+		String ext = ""; //$NON-NLS-1$
 		IConfiguration config = getDefaultConfiguration();
 		if (config != null) {
 			ext = config.getArtifactExtension();
@@ -171,7 +171,7 @@ public class ManagedBuildInfo implements IManagedBuildInfo, IScannerInfo {
 	@Override
 	public String getBuildArtifactName() {
 		// Get the default configuration and use its value
-		String name = ""; // $NON-NLS-1$
+		String name = ""; //$NON-NLS-1$
 		IConfiguration config = getDefaultConfiguration();
 		if (config != null) {
 			name = config.getArtifactName();
@@ -185,7 +185,7 @@ public class ManagedBuildInfo implements IManagedBuildInfo, IScannerInfo {
 	@Override
 	public String getCleanCommand() {
 		// Get from the model
-		String command = ""; // $NON-NLS-1$
+		String command = ""; //$NON-NLS-1$
 		IConfiguration config = getDefaultConfiguration();
 		if (config != null) {
 			command = config.getCleanCommand();
@@ -200,7 +200,7 @@ public class ManagedBuildInfo implements IManagedBuildInfo, IScannerInfo {
 	public String getConfigurationName() {
 		// Return the human-readable name of the default configuration
 		IConfiguration config = getDefaultConfiguration();
-		return config == null ? "" : config.getName(); // $NON-NLS-1$
+		return config == null ? "" : config.getName(); //$NON-NLS-1$
 	}
 
 	/* (non-Javadoc)
@@ -361,7 +361,7 @@ public class ManagedBuildInfo implements IManagedBuildInfo, IScannerInfo {
 	@Override
 	public String getToolFlagsForConfiguration(String extension, IPath inputLocation, IPath outputLocation){
 		// Treat null extensions as an empty string
-		String ext = extension == null ? "" : extension; // $NON-NLS-1$
+		String ext = extension == null ? "" : extension; //$NON-NLS-1$
 
 		// Get all the tools for the current config
 		ITool[] tools = getFilteredTools();
@@ -480,7 +480,7 @@ public class ManagedBuildInfo implements IManagedBuildInfo, IScannerInfo {
 	@Override
 	public String getPrebuildStep() {
 		// Get the default configuration and use its value
-		String name = ""; // $NON-NLS-1$
+		String name = ""; //$NON-NLS-1$
 		IConfiguration config = getDefaultConfiguration();
 		if (config != null) {
 			name = config.getPrebuildStep();
@@ -496,7 +496,7 @@ public class ManagedBuildInfo implements IManagedBuildInfo, IScannerInfo {
 	@Override
 	public String getPostbuildStep() {
 		// Get the default configuration and use its value
-		String name = ""; // $NON-NLS-1$
+		String name = ""; //$NON-NLS-1$
 		IConfiguration config = getDefaultConfiguration();
 		if (config != null) {
 			name = config.getPostbuildStep();
@@ -512,7 +512,7 @@ public class ManagedBuildInfo implements IManagedBuildInfo, IScannerInfo {
 	@Override
 	public String getPreannouncebuildStep() {
 		// Get the default configuration and use its value
-		String name = ""; // $NON-NLS-1$
+		String name = ""; //$NON-NLS-1$
 		IConfiguration config = getDefaultConfiguration();
 		if (config != null) {
 			name = config.getPreannouncebuildStep();
@@ -528,7 +528,7 @@ public class ManagedBuildInfo implements IManagedBuildInfo, IScannerInfo {
 	@Override
 	public String getPostannouncebuildStep() {
 		// Get the default configuration and use its value
-		String name = ""; // $NON-NLS-1$
+		String name = ""; //$NON-NLS-1$
 		IConfiguration config = getDefaultConfiguration();
 		if (config != null) {
 			name = config.getPostannouncebuildStep();
@@ -593,7 +593,7 @@ public class ManagedBuildInfo implements IManagedBuildInfo, IScannerInfo {
 	@Override
 	public String getToolForConfiguration(String extension) {
 		// Treat a null argument as an empty string
-		String ext = extension == null ? "" : extension; // $NON-NLS-1$
+		String ext = extension == null ? "" : extension; //$NON-NLS-1$
 		// Get all the tools for the current config
 		ITool[] tools = getFilteredTools();
 		for (int index = 0; index < tools.length; index++) {
@@ -1291,7 +1291,7 @@ public class ManagedBuildInfo implements IManagedBuildInfo, IScannerInfo {
 
 			String[] tokens = val.split("="); //$NON-NLS-1$
 			String key = tokens[0].trim();
-			String value = (tokens.length > 1) ? tokens[1].trim() : ""; // $NON-NLS-1$
+			String value = (tokens.length > 1) ? tokens[1].trim() : ""; //$NON-NLS-1$
 			// Make sure the current entries do not contain a duplicate
 			boolean add = true;
 			Iterator<IPathEntry> entryIter = entries.listIterator();
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/OptionCategory.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/OptionCategory.java
index d98c43d36d8..36c2f5f12db 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/OptionCategory.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/OptionCategory.java
@@ -42,7 +42,7 @@ import org.osgi.framework.Version;
  */
 public class OptionCategory extends BuildObject implements IOptionCategory {
 
-	private static final String EMPTY_STRING = ""; // $NON-NLS-1$
+	private static final String EMPTY_STRING = ""; //$NON-NLS-1$
 	private static final IOptionCategory[] emtpyCategories = new IOptionCategory[0];
 
 	//  Parent and children
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/OptionReference.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/OptionReference.java
index fd310d8c09d..e706bd05a6c 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/OptionReference.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/OptionReference.java
@@ -382,7 +382,7 @@ public class OptionReference implements IOption {
 				return name;
 			} catch (BuildException e) {}
 		}
-		return ""; // $NON-NLS-1$
+		return ""; //$NON-NLS-1$
 	}
 
 	@Override
@@ -396,7 +396,7 @@ public class OptionReference implements IOption {
 				return name;
 			} catch (BuildException e) {}
 		}
-		return ""; // $NON-NLS-1$
+		return ""; //$NON-NLS-1$
 	}
 
 	@Override
@@ -410,7 +410,7 @@ public class OptionReference implements IOption {
 				return id;
 			} catch (BuildException e) {}
 		}
-		return ""; // $NON-NLS-1$
+		return ""; //$NON-NLS-1$
 	}
 
 	@Override
@@ -424,7 +424,7 @@ public class OptionReference implements IOption {
 				return id;
 			} catch (BuildException e) {}
 		}
-		return ""; // $NON-NLS-1$
+		return ""; //$NON-NLS-1$
 	}
 
 	@Override
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ResourceChangeHandler.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ResourceChangeHandler.java
index 46c799a54aa..c74e288b2a8 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ResourceChangeHandler.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ResourceChangeHandler.java
@@ -387,7 +387,7 @@ public class ResourceChangeHandler implements IResourceChangeListener, ISavePart
 						IStatus.OK,
 						ManagedBuilderCorePlugin.getUniqueIdentifier(),
 						IStatus.OK,
-						"", // $NON-NLS-1$
+						"", //$NON-NLS-1$
 						null);
 			}
 		};
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ResourceConfiguration.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ResourceConfiguration.java
index 177719d9774..2f0d5934168 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ResourceConfiguration.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ResourceConfiguration.java
@@ -137,7 +137,7 @@ public class ResourceConfiguration extends ResourceInfo implements IFileInfo {
 			setManagedBuildRevision(folderInfo.getParent().getManagedBuildRevision());
 
 		setDirty(false);
-		toolsToInvoke = ""; // $NON-NLS-1$
+		toolsToInvoke = ""; //$NON-NLS-1$
 		rcbsApplicability = KIND_DISABLE_RCBS_TOOL;
 
 
@@ -149,7 +149,7 @@ public class ResourceConfiguration extends ResourceInfo implements IFileInfo {
 		}
 		// Add the resource specific tools to this resource.
 		ITool tools[] = folderInfo.getFilteredTools();
-		String subId = ""; // $NON-NLS-1$
+		String subId = ""; //$NON-NLS-1$
 		for (int i = 0; i < tools.length; i++) {
 			if( tools[i].buildsFileType(extString) ) {
 				baseTool = tools[i];
@@ -552,10 +552,10 @@ public class ResourceConfiguration extends ResourceInfo implements IFileInfo {
 		 * An empty string implies treat as if no resource configuration, i.e., use project level tool.
 		 * This getter routine returns an ITool[] to consumers (i.e., the makefile generator).
 		 */
-		String t_ToolsToInvoke = ""; // $NON-NLS-1$
+		String t_ToolsToInvoke = ""; //$NON-NLS-1$
 		ITool[] resConfigTools;
 		ITool[] tools;
-		String rcbsToolId = ""; // $NON-NLS-1$
+		String rcbsToolId = ""; //$NON-NLS-1$
 		int len;
 		int j;
 		int rcbsToolIdx=-1;
@@ -571,7 +571,7 @@ public class ResourceConfiguration extends ResourceInfo implements IFileInfo {
 		 * If no tools are currently defined, return a zero lengh array of ITool.
 		 */
 		if (resConfigTools.length == 0) {
-			toolsToInvoke = ""; // $NON-NLS-1$
+			toolsToInvoke = ""; //$NON-NLS-1$
 			tools = new ITool[0];
 			return tools;
 		}
@@ -632,7 +632,7 @@ public class ResourceConfiguration extends ResourceInfo implements IFileInfo {
 				 */
 				if(resConfigTools.length == 1){
 					tools = new ITool[0];
-					toolsToInvoke = ""; // $NON-NLS-1$
+					toolsToInvoke = ""; //$NON-NLS-1$
 					break;
 				}
 				j = 0;
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Target.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Target.java
index dc71ccc2f07..2dd34dadb76 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Target.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Target.java
@@ -40,7 +40,7 @@ import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 
 public class Target extends BuildObject implements ITarget {
-	private static final String EMPTY_STRING = ""; // $NON-NLS-1$
+	private static final String EMPTY_STRING = ""; //$NON-NLS-1$
 	private String artifactName;
 	private String binaryParserId;
 	private String cleanCommand;
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ToolReference.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ToolReference.java
index 8feda5ee498..5df1d025db4 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ToolReference.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ToolReference.java
@@ -179,7 +179,7 @@ public class ToolReference implements IToolReference {
 		outputFlag = tool.getOutputFlag();
 		outputPrefix = tool.getOutputPrefix();
 		String[] extensions = tool.getOutputsAttribute();
-		outputExtensions = ""; // $NON-NLS-1$
+		outputExtensions = ""; //$NON-NLS-1$
 		if (extensions != null) {
 			for (int index = 0; index < extensions.length; ++index) {
 				if (extensions[index] == null) continue;
@@ -346,7 +346,7 @@ public class ToolReference implements IToolReference {
 	public String getId() {
 		if (parent == null) {
 			// bad reference
-			return ""; // $NON-NLS-1$
+			return ""; //$NON-NLS-1$
 		}
 		return parent.getId();
 	}
@@ -358,7 +358,7 @@ public class ToolReference implements IToolReference {
 	public String getBaseId() {
 		if (parent == null) {
 			// bad reference
-			return ""; // $NON-NLS-1$
+			return ""; //$NON-NLS-1$
 		}
 		return parent.getBaseId();
 	}
@@ -383,7 +383,7 @@ public class ToolReference implements IToolReference {
 	public String getName() {
 		if (parent == null) {
 			// bad reference
-			return ""; // $NON-NLS-1$
+			return ""; //$NON-NLS-1$
 		}
 		return parent.getName();
 	}
@@ -466,7 +466,7 @@ public class ToolReference implements IToolReference {
 			// see if the parent has one
 			if (parent == null) {
 				// bad reference
-				return ""; // $NON-NLS-1$
+				return ""; //$NON-NLS-1$
 			}
 			return parent.getToolCommand();
 		}
@@ -673,7 +673,7 @@ public class ToolReference implements IToolReference {
 	public String getOutputExtension(String inputExtension) {
 		if (parent == null) {
 			// bad reference
-			return ""; // $NON-NLS-1$
+			return ""; //$NON-NLS-1$
 		}
 		return parent.getOutputExtension(inputExtension);
 	}
@@ -688,7 +688,7 @@ public class ToolReference implements IToolReference {
 				return parent.getOutputFlag();
 			} else {
 				// We never should be here
-				return ""; // $NON-NLS-1$
+				return ""; //$NON-NLS-1$
 			}
 		}
 		return outputFlag;
@@ -703,7 +703,7 @@ public class ToolReference implements IToolReference {
 			if (parent != null) {
 				return parent.getOutputPrefix();
 			}
-			return "";	// bad reference // $NON-NLS-1$
+			return "";	// bad reference //$NON-NLS-1$
 		}
 		return outputPrefix;
 	}
@@ -865,7 +865,7 @@ public class ToolReference implements IToolReference {
 	 */
 	@Override
 	public String getCommandLinePattern() {
-		if( parent == null ) return ""; // $NON-NLS-1$
+		if( parent == null ) return ""; //$NON-NLS-1$
 		return parent.getCommandLinePattern();
 	}
 
@@ -918,7 +918,7 @@ public class ToolReference implements IToolReference {
 	 */
 	@Override
 	public String toString() {
-		String answer = ""; // $NON-NLS-1$
+		String answer = ""; //$NON-NLS-1$
 		if (parent != null) {
 			answer += "Reference to " + parent.getName();	//$NON-NLS-1$
 		}
@@ -1282,7 +1282,7 @@ public class ToolReference implements IToolReference {
 			if (parent != null) {
 				return parent.getConvertToId();
 			} else {
-				return ""; // $NON-NLS-1$
+				return ""; //$NON-NLS-1$
 			}
 		}
 		return convertToId;
@@ -1311,7 +1311,7 @@ public class ToolReference implements IToolReference {
 			if (parent != null) {
 				return parent.getVersionsSupported();
 			} else {
-				return ""; // $NON-NLS-1$
+				return ""; //$NON-NLS-1$
 			}
 		}
 		return versionsSupported;
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/enablement/CheckStringExpression.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/enablement/CheckStringExpression.java
index 5bc1f7e40ea..0675e0c9b3c 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/enablement/CheckStringExpression.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/enablement/CheckStringExpression.java
@@ -39,11 +39,11 @@ public class CheckStringExpression implements IBooleanExpression {
 	public CheckStringExpression(IManagedConfigElement element){
 		fString = element.getAttribute(STRING);
 		if(fString == null)
-			fString = ""; // $NON-NLS-1$
+			fString = ""; //$NON-NLS-1$
 
 		fValue = element.getAttribute(VALUE);
 		if(fValue == null)
-			fValue = ""; // $NON-NLS-1$
+			fValue = ""; //$NON-NLS-1$
 
 		fIsRegex = OptionEnablementExpression.getBooleanValue(element.getAttribute(IS_REGEX));
 	}
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/scannerconfig/DefaultGnuWinScannerInfoCollector.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/scannerconfig/DefaultGnuWinScannerInfoCollector.java
index 13f7cf6975f..272a126c3c6 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/scannerconfig/DefaultGnuWinScannerInfoCollector.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/scannerconfig/DefaultGnuWinScannerInfoCollector.java
@@ -60,7 +60,7 @@ public class DefaultGnuWinScannerInfoCollector extends DefaultGCCScannerInfoColl
 //    			// See if it has an equals
 //    			String[] macroTokens = ((String)symbolIter.next()).split(EQUALS);
 //    			String macro = macroTokens[0].trim();
-//    			String value = (macroTokens.length > 1) ? macroTokens[1].trim() : ""; // $NON-NLS-1$
+//    			String value = (macroTokens.length > 1) ? macroTokens[1].trim() : ""; //$NON-NLS-1$
 //    			getDefinedSymbols().put(macro, value);
 //    		}
     		super.contributeToScannerConfig(resource, scannerInfo);
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/DefaultGCCDependencyCalculator3Commands.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/DefaultGCCDependencyCalculator3Commands.java
index 89b9bf37b0a..b211c07cb35 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/DefaultGCCDependencyCalculator3Commands.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/DefaultGCCDependencyCalculator3Commands.java
@@ -50,7 +50,7 @@ import org.eclipse.core.runtime.IPath;
 public class DefaultGCCDependencyCalculator3Commands implements
 	IManagedDependencyCommands {
 
-	private static final String EMPTY_STRING = ""; // $NON-NLS-1$
+	private static final String EMPTY_STRING = ""; //$NON-NLS-1$
 
 	//  Member variables set by the constructor
 	IPath source;
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java
index 83d82e4cbff..e42719f82b1 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java
@@ -439,7 +439,7 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator2 {
 
 
 		if (buildTargetExt == null) {
-			buildTargetExt = ""; // $NON-NLS-1$
+			buildTargetExt = ""; //$NON-NLS-1$
 		}
 		// Cache the build tools
 		config = info.getDefaultConfiguration();
@@ -651,7 +651,7 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator2 {
 			status = new MultiStatus(
 					ManagedBuilderCorePlugin.getUniqueIdentifier(),
 					IStatus.INFO,
-					"", // $NON-NLS-1$
+					"", //$NON-NLS-1$
 					null);
 			status.add(new Status (
 					IStatus.INFO,
@@ -753,7 +753,7 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator2 {
 			status = new MultiStatus (
 					ManagedBuilderCorePlugin.getUniqueIdentifier(),
 					IStatus.WARNING,
-					"", // $NON-NLS-1$
+					"", //$NON-NLS-1$
 					null);
 			// Add a new status for each of the bad folders
 			// TODO: fix error message
@@ -770,7 +770,7 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator2 {
 			status = new MultiStatus(
 					ManagedBuilderCorePlugin.getUniqueIdentifier(),
 					IStatus.OK,
-					"", // $NON-NLS-1$
+					"", //$NON-NLS-1$
 					null);
 		}
 
@@ -906,7 +906,7 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator2 {
 			status = new MultiStatus(
 					ManagedBuilderCorePlugin.getUniqueIdentifier(),
 					IStatus.INFO,
-					"", // $NON-NLS-1$
+					"", //$NON-NLS-1$
 					null);
 			status.add(new Status (
 					IStatus.INFO,
@@ -965,7 +965,7 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator2 {
 			status = new MultiStatus (
 					ManagedBuilderCorePlugin.getUniqueIdentifier(),
 					IStatus.WARNING,
-					"", // $NON-NLS-1$
+					"", //$NON-NLS-1$
 					null);
 			// Add a new status for each of the bad folders
 			// TODO: fix error message
@@ -981,7 +981,7 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator2 {
 			status = new MultiStatus(
 					ManagedBuilderCorePlugin.getUniqueIdentifier(),
 					IStatus.OK,
-					"", // $NON-NLS-1$
+					"", //$NON-NLS-1$
 					null);
 		}
 		return status;
@@ -2823,7 +2823,7 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator2 {
 		}
 
 		if (addlDeps != null && addlDeps.length > 0) {
-			calculatedDependencies = ""; // $NON-NLS-1$
+			calculatedDependencies = ""; //$NON-NLS-1$
 			for (IPath addlDep : addlDeps) {
 				calculatedDependencies += WHITESPACE + escapeWhitespaces(addlDep.toString());
 			}
@@ -3652,7 +3652,7 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator2 {
 			try {
 				secondToken = deps.get(1);
 			} catch (ArrayIndexOutOfBoundsException e) {
-				secondToken = ""; // $NON-NLS-1$
+				secondToken = ""; //$NON-NLS-1$
 			}
 			if (secondToken.startsWith("'")) { //$NON-NLS-1$
 				// This is the Win32 implementation of echo (MinGW without MSYS)
@@ -3666,7 +3666,7 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator2 {
 			try {
 				thirdToken = deps.get(2);
 			} catch (ArrayIndexOutOfBoundsException e) {
-				thirdToken = ""; // $NON-NLS-1$
+				thirdToken = ""; //$NON-NLS-1$
 			}
 			int lastIndex = thirdToken.lastIndexOf("'"); //$NON-NLS-1$
 			if (lastIndex != -1) {
@@ -3690,7 +3690,7 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator2 {
 				} while (fourthToken.length() == 0);
 
 			} catch (ArrayIndexOutOfBoundsException e) {
-				fourthToken = ""; // $NON-NLS-1$
+				fourthToken = ""; //$NON-NLS-1$
 			}
 			outBuffer.append(fourthToken).append(WHITESPACE);
 
@@ -4515,7 +4515,7 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator2 {
 	 * the name component in a <code>String</code>
 	 */
 	private String getFileName(IResource file) {
-		String answer = ""; // $NON-NLS-1$
+		String answer = ""; //$NON-NLS-1$
 		String lastSegment = file.getName();
 		int extensionSeparator = lastSegment.lastIndexOf(DOT);
 		if (extensionSeparator != -1) {
@@ -4677,7 +4677,7 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator2 {
 
 
 		if (buildTargetExt == null) {
-			buildTargetExt = ""; // $NON-NLS-1$
+			buildTargetExt = ""; //$NON-NLS-1$
 		}
 		// Cache the build tools
 		config = cfg;
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/newmake/core/MakeScannerInfo.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/newmake/core/MakeScannerInfo.java
index db46c6e6f82..a26c4faf16a 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/newmake/core/MakeScannerInfo.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/newmake/core/MakeScannerInfo.java
@@ -92,8 +92,8 @@ public class MakeScannerInfo implements IScannerInfo {
 			if (symbol.length() == 0) {
 				continue;
 			}
-			String key = ""; // $NON-NLS-1$
-			String value = ""; // $NON-NLS-1$
+			String key = ""; //$NON-NLS-1$
+			String value = ""; //$NON-NLS-1$
 			int index = symbol.indexOf("="); //$NON-NLS-1$
 			if (index != -1) {
 				key = symbol.substring(0, index).trim();
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildOptionComboFieldEditor.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildOptionComboFieldEditor.java
index 2c89993142c..29dcf0927b0 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildOptionComboFieldEditor.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildOptionComboFieldEditor.java
@@ -132,7 +132,7 @@ public class BuildOptionComboFieldEditor extends FieldEditor {
 			public void widgetSelected(SelectionEvent evt) {
 				String oldValue = selected;
 				int index = optionSelector.getSelectionIndex();
-				selected = index == -1 ? "" : optionSelector.getItem(index); // $NON-NLS-1$
+				selected = index == -1 ? "" : optionSelector.getItem(index); //$NON-NLS-1$
 				setPresentsDefaultValue(false);
 				fireValueChanged(VALUE, oldValue, selected);					
 			}
@@ -171,7 +171,7 @@ public class BuildOptionComboFieldEditor extends FieldEditor {
 	protected void doStore() {
 		// Save the selected item in the store
 		int index = optionSelector.getSelectionIndex();
-		selected = index == -1 ? "" : optionSelector.getItem(index); // $NON-NLS-1$
+		selected = index == -1 ? "" : optionSelector.getItem(index); //$NON-NLS-1$
 		getPreferenceStore().setValue(getPreferenceName(), selected);
 	}
 	
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildStepsTab.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildStepsTab.java
index 08d0a965f01..2385a48baec 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildStepsTab.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildStepsTab.java
@@ -273,7 +273,7 @@ public class BuildStepsTab extends AbstractCBuildPropertyTab {
 			rcbsTool = rcConfig.createTool(null,rcbsToolId + "." + ManagedBuildManager.getRandomNumber(),rcbsToolName,false);	//$NON-NLS-1$
 			rcbsTool.setCustomBuildStep(true);
 			IInputType rcbsToolInputType = rcbsTool.createInputType(null,rcbsToolInputTypeId + "." + ManagedBuildManager.getRandomNumber(),rcbsToolInputTypeName,false);	//$NON-NLS-1$
-			IAdditionalInput rcbsToolInputTypeAdditionalInput = rcbsToolInputType.createAdditionalInput(""); // $NON-NLS-1$
+			IAdditionalInput rcbsToolInputTypeAdditionalInput = rcbsToolInputType.createAdditionalInput(""); //$NON-NLS-1$
 			rcbsToolInputTypeAdditionalInput.setKind(IAdditionalInput.KIND_ADDITIONAL_INPUT_DEPENDENCY);
 			rcbsTool.createOutputType(null,rcbsToolOutputTypeId + "." + ManagedBuildManager.getRandomNumber(),rcbsToolOutputTypeName,false);	//$NON-NLS-1$
 		}
@@ -298,7 +298,7 @@ public class BuildStepsTab extends AbstractCBuildPropertyTab {
 
 	private String createList(String[] items) {
 		if(items == null)
-			return ""; // $NON-NLS-1$
+			return ""; //$NON-NLS-1$
 
 		StringBuilder path = new StringBuilder(EMPTY_STR);
 
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/NewBuildConfigurationDialog.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/NewBuildConfigurationDialog.java
index d037e40b0bf..652b476f7b3 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/NewBuildConfigurationDialog.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/NewBuildConfigurationDialog.java
@@ -88,8 +88,8 @@ public class NewBuildConfigurationDialog extends Dialog {
 		des = prjd;
 		setShellStyle(getShellStyle()|SWT.RESIZE);
 
-		newName = ""; // $NON-NLS-1$
-		newDescription = ""; // $NON-NLS-1$
+		newName = ""; //$NON-NLS-1$
+		newDescription = ""; //$NON-NLS-1$
 
 		parentConfig = null;
 		// The default behaviour is to clone the settings
@@ -110,9 +110,9 @@ public class NewBuildConfigurationDialog extends Dialog {
 	@Override
 	protected void buttonPressed(int buttonId) {
 		if (buttonId == IDialogConstants.OK_ID) {
-			String description = ""; // $NON-NLS-1$
-			String nameAndDescription = ""; // $NON-NLS-1$
-			String baseConfigNameAndDescription = ""; // $NON-NLS-1$
+			String description = ""; //$NON-NLS-1$
+			String nameAndDescription = ""; //$NON-NLS-1$
+			String baseConfigNameAndDescription = ""; //$NON-NLS-1$
 
 			newName = configName.getText().trim();
 			newDescription = configDescription.getText().trim();
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/NewCfgDialog.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/NewCfgDialog.java
index 6b10300156f..ca02444422b 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/NewCfgDialog.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/NewCfgDialog.java
@@ -413,8 +413,8 @@ public class NewCfgDialog implements INewCfgDialog {
 	/**
 	 */
 	public NewCfgDialog() {
-		newName = ""; // $NON-NLS-1$
-		newDescription = ""; // $NON-NLS-1$
+		newName = ""; //$NON-NLS-1$
+		newDescription = ""; //$NON-NLS-1$
 	}
 
 	@Override
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/NewVarDialog.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/NewVarDialog.java
index 5ebd26f03ab..0cd7263a620 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/NewVarDialog.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/NewVarDialog.java
@@ -55,7 +55,7 @@ import com.ibm.icu.text.Collator;
  * @noinstantiate This class is not intended to be instantiated by clients.
  */
 public class NewVarDialog extends Dialog {
-	private static final String EMPTY_STRING = ""; // $NON-NLS-1$
+	private static final String EMPTY_STRING = ""; //$NON-NLS-1$
 
 	// The title of the dialog.
 	private String fTitle;
diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/AbstractEntryStorage.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/AbstractEntryStorage.java
index ab1e0d2f151..da6405ed5ac 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/AbstractEntryStorage.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/AbstractEntryStorage.java
@@ -20,7 +20,7 @@ import org.eclipse.cdt.core.settings.model.util.SettingsSet.SettingLevel;
 public abstract class AbstractEntryStorage {
 	private int fKind;
 	
-	private static final String EMPTY_STRING = ""; // $NON-NLS-1$
+	private static final String EMPTY_STRING = ""; //$NON-NLS-1$
 
 	public AbstractEntryStorage(int kind){
 		fKind = kind;
diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryFunction.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryFunction.java
index 1da816d5f98..368ef5ac5b8 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryFunction.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryFunction.java
@@ -46,7 +46,7 @@ public class BinaryFunction extends BinaryElement implements IBinaryFunction {
 	@Override
 	public String getParameterInitializer(int pos) {
 		// TODO Auto-generated method stub
-		return ""; // $NON-NLS-1$
+		return ""; //$NON-NLS-1$
 	}
 
 	/* (non-Javadoc)
@@ -64,7 +64,7 @@ public class BinaryFunction extends BinaryElement implements IBinaryFunction {
 	@Override
 	public String getReturnType() {
 		// TODO Auto-generated method stub
-		return ""; // $NON-NLS-1$
+		return ""; //$NON-NLS-1$
 	}
 
 	/* (non-Javadoc)
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/IncludeSearchPathElement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/IncludeSearchPathElement.java
index c1d82aac1c7..41e143405d5 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/IncludeSearchPathElement.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/IncludeSearchPathElement.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2015 Wind River Systems, Inc. and others.
+ * Copyright (c) 2009, 2016 Wind River Systems, Inc. and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -72,7 +72,7 @@ public final class IncludeSearchPathElement {
 				String framework = includeDirective.substring(0, firstSep);
 				String file = includeDirective.substring(firstSep + 1);
 				if (file.length() > 0) {
-					if (fPath.endsWith(framework + FRAMEWORK_HEADERS)) { // $NON-NLS-1$
+					if (fPath.endsWith(framework + FRAMEWORK_HEADERS)) { //$NON-NLS-1$
 						return ScannerUtility.createReconciledPath(fPath, file);
 					}
 				}
diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/PE.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/PE.java
index 1f70b93d830..d6ccb489401 100644
--- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/PE.java
+++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/PE.java
@@ -885,7 +885,7 @@ public class PE {
 			}
 		}
 		
-		return ""; // $NON-NLS-1$
+		return ""; //$NON-NLS-1$
 	}
 
 	/**
diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/dwarf/Dwarf.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/dwarf/Dwarf.java
index 446da9e08de..2a81a66c301 100644
--- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/dwarf/Dwarf.java
+++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/dwarf/Dwarf.java
@@ -695,9 +695,9 @@ public class Dwarf {
 
 					ByteBuffer data = dwarfSections.get(DWARF_DEBUG_STR);
 					if (data == null) {
-						obj = ""; // $NON-NLS-1$
+						obj = ""; //$NON-NLS-1$
 					} else if (offset < 0 || offset > data.capacity()) {
-						obj = ""; // $NON-NLS-1$
+						obj = ""; //$NON-NLS-1$
 					} else {
 						StringBuilder sb = new StringBuilder();
 						data.position((int) offset);
@@ -723,9 +723,9 @@ public class Dwarf {
 
 			    	ByteBuffer data = dwarfAltSections.get(DWARF_DEBUG_STR);
 			    	if (data == null) {
-			    		obj = ""; // $NON-NLS-1$
+			    		obj = ""; //$NON-NLS-1$
 			    	} else if (offset < 0 || offset > data.capacity()) {
-			    		obj = ""; // $NON-NLS-1$
+			    		obj = ""; //$NON-NLS-1$
 			    	} else {
 			    		StringBuilder sb = new StringBuilder();
 			    		data.position((int) offset);
diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/stabs/Stabs.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/stabs/Stabs.java
index 3a5d4192fee..4b091846675 100644
--- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/stabs/Stabs.java
+++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/stabs/Stabs.java
@@ -188,7 +188,7 @@ public class Stabs {
 			if (stroff > 0) {
 				field = makeString(stroff);
 			} else {
-				field = ""; // $NON-NLS-1$
+				field = ""; //$NON-NLS-1$
 			}
 			// Check for continuation and if any go to the next stab
 			// until we find a string that is not terminated with a
diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/stabs/StabsReader.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/stabs/StabsReader.java
index 7c3d1abed84..20b729745d6 100644
--- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/stabs/StabsReader.java
+++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/stabs/StabsReader.java
@@ -177,7 +177,7 @@ public class StabsReader implements ISymbolReader {
 				if (stroff > 0) {
 					field = makeString(stroff);
 				} else {
-					field = ""; // $NON-NLS-1$
+					field = ""; //$NON-NLS-1$
 				}
 				// Check for continuation and if any go to the next stab
 				// until we find a string that is not terminated with a
diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/stabs/StringField.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/stabs/StringField.java
index 59858b9a5fc..f3787880747 100644
--- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/stabs/StringField.java
+++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/stabs/StringField.java
@@ -98,7 +98,7 @@ public class StringField {
 		if (index < array.length) {
 			typeInformation = new String(array, index, array.length - index);
 		} else {
-			typeInformation = ""; // $NON-NLS-1$
+			typeInformation = ""; //$NON-NLS-1$
 		}
 	}
 }
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/chelp/CHelpProviderTester.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/chelp/CHelpProviderTester.java
index 3fc47ad77a1..3b556e806d6 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/chelp/CHelpProviderTester.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/chelp/CHelpProviderTester.java
@@ -217,7 +217,7 @@ public class CHelpProviderTester{
 	private String getValueByKey(String key){
 		String val = fProperties.getProperty(key);
 		if(val == null)
-			val = ""; // $NON-NLS-1$
+			val = ""; //$NON-NLS-1$
 		return val;
 	}
 	
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/IndentUtil.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/IndentUtil.java
index e6c942ab46a..eb9de454b77 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/IndentUtil.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/IndentUtil.java
@@ -523,7 +523,7 @@ public final class IndentUtil {
 			if (computed != null)
 				indent= computed.toString();
 			else
-				indent= ""; // $NON-NLS-1$
+				indent= ""; //$NON-NLS-1$
 		}
 		return indent;
 	}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPreferenceBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPreferenceBlock.java
index f262c701db9..bc014934f38 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPreferenceBlock.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPreferenceBlock.java
@@ -141,7 +141,7 @@ public class CFileTypesPreferenceBlock {
 						} else if (assoc.isPredefined()) {
 							return PreferencesMessages.CFileTypesPreferencePage_preDefined; 
 						}
-						return ""; // $NON-NLS-1$
+						return ""; //$NON-NLS-1$
 				}
 			}
 			return element.toString();
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchUtil.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchUtil.java
index 1ed8810d75c..43e5bd89717 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchUtil.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchUtil.java
@@ -44,7 +44,7 @@ public class CSearchUtil {
 	
 	public static String toString(IWorkingSet[] workingSets) {
 		if (workingSets != null && workingSets.length > 0) {
-			String string = ""; // $NON-NLS-1$
+			String string = ""; //$NON-NLS-1$
 			for (int i = 0; i < workingSets.length; i++) {
 				if (i > 0)
 					string += ", ";  //$NON-NLS-1$
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CDTSharedImages.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CDTSharedImages.java
index 8d0d76a6aa9..ca07db16b7c 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CDTSharedImages.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CDTSharedImages.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2013 Andrew Gvozdev and others.
+ * Copyright (c) 2010, 2016 Andrew Gvozdev and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -80,11 +80,11 @@ public class CDTSharedImages {
 	public static final String IMG_OBJS_TUNIT_RESOURCE = "icons/obj16/c_resource_obj.gif"; //$NON-NLS-1$
 	public static final String IMG_OBJS_TUNIT_RESOURCE_H = "icons/obj16/ch_resource_obj.gif"; //$NON-NLS-1$
 	public static final String IMG_OBJS_TUNIT_RESOURCE_A = "icons/obj16/asm_resource_obj.gif"; //$NON-NLS-1$
-	public static final String IMG_OBJS_SOURCE_ROOT = "icons/obj16/sroot_obj.gif"; // $NON-NLS-1$  //$NON-NLS-1$
-	public static final String IMG_OBJS_SOURCE2_ROOT = "icons/obj16/sroot2_obj.gif"; // $NON-NLS-1$  //$NON-NLS-1$
-	public static final String IMG_OBJS_FOLDER = "icons/obj16/fldr_obj.gif"; // $NON-NLS-1$  //$NON-NLS-1$
-	public static final String IMG_OBJS_CFOLDER = "icons/obj16/cfolder_obj.gif"; // $NON-NLS-1$  //$NON-NLS-1$
-	public static final String IMG_OBJS_CONFIG = "icons/obj16/config.gif"; // $NON-NLS-1$  //$NON-NLS-1$
+	public static final String IMG_OBJS_SOURCE_ROOT = "icons/obj16/sroot_obj.gif"; //$NON-NLS-1$  //$NON-NLS-1$
+	public static final String IMG_OBJS_SOURCE2_ROOT = "icons/obj16/sroot2_obj.gif"; //$NON-NLS-1$  //$NON-NLS-1$
+	public static final String IMG_OBJS_FOLDER = "icons/obj16/fldr_obj.gif"; //$NON-NLS-1$  //$NON-NLS-1$
+	public static final String IMG_OBJS_CFOLDER = "icons/obj16/cfolder_obj.gif"; //$NON-NLS-1$  //$NON-NLS-1$
+	public static final String IMG_OBJS_CONFIG = "icons/obj16/config.gif"; //$NON-NLS-1$  //$NON-NLS-1$
 	public static final String IMG_OBJS_ARCHIVE = "icons/obj16/ar_obj.gif"; //$NON-NLS-1$
 	public static final String IMG_OBJS_BINARY = "icons/obj16/bin_obj.gif"; //$NON-NLS-1$
 	public static final String IMG_OBJS_SHLIB = "icons/obj16/shlib_obj.gif"; //$NON-NLS-1$
@@ -106,7 +106,7 @@ public class CDTSharedImages {
 	/** @since 5.4 */
 	public static final String IMG_OBJS_FRAMEWORKS_FOLDER = "icons/obj16/frameworks.png"; //$NON-NLS-1$
 	public static final String IMG_OBJS_MACROS_FILE= "icons/obj16/macros_file.gif"; //$NON-NLS-1$
-	public static final String IMG_OBJS_LIBRARY_FOLDER=  "icons/obj16/fldr_lib_obj.gif"; // $NON-NLS-1$  //$NON-NLS-1$
+	public static final String IMG_OBJS_LIBRARY_FOLDER=  "icons/obj16/fldr_lib_obj.gif"; //$NON-NLS-1$  //$NON-NLS-1$
 	public static final String IMG_OBJS_ORDER = "icons/obj16/cp_order_obj.gif"; //$NON-NLS-1$
 	public static final String IMG_OBJS_EXCLUSION_FILTER_ATTRIB = "icons/obj16/exclusion_filter_attrib.gif"; //$NON-NLS-1$
 	public static final String IMG_OBJS_SOURCE_ATTACH_ATTRIB = "icons/obj16/source_attach_attrib.gif"; //$NON-NLS-1$
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/ReferenceBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/ReferenceBlock.java
index f5c5bb01e31..55cad28d860 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/ReferenceBlock.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/ReferenceBlock.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2003, 2010 IBM Corporation and others.
+ * Copyright (c) 2003, 2016 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -47,9 +47,9 @@ import org.eclipse.ui.model.WorkbenchLabelProvider;
 @Deprecated
 public class ReferenceBlock extends AbstractCOptionPage {
 
-	private static final String PREFIX = "ReferenceBlock"; // $NON-NLS-1$ //$NON-NLS-1$
-	private static final String LABEL = PREFIX + ".label"; // $NON-NLS-1$ //$NON-NLS-1$
-	private static final String DESC = PREFIX + ".desc"; // $NON-NLS-1$ //$NON-NLS-1$
+	private static final String PREFIX = "ReferenceBlock"; //$NON-NLS-1$ //$NON-NLS-1$
+	private static final String LABEL = PREFIX + ".label"; //$NON-NLS-1$ //$NON-NLS-1$
+	private static final String DESC = PREFIX + ".desc"; //$NON-NLS-1$ //$NON-NLS-1$
 
 	private CheckboxTableViewer referenceProjectsViewer;
 
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/NewConfigurationDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/NewConfigurationDialog.java
index ddaf7e7d89f..f692a955f7e 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/NewConfigurationDialog.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/NewConfigurationDialog.java
@@ -62,8 +62,8 @@ public class NewConfigurationDialog extends Dialog implements INewCfgDialog {
 	protected NewConfigurationDialog(Shell parentShell) {
 		super(parentShell);
 		setShellStyle(getShellStyle()|SWT.RESIZE);
-		newName = ""; // $NON-NLS-1$
-		newDescription = ""; // $NON-NLS-1$
+		newName = ""; //$NON-NLS-1$
+		newDescription = ""; //$NON-NLS-1$
 	}
 
 	@Override
@@ -85,9 +85,9 @@ public class NewConfigurationDialog extends Dialog implements INewCfgDialog {
 	@Override
 	protected void buttonPressed(int buttonId) {
 		if (buttonId == IDialogConstants.OK_ID) {
-			String description = ""; // $NON-NLS-1$
-			String nameAndDescription = ""; // $NON-NLS-1$
-			String baseConfigNameAndDescription = ""; // $NON-NLS-1$
+			String description = ""; //$NON-NLS-1$
+			String nameAndDescription = ""; //$NON-NLS-1$
+			String baseConfigNameAndDescription = ""; //$NON-NLS-1$
 
 			newName = configName.getText().trim();
 			newDescription = configDescription.getText().trim();
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/RenameConfigurationDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/RenameConfigurationDialog.java
index 5e9751f704c..d091f3518ad 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/RenameConfigurationDialog.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/RenameConfigurationDialog.java
@@ -64,7 +64,7 @@ public class RenameConfigurationDialog extends Dialog {
 		setShellStyle(getShellStyle()|SWT.RESIZE);
 		newName = renameConfig.getName();
 		newDescription = renameConfig.getDescription();
-		if(newDescription == null) newDescription = ""; // $NON-NLS-1$
+		if(newDescription == null) newDescription = ""; //$NON-NLS-1$
 		originalName = renameConfig.getName();
 	}
 
diff --git a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UIStringListWidget.java b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UIStringListWidget.java
index ea795146508..4ca842aaed8 100644
--- a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UIStringListWidget.java
+++ b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UIStringListWidget.java
@@ -69,7 +69,7 @@ public class UIStringListWidget extends InputUIElement {
 	@Override
 	public Map<String, String> getValues() {
 		Map<String, String> retMap = new HashMap<String, String>();
-		String itemString = ""; // $NON-NLS-1$
+		String itemString = ""; //$NON-NLS-1$
 		for (int i = 0; i < itemsList.size(); i++) {
 			itemString = itemString + itemsList.get(i) + "|"; //$NON-NLS-1$
 		}
diff --git a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UITextWidget.java b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UITextWidget.java
index 2eb0b4807ff..9e3c81816b2 100644
--- a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UITextWidget.java
+++ b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UITextWidget.java
@@ -72,7 +72,7 @@ public class UITextWidget extends InputUIElement implements ModifyListener {
 	 */
 	public UITextWidget(UIAttributes uiAttribute) {
 		super(uiAttribute);
-		this.textValue = ""; // $NON-NLS-1$
+		this.textValue = ""; //$NON-NLS-1$
 	}
 
 	/**
diff --git a/debug/org.eclipse.cdt.debug.application.tests/src/org/eclipse/cdt/debug/application/tests/StandaloneTest.java b/debug/org.eclipse.cdt.debug.application.tests/src/org/eclipse/cdt/debug/application/tests/StandaloneTest.java
index 5947b4466a6..989efd27b96 100644
--- a/debug/org.eclipse.cdt.debug.application.tests/src/org/eclipse/cdt/debug/application/tests/StandaloneTest.java
+++ b/debug/org.eclipse.cdt.debug.application.tests/src/org/eclipse/cdt/debug/application/tests/StandaloneTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Red Hat, Inc.
+ * Copyright (c) 2015, 2016 Red Hat, Inc. and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -34,7 +34,7 @@ public abstract class StandaloneTest {
 
 		bot = new SWTBot();
 		Utilities.getDefault().buildProject(projectName);
-		final IPath executablePath = Utilities.getDefault().getProjectPath(projectName).append("a.out"); // $NON-NLS-1$
+		final IPath executablePath = Utilities.getDefault().getProjectPath(projectName).append("a.out"); //$NON-NLS-1$
 		bot.waitUntil(new WaitForFileCondition(executablePath));
 
 		bot.waitUntil(Conditions.shellIsActive(DEBUG_NEW_EXECUTABLE_TITLE));
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CEventBreakpoint.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CEventBreakpoint.java
index bb634b9ef45..9cfc33d4328 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CEventBreakpoint.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CEventBreakpoint.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2012 QNX Software Systems and others.
+ * Copyright (c) 2008, 2016 QNX Software Systems and others.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -41,7 +41,7 @@ public class CEventBreakpoint extends CBreakpoint implements ICEventBreakpoint {
 	@Override
 	protected String getMarkerMessage() throws CoreException {
 		// default message, overridden by label provider, which would take care of translation
-		return "Event Breakpoint: " + getEventType(); // $NON-NLS-1$ //$NON-NLS-1$
+		return "Event Breakpoint: " + getEventType(); //$NON-NLS-1$ //$NON-NLS-1$
 	}
 
 	/**
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MICommand.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MICommand.java
index ad49c075fd1..e92cae51d6e 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MICommand.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MICommand.java
@@ -33,7 +33,7 @@ public class MICommand<V extends MIInfo> implements ICommand<V> {
 
     List<Adjustable> fOptions = new ArrayList<>();
     List<Adjustable> fParameters = new ArrayList<>();
-    String fOperation = ""; // $NON-NLS-1$
+    String fOperation = ""; //$NON-NLS-1$
     IDMContext fCtx;
 
     /*
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIDataDisassemble.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIDataDisassemble.java
index 16a0afc81b8..50a9683ec29 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIDataDisassemble.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIDataDisassemble.java
@@ -115,7 +115,7 @@ public class MIDataDisassemble extends MICommand<MIDataDisassembleInfo> {
         if (parameters != null && parameters.length > 0) {
             return "-- " + parameters[0]; //$NON-NLS-1$
         }
-        return ""; // $NON-NLS-1$
+        return ""; //$NON-NLS-1$
     }
 
     @Override
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/VMDelta.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/VMDelta.java
index eeab138ee1c..780f9b5cb8c 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/VMDelta.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/VMDelta.java
@@ -280,7 +280,7 @@ public class VMDelta extends ModelDelta {
 	}
 	
 	private void appendDetail(StringBuilder buf, VMDelta delta, int depth) {
-		String indent = ""; // $NON-NLS-1$
+		String indent = ""; //$NON-NLS-1$
 		for (int i = 0; i < depth; i++) {
 			indent += '\t';
 		}
diff --git a/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerTab.java b/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerTab.java
index bc68ac99eb4..0b7cadb7a8d 100644
--- a/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerTab.java
+++ b/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerTab.java
@@ -464,7 +464,7 @@ public class ContainerTab extends AbstractLaunchConfigurationTab implements
 					.getAttribute(ILaunchConstants.ATTR_IMAGE, (String) null);
 			if (image == null)
 				return false;
-			int index = image.lastIndexOf(':'); // $NON-NLS-1$
+			int index = image.lastIndexOf(':'); //$NON-NLS-1$
 			if (index <= 0)
 				return false;
 			if (connection.hasImage(image.substring(0, index),
diff --git a/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/GdbDebuggerPage.java b/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/GdbDebuggerPage.java
index e349951f0eb..01ad626dfaa 100644
--- a/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/GdbDebuggerPage.java
+++ b/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/GdbDebuggerPage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2015 QNX Software Systems and others.
+ * Copyright (c) 2000, 2016 QNX Software Systems and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -122,7 +122,7 @@ public class GdbDebuggerPage extends AbstractCDebuggerPage implements Observer {
 			setErrorMessage(null);
 			setMessage(null);
 		} else {
-			setErrorMessage(Messages.GDBDebuggerPage0); // $NON-NLS-1$
+			setErrorMessage(Messages.GDBDebuggerPage0); //$NON-NLS-1$
 			setMessage(null);
 		}
 		return valid;
diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CEnvironmentTab.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CEnvironmentTab.java
index 70967c6fca4..71785c17560 100644
--- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CEnvironmentTab.java
+++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CEnvironmentTab.java
@@ -255,7 +255,7 @@ public class CEnvironmentTab extends CLaunchConfigurationTab {
 	}
 
 	public String get() {
-		String result = ""; // $NON-NLS-1$
+		String result = ""; //$NON-NLS-1$
 		Object[] entries = fElements.entrySet().toArray();
 		for (int i = 0; i < entries.length; ++i)
 			result += entries[i].toString() + '\n';
@@ -366,7 +366,7 @@ public class CEnvironmentTab extends CLaunchConfigurationTab {
 	}
 
 	protected void newEntry() {
-		EntryDialog dialog = new EntryDialog("", "", false); // $NON-NLS-1$ // $NON-NLS-2$
+		EntryDialog dialog = new EntryDialog("", "", false); //$NON-NLS-1$ //$NON-NLS-2$
 		if (dialog.open() == Window.OK) {
 			fElements.setProperty(dialog.getName(), dialog.getValue());
 			fVariableList.refresh();
diff --git a/toolchains/arduino/org.eclipse.cdt.arduino.core/src/org/eclipse/cdt/arduino/core/internal/board/ArduinoTool.java b/toolchains/arduino/org.eclipse.cdt.arduino.core/src/org/eclipse/cdt/arduino/core/internal/board/ArduinoTool.java
index f39f030da42..5361b1d7727 100644
--- a/toolchains/arduino/org.eclipse.cdt.arduino.core/src/org/eclipse/cdt/arduino/core/internal/board/ArduinoTool.java
+++ b/toolchains/arduino/org.eclipse.cdt.arduino.core/src/org/eclipse/cdt/arduino/core/internal/board/ArduinoTool.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 QNX Software Systems and others.
+ * Copyright (c) 2015, 2016 QNX Software Systems and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -95,9 +95,9 @@ public class ArduinoTool {
 
 	public Properties getToolProperties() {
 		Properties properties = new Properties();
-		properties.put("runtime.tools." + name + ".path", ArduinoBuildConfiguration.pathString(getInstallPath())); // $NON-NLS-1$ //$NON-NLS-1$//$NON-NLS-2$
+		properties.put("runtime.tools." + name + ".path", ArduinoBuildConfiguration.pathString(getInstallPath())); //$NON-NLS-1$ //$NON-NLS-1$//$NON-NLS-2$
 		properties.put("runtime.tools." + name + '-' + version + ".path", //$NON-NLS-1$//$NON-NLS-2$
-				ArduinoBuildConfiguration.pathString(getInstallPath())); // $NON-NLS-1$
+				ArduinoBuildConfiguration.pathString(getInstallPath())); //$NON-NLS-1$
 		return properties;
 	}