From 60b7b5d0d0e946e8426fd3fae75bdb3c216283ff Mon Sep 17 00:00:00 2001
From: Mikhail Sennikovsky <mikhail.sennikovskiy@gmail.com>
Date: Wed, 21 Mar 2007 17:12:28 +0000
Subject: [PATCH] Additional String externalization

---
 .../PerFileSettingsCalculator.java            |  6 ++---
 .../internal/core/CommonBuilder.java          | 24 +++++++++----------
 .../internal/core/PluginResources.properties  |  1 +
 .../model/CProjectDescriptionManager.java     |  2 +-
 .../SetCProjectDescriptionOperation.java      |  2 +-
 .../model/SettingsModelMessages.properties    |  2 ++
 6 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/build/internal/core/scannerconfig/PerFileSettingsCalculator.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/build/internal/core/scannerconfig/PerFileSettingsCalculator.java
index beb6aa22d6e..ec4a5ccf345 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/build/internal/core/scannerconfig/PerFileSettingsCalculator.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/build/internal/core/scannerconfig/PerFileSettingsCalculator.java
@@ -329,13 +329,13 @@ public class PerFileSettingsCalculator {
 
 		public String toString() {
 			if(fExts.length == 0)
-				return "<empty>";
+				return "<empty>"; //$NON-NLS-1$
 			
 			StringBuffer buf = new StringBuffer();
 			
 			for(int i = 0; i < fExts.length; i++){
 				if(i != 0)
-					buf.append(",");
+					buf.append(","); //$NON-NLS-1$
 				buf.append(fExts[i]);
 			}
 			return buf.toString();
@@ -924,7 +924,7 @@ public class PerFileSettingsCalculator {
 		String ext = path.getFileExtension();
 		if(ext != null)
 			return ext;
-		return "";
+		return ""; //$NON-NLS-1$
 	}
 	
 	private static HashMap createEmptyExtSetMapCopy(HashMap base){
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/CommonBuilder.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/CommonBuilder.java
index cbb47d16dcd..69783277975 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/CommonBuilder.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/CommonBuilder.java
@@ -174,14 +174,14 @@ public class CommonBuilder extends ACBuilder {
 			for(int i = 0; i < projects.length; i++){
 				if(bld.hasBeenBuilt(projects[i])){
 					if(VERBOSE)
-						outputTrace(null, "checking clean: the project " + projects[i].getName() +" was built, no clean needed");
+						outputTrace(null, "checking clean: the project " + projects[i].getName() +" was built, no clean needed"); //$NON-NLS-1$ //$NON-NLS-2$
 
 					return false;
 				}
 			}
 
 			if(VERBOSE)
-				outputTrace(null, "checking clean: no projects were built.. cleanning");
+				outputTrace(null, "checking clean: no projects were built.. cleanning"); //$NON-NLS-1$
 
 			fMap.clear();
 			return true;
@@ -473,13 +473,13 @@ public class CommonBuilder extends ACBuilder {
 		IProject project = getProject();
 
 		if(VERBOSE)
-			outputTrace(project.getName(), ">>build requested, type = " + kind);
+			outputTrace(project.getName(), ">>build requested, type = " + kind); //$NON-NLS-1$
 
 		IBuilder builders[] = BuilderFactory.createBuilders(project, args);
 		IProject[] projects = build(kind, project, builders, true, monitor);
 
 		if(VERBOSE)
-			outputTrace(project.getName(), "<<done build requested, type = " + kind);
+			outputTrace(project.getName(), "<<done build requested, type = " + kind); //$NON-NLS-1$
 
 		return projects;
 	}
@@ -523,7 +523,7 @@ public class CommonBuilder extends ACBuilder {
 		cfgs = filterConfigsToBuild(cfgs);
 
 		if(cfgs.length != 0){
-			monitor.beginTask("Building referenced configurations..", cfgs.length);
+			monitor.beginTask(ManagedMakeMessages.getResourceString("CommonBuilder.22"), cfgs.length); //$NON-NLS-1$
 			for(int i = 0; i < cfgs.length; i++){
 				IProgressMonitor subMonitor = new SubProgressMonitor(monitor, 1);
 				try {
@@ -531,12 +531,12 @@ public class CommonBuilder extends ACBuilder {
 					IBuilder builder = cfg.getEditableBuilder();
 //					CfgBuildInfo bInfo = new CfgBuildInfo(builder, false);
 					if(VERBOSE)
-						outputTrace(cfg.getOwner().getProject().getName(), ">>>>building reference cfg " + cfg.getName());
+						outputTrace(cfg.getOwner().getProject().getName(), ">>>>building reference cfg " + cfg.getName()); //$NON-NLS-1$
 
 					IProject[] projs = build(INCREMENTAL_BUILD, cfg.getOwner().getProject(), new IBuilder[]{builder}, false, subMonitor);
 
 					if(VERBOSE)
-						outputTrace(cfg.getOwner().getProject().getName(), "<<<<done building reference cfg " + cfg.getName());
+						outputTrace(cfg.getOwner().getProject().getName(), "<<<<done building reference cfg " + cfg.getName()); //$NON-NLS-1$
 
 					projSet.addAll(Arrays.asList(projs));
 				} catch (CoreException e){
@@ -560,13 +560,13 @@ public class CommonBuilder extends ACBuilder {
 			Set set = fBuildSet.getCfgIdSet(project, true);
 			if(set.add(cfg.getId())){
 				if(VERBOSE){
-					outputTrace(cfg.getOwner().getProject().getName(), "set: adding cfg " + cfg.getName() + " ( id=" + cfg.getId() + ")");
-					outputTrace(cfg.getOwner().getProject().getName(), "filtering regs: adding cfg " + cfg.getName() + " ( id=" + cfg.getId() + ")");
+					outputTrace(cfg.getOwner().getProject().getName(), "set: adding cfg " + cfg.getName() + " ( id=" + cfg.getId() + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+					outputTrace(cfg.getOwner().getProject().getName(), "filtering regs: adding cfg " + cfg.getName() + " ( id=" + cfg.getId() + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 				}
 
 				cfgList.add(cfg);
 			} else if(VERBOSE)
-				outputTrace(cfg.getOwner().getProject().getName(), "filtering regs: excluding cfg " + cfg.getName() + " ( id=" + cfg.getId() + ")");
+				outputTrace(cfg.getOwner().getProject().getName(), "filtering regs: excluding cfg " + cfg.getName() + " ( id=" + cfg.getId() + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 
 		}
 		return (IConfiguration[])cfgList.toArray(new IConfiguration[cfgList.size()]);
@@ -709,7 +709,7 @@ public class CommonBuilder extends ACBuilder {
 	
 	protected void build(int kind, CfgBuildInfo bInfo, IProgressMonitor monitor) throws CoreException{
 		if(VERBOSE)
-			outputTrace(bInfo.getProject().getName(), "building cfg " + bInfo.getConfiguration().getName() + " with builder " + bInfo.getBuilder().getName());
+			outputTrace(bInfo.getProject().getName(), "building cfg " + bInfo.getConfiguration().getName() + " with builder " + bInfo.getBuilder().getName()); //$NON-NLS-1$ //$NON-NLS-2$
 		IBuilder builder = bInfo.getBuilder();
 		BuildStatus status = new BuildStatus(builder);
 		
@@ -735,7 +735,7 @@ public class CommonBuilder extends ACBuilder {
 			if(!builder.isCustomBuilder()){
 				Set set = fBuildSet.getCfgIdSet(bInfo.getProject(), true);
 				if(VERBOSE)
-					outputTrace(bInfo.getProject().getName(), "set: adding cfg " + cfg.getName() + " ( id=" + cfg.getId() + ")");
+					outputTrace(bInfo.getProject().getName(), "set: adding cfg " + cfg.getName() + " ( id=" + cfg.getId() + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 				set.add(cfg.getId());
 			}
 
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/PluginResources.properties b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/PluginResources.properties
index 790a02753ab..153ea26271c 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/PluginResources.properties
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/PluginResources.properties
@@ -151,4 +151,5 @@ CommonBuilder.0=can not clean programmatically: build workspace path is not spec
 CommonBuilder.16=can not clean programmatically: build workspace path is not the project path
 CommonBuilder.12=can not clean programmatically: build workspace path is not folder
 CommonBuilder.13=can not clean programmatically: build folder is not accessible
+CommonBuilder.22=Building referenced configurations..
 MakeBuilder.buildError=
diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CProjectDescriptionManager.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CProjectDescriptionManager.java
index 2bd87097772..af098e4ba36 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CProjectDescriptionManager.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CProjectDescriptionManager.java
@@ -723,7 +723,7 @@ public class CProjectDescriptionManager {
 				runWspModification(new IWorkspaceRunnable(){
 	
 					public void run(IProgressMonitor monitor) throws CoreException {
-						monitor.beginTask("Refreshing the project settings", fi[0]);
+						monitor.beginTask(SettingsModelMessages.getString("CProjectDescriptionManager.13"), fi[0]); //$NON-NLS-1$
 						
 						for(int i = 0; i < dess.length; i++){
 							ICProjectDescription des = dess[i];
diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/SetCProjectDescriptionOperation.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/SetCProjectDescriptionOperation.java
index b3a16dfbe35..0e642b6ea62 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/SetCProjectDescriptionOperation.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/SetCProjectDescriptionOperation.java
@@ -71,7 +71,7 @@ public class SetCProjectDescriptionOperation extends CModelOperation {
 		}
 
 		mngr.setLoaddedDescription(project, fNewDescriptionCache, true);
-		CompositeWorkspaceRunnable runnable = new CompositeWorkspaceRunnable("CDT Project settings serialization");
+		CompositeWorkspaceRunnable runnable = new CompositeWorkspaceRunnable(SettingsModelMessages.getString("SetCProjectDescriptionOperation.0")); //$NON-NLS-1$
 		
 		try {
 			final IProjectDescription eDes = project.getDescription();
diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/SettingsModelMessages.properties b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/SettingsModelMessages.properties
index 43cd4bb19d4..da5f671ea78 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/SettingsModelMessages.properties
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/SettingsModelMessages.properties
@@ -30,7 +30,9 @@ CProjectDescriptionManager.0=Initiating resource change handling..
 CProjectDescriptionManager.10=invalid project file format
 CProjectDescriptionManager.11=storage file not found
 CProjectDescriptionManager.12=Serialing CDT Project settings.. 
+CProjectDescriptionManager.13=Refreshing the project settings
 CFolderDescription.0=data was not created
 CFolderDescription.1=expected proxy of type ICLanguageSetting, but was 
 CFolderDescription.2=data was not created
 CFolderDescription.3=expected proxy of type ICLanguageSetting, but was 
+SetCProjectDescriptionOperation.0=CDT Project settings serialization