diff options
author | Igor Fedorenko | 2014-04-19 13:15:19 +0000 |
---|---|---|
committer | Igor Fedorenko | 2014-04-20 23:04:43 +0000 |
commit | 84f23c8d08c0a71b81af9695965f9f42f879824c (patch) | |
tree | 7440e6454b9b5d7cb31c0d14bcd2ff2b6e847c1b | |
parent | 99fd1dd4ae33375b4ec2b56d48a0f456469a42a5 (diff) | |
download | m2e-core-84f23c8d08c0a71b81af9695965f9f42f879824c.tar.gz m2e-core-84f23c8d08c0a71b81af9695965f9f42f879824c.tar.xz m2e-core-84f23c8d08c0a71b81af9695965f9f42f879824c.zip |
432436 cleanup NLS strings
Change-Id: Iaf58c6c7a8936251cf915e6784c995de8c379823
Signed-off-by: Igor Fedorenko <igor@ifedorenko.com>
5 files changed, 39 insertions, 53 deletions
diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/Messages.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/Messages.java index f13b8b6a..1f267db0 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/Messages.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/Messages.java @@ -221,8 +221,6 @@ public class Messages extends NLS { public static String MavenGoalSelectionDialog_message; - public static String MavenImportWizard_analyzingProject; - public static String MavenImportWizard_hideWarningMessage; public static String MavenImportWizard_job; @@ -257,39 +255,17 @@ public class Messages extends NLS { public static String MavenInstallationsPreferencePage_btnEdit; - public static String MavenInstallationsPreferencePage_btnGlobalBrowse; - public static String MavenInstallationsPreferencePage_btnRemove; public static String MavenInstallationsPreferencePage_dialog_install_message; public static String MavenInstallationsPreferencePage_dialog_install_title; - public static String MavenInstallationsPreferencePage_dialog_message; - - public static String MavenInstallationsPreferencePage_dialog_title; - - public static String MavenInstallationsPreferencePage_error_global_missing; - - public static String MavenInstallationsPreferencePage_error_global_parse; - - public static String MavenInstallationsPreferencePage_error3_message; - - public static String MavenInstallationsPreferencePage_error4_message; - - public static String MavenInstallationsPreferencePage_job_updating; - public static String MavenInstallationsPreferencePage_lblNote; public static String MavenInstallationsPreferencePage_link; - public static String MavenInstallationsPreferencePage_link_global; - - public static String MavenInstallationsPreferencePage_link_open; - - public static String MavenInstallationsPreferencePage_settings; - - public static String MavenInstallationsPreferencePage_settings_install; + public static String MavenInstallationsPreferencePage_runtimeUnavailable; public static String MavenInstallationsPreferencePage_title; @@ -909,8 +885,6 @@ public class Messages extends NLS { public static String ExternalInstallPage_lblInstallationLocation_text; - public static String ExternalInstallPage_txtLocation_text; - public static String ExternalInstallPage_btnDirectory_text; public static String ExternalInstallPage_lblInstallationLibraries_text; @@ -930,12 +904,29 @@ public class Messages extends NLS { public static String MavenInstallationsPreferencePage_tblclmnName_text; public static String MavenInstallationsPreferencePage_tblclmnDetails_text; - public static String MavenInstallationWizardPage_btnExternal_text; + + public static String MavenInstallationWizard_titleAddInstallation; + + public static String MavenInstallationWizard_titleNewInstallation; + public static String MavenInstallationWizardPage_btnExternal_text_1; - public static String MavenInstallationWizardPage_btnEmbedded_text; + public static String MavenInstallationWizardPage_btnWorkspace_text; + public static String MavenInstallationWizardPage_lblInstallationType_text; + public static String MavenInstallationWizardPage_messageDuplicateInstallationName; + + public static String MavenInstallationWizardPage_messageHomeDirectoryIsNotMavenInstll; + + public static String MavenInstallationWizardPage_messageSelectHomeDirectory; + + public static String MavenInstallationWizardPage_messageSelectInstallatonName; + + public static String MavenInstallationWizardPage_selectProjectMessage; + + public static String MavenInstallationWizardPage_selectProjectTitle; + static { // initialize resource bundle NLS.initializeMessages(BUNDLE_NAME, Messages.class); diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/messages.properties b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/messages.properties index cb06d805..62885bfa 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/messages.properties +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/messages.properties @@ -137,7 +137,6 @@ MavenImportWizardPage_inherited=[inherited] MavenImportWizardPage_mntmDeselectTree_text=Deselect Tree MavenImportWizardPage_mntmSelectTree_text=Select Tree MavenImportWizardPage_title=Maven Projects -MavenImportWizard_analyzingProject=Analyzing {0} MavenImportWizard_hideWarningMessage=Hide this warning in future MavenImportWizard_job=Importing Maven projects MavenImportWizard_messageIncompleteMapping=Continuing with import will result in projects with build errors, please see help for more information @@ -169,30 +168,25 @@ MavenInstallFileArtifactWizardPage_title=Install file in local repository MavenInstallFileWizard_error=Execution error MavenInstallFileWizard_job=Installing artifact MavenInstallFileWizard_title=Install artifact -MavenInstallationWizardPage_btnEmbedded_text=Embedded -MavenInstallationWizardPage_btnExternal_text=External +MavenInstallationWizard_titleAddInstallation=Edit Maven Runtime +MavenInstallationWizard_titleNewInstallation=New Maven Runtime MavenInstallationWizardPage_btnExternal_text_1=External MavenInstallationWizardPage_btnWorkspace_text=Workspace MavenInstallationWizardPage_lblInstallationType_text=Installation type\: +MavenInstallationWizardPage_messageDuplicateInstallationName=The Maven installation name is already in use +MavenInstallationWizardPage_messageHomeDirectoryIsNotMavenInstll=Target is not a Maven Home +MavenInstallationWizardPage_messageSelectHomeDirectory=Enter the home directory of the Maven Installation +MavenInstallationWizardPage_messageSelectInstallatonName=Enter a name for the Maven Installation +MavenInstallationWizardPage_selectProjectMessage=Select projects to add: +MavenInstallationWizardPage_selectProjectTitle=Project selection MavenInstallationsPreferencePage_btnAdd=&Add... MavenInstallationsPreferencePage_btnEdit=&Edit... -MavenInstallationsPreferencePage_btnGlobalBrowse=&Browse... MavenInstallationsPreferencePage_btnRemove=&Remove MavenInstallationsPreferencePage_dialog_install_message=Select Maven installation directory MavenInstallationsPreferencePage_dialog_install_title=Maven Installation -MavenInstallationsPreferencePage_dialog_message=Select Maven installation directory -MavenInstallationsPreferencePage_dialog_title=Maven Installation -MavenInstallationsPreferencePage_error3_message=The selected Maven install is already registered. -MavenInstallationsPreferencePage_error4_message=Selected Maven install is already registered -MavenInstallationsPreferencePage_error_global_missing=Global settings file doesn't exist -MavenInstallationsPreferencePage_error_global_parse=Unable to parse global settings file; -MavenInstallationsPreferencePage_job_updating=Updating Maven installation settings MavenInstallationsPreferencePage_lblNote=Note\: Embedded runtime is always used for dependency resolution MavenInstallationsPreferencePage_link=Select the installation used to launch Maven\: -MavenInstallationsPreferencePage_link_global=Open editor for global settings file -MavenInstallationsPreferencePage_link_open=\ (<a href\="\#">open file</a>) -MavenInstallationsPreferencePage_settings=Global settings for embedded installation{0}\: -MavenInstallationsPreferencePage_settings_install=Global settings from installation directory{0}\: +MavenInstallationsPreferencePage_runtimeUnavailable=NOT AVAILABLE MavenInstallationsPreferencePage_tblclmnDetails_text=Details MavenInstallationsPreferencePage_tblclmnName_text=Name MavenInstallationsPreferencePage_title=Maven Installations diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/launch/MavenInstallationWizard.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/launch/MavenInstallationWizard.java index 82b030ce..d2e45686 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/launch/MavenInstallationWizard.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/launch/MavenInstallationWizard.java @@ -17,6 +17,7 @@ import org.eclipse.jface.wizard.Wizard; import org.eclipse.m2e.core.embedder.MavenRuntime; import org.eclipse.m2e.core.internal.launch.AbstractMavenRuntime; +import org.eclipse.m2e.core.ui.internal.Messages; @SuppressWarnings("restriction") @@ -28,12 +29,12 @@ public class MavenInstallationWizard extends Wizard { public MavenInstallationWizard(Set<String> names) { this.runtimePage = new MavenInstallationWizardPage(null, names); - setWindowTitle("New Maven Runtime"); + setWindowTitle(Messages.MavenInstallationWizard_titleNewInstallation); } public MavenInstallationWizard(MavenRuntime original, Set<String> names) { this.runtimePage = new MavenInstallationWizardPage((AbstractMavenRuntime) original, names); - setWindowTitle("Edit Maven Runtime"); + setWindowTitle(Messages.MavenInstallationWizard_titleAddInstallation); } @Override diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/launch/MavenInstallationWizardPage.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/launch/MavenInstallationWizardPage.java index f38bc928..be772b5d 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/launch/MavenInstallationWizardPage.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/launch/MavenInstallationWizardPage.java @@ -340,8 +340,8 @@ public class MavenInstallationWizardPage extends WizardPage { projects.add(facade.getProject()); } ListSelectionDialog dialog = new ListSelectionDialog(getShell(), projects, new ArrayContentProvider(), - new MavenProjectLabelProvider(), "Select projects to add:"); - dialog.setTitle("Project selection"); + new MavenProjectLabelProvider(), Messages.MavenInstallationWizardPage_selectProjectMessage); + dialog.setTitle(Messages.MavenInstallationWizardPage_selectProjectTitle); dialog.setHelpAvailable(false); if(dialog.open() == Window.OK) { Object insertionPoint = getSelectedElement(); @@ -393,23 +393,23 @@ public class MavenInstallationWizardPage extends WizardPage { if(btnExternal.getSelection()) { if(location.getText().trim().isEmpty()) { - setMessage("Enter the home directory of the Maven Installation"); + setMessage(Messages.MavenInstallationWizardPage_messageSelectHomeDirectory); return; } if(!isValidMavenInstall(location.getText())) { - setErrorMessage("Target is not a Maven Home"); + setErrorMessage(Messages.MavenInstallationWizardPage_messageHomeDirectoryIsNotMavenInstll); return; } } if(name.getText().trim().isEmpty()) { - setMessage("Enter a name for the Maven Installation"); + setMessage(Messages.MavenInstallationWizardPage_messageSelectInstallatonName); return; } if(usedNames.contains(name.getText().trim())) { - setErrorMessage("The Maven installation name is already in use"); + setErrorMessage(Messages.MavenInstallationWizardPage_messageDuplicateInstallationName); return; } diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/launch/MavenInstallationsPreferencePage.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/launch/MavenInstallationsPreferencePage.java index 99f005ec..54dffdc8 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/launch/MavenInstallationsPreferencePage.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/launch/MavenInstallationsPreferencePage.java @@ -308,7 +308,7 @@ public class MavenInstallationsPreferencePage extends PreferencePage implements case 1: StringBuilder sb = new StringBuilder(); if(!runtime.isAvailable()) { - sb.append("NOT AVAILABLE "); + sb.append(Messages.MavenInstallationsPreferencePage_runtimeUnavailable); } sb.append(runtime.toString()); return sb.toString(); |