Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/NLSUtility.java2
-rw-r--r--org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/HTMLMessages.java2
-rw-r--r--org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/ContentAssistMessages.java2
-rw-r--r--org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/URLHyperlink.java2
-rw-r--r--org.eclipse.jface.text/src/org/eclipse/jface/text/templates/JFaceTextTemplateMessages.java2
-rw-r--r--org.eclipse.jface.text/src/org/eclipse/jface/text/templates/persistence/TemplatePersistenceMessages.java2
-rw-r--r--org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchHistoryDropDownAction.java2
-rw-r--r--org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchView.java2
-rw-r--r--org.eclipse.search/search/org/eclipse/search/internal/ui/Messages.java2
-rw-r--r--org.eclipse.text/src/org/eclipse/jface/text/templates/TextTemplateMessages.java2
-rw-r--r--org.eclipse.text/src/org/eclipse/text/templates/TextTemplateMessages.java2
-rwxr-xr-xorg.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/LinkedModeConfigurationBlock.java8
-rw-r--r--org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/NLSUtility.java2
-rw-r--r--org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AbstractDecoratedTextEditor.java2
-rw-r--r--org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/DefaultMarkerAnnotationAccess.java4
-rw-r--r--org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/NLSUtility.java2
-rw-r--r--org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/rulers/ExtensionPointHelper.java8
-rw-r--r--org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AbstractTextEditor.java6
-rw-r--r--org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/rulers/RulerColumnRegistry.java11
19 files changed, 35 insertions, 30 deletions
diff --git a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/NLSUtility.java b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/NLSUtility.java
index 4b2b991a289..f4825880b14 100644
--- a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/NLSUtility.java
+++ b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/NLSUtility.java
@@ -31,7 +31,7 @@ public class NLSUtility {
* @return the formatted string
*/
public static String format(String message, Object argument) {
- return MessageFormat.format(message, new Object[] { argument });
+ return MessageFormat.format(message, argument);
}
/**
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/HTMLMessages.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/HTMLMessages.java
index ed0c47ecd82..1c31b9bbe33 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/HTMLMessages.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/HTMLMessages.java
@@ -80,6 +80,6 @@ class HTMLMessages {
}
if (arg == null)
arg= ""; //$NON-NLS-1$
- return MessageFormat.format(format, new Object[] { arg });
+ return MessageFormat.format(format, arg);
}
}
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/ContentAssistMessages.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/ContentAssistMessages.java
index f9762d4a0ec..8c043fba472 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/ContentAssistMessages.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/ContentAssistMessages.java
@@ -81,6 +81,6 @@ class ContentAssistMessages {
}
if (arg == null)
arg= ""; //$NON-NLS-1$
- return MessageFormat.format(format, new Object[] { arg });
+ return MessageFormat.format(format, arg);
}
}
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/URLHyperlink.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/URLHyperlink.java
index aaba5b745fd..6a2cde42413 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/URLHyperlink.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/URLHyperlink.java
@@ -66,7 +66,7 @@ public class URLHyperlink implements IHyperlink {
@Override
public String getHyperlinkText() {
- return MessageFormat.format(HyperlinkMessages.getString("URLHyperlink.hyperlinkText"), new Object[] { fURLString }); //$NON-NLS-1$
+ return MessageFormat.format(HyperlinkMessages.getString("URLHyperlink.hyperlinkText"), fURLString); //$NON-NLS-1$
}
/**
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/JFaceTextTemplateMessages.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/JFaceTextTemplateMessages.java
index e77d7385f81..d2a6f0ff9f2 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/JFaceTextTemplateMessages.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/JFaceTextTemplateMessages.java
@@ -38,7 +38,7 @@ class JFaceTextTemplateMessages {
}
public static String getFormattedString(String key, Object arg) {
- return MessageFormat.format(getString(key), new Object[] { arg });
+ return MessageFormat.format(getString(key), arg);
}
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/persistence/TemplatePersistenceMessages.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/persistence/TemplatePersistenceMessages.java
index 347bd769fe5..ccf5221a7bd 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/persistence/TemplatePersistenceMessages.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/persistence/TemplatePersistenceMessages.java
@@ -38,7 +38,7 @@ class TemplatePersistenceMessages {
}
public static String getFormattedString(String key, Object arg) {
- return MessageFormat.format(getString(key), new Object[] { arg });
+ return MessageFormat.format(getString(key), arg);
}
public static String getFormattedString(String key, Object[] args) {
diff --git a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchHistoryDropDownAction.java b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchHistoryDropDownAction.java
index 51904bcb03a..1e0874d34e9 100644
--- a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchHistoryDropDownAction.java
+++ b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchHistoryDropDownAction.java
@@ -41,7 +41,7 @@ class SearchHistoryDropDownAction extends Action implements IMenuCreator {
String label= escapeAmp(search.getLabel());
if (InternalSearchUI.getInstance().isQueryRunning(search.getQuery()))
- label= MessageFormat.format(SearchMessages.SearchDropDownAction_running_message, new Object[] { label });
+ label= MessageFormat.format(SearchMessages.SearchDropDownAction_running_message, label);
// fix for bug 38049
if (label.indexOf('@') >= 0)
label+= '@';
diff --git a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchView.java b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchView.java
index e36c96738b4..43610e77780 100644
--- a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchView.java
+++ b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchView.java
@@ -386,7 +386,7 @@ public class SearchView extends PageBookView implements ISearchResultViewPart, I
newPage= fSearchViewPageService.findPageForSearchResult(search, true);
if (newPage == null) {
String format= SearchMessages.SearchView_error_noResultPage;
- String message= MessageFormat.format(format, new Object[] { search.getClass().getName() });
+ String message= MessageFormat.format(format, search.getClass().getName());
SearchPlugin.log(new Status(IStatus.ERROR, SearchPlugin.getID(), 0, message, null));
return;
}
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/Messages.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/Messages.java
index d0b397f2128..41c34578a52 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/ui/Messages.java
+++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/Messages.java
@@ -23,7 +23,7 @@ import com.ibm.icu.text.MessageFormat;
public class Messages {
public static String format(String message, Object object) {
- return MessageFormat.format(message, new Object[] { object});
+ return MessageFormat.format(message, object);
}
public static String format(String message, Object[] objects) {
diff --git a/org.eclipse.text/src/org/eclipse/jface/text/templates/TextTemplateMessages.java b/org.eclipse.text/src/org/eclipse/jface/text/templates/TextTemplateMessages.java
index 86aa2c7257f..ca92177b2b1 100644
--- a/org.eclipse.text/src/org/eclipse/jface/text/templates/TextTemplateMessages.java
+++ b/org.eclipse.text/src/org/eclipse/jface/text/templates/TextTemplateMessages.java
@@ -38,7 +38,7 @@ class TextTemplateMessages {
}
public static String getFormattedString(String key, Object arg) {
- return MessageFormat.format(getString(key), new Object[] { arg });
+ return MessageFormat.format(getString(key), arg);
}
diff --git a/org.eclipse.text/src/org/eclipse/text/templates/TextTemplateMessages.java b/org.eclipse.text/src/org/eclipse/text/templates/TextTemplateMessages.java
index 5c60ca6936f..053a780cf80 100644
--- a/org.eclipse.text/src/org/eclipse/text/templates/TextTemplateMessages.java
+++ b/org.eclipse.text/src/org/eclipse/text/templates/TextTemplateMessages.java
@@ -38,7 +38,7 @@ class TextTemplateMessages {
}
public static String getFormattedString(String key, Object arg) {
- return MessageFormat.format(getString(key), new Object[] { arg });
+ return MessageFormat.format(getString(key), arg);
}
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/LinkedModeConfigurationBlock.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/LinkedModeConfigurationBlock.java
index 4b85bb89426..67b83d3c85f 100755
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/LinkedModeConfigurationBlock.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/LinkedModeConfigurationBlock.java
@@ -205,13 +205,13 @@ class LinkedModeConfigurationBlock implements IPreferenceConfigurationBlock {
private List<String[]> getStyles(Object type) {
if (type.equals(MASTER))
- return Arrays.asList(new String[][] {BOX, DASHED_BOX, HIGHLIGHT, UNDERLINE, SQUIGGLES});
+ return Arrays.asList(BOX, DASHED_BOX, HIGHLIGHT, UNDERLINE, SQUIGGLES);
if (type.equals(SLAVE))
- return Arrays.asList(new String[][] {BOX, DASHED_BOX, HIGHLIGHT, UNDERLINE, SQUIGGLES});
+ return Arrays.asList(BOX, DASHED_BOX, HIGHLIGHT, UNDERLINE, SQUIGGLES);
if (type.equals(TARGET))
- return Arrays.asList(new String[][] {BOX, DASHED_BOX, HIGHLIGHT, UNDERLINE, SQUIGGLES});
+ return Arrays.asList(BOX, DASHED_BOX, HIGHLIGHT, UNDERLINE, SQUIGGLES);
if (type.equals(EXIT))
- return Arrays.asList(new String[][] {IBEAM});
+ return Arrays.asList(new String[][] { IBEAM });
return new ArrayList<>();
}
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/NLSUtility.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/NLSUtility.java
index 224b8d2c76b..b4a3c9e799e 100644
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/NLSUtility.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/NLSUtility.java
@@ -30,7 +30,7 @@ public class NLSUtility {
* @return the formatted string
*/
public static String format(String message, Object argument) {
- return MessageFormat.format(message, new Object[] { argument });
+ return MessageFormat.format(message, argument);
}
/**
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AbstractDecoratedTextEditor.java b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AbstractDecoratedTextEditor.java
index 2134f7142ad..2e8b1e69476 100644
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AbstractDecoratedTextEditor.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AbstractDecoratedTextEditor.java
@@ -1938,7 +1938,7 @@ public abstract class AbstractDecoratedTextEditor extends StatusTextEditor {
if (!descriptor.isIncludedInMenu() || !support.isColumnSupported(descriptor))
continue;
final boolean isVisible= support.isColumnVisible(descriptor);
- IAction action= new Action(MessageFormat.format(TextEditorMessages.AbstractDecoratedTextEditor_show_ruler_label, new Object[] {descriptor.getName()}), IAction.AS_CHECK_BOX) {
+ IAction action= new Action(MessageFormat.format(TextEditorMessages.AbstractDecoratedTextEditor_show_ruler_label, descriptor.getName()), IAction.AS_CHECK_BOX) {
@Override
public void run() {
if (descriptor.isGlobal())
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/DefaultMarkerAnnotationAccess.java b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/DefaultMarkerAnnotationAccess.java
index d7e22f8d267..51b557bdbcb 100644
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/DefaultMarkerAnnotationAccess.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/DefaultMarkerAnnotationAccess.java
@@ -275,8 +275,8 @@ public class DefaultMarkerAnnotationAccess implements IAnnotationAccess, IAnnota
// backward compatibility, ignore exceptions, just don't paint
try {
- Method method= annotation.getClass().getMethod("paint", new Class[] { GC.class, Canvas.class, Rectangle.class }); //$NON-NLS-1$
- method.invoke(annotation, new Object[] {gc, canvas, bounds });
+ Method method= annotation.getClass().getMethod("paint", GC.class, Canvas.class, Rectangle.class); //$NON-NLS-1$
+ method.invoke(annotation, gc, canvas, bounds);
} catch (SecurityException x) {
} catch (IllegalArgumentException x) {
diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/NLSUtility.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/NLSUtility.java
index 8d00218ae1f..9bade5b7aa1 100644
--- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/NLSUtility.java
+++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/NLSUtility.java
@@ -30,7 +30,7 @@ public class NLSUtility {
* @return the formatted string
*/
public static String format(String message, Object argument) {
- return MessageFormat.format(message, new Object[] { argument });
+ return MessageFormat.format(message, argument);
}
/**
diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/rulers/ExtensionPointHelper.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/rulers/ExtensionPointHelper.java
index 026cb0a5728..85df73f1b33 100644
--- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/rulers/ExtensionPointHelper.java
+++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/rulers/ExtensionPointHelper.java
@@ -52,7 +52,7 @@ public final class ExtensionPointHelper {
public String getNonNullAttribute(String attribute) throws InvalidRegistryObjectException, CoreException {
String value= fElement.getAttribute(attribute);
if (value == null)
- fail(MessageFormat.format(RulerColumnMessages.ExtensionPointHelper_missing_attribute_msg, new Object[] {fName, attribute}));
+ fail(MessageFormat.format(RulerColumnMessages.ExtensionPointHelper_missing_attribute_msg, fName, attribute));
return value;
}
@@ -64,7 +64,8 @@ public final class ExtensionPointHelper {
try {
return Float.valueOf(value).floatValue();
} catch (NumberFormatException x) {
- fail(MessageFormat.format(RulerColumnMessages.ExtensionPointHelper_invalid_number_attribute_msg, new Object[] {attribute, fName}));
+ fail(MessageFormat.format(RulerColumnMessages.ExtensionPointHelper_invalid_number_attribute_msg, attribute,
+ fName));
return dflt;
}
}
@@ -77,7 +78,8 @@ public final class ExtensionPointHelper {
try {
return Boolean.parseBoolean(value);
} catch (NumberFormatException x) {
- fail(MessageFormat.format(RulerColumnMessages.ExtensionPointHelper_invalid_number_attribute_msg, new Object[] {fName, attribute}));
+ fail(MessageFormat.format(RulerColumnMessages.ExtensionPointHelper_invalid_number_attribute_msg, fName,
+ attribute));
return dflt;
}
}
diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AbstractTextEditor.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AbstractTextEditor.java
index cf5f1f3b37b..6ace776d378 100644
--- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AbstractTextEditor.java
+++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AbstractTextEditor.java
@@ -3520,7 +3520,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit
// Install drag source
final ISelectionProvider selectionProvider= viewer.getSelectionProvider();
final DragSource source= new DragSource(st, DND.DROP_COPY | DND.DROP_MOVE);
- source.setTransfer(new Transfer[] {TextTransfer.getInstance()});
+ source.setTransfer(TextTransfer.getInstance());
source.addDragListener(new DragSourceAdapter() {
String fSelectedText;
Point fSelection;
@@ -4753,8 +4753,8 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit
msg= NLSUtility.format(EditorMessages.Editor_error_activated_outofsync_message, inputName);
if (MessageDialog.open(MessageDialog.QUESTION, shell, title, msg, SWT.NONE,
- new String[] { EditorMessages.Editor_error_replace_button_label,
- EditorMessages.Editor_error_dontreplace_button_label }) == 0) {
+ EditorMessages.Editor_error_replace_button_label,
+ EditorMessages.Editor_error_dontreplace_button_label) == 0) {
try {
if (provider instanceof IDocumentProviderExtension) {
diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/rulers/RulerColumnRegistry.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/rulers/RulerColumnRegistry.java
index 18f2e441104..1f6871ebf6f 100644
--- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/rulers/RulerColumnRegistry.java
+++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/rulers/RulerColumnRegistry.java
@@ -261,22 +261,25 @@ public final class RulerColumnRegistry {
}
private void noteInvalidExtension(IConfigurationElement element, InvalidRegistryObjectException x) {
- String message= MessageFormat.format(RulerColumnMessages.RulerColumnRegistry_invalid_msg, new Object[] {ExtensionPointHelper.findId(element)});
+ String message= MessageFormat.format(RulerColumnMessages.RulerColumnRegistry_invalid_msg, ExtensionPointHelper.findId(element));
warnUser(message, x);
}
private void noteUnknownTarget(RulerColumnDescriptor desc, String referencedId) {
- String message= MessageFormat.format(RulerColumnMessages.RulerColumnRegistry_unresolved_placement_msg, new Object[] {QUALIFIED_EXTENSION_POINT, referencedId, desc.getName(), desc.getContributor()});
+ String message= MessageFormat.format(RulerColumnMessages.RulerColumnRegistry_unresolved_placement_msg,
+ QUALIFIED_EXTENSION_POINT, referencedId, desc.getName(), desc.getContributor());
warnUser(message, null);
}
private void noteCycle(RulerColumnDescriptor desc, RulerColumnDescriptor target) {
- String message= MessageFormat.format(RulerColumnMessages.RulerColumnRegistry_cyclic_placement_msg, new Object[] {QUALIFIED_EXTENSION_POINT, target.getName(), desc.getName(), desc.getContributor()});
+ String message= MessageFormat.format(RulerColumnMessages.RulerColumnRegistry_cyclic_placement_msg, QUALIFIED_EXTENSION_POINT,
+ target.getName(), desc.getName(), desc.getContributor());
warnUser(message, null);
}
private void noteDuplicateId(RulerColumnDescriptor desc) {
- String message= MessageFormat.format(RulerColumnMessages.RulerColumnRegistry_duplicate_id_msg, new Object[] {QUALIFIED_EXTENSION_POINT, desc.getId(), desc.getContributor()});
+ String message= MessageFormat.format(RulerColumnMessages.RulerColumnRegistry_duplicate_id_msg, QUALIFIED_EXTENSION_POINT,
+ desc.getId(), desc.getContributor());
warnUser(message, null);
}

Back to the top