mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

small fix to getting resource strings...

Browse source
This commit is contained in:
David Inglis 2004-05-25 18:46:56 +00:00
parent c0ba9bebfc
commit 116d4e034b
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/PathEntryManager.java
View file

@ -975,7 +975,7 @@ public class PathEntryManager implements IPathEntryStoreListener, IElementChange
continue; continue;
} }
if (entry != otherEntry && otherEntry.equals(entry)) { 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()); errMesg.append(':').append(entry.toString());
return new CModelStatus(ICModelStatusConstants.INVALID_PATHENTRY, errMesg.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); String exclusionPattern = entryPath.removeFirstSegments(otherPath.segmentCount()).segment(0);
if (CoreModelUtil.isExcluded(entryPath, exclusionPatterns)) { 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()); errMesg.append(':').append(entry.toString());
return new CModelStatus(ICModelStatusConstants.INVALID_PATHENTRY, errMesg.toString()); return new CModelStatus(ICModelStatusConstants.INVALID_PATHENTRY, errMesg.toString());
} else { } else {
if (otherKind == IPathEntry.CDT_SOURCE) { if (otherKind == IPathEntry.CDT_SOURCE) {
exclusionPattern += '/'; 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()); errMesg.append(':').append(entry.toString());
return new CModelStatus(ICModelStatusConstants.INVALID_PATHENTRY, errMesg.toString()); return new CModelStatus(ICModelStatusConstants.INVALID_PATHENTRY, errMesg.toString());
} else { } 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()); errMesg.append(':').append(entry.toString());
return new CModelStatus(ICModelStatusConstants.INVALID_PATHENTRY, errMesg.toString()); //$NON-NLS-1$ 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){ public ICModelStatus validatePathEntry(ICProject cProject, IPathEntry entry, boolean checkSourceAttachment, boolean recurseInContainers){
IProject project = cProject.getProject(); IProject project = cProject.getProject();
StringBuffer sb = new StringBuffer(); 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()); sb.append(':').append(entry.toString());
String entryMesg = sb.toString(); String entryMesg = sb.toString();
switch(entry.getEntryKind()) { switch(entry.getEntryKind()) {

2
core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CCorePluginResources.properties
View file

@ -15,7 +15,7 @@ CoreModel.NullBinaryParser.Not_binary_file=not a binary file
CoreModel.NullBinaryParser.Null_Format=Null Format CoreModel.NullBinaryParser.Null_Format=Null Format
CoreModel.PathEntry.IllegalContainerPath= Illegal container entry 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.NestedEntry= Nested path entries
CoreModel.PathEntry.InvalidPathEntry= Invalid path CoreModel.PathEntry.InvalidPathEntry= Invalid path