diff options
3 files changed, 21 insertions, 23 deletions
diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/editing/AddExclusionOperation.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/editing/AddExclusionOperation.java index ea74cb1e..9b5301c3 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/editing/AddExclusionOperation.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/editing/AddExclusionOperation.java @@ -31,17 +31,15 @@ public class AddExclusionOperation implements Operation { public void process(Document document) { Element depElement = PomHelper.findDependency(document, dependency); - if(depElement == null) { - //TODO we shall not throw exceptions from operations.. - throw new IllegalArgumentException("Dependency does not exist in this pom"); - } - Element exclusionsElement = getChild(depElement, EXCLUSIONS); + if(depElement != null) { + Element exclusionsElement = getChild(depElement, EXCLUSIONS); - Element exclusionElement = createElement(exclusionsElement, EXCLUSION); + Element exclusionElement = createElement(exclusionsElement, EXCLUSION); - createElementWithText(exclusionElement, ARTIFACT_ID, exclusion.getArtifactId()); - createElementWithText(exclusionElement, GROUP_ID, exclusion.getGroupId()); - //TODO mkleint: are there really exclusion versions?? - createElementWithText(exclusionElement, VERSION, exclusion.getVersion()); + createElementWithText(exclusionElement, ARTIFACT_ID, exclusion.getArtifactId()); + createElementWithText(exclusionElement, GROUP_ID, exclusion.getGroupId()); + //TODO mkleint: are there really exclusion versions?? + createElementWithText(exclusionElement, VERSION, exclusion.getVersion()); + } } } 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 4831caf6..93fb88a3 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 @@ -26,14 +26,12 @@ public class RemoveDependencyOperation implements Operation { */ public void process(Document document) { Element dependencyElement = PomHelper.findDependency(document, dependency); - if(dependencyElement == null) { - //TODO we shall not throw exceptions from operations.. - throw new IllegalArgumentException("Dependency does not exist in pom"); - } - Element dependencies = findChild(document.getDocumentElement(), DEPENDENCIES); - removeChild(dependencies, dependencyElement); - // Remove dependencies element if it is empty + if(dependencyElement != null) { + Element dependencies = findChild(document.getDocumentElement(), DEPENDENCIES); + removeChild(dependencies, dependencyElement); + // Remove dependencies element if it is empty - removeIfNoChildElement(dependencies); + removeIfNoChildElement(dependencies); + } } } 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 4afbb7c3..ff6e712c 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 @@ -186,11 +186,13 @@ public abstract class AbstractPomHeirarchyRefactoring extends Refactoring { 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); + if(project != null) { + IMavenProjectFacade parentFacade = getMavenProjectFacade(project); + if(parentFacade != null) { + hierarchy.add(parentFacade.getPom()); + gatherDescendants(parentFacade, projectManager, pm); + gatherAncestors(parentFacade, projectManager, pm); + } } } |