diff options
Diffstat (limited to 'build')
22 files changed, 42 insertions, 93 deletions
diff --git a/build/org.eclipse.cdt.make.core/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.make.core/META-INF/MANIFEST.MF index bba11e9c22d..a6ecd233217 100644 --- a/build/org.eclipse.cdt.make.core/META-INF/MANIFEST.MF +++ b/build/org.eclipse.cdt.make.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.cdt.make.core; singleton:=true -Bundle-Version: 7.4.100.qualifier +Bundle-Version: 7.4.200.qualifier Bundle-Activator: org.eclipse.cdt.make.core.MakeCorePlugin Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -28,5 +28,4 @@ Require-Bundle: org.eclipse.cdt.core;bundle-version="[5.0.0,7.0.0)", org.eclipse.tools.templates.freemarker;bundle-version="1.0.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: com.ibm.icu.text Automatic-Module-Name: org.eclipse.cdt.make.core diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/MakeMessages.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/MakeMessages.java index d6726852aee..3b18e3ae905 100644 --- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/MakeMessages.java +++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/MakeMessages.java @@ -13,11 +13,10 @@ *******************************************************************************/ package org.eclipse.cdt.make.internal.core; +import java.text.MessageFormat; import java.util.MissingResourceException; import java.util.ResourceBundle; -import com.ibm.icu.text.MessageFormat; - public class MakeMessages { private static final String RESOURCE_BUNDLE = MakeMessages.class.getName(); @@ -44,18 +43,9 @@ public class MakeMessages { } /** - * Gets a string from the resource bundle and formats it with the argument - * - * @param key the string used to get the bundle value, must not be null - */ - public static String getFormattedString(String key, Object arg) { - return MessageFormat.format(getString(key), new Object[] { arg }); - } - - /** * Gets a string from the resource bundle and formats it with arguments */ - public static String getFormattedString(String key, Object[] args) { + public static String getFormattedString(String key, Object... args) { return MessageFormat.format(getString(key), args); } } diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/util/LogWriter.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/util/LogWriter.java index 7501751c391..f41bfe1e0bc 100644 --- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/util/LogWriter.java +++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/util/LogWriter.java @@ -20,14 +20,13 @@ import java.io.IOException; import java.io.OutputStreamWriter; import java.io.PrintWriter; import java.io.Writer; +import java.text.DateFormat; +import java.text.SimpleDateFormat; import java.util.Date; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IStatus; -import com.ibm.icu.text.DateFormat; -import com.ibm.icu.text.SimpleDateFormat; - /** * Log writer utility * diff --git a/build/org.eclipse.cdt.make.ui/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.make.ui/META-INF/MANIFEST.MF index 49a8648f96a..4070e4299b7 100644 --- a/build/org.eclipse.cdt.make.ui/META-INF/MANIFEST.MF +++ b/build/org.eclipse.cdt.make.ui/META-INF/MANIFEST.MF @@ -41,5 +41,4 @@ Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)", org.eclipse.cdt.launch;bundle-version="9.2.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: com.ibm.icu.text Automatic-Module-Name: org.eclipse.cdt.make.ui diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeEnvironmentBlock.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeEnvironmentBlock.java index de4e28f8d14..af51fe953d9 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeEnvironmentBlock.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeEnvironmentBlock.java @@ -13,6 +13,7 @@ *******************************************************************************/ package org.eclipse.cdt.make.internal.ui; +import java.text.MessageFormat; import java.util.Comparator; import java.util.HashMap; import java.util.Hashtable; @@ -68,8 +69,6 @@ import org.eclipse.swt.widgets.TableColumn; import org.eclipse.swt.widgets.TableItem; import org.eclipse.ui.dialogs.ListSelectionDialog; -import com.ibm.icu.text.MessageFormat; - /** * @deprecated as of CDT 4.0. This tab was used to set preferences/properties * for 3.X style projects. diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/actions/FoldingMessages.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/actions/FoldingMessages.java index cf18a1f6ce0..09242adfd19 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/actions/FoldingMessages.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/actions/FoldingMessages.java @@ -17,11 +17,10 @@ package org.eclipse.cdt.make.internal.ui.actions; +import java.text.MessageFormat; import java.util.MissingResourceException; import java.util.ResourceBundle; -import com.ibm.icu.text.MessageFormat; - /** * Class that gives access to the folding messages resource bundle. */ @@ -65,23 +64,10 @@ public class FoldingMessages { * under the given key, the key is returned. * * @param key the resource key - * @param arg the message argument - * @return the string - */ - public static String getFormattedString(String key, Object arg) { - return getFormattedString(key, new Object[] { arg }); - } - - /** - * Returns the formatted resource string associated with the given key in the resource bundle. - * <code>MessageFormat</code> is used to format the message. If there isn't any value - * under the given key, the key is returned. - * - * @param key the resource key * @param args the message arguments * @return the string */ - public static String getFormattedString(String key, Object[] args) { + public static String getFormattedString(String key, Object... args) { return MessageFormat.format(getString(key), args); } } diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/dnd/MakeTargetDndUtil.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/dnd/MakeTargetDndUtil.java index 135321b5871..42546a89db3 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/dnd/MakeTargetDndUtil.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/dnd/MakeTargetDndUtil.java @@ -15,6 +15,7 @@ package org.eclipse.cdt.make.internal.ui.dnd; import java.lang.reflect.InvocationTargetException; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.List; @@ -43,8 +44,6 @@ import org.eclipse.swt.SWTException; import org.eclipse.swt.dnd.DND; import org.eclipse.swt.widgets.Shell; -import com.ibm.icu.text.MessageFormat; - /** * A collection of various functions for Make Target View drag and drop support. */ @@ -239,7 +238,7 @@ public class MakeTargetDndUtil { // Try "Copy of name" newName = MessageFormat.format(MakeUIPlugin.getResourceString("MakeTargetDnD.copyOf.uniqueName"), //$NON-NLS-1$ - new Object[] { targetName }); + targetName); if (makeTargetManager.findTarget(container, newName) == null) { return newName; } @@ -247,7 +246,7 @@ public class MakeTargetDndUtil { // Try "Copy (2) of name" for (int counter = 1;; counter++) { newName = MessageFormat.format(MakeUIPlugin.getResourceString("MakeTargetDnD.countedCopyOf.uniqueName"), //$NON-NLS-1$ - new Object[] { counter, targetName }); + counter, targetName); if (makeTargetManager.findTarget(container, newName) == null) { return newName; } diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/dnd/TextTransferDropTargetListener.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/dnd/TextTransferDropTargetListener.java index 2da17066acf..bbe9124fc74 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/dnd/TextTransferDropTargetListener.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/dnd/TextTransferDropTargetListener.java @@ -14,6 +14,7 @@ package org.eclipse.cdt.make.internal.ui.dnd; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.List; @@ -28,8 +29,6 @@ import org.eclipse.swt.dnd.TextTransfer; import org.eclipse.swt.dnd.Transfer; import org.eclipse.swt.widgets.Shell; -import com.ibm.icu.text.MessageFormat; - /** * {@code TextTransferDropTargetListener} handles dropping of selected text to * Make Target View. Each line of miltiline text passed is treated as separate @@ -165,7 +164,7 @@ public class TextTransferDropTargetListener extends AbstractContainerAreaDropAda String title = MakeUIPlugin.getResourceString("MakeTargetDnD.title.createFromTextConfirm"); //$NON-NLS-1$ String question = MessageFormat.format( MakeUIPlugin.getResourceString("MakeTargetDnD.message.createFromTextConfirm"), //$NON-NLS-1$ - new Object[] { Integer.valueOf(makeTargets.length) }); + Integer.valueOf(makeTargets.length)); String topTargets = ""; //$NON-NLS-1$ for (int i = 0; i < makeTargets.length; i++) { diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/part/WizardCheckboxTablePart.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/part/WizardCheckboxTablePart.java index db8f2a27ddd..9b7f040e4ed 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/part/WizardCheckboxTablePart.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/part/WizardCheckboxTablePart.java @@ -13,6 +13,8 @@ *******************************************************************************/ package org.eclipse.cdt.make.internal.ui.part; +import java.text.MessageFormat; + import org.eclipse.cdt.make.internal.ui.MakeUIPlugin; import org.eclipse.jface.viewers.CheckboxTableViewer; import org.eclipse.jface.viewers.StructuredViewer; @@ -22,8 +24,6 @@ import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; -import com.ibm.icu.text.MessageFormat; - /** * @version 1.0 */ @@ -126,8 +126,7 @@ public class WizardCheckboxTablePart extends CheckboxTablePart { protected void updateCounterLabel() { String number = EMPTY_STRING + getSelectionCount(); String totalNumber = EMPTY_STRING + getTotalCount(); - String message = MessageFormat.format(MakeUIPlugin.getResourceString(KEY_COUNTER), - new Object[] { number, totalNumber }); + String message = MessageFormat.format(MakeUIPlugin.getResourceString(KEY_COUNTER), number, totalNumber); counterLabel.setText(message); } diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/preferences/AbstractMakefileEditorPreferencePage.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/preferences/AbstractMakefileEditorPreferencePage.java index 9dfe6de71aa..efd1cbbeedd 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/preferences/AbstractMakefileEditorPreferencePage.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/preferences/AbstractMakefileEditorPreferencePage.java @@ -17,6 +17,7 @@ package org.eclipse.cdt.make.internal.ui.preferences; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; +import java.text.MessageFormat; import java.util.HashMap; import java.util.Iterator; import java.util.Map; @@ -42,8 +43,6 @@ import org.eclipse.swt.widgets.Text; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPreferencePage; -import com.ibm.icu.text.MessageFormat; - /** * AbstraceMakeEditorPreferencePage */ diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/DeleteTargetAction.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/DeleteTargetAction.java index ce35cf9faad..bced0df6596 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/DeleteTargetAction.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/DeleteTargetAction.java @@ -13,6 +13,7 @@ *******************************************************************************/ package org.eclipse.cdt.make.ui.views; +import java.text.MessageFormat; import java.util.List; import org.eclipse.cdt.make.core.IMakeTarget; @@ -30,8 +31,6 @@ import org.eclipse.ui.ISharedImages; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.actions.SelectionListenerAction; -import com.ibm.icu.text.MessageFormat; - /** * @noextend This class is not intended to be subclassed by clients. * @noinstantiate This class is not intended to be instantiated by clients. @@ -64,12 +63,12 @@ public class DeleteTargetAction extends SelectionListenerAction { title = MakeUIPlugin.getResourceString("DeleteTargetAction.title.confirmDeletion"); //$NON-NLS-1$ IMakeTarget target = (IMakeTarget) targets.get(0); msg = MessageFormat.format(MakeUIPlugin.getResourceString("DeleteTargetAction.message.confirmDeleteion"), //$NON-NLS-1$ - new Object[] { target.getName() }); + target.getName()); } else { title = MakeUIPlugin.getResourceString("DeleteTargetAction.title.confirmMultipleDeletion"); //$NON-NLS-1$ msg = MessageFormat.format( MakeUIPlugin.getResourceString("DeleteTargetAction.message.confirmMultipleDeletion"), //$NON-NLS-1$ - new Object[] { Integer.valueOf(targets.size()) }); + Integer.valueOf(targets.size())); } return MessageDialog.openQuestion(shell, title, msg); } diff --git a/build/org.eclipse.cdt.managedbuilder.core/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.managedbuilder.core/META-INF/MANIFEST.MF index ee0249ddded..42d7b9f70da 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/META-INF/MANIFEST.MF +++ b/build/org.eclipse.cdt.managedbuilder.core/META-INF/MANIFEST.MF @@ -41,6 +41,5 @@ Require-Bundle: org.eclipse.cdt.core;bundle-version="[5.0.0,7.0.0)", org.eclipse.core.filesystem;bundle-version="1.2.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: com.google.gson;version="2.8.0", - com.ibm.icu.text +Import-Package: com.google.gson;version="2.8.0" Automatic-Module-Name: org.eclipse.cdt.managedbuilder.core diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/build/internal/core/scannerconfig/CfgScannerConfigUtil.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/build/internal/core/scannerconfig/CfgScannerConfigUtil.java index b0355bec955..eb16f894306 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/build/internal/core/scannerconfig/CfgScannerConfigUtil.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/build/internal/core/scannerconfig/CfgScannerConfigUtil.java @@ -13,6 +13,7 @@ *******************************************************************************/ package org.eclipse.cdt.build.internal.core.scannerconfig; +import java.text.MessageFormat; import java.util.Set; import java.util.TreeSet; @@ -30,8 +31,6 @@ import org.eclipse.cdt.managedbuilder.internal.core.Tool; import org.eclipse.cdt.managedbuilder.internal.core.ToolChain; import org.eclipse.core.runtime.Assert; -import com.ibm.icu.text.MessageFormat; - public class CfgScannerConfigUtil { public static CfgInfoContext adjustPerRcTypeContext(CfgInfoContext context) { if (((Configuration) context.getConfiguration()).isPreference()) @@ -197,7 +196,7 @@ public class CfgScannerConfigUtil { if (!(tool instanceof Tool)) { String msg = MessageFormat.format(ManagedMakeMessages.getString("CfgScannerConfigUtil_ErrorNotSupported"), //$NON-NLS-1$ - new Object[] { Tool.class.getName() }); + Tool.class.getName()); throw new UnsupportedOperationException(msg); } @@ -229,7 +228,7 @@ public class CfgScannerConfigUtil { if (!(inputType instanceof InputType)) { String msg = MessageFormat.format(ManagedMakeMessages.getString("CfgScannerConfigUtil_ErrorNotSupported"), //$NON-NLS-1$ - new Object[] { InputType.class.getName() }); + InputType.class.getName()); throw new UnsupportedOperationException(msg); } diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildModelMessages.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildModelMessages.java index 1c15980a3f0..8eac744b18e 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildModelMessages.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildModelMessages.java @@ -14,11 +14,10 @@ *******************************************************************************/ package org.eclipse.cdt.managedbuilder.internal.buildmodel; +import java.text.MessageFormat; import java.util.MissingResourceException; import java.util.ResourceBundle; -import com.ibm.icu.text.MessageFormat; - public class BuildModelMessages { private static final String BUNDLE_NAME = "org.eclipse.cdt.managedbuilder.internal.buildmodel.BuildModelMessages"; //$NON-NLS-1$ @@ -42,7 +41,7 @@ public class BuildModelMessages { } public static String getFormattedString(String key, String arg) { - return MessageFormat.format(getResourceString(key), (Object[]) new String[] { arg }); + return MessageFormat.format(getResourceString(key), arg); } public static String getFormattedString(String key, String[] args) { diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ManagedMakeMessages.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ManagedMakeMessages.java index 0380c9cf5fb..7ddd1bee861 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ManagedMakeMessages.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ManagedMakeMessages.java @@ -13,11 +13,10 @@ *******************************************************************************/ package org.eclipse.cdt.managedbuilder.internal.core; +import java.text.MessageFormat; import java.util.MissingResourceException; import java.util.ResourceBundle; -import com.ibm.icu.text.MessageFormat; - /** * @since 2.0 */ @@ -50,7 +49,7 @@ public class ManagedMakeMessages { } public static String getFormattedString(String key, String arg) { - return MessageFormat.format(getResourceString(key), new Object[] { arg }); + return MessageFormat.format(getResourceString(key), arg); } public static String getFormattedString(String key, String[] args) { diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/DataProviderMessages.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/DataProviderMessages.java index 372edb43ed4..6ea27aa6af0 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/DataProviderMessages.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/DataProviderMessages.java @@ -13,11 +13,10 @@ *******************************************************************************/ package org.eclipse.cdt.managedbuilder.internal.dataprovider; +import java.text.MessageFormat; import java.util.MissingResourceException; import java.util.ResourceBundle; -import com.ibm.icu.text.MessageFormat; - public class DataProviderMessages { private static final String BUNDLE_NAME = "org.eclipse.cdt.managedbuilder.internal.dataprovider.DataProviderMessages"; //$NON-NLS-1$ @@ -41,7 +40,7 @@ public class DataProviderMessages { } public static String getFormattedString(String key, String arg) { - return MessageFormat.format(getResourceString(key), new Object[] { arg }); + return MessageFormat.format(getResourceString(key), arg); } public static String getFormattedString(String key, String[] args) { diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/language/settings/providers/CompilationDatabaseParser.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/language/settings/providers/CompilationDatabaseParser.java index e8c1e8a4a1c..882423e5dcc 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/language/settings/providers/CompilationDatabaseParser.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/language/settings/providers/CompilationDatabaseParser.java @@ -17,6 +17,7 @@ import java.net.URI; import java.nio.file.Files; import java.nio.file.Paths; import java.nio.file.attribute.FileTime; +import java.text.MessageFormat; import java.util.List; import java.util.Set; @@ -57,7 +58,6 @@ import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.SubMonitor; import com.google.gson.Gson; -import com.ibm.icu.text.MessageFormat; /** * This language settings provider takes a compile_commands.json file as input (aka, Compilation Database or CDB) and parses the commands diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/projectconverter/ConverterMessages.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/projectconverter/ConverterMessages.java index 6f446c40b0a..4b0b2261676 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/projectconverter/ConverterMessages.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/projectconverter/ConverterMessages.java @@ -13,11 +13,10 @@ *******************************************************************************/ package org.eclipse.cdt.managedbuilder.projectconverter; +import java.text.MessageFormat; import java.util.MissingResourceException; import java.util.ResourceBundle; -import com.ibm.icu.text.MessageFormat; - /** * @noextend This class is not intended to be subclassed by clients. * @noinstantiate This class is not intended to be instantiated by clients. @@ -51,7 +50,7 @@ public class ConverterMessages { } public static String getFormattedString(String key, String arg) { - return MessageFormat.format(getResourceString(key), new Object[] { arg }); + return MessageFormat.format(getResourceString(key), arg); } public static String getFormattedString(String key, String[] args) { diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/newmake/internal/core/MakeMessages.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/newmake/internal/core/MakeMessages.java index ebf7b2ba9c1..eeaa96ee0e2 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/newmake/internal/core/MakeMessages.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/newmake/internal/core/MakeMessages.java @@ -13,11 +13,10 @@ *******************************************************************************/ package org.eclipse.cdt.newmake.internal.core; +import java.text.MessageFormat; import java.util.MissingResourceException; import java.util.ResourceBundle; -import com.ibm.icu.text.MessageFormat; - public class MakeMessages { private static final String RESOURCE_BUNDLE = MakeMessages.class.getName(); @@ -44,18 +43,9 @@ public class MakeMessages { } /** - * Gets a string from the resource bundle and formats it with the argument - * - * @param key the string used to get the bundle value, must not be null - */ - public static String getFormattedString(String key, Object arg) { - return MessageFormat.format(getString(key), new Object[] { arg }); - } - - /** * Gets a string from the resource bundle and formats it with arguments */ - public static String getFormattedString(String key, Object[] args) { + public static String getFormattedString(String key, Object... args) { return MessageFormat.format(getString(key), args); } } diff --git a/build/org.eclipse.cdt.managedbuilder.ui/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.managedbuilder.ui/META-INF/MANIFEST.MF index efbfbdbb9fe..2d06e19ae95 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/META-INF/MANIFEST.MF +++ b/build/org.eclipse.cdt.managedbuilder.ui/META-INF/MANIFEST.MF @@ -26,5 +26,4 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)", org.eclipse.core.expressions Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: com.ibm.icu.text Automatic-Module-Name: org.eclipse.cdt.managedbuilder.ui diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/commands/BuildConfigurationsJob.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/commands/BuildConfigurationsJob.java index 82683d692be..a974e242ec1 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/commands/BuildConfigurationsJob.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/commands/BuildConfigurationsJob.java @@ -13,6 +13,8 @@ *******************************************************************************/ package org.eclipse.cdt.managedbuilder.internal.ui.commands; +import java.text.MessageFormat; + import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; import org.eclipse.cdt.managedbuilder.core.IConfiguration; import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager; @@ -25,8 +27,6 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; -import com.ibm.icu.text.MessageFormat; - /** * A job to build CDT build configurations. */ @@ -39,11 +39,11 @@ public class BuildConfigurationsJob extends Job { String firstProjectName = cfgDescriptions[0].getProjectDescription().getName(); String firstConfigurationName = cfgDescriptions[0].getName(); if (isCleaning) { - return MessageFormat.format(Messages.BuildConfigurationsJob_Cleaning, - new Object[] { cfgDescriptions.length, firstProjectName, firstConfigurationName }); + return MessageFormat.format(Messages.BuildConfigurationsJob_Cleaning, cfgDescriptions.length, + firstProjectName, firstConfigurationName); } else { - return MessageFormat.format(Messages.BuildConfigurationsJob_Building, - new Object[] { cfgDescriptions.length, firstProjectName, firstConfigurationName }); + return MessageFormat.format(Messages.BuildConfigurationsJob_Building, cfgDescriptions.length, + firstProjectName, firstConfigurationName); } } diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/NewVarDialog.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/NewVarDialog.java index 52da2e22d56..31f5487c975 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/NewVarDialog.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/NewVarDialog.java @@ -13,6 +13,7 @@ *******************************************************************************/ package org.eclipse.cdt.managedbuilder.ui.properties; +import java.text.Collator; import java.util.Arrays; import java.util.Comparator; @@ -49,8 +50,6 @@ import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; -import com.ibm.icu.text.Collator; - /** * the dialog used to create or edit the build macro * |