Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilos Kleint2011-02-21 08:23:11 +0000
committerMilos Kleint2011-02-21 08:23:11 +0000
commit200e3aad2da1eaa76ccd8f4fbe0ce5c4c95bf917 (patch)
tree43904a934546edb3439197222fbfb82936bb592f
parent11413b73a1a99a31a64a0a09cbc5a4c847be8d89 (diff)
downloadm2e-core-200e3aad2da1eaa76ccd8f4fbe0ce5c4c95bf917.tar.gz
m2e-core-200e3aad2da1eaa76ccd8f4fbe0ce5c4c95bf917.tar.xz
m2e-core-200e3aad2da1eaa76ccd8f4fbe0ce5c4c95bf917.zip
recursive empty element removal
-rw-r--r--org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/editing/PomEdits.java4
-rw-r--r--org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/editing/RemoveDependencyOperation.java4
2 files changed, 4 insertions, 4 deletions
diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/editing/PomEdits.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/editing/PomEdits.java
index 7b3b6a3e..b6441504 100644
--- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/editing/PomEdits.java
+++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/editing/PomEdits.java
@@ -226,7 +226,8 @@ public class PomEdits {
}
/**
- * remove the current element if it doesn't contain any sublements, useful for lists etc.
+ * remove the current element if it doesn't contain any sublements, useful for lists etc,
+ * works recursively removing all parents up that don't have any children elements.
* @param el
*/
public static void removeIfNoChildElement(Element el) {
@@ -242,6 +243,7 @@ public class PomEdits {
Node parent = el.getParentNode();
if (parent != null && parent instanceof Element) {
removeChild((Element)parent, el);
+ removeIfNoChildElement((Element)parent);
}
}
}
diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/editing/RemoveDependencyOperation.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/editing/RemoveDependencyOperation.java
index 45711d9d..4831caf6 100644
--- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/editing/RemoveDependencyOperation.java
+++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/editing/RemoveDependencyOperation.java
@@ -34,8 +34,6 @@ public class RemoveDependencyOperation implements Operation {
removeChild(dependencies, dependencyElement);
// Remove dependencies element if it is empty
- if(PomHelper.findDependencies(document.getDocumentElement()).isEmpty()) {
- removeChild(document.getDocumentElement(), dependencies);
- }
+ removeIfNoChildElement(dependencies);
}
}

Back to the top