diff options
11 files changed, 21 insertions, 17 deletions
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/OptionStringValue.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/OptionStringValue.java index 8d374801d5e..fa8addf6753 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/OptionStringValue.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/OptionStringValue.java @@ -192,6 +192,6 @@ public final class OptionStringValue { } public String toString() { - return new StringBuffer().append("ov:").append(value.toString()).toString(); + return new StringBuffer().append("ov:").append(value.toString()).toString(); //$NON-NLS-1$ } }
\ No newline at end of file diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/BuilderFactory.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/BuilderFactory.java index d6251e60ef9..d58bc9d52aa 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/BuilderFactory.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/BuilderFactory.java @@ -320,8 +320,8 @@ public class BuilderFactory { args.remove(IMakeCommonBuildInfo.BUILD_COMMAND); args.remove(IMakeCommonBuildInfo.BUILD_ARGUMENTS); } else { - args.put(IBuilder.ATTRIBUTE_IGNORE_ERR_CMD, ""); - args.put(IBuilder.ATTRIBUTE_PARALLEL_BUILD_CMD, ""); + args.put(IBuilder.ATTRIBUTE_IGNORE_ERR_CMD, ""); //$NON-NLS-1$ + args.put(IBuilder.ATTRIBUTE_PARALLEL_BUILD_CMD, ""); //$NON-NLS-1$ } } //end adjusting settings diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/CommonBuilder.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/CommonBuilder.java index 2066c6e787f..44e180c0a74 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/CommonBuilder.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/CommonBuilder.java @@ -1322,13 +1322,13 @@ public class CommonBuilder extends ACBuilder { } } else if (result.getCode() == IStatus.ERROR){ StringBuffer buf = new StringBuffer(); - buf.append("Buildfile generation error occured..").append(NEWLINE); + buf.append(ManagedMakeMessages.getString("CommonBuilder.23")).append(NEWLINE); //$NON-NLS-1$ String message = result.getMessage(); if(message != null || message.length() != 0){ buf.append(message).append(NEWLINE); } - buf.append("Build stopped..").append(NEWLINE); + buf.append(ManagedMakeMessages.getString("CommonBuilder.24")).append(NEWLINE); //$NON-NLS-1$ message = buf.toString(); buildStatus.getConsoleMessagesList().add(message); buildStatus.cancelBuild(); diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/PluginResources.properties b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/PluginResources.properties index 5769ef00efa..31ea502a629 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/PluginResources.properties +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/PluginResources.properties @@ -156,5 +156,7 @@ CommonBuilder.16=can not clean programmatically: build workspace path is not the CommonBuilder.12=can not clean programmatically: build workspace path is not folder CommonBuilder.13=can not clean programmatically: build folder is not accessible CommonBuilder.22=Building referenced configurations.. +CommonBuilder.23=Buildfile generation error occured.. +CommonBuilder.24=Build stopped.. MakeBuilder.buildError= ResourceChangeHandler2.0=project build settings update job diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildEntryStorage.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildEntryStorage.java index db6f138a646..9339f96d68a 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildEntryStorage.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildEntryStorage.java @@ -204,7 +204,7 @@ public class BuildEntryStorage extends AbstractEntryStorage { return bsVarsOnly ? new BuildSystemSpecificVariableSubstitutor(ci) - : new SupplierBasedCdtVariableSubstitutor(ci, "", " "); + : new SupplierBasedCdtVariableSubstitutor(ci, "", " "); //$NON-NLS-1$ //$NON-NLS-2$ } private UserEntryInfo[] getUserEntries(int flags, boolean usr, List emptyValuesInfos){ @@ -288,7 +288,7 @@ public class BuildEntryStorage extends AbstractEntryStorage { Path path = new Path(info.getUnresolvedPath()); String projPath; - if(path.segmentCount() != 0 && "..".equals(path.segment(0))){ + if(path.segmentCount() != 0 && "..".equals(path.segment(0))){ //$NON-NLS-1$ projPath = path.removeFirstSegments(1).toString(); } else { StringBuffer buf = new StringBuffer(); @@ -308,7 +308,7 @@ public class BuildEntryStorage extends AbstractEntryStorage { projPath = path.removeFirstSegments(1).toString(); } else { StringBuffer buf = new StringBuffer(); - buf.append("../").append(info.getUnresolvedPath()); + buf.append("../").append(info.getUnresolvedPath()); //$NON-NLS-1$ projPath = buf.toString(); } return new PathInfo(projPath, info.isWorkspacePath(), info.getSubstitutor()); diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildSystemSpecificVariableSubstitutor.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildSystemSpecificVariableSubstitutor.java index bb22e043ece..e44e42be7f3 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildSystemSpecificVariableSubstitutor.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildSystemSpecificVariableSubstitutor.java @@ -36,7 +36,7 @@ public class BuildSystemSpecificVariableSubstitutor extends SupplierBasedCdtVari } public BuildSystemSpecificVariableSubstitutor(IVariableContextInfo contextInfo){ - this(contextInfo, "", " "); + this(contextInfo, "", " "); //$NON-NLS-1$ //$NON-NLS-2$ } public BuildSystemSpecificVariableSubstitutor( diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/ACExclusionFilterEntry.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/ACExclusionFilterEntry.java index cf5b03daa62..2a22b5a627c 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/ACExclusionFilterEntry.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/ACExclusionFilterEntry.java @@ -92,10 +92,10 @@ public abstract class ACExclusionFilterEntry extends ACPathEntry implements ICEx if(exclusionPatterns.length != 0){ StringBuffer buf = new StringBuffer(); buf.append(result); - buf.append(" ; exclude: "); + buf.append(" ; exclude: "); //$NON-NLS-1$ for(int i = 0; i < exclusionPatterns.length; i++){ if(i != 0) - buf.append(", "); + buf.append(", "); //$NON-NLS-1$ buf.append(exclusionPatterns[i].toString()); } result = buf.toString(); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/ACSettingEntry.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/ACSettingEntry.java index d8370a03e5c..440f96ba7c6 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/ACSettingEntry.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/ACSettingEntry.java @@ -120,7 +120,7 @@ public abstract class ACSettingEntry implements ICSettingEntry { StringBuffer buf = new StringBuffer(); buf.append('[').append(LanguageSettingEntriesSerializer.kindToString(getKind())).append(']').append(' '); buf.append(contentsToString()); - buf.append(" ; flags: ").append(LanguageSettingEntriesSerializer.composeFlagsString(getFlags())); + buf.append(" ; flags: ").append(LanguageSettingEntriesSerializer.composeFlagsString(getFlags())); //$NON-NLS-1$ return buf.toString(); } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/CLibraryFileEntry.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/CLibraryFileEntry.java index 48b731ec4cf..2844939a4a0 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/CLibraryFileEntry.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/CLibraryFileEntry.java @@ -127,9 +127,9 @@ public final class CLibraryFileEntry extends ACPathEntry implements if(fSourceAttachmentPath != null){ StringBuffer buf = new StringBuffer(); buf.append(result); - buf.append(" ; srcPath=").append(fSourceAttachmentPath); - buf.append("; srcRoot=").append(fSourceAttachmentRootPath); - buf.append("; srcMapping=").append(fSourceAttachmentPrefixMapping); + buf.append(" ; srcPath=").append(fSourceAttachmentPath); //$NON-NLS-1$ + buf.append("; srcRoot=").append(fSourceAttachmentRootPath); //$NON-NLS-1$ + buf.append("; srcMapping=").append(fSourceAttachmentPrefixMapping); //$NON-NLS-1$ result = buf.toString(); } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/SettingsContext.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/SettingsContext.java index e5aabc2161a..5f567eaecea 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/SettingsContext.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/SettingsContext.java @@ -35,7 +35,7 @@ public final class SettingsContext implements IModificationContext{ IProjectDescription eDes = fEDes; if(eDes == null && create){ if(fProject == null) - throw ExceptionFactory.createCoreException("no project associated with the context"); + throw ExceptionFactory.createCoreException(SettingsModelMessages.getString("SettingsContext.0")); //$NON-NLS-1$ eDes = fProject.getDescription(); } @@ -51,7 +51,7 @@ public final class SettingsContext implements IModificationContext{ if(fEDes == null) fEDes = des; else if(fEDes != des) - throw ExceptionFactory.createCoreException("can not accept the not-context project description"); + throw ExceptionFactory.createCoreException(SettingsModelMessages.getString("SettingsContext.1")); //$NON-NLS-1$ } CompositeWorkspaceRunnable getCompositeWorkspaceRunnable(boolean create){ diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/SettingsModelMessages.properties b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/SettingsModelMessages.properties index c7687a146ea..890256e3495 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/SettingsModelMessages.properties +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/SettingsModelMessages.properties @@ -45,3 +45,5 @@ CExternalSettingsManager.3=writable ref info is requested for the read only conf CfgExportSettingContainerFactory.2=invalid id: project name not specified ExtensionContainerFactory.4=invalid setting provider class specified ExtensionContainerFactory.5=provider element not specified +SettingsContext.0=no project associated with the context +SettingsContext.1=can not accept the not-context project description |