diff options
author | Matthew Piggott | 2011-02-18 23:03:32 +0000 |
---|---|---|
committer | Milos Kleint | 2011-02-21 06:32:09 +0000 |
commit | 6ebbf4907dd0b0c5d110f7dda28cae363f214adc (patch) | |
tree | 76009d9a272dd9a9d1c6474837141bff88eae331 /org.eclipse.m2e.refactoring/src/org | |
parent | 2d7018c221b0fdfeb1999284144cff0a144afd82 (diff) | |
download | m2e-core-6ebbf4907dd0b0c5d110f7dda28cae363f214adc.tar.gz m2e-core-6ebbf4907dd0b0c5d110f7dda28cae363f214adc.tar.xz m2e-core-6ebbf4907dd0b0c5d110f7dda28cae363f214adc.zip |
336511 - Exclude Refactoring
Diffstat (limited to 'org.eclipse.m2e.refactoring/src/org')
3 files changed, 133 insertions, 340 deletions
diff --git a/org.eclipse.m2e.refactoring/src/org/eclipse/m2e/refactoring/AbstractPomHeirarchyRefactoring.java b/org.eclipse.m2e.refactoring/src/org/eclipse/m2e/refactoring/AbstractPomHeirarchyRefactoring.java index e6679601..4afbb7c3 100644 --- a/org.eclipse.m2e.refactoring/src/org/eclipse/m2e/refactoring/AbstractPomHeirarchyRefactoring.java +++ b/org.eclipse.m2e.refactoring/src/org/eclipse/m2e/refactoring/AbstractPomHeirarchyRefactoring.java @@ -10,77 +10,43 @@ *******************************************************************************/ package org.eclipse.m2e.refactoring; -import java.io.IOException; import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; import java.util.LinkedList; import java.util.List; -import java.util.Map; import org.apache.maven.execution.MavenExecutionRequest; import org.apache.maven.project.MavenProject; import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.OperationCanceledException; -import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.SubMonitor; -import org.eclipse.emf.common.command.BasicCommandStack; -import org.eclipse.emf.common.command.Command; -import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl; -import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain; -import org.eclipse.emf.edit.domain.EditingDomain; -import org.eclipse.emf.edit.provider.ComposedAdapterFactory; -import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory; -import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory; import org.eclipse.ltk.core.refactoring.Change; import org.eclipse.ltk.core.refactoring.CompositeChange; import org.eclipse.ltk.core.refactoring.Refactoring; import org.eclipse.ltk.core.refactoring.RefactoringStatus; import org.eclipse.ltk.core.refactoring.RefactoringStatusEntry; -import org.eclipse.ltk.core.refactoring.resource.ResourceChange; import org.eclipse.m2e.core.MavenPlugin; 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.editor.pom.MavenPomEditor; -import org.eclipse.m2e.model.edit.pom.Model; -import org.eclipse.m2e.model.edit.pom.util.PomResourceImpl; -import org.eclipse.swt.widgets.Display; -import org.eclipse.ui.IEditorPart; -import org.eclipse.ui.IEditorReference; -import org.eclipse.ui.IWorkbenchPage; -import org.eclipse.ui.IWorkbenchWindow; -import org.eclipse.ui.PlatformUI; public abstract class AbstractPomHeirarchyRefactoring extends Refactoring { public static final String PLUGIN_ID = "org.eclipse.m2e.refactoring"; - protected IMavenProjectFacade projectFacade; - - protected EditingDomain editingDomain; - - protected Model model; - protected IFile file; - protected List<MavenProject> hierarchy; + protected List<IFile> hierarchy; - protected List<MavenProject> targets; + protected List<IFile> targets; - private Map<IFile, Model> modelCache = new HashMap<IFile, Model>(); - - public AbstractPomHeirarchyRefactoring(IMavenProjectFacade projectFacade, Model model, EditingDomain editingDomain, IFile file) { - this.editingDomain = editingDomain; + public AbstractPomHeirarchyRefactoring(IFile file) { this.file = file; - this.model = model; - this.projectFacade = projectFacade; - modelCache.put(file, model); } /* @@ -99,39 +65,37 @@ public abstract class AbstractPomHeirarchyRefactoring extends Refactoring { protected abstract RefactoringStatusEntry[] isReady(IProgressMonitor pm); /* - * Is the project a target for this refactoring + * Is the pom a target for this refactoring */ - protected abstract boolean isChanged(EditingDomain editingDomain, MavenProject project, IProgressMonitor pm) - throws CoreException, OperationCanceledException, IOException; + protected abstract boolean isAffected(IFile pom, IProgressMonitor monitor) throws CoreException; /* * Change associated with the MavenProject */ - protected abstract Change getChange(MavenProject project, IProgressMonitor pm) throws CoreException; + protected abstract Change getChange(IFile file, IProgressMonitor pm) throws CoreException; /* (non-Javadoc) * @see org.eclipse.ltk.core.refactoring.Refactoring#checkInitialConditions(org.eclipse.core.runtime.IProgressMonitor) */ public RefactoringStatus checkInitialConditions(IProgressMonitor pm) throws CoreException, OperationCanceledException { - SubMonitor monitor = SubMonitor.convert(pm, 103); + SubMonitor monitor = SubMonitor.convert(pm, 104); try { checkInitial(monitor.newChild(1)); RefactoringStatus status = new RefactoringStatus(); - if(model == null && file == null) { + if(file == null) { status.addEntry(new RefactoringStatusEntry(RefactoringStatus.FATAL, Messages.AbstractPomHeirarchyRefactoring_noModelOrPom)); return status; } - loadWorkspaceAncestors(monitor.newChild(1)); + gatherHeirarchy(monitor.newChild(1)); if(monitor.isCanceled()) { throw new OperationCanceledException(); } - targets = new ArrayList<MavenProject>(); - for(MavenProject project : hierarchy) { - IMavenProjectFacade facade = getMavenProjectFacade(project); - if(isChanged(getEditingDomain(facade), project, monitor.newChild(100 / hierarchy.size()))) { - targets.add(project); + targets = new ArrayList<IFile>(); + for(IFile pom : hierarchy) { + if(isAffected(pom, monitor.newChild(100 / hierarchy.size()))) { + targets.add(pom); } if(monitor.isCanceled()) { throw new OperationCanceledException(); @@ -145,10 +109,6 @@ public abstract class AbstractPomHeirarchyRefactoring extends Refactoring { status.addEntry(entry); } return status; - } catch(IOException e) { - throw new CoreException(new Status(IStatus.ERROR, PLUGIN_ID, - Messages.AbstractPomHeirarchyRefactoring_failedToLoadModel, - e)); } finally { monitor.done(); } @@ -170,8 +130,8 @@ public abstract class AbstractPomHeirarchyRefactoring extends Refactoring { SubMonitor monitor = SubMonitor.convert(pm, targets.size() * 2); try { - for(MavenProject project : targets) { - Change change = getChange(project, monitor.newChild(1)); + for(IFile file : targets) { + Change change = getChange(file, pm); if(change != null) { compositeChange.add(change); } @@ -185,66 +145,8 @@ public abstract class AbstractPomHeirarchyRefactoring extends Refactoring { } } - /* - * Get the EditingDomain for a given project - */ - protected EditingDomain getEditingDomain(IMavenProjectFacade facade) { - if(facade.getMavenProject().equals(hierarchy.get(0)) && editingDomain != null) { - return editingDomain; - } - // Check if an editor is open - MavenPomEditor editor = getOpenEditor(facade); - if(editor != null) { - return editor.getEditingDomain(); - } - // Create a fake one - List<AdapterFactoryImpl> factories = new ArrayList<AdapterFactoryImpl>(); - factories.add(new ResourceItemProviderAdapterFactory()); - factories.add(new ReflectiveItemProviderAdapterFactory()); - - ComposedAdapterFactory adapterFactory = new ComposedAdapterFactory(factories); - BasicCommandStack commandStack = new BasicCommandStack(); - return new AdapterFactoryEditingDomain(adapterFactory, // - commandStack, new HashMap<Resource, Boolean>()); - } - - private MavenPomEditor getOpenEditor(IMavenProjectFacade facade) { - for(IWorkbenchWindow window : PlatformUI.getWorkbench().getWorkbenchWindows()) { - for(IWorkbenchPage page : window.getPages()) { - for(IEditorReference editor : page.getEditorReferences()) { - if(MavenPomEditor.EDITOR_ID.equals(editor.getId())) { - IEditorPart part = editor.getEditor(false); - if(part instanceof MavenPomEditor) { - MavenPomEditor mpe = (MavenPomEditor) part; - if(facade.getPom().equals(mpe.getPomFile())) { - return mpe; - } - } - } - } - } - } - return null; - } - - /* - * Get the model associated with the Project - */ - protected Model getModel(MavenProject mavenProject) throws CoreException, IOException { - IFile pomFile = getMavenProjectFacade(mavenProject).getPom(); - Model m = modelCache.get(pomFile); - if(m == null) { - MavenPomEditor editor = getOpenEditor(getMavenProjectFacade(mavenProject)); - if(editor != null) { - m = editor.readProjectDocument(); - } else { - PomResourceImpl resource = MavenPlugin.getDefault().getMavenModelManager().loadResource(pomFile); - resource.load(Collections.EMPTY_MAP); - m = resource.getModel(); - } - modelCache.put(pomFile, m); - } - return m; + protected IMavenProjectFacade getMavenProjectFacade(IFile pom) { + return MavenPlugin.getDefault().getMavenProjectManager().create(pom, true, new NullProgressMonitor()); } protected IMavenProjectFacade getMavenProjectFacade(MavenProject mavenProject) { @@ -252,38 +154,24 @@ public abstract class AbstractPomHeirarchyRefactoring extends Refactoring { .getMavenProject(mavenProject.getGroupId(), mavenProject.getArtifactId(), mavenProject.getVersion()); } - protected IFile getPomFile(MavenProject project) { - IMavenProjectFacade facade = getMavenProjectFacade(project); - if(facade.equals(projectFacade)) { - return file; - } - return facade.getPom(); - } - /* * Get the heirarchy of parents that exist in the workspace */ - private List<MavenProject> loadWorkspaceAncestors(IProgressMonitor progressMonitor) throws CoreException { - SubMonitor monitor = SubMonitor.convert(progressMonitor); + private List<IFile> gatherHeirarchy(IProgressMonitor progressMonitor) throws CoreException { + SubMonitor monitor = SubMonitor.convert(progressMonitor, 3); try { IMaven maven = MavenPlugin.getDefault().getMaven(); MavenProjectManager projectManager = MavenPlugin.getDefault().getMavenProjectManager(); - MavenProject project = projectFacade.getMavenProject(); + IMavenProjectFacade projectFacade = getMavenProjectFacade(file); + MavenProject project = projectFacade.getMavenProject(monitor.newChild(1)); maven.detachFromSession(project); - hierarchy = new LinkedList<MavenProject>(); - hierarchy.add(project); - while(project.getModel().getParent() != null) { - if(monitor.isCanceled()) { - return null; - } - MavenExecutionRequest request = projectManager.createExecutionRequest(projectFacade, monitor); - project = maven.resolveParentProject(request, project, monitor); - if(getMavenProjectFacade(project) != null) { - hierarchy.add(project); - } - } + hierarchy = new LinkedList<IFile>(); + hierarchy.add(file); + + gatherDescendants(projectFacade, projectManager, monitor); + gatherAncestors(projectFacade, projectManager, monitor); return hierarchy; } finally { @@ -291,66 +179,39 @@ public abstract class AbstractPomHeirarchyRefactoring extends Refactoring { } } - /* - * Wraps a {@link org.eclipse.emf.common.command.Command} to the pom in a Resource - */ - protected static class PomResourceChange extends ResourceChange { - private Command command; - - private IFile pom; - - private EditingDomain domain; - - private PomResourceChange redo; - - private String name; - - private PomResourceChange(PomResourceChange redo, EditingDomain domain, Command command, IFile pom, String name) { - this(domain, command, pom, name); - this.redo = redo; - } - - public PomResourceChange(EditingDomain domain, Command command, IFile pom, String changes) { - this.command = command; - this.domain = domain; - this.pom = pom; - this.name = pom.getFullPath().toString() + " - " + changes; - } - - /* (non-Javadoc) - * @see org.eclipse.ltk.core.refactoring.resource.ResourceChange#getModifiedResource() - */ - protected IResource getModifiedResource() { - return pom; - } - - /* (non-Javadoc) - * @see org.eclipse.ltk.core.refactoring.Change#getName() - */ - public String getName() { - return name; + private void gatherAncestors(IMavenProjectFacade projectFacade, MavenProjectManager projectManager, + IProgressMonitor pm) + throws CoreException { + MavenExecutionRequest request = projectManager.createExecutionRequest(projectFacade, pm); + MavenProject project = MavenPlugin.getDefault().getMaven() + .resolveParentProject(request, projectFacade.getMavenProject(pm), pm); + pm.worked(1); + IMavenProjectFacade parentFacade = getMavenProjectFacade(project); + if(parentFacade != null) { + hierarchy.add(parentFacade.getPom()); + gatherDescendants(parentFacade, projectManager, pm); + gatherAncestors(parentFacade, projectManager, pm); } + } - /* (non-Javadoc) - * @see org.eclipse.ltk.core.refactoring.Change#perform(org.eclipse.core.runtime.IProgressMonitor) - */ - public Change perform(IProgressMonitor pm) throws CoreException { - SubMonitor monitor = SubMonitor.convert(pm, 3); - try { - Display.getDefault().syncExec(new Runnable() { - public void run() { - domain.getCommandStack().execute(command); + private void gatherDescendants(IMavenProjectFacade projectFacade, MavenProjectManager projectManager, + IProgressMonitor pm) throws CoreException { + + for(String module : projectFacade.getMavenProjectModules()) { + IPath modulePath = projectFacade.getProject().getFullPath().append(module); + modulePath = ResourcesPlugin.getWorkspace().getRoot().getLocation().append(modulePath); + ResourcesPlugin.getWorkspace().getRoot().getContainerForLocation(modulePath); + + for(IProject p : ResourcesPlugin.getWorkspace().getRoot().getProjects()) { + if(p.getLocation().equals(modulePath)) { + IMavenProjectFacade facade = projectManager.getProject(p); + if(facade != null && !hierarchy.contains(facade)) { + if(!hierarchy.contains(facade.getPom())) { + hierarchy.add(facade.getPom()); + gatherDescendants(facade, projectManager, pm); + } } - }); - monitor.worked(2); - - if(redo == null && domain.getCommandStack().canUndo()) { - redo = new PomResourceChange(this, domain, domain.getCommandStack().getUndoCommand(), pom, name); } - monitor.worked(1); - return redo; - } finally { - monitor.done(); } } } diff --git a/org.eclipse.m2e.refactoring/src/org/eclipse/m2e/refactoring/exclude/DependencyExcludeAction.java b/org.eclipse.m2e.refactoring/src/org/eclipse/m2e/refactoring/exclude/DependencyExcludeAction.java index d23eb9e3..490aabc5 100644 --- a/org.eclipse.m2e.refactoring/src/org/eclipse/m2e/refactoring/exclude/DependencyExcludeAction.java +++ b/org.eclipse.m2e.refactoring/src/org/eclipse/m2e/refactoring/exclude/DependencyExcludeAction.java @@ -16,9 +16,6 @@ import java.util.List; import org.apache.maven.artifact.Artifact; import org.eclipse.core.resources.IFile; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.emf.edit.domain.EditingDomain; import org.eclipse.jdt.core.IJavaElement; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.internal.ui.packageview.ClassPathContainer.RequiredProjectWrapper; @@ -26,13 +23,8 @@ import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.ltk.ui.refactoring.RefactoringWizardOpenOperation; -import org.eclipse.m2e.core.MavenPlugin; 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.ui.internal.actions.SelectionUtil; -import org.eclipse.m2e.editor.pom.MavenPomEditor; -import org.eclipse.m2e.model.edit.pom.Model; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IActionDelegate; import org.eclipse.ui.IEditorPart; @@ -53,16 +45,10 @@ public class DependencyExcludeAction implements IActionDelegate { private ArtifactKey[] keys; - private Model model; - - private IMavenProjectFacade projectFacade; - - private EditingDomain editingDomain; - public void run(IAction action) { if(keys != null && file != null) { Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(); - ExcludeArtifactRefactoring r = new ExcludeArtifactRefactoring(projectFacade, model, editingDomain, keys, file); + ExcludeArtifactRefactoring r = new ExcludeArtifactRefactoring(keys, file); MavenExcludeWizard wizard = new MavenExcludeWizard(r); try { String titleForFailedChecks = ""; //$NON-NLS-1$ @@ -77,8 +63,6 @@ public class DependencyExcludeAction implements IActionDelegate { public void selectionChanged(IAction action, ISelection selection) { file = null; keys = null; - model = null; - editingDomain = null; // TODO move logic into adapters if (selection instanceof IStructuredSelection) { @@ -89,26 +73,18 @@ public class DependencyExcludeAction implements IActionDelegate { if (selected instanceof Artifact) { file = getFileFromEditor(); keys.add(new ArtifactKey((Artifact) selected)); - model = getModelFromEditor(); - projectFacade = getFacade(file); - editingDomain = getEditingDomain(); } else if (selected instanceof org.sonatype.aether.graph.DependencyNode) { file = getFileFromEditor(); keys.add(new ArtifactKey(((org.sonatype.aether.graph.DependencyNode) selected).getDependency().getArtifact())); - model = getModelFromEditor(); - projectFacade = getFacade(file); - editingDomain = getEditingDomain(); } else if (selected instanceof RequiredProjectWrapper) { RequiredProjectWrapper w = (RequiredProjectWrapper) selected; file = getFileFromProject(w.getParentClassPathContainer().getJavaProject()); - projectFacade = getFacade(file); keys.add(SelectionUtil.getType(selected, ArtifactKey.class)); } else { keys.add(SelectionUtil.getType(selected, ArtifactKey.class)); if (selected instanceof IJavaElement) { IJavaElement el = (IJavaElement) selected; file = getFileFromProject(el.getParent().getJavaProject()); - projectFacade = getFacade(file); } } } @@ -134,31 +110,4 @@ public class DependencyExcludeAction implements IActionDelegate { } return null; } - - //mkleint: scary - private Model getModelFromEditor() { - IEditorPart part = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor(); - if(part != null && part instanceof MavenPomEditor) { - try { - return ((MavenPomEditor) part).readProjectDocument(); - } catch(CoreException ex) { - // TODO Should we do something here, or do we not care - } - } - return null; - } - - private EditingDomain getEditingDomain() { - IEditorPart part = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor(); - if(part != null && part instanceof MavenPomEditor) { - return ((MavenPomEditor) part).getEditingDomain(); - } - return null; - } - - private IMavenProjectFacade getFacade(IFile file) { - MavenProjectManager projectManager = MavenPlugin.getDefault().getMavenProjectManager(); - return projectManager.create(file, true, new NullProgressMonitor()); - } - } diff --git a/org.eclipse.m2e.refactoring/src/org/eclipse/m2e/refactoring/exclude/ExcludeArtifactRefactoring.java b/org.eclipse.m2e.refactoring/src/org/eclipse/m2e/refactoring/exclude/ExcludeArtifactRefactoring.java index 34ec2c83..1e95e8d7 100644 --- a/org.eclipse.m2e.refactoring/src/org/eclipse/m2e/refactoring/exclude/ExcludeArtifactRefactoring.java +++ b/org.eclipse.m2e.refactoring/src/org/eclipse/m2e/refactoring/exclude/ExcludeArtifactRefactoring.java @@ -10,7 +10,6 @@ *******************************************************************************/ package org.eclipse.m2e.refactoring.exclude; -import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; @@ -23,13 +22,8 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.OperationCanceledException; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.SubMonitor; -import org.eclipse.emf.common.command.CompoundCommand; -import org.eclipse.emf.edit.command.AddCommand; -import org.eclipse.emf.edit.command.RemoveCommand; -import org.eclipse.emf.edit.domain.EditingDomain; import org.eclipse.ltk.core.refactoring.Change; import org.eclipse.ltk.core.refactoring.RefactoringStatus; import org.eclipse.ltk.core.refactoring.RefactoringStatusEntry; @@ -38,11 +32,11 @@ import org.eclipse.m2e.core.core.IMavenConstants; import org.eclipse.m2e.core.embedder.ArtifactKey; import org.eclipse.m2e.core.embedder.MavenModelManager; import org.eclipse.m2e.core.project.IMavenProjectFacade; -import org.eclipse.m2e.model.edit.pom.Dependency; -import org.eclipse.m2e.model.edit.pom.Exclusion; -import org.eclipse.m2e.model.edit.pom.Model; -import org.eclipse.m2e.model.edit.pom.PomPackage; -import org.eclipse.m2e.model.edit.pom.impl.PomFactoryImpl; +import org.eclipse.m2e.core.ui.internal.editing.AddExclusionOperation; +import org.eclipse.m2e.core.ui.internal.editing.PomEdits.CompoundOperation; +import org.eclipse.m2e.core.ui.internal.editing.PomEdits.Operation; +import org.eclipse.m2e.core.ui.internal.editing.PomHelper; +import org.eclipse.m2e.core.ui.internal.editing.RemoveDependencyOperation; import org.eclipse.m2e.refactoring.AbstractPomHeirarchyRefactoring; import org.eclipse.m2e.refactoring.Messages; import org.eclipse.osgi.util.NLS; @@ -56,13 +50,12 @@ public class ExcludeArtifactRefactoring extends AbstractPomHeirarchyRefactoring private final ArtifactKey[] keys; - private Map<MavenProject, Change> changeMap; - private Set<ArtifactKey> locatedKeys; - public ExcludeArtifactRefactoring(IMavenProjectFacade projectFacade, Model model, EditingDomain editingDomain, - ArtifactKey[] keys, IFile pom) { - super(projectFacade, model, editingDomain, pom); + private Map<IFile, Change> operationMap; + + public ExcludeArtifactRefactoring(ArtifactKey[] keys, IFile pom) { + super(pom); this.keys = keys; } @@ -78,18 +71,64 @@ public class ExcludeArtifactRefactoring extends AbstractPomHeirarchyRefactoring return NLS.bind(Messages.ExcludeArtifactRefactoring_refactoringName, builder.toString()); } - protected boolean isChanged(final EditingDomain editingDomain, final MavenProject project, - final IProgressMonitor progressMonitor) throws CoreException, - OperationCanceledException, IOException { + /* (non-Javadoc) + * @see org.eclipse.m2e.refactoring.exclude.AbstractRefactoring#isReady(org.eclipse.core.runtime.IProgressMonitor) + */ + protected RefactoringStatusEntry[] isReady(IProgressMonitor pm) { + if(keys == null || keys.length == 0) { + return new RefactoringStatusEntry[] {new RefactoringStatusEntry(RefactoringStatus.FATAL, + Messages.ExcludeArtifactRefactoring_noArtifactsSet)}; + } + List<RefactoringStatusEntry> entries = new ArrayList<RefactoringStatusEntry>(); + for (ArtifactKey key : keys) { + if (!locatedKeys.contains(key)) { + entries.add(new RefactoringStatusEntry(RefactoringStatus.FATAL, NLS.bind( + Messages.ExcludeArtifactRefactoring_failedToLocateArtifact, key.toString()))); + } + } + return entries.toArray(new RefactoringStatusEntry[entries.size()]); + } + + /* (non-Javadoc) + * @see org.eclipse.m2e.refactoring.AbstractRefactoring#getChange(org.apache.maven.project.MavenProject, org.eclipse.core.runtime.IProgressMonitor) + */ + protected Change getChange(IFile file, IProgressMonitor pm) { + return operationMap.get(file); + } + + /* (non-Javadoc) + * @see org.eclipse.m2e.refactoring.AbstractPomHeirarchyRefactoring#checkInitial(org.eclipse.core.runtime.IProgressMonitor) + */ + protected void checkInitial(IProgressMonitor pm) { + locatedKeys = new HashSet<ArtifactKey>(keys.length); + operationMap = new HashMap<IFile, Change>(); + } + + /* (non-Javadoc) + * @see org.eclipse.m2e.refactoring.AbstractPomHeirarchyRefactoring#checkFinal(org.eclipse.core.runtime.IProgressMonitor) + */ + protected void checkFinal(IProgressMonitor pm) { + // Do nothing + } + + /* (non-Javadoc) + * @see org.eclipse.m2e.refactoring.AbstractPomHeirarchyRefactoring#isAffected(org.eclipse.m2e.core.project.IMavenProjectFacade, org.eclipse.core.runtime.IProgressMonitor) + */ + protected boolean isAffected(IFile pomFile, IProgressMonitor progressMonitor) throws CoreException { + final SubMonitor monitor = SubMonitor.convert(progressMonitor); - final Model m = getModel(project); - final List<Dependency> deps = m.getDependencies(); final IStatus[] status = new IStatus[1]; - final CompoundCommand exclusionCommand = new CompoundCommand(); - final List<Dependency> toRemove = new ArrayList<Dependency>(); + + final IMavenProjectFacade facade = MavenPlugin.getDefault().getMavenProjectManagerImpl() + .create(pomFile, true, monitor); + final MavenProject project = facade.getMavenProject(progressMonitor); + final org.apache.maven.model.Model m = project.getModel(); + + final List<Operation> operations = new ArrayList<Operation>(); final StringBuilder msg = new StringBuilder(); - + final List<org.apache.maven.model.Dependency> dependencies = m.getDependencies(); + MavenModelManager modelManager = MavenPlugin.getDefault().getMavenModelManager(); DependencyNode root = modelManager.readDependencyTree(project, JavaScopes.TEST, monitor.newChild(1)); root.accept(new DependencyVisitor() { @@ -118,17 +157,17 @@ public class ExcludeArtifactRefactoring extends AbstractPomHeirarchyRefactoring } else if(node == topLevel) { msg.append(key.toString()).append(','); // need to remove top-level dependency - toRemove.add(findDependency(topLevel)); + operations.add(new RemoveDependencyOperation(findDependency(topLevel))); locatedKeys.add(key); } else { // need to add exclusion to top-level dependency - Dependency dependency = findDependency(topLevel); + org.apache.maven.model.Dependency dependency = findDependency(topLevel); if(dependency == null) { status[0] = new Status(IStatus.ERROR, IMavenConstants.PLUGIN_ID, NLS.bind( Messages.ExcludeRefactoring_error_parent, topLevel.getDependency().getArtifact().getGroupId(), topLevel.getDependency().getArtifact().getArtifactId())); } else { - addExclusion(exclusionCommand, dependency, key); + operations.add(new AddExclusionOperation(dependency, key)); locatedKeys.add(key); } } @@ -140,17 +179,8 @@ public class ExcludeArtifactRefactoring extends AbstractPomHeirarchyRefactoring return true; } - private void addExclusion(CompoundCommand command, Dependency dep, ArtifactKey key) { - Exclusion exclusion = PomFactoryImpl.eINSTANCE.createExclusion(); - exclusion.setArtifactId(key.getArtifactId()); - exclusion.setGroupId(key.getGroupId()); - command.append(AddCommand.create(editingDomain, dep, - PomPackage.eINSTANCE.getDependency_Exclusions(), exclusion)); - msg.append(key.toString()).append(','); - } - - private Dependency findDependency(String groupId, String artifactId) { - for(Dependency d : deps) { + private org.apache.maven.model.Dependency findDependency(String groupId, String artifactId) { + for(org.apache.maven.model.Dependency d : dependencies) { if(d.getGroupId().equals(groupId) && d.getArtifactId().equals(artifactId)) { return d; } @@ -158,7 +188,7 @@ public class ExcludeArtifactRefactoring extends AbstractPomHeirarchyRefactoring return null; } - private Dependency findDependency(DependencyNode node) { + private org.apache.maven.model.Dependency findDependency(DependencyNode node) { Artifact artifact; if(node.getRelocations().isEmpty()) { artifact = node.getDependency().getArtifact(); @@ -169,57 +199,10 @@ public class ExcludeArtifactRefactoring extends AbstractPomHeirarchyRefactoring } }); - for(Dependency remove : toRemove) { - exclusionCommand.append(RemoveCommand.create(editingDomain, remove)); - } -// for(Iterator<Dependency> rem = toRemove.iterator(); rem.hasNext();) { -// RemoveCommand.create(editingDomain, model, null, rem.next()); -// exclusionCommand.append(new RemoveCommand(editingDomain, model.getDependencies(), rem.next())); -// } - if(!exclusionCommand.isEmpty()) { - changeMap.put(project, new PomResourceChange(editingDomain, exclusionCommand, getPomFile(project),// - msg.delete(msg.length() - 1, msg.length()).toString())); - } - return !exclusionCommand.isEmpty(); - } - - /* (non-Javadoc) - * @see org.eclipse.m2e.refactoring.exclude.AbstractRefactoring#isReady(org.eclipse.core.runtime.IProgressMonitor) - */ - protected RefactoringStatusEntry[] isReady(IProgressMonitor pm) { - if(keys == null || keys.length == 0) { - return new RefactoringStatusEntry[] {new RefactoringStatusEntry(RefactoringStatus.FATAL, - Messages.ExcludeArtifactRefactoring_noArtifactsSet)}; - } - List<RefactoringStatusEntry> entries = new ArrayList<RefactoringStatusEntry>(); - for (ArtifactKey key : keys) { - if (!locatedKeys.contains(key)) { - entries.add(new RefactoringStatusEntry(RefactoringStatus.FATAL, NLS.bind( - Messages.ExcludeArtifactRefactoring_failedToLocateArtifact, key.toString()))); - } + if(operations.size() > 0) { + operationMap.put(pomFile, PomHelper.createChange(pomFile, + new CompoundOperation(operations.toArray(new Operation[operations.size()])), msg.toString())); } - return entries.toArray(new RefactoringStatusEntry[entries.size()]); - } - - /* (non-Javadoc) - * @see org.eclipse.m2e.refactoring.AbstractRefactoring#getChange(org.apache.maven.project.MavenProject, org.eclipse.core.runtime.IProgressMonitor) - */ - protected Change getChange(MavenProject project, IProgressMonitor pm) { - return changeMap.get(project); - } - - /* (non-Javadoc) - * @see org.eclipse.m2e.refactoring.AbstractPomHeirarchyRefactoring#checkInitial(org.eclipse.core.runtime.IProgressMonitor) - */ - protected void checkInitial(IProgressMonitor pm) { - locatedKeys = new HashSet<ArtifactKey>(keys.length); - changeMap = new HashMap<MavenProject, Change>(); - } - - /* (non-Javadoc) - * @see org.eclipse.m2e.refactoring.AbstractPomHeirarchyRefactoring#checkFinal(org.eclipse.core.runtime.IProgressMonitor) - */ - protected void checkFinal(IProgressMonitor pm) { - // Do nothing + return !operations.isEmpty(); } }
\ No newline at end of file |