mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-23 22:52:11 +02:00
Code Issues Wiki Activity

Externalized string fixes from David Daoust

Browse source
This commit is contained in:
Leo Treggiari 2005-05-27 16:51:15 +00:00
parent 52ae549c9f
commit bc78f58fab
9 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ProjectType.java
View file

@ -26,7 +26,6 @@ import org.eclipse.cdt.managedbuilder.macros.IProjectBuildMacroSupplier;
import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.cdt.managedbuilder.envvar.IProjectEnvironmentVariableSupplier;
public class ProjectType extends BuildObject implements IProjectType { public class ProjectType extends BuildObject implements IProjectType {

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

@ -9,6 +9,7 @@
# Intel Corporation - Initial API and implementation # Intel Corporation - Initial API and implementation
######################################### #########################################
UpdateManagedProject.notice=Updating managed Project
UpdateManagedProject20.0=Backing up the settings file for {0} UpdateManagedProject20.0=Backing up the settings file for {0}
UpdateManagedProject20.1=Updating build settings for project {0} UpdateManagedProject20.1=Updating build settings for project {0}
UpdateManagedProject20.10=No configurations were found for project {0} UpdateManagedProject20.10=No configurations were found for project {0}

2
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/projectconverter/UpdateManagedProject12.java
View file

@ -747,7 +747,7 @@ class UpdateManagedProject12 {
boolean treeLock = workspace.isTreeLocked(); boolean treeLock = workspace.isTreeLocked();
ISchedulingRule rule = workspace.getRuleFactory().createRule(project); ISchedulingRule rule = workspace.getRuleFactory().createRule(project);
if (treeLock) { if (treeLock) {
WorkspaceJob job = new WorkspaceJob("Updating managed Project") { WorkspaceJob job = new WorkspaceJob(ConverterMessages.getResourceString("UpdateManagedProject.notice")) { //$NON-NLS-1$
public IStatus runInWorkspace(IProgressMonitor monitor) throws CoreException { public IStatus runInWorkspace(IProgressMonitor monitor) throws CoreException {
ManagedBuildManager.saveBuildInfo(project, false); ManagedBuildManager.saveBuildInfo(project, false);
return Status.OK_STATUS; return Status.OK_STATUS;

2
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/projectconverter/UpdateManagedProject20.java
View file

@ -107,7 +107,7 @@ class UpdateManagedProject20 {
boolean treeLock = workspace.isTreeLocked(); boolean treeLock = workspace.isTreeLocked();
ISchedulingRule rule = workspace.getRuleFactory().createRule(project); ISchedulingRule rule = workspace.getRuleFactory().createRule(project);
if (treeLock) { if (treeLock) {
WorkspaceJob job = new WorkspaceJob("Updating managed Project") { WorkspaceJob job = new WorkspaceJob(ConverterMessages.getResourceString("UpdateManagedProject.notice")) { //$NON-NLS-1$
public IStatus runInWorkspace(IProgressMonitor monitor) throws CoreException { public IStatus runInWorkspace(IProgressMonitor monitor) throws CoreException {
ManagedBuildManager.saveBuildInfo(project, false); ManagedBuildManager.saveBuildInfo(project, false);
return Status.OK_STATUS; return Status.OK_STATUS;

2
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/projectconverter/UpdateManagedProject21.java
View file

@ -57,7 +57,7 @@ class UpdateManagedProject21 {
boolean treeLock = workspace.isTreeLocked(); boolean treeLock = workspace.isTreeLocked();
ISchedulingRule rule = workspace.getRuleFactory().createRule(project); ISchedulingRule rule = workspace.getRuleFactory().createRule(project);
if (treeLock) { if (treeLock) {
WorkspaceJob job = new WorkspaceJob("Updating managed Project") { WorkspaceJob job = new WorkspaceJob(ConverterMessages.getResourceString("UpdateManagedProject.notice")) { //$NON-NLS-1$
public IStatus runInWorkspace(IProgressMonitor monitor) throws CoreException { public IStatus runInWorkspace(IProgressMonitor monitor) throws CoreException {
ManagedBuildManager.saveBuildInfo(project, true); ManagedBuildManager.saveBuildInfo(project, true);
return Status.OK_STATUS; return Status.OK_STATUS;

2
build/org.eclipse.cdt.managedbuilder.gnu.ui/src/org/eclipse/cdt/managedbuilder/gnu/ui/GnuUIPlugin.java
View file

@ -74,7 +74,7 @@ public class GnuUIPlugin extends Plugin {
public ResourceBundle getResourceBundle() { public ResourceBundle getResourceBundle() {
try { try {
if (resourceBundle == null) if (resourceBundle == null)
resourceBundle = ResourceBundle.getBundle("org.eclipse.cdt.managedbuilder.gnu.ui.GnuUIPluginResources"); resourceBundle = ResourceBundle.getBundle("org.eclipse.cdt.managedbuilder.gnu.ui.GnuUIPluginResources"); //$NON-NLS-1$
} catch (MissingResourceException x) { } catch (MissingResourceException x) {
resourceBundle = null; resourceBundle = null;
} }

2
build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/EnvironmentBlock.java
View file

@ -802,7 +802,7 @@ public class EnvironmentBlock extends AbstractCOptionPage {
EnvironmentVariableProvider provider = (EnvironmentVariableProvider)ManagedBuildManager.getEnvironmentVariableProvider(); EnvironmentVariableProvider provider = (EnvironmentVariableProvider)ManagedBuildManager.getEnvironmentVariableProvider();
EnvVarCollector v = provider.getVariables(fCurrentContextInfo,true); EnvVarCollector v = provider.getVariables(fCurrentContextInfo,true);
if(v != null){ if(v != null){
EnvVarUIMacroSubstitutor substitutor = new EnvVarUIMacroSubstitutor(macroContextInfo, null, " "); //$NON-NLS-2$ EnvVarUIMacroSubstitutor substitutor = new EnvVarUIMacroSubstitutor(macroContextInfo, null, " "); //$NON-NLS-1$
IBuildEnvironmentVariable vars[] = v.toArray(false); IBuildEnvironmentVariable vars[] = v.toArray(false);
for(int i = 0; i < vars.length; i++){ for(int i = 0; i < vars.length; i++){
MacroResolver.checkMacros(vars[i].getValue(), substitutor); MacroResolver.checkMacros(vars[i].getValue(), substitutor);

5
build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/NewManagedCProjectWizard.java
View file

@ -13,13 +13,8 @@ package org.eclipse.cdt.managedbuilder.ui.wizards;
import org.eclipse.cdt.core.CProjectNature; import org.eclipse.cdt.core.CProjectNature;
import org.eclipse.cdt.managedbuilder.core.BuildException; import org.eclipse.cdt.managedbuilder.core.BuildException;
import org.eclipse.cdt.managedbuilder.internal.core.ManagedMakeMessages;
import org.eclipse.cdt.managedbuilder.internal.ui.ManagedBuilderUIMessages; import org.eclipse.cdt.managedbuilder.internal.ui.ManagedBuilderUIMessages;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.wizard.IWizardPage; import org.eclipse.jface.wizard.IWizardPage;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PlatformUI;
public class NewManagedCProjectWizard extends NewManagedProjectWizard { public class NewManagedCProjectWizard extends NewManagedProjectWizard {
// String constants // String constants

2
build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/NewManagedProjectWizard.java
View file

@ -90,7 +90,7 @@ public class NewManagedProjectWizard extends NewCProjectWizard {
// add stock pages // add stock pages
// TODO: MBSCustomPageManager.addStockPage(fMainPage, NewCProjectWizardPage.PAGE_ID); // TODO: MBSCustomPageManager.addStockPage(fMainPage, NewCProjectWizardPage.PAGE_ID);
MBSCustomPageManager.addStockPage(fMainPage, "org.eclipse.cdt.ui.wizard.basicPage"); MBSCustomPageManager.addStockPage(fMainPage, "org.eclipse.cdt.ui.wizard.basicPage"); //$NON-NLS-1$
MBSCustomPageManager.addStockPage(projectConfigurationPage, CProjectPlatformPage.PAGE_ID); MBSCustomPageManager.addStockPage(projectConfigurationPage, CProjectPlatformPage.PAGE_ID);
MBSCustomPageManager.addStockPage(optionPage, NewManagedProjectOptionPage.PAGE_ID); MBSCustomPageManager.addStockPage(optionPage, NewManagedProjectOptionPage.PAGE_ID);