Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgor Fedorenko2011-02-26 21:06:12 -0500
committerIgor Fedorenko2011-02-26 21:06:12 -0500
commit1f3fcca41c7815ce06a410faa5354dc88577f888 (patch)
tree4915ae626d5a87b297af387774e263f85255c08e /org.eclipse.m2e.editor.xml
parent0b83f43095f517e060ba48777ad6032ba991da2f (diff)
downloadm2e-core-1f3fcca41c7815ce06a410faa5354dc88577f888.tar.gz
m2e-core-1f3fcca41c7815ce06a410faa5354dc88577f888.tar.xz
m2e-core-1f3fcca41c7815ce06a410faa5354dc88577f888.zip
338317 unknown_packaging_type error marker no more
DefaultLifecycleMapping strategy provides good/desired behaviour for vast majority of projects. It does not make sense to require explicit mapping strategy configuration for all projects. Signed-off-by: Igor Fedorenko <igor@ifedorenko.com>
Diffstat (limited to 'org.eclipse.m2e.editor.xml')
-rw-r--r--org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/PomQuickAssistProcessor.java2
-rw-r--r--org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/internal/MarkerLocationService.java19
2 files changed, 1 insertions, 20 deletions
diff --git a/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/PomQuickAssistProcessor.java b/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/PomQuickAssistProcessor.java
index 7db71144..4105683d 100644
--- a/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/PomQuickAssistProcessor.java
+++ b/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/PomQuickAssistProcessor.java
@@ -121,8 +121,6 @@ public class PomQuickAssistProcessor implements IQuickAssistProcessor {
extractedFromMarkers(proposals, mark); //having this first sort of helps for 335490
proposals.add(new LifecycleMappingProposal(context, mark, PluginExecutionAction.ignore));
// proposals.add(new LifecycleMappingProposal(context, mark, PluginExecutionAction.execute));
- } else if (hint.equals(IMavenConstants.EDITOR_HINT_UNKNOWN_PACKAGING)){
- extractedFromMarkers(proposals, mark);
}
}
}
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 eee4baf6..0c99b2b7 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
@@ -104,24 +104,7 @@ public class MarkerLocationService implements IMarkerLocationService, IEditorMar
public void findLocationForMarker_(final IMarker marker) {
String hint = marker.getAttribute(IMavenConstants.MARKER_ATTR_EDITOR_HINT, null);
- if (IMavenConstants.EDITOR_HINT_UNKNOWN_PACKAGING.equals(hint)) {
- try {
- XmlUtils.performOnRootElement((IFile)marker.getResource(), new NodeOperation<Element>() {
- public void process(Element root, IStructuredDocument structuredDocument) {
- Element markEl = findChild(root, "packaging");
- if (markEl == null) {
- markEl = root;
- }
- annotateMarker(marker, structuredDocument, markEl);
- }
- });
- } catch(IOException e) {
- log.error("Error locating marker", e);
- } catch(CoreException e) {
- log.error("Error locating marker", e);
- }
- }
-
+
if (IMavenConstants.EDITOR_HINT_NOT_COVERED_MOJO_EXECUTION.equals(hint)) {
try {
XmlUtils.performOnRootElement((IFile)marker.getResource(), new NodeOperation<Element>() {

Back to the top