Skip to main content
summaryrefslogtreecommitdiffstats
path: root/launch
diff options
context:
space:
mode:
authorAlex Blewitt2016-04-23 14:33:27 +0000
committerAlex Blewitt2016-04-25 21:53:30 +0000
commit12904409a3d93f4ef47fb40c47b44eb6c4ead01b (patch)
treed0ff3ca029709f6c925bcc3f08f9b18e2d9397a4 /launch
parentb2db3a489c2e367718f93db7060b8e8c0b2c05a2 (diff)
downloadorg.eclipse.cdt-12904409a3d93f4ef47fb40c47b44eb6c4ead01b.tar.gz
org.eclipse.cdt-12904409a3d93f4ef47fb40c47b44eb6c4ead01b.tar.xz
org.eclipse.cdt-12904409a3d93f4ef47fb40c47b44eb6c4ead01b.zip
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>
Diffstat (limited to 'launch')
-rw-r--r--launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerTab.java2
-rw-r--r--launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/GdbDebuggerPage.java4
-rw-r--r--launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CEnvironmentTab.java4
3 files changed, 5 insertions, 5 deletions
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();

Back to the top