mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-06-08 10:16:03 +02:00
Committed the patch from David Daoust that fixes the string externalization warnings
This commit is contained in:
parent
3e9660ea3e
commit
db48cbe5a9
3 changed files with 3 additions and 3 deletions
|
@ -2680,7 +2680,7 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator {
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (generatedSource && !sourceLocation.isAbsolute()) {
|
if (generatedSource && !sourceLocation.isAbsolute()) {
|
||||||
srcName = "./" + relativePath + sourceLocation.lastSegment().toString(); // $NON-NLS-1$
|
srcName = "./" + relativePath + sourceLocation.lastSegment().toString(); //$NON-NLS-1$
|
||||||
} else {
|
} else {
|
||||||
// TODO: Should we use relative paths when possible (e.g., see MbsMacroSupplier.calculateRelPath)
|
// TODO: Should we use relative paths when possible (e.g., see MbsMacroSupplier.calculateRelPath)
|
||||||
srcName = sourceLocation.toString();
|
srcName = sourceLocation.toString();
|
||||||
|
|
|
@ -756,7 +756,7 @@ public class ToolsSettingsBlock extends AbstractCOptionPage {
|
||||||
|
|
||||||
// Build the match name.
|
// Build the match name.
|
||||||
do {
|
do {
|
||||||
catName = catOrTool.getName() + "|" + catName;
|
catName = catOrTool.getName() + "|" + catName; //$NON-NLS-1$
|
||||||
if (catOrTool instanceof ITool) break;
|
if (catOrTool instanceof ITool) break;
|
||||||
else if (catOrTool instanceof IOptionCategory) {
|
else if (catOrTool instanceof IOptionCategory) {
|
||||||
catOrTool = ((IOptionCategory)catOrTool).getOwner();
|
catOrTool = ((IOptionCategory)catOrTool).getOwner();
|
||||||
|
|
|
@ -49,7 +49,7 @@ public class ToolListLabelProvider extends LabelProvider {
|
||||||
img = manager.createImageWithDefault(descriptor);
|
img = manager.createImageWithDefault(descriptor);
|
||||||
if (img == null) {
|
if (img == null) {
|
||||||
// Report error by displaying a warning message
|
// 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;
|
return img;
|
||||||
|
|
Loading…
Add table
Reference in a new issue