From db48cbe5a998fcb1b21c550018de9959f570274c Mon Sep 17 00:00:00 2001 From: Mikhail Sennikovsky Date: Wed, 15 Jun 2005 15:24:44 +0000 Subject: [PATCH] Committed the patch from David Daoust that fixes the string externalization warnings --- .../cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java | 2 +- .../cdt/managedbuilder/internal/ui/ToolsSettingsBlock.java | 2 +- .../cdt/managedbuilder/ui/properties/ToolListLabelProvider.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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 1ee2a17d853..d2220a588d3 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 @@ -2680,7 +2680,7 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator { } } else { if (generatedSource && !sourceLocation.isAbsolute()) { - srcName = "./" + relativePath + sourceLocation.lastSegment().toString(); // $NON-NLS-1$ + srcName = "./" + relativePath + sourceLocation.lastSegment().toString(); //$NON-NLS-1$ } else { // TODO: Should we use relative paths when possible (e.g., see MbsMacroSupplier.calculateRelPath) srcName = sourceLocation.toString(); diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/ToolsSettingsBlock.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/ToolsSettingsBlock.java index b18c1926970..e0e923d25bc 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/ToolsSettingsBlock.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/ToolsSettingsBlock.java @@ -756,7 +756,7 @@ public class ToolsSettingsBlock extends AbstractCOptionPage { // Build the match name. do { - catName = catOrTool.getName() + "|" + catName; + catName = catOrTool.getName() + "|" + catName; //$NON-NLS-1$ if (catOrTool instanceof ITool) break; else if (catOrTool instanceof IOptionCategory) { catOrTool = ((IOptionCategory)catOrTool).getOwner(); diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolListLabelProvider.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolListLabelProvider.java index 2217101c505..ceba229bfc1 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolListLabelProvider.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolListLabelProvider.java @@ -49,7 +49,7 @@ public class ToolListLabelProvider extends LabelProvider { img = manager.createImageWithDefault(descriptor); if (img == null) { // Report error by displaying a warning message - System.err.println("Couldn't create image from URL \"" + url + "\", to display icon for Tool Options." ); //$NON-NLS-1$ + System.err.println("Couldn't create image from URL \"" + url + "\", to display icon for Tool Options." ); //$NON-NLS-1$ //$NON-NLS-2$ } } return img;