diff options
author | Igor Fedorenko | 2011-08-04 15:24:23 +0000 |
---|---|---|
committer | Igor Fedorenko | 2011-08-04 15:24:23 +0000 |
commit | 093352787bc8b48dfebd094d2967760491550e3e (patch) | |
tree | b850877905e0c25f594a43ef8bdcdfcb395a4b7d /org.eclipse.m2e.editor | |
parent | c47e215285d7c562d2e8c98c52a80349abe070b6 (diff) | |
parent | 55bb6dd084da70138e6fd4800a514ee94abdb743 (diff) | |
download | m2e-core-093352787bc8b48dfebd094d2967760491550e3e.tar.gz m2e-core-093352787bc8b48dfebd094d2967760491550e3e.tar.xz m2e-core-093352787bc8b48dfebd094d2967760491550e3e.zip |
Merge remote-tracking branch 'origin/master' into m2e-self-hosting
Conflicts:
com.ning.async-http-client/pom.xml
org.eclipse.m2e.archetype.common/META-INF/MANIFEST.MF
org.eclipse.m2e.archetype.common/pom.xml
org.eclipse.m2e.core.ui/pom.xml
org.eclipse.m2e.core/pom.xml
org.eclipse.m2e.discovery/pom.xml
org.eclipse.m2e.editor.xml/pom.xml
org.eclipse.m2e.editor/pom.xml
org.eclipse.m2e.feature/pom.xml
org.eclipse.m2e.integration.tests.common/pom.xml
org.eclipse.m2e.jdt/pom.xml
org.eclipse.m2e.launching/pom.xml
org.eclipse.m2e.lifecyclemapping.defaults/pom.xml
org.eclipse.m2e.logback.appender/pom.xml
org.eclipse.m2e.logback.configuration/pom.xml
org.eclipse.m2e.logback.feature/pom.xml
org.eclipse.m2e.maven.indexer/META-INF/MANIFEST.MF
org.eclipse.m2e.maven.indexer/pom.xml
org.eclipse.m2e.maven.runtime/META-INF/MANIFEST.MF
org.eclipse.m2e.maven.runtime/pom.xml
org.eclipse.m2e.model.edit/pom.xml
org.eclipse.m2e.refactoring/pom.xml
org.eclipse.m2e.scm/pom.xml
org.eclipse.m2e.sdk.feature/pom.xml
org.eclipse.m2e.site/pom.xml
org.eclipse.m2e.tests.common/pom.xml
org.eclipse.m2e.usagedata/pom.xml
org.jboss.netty/pom.xml
pom.xml
target-platform/pom.xml
Diffstat (limited to 'org.eclipse.m2e.editor')
-rw-r--r-- | org.eclipse.m2e.editor/META-INF/MANIFEST.MF | 2 | ||||
-rw-r--r-- | org.eclipse.m2e.editor/pom.xml | 2 | ||||
-rw-r--r-- | org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/MavenPomEditor.java | 11 |
3 files changed, 11 insertions, 4 deletions
diff --git a/org.eclipse.m2e.editor/META-INF/MANIFEST.MF b/org.eclipse.m2e.editor/META-INF/MANIFEST.MF index 13693e21..93d57382 100644 --- a/org.eclipse.m2e.editor/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.editor/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.m2e.editor;singleton:=true -Bundle-Version: 1.0.100.qualifier +Bundle-Version: 1.0.200.qualifier Bundle-Activator: org.eclipse.m2e.editor.MavenEditorPlugin Require-Bundle: org.eclipse.core.runtime, org.eclipse.core.resources, diff --git a/org.eclipse.m2e.editor/pom.xml b/org.eclipse.m2e.editor/pom.xml index 96316e04..11624fe0 100644 --- a/org.eclipse.m2e.editor/pom.xml +++ b/org.eclipse.m2e.editor/pom.xml @@ -12,7 +12,7 @@ <parent> <groupId>org.eclipse.m2e</groupId> <artifactId>m2e-core</artifactId> - <version>1.0.100-SNAPSHOT</version> + <version>1.0.200-SNAPSHOT</version> </parent> <artifactId>org.eclipse.m2e.editor</artifactId> diff --git a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/MavenPomEditor.java b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/MavenPomEditor.java index 324f3bdb..aec564e3 100644 --- a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/MavenPomEditor.java +++ b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/MavenPomEditor.java @@ -38,6 +38,7 @@ import org.eclipse.core.runtime.IExtensionPoint; import org.eclipse.core.runtime.IExtensionRegistry; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; @@ -62,7 +63,6 @@ import org.eclipse.m2e.core.project.IMavenProjectChangedListener; import org.eclipse.m2e.core.project.IMavenProjectFacade; import org.eclipse.m2e.core.project.MavenProjectChangedEvent; import org.eclipse.m2e.core.ui.internal.M2EUIPluginActivator; -import org.eclipse.m2e.core.ui.internal.actions.OpenPomAction.MavenPathStorageEditorInput; import org.eclipse.m2e.core.ui.internal.actions.OpenPomAction.MavenStorageEditorInput; import org.eclipse.m2e.core.ui.internal.actions.SelectionUtil; import org.eclipse.m2e.editor.MavenEditorPlugin; @@ -692,7 +692,14 @@ public class MavenPomEditor extends FormEditor implements IResourceChangeListene log.error("Unable to read maven project. Dependencies not updated."); //$NON-NLS-1$ return null; } - DependencyNode root = MavenPlugin.getMavenModelManager().readDependencyTree(mavenProject, classpath, monitor); + + IMavenProjectFacade facade = null; + if(pomFile != null && new Path(IMavenConstants.POM_FILE_NAME).equals(pomFile.getProjectRelativePath())) { + facade = MavenPlugin.getMavenProjectRegistry().getProject(pomFile.getProject()); + } + + DependencyNode root = MavenPlugin.getMavenModelManager().readDependencyTree(facade, mavenProject, classpath, + monitor); root.setData("LEVEL", "ROOT"); for (DependencyNode nd : root.getChildren()) { nd.setData("LEVEL", "DIRECT"); |