454759 Respect project repos in open pom action

Change-Id: Icd7bbd5a49456d8bd1e114af78a97445e5bb59cd
Signed-off-by: Anton Tanasenko <atg.sleepless@gmail.com>

4 files changed, 10 insertions, 5 deletions

diff --git a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/DependencyTreePage.java b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/DependencyTreePage.java
index 6cbbf3cf..3809d85e 100644
--- a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/DependencyTreePage.java
+++ b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/DependencyTreePage.java
@@ -312,7 +312,7 @@ public class DependencyTreePage extends FormPage implements IMavenProjectChanged
           Object o = it.next();
           if(o instanceof DependencyNode) {
             org.eclipse.aether.artifact.Artifact a = ((DependencyNode) o).getDependency().getArtifact();
-            OpenPomAction.openEditor(a.getGroupId(), a.getArtifactId(), a.getVersion(), null);
+            OpenPomAction.openEditor(a.getGroupId(), a.getArtifactId(), a.getVersion(), mavenProject, null);
           }
         }
       }
@@ -450,7 +450,7 @@ public class DependencyTreePage extends FormPage implements IMavenProjectChanged
           Object o = it.next();
           if(o instanceof Artifact) {
             Artifact a = (Artifact) o;
-            OpenPomAction.openEditor(a.getGroupId(), a.getArtifactId(), a.getVersion(), null);
+            OpenPomAction.openEditor(a.getGroupId(), a.getArtifactId(), a.getVersion(), mavenProject, null);
           }
         }
       }
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 ae7b9e56..39644875 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
@@ -1025,6 +1025,10 @@ public class MavenPomEditor extends FormEditor implements IResourceChangeListene
   @Override
   @SuppressWarnings("rawtypes")
   public Object getAdapter(Class adapter) {
+    if(MavenProject.class.equals(adapter)) {
+      return getMavenProject();
+    }
+
     Object result = super.getAdapter(adapter);
     if(result != null && Display.getCurrent() == null) {
       return result;
diff --git a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/MavenPomEditorPage.java b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/MavenPomEditorPage.java
index 7441dc4b..188cee7c 100644
--- a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/MavenPomEditorPage.java
+++ b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/MavenPomEditorPage.java
@@ -192,7 +192,7 @@ public abstract class MavenPomEditorPage extends FormPage {
           if(!isEmpty(ret[0]) && !isEmpty(ret[1]) && !isEmpty(ret[2])) {
             new Job(Messages.MavenPomEditorPage_job_opening) {
               protected IStatus run(IProgressMonitor monitor) {
-                OpenPomAction.openEditor(ret[0], ret[1], ret[2], monitor);
+                OpenPomAction.openEditor(ret[0], ret[1], ret[2], getPomEditor().getMavenProject(), monitor);
                 return Status.OK_STATUS;
               }
             }.schedule();
diff --git a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/OverviewPage.java b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/OverviewPage.java
index c27d2458..3325f405 100644
--- a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/OverviewPage.java
+++ b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/OverviewPage.java
@@ -436,7 +436,7 @@ public class OverviewPage extends MavenPomEditorPage {
         final String version = parentVersionText.getText();
         new Job(NLS.bind(Messages.OverviewPage_job, new Object[] {groupId, artifactId, version})) {
           protected IStatus run(IProgressMonitor monitor) {
-            OpenPomAction.openEditor(groupId, artifactId, version, monitor);
+            OpenPomAction.openEditor(groupId, artifactId, version, getPomEditor().getMavenProject(), monitor);
             return Status.OK_STATUS;
           }
         }.schedule();
@@ -591,7 +591,8 @@ public class OverviewPage extends MavenPomEditorPage {
               IMavenProjectFacade projectFacade = findModuleProject(module);
               if(projectFacade != null) {
                 ArtifactKey key = projectFacade.getArtifactKey();
-                OpenPomAction.openEditor(key.getGroupId(), key.getArtifactId(), key.getVersion(), monitor);
+                OpenPomAction.openEditor(key.getGroupId(), key.getArtifactId(), key.getVersion(), getPomEditor()
+                    .getMavenProject(), monitor);
               } else {
                 IFile modulePom = findModuleFile(module);
                 if(modulePom != null && modulePom.isAccessible()) {