From 116d4e034bbcf0a6bb8642817bbf9d820b79c0c6 Mon Sep 17 00:00:00 2001 From: David Inglis Date: Tue, 25 May 2004 18:46:56 +0000 Subject: [PATCH] small fix to getting resource strings... --- .../cdt/internal/core/model/PathEntryManager.java | 10 +++++----- .../cdt/internal/core/CCorePluginResources.properties | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/PathEntryManager.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/PathEntryManager.java index f79faaa610b..07a663b6ca6 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/PathEntryManager.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/PathEntryManager.java @@ -975,7 +975,7 @@ public class PathEntryManager implements IPathEntryStoreListener, IElementChange continue; } if (entry != otherEntry && otherEntry.equals(entry)) { - StringBuffer errMesg = new StringBuffer(CCorePlugin.getResourceBundle().getString("CoreModel.PathEntry.DuplicateEntry")); //$NON-NLS-1$ + StringBuffer errMesg = new StringBuffer(CCorePlugin.getResourceString("CoreModel.PathEntry.DuplicateEntry")); //$NON-NLS-1$ errMesg.append(':').append(entry.toString()); return new CModelStatus(ICModelStatusConstants.INVALID_PATHENTRY, errMesg.toString()); } @@ -1005,17 +1005,17 @@ public class PathEntryManager implements IPathEntryStoreListener, IElementChange String exclusionPattern = entryPath.removeFirstSegments(otherPath.segmentCount()).segment(0); if (CoreModelUtil.isExcluded(entryPath, exclusionPatterns)) { - StringBuffer errMesg = new StringBuffer(CCorePlugin.getResourceBundle().getString("CoreModel.PathEntry.NestedEntry")); //$NON-NLS-1$ + StringBuffer errMesg = new StringBuffer(CCorePlugin.getResourceString("CoreModel.PathEntry.NestedEntry")); //$NON-NLS-1$ errMesg.append(':').append(entry.toString()); return new CModelStatus(ICModelStatusConstants.INVALID_PATHENTRY, errMesg.toString()); } else { if (otherKind == IPathEntry.CDT_SOURCE) { exclusionPattern += '/'; - StringBuffer errMesg = new StringBuffer(CCorePlugin.getResourceBundle().getString("CoreModel.PathEntry.NestedEntry")); //$NON-NLS-1$ + StringBuffer errMesg = new StringBuffer(CCorePlugin.getResourceString("CoreModel.PathEntry.NestedEntry")); //$NON-NLS-1$ errMesg.append(':').append(entry.toString()); return new CModelStatus(ICModelStatusConstants.INVALID_PATHENTRY, errMesg.toString()); } else { - StringBuffer errMesg = new StringBuffer(CCorePlugin.getResourceBundle().getString("CoreModel.PathEntry.NestedEntry")); //$NON-NLS-1$ + StringBuffer errMesg = new StringBuffer(CCorePlugin.getResourceString("CoreModel.PathEntry.NestedEntry")); //$NON-NLS-1$ errMesg.append(':').append(entry.toString()); return new CModelStatus(ICModelStatusConstants.INVALID_PATHENTRY, errMesg.toString()); //$NON-NLS-1$ } @@ -1032,7 +1032,7 @@ public class PathEntryManager implements IPathEntryStoreListener, IElementChange public ICModelStatus validatePathEntry(ICProject cProject, IPathEntry entry, boolean checkSourceAttachment, boolean recurseInContainers){ IProject project = cProject.getProject(); StringBuffer sb = new StringBuffer(); - sb.append(CCorePlugin.getResourceBundle().getString("CoreModel.PathEntry.InvalidPathEntry")); //$NON-NLS-1$ + sb.append(CCorePlugin.getResourceString("CoreModel.PathEntry.InvalidPathEntry")); //$NON-NLS-1$ sb.append(':').append(entry.toString()); String entryMesg = sb.toString(); switch(entry.getEntryKind()) { diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CCorePluginResources.properties b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CCorePluginResources.properties index db9cb1cf2b1..739cd300cde 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CCorePluginResources.properties +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CCorePluginResources.properties @@ -15,7 +15,7 @@ CoreModel.NullBinaryParser.Not_binary_file=not a binary file CoreModel.NullBinaryParser.Null_Format=Null Format CoreModel.PathEntry.IllegalContainerPath= Illegal container entry -CoreModel.PathEntry.DuplicatedEntry= Duplicate path entries +CoreModel.PathEntry.DuplicateEntry= Duplicate path entries CoreModel.PathEntry.NestedEntry= Nested path entries CoreModel.PathEntry.InvalidPathEntry= Invalid path