From f1627c3e15d2ac4656d0903c2ffc03c323f2c1b3 Mon Sep 17 00:00:00 2001 From: Andrew Gvozdev Date: Thu, 8 Jul 2010 21:55:22 +0000 Subject: [PATCH] Bug 319322: Spelling corrected and duplicate messages removed --- .../tcmodification/ToolChainModificationMessages.properties | 5 +---- .../internal/tcmodification/ToolListModification.java | 6 +++--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ToolChainModificationMessages.properties b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ToolChainModificationMessages.properties index 978dea6756d..783fb269932 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ToolChainModificationMessages.properties +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ToolChainModificationMessages.properties @@ -10,8 +10,5 @@ ############################################################################### FolderInfoModification.0=Toolchain is incompatible with the current configuration ConfigurationModification.0=Builder is incompatible with the current configuration +ToolListModification.ToolIsIncompatible=Tool is incompatible with the current configuration RulesManager.1=Tool-chain modification rules initialization - -ToolListModification.0=Tool is incompatible with the current configuration -ToolListModification.2=Tool is incompatible with the current cnfiguration -ToolListModification.4=Tool is incompatible with the current cnfiguration diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ToolListModification.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ToolListModification.java index 5cb119befec..dfa6482187e 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ToolListModification.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ToolListModification.java @@ -94,7 +94,7 @@ public abstract class ToolListModification implements public CompatibilityStatus getCompatibilityStatus() { return fIsProject ? CompatibilityStatus.OK_COMPATIBILITY_STATUS - : new CompatibilityStatus(IStatus.ERROR, Messages.getString("ToolListModification.0"), null); //$NON-NLS-1$ + : new CompatibilityStatus(IStatus.ERROR, Messages.getString("ToolListModification.ToolIsIncompatible"), null); //$NON-NLS-1$ } public IModificationOperation[] getSupportedOperations() { @@ -300,7 +300,7 @@ public abstract class ToolListModification implements String message; if(!isCompatible()){ severity = IStatus.ERROR; - message = Messages.getString("ToolListModification.2"); //$NON-NLS-1$ + message = Messages.getString("ToolListModification.ToolIsIncompatible"); //$NON-NLS-1$ } else { severity = IStatus.OK; message = ""; //$NON-NLS-1$ @@ -463,7 +463,7 @@ public abstract class ToolListModification implements ConflictSet conflicts; if(!isCompatible()){ severity = IStatus.ERROR; - message = Messages.getString("ToolListModification.4");; //$NON-NLS-1$ + message = Messages.getString("ToolListModification.ToolIsIncompatible"); //$NON-NLS-1$ conflicts = new ConflictSet(fRealTool, fErrComflictMatchList, fStatusInfo.getConflictingTools()); } else { severity = IStatus.OK;