diff --git a/core/org.eclipse.cdt.core/ChangeLog b/core/org.eclipse.cdt.core/ChangeLog index 5dc532031d8..f0d1bbf8118 100644 --- a/core/org.eclipse.cdt.core/ChangeLog +++ b/core/org.eclipse.cdt.core/ChangeLog @@ -1,3 +1,19 @@ +2004-02-10 Tanya Wolff + Start of Fix for 51192: The defect is for all org.eclipse.cdt.core strings, but each package + should be handled by respective component owners. + + These files have strings extracted; the other + changed files have only strings commented out with //$NON-NLS-1$ + See defect 51192 for how these strings were extracted with the + "Find strings to externalize" wizard. + + model/org.eclipse.cdt.internal.core.model/ArchiveContainer.java + model/org.eclipse.cdt.internal.core.model/BinaryContainer.java + model/org.eclipse.cdt.internal.core.model/BinaryRunner.java + model/org.eclipse.cdt.internal.core.model/CModelBuilder.java + model/org.eclipse.cdt.internal.core.model/CModelStatus.java + model/org.eclipse.cdt.internal.core.model/NullBinaryParser.java + 2004-02-10 Vladimir Hirsl Fix for PR# 51373: NPE when trying to instantiate a CBuildConsole with non null id diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/CoreModel.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/CoreModel.java index adfc62396e9..a17011f0b5a 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/CoreModel.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/CoreModel.java @@ -31,7 +31,7 @@ public class CoreModel { private static CoreModel cmodel = null; private static CModelManager manager = null; - public final static String CORE_MODEL_ID = CCorePlugin.PLUGIN_ID + ".coremodel"; + public final static String CORE_MODEL_ID = CCorePlugin.PLUGIN_ID + ".coremodel"; //$NON-NLS-1$ /** * Creates an ICElement form and IPath. diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ArchiveContainer.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ArchiveContainer.java index 6b5fcfdcb39..0b005544190 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ArchiveContainer.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ArchiveContainer.java @@ -6,7 +6,7 @@ package org.eclipse.cdt.internal.core.model; */ import java.util.Map; - +import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.IArchive; import org.eclipse.cdt.core.model.IArchiveContainer; @@ -17,7 +17,7 @@ import org.eclipse.core.runtime.IProgressMonitor; public class ArchiveContainer extends Openable implements IArchiveContainer { public ArchiveContainer (CProject cProject) { - super (cProject, null, "Archives", CElement.C_VCONTAINER); + super (cProject, null, CCorePlugin.getResourceString("CoreModel.ArchiveContainer.Archives"), CElement.C_VCONTAINER); //$NON-NLS-1$ } public IArchive[] getArchives() { diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Binary.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Binary.java index b9b3358cab4..fd7c52e57b6 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Binary.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Binary.java @@ -82,7 +82,7 @@ public class Binary extends Openable implements IBinary { cpu = ((IBinaryObject)getBinaryFile()).getCPU(); } } - return (cpu == null ? "" : cpu); + return (cpu == null ? "" : cpu); //$NON-NLS-1$ } public String[] getNeededSharedLibs() { @@ -127,7 +127,7 @@ public class Binary extends Openable implements IBinary { soname = ((IBinaryShared)getBinaryFile()).getSoName(); } } - return (soname == null ? "" : soname); + return (soname == null ? "" : soname); //$NON-NLS-1$ } public boolean isLittleEndian() { diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryContainer.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryContainer.java index 6e446365fb8..2f15e1cfb3c 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryContainer.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryContainer.java @@ -6,7 +6,7 @@ package org.eclipse.cdt.internal.core.model; */ import java.util.Map; - +import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.IBinary; import org.eclipse.cdt.core.model.IBinaryContainer; @@ -17,7 +17,7 @@ import org.eclipse.core.runtime.IProgressMonitor; public class BinaryContainer extends Openable implements IBinaryContainer { public BinaryContainer (CProject cProject) { - super (cProject, null, "Binaries", CElement.C_VCONTAINER); + super (cProject, null, CCorePlugin.getResourceString("CoreModel.BinaryContainer.Binaries"), CElement.C_VCONTAINER); //$NON-NLS-1$ } public IBinary[] getBinaries() { diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryElement.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryElement.java index 812052876e0..0b77437a19c 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryElement.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryElement.java @@ -80,7 +80,7 @@ public class BinaryElement extends CElement implements IBinaryElement, ISourceMa throw new CModelException(e, ICModelStatusConstants.IO_EXCEPTION); } } - return ""; + return ""; //$NON-NLS-1$ } /* (non-Javadoc) @@ -115,7 +115,7 @@ public class BinaryElement extends CElement implements IBinaryElement, ISourceMa } else { // TODO-model: handle non-absolute paths when finding source files // ??? assert() - path = new Path(""); + path = new Path(""); //$NON-NLS-1$ } // Fall back to the project sourcemapper. if (tu == null) { diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryRunner.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryRunner.java index beb98c8aeb4..3f1cefba23f 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryRunner.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryRunner.java @@ -14,6 +14,7 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IResourceVisitor; import org.eclipse.core.runtime.CoreException; +import org.eclipse.cdt.core.CCorePlugin; public class BinaryRunner { IProject project; @@ -52,7 +53,7 @@ public class BinaryRunner { } } - }, "Binary Search Thread"); + }, CCorePlugin.getResourceString("CoreModel.BinaryRunner.Binary_Search_Thread")); //$NON-NLS-1$ runner.start(); } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryVariable.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryVariable.java index 668be02a81b..5fd8f5978f0 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryVariable.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryVariable.java @@ -21,7 +21,7 @@ public class BinaryVariable extends BinaryElement implements IVariable { */ public String getInitializer() { // TODO Auto-generated method stub - return ""; + return ""; //$NON-NLS-1$ } /* (non-Javadoc) @@ -29,7 +29,7 @@ public class BinaryVariable extends BinaryElement implements IVariable { */ public String getTypeName() { // TODO Auto-generated method stub - return ""; + return ""; //$NON-NLS-1$ } /* (non-Javadoc) diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CElement.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CElement.java index 2a37a7728fd..7ad9465b021 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CElement.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CElement.java @@ -215,44 +215,44 @@ public abstract class CElement extends PlatformObject implements ICElement { } public String toDebugString() { - return getElementName() + " " + getTypeString(getElementType()); + return getElementName() + " " + getTypeString(getElementType()); //$NON-NLS-1$ } // util public static String getTypeString(int type) { switch (type) { case C_MODEL: - return "CMODEL"; + return "CMODEL"; //$NON-NLS-1$ case C_PROJECT: - return "CPROJECT"; + return "CPROJECT"; //$NON-NLS-1$ case C_CCONTAINER: - return "CCONTAINER"; + return "CCONTAINER"; //$NON-NLS-1$ case C_UNIT: - return "TRANSLATION_UNIT"; + return "TRANSLATION_UNIT"; //$NON-NLS-1$ case C_FUNCTION: - return "C_FUNCTION"; + return "C_FUNCTION"; //$NON-NLS-1$ case C_FUNCTION_DECLARATION: - return "C_FUNCTION_DECLARATION"; + return "C_FUNCTION_DECLARATION"; //$NON-NLS-1$ case C_VARIABLE: - return "C_VARIABLE"; + return "C_VARIABLE"; //$NON-NLS-1$ case C_VARIABLE_DECLARATION: - return "C_VARIABLE_DECLARATION"; + return "C_VARIABLE_DECLARATION"; //$NON-NLS-1$ case C_INCLUDE: - return "C_INCLUDE"; + return "C_INCLUDE"; //$NON-NLS-1$ case C_MACRO: - return "C_MACRO"; + return "C_MACRO"; //$NON-NLS-1$ case C_STRUCT: - return "C_STRUCT"; + return "C_STRUCT"; //$NON-NLS-1$ case C_CLASS: - return "C_CLASS"; + return "C_CLASS"; //$NON-NLS-1$ case C_UNION: - return "C_UNION"; + return "C_UNION"; //$NON-NLS-1$ case C_FIELD: - return "C_FIELD"; + return "C_FIELD"; //$NON-NLS-1$ case C_METHOD: - return "C_METHOD"; + return "C_METHOD"; //$NON-NLS-1$ default: - return "UNKNOWN"; + return "UNKNOWN"; //$NON-NLS-1$ } } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelBuilder.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelBuilder.java index cd1bec8a577..80cce3ed489 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelBuilder.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelBuilder.java @@ -78,7 +78,7 @@ public class CModelBuilder { { IProject currentProject = null; boolean hasCppNature = true; - String code = ""; + String code = ""; //$NON-NLS-1$ // get the current project if (translationUnit != null && translationUnit.getCProject() != null) { @@ -137,11 +137,11 @@ public class CModelBuilder { } catch( ParserFactoryError pfe ) { - throw new ParserException( "Parser/Scanner construction failure."); + throw new ParserException( CCorePlugin.getResourceString("CModelBuilder.Parser_Construction_Failure")); //$NON-NLS-1$ } // call parse if( ! parser.parse() && throwExceptionOnError ) - throw new ParserException("Parse failure"); + throw new ParserException(CCorePlugin.getResourceString("CModelBuilder.Parse_Failure")); //$NON-NLS-1$ return quickParseCallback.getCompilationUnit(); } @@ -154,7 +154,7 @@ public class CModelBuilder { catch( ParserException e ) { - Util.debugLog( "Parse Exception in CModelBuilder", IDebugLogConstants.MODEL ); + Util.debugLog( "Parse Exception in CModelBuilder", IDebugLogConstants.MODEL ); //$NON-NLS-1$ //e.printStackTrace(); } long startTime = System.currentTimeMillis(); @@ -164,7 +164,7 @@ public class CModelBuilder { } catch( NullPointerException npe ) { - Util.debugLog( "NullPointer exception in CModelBuilder", IDebugLogConstants.MODEL); + Util.debugLog( "NullPointer exception in CModelBuilder", IDebugLogConstants.MODEL); //$NON-NLS-1$ //npe.printStackTrace(); } @@ -343,7 +343,7 @@ public class CModelBuilder { private Namespace createNamespace(Parent parent, IASTNamespaceDefinition nsDef){ // create element - String type = "namespace"; + String type = "namespace"; //$NON-NLS-1$ String nsName = (nsDef.getName() == null ) ? "" : nsDef.getName().toString(); @@ -362,7 +362,7 @@ public class CModelBuilder { private Enumeration createEnumeration(Parent parent, IASTEnumerationSpecifier enumSpecifier){ // create element - String type = "enum"; + String type = "enum"; //$NON-NLS-1$ String enumName = (enumSpecifier.getName() == null ) ? "" : enumSpecifier.getName().toString(); @@ -407,8 +407,8 @@ public class CModelBuilder { private Structure createClass(Parent parent, IASTClassSpecifier classSpecifier, boolean isTemplate){ // create element - String className = ""; - String type = ""; + String className = ""; //$NON-NLS-1$ + String type = ""; //$NON-NLS-1$ int kind = ICElement.C_CLASS; ASTClassKind classkind = classSpecifier.getClassKind(); if(classkind == ASTClassKind.CLASS){ @@ -416,7 +416,7 @@ public class CModelBuilder { kind = ICElement.C_CLASS; else kind = ICElement.C_TEMPLATE_CLASS; - type = "class"; + type = "class"; //$NON-NLS-1$ className = (classSpecifier.getName() == null ) ? "" : classSpecifier.getName().toString(); @@ -426,7 +426,7 @@ public class CModelBuilder { kind = ICElement.C_STRUCT; else kind = ICElement.C_TEMPLATE_STRUCT; - type = "struct"; + type = "struct"; //$NON-NLS-1$ className = (classSpecifier.getName() == null ) ? "" : classSpecifier.getName().toString(); @@ -436,7 +436,7 @@ public class CModelBuilder { kind = ICElement.C_UNION; else kind = ICElement.C_TEMPLATE_UNION; - type = "union"; + type = "union"; //$NON-NLS-1$ className = (classSpecifier.getName() == null ) ? "" : classSpecifier.getName().toString(); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelManager.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelManager.java index 8121b7caff6..f072f1991b9 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelManager.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelManager.java @@ -111,9 +111,9 @@ public class CModelManager implements IResourceChangeListener { */ private HashMap sourceMappers = new HashMap(); - public static final String [] sourceExtensions = {"c", "cxx", "cc", "C", "cpp"}; + public static final String [] sourceExtensions = {"c", "cxx", "cc", "C", "cpp"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ - public static final String [] headerExtensions = {"h", "hh", "hpp", "H"}; + public static final String [] headerExtensions = {"h", "hh", "hpp", "H"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ public static final IWorkingCopy[] NoWorkingCopy = new IWorkingCopy[0]; diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelStatus.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelStatus.java index 274501145d3..260d04c5220 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelStatus.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelStatus.java @@ -44,7 +44,7 @@ public class CModelStatus extends Status implements ICModelStatus, ICModelStatus /** * Singleton OK object */ - public static final ICModelStatus VERIFIED_OK = new CModelStatus(OK, OK, org.eclipse.cdt.internal.core.Util.bind("status.OK"));; + public static final ICModelStatus VERIFIED_OK = new CModelStatus(OK, OK, org.eclipse.cdt.internal.core.Util.bind("status.OK"));; //$NON-NLS-1$ /** * Constructs an C model status with no corresponding elements. @@ -157,7 +157,7 @@ public class CModelStatus extends Status implements ICModelStatus, ICModelStatus * Returns the message that is relevant to the code of this status. */ public String getMessage() { - return "Error in C Plugin"; + return CCorePlugin.getResourceString("CoreModel.CModelStatus.Error_in_CPlugin"); //$NON-NLS-1$ } /** * @see IOperationStatus diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CPathEntry.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CPathEntry.java index 2003955ece0..8d0ea5aed0f 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CPathEntry.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CPathEntry.java @@ -82,7 +82,7 @@ public class CPathEntry implements ICPathEntry { switch (kind) { case ICPathEntry.CDT_PROJECT : - return "prj"; + return "prj"; //$NON-NLS-1$ case ICPathEntry.CDT_SOURCE : return "src"; //$NON-NLS-1$ case ICPathEntry.CDT_LIBRARY : diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CProject.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CProject.java index d9882bf2974..e4622607d26 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CProject.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CProject.java @@ -491,7 +491,7 @@ public class CProject extends CContainer implements ICProject { default : { - ICModelStatus status = new CModelStatus(ICModelStatus.ERROR, "CPathEntry: unknown kind (" + kindAttr + ")"); //$NON-NLS-1$ + ICModelStatus status = new CModelStatus(ICModelStatus.ERROR, "CPathEntry: unknown kind (" + kindAttr + ")"); //$NON-NLS-1$ //$NON-NLS-2$ throw new CModelException(status); } } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Enumerator.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Enumerator.java index bd3a8c5b3df..b72cf36d3d9 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Enumerator.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Enumerator.java @@ -15,7 +15,7 @@ import org.eclipse.cdt.core.model.IEnumerator; ***********************************************************************/ public class Enumerator extends SourceManipulation implements IEnumerator{ - String constantExpression = ""; + String constantExpression = ""; //$NON-NLS-1$ public Enumerator(ICElement parent, String name) { super(parent, name, CElement.C_ENUMERATOR); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/FieldInfo.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/FieldInfo.java index 52e4b4c63d1..5776a9b326d 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/FieldInfo.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/FieldInfo.java @@ -15,7 +15,7 @@ import org.eclipse.cdt.core.parser.ast.ASTAccessVisibility; public class FieldInfo extends SourceManipulationInfo { - String typeStr = ""; + String typeStr = ""; //$NON-NLS-1$ boolean isConst = false; boolean isVolatile = false; boolean isMutable = false; diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/FunctionDeclaration.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/FunctionDeclaration.java index 6e0db36083f..66d24080d41 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/FunctionDeclaration.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/FunctionDeclaration.java @@ -30,7 +30,7 @@ public class FunctionDeclaration extends SourceManipulation implements IFunction if (returnType != null) return returnType; else - return ""; + return ""; //$NON-NLS-1$ } public void setReturnType(String type){ @@ -53,9 +53,9 @@ public class FunctionDeclaration extends SourceManipulation implements IFunction StringBuffer sig = new StringBuffer(getElementName()); sig.append(getParameterClause()); if(isConst()) - sig.append(" const"); + sig.append(" const"); //$NON-NLS-1$ if(isVolatile()) - sig.append(" volatile"); + sig.append(" volatile"); //$NON-NLS-1$ return sig.toString(); } @@ -63,24 +63,24 @@ public class FunctionDeclaration extends SourceManipulation implements IFunction StringBuffer sig = new StringBuffer(); if(getNumberOfParameters() > 0){ - sig.append("("); + sig.append("("); //$NON-NLS-1$ String[] paramTypes = getParameterTypes(); int i = 0; sig.append(paramTypes[i++]); while (i < paramTypes.length){ - sig.append(", "); + sig.append(", "); //$NON-NLS-1$ sig.append(paramTypes[i++]); } - sig.append(")"); + sig.append(")"); //$NON-NLS-1$ } else{ - sig.append("()"); + sig.append("()"); //$NON-NLS-1$ } return sig.toString(); } public String getParameterInitializer(int pos) { - return ""; + return ""; //$NON-NLS-1$ } public String[] getExceptions(){ diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/FunctionTemplate.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/FunctionTemplate.java index ad2f99bae97..57158f9fa72 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/FunctionTemplate.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/FunctionTemplate.java @@ -61,7 +61,7 @@ public class FunctionTemplate extends FunctionDeclaration implements ITemplate{ public String getTemplateSignature() { StringBuffer sig = new StringBuffer(getElementName()); if(getNumberOfTemplateParameters() > 0){ - sig.append("<"); + sig.append("<"); //$NON-NLS-1$ String[] paramTypes = getTemplateParameterTypes(); int i = 0; sig.append(paramTypes[i++]); @@ -69,19 +69,19 @@ public class FunctionTemplate extends FunctionDeclaration implements ITemplate{ sig.append(", "); sig.append(paramTypes[i++]); } - sig.append(">"); + sig.append(">"); //$NON-NLS-1$ } else{ - sig.append("<>"); + sig.append("<>"); //$NON-NLS-1$ } sig.append(this.getParameterClause()); if(isConst()) - sig.append(" const"); + sig.append(" const"); //$NON-NLS-1$ if(isVolatile()) - sig.append(" volatile"); + sig.append(" volatile"); //$NON-NLS-1$ if((this.getReturnType() != null) && (this.getReturnType().length() > 0)){ - sig.append(" : "); + sig.append(" : "); //$NON-NLS-1$ sig.append(this.getReturnType()); } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Macro.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Macro.java index 7c5ca6fae54..8570ed04640 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Macro.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Macro.java @@ -15,11 +15,11 @@ public class Macro extends SourceManipulation implements IMacro { } public String getIdentifierList() { - return ""; + return ""; //$NON-NLS-1$ } public String getTokenSequence() { - return ""; + return ""; //$NON-NLS-1$ } protected CElementInfo createElementInfo () { diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/MethodDeclaration.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/MethodDeclaration.java index f54ac6c7c6e..368bf635d9f 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/MethodDeclaration.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/MethodDeclaration.java @@ -38,7 +38,7 @@ public class MethodDeclaration extends FunctionDeclaration implements IMethodDec public boolean isDestructor() { // is not implemented in the parser's quick mode //return isDestructor; - return getElementName().startsWith("~"); + return getElementName().startsWith("~"); //$NON-NLS-1$ } public void setConstructor(boolean isConstructor) { @@ -50,7 +50,7 @@ public class MethodDeclaration extends FunctionDeclaration implements IMethodDec } public boolean isOperator(){ - return getElementName().startsWith("operator"); + return getElementName().startsWith("operator"); //$NON-NLS-1$ } public boolean isPureVirtual(){ diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/MethodTemplate.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/MethodTemplate.java index a4b3a9020c8..1309f098d68 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/MethodTemplate.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/MethodTemplate.java @@ -62,27 +62,27 @@ public class MethodTemplate extends MethodDeclaration implements ITemplate{ public String getTemplateSignature() { StringBuffer sig = new StringBuffer(getElementName()); if(getNumberOfTemplateParameters() > 0){ - sig.append("<"); + sig.append("<"); //$NON-NLS-1$ String[] paramTypes = getTemplateParameterTypes(); int i = 0; sig.append(paramTypes[i++]); while (i < paramTypes.length){ - sig.append(", "); + sig.append(", "); //$NON-NLS-1$ sig.append(paramTypes[i++]); } - sig.append(">"); + sig.append(">"); //$NON-NLS-1$ } else{ - sig.append("<>"); + sig.append("<>"); //$NON-NLS-1$ } sig.append(this.getParameterClause()); if(isConst()) - sig.append(" const"); + sig.append(" const"); //$NON-NLS-1$ if(isVolatile()) - sig.append(" volatile"); + sig.append(" volatile"); //$NON-NLS-1$ if((this.getReturnType() != null) && (this.getReturnType().length() > 0)){ - sig.append(" : "); + sig.append(" : "); //$NON-NLS-1$ sig.append(this.getReturnType()); } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Namespace.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Namespace.java index 5a32725aa16..ad70e2bb909 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Namespace.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Namespace.java @@ -16,7 +16,7 @@ import org.eclipse.cdt.core.model.INamespace; public class Namespace extends SourceManipulation implements INamespace{ - String typeName = ""; + String typeName = ""; //$NON-NLS-1$ public Namespace(ICElement parent, String name) { super(parent, name, CElement.C_NAMESPACE); } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/NullBinaryParser.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/NullBinaryParser.java index cf4c4586f09..b4af49aefaf 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/NullBinaryParser.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/NullBinaryParser.java @@ -6,7 +6,7 @@ package org.eclipse.cdt.internal.core.model; */ import java.io.IOException; - +import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.IBinaryParser; import org.eclipse.core.runtime.IPath; @@ -18,14 +18,14 @@ public class NullBinaryParser implements IBinaryParser { * @see org.eclipse.cdt.core.IBinaryParser#getBinary(org.eclipse.core.runtime.IPath) */ public IBinaryFile getBinary(IPath path) throws IOException { - throw new IOException("not a binary file"); + throw new IOException(CCorePlugin.getResourceString("CoreModel.NullBinaryParser.Not_binary_file")); //$NON-NLS-1$ } /* (non-Javadoc) * @see org.eclipse.cdt.core.IBinaryParser#getFormat() */ public String getFormat() { - return "Null Format"; + return CCorePlugin.getResourceString("CoreModel.NullBinaryParser.Null_Format"); //$NON-NLS-1$ } /* (non-Javadoc) diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/SourceManipulationInfo.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/SourceManipulationInfo.java index 02ac28e2727..2cb4874e1c0 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/SourceManipulationInfo.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/SourceManipulationInfo.java @@ -56,7 +56,7 @@ class SourceManipulationInfo extends CElementInfo { throw new CModelException(e, ICModelStatusConstants.IO_EXCEPTION); } } - return ""; + return ""; //$NON-NLS-1$ } /** diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/StructureInfo.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/StructureInfo.java index e50ba53ac5b..2e7644e2a5a 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/StructureInfo.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/StructureInfo.java @@ -18,11 +18,11 @@ public class StructureInfo extends VariableInfo { super(element); if (element.getElementType() == ICElement.C_CLASS) - this.setTypeName("class"); + this.setTypeName("class"); //$NON-NLS-1$ else if (element.getElementType() == ICElement.C_UNION) - this.setTypeName("union"); + this.setTypeName("union"); //$NON-NLS-1$ else - this.setTypeName("struct"); + this.setTypeName("struct"); //$NON-NLS-1$ } public boolean isUnion() { diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/StructureTemplate.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/StructureTemplate.java index dd6d387d411..a99967b7840 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/StructureTemplate.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/StructureTemplate.java @@ -52,18 +52,18 @@ public class StructureTemplate extends Structure implements ITemplate{ public String getTemplateSignature() { StringBuffer sig = new StringBuffer(getElementName()); if(getNumberOfTemplateParameters() > 0){ - sig.append("<"); + sig.append("<"); //$NON-NLS-1$ String[] paramTypes = getTemplateParameterTypes(); int i = 0; sig.append(paramTypes[i++]); while (i < paramTypes.length){ - sig.append(", "); + sig.append(", "); //$NON-NLS-1$ sig.append(paramTypes[i++]); } - sig.append(">"); + sig.append(">"); //$NON-NLS-1$ } else{ - sig.append("<>"); + sig.append("<>"); //$NON-NLS-1$ } return sig.toString(); } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/TypeDef.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/TypeDef.java index 2e3b1a59184..cb4684baa87 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/TypeDef.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/TypeDef.java @@ -16,7 +16,7 @@ import org.eclipse.cdt.core.model.ITypeDef; public class TypeDef extends SourceManipulation implements ITypeDef{ - String typeName= ""; + String typeName= ""; //$NON-NLS-1$ public TypeDef(ICElement parent, String name) { super(parent, name, CElement.C_TYPEDEF); } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Util.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Util.java index 01ec0355b85..35ffc4d1c3b 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Util.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Util.java @@ -193,13 +193,13 @@ public class Util implements ICLogConstants { if ( CCorePlugin.getDefault().isDebugging() && isActive(client)) { // Time stamp if(addTimeStamp) - message = MessageFormat.format( "[{0}] {1}", new Object[] { new Long( System.currentTimeMillis() ), message } ); + message = MessageFormat.format( "[{0}] {1}", new Object[] { new Long( System.currentTimeMillis() ), message } ); //$NON-NLS-1$ while (message.length() > 100) { String partial = message.substring(0, 100); message = message.substring(100); - System.out.println(partial + "\\"); + System.out.println(partial + "\\"); //$NON-NLS-1$ } - if (message.endsWith("\n")) { + if (message.endsWith("\n")) { //$NON-NLS-1$ System.err.print(message); } else { System.out.println(message); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Variable.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Variable.java index f3cdc985349..1324cdc8b8c 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Variable.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Variable.java @@ -19,7 +19,7 @@ public class Variable extends VariableDeclaration implements IVariable { } public String getInitializer() { - return ""; + return ""; //$NON-NLS-1$ } } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/VariableInfo.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/VariableInfo.java index a528f414c2a..21026773e9c 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/VariableInfo.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/VariableInfo.java @@ -7,7 +7,7 @@ package org.eclipse.cdt.internal.core.model; class VariableInfo extends SourceManipulationInfo { - String typeStr = ""; + String typeStr = ""; //$NON-NLS-1$ boolean isConst = false; boolean isVolatile = false; boolean isStatic = false; diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/VariableTemplate.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/VariableTemplate.java index 1649073ba91..b22876a8c94 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/VariableTemplate.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/VariableTemplate.java @@ -49,21 +49,21 @@ public class VariableTemplate extends Variable implements ITemplate { public String getTemplateSignature() { StringBuffer sig = new StringBuffer(getElementName()); if(getNumberOfTemplateParameters() > 0){ - sig.append("<"); + sig.append("<"); //$NON-NLS-1$ String[] paramTypes = getTemplateParameterTypes(); int i = 0; sig.append(paramTypes[i++]); while (i < paramTypes.length){ - sig.append(", "); + sig.append(", "); //$NON-NLS-1$ sig.append(paramTypes[i++]); } - sig.append(">"); + sig.append(">"); //$NON-NLS-1$ } else{ - sig.append("<>"); + sig.append("<>"); //$NON-NLS-1$ } - sig.append(" : "); + sig.append(" : "); //$NON-NLS-1$ sig.append(this.getTypeName()); return sig.toString(); 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 b74630d25ce..314a0125ca3 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 @@ -5,3 +5,11 @@ # ################################################ CBuilder.build_error= Build Error +CoreModel.BinaryRunner.Binary_Search_Thread=Binary Search Thread +CoreModel.CModelBuilder.Parser_Construction_Failure=Parser/Scanner construction failure. +CoreModel.CModelBuilder.Parse_Failure=Parse failure +CoreModel.ArchiveContainer.Archives=Archives +CoreModel.BinaryContainer.Binaries=Binaries +CoreModel.CModelStatus.Error_in_CPlugin=Error in C Plugin +CoreModel.NullBinaryParser.Not_binary_file=not a binary file +CoreModel.NullBinaryParser.Null_Format=Null Format