clean-up re Bug 338524 - Avoid using class MessageFormat
- no more NLS problems in any of our plugins.
diff --git a/plugins/org.eclipse.objectteams.otdt.jdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/assist/CompletionAdaptor.java b/plugins/org.eclipse.objectteams.otdt.jdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/assist/CompletionAdaptor.java
index 5e4e91d..6e0a86a 100644
--- a/plugins/org.eclipse.objectteams.otdt.jdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/assist/CompletionAdaptor.java
+++ b/plugins/org.eclipse.objectteams.otdt.jdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/assist/CompletionAdaptor.java
@@ -82,6 +82,7 @@
import org.eclipse.objectteams.otdt.core.compiler.IOTConstants;
import org.eclipse.objectteams.otdt.ui.ImageConstants;
import org.eclipse.objectteams.otdt.ui.ImageManager;
+import org.eclipse.osgi.util.NLS;
import base org.eclipse.jdt.internal.corext.codemanipulation.StubUtility2;
import base org.eclipse.jdt.internal.ui.text.java.LazyJavaTypeCompletionProposal;
@@ -360,9 +361,8 @@
message = org.eclipse.objectteams.otdt.internal.ui.Messages.Completion_callout_to_field_label;
break;
}
- nameBuffer.append(Messages.format(
- message,
- new String(createTypeDisplayName(proposal.getDeclarationSignature()))));
+ nameBuffer.append(NLS.bind(message,
+ new String(createTypeDisplayName(proposal.getDeclarationSignature()))));
return nameBuffer;
}
@@ -371,7 +371,7 @@
StyledString nameBuffer= new StyledString();
nameBuffer.append(createJavadocSimpleProposalLabel(proposal));
nameBuffer.append(" - "); //$NON-NLS-1$
- nameBuffer.append(Messages.format(
+ nameBuffer.append(NLS.bind(
org.eclipse.objectteams.otdt.internal.ui.Messages.Completion_callout_to_field_label,
new String(createTypeDisplayName(proposal.getDeclarationSignature()))));
return nameBuffer;
diff --git a/plugins/org.eclipse.objectteams.otdt.jdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/assist/OTQuickFixes.java b/plugins/org.eclipse.objectteams.otdt.jdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/assist/OTQuickFixes.java
index 25b3f37..a409a3e 100644
--- a/plugins/org.eclipse.objectteams.otdt.jdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/assist/OTQuickFixes.java
+++ b/plugins/org.eclipse.objectteams.otdt.jdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/assist/OTQuickFixes.java
@@ -61,7 +61,6 @@
import org.eclipse.jdt.internal.corext.fix.IProposableFix;
import org.eclipse.jdt.internal.corext.fix.LinkedProposalModel;
import org.eclipse.jdt.internal.corext.fix.LinkedProposalPositionGroup;
-import org.eclipse.jdt.internal.corext.util.Messages;
import org.eclipse.jdt.internal.ui.JavaPluginImages;
import org.eclipse.jdt.internal.ui.fix.Java50CleanUp;
import org.eclipse.jdt.internal.ui.text.correction.ASTResolving;
@@ -82,6 +81,7 @@
import org.eclipse.objectteams.otdt.internal.ui.text.correction.MappingProposalSubProcessor;
import org.eclipse.objectteams.otdt.internal.ui.text.correction.TypeProposalSubProcessor;
import org.eclipse.objectteams.otdt.internal.ui.util.Images;
+import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.graphics.Image;
import base org.eclipse.jdt.internal.corext.fix.Java50Fix;
@@ -183,9 +183,9 @@
// other cases are already handled by the original method.
return base.addSuppressWarningsProposal(cu, node, warningToken, relevance, proposals);
}
- String label= Messages.format(
- CorrectionMessages.SuppressWarningsSubProcessor_suppress_warnings_label,
- new String[] { warningToken, name });
+ String label= NLS.bind(CorrectionMessages.SuppressWarningsSubProcessor_suppress_warnings_label,
+ warningToken,
+ name);
// instantiate a role wrapping an invisible class
// and immediately lower the object using a public base type:
diff --git a/plugins/org.eclipse.objectteams.otdt.jdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/text/correction/ChangeModifierProposalSubProcessor.java b/plugins/org.eclipse.objectteams.otdt.jdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/text/correction/ChangeModifierProposalSubProcessor.java
index afb0585..c637599 100644
--- a/plugins/org.eclipse.objectteams.otdt.jdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/text/correction/ChangeModifierProposalSubProcessor.java
+++ b/plugins/org.eclipse.objectteams.otdt.jdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/text/correction/ChangeModifierProposalSubProcessor.java
@@ -47,7 +47,6 @@
import org.eclipse.jdt.ui.text.java.IInvocationContext;
import org.eclipse.jdt.ui.text.java.IJavaCompletionProposal;
import org.eclipse.swt.graphics.Image;
-import org.eclipse.objectteams.otdt.core.exceptions.InternalCompilerError;
import org.eclipse.objectteams.otdt.ui.ImageConstants;
import org.eclipse.objectteams.otdt.ui.ImageManager;
diff --git a/plugins/org.eclipse.objectteams.otdt.jdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/text/correction/CorrectionMessages.java b/plugins/org.eclipse.objectteams.otdt.jdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/text/correction/CorrectionMessages.java
index f7a762f..12e1dab 100644
--- a/plugins/org.eclipse.objectteams.otdt.jdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/text/correction/CorrectionMessages.java
+++ b/plugins/org.eclipse.objectteams.otdt.jdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/text/correction/CorrectionMessages.java
@@ -70,6 +70,10 @@
public static String OTQuickfix_add_missing_role_tag;
+ public static String QuickAssistProcessor_addMethodBindingSignatures_label;
+ public static String QuickAssistProcessor_addSignature_editName;
+ public static String QuickAssistProcessor_removeMethodBindingSignatures_label;
+
static {
NLS.initializeMessages(BUNDLE_NAME, CorrectionMessages.class);
}
diff --git a/plugins/org.eclipse.objectteams.otdt.jdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/text/correction/CorrectionMessages.properties b/plugins/org.eclipse.objectteams.otdt.jdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/text/correction/CorrectionMessages.properties
index 49752c1..a9b79e8 100644
--- a/plugins/org.eclipse.objectteams.otdt.jdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/text/correction/CorrectionMessages.properties
+++ b/plugins/org.eclipse.objectteams.otdt.jdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/text/correction/CorrectionMessages.properties
@@ -42,3 +42,6 @@
# javadoc
OTQuickfix_add_missing_role_tag=Add missing @role tag for role file ''{0}''.
+QuickAssistProcessor_addMethodBindingSignatures_label=Add signatures to method binding
+QuickAssistProcessor_addSignature_editName=Add Signatures
+QuickAssistProcessor_removeMethodBindingSignatures_label=Remove signatures from method binding
diff --git a/plugins/org.eclipse.objectteams.otdt.jdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/text/correction/QuickAssistProcessor.java b/plugins/org.eclipse.objectteams.otdt.jdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/text/correction/QuickAssistProcessor.java
index 92cef5f..3647498 100644
--- a/plugins/org.eclipse.objectteams.otdt.jdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/text/correction/QuickAssistProcessor.java
+++ b/plugins/org.eclipse.objectteams.otdt.jdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/text/correction/QuickAssistProcessor.java
@@ -140,7 +140,7 @@
}
}
- String label= "Remove signatures from method binding";
+ String label= CorrectionMessages.QuickAssistProcessor_removeMethodBindingSignatures_label;
Image image= JavaPluginImages.get(JavaPluginImages.IMG_CORRECTION_REMOVE);
ASTRewriteCorrectionProposal proposal= new ASTRewriteCorrectionProposal(label, cu, rewrite, 1, image);
resultingCollections.add(proposal);
@@ -210,13 +210,13 @@
final AST ast= mapping.getAST();
final ASTRewrite rewrite= ASTRewrite.create(ast);
- String label= "Add signatures to method binding";
+ String label= CorrectionMessages.QuickAssistProcessor_addMethodBindingSignatures_label;
Image image= JavaPluginImages.get(JavaPluginImages.IMG_CORRECTION_ADD);
ASTRewriteCorrectionProposal proposal= new ASTRewriteCorrectionProposal(label, cu, rewrite, 1, image) {
@Override
protected ASTRewrite getRewrite() throws CoreException
{
- TextEditGroup editGroup = new TextEditGroup("Add Signatures");
+ TextEditGroup editGroup = new TextEditGroup(CorrectionMessages.QuickAssistProcessor_addSignature_editName);
ImportRewrite imports = createImportRewrite((CompilationUnit) ASTNodes.getParent(mapping, ASTNode.COMPILATION_UNIT));
// role method:
IMethodBinding roleMethod = mapping.resolveBinding().getRoleMethod();
diff --git a/plugins/org.eclipse.objectteams.otdt.jdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/viewsupport/ViewAdaptor.java b/plugins/org.eclipse.objectteams.otdt.jdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/viewsupport/ViewAdaptor.java
index b856c75..b2c75f4 100644
--- a/plugins/org.eclipse.objectteams.otdt.jdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/viewsupport/ViewAdaptor.java
+++ b/plugins/org.eclipse.objectteams.otdt.jdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/viewsupport/ViewAdaptor.java
@@ -17,7 +17,6 @@
*******************************************************************************/
package org.eclipse.objectteams.otdt.internal.ui.viewsupport;
-import java.text.MessageFormat;
import java.util.StringTokenizer;
import org.eclipse.jdt.core.Flags;
@@ -52,6 +51,7 @@
import org.eclipse.objectteams.otdt.internal.core.OTType;
import org.eclipse.objectteams.otdt.internal.ui.Messages;
import org.eclipse.objectteams.otdt.ui.ImageManager;
+import org.eclipse.osgi.util.NLS;
@@ -391,7 +391,7 @@
});
// append explanation:
offset = buffer.length();
- String qualifier = MessageFormat.format(Messages.ViewAdaptor_guard_predicate_postfix,
+ String qualifier = NLS.bind(Messages.ViewAdaptor_guard_predicate_postfix,
new Object[]{guardedElement});
buffer.append(qualifier);
buffer.setStyle(offset, qualifier.length(), StyledString.QUALIFIER_STYLER);