[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
|
Applied Re: [cdt-patch] Partial fix for 51192: externalizing strings in Core
|
Thanks Tanya.
Hoda Amer
Staff Software Engineer
Rational Software - IBM Software Group
Tanya Wolff/Ottawa/IBM@IBMCA
Sent by: cdt-patch-admin@xxxxxxxxxxx
02/12/2004 10:47 AM
|
Please respond to
cdt-patch |
|
|
To
| cdt-patch@xxxxxxxxxxx
|
|
cc
|
|
|
Subject
| [cdt-patch] Partial fix for
51192: externalizing strings in Core |
|
This patch externalizes the few translatable strings in the org.eclipse.cdt.core/model
package. All other non-translatable strings are are marked //$NON-NLS-x$
The defect won't be resolved until all the packages in the core have been
dealt with in a similar manner. See the defect 51192 for details.
Index: ChangeLog
===================================================================
retrieving revision 1.212
diff -u -r1.212 ChangeLog
--- ChangeLog 10 Feb 2004 20:42:04 -0000 1.212
+++ ChangeLog 12 Feb 2004 15:40:18 -0000
@@ -1,3 +1,19 @@
+2004-02-12 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
Index: model/org/eclipse/cdt/core/model/CoreModel.java
===================================================================
retrieving revision 1.17
diff -u -r1.17 CoreModel.java
--- model/org/eclipse/cdt/core/model/CoreModel.java 24 Oct 2003 02:13:03 -0000 1.17
+++ model/org/eclipse/cdt/core/model/CoreModel.java 12 Feb 2004 15:40:20 -0000
@@ -31,7 +31,7 @@
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.
Index: model/org/eclipse/cdt/internal/core/model/ArchiveContainer.java
===================================================================
retrieving revision 1.8
diff -u -r1.8 ArchiveContainer.java
--- model/org/eclipse/cdt/internal/core/model/ArchiveContainer.java 27 Mar 2003 20:07:36 -0000 1.8
+++ model/org/eclipse/cdt/internal/core/model/ArchiveContainer.java 12 Feb 2004 15:40:24 -0000
@@ -6,7 +6,7 @@
*/
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 @@
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() {
Index: model/org/eclipse/cdt/internal/core/model/Binary.java
===================================================================
retrieving revision 1.15
diff -u -r1.15 Binary.java
--- model/org/eclipse/cdt/internal/core/model/Binary.java 20 Jan 2004 21:13:28 -0000 1.15
+++ model/org/eclipse/cdt/internal/core/model/Binary.java 12 Feb 2004 15:40:24 -0000
@@ -82,7 +82,7 @@
cpu = ((IBinaryObject)getBinaryFile()).getCPU();
}
}
- return (cpu == null ? "" : cpu);
+ return (cpu == null ? "" : cpu); //$NON-NLS-1$
}
public String[] getNeededSharedLibs() {
@@ -127,7 +127,7 @@
soname = ((IBinaryShared)getBinaryFile()).getSoName();
}
}
- return (soname == null ? "" : soname);
+ return (soname == null ? "" : soname); //$NON-NLS-1$
}
public boolean isLittleEndian() {
Index: model/org/eclipse/cdt/internal/core/model/BinaryContainer.java
===================================================================
retrieving revision 1.8
diff -u -r1.8 BinaryContainer.java
--- model/org/eclipse/cdt/internal/core/model/BinaryContainer.java 27 Mar 2003 20:07:36 -0000 1.8
+++ model/org/eclipse/cdt/internal/core/model/BinaryContainer.java 12 Feb 2004 15:40:24 -0000
@@ -6,7 +6,7 @@
*/
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 @@
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() {
Index: model/org/eclipse/cdt/internal/core/model/BinaryElement.java
===================================================================
retrieving revision 1.4
diff -u -r1.4 BinaryElement.java
--- model/org/eclipse/cdt/internal/core/model/BinaryElement.java 1 Oct 2003 14:18:13 -0000 1.4
+++ model/org/eclipse/cdt/internal/core/model/BinaryElement.java 12 Feb 2004 15:40:24 -0000
@@ -80,7 +80,7 @@
throw new CModelException(e, ICModelStatusConstants.IO_EXCEPTION);
}
}
- return "";
+ return ""; //$NON-NLS-1$
}
/* (non-Javadoc)
@@ -115,7 +115,7 @@
} 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) {
Index: model/org/eclipse/cdt/internal/core/model/BinaryRunner.java
===================================================================
retrieving revision 1.4
diff -u -r1.4 BinaryRunner.java
--- model/org/eclipse/cdt/internal/core/model/BinaryRunner.java 6 Nov 2003 19:52:40 -0000 1.4
+++ model/org/eclipse/cdt/internal/core/model/BinaryRunner.java 12 Feb 2004 15:40:24 -0000
@@ -14,6 +14,7 @@
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 @@
}
}
- }, "Binary Search Thread");
+ }, CCorePlugin.getResourceString("CoreModel.BinaryRunner.Binary_Search_Thread")); //$NON-NLS-1$
runner.start();
}
Index: model/org/eclipse/cdt/internal/core/model/BinaryVariable.java
===================================================================
retrieving revision 1.3
diff -u -r1.3 BinaryVariable.java
--- model/org/eclipse/cdt/internal/core/model/BinaryVariable.java 25 Aug 2003 04:20:40 -0000 1.3
+++ model/org/eclipse/cdt/internal/core/model/BinaryVariable.java 12 Feb 2004 15:40:24 -0000
@@ -21,7 +21,7 @@
*/
public String getInitializer() {
// TODO Auto-generated method stub
- return "";
+ return ""; //$NON-NLS-1$
}
/* (non-Javadoc)
@@ -29,7 +29,7 @@
*/
public String getTypeName() {
// TODO Auto-generated method stub
- return "";
+ return ""; //$NON-NLS-1$
}
/* (non-Javadoc)
Index: model/org/eclipse/cdt/internal/core/model/CElement.java
===================================================================
retrieving revision 1.12
diff -u -r1.12 CElement.java
--- model/org/eclipse/cdt/internal/core/model/CElement.java 20 Jan 2004 16:37:17 -0000 1.12
+++ model/org/eclipse/cdt/internal/core/model/CElement.java 12 Feb 2004 15:40:24 -0000
@@ -215,44 +215,44 @@
}
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$
}
}
Index: model/org/eclipse/cdt/internal/core/model/CModelBuilder.java
===================================================================
retrieving revision 1.28
diff -u -r1.28 CModelBuilder.java
--- model/org/eclipse/cdt/internal/core/model/CModelBuilder.java 6 Feb 2004 17:29:36 -0000 1.28
+++ model/org/eclipse/cdt/internal/core/model/CModelBuilder.java 12 Feb 2004 15:40:25 -0000
@@ -78,7 +78,7 @@
{
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 @@
}
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 @@
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,14 +164,14 @@
}
catch( NullPointerException npe )
{
- Util.debugLog( "NullPointer exception in CModelBuilder", IDebugLogConstants.MODEL);
+ Util.debugLog( "NullPointer exception in CModelBuilder", IDebugLogConstants.MODEL); //$NON-NLS-1$
//npe.printStackTrace();
}
// For the debuglog to take place, you have to call
// Util.setDebugging(true);
// Or set debug to true in the core plugin preference
return this.newElements;
}
@@ -343,7 +343,7 @@
private Namespace createNamespace(Parent parent, IASTNamespaceDefinition nsDef){
// create element
- String type = "namespace";
+ String type = "namespace"; //$NON-NLS-1$
String nsName = (nsDef.getName() == null )
? ""
@@ -362,7 +362,7 @@
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 @@
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,9 +416,9 @@
kind = ICElement.C_CLASS;
else
kind = ICElement.C_TEMPLATE_CLASS;
- type = "class";
+ type = "class"; //$NON-NLS-1$
className = (classSpecifier.getName() == null )
- ? ""
+ ? ""
}
if(classkind == ASTClassKind.STRUCT){
@@ -426,7 +426,7 @@
kind = ICElement.C_STRUCT;
else
kind = ICElement.C_TEMPLATE_STRUCT;
- type = "struct";
+ type = "struct"; //$NON-NLS-1$
className = (classSpecifier.getName() == null )
? ""
@@ -436,7 +436,7 @@
kind = ICElement.C_UNION;
else
kind = ICElement.C_TEMPLATE_UNION;
- type = "union";
+ type = "union"; //$NON-NLS-1$
className = (classSpecifier.getName() == null )
? ""
Index: model/org/eclipse/cdt/internal/core/model/CModelManager.java
===================================================================
retrieving revision 1.43
diff -u -r1.43 CModelManager.java
--- model/org/eclipse/cdt/internal/core/model/CModelManager.java 5 Feb 2004 17:33:15 -0000 1.43
+++ model/org/eclipse/cdt/internal/core/model/CModelManager.java 12 Feb 2004 15:40:25 -0000
@@ -111,9 +111,9 @@
*/
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];
Index: model/org/eclipse/cdt/internal/core/model/CModelStatus.java
===================================================================
retrieving revision 1.3
diff -u -r1.3 CModelStatus.java
--- model/org/eclipse/cdt/internal/core/model/CModelStatus.java 12 Aug 2003 20:20:04 -0000 1.3
+++ model/org/eclipse/cdt/internal/core/model/CModelStatus.java 12 Feb 2004 15:40:25 -0000
@@ -44,7 +44,7 @@
/**
* 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 @@
* 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
Index: model/org/eclipse/cdt/internal/core/model/CPathEntry.java
===================================================================
retrieving revision 1.3
diff -u -r1.3 CPathEntry.java
--- model/org/eclipse/cdt/internal/core/model/CPathEntry.java 27 Oct 2003 03:12:03 -0000 1.3
+++ model/org/eclipse/cdt/internal/core/model/CPathEntry.java 12 Feb 2004 15:40:25 -0000
@@ -82,7 +82,7 @@
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 :
Index: model/org/eclipse/cdt/internal/core/model/CProject.java
===================================================================
retrieving revision 1.10
diff -u -r1.10 CProject.java
--- model/org/eclipse/cdt/internal/core/model/CProject.java 27 Oct 2003 03:12:03 -0000 1.10
+++ model/org/eclipse/cdt/internal/core/model/CProject.java 12 Feb 2004 15:40:26 -0000
@@ -491,7 +491,7 @@
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);
}
}
Index: model/org/eclipse/cdt/internal/core/model/Enumerator.java
===================================================================
retrieving revision 1.1
diff -u -r1.1 Enumerator.java
--- model/org/eclipse/cdt/internal/core/model/Enumerator.java 31 Mar 2003 20:47:34 -0000 1.1
+++ model/org/eclipse/cdt/internal/core/model/Enumerator.java 12 Feb 2004 15:40:26 -0000
@@ -15,7 +15,7 @@
***********************************************************************/
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);
Index: model/org/eclipse/cdt/internal/core/model/FieldInfo.java
===================================================================
retrieving revision 1.6
diff -u -r1.6 FieldInfo.java
--- model/org/eclipse/cdt/internal/core/model/FieldInfo.java 25 Aug 2003 04:20:40 -0000 1.6
+++ model/org/eclipse/cdt/internal/core/model/FieldInfo.java 12 Feb 2004 15:40:26 -0000
@@ -15,7 +15,7 @@
public class FieldInfo extends SourceManipulationInfo {
- String typeStr = "";
+ String typeStr = ""; //$NON-NLS-1$
boolean isConst = false;
boolean isVolatile = false;
boolean isMutable = false;
Index: model/org/eclipse/cdt/internal/core/model/FunctionDeclaration.java
===================================================================
retrieving revision 1.9
diff -u -r1.9 FunctionDeclaration.java
--- model/org/eclipse/cdt/internal/core/model/FunctionDeclaration.java 25 Aug 2003 04:20:40 -0000 1.9
+++ model/org/eclipse/cdt/internal/core/model/FunctionDeclaration.java 12 Feb 2004 15:40:27 -0000
@@ -30,7 +30,7 @@
if (returnType != null)
return returnType;
else
- return "";
+ return ""; //$NON-NLS-1$
}
public void setReturnType(String type){
@@ -53,9 +53,9 @@
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 @@
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(){
Index: model/org/eclipse/cdt/internal/core/model/FunctionTemplate.java
===================================================================
retrieving revision 1.3
diff -u -r1.3 FunctionTemplate.java
--- model/org/eclipse/cdt/internal/core/model/FunctionTemplate.java 28 Aug 2003 19:49:37 -0000 1.3
+++ model/org/eclipse/cdt/internal/core/model/FunctionTemplate.java 12 Feb 2004 15:40:27 -0000
@@ -61,27 +61,27 @@
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(this.getReturnType());
}
Index: model/org/eclipse/cdt/internal/core/model/Macro.java
===================================================================
retrieving revision 1.1
diff -u -r1.1 Macro.java
--- model/org/eclipse/cdt/internal/core/model/Macro.java 26 Jun 2002 20:37:14 -0000 1.1
+++ model/org/eclipse/cdt/internal/core/model/Macro.java 12 Feb 2004 15:40:27 -0000
@@ -15,11 +15,11 @@
}
public String getIdentifierList() {
- return "";
+ return ""; //$NON-NLS-1$
}
public String getTokenSequence() {
- return "";
+ return ""; //$NON-NLS-1$
}
protected CElementInfo createElementInfo () {
Index: model/org/eclipse/cdt/internal/core/model/MethodDeclaration.java
===================================================================
retrieving revision 1.6
diff -u -r1.6 MethodDeclaration.java
--- model/org/eclipse/cdt/internal/core/model/MethodDeclaration.java 28 Aug 2003 15:50:31 -0000 1.6
+++ model/org/eclipse/cdt/internal/core/model/MethodDeclaration.java 12 Feb 2004 15:40:27 -0000
@@ -38,7 +38,7 @@
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 boolean isOperator(){
- return getElementName().startsWith("operator");
+ return getElementName().startsWith("operator"); //$NON-NLS-1$
}
public boolean isPureVirtual(){
Index: model/org/eclipse/cdt/internal/core/model/MethodTemplate.java
===================================================================
retrieving revision 1.3
diff -u -r1.3 MethodTemplate.java
--- model/org/eclipse/cdt/internal/core/model/MethodTemplate.java 28 Aug 2003 19:49:37 -0000 1.3
+++ model/org/eclipse/cdt/internal/core/model/MethodTemplate.java 12 Feb 2004 15:40:27 -0000
@@ -62,27 +62,27 @@
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(this.getReturnType());
}
Index: model/org/eclipse/cdt/internal/core/model/Namespace.java
===================================================================
retrieving revision 1.3
diff -u -r1.3 Namespace.java
--- model/org/eclipse/cdt/internal/core/model/Namespace.java 8 Apr 2003 21:30:53 -0000 1.3
+++ model/org/eclipse/cdt/internal/core/model/Namespace.java 12 Feb 2004 15:40:27 -0000
@@ -16,7 +16,7 @@
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);
}
Index: model/org/eclipse/cdt/internal/core/model/NullBinaryParser.java
===================================================================
retrieving revision 1.3
diff -u -r1.3 NullBinaryParser.java
--- model/org/eclipse/cdt/internal/core/model/NullBinaryParser.java 18 Nov 2003 16:19:58 -0000 1.3
+++ model/org/eclipse/cdt/internal/core/model/NullBinaryParser.java 12 Feb 2004 15:40:27 -0000
@@ -6,7 +6,7 @@
*/
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 @@
* @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)
Index: model/org/eclipse/cdt/internal/core/model/SourceManipulationInfo.java
===================================================================
retrieving revision 1.5
diff -u -r1.5 SourceManipulationInfo.java
--- model/org/eclipse/cdt/internal/core/model/SourceManipulationInfo.java 4 Apr 2003 14:01:29 -0000 1.5
+++ model/org/eclipse/cdt/internal/core/model/SourceManipulationInfo.java 12 Feb 2004 15:40:27 -0000
@@ -56,7 +56,7 @@
throw new CModelException(e, ICModelStatusConstants.IO_EXCEPTION);
}
}
- return "";
+ return ""; //$NON-NLS-1$
}
/**
Index: model/org/eclipse/cdt/internal/core/model/StructureInfo.java
===================================================================
retrieving revision 1.3
diff -u -r1.3 StructureInfo.java
--- model/org/eclipse/cdt/internal/core/model/StructureInfo.java 4 Apr 2003 14:01:29 -0000 1.3
+++ model/org/eclipse/cdt/internal/core/model/StructureInfo.java 12 Feb 2004 15:40:27 -0000
@@ -18,11 +18,11 @@
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() {
Index: model/org/eclipse/cdt/internal/core/model/StructureTemplate.java
===================================================================
retrieving revision 1.1
diff -u -r1.1 StructureTemplate.java
--- model/org/eclipse/cdt/internal/core/model/StructureTemplate.java 1 May 2003 19:46:41 -0000 1.1
+++ model/org/eclipse/cdt/internal/core/model/StructureTemplate.java 12 Feb 2004 15:40:27 -0000
@@ -52,18 +52,18 @@
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();
}
Index: model/org/eclipse/cdt/internal/core/model/TypeDef.java
===================================================================
retrieving revision 1.3
diff -u -r1.3 TypeDef.java
--- model/org/eclipse/cdt/internal/core/model/TypeDef.java 8 Apr 2003 21:30:53 -0000 1.3
+++ model/org/eclipse/cdt/internal/core/model/TypeDef.java 12 Feb 2004 15:40:27 -0000
@@ -16,7 +16,7 @@
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);
}
Index: model/org/eclipse/cdt/internal/core/model/Util.java
===================================================================
retrieving revision 1.10
diff -u -r1.10 Util.java
--- model/org/eclipse/cdt/internal/core/model/Util.java 27 Jan 2004 01:21:18 -0000 1.10
+++ model/org/eclipse/cdt/internal/core/model/Util.java 12 Feb 2004 15:40:27 -0000
@@ -193,13 +193,13 @@
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);
Index: model/org/eclipse/cdt/internal/core/model/Variable.java
===================================================================
retrieving revision 1.5
diff -u -r1.5 Variable.java
--- model/org/eclipse/cdt/internal/core/model/Variable.java 1 May 2003 19:46:41 -0000 1.5
+++ model/org/eclipse/cdt/internal/core/model/Variable.java 12 Feb 2004 15:40:27 -0000
@@ -19,7 +19,7 @@
}
public String getInitializer() {
- return "";
+ return ""; //$NON-NLS-1$
}
}
Index: model/org/eclipse/cdt/internal/core/model/VariableInfo.java
===================================================================
retrieving revision 1.6
diff -u -r1.6 VariableInfo.java
--- model/org/eclipse/cdt/internal/core/model/VariableInfo.java 25 Aug 2003 04:20:40 -0000 1.6
+++ model/org/eclipse/cdt/internal/core/model/VariableInfo.java 12 Feb 2004 15:40:28 -0000
@@ -7,7 +7,7 @@
class VariableInfo extends SourceManipulationInfo {
- String typeStr = "";
+ String typeStr = ""; //$NON-NLS-1$
boolean isConst = false;
boolean isVolatile = false;
boolean isStatic = false;
Index: model/org/eclipse/cdt/internal/core/model/VariableTemplate.java
===================================================================
retrieving revision 1.1
diff -u -r1.1 VariableTemplate.java
--- model/org/eclipse/cdt/internal/core/model/VariableTemplate.java 1 May 2003 19:46:41 -0000 1.1
+++ model/org/eclipse/cdt/internal/core/model/VariableTemplate.java 12 Feb 2004 15:40:28 -0000
@@ -49,21 +49,21 @@
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.getTypeName());
return sig.toString();
Index: src/org/eclipse/cdt/internal/core/CCorePluginResources.properties
===================================================================
retrieving revision 1.5
diff -u -r1.5 CCorePluginResources.properties
--- src/org/eclipse/cdt/internal/core/CCorePluginResources.properties 15 Sep 2003 20:44:07 -0000 1.5
+++ src/org/eclipse/cdt/internal/core/CCorePluginResources.properties 12 Feb 2004 15:40:31 -0000
@@ -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
