Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFred Bricon2012-05-04 13:23:41 -0400
committerFred Bricon2012-05-07 12:15:01 -0400
commita88c873eb0401be2337d44e7fe32a0fccb84d06a (patch)
tree56c862878f009be0cbaf18ea5aeb42ee034f8e9d
parent38fae6d9c40314f410f338c8f759aa627927c916 (diff)
downloadm2e-core-a88c873eb0401be2337d44e7fe32a0fccb84d06a.tar.gz
m2e-core-a88c873eb0401be2337d44e7fe32a0fccb84d06a.tar.xz
m2e-core-a88c873eb0401be2337d44e7fe32a0fccb84d06a.zip
378526 show 'Resolve Later' action when necessary
If there's no Lifecycle mapping error for an item in the Lifecycle mapping page, then we display an empty string so as not to confuse users. The 'Resolve Later' label is only shown when there's an actual mapping error. Signed-off-by: Fred Bricon <fbricon@gmail.com>
-rw-r--r--org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/LifecycleMappingPage.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/LifecycleMappingPage.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/LifecycleMappingPage.java
index b37082d1..37ebd277 100644
--- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/LifecycleMappingPage.java
+++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/LifecycleMappingPage.java
@@ -214,7 +214,11 @@ public class LifecycleMappingPage extends WizardPage {
for(IMavenDiscoveryProposal prop : all) {
values.add(NLS.bind(Messages.LifecycleMappingPage_installDescription, prop.toString()));
}
- values.add(Messages.LifecycleMappingPage_resolveLaterDescription);
+ if (prov.isError(mappingConfiguration)) {
+ values.add(Messages.LifecycleMappingPage_resolveLaterDescription);
+ } else {
+ values.add(EMPTY_STRING);
+ }
addIgnoreProposals(values, prov);
ComboBoxCellEditor edit = new ComboBoxCellEditor(treeViewer.getTree(), values.toArray(new String[values
.size()]));
@@ -348,7 +352,7 @@ public class LifecycleMappingPage extends WizardPage {
return Messages.LifecycleMappingPage_doNotExecuteParent;
} else if(proposal != null) {
return NLS.bind(Messages.LifecycleMappingPage_installDescription, proposal.toString()); //not really feeling well here.
- } else if(loading) {
+ } else if(loading || !prov.isError(mappingConfiguration)) {
return EMPTY_STRING;
} else {
return Messages.LifecycleMappingPage_resolveLaterDescription;

Back to the top