Bug 539481: [11][quick assist] Update display names of quick assists
related to var and lambda
Change-Id: I76effea9e05b023169705853e8517b63add3ad96
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/CorrectionMessages.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/CorrectionMessages.java
index efb0c0a..19ce849 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/CorrectionMessages.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/CorrectionMessages.java
@@ -297,9 +297,8 @@
public static String QuickAssistProcessor_add_inferred_lambda_parameter_types;
public static String QuickAssistProcessor_replace_var_with_inferred_lambda_parameter_types;
public static String QuickAssistProcessor_add_var_lambda_parameter_types;
- public static String QuickAssistProcessor_replace_inferred_with_var_lambda_parameter_types;
- public static String QuickAssistProcessor_remove_inferred_lambda_parameter_types;
- public static String QuickAssistProcessor_remove_var_lambda_parameter_types;
+ public static String QuickAssistProcessor_replace_lambda_parameter_types_with_var;
+ public static String QuickAssistProcessor_remove_lambda_parameter_types;
public static String QuickAssistProcessor_addfinallyblock_description;
public static String QuickAssistProcessor_addelseblock_description;
public static String QuickAssistProcessor_addParenthesesInLambda;
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/CorrectionMessages.properties b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/CorrectionMessages.properties
index 98fb82d..9b7b528 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/CorrectionMessages.properties
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/CorrectionMessages.properties
@@ -356,11 +356,10 @@
QuickAssistProcessor_extract_to_constant_description=Extract to constant
QuickAssistProcessor_joindeclaration_description=Join variable declaration
QuickAssistProcessor_add_inferred_lambda_parameter_types=Add inferred lambda parameter types
-QuickAssistProcessor_replace_var_with_inferred_lambda_parameter_types= Replace var types with inferred lambda parameter types
-QuickAssistProcessor_add_var_lambda_parameter_types=Add var lambda parameter types
-QuickAssistProcessor_replace_inferred_with_var_lambda_parameter_types=Replace inferred types with var lambda parameter types
-QuickAssistProcessor_remove_inferred_lambda_parameter_types=Remove inferred lambda parameter types
-QuickAssistProcessor_remove_var_lambda_parameter_types=Remove var lambda parameter types
+QuickAssistProcessor_replace_var_with_inferred_lambda_parameter_types= Replace 'var' with inferred lambda parameter types
+QuickAssistProcessor_add_var_lambda_parameter_types=Add 'var' lambda parameter types
+QuickAssistProcessor_replace_lambda_parameter_types_with_var=Replace lambda parameter types with 'var'
+QuickAssistProcessor_remove_lambda_parameter_types=Remove lambda parameter types
QuickAssistProcessor_addfinallyblock_description=Add finally block
QuickAssistProcessor_addelseblock_description=Add else block
QuickAssistProcessor_addParenthesesInLambda=Add parentheses around lambda parameter
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/QuickAssistProcessor.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/QuickAssistProcessor.java
index ca3bcda..9aa6410 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/QuickAssistProcessor.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/QuickAssistProcessor.java
@@ -1537,7 +1537,7 @@
String label= null;
Image image= JavaPluginImages.get(JavaPluginImages.IMG_CORRECTION_CHANGE);
if (isvarTypeSingleVariableDeclaration) {
- label= CorrectionMessages.QuickAssistProcessor_replace_inferred_with_var_lambda_parameter_types;
+ label= CorrectionMessages.QuickAssistProcessor_replace_lambda_parameter_types_with_var;
ASTRewriteRemoveImportsCorrectionProposal newProposal= new ASTRewriteRemoveImportsCorrectionProposal(label, context.getCompilationUnit(), rewrite,
IProposalRelevance.ADD_INFERRED_LAMBDA_PARAMETER_TYPES, image);
newProposal.setImportRemover(remover);
@@ -1622,14 +1622,13 @@
ASTRewriteCorrectionProposal proposal;
String label= null;
Image image= JavaPluginImages.get(JavaPluginImages.IMG_CORRECTION_CHANGE);
+ label= CorrectionMessages.QuickAssistProcessor_remove_lambda_parameter_types;
if (removeImports) {
- label= CorrectionMessages.QuickAssistProcessor_remove_inferred_lambda_parameter_types;
ASTRewriteRemoveImportsCorrectionProposal newProposal= new ASTRewriteRemoveImportsCorrectionProposal(label, context.getCompilationUnit(), rewrite,
IProposalRelevance.ADD_INFERRED_LAMBDA_PARAMETER_TYPES, image);
newProposal.setImportRemover(remover);
proposal= newProposal;
} else {
- label= CorrectionMessages.QuickAssistProcessor_remove_var_lambda_parameter_types;
proposal= new ASTRewriteCorrectionProposal(label, context.getCompilationUnit(), rewrite, IProposalRelevance.ADD_INFERRED_LAMBDA_PARAMETER_TYPES, image);
}
proposal.setImportRewrite(importRewrite);
