Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Blewitt2016-04-23 10:33:27 -0400
committerAlex Blewitt2016-04-25 17:53:30 -0400
commit12904409a3d93f4ef47fb40c47b44eb6c4ead01b (patch)
treed0ff3ca029709f6c925bcc3f08f9b18e2d9397a4 /build/org.eclipse.cdt.make.core
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 'build/org.eclipse.cdt.make.core')
-rw-r--r--build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeScannerInfo.java4
-rw-r--r--build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/NullMakefile.java2
-rw-r--r--build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/gnu/GNUMakefile.java2
-rw-r--r--build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/util/CCommandDSC.java6
4 files changed, 7 insertions, 7 deletions
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 a1c63bccd0..70fae84ebd 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 caa586b4f0..46102b5107 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 fba86ce886..e847ae0dfb 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 0e8d9cbbf4..3bbd0b9d22 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())) {

Back to the top