From bc78f58fab89a3e895eac83e6a97ed30ec09d521 Mon Sep 17 00:00:00 2001 From: Leo Treggiari Date: Fri, 27 May 2005 16:51:15 +0000 Subject: [PATCH] Externalized string fixes from David Daoust --- .../cdt/managedbuilder/internal/core/ProjectType.java | 1 - .../projectconverter/PluginResources.properties | 1 + .../projectconverter/UpdateManagedProject12.java | 2 +- .../projectconverter/UpdateManagedProject20.java | 2 +- .../projectconverter/UpdateManagedProject21.java | 2 +- .../org/eclipse/cdt/managedbuilder/gnu/ui/GnuUIPlugin.java | 2 +- .../cdt/managedbuilder/internal/ui/EnvironmentBlock.java | 2 +- .../managedbuilder/ui/wizards/NewManagedCProjectWizard.java | 5 ----- .../managedbuilder/ui/wizards/NewManagedProjectWizard.java | 2 +- 9 files changed, 7 insertions(+), 12 deletions(-) diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ProjectType.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ProjectType.java index 3571610a397..111a2e94af1 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ProjectType.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ProjectType.java @@ -26,7 +26,6 @@ import org.eclipse.cdt.managedbuilder.macros.IProjectBuildMacroSupplier; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; -import org.eclipse.cdt.managedbuilder.envvar.IProjectEnvironmentVariableSupplier; public class ProjectType extends BuildObject implements IProjectType { diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/projectconverter/PluginResources.properties b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/projectconverter/PluginResources.properties index 5afc9f231a6..12542b9aea7 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/projectconverter/PluginResources.properties +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/projectconverter/PluginResources.properties @@ -9,6 +9,7 @@ # Intel Corporation - Initial API and implementation ######################################### +UpdateManagedProject.notice=Updating managed Project UpdateManagedProject20.0=Backing up the settings file for {0} UpdateManagedProject20.1=Updating build settings for project {0} UpdateManagedProject20.10=No configurations were found for project {0} diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/projectconverter/UpdateManagedProject12.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/projectconverter/UpdateManagedProject12.java index dec5e68ff00..c7623c5d070 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/projectconverter/UpdateManagedProject12.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/projectconverter/UpdateManagedProject12.java @@ -747,7 +747,7 @@ class UpdateManagedProject12 { boolean treeLock = workspace.isTreeLocked(); ISchedulingRule rule = workspace.getRuleFactory().createRule(project); 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 { ManagedBuildManager.saveBuildInfo(project, false); return Status.OK_STATUS; diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/projectconverter/UpdateManagedProject20.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/projectconverter/UpdateManagedProject20.java index 200f6b3e926..f11392b29f8 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/projectconverter/UpdateManagedProject20.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/projectconverter/UpdateManagedProject20.java @@ -107,7 +107,7 @@ class UpdateManagedProject20 { boolean treeLock = workspace.isTreeLocked(); ISchedulingRule rule = workspace.getRuleFactory().createRule(project); 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 { ManagedBuildManager.saveBuildInfo(project, false); return Status.OK_STATUS; diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/projectconverter/UpdateManagedProject21.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/projectconverter/UpdateManagedProject21.java index 04da0a2d011..25d10848389 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/projectconverter/UpdateManagedProject21.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/projectconverter/UpdateManagedProject21.java @@ -57,7 +57,7 @@ class UpdateManagedProject21 { boolean treeLock = workspace.isTreeLocked(); ISchedulingRule rule = workspace.getRuleFactory().createRule(project); 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 { ManagedBuildManager.saveBuildInfo(project, true); return Status.OK_STATUS; diff --git a/build/org.eclipse.cdt.managedbuilder.gnu.ui/src/org/eclipse/cdt/managedbuilder/gnu/ui/GnuUIPlugin.java b/build/org.eclipse.cdt.managedbuilder.gnu.ui/src/org/eclipse/cdt/managedbuilder/gnu/ui/GnuUIPlugin.java index 37494cade95..545d4a1d4f5 100644 --- a/build/org.eclipse.cdt.managedbuilder.gnu.ui/src/org/eclipse/cdt/managedbuilder/gnu/ui/GnuUIPlugin.java +++ b/build/org.eclipse.cdt.managedbuilder.gnu.ui/src/org/eclipse/cdt/managedbuilder/gnu/ui/GnuUIPlugin.java @@ -74,7 +74,7 @@ public class GnuUIPlugin extends Plugin { public ResourceBundle getResourceBundle() { try { 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) { resourceBundle = null; } diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/EnvironmentBlock.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/EnvironmentBlock.java index 95bdca14761..40199a80f61 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/EnvironmentBlock.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/EnvironmentBlock.java @@ -802,7 +802,7 @@ public class EnvironmentBlock extends AbstractCOptionPage { EnvironmentVariableProvider provider = (EnvironmentVariableProvider)ManagedBuildManager.getEnvironmentVariableProvider(); EnvVarCollector v = provider.getVariables(fCurrentContextInfo,true); 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); for(int i = 0; i < vars.length; i++){ MacroResolver.checkMacros(vars[i].getValue(), substitutor); diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/NewManagedCProjectWizard.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/NewManagedCProjectWizard.java index c49fb40da24..9090a1a72d3 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/NewManagedCProjectWizard.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/NewManagedCProjectWizard.java @@ -13,13 +13,8 @@ package org.eclipse.cdt.managedbuilder.ui.wizards; import org.eclipse.cdt.core.CProjectNature; 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.jface.dialogs.MessageDialog; 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 { // String constants diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/NewManagedProjectWizard.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/NewManagedProjectWizard.java index 3e2aabe8960..f6bad1ec611 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/NewManagedProjectWizard.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/NewManagedProjectWizard.java @@ -90,7 +90,7 @@ public class NewManagedProjectWizard extends NewCProjectWizard { // add stock pages // 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(optionPage, NewManagedProjectOptionPage.PAGE_ID);