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>

5 files changed, 12 insertions, 12 deletions

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;