diff options
| author | Milos Kleint | 2011-01-25 09:15:37 +0000 |
|---|---|---|
| committer | Milos Kleint | 2011-01-25 09:15:37 +0000 |
| commit | 54ee65990442bf8a5e641aa27e465e0476973322 (patch) | |
| tree | 96ca354788f84490826b2290d20b31feccfa67b2 | |
| parent | 8f3a3c0cdca96fc681f3b92f60080cc9d6cfaac7 (diff) | |
| download | m2e-core-54ee65990442bf8a5e641aa27e465e0476973322.tar.gz m2e-core-54ee65990442bf8a5e641aa27e465e0476973322.tar.xz m2e-core-54ee65990442bf8a5e641aa27e465e0476973322.zip | |
add more details about execution into the additional information window
3 files changed, 18 insertions, 5 deletions
diff --git a/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/internal/Messages.java b/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/internal/Messages.java index 2833bfb1..f50ffdbe 100644 --- a/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/internal/Messages.java +++ b/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/internal/Messages.java @@ -40,6 +40,8 @@ public class Messages extends NLS { public static String InsertExpressionProposal_hint2; + public static String LifecycleMappingProposal_all_desc; + public static String LifecycleMappingProposal_execute_desc; public static String LifecycleMappingProposal_execute_label; diff --git a/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/internal/lifecycle/LifecycleMappingProposal.java b/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/internal/lifecycle/LifecycleMappingProposal.java index 113f3f15..7c2c92fe 100644 --- a/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/internal/lifecycle/LifecycleMappingProposal.java +++ b/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/internal/lifecycle/LifecycleMappingProposal.java @@ -91,9 +91,19 @@ public class LifecycleMappingProposal implements ICompletionProposal, ICompletio //no context in markerresolution, just to be sure.. return null; } - return PluginExecutionAction.ignore.equals(action) - ? Messages.LifecycleMappingProposal_ignore_desc - : Messages.LifecycleMappingProposal_execute_desc; + String pluginGroupId = marker.getAttribute(IMavenConstants.MARKER_ATTR_GROUP_ID, ""); //$NON-NLS-1$ + String pluginArtifactId = marker.getAttribute(IMavenConstants.MARKER_ATTR_ARTIFACT_ID, ""); //$NON-NLS-1$ + String pluginVersion = marker.getAttribute(IMavenConstants.MARKER_ATTR_VERSION, ""); //$NON-NLS-1$ + String goal = marker.getAttribute(IMavenConstants.MARKER_ATTR_GOAL, ""); //$NON-NLS-1$ + String execution = marker.getAttribute(IMavenConstants.MARKER_ATTR_EXECUTION_ID, "-"); //$NON-NLS-1$ + String phase = marker.getAttribute(IMavenConstants.MARKER_ATTR_LIFECYCLE_PHASE, "-"); //$NON-NLS-1$ + String info = NLS.bind(Messages.LifecycleMappingProposal_all_desc, + new Object[] {goal, execution, phase, pluginGroupId + ":" + pluginArtifactId + ":" + pluginVersion, //$NON-NLS-1$ //$NON-NLS-2$ + (PluginExecutionAction.ignore.equals(action) + ? Messages.LifecycleMappingProposal_ignore_desc + : Messages.LifecycleMappingProposal_execute_desc)}); + + return info; } public String getLabel() { diff --git a/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/internal/messages.properties b/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/internal/messages.properties index 57079482..82545d33 100644 --- a/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/internal/messages.properties +++ b/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/internal/messages.properties @@ -9,10 +9,11 @@ InsertArtifactProposal_insert_plugin_title=Select Plugin InsertArtifactProposal_searchDialog_title=Select Parent InsertExpressionProposal_hint1=The expression evaluates to <b>{0}</b> in the current effective pom. InsertExpressionProposal_hint2=<br>It is based on property defined in <b>{0}</b> +LifecycleMappingProposal_all_desc=<html>Goal: <b>{0}</b><br/>ExecutionId: <b>{1}</b><br/>Phase: <b>{2}</b><br/>Plugin: {3}<br/><br/>{4}</html> LifecycleMappingProposal_execute_desc=This quickfix generates a plugin configuration snippet recognized by the m2e integration during project configuration. It marks the given goal to be executed during the Eclipse build. -LifecycleMappingProposal_execute_label=Execute goal {0} as part of Eclipse build. +LifecycleMappingProposal_execute_label=Execute goal {0} as part of Eclipse build LifecycleMappingProposal_ignore_desc=This quickfix generates a plugin configuration snippet recognized by the m2e integration during project configuration. It marks the given goal as ignored for the purposes of the Eclipse build. -LifecycleMappingProposal_ignore_label=Ignore goal {0} in Eclipse build. +LifecycleMappingProposal_ignore_label=Ignore goal {0} in Eclipse build MavenMarkerResolution_error=Unable to apply the quick fix. The file may have unsaved changes that invalidate the current quick fix. MavenMarkerResolution_error_title=Error MavenMarkerResolution_schema_label=Add Schema information to the specified pom.xml |