Introduced IMavenProjectRegistry to replace MavenProjectManager

Signed-off-by: Igor Fedorenko <igor@ifedorenko.com>

14 files changed, 43 insertions, 40 deletions

diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/MavenVersionDecorator.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/MavenVersionDecorator.java
index 9b462c54..be03a7cb 100644
--- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/MavenVersionDecorator.java
+++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/MavenVersionDecorator.java
@@ -28,7 +28,7 @@ import org.eclipse.m2e.core.embedder.ArtifactKey;
 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.project.MavenProjectManager;
+import org.eclipse.m2e.core.project.IMavenProjectRegistry;
 import org.eclipse.swt.graphics.Image;
 
 /**
@@ -47,7 +47,7 @@ public class MavenVersionDecorator implements ILabelDecorator {
       IResource resource = (IResource) element;
       IProject project = resource.getProject();
       if(project!=null) {
-        MavenProjectManager projectManager = MavenPlugin.getDefault().getMavenProjectManager();
+        IMavenProjectRegistry projectManager = MavenPlugin.getDefault().getMavenProjectRegistry();
         IMavenProjectFacade facade = projectManager.create(project, new NullProgressMonitor());
         if(facade!=null) {
           ArtifactKey mavenProject = facade.getArtifactKey();
@@ -92,14 +92,14 @@ public class MavenVersionDecorator implements ILabelDecorator {
     
     listeners.put(listener, projectChangeListener);
     
-    MavenProjectManager projectManager = MavenPlugin.getDefault().getMavenProjectManager();
+    IMavenProjectRegistry projectManager = MavenPlugin.getDefault().getMavenProjectRegistry();
     projectManager.addMavenProjectChangedListener(projectChangeListener);
   }
   
   public void removeListener(ILabelProviderListener listener) {
     IMavenProjectChangedListener projectChangeListener = listeners.get(listener);
     if(projectChangeListener!=null) {
-      MavenProjectManager projectManager = MavenPlugin.getDefault().getMavenProjectManager();
+      IMavenProjectRegistry projectManager = MavenPlugin.getDefault().getMavenProjectRegistry();
       projectManager.removeMavenProjectChangedListener(projectChangeListener);
     }
   }
diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/UpdateConfigurationJob.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/UpdateConfigurationJob.java
index 2511668e..49c1a449 100644
--- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/UpdateConfigurationJob.java
+++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/UpdateConfigurationJob.java
@@ -81,7 +81,7 @@ public class UpdateConfigurationJob extends WorkspaceJob {
       }
 
       monitor.subTask(project.getName());
-      IMavenProjectFacade projectFacade = plugin.getMavenProjectManager().create(project, monitor);
+      IMavenProjectFacade projectFacade = plugin.getMavenProjectRegistry().create(project, monitor);
       if(projectFacade != null) {
       try {
           plugin.getProjectConfigurationManager().updateProjectConfiguration(project, //
diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/AddDependencyAction.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/AddDependencyAction.java
index 0cbb273e..a7924e52 100644
--- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/AddDependencyAction.java
+++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/AddDependencyAction.java
@@ -54,7 +54,7 @@ public class AddDependencyAction extends MavenActionSupport implements IWorkbenc
       MavenProject mp = null;
       IProject prj = file.getProject();
       if (prj != null && IMavenConstants.POM_FILE_NAME.equals(file.getProjectRelativePath().toString())) {
-          IMavenProjectFacade facade = MavenPlugin.getDefault().getMavenProjectManager().getProject(prj);
+          IMavenProjectFacade facade = MavenPlugin.getDefault().getMavenProjectRegistry().getProject(prj);
           if (facade != null) {
             mp = facade.getMavenProject();
           }
diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/AddPluginAction.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/AddPluginAction.java
index d0addd18..e57f2c72 100644
--- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/AddPluginAction.java
+++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/AddPluginAction.java
@@ -47,7 +47,7 @@ public class AddPluginAction extends MavenActionSupport implements IWorkbenchWin
     MavenProject mp = null;
     IProject prj = file.getProject();
     if (prj != null && IMavenConstants.POM_FILE_NAME.equals(file.getProjectRelativePath().toString())) {
-        IMavenProjectFacade facade = MavenPlugin.getDefault().getMavenProjectManager().getProject(prj);
+        IMavenProjectFacade facade = MavenPlugin.getDefault().getMavenProjectRegistry().getProject(prj);
         if (facade != null) {
           mp = facade.getMavenProject();
         }
diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/ChangeNatureAction.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/ChangeNatureAction.java
index 0f3492e7..0d623ae2 100644
--- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/ChangeNatureAction.java
+++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/ChangeNatureAction.java
@@ -34,7 +34,7 @@ import org.eclipse.m2e.core.core.IMavenConstants;
 import org.eclipse.m2e.core.embedder.IMavenConfiguration;
 import org.eclipse.m2e.core.ui.internal.Messages;
 import org.eclipse.m2e.core.project.IProjectConfigurationManager;
-import org.eclipse.m2e.core.project.MavenProjectManager;
+import org.eclipse.m2e.core.project.IMavenProjectRegistry;
 import org.eclipse.m2e.core.project.MavenUpdateRequest;
 import org.eclipse.m2e.core.project.ResolverConfiguration;
 import org.eclipse.ui.IObjectActionDelegate;
@@ -110,7 +110,7 @@ public class ChangeNatureAction implements IObjectActionDelegate, IExecutableExt
     private final int option;
 
     private final IProjectConfigurationManager importManager;
-    private final MavenProjectManager projectManager;
+    private final IMavenProjectRegistry projectManager;
     private final IMavenConfiguration mavenConfiguration;
 
     public UpdateJob(Set<IProject> projects, int option) {
@@ -120,7 +120,7 @@ public class ChangeNatureAction implements IObjectActionDelegate, IExecutableExt
 
       MavenPlugin plugin = MavenPlugin.getDefault();
       this.importManager = plugin.getProjectConfigurationManager();
-      this.projectManager = plugin.getMavenProjectManager();
+      this.projectManager = plugin.getMavenProjectRegistry();
       
       this.mavenConfiguration = MavenPlugin.getDefault().getMavenConfiguration();
     }
@@ -153,10 +153,9 @@ public class ChangeNatureAction implements IObjectActionDelegate, IExecutableExt
     }
 
     private void changeNature(final IProject project, IProgressMonitor monitor) throws CoreException {
-      MavenPlugin plugin = MavenPlugin.getDefault();
-      MavenProjectManager projectManager = plugin.getMavenProjectManager();
+      IProjectConfigurationManager configurationManager = MavenPlugin.getProjectConfigurationManager();
       
-      final ResolverConfiguration configuration = projectManager.getResolverConfiguration(project);
+      final ResolverConfiguration configuration = configurationManager.getResolverConfiguration(project);
 
       boolean updateSourceFolders = false;
 
@@ -169,7 +168,7 @@ public class ChangeNatureAction implements IObjectActionDelegate, IExecutableExt
           break;
       }
 
-      projectManager.setResolverConfiguration(project, configuration);
+      configurationManager.setResolverConfiguration(project, configuration);
 
       if (updateSourceFolders) {
         importManager.updateProjectConfiguration(project, monitor);
diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/MavenActionSupport.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/MavenActionSupport.java
index 2a155842..aea8d1c6 100644
--- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/MavenActionSupport.java
+++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/MavenActionSupport.java
@@ -25,7 +25,7 @@ import org.eclipse.m2e.core.core.IMavenConstants;
 import org.eclipse.m2e.core.embedder.ArtifactKey;
 import org.eclipse.m2e.core.embedder.ArtifactRef;
 import org.eclipse.m2e.core.project.IMavenProjectFacade;
-import org.eclipse.m2e.core.project.MavenProjectManager;
+import org.eclipse.m2e.core.project.IMavenProjectRegistry;
 import org.eclipse.m2e.core.ui.internal.M2EUIPluginActivator;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.IEditorInput;
@@ -54,7 +54,7 @@ public abstract class MavenActionSupport implements IObjectActionDelegate {
 
   protected Set<ArtifactKey> getArtifacts(IFile file, MavenPlugin plugin) {
     try {
-      MavenProjectManager projectManager = plugin.getMavenProjectManager();
+      IMavenProjectRegistry projectManager = plugin.getMavenProjectRegistry();
       //TODO: mkleint: this is a bit troubling as it can take considerate amount of time
       // and it's being called in action's run() before the search dialog appearing.
       IMavenProjectFacade projectFacade = projectManager.create(file, true, new NullProgressMonitor());
diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/MavenPropertyTester.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/MavenPropertyTester.java
index 1f4ae005..81ceae9a 100644
--- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/MavenPropertyTester.java
+++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/MavenPropertyTester.java
@@ -21,7 +21,7 @@ import org.eclipse.m2e.core.MavenPlugin;
 import org.eclipse.m2e.core.core.IMavenConstants;
 import org.eclipse.m2e.core.embedder.ArtifactKey;
 import org.eclipse.m2e.core.project.IMavenProjectFacade;
-import org.eclipse.m2e.core.project.MavenProjectManager;
+import org.eclipse.m2e.core.project.IMavenProjectRegistry;
 import org.eclipse.m2e.core.project.ResolverConfiguration;
 import org.sonatype.aether.graph.DependencyNode;
 
@@ -67,7 +67,7 @@ public class MavenPropertyTester extends PropertyTester {
       
       IProject projectAdapter = (IProject) adaptable.getAdapter(IProject.class);
       if(projectAdapter!=null) {
-          MavenProjectManager projectManager = MavenPlugin.getDefault().getMavenProjectManager();
+          IMavenProjectRegistry projectManager = MavenPlugin.getDefault().getMavenProjectRegistry();
           IMavenProjectFacade projectFacade = projectManager.create(projectAdapter, new NullProgressMonitor());
           if(projectFacade != null) {
             ResolverConfiguration configuration = projectFacade.getResolverConfiguration();
@@ -84,7 +84,7 @@ public class MavenPropertyTester extends PropertyTester {
     if (HAS_PROJECT_ARTIFACT_KEY.equals(property)) {
       ArtifactKey key = SelectionUtil.getType(receiver, ArtifactKey.class);
       if(key != null) {
-        MavenProjectManager projectManager = MavenPlugin.getDefault().getMavenProjectManager();
+        IMavenProjectRegistry projectManager = MavenPlugin.getDefault().getMavenProjectRegistry();
         IMavenProjectFacade mavenProject = null;
         mavenProject = projectManager.getMavenProject( //
             key.getGroupId(), key.getArtifactId(), key.getVersion());
diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/OpenPomAction.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/OpenPomAction.java
index 23383c75..d4c70530 100644
--- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/OpenPomAction.java
+++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/OpenPomAction.java
@@ -46,7 +46,7 @@ import org.eclipse.m2e.core.index.IIndex;
 import org.eclipse.m2e.core.index.IndexedArtifact;
 import org.eclipse.m2e.core.index.IndexedArtifactFile;
 import org.eclipse.m2e.core.project.IMavenProjectFacade;
-import org.eclipse.m2e.core.project.MavenProjectManager;
+import org.eclipse.m2e.core.project.IMavenProjectRegistry;
 import org.eclipse.m2e.core.ui.internal.Messages;
 import org.eclipse.m2e.core.ui.internal.dialogs.MavenRepositorySearchDialog;
 import org.eclipse.osgi.util.NLS;
@@ -198,7 +198,7 @@ public class OpenPomAction extends ActionDelegate implements IWorkbenchWindowAct
       try {
         MavenPlugin plugin = MavenPlugin.getDefault();
 
-        MavenProjectManager projectManager = plugin.getMavenProjectManager();
+        IMavenProjectRegistry projectManager = plugin.getMavenProjectRegistry();
         IMavenProjectFacade projectFacade = projectManager.getMavenProject(groupId, artifactId, version);
         if(projectFacade != null) {
           final IFile pomFile = projectFacade.getPom();
diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/OpenUrlAction.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/OpenUrlAction.java
index 7bd3c52a..d9ce84cd 100644
--- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/OpenUrlAction.java
+++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/OpenUrlAction.java
@@ -185,7 +185,7 @@ public class OpenUrlAction extends ActionDelegate implements IWorkbenchWindowAct
     MavenPlugin plugin = MavenPlugin.getDefault();
     IMaven maven = MavenPlugin.getDefault().getMaven();
 
-    IMavenProjectFacade projectFacade = plugin.getMavenProjectManager().getMavenProject(groupId, artifactId, version);
+    IMavenProjectFacade projectFacade = plugin.getMavenProjectRegistry().getMavenProject(groupId, artifactId, version);
     if(projectFacade != null) {
       return projectFacade.getMavenProject(monitor);
     }
diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/RefreshMavenModelsAction.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/RefreshMavenModelsAction.java
index d8934456..c2cc2dc5 100644
--- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/RefreshMavenModelsAction.java
+++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/RefreshMavenModelsAction.java
@@ -25,7 +25,7 @@ import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.m2e.core.MavenPlugin;
 import org.eclipse.m2e.core.core.IMavenConstants;
-import org.eclipse.m2e.core.project.MavenProjectManager;
+import org.eclipse.m2e.core.project.IMavenProjectRegistry;
 import org.eclipse.m2e.core.project.MavenUpdateRequest;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.IWorkbenchWindowActionDelegate;
@@ -65,7 +65,7 @@ public class RefreshMavenModelsAction implements IWorkbenchWindowActionDelegate,
   // IWorkbenchWindowActionDelegate
   
   public void run(IAction action) {
-    MavenProjectManager projectManager = MavenPlugin.getDefault().getMavenProjectManager();
+    IMavenProjectRegistry projectManager = MavenPlugin.getDefault().getMavenProjectRegistry();
     projectManager.refresh(new MavenUpdateRequest(getProjects(), offline, updateSnapshots));
   }
 
diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/SelectionUtil.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/SelectionUtil.java
index 4ed21720..14155b66 100644
--- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/SelectionUtil.java
+++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/SelectionUtil.java
@@ -44,7 +44,7 @@ import org.eclipse.m2e.core.core.IMavenConstants;
 import org.eclipse.m2e.core.embedder.ArtifactKey;
 import org.eclipse.m2e.core.embedder.IMaven;
 import org.eclipse.m2e.core.project.IMavenProjectFacade;
-import org.eclipse.m2e.core.project.MavenProjectManager;
+import org.eclipse.m2e.core.project.IMavenProjectRegistry;
 import org.eclipse.m2e.core.ui.internal.Messages;
 import org.eclipse.m2e.core.ui.internal.util.Util;
 import org.eclipse.m2e.core.ui.internal.util.Util.FileStoreEditorInputStub;
@@ -272,7 +272,7 @@ public class SelectionUtil {
   public static MavenProject getMavenProject(IEditorInput editorInput, IProgressMonitor monitor) throws CoreException {
     if(editorInput instanceof IFileEditorInput) {
       IFile pomFile = ((IFileEditorInput) editorInput).getFile();
-      MavenProjectManager projectManager = MavenPlugin.getDefault().getMavenProjectManager();
+      IMavenProjectRegistry projectManager = MavenPlugin.getDefault().getMavenProjectRegistry();
       IMavenProjectFacade facade = projectManager.create(pomFile, true, monitor);
       if(facade!=null) {
         return facade.getMavenProject(monitor);
diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/MavenProjectPreferencePage.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/MavenProjectPreferencePage.java
index c3598103..66484d72 100644
--- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/MavenProjectPreferencePage.java
+++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/MavenProjectPreferencePage.java
@@ -11,6 +11,9 @@
 
 package org.eclipse.m2e.core.ui.internal.preferences;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.WorkspaceJob;
 import org.eclipse.core.runtime.CoreException;
@@ -18,11 +21,6 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.m2e.core.MavenPlugin;
-import org.eclipse.m2e.core.core.IMavenConstants;
-import org.eclipse.m2e.core.project.MavenProjectManager;
-import org.eclipse.m2e.core.project.ResolverConfiguration;
-import org.eclipse.m2e.core.ui.internal.Messages;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
@@ -33,8 +31,12 @@ import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.dialogs.PropertyPage;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
+import org.eclipse.m2e.core.MavenPlugin;
+import org.eclipse.m2e.core.core.IMavenConstants;
+import org.eclipse.m2e.core.project.IProjectConfigurationManager;
+import org.eclipse.m2e.core.project.ResolverConfiguration;
+import org.eclipse.m2e.core.ui.internal.Messages;
 
 /**
  * Maven project preference page
@@ -128,25 +130,24 @@ public class MavenProjectPreferencePage extends PropertyPage {
 //    configuration.setIncludeModules(includeModulesButton.getSelection());
     configuration.setActiveProfiles(activeProfilesText.getText());
     
-    MavenProjectManager projectManager = MavenPlugin.getDefault().getMavenProjectManager();
+    IProjectConfigurationManager projectManager = MavenPlugin.getProjectConfigurationManager();
     boolean isSet = projectManager.setResolverConfiguration(getProject(), configuration);
     if(isSet) {
 
         boolean res = MessageDialog.openQuestion(getShell(), Messages.MavenProjectPreferencePage_dialog_title, //
             Messages.MavenProjectPreferencePage_dialog_message);
         if(res) {
-          final MavenPlugin plugin = MavenPlugin.getDefault();
           WorkspaceJob job = new WorkspaceJob(NLS.bind(Messages.MavenProjectPreferencePage_job, project.getName() )) {
             public IStatus runInWorkspace(IProgressMonitor monitor) {
               try {
-                plugin.getProjectConfigurationManager().updateProjectConfiguration(project, monitor);
+                MavenPlugin.getProjectConfigurationManager().updateProjectConfiguration(project, monitor);
               } catch(CoreException ex) {
                 return ex.getStatus();
               }
               return Status.OK_STATUS;
             }
           };
-          job.setRule(plugin.getProjectConfigurationManager().getRule());
+          job.setRule(MavenPlugin.getProjectConfigurationManager().getRule());
           job.schedule();
         }
 
@@ -156,7 +157,7 @@ public class MavenProjectPreferencePage extends PropertyPage {
   }
 
   private ResolverConfiguration getResolverConfiguration() {
-    MavenProjectManager projectManager = MavenPlugin.getDefault().getMavenProjectManager();
+    IProjectConfigurationManager projectManager = MavenPlugin.getProjectConfigurationManager();
     return projectManager.getResolverConfiguration(getProject());
   }
 
diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/MavenSettingsPreferencePage.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/MavenSettingsPreferencePage.java
index 0938769a..e7d14f65 100644
--- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/MavenSettingsPreferencePage.java
+++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/MavenSettingsPreferencePage.java
@@ -147,7 +147,7 @@ public class MavenSettingsPreferencePage extends PreferencePage implements IWork
             indexManager.getWorkspaceIndex().updateIndex(true, monitor);
           }
           if(updateMavenDependencies){
-            IMavenProjectFacade[] projects = MavenPlugin.getDefault().getMavenProjectManager().getProjects();
+            IMavenProjectFacade[] projects = MavenPlugin.getDefault().getMavenProjectRegistry().getProjects();
             ArrayList<IProject> allProjects = new ArrayList<IProject>();
             if(projects != null){
               MavenPlugin.getDefault().getMaven().reloadSettings();
@@ -158,7 +158,7 @@ public class MavenSettingsPreferencePage extends PreferencePage implements IWork
               }
               MavenPlugin
                   .getDefault()
-                  .getMavenProjectManager()
+                  .getMavenProjectRegistry()
                   .refresh(
                       new MavenUpdateRequest(allProjects.toArray(new IProject[] {}), mavenConfiguration.isOffline(),
                           true));
diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/LifecycleMappingPage.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/LifecycleMappingPage.java
index ac7f6f14..b0868fea 100644
--- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/LifecycleMappingPage.java
+++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/LifecycleMappingPage.java
@@ -23,6 +23,9 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.jface.resource.JFaceResources;
+import org.eclipse.jface.viewers.CellEditor;
+import org.eclipse.jface.viewers.ComboBoxCellEditor;
+import org.eclipse.jface.viewers.EditingSupport;
 import org.eclipse.jface.viewers.ILabelProviderListener;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredSelection;