Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Gvozdev2010-09-14 11:29:34 -0400
committerAndrew Gvozdev2010-09-14 11:29:34 -0400
commitf4ca6178d7f459802e49dd871c13bac9d25fb811 (patch)
tree3e61a1b9534b83c2b3633f448b19fd48bdf4ee58
parentc8084bae2ec004906c727ee54b88a08c24bc6212 (diff)
downloadorg.eclipse.cdt-f4ca6178d7f459802e49dd871c13bac9d25fb811.tar.gz
org.eclipse.cdt-f4ca6178d7f459802e49dd871c13bac9d25fb811.tar.xz
org.eclipse.cdt-f4ca6178d7f459802e49dd871c13bac9d25fb811.zip
bug 318812: Reverted as it broke translation workv201009141542
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/Messages.java269
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/Messages.properties280
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/actions/BuildConfigurationsJob.java3
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/actions/CleanAndBuildDialog.java1
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/actions/ConvertTargetAction.java23
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/actions/ConvertTargetDialog.java4
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/actions/Messages.java35
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/actions/messages.properties20
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/workingsets/MBSProjectConfiguration.java6
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PrefPage_NewCDTProject.java4
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PrefPage_NewCDTWizard.java4
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PrefPage_PropertyPage.java4
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PreferredToolchainsTab.java15
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PropertyMultiCfgTab.java18
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PropertyPageDefsTab.java32
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/WizardDefaultsTab.java6
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ArtifactTab.java9
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildBehaviourTab.java27
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildOptionSettingsUI.java3
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildStepsTab.java48
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildToolSettingUI.java16
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuilderSettingsTab.java23
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/CPropertyVarsTab.java70
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/DiscoveryTab.java36
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/Messages.java16
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/NewBuildConfigurationDialog.java38
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/NewCfgDialog.java38
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/NewVarDialog.java53
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolChainEditTab.java43
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolListLabelProvider.java6
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolSelectionDialog.java27
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolSettingsTab.java5
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/messages.properties130
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CDTConfigWizardPage.java26
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CfgHolder.java4
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/MBSCustomPageManager.java16
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/MBSWizardHandler.java22
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/ManagedBuildWizard.java6
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/Messages.java2
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/NewMakeProjFromExisting.java1
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/NewMakeProjFromExistingPage.java1
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/STDWizardHandler.java9
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/StdBuildWizard.java6
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/messages.properties24
44 files changed, 587 insertions, 842 deletions
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/Messages.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/Messages.java
deleted file mode 100644
index 0c2734a774..0000000000
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/Messages.java
+++ /dev/null
@@ -1,269 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2010 Andrew Gvozdev and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Andrew Gvozdev - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.cdt.managedbuilder.internal.ui;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-
- public static String AbstractCWizard_0;
- public static String AbstractPrefPage_0;
- public static String ArtifactTab_0;
- public static String ArtifactTab_1;
- public static String ArtifactTab_2;
- public static String ArtifactTab_3;
- public static String BuildConfigurationsJob_BuildError;
- public static String BuildConfigurationsJob_Building;
- public static String BuildConfigurationsJob_Cleaning;
- public static String BuilderSettingsTab_0;
- public static String BuilderSettingsTab_1;
- public static String BuilderSettingsTab_10;
- public static String BuilderSettingsTab_11;
- public static String BuilderSettingsTab_12;
- public static String BuilderSettingsTab_13;
- public static String BuilderSettingsTab_14;
- public static String BuilderSettingsTab_15;
- public static String BuilderSettingsTab_16;
- public static String BuilderSettingsTab_17;
- public static String BuilderSettingsTab_18;
- public static String BuilderSettingsTab_19;
- public static String BuilderSettingsTab_2;
- public static String BuilderSettingsTab_20;
- public static String BuilderSettingsTab_21;
- public static String BuilderSettingsTab_22;
- public static String BuilderSettingsTab_3;
- public static String BuilderSettingsTab_4;
- public static String BuilderSettingsTab_5;
- public static String BuilderSettingsTab_6;
- public static String BuilderSettingsTab_7;
- public static String BuilderSettingsTab_8;
- public static String BuilderSettingsTab_9;
- public static String BuildOptionSettingsUI_0;
- public static String BuildPropertyPage_error_Unknown_tree_element;
- public static String BuildStepsTab_0;
- public static String BuildStepsTab_1;
- public static String BuildStepsTab_2;
- public static String BuildStepsTab_3;
- public static String BuildStepsTab_4;
- public static String BuildStepsTab_5;
- public static String BuildStepsTab_6;
- public static String BuildToolSettingsPage_alloptions;
- public static String BuildToolSettingsPage_tool_advancedSettings;
- public static String BuildToolSettingsPage_tool_command;
- public static String BuildToolSettingsPage_tool_commandLinePattern;
- public static String CConfigWizardPage_0;
- public static String CConfigWizardPage_1;
- public static String CConfigWizardPage_10;
- public static String CConfigWizardPage_11;
- public static String CConfigWizardPage_12;
- public static String CConfigWizardPage_13;
- public static String CConfigWizardPage_4;
- public static String CConfigWizardPage_5;
- public static String CConfigWizardPage_6;
- public static String CConfigWizardPage_7;
- public static String CConfigWizardPage_8;
- public static String CDTConfigWizardPage_0;
- public static String CleanAndBuildDialog_Active;
- public static String CleanAndBuildDialog_BuildConfigurations;
- public static String CleanAndBuildDialog_CleanConfigurations;
- public static String CleanAndBuildDialog_RebuildConfigurations;
- public static String CleanAndBuildDialog_SelectConfigurations;
- public static String CMainWizardPage_0;
- public static String CMainWizardPage_1;
- public static String CNewWizard_0;
- public static String ConvertTargetAction_No_Converter;
- public static String CPropertyVarsTab_0;
- public static String CWizardHandler_0;
- public static String CWizardHandler_1;
- public static String CWizardHandler_2;
- public static String CWizardHandler_3;
- public static String CWizardHandler_4;
- public static String CWizardHandler_5;
- public static String CWizardHandler_6;
- public static String DiscoveryTab_0;
- public static String DiscoveryTab_1;
- public static String DiscoveryTab_2;
- public static String DiscoveryTab_3;
- public static String DiscoveryTab_5;
- public static String DiscoveryTab_6;
- public static String DiscoveryTab_7;
- public static String DiscoveryTab_8;
- public static String DiscoveryTab_Clear;
- public static String DiscoveryTab_ClearDisoveredEntries;
- public static String DiscoveryTab_ClearEntries;
- public static String DiscoveryTab_DiscoveredEntriesCleared;
- public static String DiscoveryTab_ErrorClearingEntries;
- public static String EnvironmentTab_15;
- public static String EnvironmentTab_23;
- public static String MacrosBlock_label_delete_all_confirm_message;
- public static String MacrosBlock_label_delete_all_confirm_title;
- public static String MacrosBlock_label_delete_confirm_message;
- public static String MacrosBlock_label_delete_confirm_title;
- public static String MacrosBlock_label_header_name;
- public static String MacrosBlock_label_header_type;
- public static String MacrosBlock_label_header_value;
- public static String MacrosBlock_label_type_path_any_list;
- public static String MacrosBlock_label_type_path_any;
- public static String MacrosBlock_label_type_path_dir_list;
- public static String MacrosBlock_label_type_path_dir;
- public static String MacrosBlock_label_type_path_file_list;
- public static String MacrosBlock_label_type_path_file;
- public static String MacrosBlock_label_type_text_list;
- public static String MacrosBlock_label_type_text;
- public static String MacrosBlock_label_value_eclipse_dynamic;
- public static String MBSCustomPageManager_error0;
- public static String MBSCustomPageManager_error1;
- public static String MBSCustomPageManager_error2;
- public static String MBSCustomPageManager_error3;
- public static String MBSCustomPageManager_error4;
- public static String MBSCustomPageManager_error5;
- public static String MBSCustomPageManager_error6;
- public static String MBSProjectConfiguration_No_configuration_selected_for_project;
- public static String MBSWizardHandler_0;
- public static String NewBuildConfigurationDialog_0;
- public static String NewBuildConfigurationDialog_1;
- public static String NewBuildMacroDialog_label_browse;
- public static String NewBuildMacroDialog_label_list_title;
- public static String NewBuildMacroDialog_label_title_edit;
- public static String NewBuildMacroDialog_label_title_new;
- public static String NewBuildMacroDialog_label_type_path_any_list;
- public static String NewBuildMacroDialog_label_type_path_any;
- public static String NewBuildMacroDialog_label_type_path_dir_list;
- public static String NewBuildMacroDialog_label_type_path_dir;
- public static String NewBuildMacroDialog_label_type_path_file_list;
- public static String NewBuildMacroDialog_label_type_path_file;
- public static String NewBuildMacroDialog_label_type_text_list;
- public static String NewBuildMacroDialog_label_type_text;
- public static String NewBuildMacroDialog_label_type;
- public static String NewBuildMacroDialog_label_value;
- public static String NewCfgDialog_0;
- public static String NewCfgDialog_1;
- public static String NewCfgDialog_2;
- public static String NewCfgDialog_3;
- public static String NewCfgDialog_4;
- public static String NewCfgDialog_5;
- public static String NewConfiguration_error_caseName;
- public static String NewConfiguration_error_duplicateName;
- public static String NewConfiguration_error_invalidName;
- public static String NewConfiguration_label_clone;
- public static String NewConfiguration_label_copy;
- public static String NewConfiguration_label_description;
- public static String NewConfiguration_label_group;
- public static String NewConfiguration_label_name;
- public static String NewConfiguration_label_warning;
- public static String NewMakeProjFromExisting_0;
- public static String NewMakeProjFromExisting_1;
- public static String NewMakeProjFromExistingPage_0;
- public static String NewMakeProjFromExistingPage_1;
- public static String NewMakeProjFromExistingPage_10;
- public static String NewMakeProjFromExistingPage_11;
- public static String NewMakeProjFromExistingPage_2;
- public static String NewMakeProjFromExistingPage_3;
- public static String NewMakeProjFromExistingPage_4;
- public static String NewMakeProjFromExistingPage_5;
- public static String NewMakeProjFromExistingPage_6;
- public static String NewMakeProjFromExistingPage_7;
- public static String NewMakeProjFromExistingPage_8;
- public static String NewMakeProjFromExistingPage_9;
- public static String NewVarDialog_0;
- public static String NewVarDialog_1;
- public static String PreferredToolchainsTab_0;
- public static String PreferredToolchainsTab_1;
- public static String PreferredToolchainsTab_2;
- public static String PreferredToolchainsTab_3;
- public static String PrefPage_NewCDTWizard_0;
- public static String PrefPage_PropertyPage_0;
- public static String ProjectConvert_conversionErrordialog_message;
- public static String ProjectConvert_conversionErrordialog_title;
- public static String ProjectConvert_convertersList;
- public static String ProjectConvert_noConverterErrordialog_message;
- public static String ProjectConvert_title;
- public static String PropertyMultiCfgTab_10;
- public static String PropertyMultiCfgTab_11;
- public static String PropertyMultiCfgTab_3;
- public static String PropertyMultiCfgTab_4;
- public static String PropertyMultiCfgTab_6;
- public static String PropertyMultiCfgTab_7;
- public static String PropertyMultiCfgTab_8;
- public static String PropertyMultiCfgTab_9;
- public static String PropertyPageDefsTab_0;
- public static String PropertyPageDefsTab_1;
- public static String PropertyPageDefsTab_10;
- public static String PropertyPageDefsTab_11;
- public static String PropertyPageDefsTab_12;
- public static String PropertyPageDefsTab_13;
- public static String PropertyPageDefsTab_14;
- public static String PropertyPageDefsTab_16;
- public static String PropertyPageDefsTab_4;
- public static String PropertyPageDefsTab_5;
- public static String PropertyPageDefsTab_6;
- public static String PropertyPageDefsTab_7;
- public static String PropertyPageDefsTab_8;
- public static String PropertyPageDefsTab_9;
- public static String PropertyPageDefsTab_showIncludeFileTab;
- public static String ResourceCustomBuildStepBlock_label_applicability_rule_after;
- public static String ResourceCustomBuildStepBlock_label_applicability_rule_before;
- public static String ResourceCustomBuildStepBlock_label_applicability_rule_disable;
- public static String ResourceCustomBuildStepBlock_label_applicability_rule_override;
- public static String ResourceCustomBuildStepBlock_label_applicability;
- public static String ScannerConfigOptionsDialog_scGroup_enabled_button;
- public static String ScannerConfigOptionsDialog_scGroup_label;
- public static String ScannerConfigOptionsDialog_scGroup_problemReporting_enabled_button;
- public static String ScannerConfigOptionsDialog_scGroup_selectedProfile_combo;
- public static String StdBuildWizard_0;
- public static String StdProjectTypeHandler_0;
- public static String StdProjectTypeHandler_2;
- public static String StdProjectTypeHandler_3;
- public static String ToolChainEditTab_0;
- public static String ToolChainEditTab_1;
- public static String ToolChainEditTab_10;
- public static String ToolChainEditTab_11;
- public static String ToolChainEditTab_12;
- public static String ToolChainEditTab_13;
- public static String ToolChainEditTab_14;
- public static String ToolChainEditTab_15;
- public static String ToolChainEditTab_16;
- public static String ToolChainEditTab_17;
- public static String ToolChainEditTab_2;
- public static String ToolChainEditTab_3;
- public static String ToolChainEditTab_4;
- public static String ToolChainEditTab_5;
- public static String ToolChainEditTab_6;
- public static String ToolChainEditTab_7;
- public static String ToolChainEditTab_8;
- public static String ToolChainEditTab_9;
- public static String ToolChainEditTab_OrphanedBuilder;
- public static String ToolChainEditTab_OrphanedToolchain;
- public static String ToolSelectionDialog_0;
- public static String ToolSelectionDialog_1;
- public static String ToolSelectionDialog_10;
- public static String ToolSelectionDialog_11;
- public static String ToolSelectionDialog_12;
- public static String ToolSelectionDialog_13;
- public static String ToolSelectionDialog_14;
- public static String ToolSelectionDialog_15;
- public static String ToolSelectionDialog_16;
- public static String ToolSelectionDialog_2;
- public static String ToolSelectionDialog_7;
- public static String ToolSelectionDialog_8;
- public static String ToolSelectionDialog_9;
- public static String ToolSettingsTab_0;
- public static String WizardDefaultsTab_0;
- public static String WizardDefaultsTab_1;
-
- static {
- // Initialize resource bundle.
- NLS.initializeMessages(Messages.class.getName(), Messages.class);
- }
-
- private Messages() {
- }
-}
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/Messages.properties b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/Messages.properties
deleted file mode 100644
index e7fd85e5a7..0000000000
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/Messages.properties
+++ /dev/null
@@ -1,280 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2010 IBM Corporation, QNX Software Systems, and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1_0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM - Initial API and implementation
-# Andrew Gvozdev (Quoin Inc.) - Combined managedbuilder.ui bundles to NLS message format, bug 318812
-###############################################################################
-
-BuildConfigurationsJob_BuildError=Build error
-BuildConfigurationsJob_Building=Building {1}[{2}], ... [{0}]
-BuildConfigurationsJob_Cleaning=Cleaning {1}[{2}], ... [{0}]
-
-CleanAndBuildDialog_Active=[Active]
-CleanAndBuildDialog_BuildConfigurations=Build selected configurations
-CleanAndBuildDialog_CleanConfigurations=Clean selected configurations
-CleanAndBuildDialog_RebuildConfigurations=Clean and Rebuild Configurations
-CleanAndBuildDialog_SelectConfigurations=Select configurations to rebuild.
-
-BuilderSettingsTab_0=Builder
-BuilderSettingsTab_1=Builder &type:
-BuilderSettingsTab_2=External builder
-BuilderSettingsTab_3=Internal builder
-BuilderSettingsTab_4=&Use default build command
-BuilderSettingsTab_5=Build &command:
-BuilderSettingsTab_6=Makefile generation
-BuilderSettingsTab_7=&Generate Makefiles automatically
-BuilderSettingsTab_8=&Expand Env. Variable Refs in Makefiles
-BuilderSettingsTab_9=Build settings
-BuilderSettingsTab_10=Stop on first build error
-BuilderSettingsTab_11=Use parallel build
-BuilderSettingsTab_12=Use optimal jobs number
-BuilderSettingsTab_13=Use parallel jobs:
-BuilderSettingsTab_14=Workbench Build Behavior
-BuilderSettingsTab_15=Workbench build type:
-BuilderSettingsTab_16=Make build target:
-BuilderSettingsTab_17=Build on resource save (Auto build)
-BuilderSettingsTab_18=Note: See Workbench automatic build preference
-BuilderSettingsTab_19=Build (Incremental build)
-BuilderSettingsTab_20=Clean
-BuilderSettingsTab_21=Build location
-BuilderSettingsTab_22=Build &directory:
-BuildStepsTab_0=Command:
-BuildStepsTab_1=Description:
-BuildStepsTab_2=Pre-build steps
-BuildStepsTab_3=Post-build steps
-BuildStepsTab_4=Resource Custom Build Step
-BuildStepsTab_5=Additional input file name(s):
-BuildStepsTab_6=Output file name(s):
-ArtifactTab_0=Artifact Type:
-ArtifactTab_1=Artifact name:
-ArtifactTab_2=Artifact extension:
-ArtifactTab_3=Output prefix:
-CPropertyVarsTab_0=Show system variables
-DiscoveryTab_0=Discovery profiles scope
-DiscoveryTab_1=Per Language
-DiscoveryTab_2=Configuration-wide
-DiscoveryTab_3=Unknown
-DiscoveryTab_5=Tools:
-DiscoveryTab_6=No profiles found
-DiscoveryTab_7=InfoContexts are different \!
-DiscoveryTab_8=Configuration:
-DiscoveryTab_Clear=Clear
-DiscoveryTab_ClearDisoveredEntries=Clear discovered entries now:
-DiscoveryTab_ClearEntries=Clear entries
-DiscoveryTab_DiscoveredEntriesCleared=Discovered entries cleared. Scanner discovery will re-aquire the settings when run (normally during the build).
-DiscoveryTab_ErrorClearingEntries=Error clearing entries:
-ToolSelectionDialog_0=Select tools
-ToolSelectionDialog_1=Available tools
-ToolSelectionDialog_2=Used tools
-ToolSelectionDialog_7=Tool conflict:
-ToolSelectionDialog_8=Tool does not support managed build \!
-ToolSelectionDialog_9=Props not defined \!
-ToolSelectionDialog_10=Props not supported \!
-ToolSelectionDialog_11=Req. props not supported \!
-ToolSelectionDialog_12=Add tool -->
-ToolSelectionDialog_13=<-- Remove tool
-ToolSelectionDialog_14=<<- Replace ->>
-ToolSelectionDialog_15=Allow all changes
-ToolSelectionDialog_16=This tool can replace
-ToolChainEditTab_0=Display compatible toolchains only
-ToolChainEditTab_1=Current toolchain:
-ToolChainEditTab_10=builder
-ToolChainEditTab_11=configuration
-ToolChainEditTab_12=file info
-ToolChainEditTab_13=folder info
-ToolChainEditTab_14=tool
-ToolChainEditTab_15=Error \#
-ToolChainEditTab_16=:
-ToolChainEditTab_17=\n
-ToolChainEditTab_2=Current builder:
-ToolChainEditTab_3=Used tools
-ToolChainEditTab_4=Select Tools...
-ToolChainEditTab_5=Select tool
-ToolChainEditTab_6=-- NO TOOL --
-ToolChainEditTab_7=incompatibility with
-ToolChainEditTab_8=source extension conflict with
-ToolChainEditTab_9=toolchain
-ToolChainEditTab_OrphanedBuilder=Orphaned builder {0} ({1})
-ToolChainEditTab_OrphanedToolchain=Orphaned toolchain {0} ({1})
-NewVarDialog_0=Variable name:
-NewVarDialog_1=Apply to all configurations
-NewCfgDialog_0=Existing configuration
-NewCfgDialog_1=Default configuration
-NewBuildConfigurationDialog_0=Cannot create config
-NewBuildConfigurationDialog_1=>>
-PrefPage_NewCDTWizard_0=Settings will be applied to CDT new project wizard during project creation process
-WizardDefaultsTab_0=Show only supported toolchains, by default
-WizardDefaultsTab_1=Group old-style toolchains to <Others> folder
-PreferredToolchainsTab_0=Preferred toolchain will be selected by default in Wizard
-PreferredToolchainsTab_1=Make toolchain(s) preferred
-PreferredToolchainsTab_2=Make toolchain(s) not preferred
-PreferredToolchainsTab_3=Preferred toolchain(s):
-ToolSettingsTab_0=Hover over an option to display its tooltip
-BuildOptionSettingsUI_0=No tooltip is available for this option
-ScannerConfigOptionsDialog_scGroup_enabled_button=Automate discovery of paths and symbols
-ScannerConfigOptionsDialog_scGroup_label=Automated discovery of paths and symbols
-ScannerConfigOptionsDialog_scGroup_problemReporting_enabled_button=Report path detection problems
-ScannerConfigOptionsDialog_scGroup_selectedProfile_combo=Discovery profile:
-StdProjectTypeHandler_0=-- Other Toolchain --
-StdProjectTypeHandler_2=Default
-StdProjectTypeHandler_3=creation Make project: IBuilder is null
-CNewWizard_0=Others
-CWizardHandler_0=Toolchains:
-CWizardHandler_1=A Toolchain is a set of tools\n
-CWizardHandler_2=(compiler, linker, assembler)\n
-CWizardHandler_3=intended to build your project.\n
-CWizardHandler_4=Additional tools, like a debugger,\n
-CWizardHandler_5=can be associated with a toolchain.
-CWizardHandler_6=Cannot create managed project with NULL configuration
-StdBuildWizard_0=Makefile project
-MBSWizardHandler_0=At least one toolchain should be selected
-CMainWizardPage_1=Show project types and toolchains only if they are supported on the platform
-AbstractCWizard_0=Empty Project
-
-NewMakeProjFromExisting_0=Import Existing Code
-NewMakeProjFromExisting_1=Importing Existing Code
-NewMakeProjFromExistingPage_0=Import Existing Code
-NewMakeProjFromExistingPage_1=Import Existing Code
-NewMakeProjFromExistingPage_10=Toolchain for Indexer Settings
-NewMakeProjFromExistingPage_11=<none>
-NewMakeProjFromExistingPage_2=Create a new Makefile project from existing code in that same directory
-NewMakeProjFromExistingPage_3=Project Name
-NewMakeProjFromExistingPage_4=Project already exists
-NewMakeProjFromExistingPage_5=Existing Code Location
-NewMakeProjFromExistingPage_6=Browse...
-NewMakeProjFromExistingPage_7=Select root directory of existing code
-NewMakeProjFromExistingPage_8=Not a valid directory
-NewMakeProjFromExistingPage_9=Languages
-
-# ----------- Configuration Selection Page -----------
-BuildPropertyPage_error_Unknown_tree_element=Unknown type of element in tree of type {0}
-
-# ----------- Managed Build Custom Wizard Page Manager Error Strings -----------
-MBSCustomPageManager_error0=Unknown element type
-MBSCustomPageManager_error1=\ for extension point
-MBSCustomPageManager_error2=Unknown child element type
-MBSCustomPageManager_error3=\ for wizardPage element in extension point
-MBSCustomPageManager_error4=Missing projectType ID
-MBSCustomPageManager_error5=Missing toolchain ID
-MBSCustomPageManager_error6=Missing nature ID
-MBSProjectConfiguration_No_configuration_selected_for_project=No configuration selected for project "{0}".
-
-# ----------- Macros Block -----------
-MacrosBlock_label_header_name=Name
-MacrosBlock_label_header_type=Type
-MacrosBlock_label_header_value=Value
-MacrosBlock_label_delete_confirm_title=Build Variable Deletion Confirmation
-MacrosBlock_label_delete_confirm_message=Are you sure you want to delete the selected user Build Variable(s)?
-MacrosBlock_label_delete_all_confirm_title=Build Variables Deletion Confirmation
-MacrosBlock_label_delete_all_confirm_message=Are you sure you want to delete all user Build Variables?
-MacrosBlock_label_value_eclipse_dynamic=<ECLIPSE DYNAMIC VARIABLE>
-MacrosBlock_label_type_text=String
-MacrosBlock_label_type_text_list=String List
-MacrosBlock_label_type_path_file=File
-MacrosBlock_label_type_path_dir=Directory
-MacrosBlock_label_type_path_file_list=File List
-MacrosBlock_label_type_path_dir_list=Directory List
-MacrosBlock_label_type_path_any=Path
-MacrosBlock_label_type_path_any_list=Path List
-
-# ----------- New Build Macro Dialog -----------
-NewBuildMacroDialog_label_value=Value:
-NewBuildMacroDialog_label_type=Type:
-NewBuildMacroDialog_label_type_text=String
-NewBuildMacroDialog_label_type_text_list=String List
-NewBuildMacroDialog_label_type_path_file=File
-NewBuildMacroDialog_label_type_path_dir=Directory
-NewBuildMacroDialog_label_type_path_file_list=File List
-NewBuildMacroDialog_label_type_path_dir_list=Directory List
-NewBuildMacroDialog_label_type_path_any=Path
-NewBuildMacroDialog_label_type_path_any_list=Path List
-NewBuildMacroDialog_label_browse=Browse
-NewBuildMacroDialog_label_title_new=Define a New Build Variable
-NewBuildMacroDialog_label_title_edit=Edit Existing Build Variable
-NewBuildMacroDialog_label_list_title=Value of Build Variable
-
-# ----------- Resource Custom Build Step Block -----------
-ResourceCustomBuildStepBlock_label_applicability=Custom Build Step Applicability
-ResourceCustomBuildStepBlock_label_applicability_rule_before=Apply Custom Build Step Before Other Tools
-ResourceCustomBuildStepBlock_label_applicability_rule_after=Apply Custom Build Step After Other Tools
-ResourceCustomBuildStepBlock_label_applicability_rule_override=Apply Custom Build Step Overriding Other Tools
-ResourceCustomBuildStepBlock_label_applicability_rule_disable=Disable Custom Build Step
-
-# ----------- New Configuration -----------
-NewConfiguration_label_name=Name:
-NewConfiguration_label_description=Description:
-NewConfiguration_label_group=Copy settings from
-NewConfiguration_label_copy=Default configuration:
-NewConfiguration_label_clone=Existing configuration:
-NewConfiguration_label_warning=Note: The configuration name will be used as a directory name in the file system. Please ensure that it is valid for your platform.
-NewConfiguration_error_duplicateName=A configuration named "{0}" already exists.
-NewConfiguration_error_caseName=A configuration name that differs only in case to "{0}" exists.
-NewConfiguration_error_invalidName=The name "{0}" is invalid.
-
-# ----------- Build Tool Settings -----------
-BuildToolSettingsPage_alloptions=All options:
-BuildToolSettingsPage_tool_command=Command:
-BuildToolSettingsPage_tool_commandLinePattern=Command\nline pattern:
-BuildToolSettingsPage_tool_advancedSettings=Expert settings:
-
-# Project Conversion Dialog messages
-ProjectConvert_conversionErrordialog_title=Project Conversion Error
-ProjectConvert_conversionErrordialog_message=Error has occurred during the conversion of the project {0} .
-ProjectConvert_noConverterErrordialog_message=There are no converters available to convert the project {0} .
-ProjectConvert_title=Project Converters for {0}
-
-PropertyMultiCfgTab_10=Add/remove/change affected elements, do not touch others
-PropertyMultiCfgTab_11=Replace existing string lists with string list shown to user
-PropertyMultiCfgTab_3=String List Display Mode
-PropertyMultiCfgTab_4=Define how string lists from different configurations should be combined for display when lists are not equal:
-PropertyMultiCfgTab_6=Show common elements (conjunction)
-PropertyMultiCfgTab_7=Show all elements except doubles (disjunction)
-PropertyMultiCfgTab_8=String List Write Mode
-PropertyMultiCfgTab_9=Define how to save changes in string lists for different configurations:
-PropertyPageDefsTab_0=Show "Manage Configurations..." button
-PropertyPageDefsTab_1=Display "Data Hierarchy" tab
-PropertyPageDefsTab_10=Display "Export Settings" tab
-PropertyPageDefsTab_11=Save Property Dialog Bounds
-PropertyPageDefsTab_12=Save size and position
-PropertyPageDefsTab_13=Save size only
-PropertyPageDefsTab_14=Do not save at all
-PropertyPageDefsTab_16=Display tool option tips of "Tool Settings" tab at fixed location
-PropertyPageDefsTab_4=Display "Tool Chain Editor" tab
-PropertyPageDefsTab_5=Discovery Profiles Naming Rule
-PropertyPageDefsTab_6=Show disc. page names if they are unique. Else names + profile IDs.
-PropertyPageDefsTab_7=Show disc. page names if they are unique. Else show profile IDs.
-PropertyPageDefsTab_8=Always show names + profile IDs
-PropertyPageDefsTab_9=Always show profile IDs only
-PropertyPageDefsTab_showIncludeFileTab=Display "Include Files" tab
-ProjectConvert_convertersList=Converters List
-
-AbstractPrefPage_0=\ Preference settings will be applied to new projects \n only when there were no toolchains selected.
-EnvironmentTab_15=Current String List DISPLAY mode. Double-click to change
-EnvironmentTab_23=Current String List WRITE mode. Double-click to change
-PrefPage_PropertyPage_0=These settings will affect behavior of CDT property pages
-
-CConfigWizardPage_0=Select Configurations
-CConfigWizardPage_1=Select platforms and configurations you wish to deploy on
-CConfigWizardPage_4=Project type:
-CConfigWizardPage_5=Toolchains:
-CConfigWizardPage_6=Configurations:
-CConfigWizardPage_7=Select all
-CConfigWizardPage_8=Deselect all
-CConfigWizardPage_10=At least one configuration should be available. Project cannot be created.
-CConfigWizardPage_11=At least one configuration should be selected. Please check needed configurations.
-CConfigWizardPage_12=Use "Advanced settings" button to edit project's properties.\n\nAdditional configurations can be added after project creation.\nUse "Manage configurations" buttons either on toolbar or on property pages.
-CConfigWizardPage_13=Advanced settings...
-CMainWizardPage_0=Project type:
-CDTConfigWizardPage_0=Select configurations
-ConvertTargetAction_No_Converter=No converter
-
-NewCfgDialog_2=Cannot create new configuration
-NewCfgDialog_3=-- not selected --
-NewCfgDialog_4=Import from projects
-NewCfgDialog_5=Import predefined
-
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/actions/BuildConfigurationsJob.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/actions/BuildConfigurationsJob.java
index 7f73fc11c0..19f019ee2f 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/actions/BuildConfigurationsJob.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/actions/BuildConfigurationsJob.java
@@ -13,7 +13,6 @@ package org.eclipse.cdt.managedbuilder.internal.ui.actions;
import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
import org.eclipse.cdt.managedbuilder.core.IConfiguration;
import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
-import org.eclipse.cdt.managedbuilder.internal.ui.Messages;
import org.eclipse.core.resources.IncrementalProjectBuilder;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
@@ -79,7 +78,7 @@ public class BuildConfigurationsJob extends Job {
ManagedBuildManager.buildConfigurations(cfgs, null, monitor, true, buildKind);
}
} catch (CoreException e) {
- return new Status(IStatus.ERROR, Messages.BuildConfigurationsJob_BuildError, e.getLocalizedMessage());
+ return new Status(IStatus.ERROR, org.eclipse.cdt.managedbuilder.internal.ui.actions.Messages.BuildConfigurationsJob_BuildError, e.getLocalizedMessage());
}
if (monitor.isCanceled()) {
return Status.CANCEL_STATUS;
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/actions/CleanAndBuildDialog.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/actions/CleanAndBuildDialog.java
index f43357e872..d7dc190906 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/actions/CleanAndBuildDialog.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/actions/CleanAndBuildDialog.java
@@ -16,7 +16,6 @@ import java.util.List;
import org.eclipse.cdt.core.model.CoreModel;
import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
import org.eclipse.cdt.core.settings.model.ICProjectDescription;
-import org.eclipse.cdt.managedbuilder.internal.ui.Messages;
import org.eclipse.cdt.managedbuilder.ui.properties.ManagedBuilderUIImages;
import org.eclipse.cdt.managedbuilder.ui.properties.ManagedBuilderUIPlugin;
import org.eclipse.cdt.ui.CUIPlugin;
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/actions/ConvertTargetAction.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/actions/ConvertTargetAction.java
index 830ad21401..41e1846e37 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/actions/ConvertTargetAction.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/actions/ConvertTargetAction.java
@@ -16,13 +16,12 @@ import org.eclipse.cdt.managedbuilder.core.IProjectType;
import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
import org.eclipse.cdt.managedbuilder.ui.properties.ManagedBuilderUIPlugin;
import org.eclipse.cdt.ui.CUIPlugin;
-import org.eclipse.cdt.managedbuilder.internal.ui.Messages;
+import org.eclipse.cdt.ui.newui.UIMessages;
import org.eclipse.core.resources.IProject;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IObjectActionDelegate;
import org.eclipse.ui.IWorkbenchPart;
@@ -77,24 +76,28 @@ public class ConvertTargetAction
// Check whether the converters available for the selected project
// If there are no converters display error dialog otherwise display converters list
- if( ManagedBuildManager.hasTargetConversionElements(getProjectType(getSelectedProject())) == true ) {
+ if( ManagedBuildManager.hasTargetConversionElements(getProjectType(getSelectedProject())) == true ) {
handleConvertTargetAction();
} else {
- MessageDialog.openError(shell,Messages.ConvertTargetAction_No_Converter,
- NLS.bind(Messages.ProjectConvert_noConverterErrordialog_message, new String[] {getSelectedProject().getName()}) );
+ MessageDialog.openError(shell,"No converter", //$NON-NLS-1$
+ UIMessages.getFormattedString("ProjectConvert.noConverterErrordialog.message", new String[] {getSelectedProject().getName()}) ); //$NON-NLS-1$
}
}
private void handleConvertTargetAction() {
Shell shell = ManagedBuilderUIPlugin.getDefault().getShell();
- String projectName = getSelectedProject().getName();
- String title = NLS.bind(Messages.ProjectConvert_title, new String(projectName));
+ String title = UIMessages.getFormattedString(PROJECT_CONVERTER_DIALOG, new String(getSelectedProject().getName()));
ConvertTargetDialog dialog = new ConvertTargetDialog(shell, getSelectedProject(), title);
if ( dialog.open() == ConvertTargetDialog.OK ) {
- if ( ConvertTargetDialog.isConversionSuccessful() == false) {
- MessageDialog.openError(shell, Messages.ProjectConvert_conversionErrordialog_title,
- NLS.bind(Messages.ProjectConvert_conversionErrordialog_message, projectName));
+ if ( ConvertTargetDialog.isConversionSuccessful() == false) {
+ MessageDialog.openError(
+ shell,
+ UIMessages
+ .getString("ProjectConvert.conversionErrordialog.title"), //$NON-NLS-1$
+ UIMessages
+ .getFormattedString(
+ "ProjectConvert.conversionErrordialog.message", new String[] { getSelectedProject().getName() })); //$NON-NLS-1$
}
}
return;
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/actions/ConvertTargetDialog.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/actions/ConvertTargetDialog.java
index 1c3dbd8f99..8b4def29ba 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/actions/ConvertTargetDialog.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/actions/ConvertTargetDialog.java
@@ -18,7 +18,7 @@ import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo;
import org.eclipse.cdt.managedbuilder.core.IManagedProject;
import org.eclipse.cdt.managedbuilder.core.IProjectType;
import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
-import org.eclipse.cdt.managedbuilder.internal.ui.Messages;
+import org.eclipse.cdt.ui.newui.UIMessages;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IConfigurationElement;
@@ -127,7 +127,7 @@ public class ConvertTargetDialog extends Dialog {
// Create the converters list group area
final Group convertersListGroup = new Group(comp, SWT.NONE);
convertersListGroup.setFont(parent.getFont());
- convertersListGroup.setText(Messages.ProjectConvert_convertersList);
+ convertersListGroup.setText(UIMessages.getString(CONVERTERS_LIST));
convertersListGroup.setLayout(new GridLayout(1, false));
convertersListGroup.setLayoutData(new GridData(GridData.FILL_BOTH));
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/actions/Messages.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/actions/Messages.java
new file mode 100644
index 0000000000..2ea6560a71
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/actions/Messages.java
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright (c) 2010, 2010 Andrew Gvozdev and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Andrew Gvozdev (Quoin Inc.) - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.cdt.managedbuilder.internal.ui.actions;
+
+import org.eclipse.osgi.util.NLS;
+
+/**
+ * Message bundle class for externalizing messages.
+ */
+public class Messages extends NLS {
+ private static final String BUNDLE_NAME = "org.eclipse.cdt.managedbuilder.internal.ui.actions.messages"; //$NON-NLS-1$
+ public static String BuildConfigurationsJob_BuildError;
+ public static String BuildConfigurationsJob_Building;
+ public static String BuildConfigurationsJob_Cleaning;
+ public static String CleanAndBuildDialog_Active;
+ public static String CleanAndBuildDialog_BuildConfigurations;
+ public static String CleanAndBuildDialog_CleanConfigurations;
+ public static String CleanAndBuildDialog_RebuildConfigurations;
+ public static String CleanAndBuildDialog_SelectConfigurations;
+ static {
+ // initialize resource bundle
+ NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+ }
+
+ private Messages() {
+ }
+}
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/actions/messages.properties b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/actions/messages.properties
new file mode 100644
index 0000000000..47025ca04e
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/actions/messages.properties
@@ -0,0 +1,20 @@
+###############################################################################
+# Copyright (c) 2010, 2010 Andrew Gvozdev and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# Andrew Gvozdev (Quoin Inc.) - initial API and implementation
+###############################################################################
+
+BuildConfigurationsJob_BuildError=Build error
+BuildConfigurationsJob_Building=Building {1}[{2}], ... [{0}]
+BuildConfigurationsJob_Cleaning=Cleaning {1}[{2}], ... [{0}]
+
+CleanAndBuildDialog_Active=[Active]
+CleanAndBuildDialog_BuildConfigurations=Build selected configurations
+CleanAndBuildDialog_CleanConfigurations=Clean selected configurations
+CleanAndBuildDialog_RebuildConfigurations=Clean and Rebuild Configurations
+CleanAndBuildDialog_SelectConfigurations=Select configurations to rebuild.
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/workingsets/MBSProjectConfiguration.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/workingsets/MBSProjectConfiguration.java
index 570da68c41..6bb40408b3 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/workingsets/MBSProjectConfiguration.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/workingsets/MBSProjectConfiguration.java
@@ -16,7 +16,6 @@ import org.eclipse.cdt.internal.ui.workingsets.IWorkingSetConfiguration;
import org.eclipse.cdt.internal.ui.workingsets.WorkingSetProjectConfiguration;
import org.eclipse.cdt.managedbuilder.core.IConfiguration;
import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
-import org.eclipse.cdt.managedbuilder.internal.ui.Messages;
import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
@@ -72,8 +71,9 @@ class MBSProjectConfiguration extends WorkingSetProjectConfiguration {
: ManagedBuildManager.getConfigurationForDescription(config);
if (mbsConfig == null) {
- result = new Status(IStatus.WARNING, CUIPlugin.PLUGIN_ID,
- NLS.bind(Messages.MBSProjectConfiguration_No_configuration_selected_for_project, project.getName()));
+ result = new Status(IStatus.WARNING, CUIPlugin.PLUGIN_ID, NLS.bind(
+ "No configuration selected for project \"{0}\".", project
+ .getName()));
} else {
monitor = SubMonitor.convert(monitor);
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PrefPage_NewCDTProject.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PrefPage_NewCDTProject.java
index 44fe25a336..7a1982c4bb 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PrefPage_NewCDTProject.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PrefPage_NewCDTProject.java
@@ -17,7 +17,7 @@ import org.eclipse.cdt.core.settings.model.ICResourceDescription;
import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
import org.eclipse.cdt.ui.newui.AbstractPrefPage;
import org.eclipse.cdt.ui.newui.ICPropertyTab;
-import org.eclipse.cdt.managedbuilder.internal.ui.Messages;
+import org.eclipse.cdt.ui.newui.UIMessages;
import org.eclipse.core.runtime.CoreException;
/**
@@ -52,6 +52,6 @@ public class PrefPage_NewCDTProject extends AbstractPrefPage {
@Override
protected String getHeader() {
- return Messages.AbstractPrefPage_0;
+ return UIMessages.getString("AbstractPrefPage.0"); //$NON-NLS-1$
}
}
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PrefPage_NewCDTWizard.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PrefPage_NewCDTWizard.java
index 2d93ab4486..ae4682215c 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PrefPage_NewCDTWizard.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PrefPage_NewCDTWizard.java
@@ -12,7 +12,7 @@
package org.eclipse.cdt.managedbuilder.ui.preferences;
import org.eclipse.cdt.core.settings.model.ICResourceDescription;
-import org.eclipse.cdt.managedbuilder.internal.ui.Messages;
+import org.eclipse.cdt.managedbuilder.ui.properties.Messages;
import org.eclipse.cdt.ui.newui.AbstractPrefPage;
import org.eclipse.cdt.ui.newui.ICPropertyTab;
@@ -26,7 +26,7 @@ public class PrefPage_NewCDTWizard extends AbstractPrefPage {
@Override
protected String getHeader() {
- return Messages.PrefPage_NewCDTWizard_0;
+ return Messages.getString("PrefPage_NewCDTWizard.0"); //$NON-NLS-1$
}
/*
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PrefPage_PropertyPage.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PrefPage_PropertyPage.java
index f863c5d8df..7449fc8995 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PrefPage_PropertyPage.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PrefPage_PropertyPage.java
@@ -14,7 +14,7 @@ package org.eclipse.cdt.managedbuilder.ui.preferences;
import org.eclipse.cdt.core.settings.model.ICResourceDescription;
import org.eclipse.cdt.ui.newui.AbstractPrefPage;
import org.eclipse.cdt.ui.newui.ICPropertyTab;
-import org.eclipse.cdt.managedbuilder.internal.ui.Messages;
+import org.eclipse.cdt.ui.newui.UIMessages;
/**
* @since 5.1
@@ -26,7 +26,7 @@ public class PrefPage_PropertyPage extends AbstractPrefPage {
@Override
protected String getHeader() {
- return Messages.PrefPage_PropertyPage_0;
+ return UIMessages.getString("PrefPage_PropertyPage.0"); //$NON-NLS-1$
}
/*
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PreferredToolchainsTab.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PreferredToolchainsTab.java
index 617f58dc64..3818198fc5 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PreferredToolchainsTab.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PreferredToolchainsTab.java
@@ -16,11 +16,12 @@ import java.util.List;
import org.eclipse.cdt.core.settings.model.ICResourceDescription;
import org.eclipse.cdt.managedbuilder.core.IToolChain;
-import org.eclipse.cdt.managedbuilder.internal.ui.Messages;
import org.eclipse.cdt.managedbuilder.ui.properties.AbstractCBuildPropertyTab;
+import org.eclipse.cdt.managedbuilder.ui.properties.Messages;
import org.eclipse.cdt.managedbuilder.ui.wizards.MBSWizardHandler;
import org.eclipse.cdt.ui.newui.CDTPrefUtil;
import org.eclipse.cdt.ui.newui.PageLayout;
+import org.eclipse.cdt.ui.newui.UIMessages;
import org.eclipse.cdt.ui.wizards.CDTMainWizardPage;
import org.eclipse.cdt.ui.wizards.CWizardHandler;
import org.eclipse.cdt.ui.wizards.EntryDescriptor;
@@ -65,7 +66,7 @@ public class PreferredToolchainsTab extends AbstractCBuildPropertyTab {
c.setLayout(new GridLayout(2, true));
Label l1 = new Label(c, SWT.NONE);
- l1.setText(Messages.CMainWizardPage_0);
+ l1.setText(UIMessages.getString("CMainWizardPage.0")); //$NON-NLS-1$
l1.setFont(parent.getFont());
l1.setLayoutData(new GridData(GridData.BEGINNING));
@@ -88,21 +89,21 @@ public class PreferredToolchainsTab extends AbstractCBuildPropertyTab {
right.setLayout(new PageLayout());
Label l = new Label(c,SWT.WRAP | SWT.CENTER);
- l.setText(Messages.PreferredToolchainsTab_0);
+ l.setText(Messages.getString("PreferredToolchainsTab.0")); //$NON-NLS-1$
GridData gd = new GridData(GridData.CENTER);
gd.horizontalSpan = 2;
l.setLayoutData(gd);
new Label(c,0).setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
pref1 = new Button(c, SWT.PUSH);
- pref1.setText(Messages.PreferredToolchainsTab_1);
+ pref1.setText(Messages.getString("PreferredToolchainsTab.1")); //$NON-NLS-1$
pref1.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
pref1.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) { setPref(true); }} );
new Label(c,0).setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
pref0 = new Button(c, SWT.PUSH);
- pref0.setText(Messages.PreferredToolchainsTab_2);
+ pref0.setText(Messages.getString("PreferredToolchainsTab.2")); //$NON-NLS-1$
pref0.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
pref0.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) { setPref(false); }} );
@@ -118,7 +119,7 @@ public class PreferredToolchainsTab extends AbstractCBuildPropertyTab {
show_sup = new Button(c, SWT.CHECK);
show_sup.setSelection(true);
- show_sup.setText(Messages.CMainWizardPage_1);
+ show_sup.setText(Messages.getString("CMainWizardPage.1")); //$NON-NLS-1$
gd = new GridData(GridData.FILL_HORIZONTAL);
gd.horizontalSpan = 2;
show_sup.setLayoutData(gd);
@@ -167,7 +168,7 @@ public class PreferredToolchainsTab extends AbstractCBuildPropertyTab {
temp = temp + ", " + iterator.next(); //$NON-NLS-1$
}
- preferredTCsLabel.setText(Messages.PreferredToolchainsTab_3 + temp);
+ preferredTCsLabel.setText(Messages.getString("PreferredToolchainsTab.3") + temp); //$NON-NLS-1$
}
}
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PropertyMultiCfgTab.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PropertyMultiCfgTab.java
index 298d838621..9e998c9f5a 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PropertyMultiCfgTab.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PropertyMultiCfgTab.java
@@ -13,7 +13,7 @@ package org.eclipse.cdt.managedbuilder.ui.preferences;
import org.eclipse.cdt.core.settings.model.ICResourceDescription;
import org.eclipse.cdt.ui.newui.AbstractCPropertyTab;
import org.eclipse.cdt.ui.newui.CDTPrefUtil;
-import org.eclipse.cdt.managedbuilder.internal.ui.Messages;
+import org.eclipse.cdt.ui.newui.UIMessages;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.layout.GridData;
@@ -49,7 +49,7 @@ public class PropertyMultiCfgTab extends AbstractCPropertyTab {
usercomp.setLayout(g);
dGrp = new Group(usercomp, SWT.NONE);
- dGrp.setText(Messages.PropertyMultiCfgTab_3);
+ dGrp.setText(UIMessages.getString("PropertyMultiCfgTab.3")); //$NON-NLS-1$
dGrp.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
FillLayout fl = new FillLayout(SWT.VERTICAL);
fl.spacing = SPACING;
@@ -58,15 +58,15 @@ public class PropertyMultiCfgTab extends AbstractCPropertyTab {
dGrp.setLayout(fl);
Label l = new Label(dGrp, SWT.WRAP);
- l.setText(Messages.PropertyMultiCfgTab_4);
+ l.setText(UIMessages.getString("PropertyMultiCfgTab.4")); //$NON-NLS-1$
d_1 = new Button(dGrp, SWT.RADIO);
- d_1.setText(Messages.PropertyMultiCfgTab_6);
+ d_1.setText(UIMessages.getString("PropertyMultiCfgTab.6")); //$NON-NLS-1$
d_2 = new Button(dGrp, SWT.RADIO);
- d_2.setText(Messages.PropertyMultiCfgTab_7);
+ d_2.setText(UIMessages.getString("PropertyMultiCfgTab.7")); //$NON-NLS-1$
wGrp = new Group(usercomp, SWT.NONE);
- wGrp.setText(Messages.PropertyMultiCfgTab_8);
+ wGrp.setText(UIMessages.getString("PropertyMultiCfgTab.8")); //$NON-NLS-1$
wGrp.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
fl = new FillLayout(SWT.VERTICAL);
fl.spacing = SPACING;
@@ -75,12 +75,12 @@ public class PropertyMultiCfgTab extends AbstractCPropertyTab {
wGrp.setLayout(fl);
l = new Label(wGrp, SWT.WRAP);
- l.setText(Messages.PropertyMultiCfgTab_9);
+ l.setText(UIMessages.getString("PropertyMultiCfgTab.9")); //$NON-NLS-1$
w_0 = new Button(wGrp, SWT.RADIO);
- w_0.setText(Messages.PropertyMultiCfgTab_10);
+ w_0.setText(UIMessages.getString("PropertyMultiCfgTab.10")); //$NON-NLS-1$
w_1 = new Button(wGrp, SWT.RADIO);
- w_1.setText(Messages.PropertyMultiCfgTab_11);
+ w_1.setText(UIMessages.getString("PropertyMultiCfgTab.11")); //$NON-NLS-1$
switch (CDTPrefUtil.getInt(CDTPrefUtil.KEY_DMODE)) {
case CDTPrefUtil.DMODE_CONJUNCTION: d_1.setSelection(true); break;
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PropertyPageDefsTab.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PropertyPageDefsTab.java
index 458f7e517a..a3015ddc98 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PropertyPageDefsTab.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PropertyPageDefsTab.java
@@ -14,7 +14,7 @@ package org.eclipse.cdt.managedbuilder.ui.preferences;
import org.eclipse.cdt.core.settings.model.ICResourceDescription;
import org.eclipse.cdt.ui.newui.AbstractCPropertyTab;
import org.eclipse.cdt.ui.newui.CDTPrefUtil;
-import org.eclipse.cdt.managedbuilder.internal.ui.Messages;
+import org.eclipse.cdt.ui.newui.UIMessages;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.layout.GridData;
@@ -55,31 +55,31 @@ public class PropertyPageDefsTab extends AbstractCPropertyTab {
usercomp.setLayout(new GridLayout(1, false));
show_mng = new Button(usercomp, SWT.CHECK);
- show_mng.setText(Messages.PropertyPageDefsTab_0);
+ show_mng.setText(UIMessages.getString("PropertyPageDefsTab.0")); //$NON-NLS-1$
show_mng.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
show_inc_files = new Button(usercomp, SWT.CHECK);
- show_inc_files.setText(Messages.PropertyPageDefsTab_showIncludeFileTab);
+ show_inc_files.setText(UIMessages.getString("PropertyPageDefsTab.showIncludeFileTab")); //$NON-NLS-1$
show_inc_files.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
show_tree = new Button(usercomp, SWT.CHECK);
- show_tree.setText(Messages.PropertyPageDefsTab_1);
+ show_tree.setText(UIMessages.getString("PropertyPageDefsTab.1")); //$NON-NLS-1$
show_tree.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
show_tool = new Button(usercomp, SWT.CHECK);
- show_tool.setText(Messages.PropertyPageDefsTab_4);
+ show_tool.setText(UIMessages.getString("PropertyPageDefsTab.4")); //$NON-NLS-1$
show_tool.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
show_exp = new Button(usercomp, SWT.CHECK);
- show_exp.setText(Messages.PropertyPageDefsTab_10);
+ show_exp.setText(UIMessages.getString("PropertyPageDefsTab.10")); //$NON-NLS-1$
show_exp.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
show_tipbox = new Button(usercomp, SWT.CHECK);
- show_tipbox.setText(Messages.PropertyPageDefsTab_16);
+ show_tipbox.setText(UIMessages.getString("PropertyPageDefsTab.16")); //$NON-NLS-1$
show_tipbox.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
Group saveGrp = new Group(usercomp, SWT.NONE);
- saveGrp.setText(Messages.PropertyPageDefsTab_11);
+ saveGrp.setText(UIMessages.getString("PropertyPageDefsTab.11")); //$NON-NLS-1$
saveGrp.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
FillLayout fl = new FillLayout(SWT.VERTICAL);
fl.spacing = SPACING;
@@ -88,14 +88,14 @@ public class PropertyPageDefsTab extends AbstractCPropertyTab {
saveGrp.setLayout(fl);
s_0 = new Button(saveGrp, SWT.RADIO);
- s_0.setText(Messages.PropertyPageDefsTab_13);
+ s_0.setText(UIMessages.getString("PropertyPageDefsTab.13")); //$NON-NLS-1$
s_1 = new Button(saveGrp, SWT.RADIO);
- s_1.setText(Messages.PropertyPageDefsTab_12);
+ s_1.setText(UIMessages.getString("PropertyPageDefsTab.12")); //$NON-NLS-1$
s_2 = new Button(saveGrp, SWT.RADIO);
- s_2.setText(Messages.PropertyPageDefsTab_14);
+ s_2.setText(UIMessages.getString("PropertyPageDefsTab.14")); //$NON-NLS-1$
Group discGrp = new Group(usercomp, SWT.NONE);
- discGrp.setText(Messages.PropertyPageDefsTab_5);
+ discGrp.setText(UIMessages.getString("PropertyPageDefsTab.5")); //$NON-NLS-1$
discGrp.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
fl = new FillLayout(SWT.VERTICAL);
fl.spacing = SPACING;
@@ -104,13 +104,13 @@ public class PropertyPageDefsTab extends AbstractCPropertyTab {
discGrp.setLayout(fl);
b_0 = new Button(discGrp, SWT.RADIO);
- b_0.setText(Messages.PropertyPageDefsTab_6);
+ b_0.setText(UIMessages.getString("PropertyPageDefsTab.6")); //$NON-NLS-1$
b_1 = new Button(discGrp, SWT.RADIO);
- b_1.setText(Messages.PropertyPageDefsTab_7);
+ b_1.setText(UIMessages.getString("PropertyPageDefsTab.7")); //$NON-NLS-1$
b_2 = new Button(discGrp, SWT.RADIO);
- b_2.setText(Messages.PropertyPageDefsTab_8);
+ b_2.setText(UIMessages.getString("PropertyPageDefsTab.8")); //$NON-NLS-1$
b_3 = new Button(discGrp, SWT.RADIO);
- b_3.setText(Messages.PropertyPageDefsTab_9);
+ b_3.setText(UIMessages.getString("PropertyPageDefsTab.9")); //$NON-NLS-1$
show_inc_files.setSelection(CDTPrefUtil.getBool(CDTPrefUtil.KEY_SHOW_INC_FILES));
show_tree.setSelection(CDTPrefUtil.getBool(CDTPrefUtil.KEY_DTREE));
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/WizardDefaultsTab.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/WizardDefaultsTab.java
index 636382cc66..ed917d2603 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/WizardDefaultsTab.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/WizardDefaultsTab.java
@@ -11,7 +11,7 @@
package org.eclipse.cdt.managedbuilder.ui.preferences;
import org.eclipse.cdt.core.settings.model.ICResourceDescription;
-import org.eclipse.cdt.managedbuilder.internal.ui.Messages;
+import org.eclipse.cdt.managedbuilder.ui.properties.Messages;
import org.eclipse.cdt.ui.newui.AbstractCPropertyTab;
import org.eclipse.cdt.ui.newui.CDTPrefUtil;
import org.eclipse.swt.SWT;
@@ -37,11 +37,11 @@ public class WizardDefaultsTab extends AbstractCPropertyTab {
usercomp.setLayout(new GridLayout(1, false));
show_sup = new Button(usercomp, SWT.CHECK);
- show_sup.setText(Messages.WizardDefaultsTab_0);
+ show_sup.setText(Messages.getString("WizardDefaultsTab.0")); //$NON-NLS-1$
show_sup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
show_oth = new Button(usercomp, SWT.CHECK);
- show_oth.setText(Messages.WizardDefaultsTab_1);
+ show_oth.setText(Messages.getString("WizardDefaultsTab.1")); //$NON-NLS-1$
show_oth.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
show_sup.setSelection(!CDTPrefUtil.getBool(CDTPrefUtil.KEY_NOSUPP));
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ArtifactTab.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ArtifactTab.java
index 10abd67ad2..b5fd41f24f 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ArtifactTab.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ArtifactTab.java
@@ -23,7 +23,6 @@ import org.eclipse.cdt.managedbuilder.core.IConfiguration;
import org.eclipse.cdt.managedbuilder.core.IMultiConfiguration;
import org.eclipse.cdt.managedbuilder.core.ITool;
import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
-import org.eclipse.cdt.managedbuilder.internal.ui.Messages;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
@@ -66,7 +65,7 @@ public class ArtifactTab extends AbstractCBuildPropertyTab {
Label l1 = new Label(usercomp, SWT.NONE);
l1.setLayoutData(new GridData(GridData.BEGINNING));
- l1.setText(Messages.ArtifactTab_0);
+ l1.setText(Messages.getString("ArtifactTab.0")); //$NON-NLS-1$
c1 = new Combo(usercomp, SWT.READ_ONLY | SWT.DROP_DOWN | SWT.BORDER);
c1.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
c1.addSelectionListener(new SelectionAdapter() {
@@ -78,7 +77,7 @@ public class ArtifactTab extends AbstractCBuildPropertyTab {
Label l2 = new Label(usercomp, SWT.NONE);
l2.setLayoutData(new GridData(GridData.BEGINNING));
- l2.setText(Messages.ArtifactTab_1);
+ l2.setText(Messages.getString("ArtifactTab.1")); //$NON-NLS-1$
t2 = setCombo(FIELD.NAME, set2);
t2.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent e) {
@@ -88,7 +87,7 @@ public class ArtifactTab extends AbstractCBuildPropertyTab {
Label l3 = new Label(usercomp, SWT.NONE);
l3.setLayoutData(new GridData(GridData.BEGINNING));
- l3.setText(Messages.ArtifactTab_2);
+ l3.setText(Messages.getString("ArtifactTab.2")); //$NON-NLS-1$
t3 = setCombo(FIELD.EXT, set3);
t3.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent e) {
@@ -98,7 +97,7 @@ public class ArtifactTab extends AbstractCBuildPropertyTab {
l4 = new Label(usercomp, SWT.NONE);
l4.setLayoutData(new GridData(GridData.BEGINNING));
- l4.setText(Messages.ArtifactTab_3);
+ l4.setText(Messages.getString("ArtifactTab.3")); //$NON-NLS-1$
t4 = setCombo(FIELD.PREF, set4);
t4.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent e) {
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildBehaviourTab.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildBehaviourTab.java
index 7acf0d9326..e436350673 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildBehaviourTab.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildBehaviourTab.java
@@ -22,7 +22,6 @@ import org.eclipse.cdt.managedbuilder.internal.buildmodel.BuildProcessManager;
import org.eclipse.cdt.managedbuilder.internal.core.Builder;
import org.eclipse.cdt.managedbuilder.internal.core.Configuration;
import org.eclipse.cdt.managedbuilder.internal.core.MultiConfiguration;
-import org.eclipse.cdt.managedbuilder.internal.ui.Messages;
import org.eclipse.cdt.newmake.core.IMakeBuilderInfo;
import org.eclipse.cdt.ui.newui.AbstractCPropertyTab;
import org.eclipse.cdt.ui.newui.ICPropertyProvider;
@@ -82,7 +81,7 @@ public class BuildBehaviourTab extends AbstractCBuildPropertyTab {
usercomp.setLayout(new GridLayout(1, false));
// Build setting group
- Group g3 = setupGroup(usercomp, Messages.BuilderSettingsTab_9, 2, GridData.FILL_HORIZONTAL);
+ Group g3 = setupGroup(usercomp, Messages.getString("BuilderSettingsTab.9"), 2, GridData.FILL_HORIZONTAL); //$NON-NLS-1$
GridLayout gl = new GridLayout(2, true);
gl.verticalSpacing = 0;
gl.marginWidth = 0;
@@ -100,7 +99,7 @@ public class BuildBehaviourTab extends AbstractCBuildPropertyTab {
gl.marginHeight = 0;
c1.setLayout(gl);
- b_stopOnError = setupCheck(c1, Messages.BuilderSettingsTab_10, 1, GridData.BEGINNING);
+ b_stopOnError = setupCheck(c1, Messages.getString("BuilderSettingsTab.10"), 1, GridData.BEGINNING); //$NON-NLS-1$
Composite c2 = new Composite(g3, SWT.NONE);
setupControl(c2, 1, GridData.FILL_BOTH);
@@ -110,7 +109,7 @@ public class BuildBehaviourTab extends AbstractCBuildPropertyTab {
gl.marginHeight = 0;
c2.setLayout(gl);
- b_parallel = setupCheck(c2, Messages.BuilderSettingsTab_11, 1, GridData.BEGINNING);
+ b_parallel = setupCheck(c2, Messages.getString("BuilderSettingsTab.11"), 1, GridData.BEGINNING); //$NON-NLS-1$
Composite c3 = new Composite(g3, SWT.NONE);
setupControl(c3, 1, GridData.FILL_BOTH);
@@ -121,7 +120,7 @@ public class BuildBehaviourTab extends AbstractCBuildPropertyTab {
c3.setLayout(gl);
b_parallelOpt= new Button(c3, SWT.RADIO);
- b_parallelOpt.setText(Messages.BuilderSettingsTab_12);
+ b_parallelOpt.setText(Messages.getString("BuilderSettingsTab.12")); //$NON-NLS-1$
setupControl(b_parallelOpt, 2, GridData.BEGINNING);
((GridData)(b_parallelOpt.getLayoutData())).horizontalIndent = 15;
b_parallelOpt.addSelectionListener(new SelectionAdapter() {
@@ -132,7 +131,7 @@ public class BuildBehaviourTab extends AbstractCBuildPropertyTab {
}});
b_parallelNum= new Button(c3, SWT.RADIO);
- b_parallelNum.setText(Messages.BuilderSettingsTab_13);
+ b_parallelNum.setText(Messages.getString("BuilderSettingsTab.13")); //$NON-NLS-1$
setupControl(b_parallelNum, 1, GridData.BEGINNING);
((GridData)(b_parallelNum.getLayoutData())).horizontalIndent = 15;
b_parallelNum.addSelectionListener(new SelectionAdapter() {
@@ -157,13 +156,13 @@ public class BuildBehaviourTab extends AbstractCBuildPropertyTab {
AccessibleListener makeTargetLabelAccessibleListener = new AccessibleAdapter() {
@Override
public void getName(AccessibleEvent e) {
- e.result = Messages.BuilderSettingsTab_16;
+ e.result = Messages.getString("BuilderSettingsTab.16"); //$NON-NLS-1$
}
};
- Group g4 = setupGroup(usercomp, Messages.BuilderSettingsTab_14, 3, GridData.FILL_HORIZONTAL);
- setupLabel(g4, Messages.BuilderSettingsTab_15, 1, GridData.BEGINNING);
- title2 = setupLabel(g4, Messages.BuilderSettingsTab_16, 2, GridData.BEGINNING);
- b_autoBuild = setupCheck(g4, Messages.BuilderSettingsTab_17, 1, GridData.BEGINNING);
+ Group g4 = setupGroup(usercomp, Messages.getString("BuilderSettingsTab.14"), 3, GridData.FILL_HORIZONTAL); //$NON-NLS-1$
+ setupLabel(g4, Messages.getString("BuilderSettingsTab.15"), 1, GridData.BEGINNING); //$NON-NLS-1$
+ title2 = setupLabel(g4, Messages.getString("BuilderSettingsTab.16"), 2, GridData.BEGINNING); //$NON-NLS-1$
+ b_autoBuild = setupCheck(g4, Messages.getString("BuilderSettingsTab.17"), 1, GridData.BEGINNING); //$NON-NLS-1$
t_autoBuild = setupBlock(g4, b_autoBuild);
t_autoBuild.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent e) {
@@ -171,8 +170,8 @@ public class BuildBehaviourTab extends AbstractCBuildPropertyTab {
setBuildAttribute(IMakeBuilderInfo.BUILD_TARGET_AUTO, t_autoBuild.getText());
}} );
t_autoBuild.getAccessible().addAccessibleListener(makeTargetLabelAccessibleListener);
- setupLabel(g4, Messages.BuilderSettingsTab_18, 3, GridData.BEGINNING);
- b_cmdBuild = setupCheck(g4, Messages.BuilderSettingsTab_19, 1, GridData.BEGINNING);
+ setupLabel(g4, Messages.getString("BuilderSettingsTab.18"), 3, GridData.BEGINNING); //$NON-NLS-1$
+ b_cmdBuild = setupCheck(g4, Messages.getString("BuilderSettingsTab.19"), 1, GridData.BEGINNING); //$NON-NLS-1$
t_cmdBuild = setupBlock(g4, b_cmdBuild);
t_cmdBuild.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent e) {
@@ -180,7 +179,7 @@ public class BuildBehaviourTab extends AbstractCBuildPropertyTab {
setBuildAttribute(IMakeBuilderInfo.BUILD_TARGET_INCREMENTAL, t_cmdBuild.getText());
}} );
t_cmdBuild.getAccessible().addAccessibleListener(makeTargetLabelAccessibleListener);
- b_cmdClean = setupCheck(g4, Messages.BuilderSettingsTab_20, 1, GridData.BEGINNING);
+ b_cmdClean = setupCheck(g4, Messages.getString("BuilderSettingsTab.20"), 1, GridData.BEGINNING); //$NON-NLS-1$
t_cmdClean = setupBlock(g4, b_cmdClean);
t_cmdClean.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent e) {
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildOptionSettingsUI.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildOptionSettingsUI.java
index 7e6c9955cc..73e2d99454 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildOptionSettingsUI.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildOptionSettingsUI.java
@@ -34,7 +34,6 @@ import org.eclipse.cdt.managedbuilder.core.ITool;
import org.eclipse.cdt.managedbuilder.core.IToolChain;
import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
import org.eclipse.cdt.managedbuilder.internal.core.MultiResourceInfo;
-import org.eclipse.cdt.managedbuilder.internal.ui.Messages;
import org.eclipse.cdt.managedbuilder.macros.BuildMacroException;
import org.eclipse.cdt.managedbuilder.macros.IBuildMacroProvider;
import org.eclipse.cdt.ui.newui.AbstractPage;
@@ -208,7 +207,7 @@ public class BuildOptionSettingsUI extends AbstractToolSettingUI {
String contextId = opt.getContextId();
if (pageHasToolTipBox && (tipStr==null || tipStr.trim().length()==0)) {
- tipStr = Messages.BuildOptionSettingsUI_0;
+ tipStr = Messages.getString("BuildOptionSettingsUI.0"); //$NON-NLS-1$
}
try {
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildStepsTab.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildStepsTab.java
index dd2f60fcfa..e82ed116da 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildStepsTab.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildStepsTab.java
@@ -29,7 +29,7 @@ import org.eclipse.cdt.managedbuilder.core.IResourceConfiguration;
import org.eclipse.cdt.managedbuilder.core.IResourceInfo;
import org.eclipse.cdt.managedbuilder.core.ITool;
import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
-import org.eclipse.cdt.managedbuilder.internal.ui.Messages;
+import org.eclipse.cdt.ui.newui.UIMessages;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
@@ -58,8 +58,8 @@ public class BuildStepsTab extends AbstractCBuildPropertyTab {
private IFileInfo rcfg;
private boolean canModify = true;
- private static final String label1 = Messages.BuildStepsTab_0;
- private static final String label2 = Messages.BuildStepsTab_1;
+ private static final String label1 = Messages.getString("BuildStepsTab.0"); //$NON-NLS-1$
+ private static final String label2 = Messages.getString("BuildStepsTab.1"); //$NON-NLS-1$
private static final String PATH_SEPERATOR = ";"; //$NON-NLS-1$
private static final String rcbsToolId = new String("org.eclipse.cdt.managedbuilder.ui.rcbs"); //$NON-NLS-1$
private static final String rcbsToolName = new String("Resource Custom Build Step"); //$NON-NLS-1$
@@ -68,6 +68,14 @@ public class BuildStepsTab extends AbstractCBuildPropertyTab {
private static final String rcbsToolOutputTypeId = new String("org.eclipse.cdt.managedbuilder.ui.rcbs.outputtype"); //$NON-NLS-1$
private static final String rcbsToolOutputTypeName = new String("Resource Custom Build Step Output Type"); //$NON-NLS-1$
+ private static final String PREFIX = "ResourceCustomBuildStepBlock"; //$NON-NLS-1$
+ private static final String LABEL = PREFIX + ".label"; //$NON-NLS-1$
+ private static final String RCBS_APPLICABILITY = LABEL + ".applicability"; //$NON-NLS-1$
+ private static final String RCBS_BEFORE = LABEL + ".applicability.rule.before"; //$NON-NLS-1$
+ private static final String RCBS_AFTER = LABEL + ".applicability.rule.after"; //$NON-NLS-1$
+ private static final String RCBS_OVERRIDE = LABEL + ".applicability.rule.override"; //$NON-NLS-1$
+ private static final String RCBS_DISABLE = LABEL + ".applicability.rule.disable"; //$NON-NLS-1$
+
private enum FIELD {PRECMD, PREANN, PSTCMD, PSTANN}
private Set<String> set1 = new TreeSet<String>();
private Set<String> set2 = new TreeSet<String>();
@@ -75,10 +83,10 @@ public class BuildStepsTab extends AbstractCBuildPropertyTab {
private Set<String> set4 = new TreeSet<String>();
private static final String[] rcbsApplicabilityRules = {
- new String(Messages.ResourceCustomBuildStepBlock_label_applicability_rule_override),
-// new String(ManagedBuilderMessages_getResourceString("ResourceCustomBuildStepBlock_label_applicability_rule_before")),
-// new String(ManagedBuilderMessages_getResourceString("ResourceCustomBuildStepBlock_label_applicability_rule_after")),
- new String(Messages.ResourceCustomBuildStepBlock_label_applicability_rule_disable),
+ new String(UIMessages.getString(RCBS_OVERRIDE)),
+// new String(ManagedBuilderUIMessages.getResourceString(RCBS_BEFORE)),
+// new String(ManagedBuilderUIMessages.getResourceString(RCBS_AFTER)),
+ new String(UIMessages.getString(RCBS_DISABLE)),
};
@@ -97,7 +105,7 @@ public class BuildStepsTab extends AbstractCBuildPropertyTab {
*
*/
private void createForProject() {
- Group g1 = setupGroup (usercomp, Messages.BuildStepsTab_2, 1, GridData.FILL_HORIZONTAL);
+ Group g1 = setupGroup (usercomp, Messages.getString("BuildStepsTab.2"), 1, GridData.FILL_HORIZONTAL); //$NON-NLS-1$
setupLabel(g1, label1, 1, GridData.BEGINNING);
preCmd = setCombo(g1, FIELD.PRECMD, set1);
preCmd.addModifyListener(new ModifyListener() {
@@ -116,7 +124,7 @@ public class BuildStepsTab extends AbstractCBuildPropertyTab {
getCfg().setPreannouncebuildStep(preDes.getText());
}});
- Group g2 = setupGroup (usercomp, Messages.BuildStepsTab_3, 1, GridData.FILL_HORIZONTAL);
+ Group g2 = setupGroup (usercomp, Messages.getString("BuildStepsTab.3"), 1, GridData.FILL_HORIZONTAL); //$NON-NLS-1$
setupLabel(g2, label1, 1, GridData.BEGINNING);
postCmd = setCombo(g2, FIELD.PSTCMD, set3);
postCmd.addModifyListener(new ModifyListener() {
@@ -140,8 +148,8 @@ public class BuildStepsTab extends AbstractCBuildPropertyTab {
*
*/
private void createForFile() {
- Group g1 = setupGroup (usercomp, Messages.BuildStepsTab_4, 1, GridData.FILL_HORIZONTAL);
- setupLabel(g1, Messages.ResourceCustomBuildStepBlock_label_applicability, 1, GridData.BEGINNING);
+ Group g1 = setupGroup (usercomp, Messages.getString("BuildStepsTab.4"), 1, GridData.FILL_HORIZONTAL); //$NON-NLS-1$
+ setupLabel(g1, UIMessages.getString(RCBS_APPLICABILITY), 1, GridData.BEGINNING);
combo = new Combo(g1, SWT.READ_ONLY | SWT.DROP_DOWN | SWT.BORDER);
combo.setItems(rcbsApplicabilityRules);
@@ -151,7 +159,7 @@ public class BuildStepsTab extends AbstractCBuildPropertyTab {
rcfg.setRcbsApplicability(sel2app(combo.getSelectionIndex()));
}});
- setupLabel(g1, Messages.BuildStepsTab_5, 1, GridData.BEGINNING);
+ setupLabel(g1, Messages.getString("BuildStepsTab.5"), 1, GridData.BEGINNING); //$NON-NLS-1$
preCmd = setCombo(g1, FIELD.PRECMD, set1);
preCmd.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent e) {
@@ -166,7 +174,7 @@ public class BuildStepsTab extends AbstractCBuildPropertyTab {
}
}});
- setupLabel(g1, Messages.BuildStepsTab_6, 1, GridData.BEGINNING);
+ setupLabel(g1, Messages.getString("BuildStepsTab.6"), 1, GridData.BEGINNING); //$NON-NLS-1$
preDes = setCombo(g1, FIELD.PREANN, set2);
preDes.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent e) {
@@ -351,11 +359,11 @@ public class BuildStepsTab extends AbstractCBuildPropertyTab {
private int sel2app(int index){
String sel = combo.getItem(index);
- if(Messages.ResourceCustomBuildStepBlock_label_applicability_rule_override.equals(sel)){
+ if(UIMessages.getString(RCBS_OVERRIDE).equals(sel)){
return IResourceConfiguration.KIND_APPLY_RCBS_TOOL_AS_OVERRIDE;
- } else if(Messages.ResourceCustomBuildStepBlock_label_applicability_rule_after.equals(sel)){
+ } else if(UIMessages.getString(RCBS_AFTER).equals(sel)){
return IResourceConfiguration.KIND_APPLY_RCBS_TOOL_AFTER;
- } else if(Messages.ResourceCustomBuildStepBlock_label_applicability_rule_before.equals(sel)){
+ } else if(UIMessages.getString(RCBS_BEFORE).equals(sel)){
return IResourceConfiguration.KIND_APPLY_RCBS_TOOL_BEFORE;
}
return IResourceConfiguration.KIND_DISABLE_RCBS_TOOL;
@@ -366,14 +374,14 @@ public class BuildStepsTab extends AbstractCBuildPropertyTab {
private int app2sel(int val){
switch(val){
case IResourceConfiguration.KIND_APPLY_RCBS_TOOL_AFTER:
- return combo.indexOf(Messages.ResourceCustomBuildStepBlock_label_applicability_rule_after);
+ return combo.indexOf(UIMessages.getString(RCBS_AFTER));
case IResourceConfiguration.KIND_APPLY_RCBS_TOOL_BEFORE:
- return combo.indexOf(Messages.ResourceCustomBuildStepBlock_label_applicability_rule_before);
+ return combo.indexOf(UIMessages.getString(RCBS_BEFORE));
case IResourceConfiguration.KIND_DISABLE_RCBS_TOOL:
- return combo.indexOf(Messages.ResourceCustomBuildStepBlock_label_applicability_rule_disable);
+ return combo.indexOf(UIMessages.getString(RCBS_DISABLE));
case IResourceConfiguration.KIND_APPLY_RCBS_TOOL_AS_OVERRIDE:
default:
- return combo.indexOf(Messages.ResourceCustomBuildStepBlock_label_applicability_rule_override);
+ return combo.indexOf(UIMessages.getString(RCBS_OVERRIDE));
}
}
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildToolSettingUI.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildToolSettingUI.java
index 685cf46fee..5fb1b416ce 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildToolSettingUI.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildToolSettingUI.java
@@ -25,7 +25,7 @@ import org.eclipse.cdt.managedbuilder.core.ITool;
import org.eclipse.cdt.managedbuilder.internal.core.MultiResourceInfo;
import org.eclipse.cdt.ui.newui.AbstractCPropertyTab;
import org.eclipse.cdt.ui.newui.MultiLineTextFieldEditor;
-import org.eclipse.cdt.managedbuilder.internal.ui.Messages;
+import org.eclipse.cdt.ui.newui.UIMessages;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.preference.FieldEditor;
import org.eclipse.jface.preference.StringFieldEditor;
@@ -85,7 +85,13 @@ public class BuildToolSettingUI extends AbstractToolSettingUI {
// Data members
// all build options field editor label
- private static final String ALL_OPTIONS = Messages.BuildToolSettingsPage_alloptions;
+ private static final String ALL_OPTIONS = UIMessages.getString("BuildToolSettingsPage.alloptions"); //$NON-NLS-1$
+ // Field editor label for tool command
+ private static final String COMMAND = "BuildToolSettingsPage.tool.command"; //$NON-NLS-1$
+ // Advanced settings label
+ private static final String ADVANCED_GROUP = "BuildToolSettingsPage.tool.advancedSettings"; //$NON-NLS-1$
+ // Field editor label for tool command line pattern
+ private static final String COMMAND_LINE_PATTERN = "BuildToolSettingsPage.tool.commandLinePattern"; //$NON-NLS-1$
private static final String DEFAULT_SEPERATOR = ";"; //$NON-NLS-1$
// Whitespace character
@@ -140,7 +146,7 @@ public class BuildToolSettingUI extends AbstractToolSettingUI {
Composite parent = getFieldEditorParent();
FontMetrics fm = AbstractCPropertyTab.getFontMetrics(parent);
commandStringField = new StringFieldEditor(fTool.getId(),
- Messages.BuildToolSettingsPage_tool_command,
+ UIMessages.getString(COMMAND),
parent);
commandStringField.setEmptyStringAllowed(false);
GridData gd = ((GridData)commandStringField.getTextControl(parent).getLayoutData());
@@ -158,12 +164,12 @@ public class BuildToolSettingUI extends AbstractToolSettingUI {
addField(allOptionFieldEditor);
addField( createLabelEditor( getFieldEditorParent(), WHITESPACE ) );
- addField( createLabelEditor( getFieldEditorParent(), Messages.BuildToolSettingsPage_tool_advancedSettings ) );
+ addField( createLabelEditor( getFieldEditorParent(), UIMessages.getString(ADVANCED_GROUP) ) );
// Add a string editor to edit the tool command line pattern
parent = getFieldEditorParent();
commandLinePatternField = new StringFieldEditor(fTool.getId() + ToolSettingsPrefStore.COMMAND_LINE_SUFFIX,
- Messages.BuildToolSettingsPage_tool_commandLinePattern,
+ UIMessages.getString(COMMAND_LINE_PATTERN),
parent);
gd = ((GridData)commandLinePatternField.getTextControl(parent).getLayoutData());
gd.grabExcessHorizontalSpace = true;
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuilderSettingsTab.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuilderSettingsTab.java
index 1ac54359f7..3aa51032ae 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuilderSettingsTab.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuilderSettingsTab.java
@@ -19,7 +19,6 @@ import org.eclipse.cdt.managedbuilder.core.IConfiguration;
import org.eclipse.cdt.managedbuilder.core.IMultiConfiguration;
import org.eclipse.cdt.managedbuilder.internal.core.Configuration;
import org.eclipse.cdt.managedbuilder.internal.core.MultiConfiguration;
-import org.eclipse.cdt.managedbuilder.internal.ui.Messages;
import org.eclipse.cdt.ui.newui.AbstractCPropertyTab;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.swt.SWT;
@@ -69,12 +68,12 @@ public class BuilderSettingsTab extends AbstractCBuildPropertyTab {
usercomp.setLayout(new GridLayout(1, false));
// Builder group
- Group g1 = setupGroup(usercomp, Messages.BuilderSettingsTab_0, 3, GridData.FILL_HORIZONTAL);
- setupLabel(g1, Messages.BuilderSettingsTab_1, 1, GridData.BEGINNING);
+ Group g1 = setupGroup(usercomp, Messages.getString("BuilderSettingsTab.0"), 3, GridData.FILL_HORIZONTAL); //$NON-NLS-1$
+ setupLabel(g1, Messages.getString("BuilderSettingsTab.1"), 1, GridData.BEGINNING); //$NON-NLS-1$
c_builderType = new Combo(g1, SWT.READ_ONLY | SWT.DROP_DOWN | SWT.BORDER);
setupControl(c_builderType, 2, GridData.FILL_HORIZONTAL);
- c_builderType.add(Messages.BuilderSettingsTab_2);
- c_builderType.add(Messages.BuilderSettingsTab_3);
+ c_builderType.add(Messages.getString("BuilderSettingsTab.2")); //$NON-NLS-1$
+ c_builderType.add(Messages.getString("BuilderSettingsTab.3")); //$NON-NLS-1$
c_builderType.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent event) {
@@ -82,9 +81,9 @@ public class BuilderSettingsTab extends AbstractCBuildPropertyTab {
updateButtons();
}});
- b_useDefault = setupCheck(g1, Messages.BuilderSettingsTab_4, 3, GridData.BEGINNING);
+ b_useDefault = setupCheck(g1, Messages.getString("BuilderSettingsTab.4"), 3, GridData.BEGINNING); //$NON-NLS-1$
- setupLabel(g1, Messages.BuilderSettingsTab_5, 1, GridData.BEGINNING);
+ setupLabel(g1, Messages.getString("BuilderSettingsTab.5"), 1, GridData.BEGINNING); //$NON-NLS-1$
t_buildCmd = setupBlock(g1, b_useDefault);
t_buildCmd.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent e) {
@@ -100,15 +99,15 @@ public class BuilderSettingsTab extends AbstractCBuildPropertyTab {
}
}});
- Group g2 = setupGroup(usercomp, Messages.BuilderSettingsTab_6, 2, GridData.FILL_HORIZONTAL);
+ Group g2 = setupGroup(usercomp, Messages.getString("BuilderSettingsTab.6"), 2, GridData.FILL_HORIZONTAL); //$NON-NLS-1$
((GridLayout)(g2.getLayout())).makeColumnsEqualWidth = true;
- b_genMakefileAuto = setupCheck(g2, Messages.BuilderSettingsTab_7, 1, GridData.BEGINNING);
- b_expandVars = setupCheck(g2, Messages.BuilderSettingsTab_8, 1, GridData.BEGINNING);
+ b_genMakefileAuto = setupCheck(g2, Messages.getString("BuilderSettingsTab.7"), 1, GridData.BEGINNING); //$NON-NLS-1$
+ b_expandVars = setupCheck(g2, Messages.getString("BuilderSettingsTab.8"), 1, GridData.BEGINNING); //$NON-NLS-1$
// Build location group
- group_dir = setupGroup(usercomp, Messages.BuilderSettingsTab_21, 2, GridData.FILL_HORIZONTAL);
- setupLabel(group_dir, Messages.BuilderSettingsTab_22, 1, GridData.BEGINNING);
+ group_dir = setupGroup(usercomp, Messages.getString("BuilderSettingsTab.21"), 2, GridData.FILL_HORIZONTAL); //$NON-NLS-1$
+ setupLabel(group_dir, Messages.getString("BuilderSettingsTab.22"), 1, GridData.BEGINNING); //$NON-NLS-1$
t_dir = setupText(group_dir, 1, GridData.FILL_HORIZONTAL);
t_dir.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent e) {
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/CPropertyVarsTab.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/CPropertyVarsTab.java
index bc3273d9a6..7c65aace9b 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/CPropertyVarsTab.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/CPropertyVarsTab.java
@@ -32,7 +32,7 @@ import org.eclipse.cdt.ui.newui.AbstractCPropertyTab;
import org.eclipse.cdt.ui.newui.AbstractPage;
import org.eclipse.cdt.ui.newui.CDTPrefUtil;
import org.eclipse.cdt.ui.newui.PrefPage_Abstract;
-import org.eclipse.cdt.managedbuilder.internal.ui.Messages;
+import org.eclipse.cdt.ui.newui.UIMessages;
import org.eclipse.cdt.utils.cdtvariables.CdtVariableResolver;
import org.eclipse.cdt.utils.envvar.EnvVarOperationProcessor;
import org.eclipse.core.runtime.CoreException;
@@ -82,6 +82,36 @@ import org.eclipse.swt.widgets.TableColumn;
* @noinstantiate This class is not intended to be instantiated by clients.
*/
public class CPropertyVarsTab extends AbstractCPropertyTab {
+ /*
+ * String constants
+ */
+ private static final String PREFIX = "MacrosBlock"; //$NON-NLS-1$
+ private static final String LABEL = PREFIX + ".label"; //$NON-NLS-1$
+
+ private static final String HEADER = LABEL + ".header"; //$NON-NLS-1$
+ private static final String HEADER_NAME = HEADER + ".name"; //$NON-NLS-1$
+ private static final String HEADER_TYPE = HEADER + ".type"; //$NON-NLS-1$
+ private static final String HEADER_VALUE = HEADER + ".value"; //$NON-NLS-1$
+
+ private static final String TYPE = LABEL + ".type"; //$NON-NLS-1$
+ private static final String TYPE_TEXT = TYPE + ".text"; //$NON-NLS-1$
+ private static final String TYPE_TEXT_LIST = TYPE + ".text.list"; //$NON-NLS-1$
+ private static final String TYPE_PATH_FILE = TYPE + ".path.file"; //$NON-NLS-1$
+ private static final String TYPE_PATH_FILE_LIST = TYPE + ".path.file.list"; //$NON-NLS-1$
+ private static final String TYPE_PATH_DIR = TYPE + ".path.dir"; //$NON-NLS-1$
+ private static final String TYPE_PATH_DIR_LIST = TYPE + ".path.dir.list"; //$NON-NLS-1$
+ private static final String TYPE_PATH_ANY = TYPE + ".path.any"; //$NON-NLS-1$
+ private static final String TYPE_PATH_ANY_LIST = TYPE + ".path.any.list"; //$NON-NLS-1$
+
+ private static final String DELETE_CONFIRM_TITLE = LABEL + ".delete.confirm.title"; //$NON-NLS-1$
+ private static final String DELETE_CONFIRM_MESSAGE = LABEL + ".delete.confirm.message"; //$NON-NLS-1$
+
+ private static final String DELETE_ALL_CONFIRM_TITLE = LABEL + ".delete.all.confirm.title"; //$NON-NLS-1$
+ private static final String DELETE_ALL_CONFIRM_MESSAGE = LABEL + ".delete.all.confirm.message"; //$NON-NLS-1$
+
+ private static final String VALUE = LABEL + ".value"; //$NON-NLS-1$
+ private static final String VALUE_ECLIPSE_DYNAMIC = VALUE + ".eclipse.dynamic"; //$NON-NLS-1$
+
private static final String VALUE_DELIMITER = " || "; //$NON-NLS-1$
private static final ICdtVariableManager vmgr = CCorePlugin.getDefault().getCdtVariableManager();
@@ -111,9 +141,9 @@ public class CPropertyVarsTab extends AbstractCPropertyTab {
};
private static final String[] fTableColumnNames = new String[] {
- Messages.MacrosBlock_label_header_name,
- Messages.MacrosBlock_label_header_type,
- Messages.MacrosBlock_label_header_value,
+ UIMessages.getString(HEADER_NAME),
+ UIMessages.getString(HEADER_TYPE),
+ UIMessages.getString(HEADER_VALUE),
};
private static final ColumnLayoutData[] fTableColumnLayouts = {new ColumnPixelData(100), new ColumnPixelData(100), new ColumnPixelData(250)};
@@ -147,21 +177,21 @@ public class CPropertyVarsTab extends AbstractCPropertyTab {
case 1:
switch(var.getValueType()){
case ICdtVariable.VALUE_PATH_FILE:
- return Messages.MacrosBlock_label_type_path_file;
+ return UIMessages.getString(TYPE_PATH_FILE);
case ICdtVariable.VALUE_PATH_FILE_LIST:
- return Messages.MacrosBlock_label_type_path_file_list;
+ return UIMessages.getString(TYPE_PATH_FILE_LIST);
case ICdtVariable.VALUE_PATH_DIR:
- return Messages.MacrosBlock_label_type_path_dir;
+ return UIMessages.getString(TYPE_PATH_DIR);
case ICdtVariable.VALUE_PATH_DIR_LIST:
- return Messages.MacrosBlock_label_type_path_dir_list;
+ return UIMessages.getString(TYPE_PATH_DIR_LIST);
case ICdtVariable.VALUE_PATH_ANY:
- return Messages.MacrosBlock_label_type_path_any;
+ return UIMessages.getString(TYPE_PATH_ANY);
case ICdtVariable.VALUE_PATH_ANY_LIST:
- return Messages.MacrosBlock_label_type_path_any_list;
+ return UIMessages.getString(TYPE_PATH_ANY_LIST);
case ICdtVariable.VALUE_TEXT:
- return Messages.MacrosBlock_label_type_text;
+ return UIMessages.getString(TYPE_TEXT);
case ICdtVariable.VALUE_TEXT_LIST:
- return Messages.MacrosBlock_label_type_text_list;
+ return UIMessages.getString(TYPE_TEXT_LIST);
default:
return "? " + var.getValueType(); //$NON-NLS-1$
}
@@ -293,8 +323,8 @@ public class CPropertyVarsTab extends AbstractCPropertyTab {
ICdtVariable macros[] = getSelectedUserMacros();
if(macros != null && macros.length > 0){
if(MessageDialog.openQuestion(usercomp.getShell(),
- Messages.MacrosBlock_label_delete_confirm_title,
- Messages.MacrosBlock_label_delete_confirm_message)){
+ UIMessages.getString(DELETE_CONFIRM_TITLE),
+ UIMessages.getString(DELETE_CONFIRM_MESSAGE))){
for(int i = 0; i < macros.length; i++){
if (cfgd != null) {
if (page.isMultiCfg() && cfgd instanceof ICMultiItemsHolder) {
@@ -330,8 +360,8 @@ public class CPropertyVarsTab extends AbstractCPropertyTab {
@Override
protected void performDefaults() {
if(MessageDialog.openQuestion(usercomp.getShell(),
- Messages.MacrosBlock_label_delete_all_confirm_title,
- Messages.MacrosBlock_label_delete_all_confirm_message)){
+ UIMessages.getString(DELETE_ALL_CONFIRM_TITLE),
+ UIMessages.getString(DELETE_ALL_CONFIRM_MESSAGE))){
if (cfgd != null) {
if (page.isMultiCfg() && cfgd instanceof ICMultiItemsHolder) {
ICConfigurationDescription[] cfs = (ICConfigurationDescription[])((ICMultiItemsHolder)cfgd).getItems();
@@ -359,7 +389,7 @@ public class CPropertyVarsTab extends AbstractCPropertyTab {
// Create a "show parent levels" button
final Button b = new Button(usercomp, SWT.CHECK);
b.setFont(usercomp.getFont());
- b.setText(Messages.CPropertyVarsTab_0);
+ b.setText(Messages.getString("CPropertyVarsTab.0")); //$NON-NLS-1$
b.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
b.setSelection(fShowSysMacros);
b.addSelectionListener(new SelectionAdapter() {
@@ -372,7 +402,7 @@ public class CPropertyVarsTab extends AbstractCPropertyTab {
lb1 = new Label(usercomp, SWT.BORDER | SWT.CENTER);
lb1.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- lb1.setToolTipText(Messages.EnvironmentTab_15);
+ lb1.setToolTipText(UIMessages.getString("EnvironmentTab.15")); //$NON-NLS-1$
lb1.addMouseListener(new MouseAdapter() {
@Override
public void mouseDoubleClick(MouseEvent e) {
@@ -389,7 +419,7 @@ public class CPropertyVarsTab extends AbstractCPropertyTab {
lb2 = new Label(usercomp, SWT.BORDER | SWT.CENTER);
lb2.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- lb2.setToolTipText(Messages.EnvironmentTab_23);
+ lb2.setToolTipText(UIMessages.getString("EnvironmentTab.23")); //$NON-NLS-1$
lb2.addMouseListener(new MouseAdapter() {
@Override
public void mouseDoubleClick(MouseEvent e) {
@@ -591,7 +621,7 @@ public class CPropertyVarsTab extends AbstractCPropertyTab {
private String getString(ICdtVariable v) {
if (fUserSup.isDynamic(v))
- return Messages.MacrosBlock_label_value_eclipse_dynamic;
+ return UIMessages.getString(VALUE_ECLIPSE_DYNAMIC);
String value = EMPTY_STR;
try {
if (CdtVariableResolver.isStringListVariable(v.getValueType()))
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/DiscoveryTab.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/DiscoveryTab.java
index 22d2fdd055..d5cff7c662 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/DiscoveryTab.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/DiscoveryTab.java
@@ -46,7 +46,7 @@ import org.eclipse.cdt.managedbuilder.core.ITool;
import org.eclipse.cdt.managedbuilder.core.IToolChain;
import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.cdt.ui.newui.CDTPrefUtil;
-import org.eclipse.cdt.managedbuilder.internal.ui.Messages;
+import org.eclipse.cdt.ui.newui.UIMessages;
import org.eclipse.cdt.utils.ui.controls.ControlFactory;
import org.eclipse.cdt.utils.ui.controls.TabFolderLayout;
import org.eclipse.core.resources.IProject;
@@ -129,13 +129,13 @@ public class DiscoveryTab extends AbstractCBuildPropertyTab implements IBuildInf
usercomp.setLayout(new GridLayout(1, false));
if (page.isForProject() || page.isForPrefs()) {
- Group scopeGroup = setupGroup(usercomp, Messages.DiscoveryTab_0,
+ Group scopeGroup = setupGroup(usercomp, Messages.getString("DiscoveryTab.0"), //$NON-NLS-1$
1, GridData.FILL_HORIZONTAL);
scopeGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
scopeComboBox = new Combo(scopeGroup, SWT.DROP_DOWN | SWT.READ_ONLY | SWT.BORDER);
scopeComboBox.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- scopeComboBox.add(Messages.DiscoveryTab_1);
- scopeComboBox.add(Messages.DiscoveryTab_2);
+ scopeComboBox.add(Messages.getString("DiscoveryTab.1")); //$NON-NLS-1$
+ scopeComboBox.add(Messages.getString("DiscoveryTab.2")); //$NON-NLS-1$
scopeComboBox.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
@@ -187,10 +187,10 @@ public class DiscoveryTab extends AbstractCBuildPropertyTab implements IBuildInf
}
private void createScannerConfigControls(Composite parent) {
- autoDiscoveryGroup = setupGroup(parent, Messages.ScannerConfigOptionsDialog_scGroup_label,
+ autoDiscoveryGroup = setupGroup(parent, UIMessages.getString("ScannerConfigOptionsDialog.scGroup.label"), //$NON-NLS-1$
2, GridData.FILL_HORIZONTAL);
- autoDiscoveryCheckBox = setupCheck(autoDiscoveryGroup, Messages.ScannerConfigOptionsDialog_scGroup_enabled_button,
+ autoDiscoveryCheckBox = setupCheck(autoDiscoveryGroup, UIMessages.getString("ScannerConfigOptionsDialog.scGroup.enabled.button"), //$NON-NLS-1$
2, GridData.FILL_HORIZONTAL);
autoDiscoveryCheckBox.addSelectionListener(new SelectionAdapter() {
@Override
@@ -206,7 +206,7 @@ public class DiscoveryTab extends AbstractCBuildPropertyTab implements IBuildInf
}
});
reportProblemsCheckBox = setupCheck(autoDiscoveryGroup,
- Messages.ScannerConfigOptionsDialog_scGroup_problemReporting_enabled_button,
+ UIMessages.getString("ScannerConfigOptionsDialog.scGroup.problemReporting.enabled.button"), //$NON-NLS-1$
2, GridData.FILL_HORIZONTAL);
reportProblemsCheckBox.addSelectionListener(new SelectionAdapter() {
@Override
@@ -216,7 +216,7 @@ public class DiscoveryTab extends AbstractCBuildPropertyTab implements IBuildInf
});
// Add profile combo box
- setupLabel(autoDiscoveryGroup, Messages.ScannerConfigOptionsDialog_scGroup_selectedProfile_combo,
+ setupLabel(autoDiscoveryGroup, UIMessages.getString("ScannerConfigOptionsDialog.scGroup.selectedProfile.combo"), //$NON-NLS-1$
1, GridData.BEGINNING);
profileComboBox = new Combo(autoDiscoveryGroup, SWT.DROP_DOWN | SWT.READ_ONLY | SWT.BORDER);
profileComboBox.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
@@ -232,10 +232,10 @@ public class DiscoveryTab extends AbstractCBuildPropertyTab implements IBuildInf
// "Clear" label
@SuppressWarnings("unused")
- Label clearLabel = ControlFactory.createLabel(autoDiscoveryGroup, Messages.DiscoveryTab_ClearDisoveredEntries);
+ Label clearLabel = ControlFactory.createLabel(autoDiscoveryGroup, Messages.getString("DiscoveryTab.ClearDisoveredEntries")); //$NON-NLS-1$
// "Clear" button
- Button clearButton = ControlFactory.createPushButton(autoDiscoveryGroup, Messages.DiscoveryTab_Clear);
+ Button clearButton = ControlFactory.createPushButton(autoDiscoveryGroup, Messages.getString("DiscoveryTab.Clear")); //$NON-NLS-1$
GridData gd = (GridData) clearButton.getLayoutData();
gd.grabExcessHorizontalSpace = false;
gd.widthHint = 80;
@@ -245,12 +245,12 @@ public class DiscoveryTab extends AbstractCBuildPropertyTab implements IBuildInf
clearButton.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent event) {
- String title = Messages.DiscoveryTab_ClearEntries;
+ String title = Messages.getString("DiscoveryTab.ClearEntries"); //$NON-NLS-1$
try {
clearDiscoveredEntries();
- MessageDialog.openInformation(shell, title, Messages.DiscoveryTab_DiscoveredEntriesCleared);
+ MessageDialog.openInformation(shell, title, Messages.getString("DiscoveryTab.DiscoveredEntriesCleared")); //$NON-NLS-1$
} catch (CoreException e) {
- MessageDialog.openError(shell, title, Messages.DiscoveryTab_ErrorClearingEntries + e.getLocalizedMessage());
+ MessageDialog.openError(shell, title, Messages.getString("DiscoveryTab.ErrorClearingEntries") + e.getLocalizedMessage()); //$NON-NLS-1$
}
}
});
@@ -287,10 +287,10 @@ public class DiscoveryTab extends AbstractCBuildPropertyTab implements IBuildInf
private void updateData() {
int selScope = 0;
- String lblText = Messages.DiscoveryTab_5;
+ String lblText = Messages.getString("DiscoveryTab.5"); //$NON-NLS-1$
if (!cbi.isPerRcTypeDiscovery()) {
selScope = 1;
- lblText = Messages.DiscoveryTab_8;
+ lblText = Messages.getString("DiscoveryTab.8"); //$NON-NLS-1$
}
if (scopeComboBox != null)
scopeComboBox.select(selScope);
@@ -316,7 +316,7 @@ public class DiscoveryTab extends AbstractCBuildPropertyTab implements IBuildInf
s = tool.getName();
}
if (s == null)
- s = Messages.DiscoveryTab_3;
+ s = Messages.getString("DiscoveryTab.3"); //$NON-NLS-1$
}
IScannerConfigBuilderInfo2 bi2 = infoMap.get(cfgInfoContext);
TableItem ti = new TableItem(resTable, SWT.NONE);
@@ -330,7 +330,7 @@ public class DiscoveryTab extends AbstractCBuildPropertyTab implements IBuildInf
resTable.select((pos < len && pos > -1) ? pos : 0);
handleToolSelected();
} else {
- setVisibility(Messages.DiscoveryTab_6);
+ setVisibility(Messages.getString("DiscoveryTab.6")); //$NON-NLS-1$
}
}
@@ -599,7 +599,7 @@ public class DiscoveryTab extends AbstractCBuildPropertyTab implements IBuildInf
ManagedBuilderUIPlugin.log(e);
}
} else {
- CUIPlugin.getDefault().logErrorMessage(Messages.DiscoveryTab_7);
+ CUIPlugin.getDefault().logErrorMessage(Messages.getString("DiscoveryTab.7")); //$NON-NLS-1$
}
}
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/Messages.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/Messages.java
index 84cdda98b0..cf8f55f78e 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/Messages.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/Messages.java
@@ -10,17 +10,27 @@
*******************************************************************************/
package org.eclipse.cdt.managedbuilder.ui.properties;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
/**
* @noextend This class is not intended to be subclassed by clients.
* @noinstantiate This class is not intended to be instantiated by clients.
- * @deprecated. This class is not used. Use {@link org.eclipse.cdt.managedbuilder.internal.ui} instead.
*/
-@Deprecated
public class Messages {
+ private static final String BUNDLE_NAME = "org.eclipse.cdt.managedbuilder.ui.properties.messages"; //$NON-NLS-1$
+
+ private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
+ .getBundle(BUNDLE_NAME);
+
private Messages() {
}
public static String getString(String key) {
- return '!' + key + '!';
+ try {
+ return RESOURCE_BUNDLE.getString(key);
+ } catch (MissingResourceException e) {
+ return '!' + key + '!';
+ }
}
}
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/NewBuildConfigurationDialog.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/NewBuildConfigurationDialog.java
index 450d255fd8..130b288608 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/NewBuildConfigurationDialog.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/NewBuildConfigurationDialog.java
@@ -17,13 +17,12 @@ import org.eclipse.cdt.managedbuilder.core.IConfiguration;
import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
import org.eclipse.cdt.managedbuilder.internal.core.Configuration;
import org.eclipse.cdt.managedbuilder.internal.core.ManagedProject;
-import org.eclipse.cdt.managedbuilder.internal.ui.Messages;
+import org.eclipse.cdt.ui.newui.UIMessages;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.preference.JFacePreferences;
import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
@@ -50,6 +49,19 @@ import org.eclipse.swt.widgets.Text;
* @noinstantiate This class is not intended to be instantiated by clients.
*/
public class NewBuildConfigurationDialog extends Dialog {
+ // String constants
+ private static final String PREFIX = "NewConfiguration"; //$NON-NLS-1$
+ private static final String LABEL = PREFIX + ".label"; //$NON-NLS-1$
+ private static final String ERROR = PREFIX + ".error"; //$NON-NLS-1$
+ private static final String NAME = LABEL + ".name"; //$NON-NLS-1$
+ private static final String GROUP = LABEL + ".group"; //$NON-NLS-1$
+ private static final String COPY = LABEL + ".copy"; //$NON-NLS-1$
+ private static final String CLONE = LABEL + ".clone"; //$NON-NLS-1$
+ private static final String DUPLICATE = ERROR + ".duplicateName"; //$NON-NLS-1$
+ private static final String CASE = ERROR + ".caseName"; //$NON-NLS-1$
+ private static final String INVALID = ERROR + ".invalidName"; //$NON-NLS-1$
+ private static final String DESCRIPTION = LABEL + ".description"; //$NON-NLS-1$
+
// Widgets
private Button btnClone;
private Button btnCopy;
@@ -59,7 +71,7 @@ public class NewBuildConfigurationDialog extends Dialog {
private Combo cloneConfigSelector;
private Label statusLabel;
- // Bookkeeping
+ // Bookeeping
private boolean clone;
/** Default configurations defined in the toolchain description */
private IConfiguration[] defaultCfgds;
@@ -197,7 +209,7 @@ public class NewBuildConfigurationDialog extends Dialog {
// Add a label and a text widget for Configuration's name
final Label nameLabel = new Label(group1, SWT.LEFT);
nameLabel.setFont(parent.getFont());
- nameLabel.setText(Messages.NewConfiguration_label_name);
+ nameLabel.setText(UIMessages.getString(NAME));
gd = new GridData(GridData.FILL_HORIZONTAL);
gd.horizontalSpan = 1;
@@ -221,7 +233,7 @@ public class NewBuildConfigurationDialog extends Dialog {
// Add a label and a text widget for Configuration's description
final Label descriptionLabel = new Label(group1, SWT.LEFT);
descriptionLabel.setFont(parent.getFont());
- descriptionLabel.setText(Messages.NewConfiguration_label_description);
+ descriptionLabel.setText(UIMessages.getString(DESCRIPTION));
gd = new GridData(GridData.FILL_HORIZONTAL);
gd.horizontalSpan = 1;
@@ -241,7 +253,7 @@ public class NewBuildConfigurationDialog extends Dialog {
final Group group = new Group(composite, SWT.NONE);
group.setFont(composite.getFont());
- group.setText(Messages.NewConfiguration_label_group);
+ group.setText(UIMessages.getString(GROUP));
GridLayout layout = new GridLayout(3, false);
group.setLayout(layout);
gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -257,7 +269,7 @@ public class NewBuildConfigurationDialog extends Dialog {
// Add a radio button and combo box to copy from default config
btnCopy = new Button(group, SWT.RADIO);
btnCopy.setFont(group.getFont());
- btnCopy.setText(Messages.NewConfiguration_label_copy);
+ btnCopy.setText(UIMessages.getString(COPY));
setButtonLayoutData(btnCopy);
btnCopy.addSelectionListener(radioListener);
@@ -279,7 +291,7 @@ public class NewBuildConfigurationDialog extends Dialog {
// Create a radio button and combo for clonable configs
btnClone = new Button(group, SWT.RADIO);
btnClone.setFont(group.getFont());
- btnClone.setText(Messages.NewConfiguration_label_clone);
+ btnClone.setText(UIMessages.getString(CLONE));
setButtonLayoutData(btnClone);
btnClone.addSelectionListener(radioListener);
btnClone.setSelection(true);
@@ -453,12 +465,12 @@ public class NewBuildConfigurationDialog extends Dialog {
s = ""; //$NON-NLS-1$
// Make sure the name is not a duplicate
} else if (isDuplicateName(currentName)) {
- s = NLS.bind(Messages.NewConfiguration_error_duplicateName, currentName);
+ s = UIMessages.getFormattedString(DUPLICATE, currentName);
} else if (isSimilarName(currentName)) {
- s = NLS.bind(Messages.NewConfiguration_error_caseName, currentName);
+ s = UIMessages.getFormattedString(CASE, currentName);
} else if (!validateName(currentName)) {
// TODO Create a decent I18N string to describe this problem
- s = NLS.bind(Messages.NewConfiguration_error_invalidName, currentName);
+ s = UIMessages.getFormattedString(INVALID, currentName);
}
if (statusLabel == null) return;
Button b = getButton(IDialogConstants.OK_ID);
@@ -499,8 +511,8 @@ public class NewBuildConfigurationDialog extends Dialog {
try {
des.createConfiguration(ManagedBuildManager.CFG_DATA_PROVIDER_ID, data);
} catch (CoreException e) {
- System.out.println(Messages.NewBuildConfigurationDialog_0);
- System.out.println(Messages.NewBuildConfigurationDialog_1 + e.getLocalizedMessage());
+ System.out.println(Messages.getString("NewBuildConfigurationDialog.0")); //$NON-NLS-1$
+ System.out.println(Messages.getString("NewBuildConfigurationDialog.1") + e.getLocalizedMessage()); //$NON-NLS-1$
}
return null;
}
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/NewCfgDialog.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/NewCfgDialog.java
index a3e8c10577..65a67d17e1 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/NewCfgDialog.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/NewCfgDialog.java
@@ -33,7 +33,7 @@ import org.eclipse.cdt.managedbuilder.internal.core.Configuration;
import org.eclipse.cdt.managedbuilder.internal.core.ManagedProject;
import org.eclipse.cdt.managedbuilder.ui.wizards.MBSWizardHandler;
import org.eclipse.cdt.ui.newui.INewCfgDialog;
-import org.eclipse.cdt.managedbuilder.internal.ui.Messages;
+import org.eclipse.cdt.ui.newui.UIMessages;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IStatus;
@@ -42,7 +42,6 @@ import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.preference.JFacePreferences;
import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
@@ -64,10 +63,19 @@ import org.eclipse.swt.widgets.Text;
* @noinstantiate This class is not intended to be instantiated by clients.
*/
public class NewCfgDialog implements INewCfgDialog {
+ private static final String PREFIX = "NewConfiguration"; //$NON-NLS-1$
+ private static final String LABEL = PREFIX + ".label"; //$NON-NLS-1$
+ private static final String ERROR = PREFIX + ".error"; //$NON-NLS-1$
+ private static final String NAME = LABEL + ".name"; //$NON-NLS-1$
+ private static final String GROUP = LABEL + ".group"; //$NON-NLS-1$
+ private static final String DUPLICATE = ERROR + ".duplicateName"; //$NON-NLS-1$
+ private static final String CASE = ERROR + ".caseName"; //$NON-NLS-1$
+ private static final String INVALID = ERROR + ".invalidName"; //$NON-NLS-1$
+ private static final String DESCRIPTION = LABEL + ".description"; //$NON-NLS-1$
private static final String NULL = "[null]"; //$NON-NLS-1$
private static final String SEPARATOR = " > "; //$NON-NLS-1$
private static final String ART = MBSWizardHandler.ARTIFACT;
- private static final String NOT = Messages.NewCfgDialog_3;
+ private static final String NOT = UIMessages.getString("NewCfgDialog.3"); //$NON-NLS-1$
// Widgets
private Text configName;
private Text configDescription;
@@ -168,7 +176,7 @@ public class NewCfgDialog implements INewCfgDialog {
// as a directory name in the filesystem.
Label warningLabel = new Label(group1, SWT.BEGINNING | SWT.WRAP);
warningLabel.setFont(parent.getFont());
- warningLabel.setText(Messages.NewConfiguration_label_warning);
+ warningLabel.setText(UIMessages.getString("NewConfiguration.label.warning")); //$NON-NLS-1$
gd = new GridData(SWT.FILL, SWT.BEGINNING, true, false, 3, 1);
gd.widthHint = 300;
warningLabel.setLayoutData(gd);
@@ -176,7 +184,7 @@ public class NewCfgDialog implements INewCfgDialog {
// Add a label and a text widget for Configuration's name
final Label nameLabel = new Label(group1, SWT.LEFT);
nameLabel.setFont(parent.getFont());
- nameLabel.setText(Messages.NewConfiguration_label_name);
+ nameLabel.setText(UIMessages.getString(NAME));
gd = new GridData(GridData.FILL_HORIZONTAL);
gd.horizontalSpan = 1;
@@ -200,7 +208,7 @@ public class NewCfgDialog implements INewCfgDialog {
// Add a label and a text widget for Configuration's description
final Label descriptionLabel = new Label(group1, SWT.LEFT);
descriptionLabel.setFont(parent.getFont());
- descriptionLabel.setText(Messages.NewConfiguration_label_description);
+ descriptionLabel.setText(UIMessages.getString(DESCRIPTION));
gd = new GridData(GridData.FILL_HORIZONTAL);
gd.horizontalSpan = 1;
@@ -218,7 +226,7 @@ public class NewCfgDialog implements INewCfgDialog {
final Group group = new Group(composite, SWT.NONE);
group.setFont(composite.getFont());
- group.setText(Messages.NewConfiguration_label_group);
+ group.setText(UIMessages.getString(GROUP));
GridLayout layout = new GridLayout(2, false);
group.setLayout(layout);
gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -226,7 +234,7 @@ public class NewCfgDialog implements INewCfgDialog {
group.setLayoutData(gd);
b_clone = new Button(group, SWT.RADIO);
- b_clone.setText(Messages.NewCfgDialog_0);
+ b_clone.setText(Messages.getString("NewCfgDialog.0")); //$NON-NLS-1$
gd = new GridData(GridData.BEGINNING);
b_clone.setLayoutData(gd);
b_clone.setSelection(true);
@@ -250,7 +258,7 @@ public class NewCfgDialog implements INewCfgDialog {
});
b_real = new Button(group, SWT.RADIO);
- b_real.setText(Messages.NewCfgDialog_1);
+ b_real.setText(Messages.getString("NewCfgDialog.1")); //$NON-NLS-1$
gd = new GridData(GridData.BEGINNING);
b_real.setLayoutData(gd);
b_real.addSelectionListener(new SelectionAdapter() {
@@ -279,7 +287,7 @@ public class NewCfgDialog implements INewCfgDialog {
/* import */
b_import = new Button(group, SWT.RADIO);
- b_import.setText(Messages.NewCfgDialog_4);
+ b_import.setText(UIMessages.getString("NewCfgDialog.4")); //$NON-NLS-1$
gd = new GridData(GridData.BEGINNING);
b_import.setLayoutData(gd);
b_import.addSelectionListener(new SelectionAdapter() {
@@ -303,7 +311,7 @@ public class NewCfgDialog implements INewCfgDialog {
/* import predefined */
b_importDef = new Button(group, SWT.RADIO);
- b_importDef.setText(Messages.NewCfgDialog_5);
+ b_importDef.setText(UIMessages.getString("NewCfgDialog.5")); //$NON-NLS-1$
gd = new GridData(GridData.BEGINNING);
b_importDef.setLayoutData(gd);
b_importDef.addSelectionListener(new SelectionAdapter() {
@@ -355,12 +363,12 @@ public class NewCfgDialog implements INewCfgDialog {
s = ""; //$NON-NLS-1$
// Make sure the name is not a duplicate
} else if (isDuplicateName(currentName)) {
- s = NLS.bind(Messages.NewConfiguration_error_duplicateName, currentName);
+ s = UIMessages.getFormattedString(DUPLICATE, currentName);
} else if (isSimilarName(currentName)) {
- s = NLS.bind(Messages.NewConfiguration_error_caseName, currentName);
+ s = UIMessages.getFormattedString(CASE, currentName);
} else if (!validateName(currentName)) {
// TODO Create a decent I18N string to describe this problem
- s = NLS.bind(Messages.NewConfiguration_error_invalidName, currentName);
+ s = UIMessages.getFormattedString(INVALID, currentName);
}
if (statusLabel == null) return;
Button b = getButton(IDialogConstants.OK_ID);
@@ -554,7 +562,7 @@ public class NewCfgDialog implements INewCfgDialog {
if (config == null || cfgDes == null) {
throw new CoreException(new Status(IStatus.ERROR,
"org.eclipse.cdt.managedbuilder.ui", -1, //$NON-NLS-1$
- Messages.NewCfgDialog_2, null));
+ UIMessages.getString("NewCfgDialog.2"), null)); //$NON-NLS-1$
}
} catch (CoreException e) {
ManagedBuilderUIPlugin.log(e);
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/NewVarDialog.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/NewVarDialog.java
index 5f3410aef6..795a87e8e9 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/NewVarDialog.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/NewVarDialog.java
@@ -21,7 +21,7 @@ import org.eclipse.cdt.core.settings.model.ICMultiItemsHolder;
import org.eclipse.cdt.managedbuilder.core.IOption;
import org.eclipse.cdt.managedbuilder.internal.macros.BuildMacro;
import org.eclipse.cdt.managedbuilder.macros.IBuildMacro;
-import org.eclipse.cdt.managedbuilder.internal.ui.Messages;
+import org.eclipse.cdt.ui.newui.UIMessages;
import org.eclipse.cdt.utils.cdtvariables.CdtVariableResolver;
import org.eclipse.cdt.utils.ui.controls.FileListControl;
import org.eclipse.jface.dialogs.Dialog;
@@ -54,6 +54,25 @@ import org.eclipse.swt.widgets.Text;
* @noinstantiate This class is not intended to be instantiated by clients.
*/
public class NewVarDialog extends Dialog {
+ // String constants
+ private static final String PREFIX = "NewBuildMacroDialog"; //$NON-NLS-1$
+ private static final String LABEL = PREFIX + ".label"; //$NON-NLS-1$
+ private static final String VALUE = LABEL + ".value"; //$NON-NLS-1$
+
+ private static final String TYPE = LABEL + ".type"; //$NON-NLS-1$
+ private static final String TYPE_TEXT = TYPE + ".text"; //$NON-NLS-1$
+ private static final String TYPE_TEXT_LIST = TYPE + ".text.list"; //$NON-NLS-1$
+ private static final String TYPE_PATH_FILE = TYPE + ".path.file"; //$NON-NLS-1$
+ private static final String TYPE_PATH_FILE_LIST = TYPE + ".path.file.list"; //$NON-NLS-1$
+ private static final String TYPE_PATH_DIR = TYPE + ".path.dir"; //$NON-NLS-1$
+ private static final String TYPE_PATH_DIR_LIST = TYPE + ".path.dir.list"; //$NON-NLS-1$
+ private static final String TYPE_PATH_ANY = TYPE + ".path.any"; //$NON-NLS-1$
+ private static final String TYPE_PATH_ANY_LIST = TYPE + ".path.any.list"; //$NON-NLS-1$
+
+ private static final String BROWSE = LABEL + ".browse"; //$NON-NLS-1$
+ private static final String LIST_TITLE = LABEL + ".list.title"; //$NON-NLS-1$
+ private static final String TITLE_NEW = LABEL + ".title.new"; //$NON-NLS-1$
+ private static final String TITLE_EDIT = LABEL + ".title.edit"; //$NON-NLS-1$
private static final String EMPTY_STRING = new String();
// The title of the dialog.
@@ -86,9 +105,9 @@ public class NewVarDialog extends Dialog {
super(parentShell);
cfgd = _cfgd;
if(editedMacro != null)
- fTitle = Messages.NewBuildMacroDialog_label_title_edit;
+ fTitle = UIMessages.getString(TITLE_EDIT);
else
- fTitle = Messages.NewBuildMacroDialog_label_title_new;
+ fTitle = UIMessages.getString(TITLE_NEW);
fEditedMacro = editedMacro;
vars = _vars;
}
@@ -118,7 +137,7 @@ public class NewVarDialog extends Dialog {
Label nameLabel = new Label(comp, SWT.LEFT);
nameLabel.setFont(comp.getFont());
- nameLabel.setText(Messages.NewVarDialog_0);
+ nameLabel.setText(Messages.getString("NewVarDialog.0")); //$NON-NLS-1$
nameLabel.setLayoutData(new GridData());
fMacroNameEdit = new CCombo(comp, SWT.BORDER);
@@ -142,7 +161,7 @@ public class NewVarDialog extends Dialog {
if (fEditedMacro == null && cfgd != null && !(cfgd instanceof ICMultiItemsHolder)) {
Button c_all = new Button(comp, SWT.CHECK);
- c_all.setText(Messages.NewVarDialog_1);
+ c_all.setText(Messages.getString("NewVarDialog.1")); //$NON-NLS-1$
gd = new GridData(GridData.BEGINNING);
gd.horizontalSpan = 3;
c_all.setLayoutData(gd);
@@ -156,7 +175,7 @@ public class NewVarDialog extends Dialog {
Label typeLabel = new Label(comp, SWT.LEFT);
typeLabel.setFont(comp.getFont());
- typeLabel.setText(Messages.NewBuildMacroDialog_label_type);
+ typeLabel.setText(UIMessages.getString(TYPE));
gd = new GridData();
typeLabel.setLayoutData(gd);
@@ -166,14 +185,14 @@ public class NewVarDialog extends Dialog {
// gd.widthHint = 100;
fTypeSelector.setLayoutData(gd);
fTypeSelector.setItems(new String[]{
- Messages.NewBuildMacroDialog_label_type_text,
- Messages.NewBuildMacroDialog_label_type_text_list,
- Messages.NewBuildMacroDialog_label_type_path_file,
- Messages.NewBuildMacroDialog_label_type_path_file_list,
- Messages.NewBuildMacroDialog_label_type_path_dir,
- Messages.NewBuildMacroDialog_label_type_path_dir_list,
- Messages.NewBuildMacroDialog_label_type_path_any,
- Messages.NewBuildMacroDialog_label_type_path_any_list
+ UIMessages.getString(TYPE_TEXT),
+ UIMessages.getString(TYPE_TEXT_LIST),
+ UIMessages.getString(TYPE_PATH_FILE),
+ UIMessages.getString(TYPE_PATH_FILE_LIST),
+ UIMessages.getString(TYPE_PATH_DIR),
+ UIMessages.getString(TYPE_PATH_DIR_LIST),
+ UIMessages.getString(TYPE_PATH_ANY),
+ UIMessages.getString(TYPE_PATH_ANY_LIST)
});
setSelectedType(IBuildMacro.VALUE_TEXT);
@@ -185,7 +204,7 @@ public class NewVarDialog extends Dialog {
fMacroValueLabel = new Label(comp, SWT.LEFT);
fMacroValueLabel.setFont(comp.getFont());
- fMacroValueLabel.setText(Messages.NewBuildMacroDialog_label_value);
+ fMacroValueLabel.setText(UIMessages.getString(VALUE));
gd = new GridData();
gd.horizontalSpan = 1;
fMacroValueLabel.setLayoutData(gd);
@@ -204,7 +223,7 @@ public class NewVarDialog extends Dialog {
fBrowseButton = new Button(comp,SWT.PUSH);
fBrowseButton.setFont(comp.getFont());
- fBrowseButton.setText(Messages.NewBuildMacroDialog_label_browse);
+ fBrowseButton.setText(UIMessages.getString(BROWSE));
fBrowseButton.addSelectionListener(new SelectionAdapter(){
@Override
public void widgetSelected(SelectionEvent e){
@@ -223,7 +242,7 @@ public class NewVarDialog extends Dialog {
fListEditorContainier.setLayoutData(gd);
fListEditorContainier.setLayout(new GridLayout());
- fListEditor = new FileListControl(fListEditorContainier, Messages.NewBuildMacroDialog_label_list_title, IOption.BROWSE_NONE);
+ fListEditor = new FileListControl(fListEditorContainier, UIMessages.getString(LIST_TITLE), IOption.BROWSE_NONE);
/* Enable workspace support for list editor */
fListEditor.setWorkspaceSupport(true);
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolChainEditTab.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolChainEditTab.java
index 4d93424b4f..edfe962e66 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolChainEditTab.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolChainEditTab.java
@@ -28,7 +28,6 @@ import org.eclipse.cdt.managedbuilder.core.IToolChain;
import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
import org.eclipse.cdt.managedbuilder.internal.core.IRealBuildObjectAssociation;
import org.eclipse.cdt.managedbuilder.internal.core.ToolChain;
-import org.eclipse.cdt.managedbuilder.internal.ui.Messages;
import org.eclipse.cdt.managedbuilder.tcmodification.CompatibilityStatus;
import org.eclipse.cdt.managedbuilder.tcmodification.IConfigurationModification;
import org.eclipse.cdt.managedbuilder.tcmodification.IConflict;
@@ -63,7 +62,7 @@ import org.eclipse.swt.widgets.Text;
public class ToolChainEditTab extends AbstractCBuildPropertyTab {
private static final IToolChainModificationManager tcmmgr = ManagedBuildManager.getToolChainModificationManager();
- private static final String NO_TC = Messages.StdProjectTypeHandler_0;
+ private static final String NO_TC = Messages.getString("StdProjectTypeHandler.0"); //$NON-NLS-1$
private static final IToolChain[] r_tcs = ManagedBuildManager.getRealToolChains();
private static final IBuilder[] r_bs = ManagedBuildManager.getRealBuilders();
private static final ITool[] r_tools = ManagedBuildManager.getRealTools();
@@ -98,10 +97,10 @@ public class ToolChainEditTab extends AbstractCBuildPropertyTab {
public void createControls(Composite parent) {
super.createControls(parent);
usercomp.setLayout(new GridLayout(2, false));
- b_dispCompatible = setupCheck(usercomp, Messages.ToolChainEditTab_0, 2, GridData.BEGINNING);
+ b_dispCompatible = setupCheck(usercomp, Messages.getString("ToolChainEditTab.0"), 2, GridData.BEGINNING); //$NON-NLS-1$
b_dispCompatible.setSelection(true);
- setupLabel(usercomp, Messages.ToolChainEditTab_1, 1, GridData.BEGINNING);
+ setupLabel(usercomp, Messages.getString("ToolChainEditTab.1"), 1, GridData.BEGINNING); //$NON-NLS-1$
c_toolchain = new Combo(usercomp, SWT.READ_ONLY | SWT.DROP_DOWN | SWT.BORDER);
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
gd.horizontalSpan = 1;
@@ -117,7 +116,7 @@ public class ToolChainEditTab extends AbstractCBuildPropertyTab {
setupControl(st_toolchain, 2, GridData.FILL_HORIZONTAL);
st_toolchain.setForeground(red);
- setupLabel(usercomp, Messages.ToolChainEditTab_2, 1, GridData.BEGINNING);
+ setupLabel(usercomp, Messages.getString("ToolChainEditTab.2"), 1, GridData.BEGINNING); //$NON-NLS-1$
c_builder = new Combo(usercomp, SWT.READ_ONLY | SWT.DROP_DOWN | SWT.BORDER);
gd = new GridData(GridData.FILL_HORIZONTAL);
gd.horizontalSpan = 1;
@@ -135,7 +134,7 @@ public class ToolChainEditTab extends AbstractCBuildPropertyTab {
// make table for tools list
if (page.isForFile()) {
- single_tool_group = setupGroup(usercomp, Messages.ToolChainEditTab_5, 2, GridData.FILL_BOTH);
+ single_tool_group = setupGroup(usercomp, Messages.getString("ToolChainEditTab.5"), 2, GridData.FILL_BOTH); //$NON-NLS-1$
setupControl(single_tool_group, 2, GridData.FILL_BOTH);
c_tool = new Combo(single_tool_group, SWT.READ_ONLY | SWT.DROP_DOWN | SWT.BORDER);
gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -150,7 +149,7 @@ public class ToolChainEditTab extends AbstractCBuildPropertyTab {
st_tool = setupLabel(single_tool_group, EMPTY_STR, 2, GridData.FILL_HORIZONTAL);
st_tool.setForeground(red);
} else { // Folder or Project
- tools_group = setupGroup(usercomp, Messages.ToolChainEditTab_3, 2, GridData.FILL_BOTH);
+ tools_group = setupGroup(usercomp, Messages.getString("ToolChainEditTab.3"), 2, GridData.FILL_BOTH); //$NON-NLS-1$
setupControl(tools_group, 2, GridData.FILL_BOTH);
text = new Text(tools_group, SWT.BORDER | SWT.WRAP | SWT.MULTI |
@@ -172,7 +171,7 @@ public class ToolChainEditTab extends AbstractCBuildPropertyTab {
}});
button_edit.setLayoutData(new GridData(GridData.END));
- button_edit.setText(Messages.ToolChainEditTab_4);
+ button_edit.setText(Messages.getString("ToolChainEditTab.4")); //$NON-NLS-1$
}
}
@@ -211,7 +210,7 @@ public class ToolChainEditTab extends AbstractCBuildPropertyTab {
IToolChain realToolChain = ManagedBuildManager.getRealToolChain(toolChain);
if (realToolChain==null) {
// The toolchain is not derived from extension
- String errText = NLS.bind(Messages.ToolChainEditTab_OrphanedToolchain, toolChain.getId(), toolChain.getName());
+ String errText = NLS.bind(Messages.getString("ToolChainEditTab_OrphanedToolchain"), toolChain.getId(), toolChain.getName()); //$NON-NLS-1$
st_toolchain.setText(errText);
} else if (foim.isToolChainCompatible()) {
st_toolchain.setText(EMPTY_STR);
@@ -227,7 +226,7 @@ public class ToolChainEditTab extends AbstractCBuildPropertyTab {
IBuilder realBuilder = ManagedBuildManager.getRealBuilder(builder);
if (realBuilder==null) {
// The builder is not derived from extension
- String errText = NLS.bind(Messages.ToolChainEditTab_OrphanedBuilder, builder.getId(), builder.getName());
+ String errText = NLS.bind(Messages.getString("ToolChainEditTab_OrphanedBuilder"), builder.getId(), builder.getName()); //$NON-NLS-1$
st_builder.setText(errText);
} else {
CompatibilityStatus cs = cm.getBuilderCompatibilityStatus();
@@ -358,7 +357,7 @@ public class ToolChainEditTab extends AbstractCBuildPropertyTab {
}
// Add NO_TOOL
if (add) {
- c_tool.add(Messages.ToolChainEditTab_6);
+ c_tool.add(Messages.getString("ToolChainEditTab.6")); //$NON-NLS-1$
}
c_tool.select(pos);
}
@@ -607,39 +606,39 @@ public class ToolChainEditTab extends AbstractCBuildPropertyTab {
String t = EMPTY_STR;
switch (cons[i].getConflictType()) {
case IConflict.INCOMPATIBLE:
- t = Messages.ToolChainEditTab_7;
+ t = Messages.getString("ToolChainEditTab.7"); //$NON-NLS-1$
break;
case IConflict.SOURCE_EXT_CONFLICT:
- t = Messages.ToolChainEditTab_8;
+ t = Messages.getString("ToolChainEditTab.8"); //$NON-NLS-1$
break;
}
String o = EMPTY_STR;
switch (cons[i].getObjectType()) {
case IRealBuildObjectAssociation.OBJECT_TOOLCHAIN:
- o = Messages.ToolChainEditTab_9;
+ o = Messages.getString("ToolChainEditTab.9"); //$NON-NLS-1$
break;
case IRealBuildObjectAssociation.OBJECT_BUILDER:
- o = Messages.ToolChainEditTab_10;
+ o = Messages.getString("ToolChainEditTab.10"); //$NON-NLS-1$
break;
case IRealBuildObjectAssociation.OBJECT_CONFIGURATION:
- o = Messages.ToolChainEditTab_11;
+ o = Messages.getString("ToolChainEditTab.11"); //$NON-NLS-1$
break;
case IRealBuildObjectAssociation.OBJECT_FILE_INFO:
- o = Messages.ToolChainEditTab_12;
+ o = Messages.getString("ToolChainEditTab.12"); //$NON-NLS-1$
break;
case IRealBuildObjectAssociation.OBJECT_FOLDER_INFO:
- o = Messages.ToolChainEditTab_13;
+ o = Messages.getString("ToolChainEditTab.13"); //$NON-NLS-1$
break;
case IRealBuildObjectAssociation.OBJECT_TOOL:
- o = Messages.ToolChainEditTab_14;
+ o = Messages.getString("ToolChainEditTab.14"); //$NON-NLS-1$
break;
}
- result.append(Messages.ToolChainEditTab_15 +
- (i+1) + Messages.ToolChainEditTab_16 +
+ result.append(Messages.getString("ToolChainEditTab.15") + //$NON-NLS-1$
+ (i+1) + Messages.getString("ToolChainEditTab.16") + //$NON-NLS-1$
SPACE + t + SPACE + o + SPACE + n +
- Messages.ToolChainEditTab_17);
+ Messages.getString("ToolChainEditTab.17")); //$NON-NLS-1$
}
String s = result.toString();
if (s.trim().length() == 0)
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolListLabelProvider.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolListLabelProvider.java
index cfb3d3d678..648b26efd1 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolListLabelProvider.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolListLabelProvider.java
@@ -14,13 +14,12 @@ import java.net.URL;
import org.eclipse.cdt.managedbuilder.core.IOptionCategory;
import org.eclipse.cdt.managedbuilder.core.ITool;
-import org.eclipse.cdt.managedbuilder.internal.ui.Messages;
+import org.eclipse.cdt.ui.newui.UIMessages;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.jface.resource.ResourceManager;
import org.eclipse.core.runtime.Assert;
import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.Display;
@@ -31,6 +30,7 @@ import org.eclipse.swt.widgets.Display;
public class ToolListLabelProvider extends LabelProvider {
private final Image IMG_TOOL = ManagedBuilderUIImages.get(ManagedBuilderUIImages.IMG_BUILD_TOOL);
private final Image IMG_CAT = ManagedBuilderUIImages.get(ManagedBuilderUIImages.IMG_BUILD_CAT);
+ private static final String ERROR_UNKNOWN_ELEMENT = "BuildPropertyPage.error.Unknown_tree_element"; //$NON-NLS-1$
private ImageDescriptor descriptor = null;
private ResourceManager manager = null;
@@ -104,7 +104,7 @@ public class ToolListLabelProvider extends LabelProvider {
}
protected RuntimeException unknownElement(Object element) {
- return new RuntimeException(NLS.bind(Messages.BuildPropertyPage_error_Unknown_tree_element, element.getClass().getName()));
+ return new RuntimeException(UIMessages.getFormattedString(ERROR_UNKNOWN_ELEMENT, element.getClass().getName()));
}
/**
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolSelectionDialog.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolSelectionDialog.java
index 444829f91b..0b9546d120 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolSelectionDialog.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolSelectionDialog.java
@@ -23,7 +23,6 @@ import org.eclipse.cdt.managedbuilder.core.IModificationStatus;
import org.eclipse.cdt.managedbuilder.core.IResourceInfo;
import org.eclipse.cdt.managedbuilder.core.ITool;
import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
-import org.eclipse.cdt.managedbuilder.internal.ui.Messages;
import org.eclipse.cdt.managedbuilder.tcmodification.CompatibilityStatus;
import org.eclipse.cdt.managedbuilder.tcmodification.IModificationOperation;
import org.eclipse.cdt.managedbuilder.tcmodification.IToolListModification;
@@ -83,7 +82,7 @@ public class ToolSelectionDialog extends Dialog {
@Override
protected void configureShell(Shell shell) {
super.configureShell(shell);
- shell.setText(Messages.ToolSelectionDialog_0);
+ shell.setText(Messages.getString("ToolSelectionDialog.0")); //$NON-NLS-1$
}
@Override
@@ -126,7 +125,7 @@ public class ToolSelectionDialog extends Dialog {
}});
TableColumn col = new TableColumn(t1, SWT.NONE);
- col.setText(Messages.ToolSelectionDialog_1);
+ col.setText(Messages.getString("ToolSelectionDialog.1")); //$NON-NLS-1$
col.setWidth(COL_WIDTH);
l1 = new CLabel(c1, SWT.BORDER);
@@ -145,7 +144,7 @@ public class ToolSelectionDialog extends Dialog {
}});
col = new TableColumn(t2, SWT.NONE);
- col.setText(Messages.ToolSelectionDialog_2);
+ col.setText(Messages.getString("ToolSelectionDialog.2")); //$NON-NLS-1$
col.setWidth(COL_WIDTH);
txt2 = new Text(c3, SWT.BORDER | SWT.WRAP | SWT.MULTI |
@@ -156,7 +155,7 @@ public class ToolSelectionDialog extends Dialog {
txt2.setLayoutData(gd);
b_add = new Button(c2, SWT.PUSH);
- b_add.setText(Messages.ToolSelectionDialog_12);
+ b_add.setText(Messages.getString("ToolSelectionDialog.12")); //$NON-NLS-1$
b_add.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
@@ -172,7 +171,7 @@ public class ToolSelectionDialog extends Dialog {
b_add.setLayoutData(new GridData(GridData.FILL, GridData.BEGINNING, true, false));
b_rep = new Button(c2, SWT.PUSH);
- b_rep.setText(Messages.ToolSelectionDialog_14);
+ b_rep.setText(Messages.getString("ToolSelectionDialog.14")); //$NON-NLS-1$
b_rep.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
@@ -181,7 +180,7 @@ public class ToolSelectionDialog extends Dialog {
b_rep.setLayoutData(new GridData(GridData.FILL, GridData.BEGINNING, true, false));
b_del = new Button(c2, SWT.PUSH);
- b_del.setText(Messages.ToolSelectionDialog_13);
+ b_del.setText(Messages.getString("ToolSelectionDialog.13")); //$NON-NLS-1$
b_del.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
b_del.addSelectionListener(new SelectionAdapter() {
@Override
@@ -203,7 +202,7 @@ public class ToolSelectionDialog extends Dialog {
new Label(c2, SWT.NONE).setLayoutData(new GridData(GridData.FILL, SWT.FILL, true, true));
b_all = new Button(c2, SWT.CHECK | SWT.WRAP);
- b_all.setText(Messages.ToolSelectionDialog_15);
+ b_all.setText(Messages.getString("ToolSelectionDialog.15")); //$NON-NLS-1$
b_all.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
b_all.addSelectionListener(new SelectionAdapter() {
@Override
@@ -374,7 +373,7 @@ public class ToolSelectionDialog extends Dialog {
if (IMG_ARROW.equals(ti.getImage()) && !isPrj) {
TableItem[] tis = t2.getSelection();
if (tis != null && tis.length > 0) {
- message = Messages.ToolSelectionDialog_16 +
+ message = Messages.getString("ToolSelectionDialog.16") + //$NON-NLS-1$
((ITool)tis[0].getData()).getUniqueRealName();
}
}
@@ -459,7 +458,7 @@ public class ToolSelectionDialog extends Dialog {
int c = st.getCode();
String s = EMPTY_STR;
if ((c & IModificationStatus.TOOLS_CONFLICT) != 0) {
- s = s + Messages.ToolSelectionDialog_7;
+ s = s + Messages.getString("ToolSelectionDialog.7"); //$NON-NLS-1$
ITool[][] tools = st.getToolsConflicts();
List<String> conflictTools = new ArrayList<String>();
for (int k=0; k<t2.getItemCount(); k++) {
@@ -484,7 +483,7 @@ public class ToolSelectionDialog extends Dialog {
}
}
if ((c & IModificationStatus.TOOLS_DONT_SUPPORT_MANAGED_BUILD) != 0) {
- s = s + Messages.ToolSelectionDialog_8;
+ s = s + Messages.getString("ToolSelectionDialog.8"); //$NON-NLS-1$
ITool[] tools = st.getNonManagedBuildTools();
for (int k=0; k<t2.getItemCount(); k++) {
TableItem ti = t2.getItem(k);
@@ -498,13 +497,13 @@ public class ToolSelectionDialog extends Dialog {
}
}
if ((c & IModificationStatus.PROPS_NOT_DEFINED) != 0) {
- s = s + Messages.ToolSelectionDialog_9;
+ s = s + Messages.getString("ToolSelectionDialog.9"); //$NON-NLS-1$
}
if ((c & IModificationStatus.PROPS_NOT_SUPPORTED) != 0) {
- s = s + Messages.ToolSelectionDialog_10;
+ s = s + Messages.getString("ToolSelectionDialog.10"); //$NON-NLS-1$
}
if ((c & IModificationStatus.REQUIRED_PROPS_NOT_SUPPORTED) != 0) {
- s = s + Messages.ToolSelectionDialog_11;
+ s = s + Messages.getString("ToolSelectionDialog.11"); //$NON-NLS-1$
}
errorLabel.setText(s);
// if(getButton(IDialogConstants.OK_ID) != null)
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolSettingsTab.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolSettingsTab.java
index ff598d300c..6847b7c5df 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolSettingsTab.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolSettingsTab.java
@@ -32,7 +32,6 @@ import org.eclipse.cdt.managedbuilder.core.ITool;
import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
import org.eclipse.cdt.managedbuilder.internal.core.MultiConfiguration;
import org.eclipse.cdt.managedbuilder.internal.macros.BuildMacroProvider;
-import org.eclipse.cdt.managedbuilder.internal.ui.Messages;
import org.eclipse.cdt.ui.newui.CDTPrefUtil;
import org.eclipse.cdt.ui.newui.PageLayout;
import org.eclipse.core.resources.IResource;
@@ -198,7 +197,7 @@ public class ToolSettingsTab extends AbstractCBuildPropertyTab implements IPrefe
if (tipText==null) {
return;
}
- tipText.setText(Messages.ToolSettingsTab_0);
+ tipText.setText(Messages.getString("ToolSettingsTab.0")); //$NON-NLS-1$
tipText.update();
}
@@ -340,7 +339,7 @@ public class ToolSettingsTab extends AbstractCBuildPropertyTab implements IPrefe
private void createTipArea (Composite parent) {
tipText = new StyledText(parent, SWT.V_SCROLL|SWT.BORDER | SWT.READ_ONLY | SWT.MULTI | SWT.WRAP);
tipText.setLayoutData(new GridData(GridData.FILL_BOTH));
- tipText.setText(Messages.ToolSettingsTab_0);
+ tipText.setText(Messages.getString("ToolSettingsTab.0")); //$NON-NLS-1$
styleRange = new StyleRange();
styleRange.start = 0;
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/messages.properties b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/messages.properties
new file mode 100644
index 0000000000..15c24ac3da
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/messages.properties
@@ -0,0 +1,130 @@
+###############################################################################
+# Copyright (c) 2005, 2010 Intel Corporation and others
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# Intel Corporation - initial API and implementation
+# IBM Corporation
+###############################################################################
+BuilderSettingsTab.0=Builder
+BuilderSettingsTab.1=Builder &type:
+BuilderSettingsTab.2=External builder
+BuilderSettingsTab.3=Internal builder
+BuilderSettingsTab.4=&Use default build command
+BuilderSettingsTab.5=Build &command:
+BuilderSettingsTab.6=Makefile generation
+BuilderSettingsTab.7=&Generate Makefiles automatically
+BuilderSettingsTab.8=&Expand Env. Variable Refs in Makefiles
+BuilderSettingsTab.9=Build settings
+BuilderSettingsTab.10=Stop on first build error
+BuilderSettingsTab.11=Use parallel build
+BuilderSettingsTab.12=Use optimal jobs number
+BuilderSettingsTab.13=Use parallel jobs:
+BuilderSettingsTab.14=Workbench Build Behavior
+BuilderSettingsTab.15=Workbench build type:
+BuilderSettingsTab.16=Make build target:
+BuilderSettingsTab.17=Build on resource save (Auto build)
+BuilderSettingsTab.18=Note: See Workbench automatic build preference
+BuilderSettingsTab.19=Build (Incremental build)
+BuilderSettingsTab.20=Clean
+BuilderSettingsTab.21=Build location
+BuilderSettingsTab.22=Build &directory:
+BuildStepsTab.0=Command:
+BuildStepsTab.1=Description:
+BuildStepsTab.2=Pre-build steps
+BuildStepsTab.3=Post-build steps
+BuildStepsTab.4=Resource Custom Build Step
+BuildStepsTab.5=Additional input file name(s):
+BuildStepsTab.6=Output file name(s):
+ArtifactTab.0=Artifact Type:
+ArtifactTab.1=Artifact name:
+ArtifactTab.2=Artifact extension:
+ArtifactTab.3=Output prefix:
+CPropertyVarsTab.0=Show system variables
+DiscoveryTab.0=Discovery profiles scope
+DiscoveryTab.1=Per Language
+DiscoveryTab.2=Configuration-wide
+DiscoveryTab.3=Unknown
+DiscoveryTab.4=Not applicable\nin multi-cfg mode \!
+DiscoveryTab.5=Tools:
+DiscoveryTab.6=No profiles found
+DiscoveryTab.7=InfoContexts are different \!
+DiscoveryTab.8=Configuration:
+DiscoveryTab.Clear=Clear
+DiscoveryTab.ClearDisoveredEntries=Clear discovered entries now:
+DiscoveryTab.ClearEntries=Clear entries
+DiscoveryTab.DiscoveredEntriesCleared=Discovered entries cleared. Scanner discovery will re-aquire the settings when run (normally during the build).
+DiscoveryTab.ErrorClearingEntries=Error clearing entries:
+ToolSelectionDialog.0=Select tools
+ToolSelectionDialog.1=Available tools
+ToolSelectionDialog.2=Used tools
+ToolSelectionDialog.7=Tool conflict:
+ToolSelectionDialog.8=Tool does not support managed build \!
+ToolSelectionDialog.9=Props not defined \!
+ToolSelectionDialog.10=Props not supported \!
+ToolSelectionDialog.11=Req. props not supported \!
+ToolSelectionDialog.12=Add tool -->
+ToolSelectionDialog.13=<-- Remove tool
+ToolSelectionDialog.14=<<- Replace ->>
+ToolSelectionDialog.15=Allow all changes
+ToolSelectionDialog.16=This tool can replace
+ToolChainEditTab.0=Display compatible toolchains only
+ToolChainEditTab.1=Current toolchain:
+ToolChainEditTab.10=builder
+ToolChainEditTab.11=configuration
+ToolChainEditTab.12=file info
+ToolChainEditTab.13=folder info
+ToolChainEditTab.14=tool
+ToolChainEditTab.15=Error \#
+ToolChainEditTab.16=:
+ToolChainEditTab.17=\n
+ToolChainEditTab.2=Current builder:
+ToolChainEditTab.3=Used tools
+ToolChainEditTab.4=Select Tools...
+ToolChainEditTab.5=Select tool
+ToolChainEditTab.6=-- NO TOOL --
+ToolChainEditTab.7=incompatibility with
+ToolChainEditTab.8=source extension conflict with
+ToolChainEditTab.9=toolchain
+ToolChainEditTab_OrphanedBuilder=Orphaned builder {0} ({1})
+ToolChainEditTab_OrphanedToolchain=Orphaned toolchain {0} ({1})
+NewVarDialog.0=Variable name:
+NewVarDialog.1=Apply to all configurations
+NewCfgDialog.0=Existing configuration
+NewCfgDialog.1=Default configuration
+NewBuildConfigurationDialog.0=Cannot create config
+NewBuildConfigurationDialog.1=>>
+PrefPage_NewCDTWizard.0=Settings will be applied to CDT new project wizard during project creation process
+WizardDefaultsTab.0=Show only supported toolchains, by default
+WizardDefaultsTab.1=Group old-style toolchains to <Others> folder
+PreferredToolchainsTab.0=Preferred toolchain will be selected by default in Wizard
+PreferredToolchainsTab.1=Make toolchain(s) preferred
+PreferredToolchainsTab.2=Make toolchain(s) not preferred
+PreferredToolchainsTab.3=Preferred toolchain(s):
+ToolSettingsTab.0=Hover over an option to display its tooltip
+BuildOptionSettingsUI.0=No tooltip is available for this option
+ScannerConfigOptionsDialog.scGroup.enabled.button=
+ScannerConfigOptionsDialog.scGroup.label=
+ScannerConfigOptionsDialog.scGroup.problemReporting.enabled.button=
+ScannerConfigOptionsDialog.scGroup.selectedProfile.combo=
+StdProjectTypeHandler.0=-- Other Toolchain --
+StdProjectTypeHandler.2=Default
+StdProjectTypeHandler.3=creation Make project: IBuilder is null
+CNewWizard.0=Others
+CWizardHandler.0=Toolchains:
+CWizardHandler.1=A Toolchain is a set of tools\n
+CWizardHandler.2=(compiler, linker, assembler)\n
+CWizardHandler.3=intended to build your project.\n
+CWizardHandler.4=Additional tools, like a debugger,\n
+CWizardHandler.5=can be associated with a toolchain.
+CWizardHandler.6=Cannot create managed project with NULL configuration
+StdBuildWizard.0=Makefile project
+MBSWizardHandler.0=At least one toolchain should be selected
+MBSWizardHandler.1=At least one configuration should be selected. Please check needed configurations.
+CMainWizardPage.1=Show project types and toolchains only if they are supported on the platform
+CMainWizardPage.2=Edit properties after project creation
+AbstractCWizard.0=Empty Project
+
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CDTConfigWizardPage.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CDTConfigWizardPage.java
index 34081fde87..921487f72a 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CDTConfigWizardPage.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CDTConfigWizardPage.java
@@ -19,7 +19,7 @@ import org.eclipse.cdt.managedbuilder.core.IToolChain;
import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
import org.eclipse.cdt.managedbuilder.ui.properties.ManagedBuilderUIImages;
import org.eclipse.cdt.ui.newui.CDTPrefUtil;
-import org.eclipse.cdt.managedbuilder.internal.ui.Messages;
+import org.eclipse.cdt.ui.newui.UIMessages;
import org.eclipse.core.resources.IProject;
import org.eclipse.jface.viewers.CheckStateChangedEvent;
import org.eclipse.jface.viewers.CheckboxTableViewer;
@@ -57,9 +57,9 @@ public class CDTConfigWizardPage extends WizardPage {
public static final String PAGE_ID = "org.eclipse.cdt.managedbuilder.ui.wizard.CConfigWizardPage"; //$NON-NLS-1$
private static final Image IMG_CONFIG = ManagedBuilderUIImages.get(ManagedBuilderUIImages.IMG_BUILD_CONFIG);
- private static final String TITLE = Messages.CConfigWizardPage_0;
- private static final String MESSAGE = Messages.CConfigWizardPage_1;
- private static final String COMMENT = Messages.CConfigWizardPage_12;
+ private static final String TITLE = UIMessages.getString("CConfigWizardPage.0"); //$NON-NLS-1$
+ private static final String MESSAGE = UIMessages.getString("CConfigWizardPage.1"); //$NON-NLS-1$
+ private static final String COMMENT = UIMessages.getString("CConfigWizardPage.12"); //$NON-NLS-1$
private static final String EMPTY_STR = ""; //$NON-NLS-1$
private Table table;
@@ -78,7 +78,7 @@ public class CDTConfigWizardPage extends WizardPage {
IWizardPage[] customPages = null;
public CDTConfigWizardPage(MBSWizardHandler h) {
- super(Messages.CDTConfigWizardPage_0);
+ super(UIMessages.getString("CDTConfigWizardPage.0")); //$NON-NLS-1$
setPageComplete(false);
handler = h;
setWizard(h.getWizard());
@@ -109,11 +109,11 @@ public class CDTConfigWizardPage extends WizardPage {
c1.setLayout(new GridLayout(2, false));
c1.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- setupLabel(c1, Messages.CConfigWizardPage_4, GridData.BEGINNING);
+ setupLabel(c1, UIMessages.getString("CConfigWizardPage.4"), GridData.BEGINNING); //$NON-NLS-1$
l_projtype = setupLabel(c1, EMPTY_STR, GridData.FILL_HORIZONTAL);
- setupLabel(c1, Messages.CConfigWizardPage_5, GridData.BEGINNING);
+ setupLabel(c1, UIMessages.getString("CConfigWizardPage.5"), GridData.BEGINNING); //$NON-NLS-1$
l_chains = setupLabel(c1, EMPTY_STR, GridData.FILL_HORIZONTAL);
- setupLabel(c1, Messages.CConfigWizardPage_6, GridData.BEGINNING);
+ setupLabel(c1, UIMessages.getString("CConfigWizardPage.6"), GridData.BEGINNING); //$NON-NLS-1$
setupLabel(c1, EMPTY_STR, GridData.BEGINNING);
Composite c2 = new Composite(parent, SWT.NONE);
@@ -150,7 +150,7 @@ public class CDTConfigWizardPage extends WizardPage {
c.setLayout(new GridLayout());
Button b1 = new Button(c, SWT.PUSH);
- b1.setText(Messages.CConfigWizardPage_7);
+ b1.setText(UIMessages.getString("CConfigWizardPage.7")); //$NON-NLS-1$
b1.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
b1.addSelectionListener(new SelectionAdapter() {
@Override
@@ -161,7 +161,7 @@ public class CDTConfigWizardPage extends WizardPage {
}});
Button b2 = new Button(c, SWT.PUSH);
- b2.setText(Messages.CConfigWizardPage_8);
+ b2.setText(UIMessages.getString("CConfigWizardPage.8")); //$NON-NLS-1$
b2.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
b2.addSelectionListener(new SelectionAdapter() {
@Override
@@ -175,7 +175,7 @@ public class CDTConfigWizardPage extends WizardPage {
new Label(c, 0).setLayoutData(new GridData(GridData.FILL_BOTH));
Button b3 = new Button(c, SWT.PUSH);
- b3.setText(Messages.CConfigWizardPage_13);
+ b3.setText(UIMessages.getString("CConfigWizardPage.13")); //$NON-NLS-1$
b3.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
b3.addSelectionListener(new SelectionAdapter() {
@Override
@@ -245,12 +245,12 @@ public class CDTConfigWizardPage extends WizardPage {
return true;
if (table.getItemCount() == 0) {
- errorMessage = Messages.CConfigWizardPage_10;
+ errorMessage = UIMessages.getString("CConfigWizardPage.10"); //$NON-NLS-1$
message = errorMessage;
return false;
}
if (tv.getCheckedElements().length == 0) {
- errorMessage = Messages.CConfigWizardPage_11;
+ errorMessage = UIMessages.getString("CConfigWizardPage.11"); //$NON-NLS-1$
message = errorMessage;
return false;
}
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CfgHolder.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CfgHolder.java
index a5db840358..2bbaca5ae5 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CfgHolder.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CfgHolder.java
@@ -16,7 +16,7 @@ import org.eclipse.cdt.managedbuilder.core.IConfiguration;
import org.eclipse.cdt.managedbuilder.core.IProjectType;
import org.eclipse.cdt.managedbuilder.core.IToolChain;
import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
-import org.eclipse.cdt.managedbuilder.internal.ui.Messages;
+import org.eclipse.cdt.ui.newui.UIMessages;
/**
* This class is intended for data exchange between
@@ -41,7 +41,7 @@ public class CfgHolder {
cfg = _cfg;
if (cfg == null) {
if (tc == null || tc.getParent() == null)
- name = Messages.StdProjectTypeHandler_2;
+ name = UIMessages.getString("StdProjectTypeHandler.2"); //$NON-NLS-1$
else
name = tc.getParent().getName();
} else
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/MBSCustomPageManager.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/MBSCustomPageManager.java
index bc48433342..3d34119a60 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/MBSCustomPageManager.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/MBSCustomPageManager.java
@@ -24,7 +24,7 @@ import java.util.TreeMap;
import org.eclipse.cdt.managedbuilder.core.BuildException;
import org.eclipse.cdt.managedbuilder.core.IToolChain;
import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
-import org.eclipse.cdt.managedbuilder.internal.ui.Messages;
+import org.eclipse.cdt.ui.newui.UIMessages;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IExtension;
@@ -171,9 +171,9 @@ public final class MBSCustomPageManager
{
// there are currently no other supported element types
// so throw an exception
- throw new BuildException(Messages.MBSCustomPageManager_error0
+ throw new BuildException(UIMessages.getString("MBSCustomPageManager.error0") //$NON-NLS-1$
+ element.getName()
- + Messages.MBSCustomPageManager_error1
+ + UIMessages.getString("MBSCustomPageManager.error1") //$NON-NLS-1$
+ EXTENSION_POINT_ID);
}
}
@@ -258,9 +258,9 @@ public final class MBSCustomPageManager
// no other types supported... throw an exception
// there are currently no other supported element types
// so throw an exception
- throw new BuildException(Messages.MBSCustomPageManager_error2
+ throw new BuildException(UIMessages.getString("MBSCustomPageManager.error2") //$NON-NLS-1$
+ element.getName()
- + Messages.MBSCustomPageManager_error3
+ + UIMessages.getString("MBSCustomPageManager.error3") //$NON-NLS-1$
+ EXTENSION_POINT_ID);
}
}
@@ -276,7 +276,7 @@ public final class MBSCustomPageManager
if (projectType != null)
currentPageData.addProjectType(projectType);
else
- throw new BuildException(Messages.MBSCustomPageManager_error4);
+ throw new BuildException(UIMessages.getString("MBSCustomPageManager.error4")); //$NON-NLS-1$
}
private static void loadToolchain(IConfigurationElement element,
@@ -300,7 +300,7 @@ public final class MBSCustomPageManager
currentPageData.addToolchain(toolchainID, versionsSupported);
}
else
- throw new BuildException(Messages.MBSCustomPageManager_error5);
+ throw new BuildException(UIMessages.getString("MBSCustomPageManager.error5")); //$NON-NLS-1$
}
private static void loadNature(IConfigurationElement element,
@@ -311,7 +311,7 @@ public final class MBSCustomPageManager
if (nature != null)
currentPageData.addNature(nature);
else
- throw new BuildException(Messages.MBSCustomPageManager_error6);
+ throw new BuildException(UIMessages.getString("MBSCustomPageManager.error6")); //$NON-NLS-1$
}
/**
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/MBSWizardHandler.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/MBSWizardHandler.java
index 6897d55621..c685150a1c 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/MBSWizardHandler.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/MBSWizardHandler.java
@@ -42,7 +42,7 @@ import org.eclipse.cdt.managedbuilder.internal.core.Configuration;
import org.eclipse.cdt.managedbuilder.internal.core.ManagedBuildInfo;
import org.eclipse.cdt.managedbuilder.internal.core.ManagedProject;
import org.eclipse.cdt.managedbuilder.ui.properties.ManagedBuilderUIPlugin;
-import org.eclipse.cdt.managedbuilder.internal.ui.Messages;
+import org.eclipse.cdt.managedbuilder.ui.properties.Messages;
import org.eclipse.cdt.ui.newui.CDTPrefUtil;
import org.eclipse.cdt.ui.templateengine.IWizardDataPage;
import org.eclipse.cdt.ui.templateengine.Template;
@@ -88,11 +88,11 @@ public class MBSWizardHandler extends CWizardHandler {
private static final String PROPERTY = "org.eclipse.cdt.build.core.buildType"; //$NON-NLS-1$
private static final String PROP_VAL = PROPERTY + ".debug"; //$NON-NLS-1$
private static final String tooltip =
- Messages.CWizardHandler_1 +
- Messages.CWizardHandler_2 +
- Messages.CWizardHandler_3 +
- Messages.CWizardHandler_4 +
- Messages.CWizardHandler_5;
+ Messages.getString("CWizardHandler.1")+ //$NON-NLS-1$
+ Messages.getString("CWizardHandler.2") + //$NON-NLS-1$
+ Messages.getString("CWizardHandler.3") + //$NON-NLS-1$
+ Messages.getString("CWizardHandler.4") + //$NON-NLS-1$
+ Messages.getString("CWizardHandler.5"); //$NON-NLS-1$
protected SortedMap<String, IToolChain> full_tcs = new TreeMap<String, IToolChain>();
private String propertyId = null;
@@ -307,18 +307,18 @@ public class MBSWizardHandler extends CWizardHandler {
}
public MBSWizardHandler(IProjectType _pt, Composite p, IWizard w) {
- super(p, Messages.CWizardHandler_0, _pt.getName());
+ super(p, Messages.getString("CWizardHandler.0"), _pt.getName()); //$NON-NLS-1$
pt = _pt;
setWizard(w);
}
public MBSWizardHandler(String name, Composite p, IWizard w) {
- super(p, Messages.CWizardHandler_0, name);
+ super(p, Messages.getString("CWizardHandler.0"), name); //$NON-NLS-1$
setWizard(w);
}
public MBSWizardHandler(IBuildPropertyValue val, Composite p, IWizard w) {
- super(p, Messages.CWizardHandler_0, val.getName());
+ super(p, Messages.getString("CWizardHandler.0"), val.getName()); //$NON-NLS-1$
propertyId = val.getId();
setWizard(w);
}
@@ -560,7 +560,7 @@ public class MBSWizardHandler extends CWizardHandler {
if (cfgs == null || cfgs.length == 0 || cfgs[0].getConfiguration() == null) {
throw new CoreException(new Status(IStatus.ERROR,
ManagedBuilderUIPlugin.getUniqueIdentifier(),
- Messages.CWizardHandler_6));
+ Messages.getString("CWizardHandler.6"))); //$NON-NLS-1$
}
Configuration cf = (Configuration)cfgs[0].getConfiguration();
ManagedProject mProj = new ManagedProject(project, cf.getProjectType());
@@ -724,7 +724,7 @@ public class MBSWizardHandler extends CWizardHandler {
public String getErrorMessage() {
TableItem[] tis = table.getSelection();
if (tis == null || tis.length == 0)
- return Messages.MBSWizardHandler_0;
+ return Messages.getString("MBSWizardHandler.0"); //$NON-NLS-1$
return null;
}
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/ManagedBuildWizard.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/ManagedBuildWizard.java
index 72b08bba30..dcc96701fd 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/ManagedBuildWizard.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/ManagedBuildWizard.java
@@ -22,7 +22,7 @@ import org.eclipse.cdt.managedbuilder.core.BuildListComparator;
import org.eclipse.cdt.managedbuilder.core.IProjectType;
import org.eclipse.cdt.managedbuilder.core.IToolChain;
import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
-import org.eclipse.cdt.managedbuilder.internal.ui.Messages;
+import org.eclipse.cdt.managedbuilder.ui.properties.Messages;
import org.eclipse.cdt.ui.newui.CDTPrefUtil;
import org.eclipse.cdt.ui.wizards.EntryDescriptor;
import org.eclipse.jface.wizard.IWizard;
@@ -34,12 +34,12 @@ import org.eclipse.swt.graphics.Image;
*/
public class ManagedBuildWizard extends AbstractCWizard {
private static final Image IMG = CPluginImages.get(CPluginImages.IMG_OBJS_CONTAINER);
- public static final String OTHERS_LABEL = Messages.CNewWizard_0;
+ public static final String OTHERS_LABEL = Messages.getString("CNewWizard.0"); //$NON-NLS-1$
/**
* @since 5.1
*/
- public static final String EMPTY_PROJECT = Messages.AbstractCWizard_0;
+ public static final String EMPTY_PROJECT = Messages.getString("AbstractCWizard.0"); //$NON-NLS-1$
/**
* Creates and returns an array of items to be displayed
*/
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/Messages.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/Messages.java
index 603dbbcccf..354c6de657 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/Messages.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/Messages.java
@@ -14,9 +14,7 @@ import org.eclipse.osgi.util.NLS;
/**
* @since 7.0
- * @deprecated. This class is not used. Use {@link org.eclipse.cdt.managedbuilder.internal.ui} instead.
*/
-@Deprecated
public class Messages extends NLS {
private static final String BUNDLE_NAME = "org.eclipse.cdt.managedbuilder.ui.wizards.messages"; //$NON-NLS-1$
public static String NewMakeProjFromExisting_0;
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/NewMakeProjFromExisting.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/NewMakeProjFromExisting.java
index 638bc232bf..d9f881f536 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/NewMakeProjFromExisting.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/NewMakeProjFromExisting.java
@@ -25,7 +25,6 @@ import org.eclipse.cdt.managedbuilder.internal.core.Configuration;
import org.eclipse.cdt.managedbuilder.internal.core.ManagedBuildInfo;
import org.eclipse.cdt.managedbuilder.internal.core.ManagedProject;
import org.eclipse.cdt.managedbuilder.internal.core.ToolChain;
-import org.eclipse.cdt.managedbuilder.internal.ui.Messages;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IProjectDescription;
import org.eclipse.core.resources.IWorkspace;
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/NewMakeProjFromExistingPage.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/NewMakeProjFromExistingPage.java
index 31e61531ff..97365315e6 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/NewMakeProjFromExistingPage.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/NewMakeProjFromExistingPage.java
@@ -18,7 +18,6 @@ import java.util.Map;
import org.eclipse.cdt.managedbuilder.core.IToolChain;
import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
-import org.eclipse.cdt.managedbuilder.internal.ui.Messages;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.resources.ResourcesPlugin;
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/STDWizardHandler.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/STDWizardHandler.java
index a58b4f4254..20de6d1013 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/STDWizardHandler.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/STDWizardHandler.java
@@ -23,7 +23,8 @@ import org.eclipse.cdt.managedbuilder.internal.core.Configuration;
import org.eclipse.cdt.managedbuilder.internal.core.ManagedBuildInfo;
import org.eclipse.cdt.managedbuilder.internal.core.ManagedProject;
import org.eclipse.cdt.managedbuilder.internal.core.ToolChain;
-import org.eclipse.cdt.managedbuilder.internal.ui.Messages;
+import org.eclipse.cdt.managedbuilder.ui.properties.Messages;
+import org.eclipse.cdt.ui.newui.UIMessages;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -37,13 +38,13 @@ import org.eclipse.swt.widgets.Composite;
public class STDWizardHandler extends MBSWizardHandler {
public STDWizardHandler(Composite p, IWizard w) {
- super(Messages.StdBuildWizard_0, p, w);
+ super(Messages.getString("StdBuildWizard.0"), p, w); //$NON-NLS-1$
}
@Override
public void addTc(IToolChain tc) {
if (tc == null) {
- full_tcs.put(Messages.StdProjectTypeHandler_0, null);
+ full_tcs.put(UIMessages.getString("StdProjectTypeHandler.0"), null); //$NON-NLS-1$
} else {
if (tc.isAbstract() || tc.isSystemObject()) return;
// unlike CWizardHandler, we don't check for configs
@@ -94,7 +95,7 @@ public class STDWizardHandler extends MBSWizardHandler {
}
bld.setManagedBuildOn(false);
} else {
- System.out.println(Messages.StdProjectTypeHandler_3);
+ System.out.println(UIMessages.getString("StdProjectTypeHandler.3")); //$NON-NLS-1$
}
cfg.setArtifactName(mProj.getDefaultArtifactName());
CConfigurationData data = cfg.getConfigurationData();
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/StdBuildWizard.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/StdBuildWizard.java
index bb4c165e2e..4d3b213a3b 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/StdBuildWizard.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/StdBuildWizard.java
@@ -12,7 +12,7 @@ package org.eclipse.cdt.managedbuilder.ui.wizards;
import org.eclipse.cdt.managedbuilder.core.IToolChain;
import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
-import org.eclipse.cdt.managedbuilder.internal.ui.Messages;
+import org.eclipse.cdt.managedbuilder.ui.properties.Messages;
import org.eclipse.cdt.ui.wizards.EntryDescriptor;
import org.eclipse.jface.wizard.IWizard;
@@ -21,13 +21,13 @@ import org.eclipse.jface.wizard.IWizard;
* @noinstantiate This class is not intended to be instantiated by clients.
*/
public class StdBuildWizard extends AbstractCWizard {
- private static final String NAME = Messages.StdBuildWizard_0;
+ private static final String NAME = Messages.getString("StdBuildWizard.0"); //$NON-NLS-1$
private static final String ID = "org.eclipse.cdt.build.makefile.projectType"; //$NON-NLS-1$
/**
* @since 5.1
*/
- public static final String EMPTY_PROJECT = Messages.AbstractCWizard_0;
+ public static final String EMPTY_PROJECT = Messages.getString("AbstractCWizard.0"); //$NON-NLS-1$
@Override
public EntryDescriptor[] createItems(boolean supportedOnly, IWizard wizard) {
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/messages.properties b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/messages.properties
new file mode 100644
index 0000000000..38e8dbb737
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/messages.properties
@@ -0,0 +1,24 @@
+###############################################################################
+# Copyright (c) 2007, 2010 Intel Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# Intel Corporation - initial API and implementation
+###############################################################################
+NewMakeProjFromExisting_0=Import Existing Code
+NewMakeProjFromExisting_1=Importing Existing Code
+NewMakeProjFromExistingPage_0=Import Existing Code
+NewMakeProjFromExistingPage_1=Import Existing Code
+NewMakeProjFromExistingPage_10=Toolchain for Indexer Settings
+NewMakeProjFromExistingPage_11=<none>
+NewMakeProjFromExistingPage_2=Create a new Makefile project from existing code in that same directory
+NewMakeProjFromExistingPage_3=Project Name
+NewMakeProjFromExistingPage_4=Project already exists
+NewMakeProjFromExistingPage_5=Existing Code Location
+NewMakeProjFromExistingPage_6=Browse...
+NewMakeProjFromExistingPage_7=Select root directory of existing code
+NewMakeProjFromExistingPage_8=Not a valid directory
+NewMakeProjFromExistingPage_9=Languages

Back to the top