refactoring, introduce constants for elements, move some methods to PomHelper

2 files changed, 9 insertions, 8 deletions

diff --git a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/dialogs/ManageDependenciesDialog.java b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/dialogs/ManageDependenciesDialog.java
index 2cb044e3..2c583931 100644
--- a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/dialogs/ManageDependenciesDialog.java
+++ b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/dialogs/ManageDependenciesDialog.java
@@ -39,6 +39,7 @@ import org.eclipse.m2e.core.ui.internal.dialogs.AbstractMavenDialog;
 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.PomEdits.OperationTuple;
+import org.eclipse.m2e.core.ui.internal.editing.PomHelper;
 import org.eclipse.m2e.editor.MavenEditorPlugin;
 import org.eclipse.m2e.editor.composites.DependencyLabelProvider;
 import org.eclipse.m2e.editor.composites.ListEditorContentProvider;
@@ -289,7 +290,7 @@ public class ManageDependenciesDialog extends AbstractMavenDialog {
           }
           //TODO is the version is defined by property expression, we should make sure the property is defined in the current project
           for (Dependency modelDependency : modelDependencies) {
-            createDependency(managedDepsElement, modelDependency.getGroupId(), modelDependency.getArtifactId(), modelDependency.getVersion());
+            PomHelper.createDependency(managedDepsElement, modelDependency.getGroupId(), modelDependency.getArtifactId(), modelDependency.getVersion());
           }
       }
     };
diff --git a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/OverviewPage.java b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/OverviewPage.java
index 8c594d45..e00bb6bb 100644
--- a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/OverviewPage.java
+++ b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/OverviewPage.java
@@ -1395,17 +1395,17 @@ public class OverviewPage extends MavenPomEditorPage {
             performOnDOMDocument(new OperationTuple(pomFile, new Operation() {
               public void process(Document document) {
                 Element root = document.getDocumentElement();
-                Element parent = getChild(root, "parent");
-                setText(getChild(parent, "groupId"), parentGroupId);
-                setText(getChild(parent, "artifactId"), parentArtifactId);
-                setText(getChild(parent, "version"), parentVersion);
-                setText(getChild(parent, "relativePath"), relativePath);
-                Element grId = findChild(root, "groupId");
+                Element parent = getChild(root, PARENT);
+                setText(getChild(parent, GROUP_ID), parentGroupId);
+                setText(getChild(parent, ARTIFACT_ID), parentArtifactId);
+                setText(getChild(parent, VERSION), parentVersion);
+                setText(getChild(parent, RELATIVE_PATH), relativePath);
+                Element grId = findChild(root, GROUP_ID);
                 String grIdText = getTextValue(grId);
                 if (grIdText != null && grIdText.equals(parentGroupId)) {
                   removeChild(root, grId);
                 }
-                Element ver = findChild(root, "version");
+                Element ver = findChild(root, VERSION);
                 String verText = getTextValue(ver);
                 if (verText != null && verText.equals(parentVersion)) {
                   removeChild(root, ver);