diff options
6 files changed, 20 insertions, 19 deletions
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 d32f5352..62506030 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 @@ -403,9 +403,9 @@ locationComponentLocation=Location locationComponentSelectLocation=Select Location pomEditorDefaultPage=Open XML page in the POM editor by default preferencesDebugOutput=Debu&g Output -preferencesDownloadJavadoc=Download Artifact &JavaDoc +preferencesDownloadJavadoc=Download Artifact &Javadoc preferencesDownloadSources=Do&wnload Artifact Sources -preferencesDownloadSourcesTooltip=If sources are unavailable, JavaDoc will be downloaded as a fall back. +preferencesDownloadSourcesTooltip=If sources are unavailable, Javadoc will be downloaded as a fall back. preferencesGlobalUpdateNever=Do not automatically update dependencies from remote repositories preferencesOffline=&Offline preferencesGlobalChecksumPolicy=Global Checksum Policy\: diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/ProjectConfigurationManager.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/ProjectConfigurationManager.java index 05c5d4b9..5f6924fd 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/ProjectConfigurationManager.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/ProjectConfigurationManager.java @@ -691,6 +691,7 @@ public class ProjectConfigurationManager implements IProjectConfigurationManager monitor.subTask(Messages.ProjectConfigurationManager_task_creating_pom); IFile pomFile = project.getFile(IMavenConstants.POM_FILE_NAME); + mavenModelManager.createMavenModel(pomFile, model); monitor.worked(1); diff --git a/org.eclipse.m2e.jdt.ui/fragment.properties b/org.eclipse.m2e.jdt.ui/fragment.properties index 29af7d51..7d7513ef 100644 --- a/org.eclipse.m2e.jdt.ui/fragment.properties +++ b/org.eclipse.m2e.jdt.ui/fragment.properties @@ -11,13 +11,13 @@ m2.classpath-container.page.dependencies.name=Maven Managed Dependencies m2.popup.menu.label=&Maven m2.popup.DownloadSourcesAction.downloadSource=Download &Sources -m2.popup.DownloadSourcesAction.downloadJavaDoc=Download &JavaDoc +m2.popup.DownloadSourcesAction.downloadJavaDoc=Download &Javadoc m2.popup.OpenUrlAction.openCiPage=Open Continuous Integration m2.popup.OpenUrlAction.openScmPage=Open Source Control m2.popup.OpenUrlAction.openIssuesPage=Open Issue Tracker m2.popup.OpenUrlAction.openProjectPage=Open Project Page m2.popup.OpenPomAction=Open POM -m2.popup.OpenJavaDoc=Open JavaDoc +m2.popup.OpenJavaDoc=Open Javadoc Bundle-Vendor = Eclipse.org - m2e Bundle-Name = Maven Integration for Eclipse JDT UI @@ -25,10 +25,10 @@ configurator.jdt.name = JDT filter.description = Hides module folders from Maven projects filter.name = Maven modules action.label = label -action.javadoc.label = Open JavaDoc -action.javadoc2.label = Open JavaDoc -action.javadoc3.label = Open JavaDoc -action.javadoc4.label = Open JavaDoc +action.javadoc.label = Open Javadoc +action.javadoc2.label = Open Javadoc +action.javadoc3.label = Open Javadoc +action.javadoc4.label = Open Javadoc lifecycleMapping.jar.name = Jar Lifecycle Mapping java.conversion.participant.name = Java project converter diff --git a/org.eclipse.m2e.jdt.ui/src/org/eclipse/m2e/jdt/ui/internal/actions/OpenJavaDocAction.java b/org.eclipse.m2e.jdt.ui/src/org/eclipse/m2e/jdt/ui/internal/actions/OpenJavaDocAction.java index a90ae031..a0b673f7 100644 --- a/org.eclipse.m2e.jdt.ui/src/org/eclipse/m2e/jdt/ui/internal/actions/OpenJavaDocAction.java +++ b/org.eclipse.m2e.jdt.ui/src/org/eclipse/m2e/jdt/ui/internal/actions/OpenJavaDocAction.java @@ -101,8 +101,8 @@ public class OpenJavaDocAction extends ActionDelegate { List<ArtifactRepository> artifactRepositories = maven.getArtifactRepositories(); - Artifact artifact = maven.resolve(groupId, artifactId, version, - "javadoc", "javadoc", artifactRepositories, monitor); //$NON-NLS-1$ //$NON-NLS-2$ + Artifact artifact = maven.resolve(groupId, artifactId, version, "javadoc", "javadoc", artifactRepositories, //$NON-NLS-1$//$NON-NLS-2$ + monitor); final File file = artifact.getFile(); if(file == null) { @@ -127,7 +127,7 @@ public class OpenJavaDocAction extends ActionDelegate { }); } catch(CoreException ex) { - log.error("Can't download JavaDoc for " + name, ex); + log.error("Can't download Javadoc for " + name, ex); openDialog(NLS.bind(Messages.OpenJavaDocAction_error_download, name)); // TODO search index and offer to select other version } diff --git a/org.eclipse.m2e.jdt/plugin.properties b/org.eclipse.m2e.jdt/plugin.properties index 8626a563..dd9da88b 100644 --- a/org.eclipse.m2e.jdt/plugin.properties +++ b/org.eclipse.m2e.jdt/plugin.properties @@ -12,10 +12,10 @@ Bundle-Vendor = Eclipse.org - m2e Bundle-Name = Maven Integration for Eclipse JDT configurator.jdt.name = JDT action.label = label -action.javadoc.label = Open JavaDoc -action.javadoc2.label = Open JavaDoc -action.javadoc3.label = Open JavaDoc -action.javadoc4.label = Open JavaDoc +action.javadoc.label = Open Javadoc +action.javadoc2.label = Open Javadoc +action.javadoc3.label = Open Javadoc +action.javadoc4.label = Open Javadoc lifecycleMapping.jar.name = Jar Lifecycle Mapping java.conversion.participant.name = Java project converter diff --git a/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/messages.properties b/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/messages.properties index c058c84a..e599feea 100644 --- a/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/messages.properties +++ b/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/messages.properties @@ -7,9 +7,9 @@ MavenClasspathContainerInitializer_error_cannot_persist=Can't persist classpath MavenClasspathContainerInitializer_job_name=Persist classpath container changes MavenJdtPlugin_job_name=Building... MavenRuntimeClasspathProvider_error_unsupported=Unsupported launch configuration type {0} -OpenJavaDocAction_error_download=Can't download JavaDoc for {0} +OpenJavaDocAction_error_download=Can't download Javadoc for {0} OpenJavaDocAction_error_message=Unable to read Maven project -OpenJavaDocAction_error_title=Open JavaDoc -OpenJavaDocAction_info_title=Show JavaDoc -OpenJavaDocAction_job_open_javadoc=Opening JavaDoc for {0} +OpenJavaDocAction_error_title=Open Javadoc +OpenJavaDocAction_info_title=Show Javadoc +OpenJavaDocAction_job_open_javadoc=Opening Javadoc for {0} OpenJavaDocAction_message1=Unable to identify Maven artifact |