bug 337565 - Remove Dependency when operating on descendants

1 files changed, 7 insertions, 4 deletions

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 4e84a93a..4ed428aa 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
@@ -141,13 +141,12 @@ public class ExcludeArtifactRefactoring extends Refactoring {
     // Below exclusion point - pull up dependency to exclusion point
     for(MavenProject project : getDescendants()) {
       visitor = locate(project, monitor.newChild(1));
+      List<Operation> operations = new ArrayList<Operation>();
       for(Entry<Dependency, Set<ArtifactKey>> entry : visitor.getSourceMap().entrySet()) {
         locatedKeys.addAll(entry.getValue());
         Dependency dependency = entry.getKey();
-        if(contains(entry.getValue(), dependency)) {
-          changes.add(PomHelper.createChange(getFile(project), new RemoveDependencyOperation(dependency),
-              NLS.bind(Messages.ExcludeArtifactRefactoring_removeDependency, toString(dependency))));
-        } else {
+        operations.add(new RemoveDependencyOperation(dependency));
+        if(!contains(entry.getValue(), dependency)) {
           CompositeChange change = new CompositeChange(Messages.ExcludeArtifactRefactoring_moveDependency);
           change.add(PomHelper.createChange(getFile(project), new RemoveDependencyOperation(dependency),
               NLS.bind(Messages.ExcludeArtifactRefactoring_removeDependency, toString(dependency))));
@@ -157,6 +156,10 @@ public class ExcludeArtifactRefactoring extends Refactoring {
           }
         }
       }
+      if(operations.size() > 0) {
+        changes.add(PomHelper.createChange(getFile(project),
+            new CompoundOperation(operations.toArray(new Operation[operations.size()])), "Exclude Artifact"));
+      }
     }
 
     // Above exclusion - Add dep to exclusionPoint