Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilos Kleint2011-02-11 05:41:38 -0500
committerMilos Kleint2011-02-11 05:41:38 -0500
commit4e6a798373801be36f1a705629f81a3f7ba2cb9e (patch)
tree232f4de34e325f3de796ef059139ea4a6c02366f /org.eclipse.m2e.editor.xml
parent147f378f7b976e171f0aab72058cf14a25b2402c (diff)
downloadm2e-core-4e6a798373801be36f1a705629f81a3f7ba2cb9e.tar.gz
m2e-core-4e6a798373801be36f1a705629f81a3f7ba2cb9e.tar.xz
m2e-core-4e6a798373801be36f1a705629f81a3f7ba2cb9e.zip
fix wrong merge
Diffstat (limited to 'org.eclipse.m2e.editor.xml')
-rw-r--r--org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/internal/MarkerLocationService.java11
1 files changed, 0 insertions, 11 deletions
diff --git a/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/internal/MarkerLocationService.java b/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/internal/MarkerLocationService.java
index 8ff5e968..d31a8de0 100644
--- a/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/internal/MarkerLocationService.java
+++ b/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/internal/MarkerLocationService.java
@@ -1,12 +1,5 @@
package org.eclipse.m2e.editor.xml.internal;
-import static org.eclipse.m2e.editor.xml.internal.PomEdits.childEquals;
-import static org.eclipse.m2e.editor.xml.internal.PomEdits.childMissingOrEqual;
-import static org.eclipse.m2e.editor.xml.internal.PomEdits.findChild;
-import static org.eclipse.m2e.editor.xml.internal.PomEdits.findChilds;
-import static org.eclipse.m2e.editor.xml.internal.PomEdits.getTextValue;
-import static org.eclipse.m2e.editor.xml.internal.PomEdits.textEquals;
-
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
@@ -44,12 +37,8 @@ import org.eclipse.m2e.core.core.IMavenConstants;
import org.eclipse.m2e.core.internal.markers.IEditorMarkerService;
import org.eclipse.m2e.core.internal.markers.IMarkerLocationService;
import org.eclipse.m2e.core.internal.markers.IMavenMarkerManager;
-<<<<<<< HEAD
-import org.eclipse.m2e.editor.xml.internal.PomEdits.Matcher;
-=======
import static org.eclipse.m2e.core.ui.internal.editing.PomEdits.*;
->>>>>>> move pomedits class to core.ui plugin
/**
* a service impl used by the core module to improve marker locations and addition of our own markers

Back to the top