mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-05 07:15:39 +02:00
Code Issues Wiki Activity

Additional String externalization

Browse source
This commit is contained in:
Mikhail Sennikovsky 2007-03-21 17:12:28 +00:00
parent 908817c1a5
commit 60b7b5d0d0
6 changed files with 20 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/build/internal/core/scannerconfig/PerFileSettingsCalculator.java
View file

@ -329,13 +329,13 @@ public class PerFileSettingsCalculator {
public String toString() { public String toString() {
if(fExts.length == 0) if(fExts.length == 0)
return "<empty>"; return "<empty>"; //$NON-NLS-1$
StringBuffer buf = new StringBuffer(); StringBuffer buf = new StringBuffer();
for(int i = 0; i < fExts.length; i++){ for(int i = 0; i < fExts.length; i++){
if(i != 0) if(i != 0)
buf.append(","); buf.append(","); //$NON-NLS-1$
buf.append(fExts[i]); buf.append(fExts[i]);
} }
return buf.toString(); return buf.toString();
@ -924,7 +924,7 @@ public class PerFileSettingsCalculator {
String ext = path.getFileExtension(); String ext = path.getFileExtension();
if(ext != null) if(ext != null)
return ext; return ext;
return ""; return ""; //$NON-NLS-1$
} }
private static HashMap createEmptyExtSetMapCopy(HashMap base){ private static HashMap createEmptyExtSetMapCopy(HashMap base){

24
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/CommonBuilder.java
View file

@ -174,14 +174,14 @@ public class CommonBuilder extends ACBuilder {
for(int i = 0; i < projects.length; i++){ for(int i = 0; i < projects.length; i++){
if(bld.hasBeenBuilt(projects[i])){ if(bld.hasBeenBuilt(projects[i])){
if(VERBOSE) 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; return false;
} }
} }
if(VERBOSE) 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(); fMap.clear();
return true; return true;
@ -473,13 +473,13 @@ public class CommonBuilder extends ACBuilder {
IProject project = getProject(); IProject project = getProject();
if(VERBOSE) 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); IBuilder builders[] = BuilderFactory.createBuilders(project, args);
IProject[] projects = build(kind, project, builders, true, monitor); IProject[] projects = build(kind, project, builders, true, monitor);
if(VERBOSE) if(VERBOSE)
outputTrace(project.getName(), "<<done build requested, type = " + kind); outputTrace(project.getName(), "<<done build requested, type = " + kind); //$NON-NLS-1$
return projects; return projects;
} }
@ -523,7 +523,7 @@ public class CommonBuilder extends ACBuilder {
cfgs = filterConfigsToBuild(cfgs); cfgs = filterConfigsToBuild(cfgs);
if(cfgs.length != 0){ 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++){ for(int i = 0; i < cfgs.length; i++){
IProgressMonitor subMonitor = new SubProgressMonitor(monitor, 1); IProgressMonitor subMonitor = new SubProgressMonitor(monitor, 1);
try { try {
@ -531,12 +531,12 @@ public class CommonBuilder extends ACBuilder {
IBuilder builder = cfg.getEditableBuilder(); IBuilder builder = cfg.getEditableBuilder();
// CfgBuildInfo bInfo = new CfgBuildInfo(builder, false); // CfgBuildInfo bInfo = new CfgBuildInfo(builder, false);
if(VERBOSE) 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); IProject[] projs = build(INCREMENTAL_BUILD, cfg.getOwner().getProject(), new IBuilder[]{builder}, false, subMonitor);
if(VERBOSE) 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)); projSet.addAll(Arrays.asList(projs));
} catch (CoreException e){ } catch (CoreException e){
@ -560,13 +560,13 @@ public class CommonBuilder extends ACBuilder {
Set set = fBuildSet.getCfgIdSet(project, true); Set set = fBuildSet.getCfgIdSet(project, true);
if(set.add(cfg.getId())){ if(set.add(cfg.getId())){
if(VERBOSE){ if(VERBOSE){
outputTrace(cfg.getOwner().getProject().getName(), "set: 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() + ")"); 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); cfgList.add(cfg);
} else if(VERBOSE) } 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()]); 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{ protected void build(int kind, CfgBuildInfo bInfo, IProgressMonitor monitor) throws CoreException{
if(VERBOSE) 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(); IBuilder builder = bInfo.getBuilder();
BuildStatus status = new BuildStatus(builder); BuildStatus status = new BuildStatus(builder);
@ -735,7 +735,7 @@ public class CommonBuilder extends ACBuilder {
if(!builder.isCustomBuilder()){ if(!builder.isCustomBuilder()){
Set set = fBuildSet.getCfgIdSet(bInfo.getProject(), true); Set set = fBuildSet.getCfgIdSet(bInfo.getProject(), true);
if(VERBOSE) 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()); set.add(cfg.getId());
} }

1
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/PluginResources.properties
View file

@ -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.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.12=can not clean programmatically: build workspace path is not folder
CommonBuilder.13=can not clean programmatically: build folder is not accessible CommonBuilder.13=can not clean programmatically: build folder is not accessible
CommonBuilder.22=Building referenced configurations..
MakeBuilder.buildError= MakeBuilder.buildError=

2
core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CProjectDescriptionManager.java
View file

@ -723,7 +723,7 @@ public class CProjectDescriptionManager {
runWspModification(new IWorkspaceRunnable(){ runWspModification(new IWorkspaceRunnable(){
public void run(IProgressMonitor monitor) throws CoreException { 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++){ for(int i = 0; i < dess.length; i++){
ICProjectDescription des = dess[i]; ICProjectDescription des = dess[i];

2
core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/SetCProjectDescriptionOperation.java
View file

@ -71,7 +71,7 @@ public class SetCProjectDescriptionOperation extends CModelOperation {
} }
mngr.setLoaddedDescription(project, fNewDescriptionCache, true); 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 { try {
final IProjectDescription eDes = project.getDescription(); final IProjectDescription eDes = project.getDescription();

2
core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/SettingsModelMessages.properties
View file

@ -30,7 +30,9 @@ CProjectDescriptionManager.0=Initiating resource change handling..
CProjectDescriptionManager.10=invalid project file format CProjectDescriptionManager.10=invalid project file format
CProjectDescriptionManager.11=storage file not found CProjectDescriptionManager.11=storage file not found
CProjectDescriptionManager.12=Serialing CDT Project settings.. CProjectDescriptionManager.12=Serialing CDT Project settings..
CProjectDescriptionManager.13=Refreshing the project settings
CFolderDescription.0=data was not created CFolderDescription.0=data was not created
CFolderDescription.1=expected proxy of type ICLanguageSetting, but was CFolderDescription.1=expected proxy of type ICLanguageSetting, but was
CFolderDescription.2=data was not created CFolderDescription.2=data was not created
CFolderDescription.3=expected proxy of type ICLanguageSetting, but was CFolderDescription.3=expected proxy of type ICLanguageSetting, but was
SetCProjectDescriptionOperation.0=CDT Project settings serialization