From 87b627bf02eaab28cdb64f6ebe203ac64d18fe94 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Thu, 27 Feb 2020 21:08:16 +0200 Subject: [PATCH] Bug 560614 - Drop dependency on ICU4J Straightforward conversion. Still usages left that need deeper investigation how to be done proper. Some long time commented code removed as java formatter breaks trailing whitespaces on save. Change-Id: If74259bed5735b0d4cc98fc2cfa609c9c53c80c9 Signed-off-by: Alexander Kurtakov --- .../META-INF/MANIFEST.MF | 3 +-- .../cdt/make/internal/core/MakeMessages.java | 14 ++--------- .../core/scannerconfig/util/LogWriter.java | 5 ++-- .../META-INF/MANIFEST.MF | 1 - .../internal/ui/MakeEnvironmentBlock.java | 3 +-- .../internal/ui/actions/FoldingMessages.java | 18 ++------------- .../internal/ui/dnd/MakeTargetDndUtil.java | 7 +++--- .../dnd/TextTransferDropTargetListener.java | 5 ++-- .../ui/part/WizardCheckboxTablePart.java | 7 +++--- .../AbstractMakefileEditorPreferencePage.java | 3 +-- .../cdt/make/ui/views/DeleteTargetAction.java | 7 +++--- .../META-INF/MANIFEST.MF | 3 +-- .../scannerconfig/CfgScannerConfigUtil.java | 7 +++--- .../buildmodel/BuildModelMessages.java | 5 ++-- .../internal/core/ManagedMakeMessages.java | 5 ++-- .../dataprovider/DataProviderMessages.java | 5 ++-- .../providers/CompilationDatabaseParser.java | 2 +- .../projectconverter/ConverterMessages.java | 5 ++-- .../newmake/internal/core/MakeMessages.java | 14 ++--------- .../META-INF/MANIFEST.MF | 1 - .../ui/commands/BuildConfigurationsJob.java | 12 +++++----- .../ui/properties/NewVarDialog.java | 3 +-- .../org.eclipse.cdt.core/META-INF/MANIFEST.MF | 1 - .../core/model/CoreModelMessages.java | 14 ++--------- .../eclipse/cdt/internal/core/model/Util.java | 7 +++--- .../AbstractCProjectDescriptionStorage.java | 6 ++--- .../model/CProjectDescriptionManager.java | 22 +++--------------- .../export/ExternalExportProjectProvider.java | 7 +++--- .../internal/core/dom/parser/ASTProblem.java | 5 ++-- .../core/dom/parser/ProblemBinding.java | 6 ++--- .../core/indexer/StandaloneIndexerTask.java | 3 +-- .../internal/core/parser/ParserMessages.java | 5 ++-- .../parser/scanner/PreprocessorMacro.java | 3 +-- .../cdt/internal/core/pdom/PDOMManager.java | 9 ++++---- .../cdt/internal/core/pdom/db/BTree.java | 16 ++++++------- .../cdt/internal/core/pdom/db/Database.java | 5 ++-- .../internal/core/pdom/export/CLIUtil.java | 6 ++--- .../core/pdom/export/GeneratePDOM.java | 11 ++++----- .../pdom/export/GeneratePDOMApplication.java | 8 +++---- .../core/pdom/indexer/PDOMIndexerTask.java | 3 +-- .../src/org/eclipse/cdt/core/CCorePlugin.java | 5 ++-- .../cdt/core/resources/RefreshExclusion.java | 3 +-- .../internal/core/CConfigBasedDescriptor.java | 5 ++-- .../cdt/internal/core/CDTLogWriter.java | 5 ++-- .../templateengine/process/ProcessHelper.java | 3 +-- .../templateengine/process/ProcessRunner.java | 4 ++-- .../org/eclipse/cdt/utils/coff/Coff.java | 3 +-- .../org/eclipse/cdt/utils/coff/Coff64.java | 3 +-- .../org/eclipse/cdt/utils/xcoff/XCoff32.java | 3 +-- .../META-INF/MANIFEST.MF | 1 - .../includes/BindingClassifierTest.java | 3 +-- .../cdt/ui/tests/text/BreakIteratorTest.java | 2 +- .../corext/codemanipulation/IncludeInfo.java | 2 +- .../template/c/FileTemplateContextType.java | 5 ++-- .../cdt/internal/corext/util/Messages.java | 8 ++----- .../internal/ui/actions/FoldingMessages.java | 18 ++------------- .../dialogs/TextFieldNavigationHandler.java | 3 +-- .../cdt/internal/ui/editor/CEditor.java | 3 +-- .../ui/editor/ConstructedCEditorMessages.java | 12 ++-------- .../internal/ui/editor/SortLinesAction.java | 3 +-- .../internal/ui/filters/FilterDescriptor.java | 3 +-- .../CEditorColoringConfigurationBlock.java | 3 +-- .../HeaderSubstitutionMapEditDialog.java | 3 +-- .../gettersandsetters/AccessorDescriptor.java | 4 ++-- .../refactoring/includes/IncludeCreator.java | 3 +-- .../includes/IncludeOrganizer.java | 3 +-- .../refactoring/includes/SymbolExportMap.java | 7 +++--- .../ui/search/CSearchListContentProvider.java | 7 +++--- .../search/actions/SelectionParseAction.java | 16 ++++++------- .../cdt/internal/ui/text/CBreakIterator.java | 4 +--- .../cdt/internal/ui/text/CWordIterator.java | 4 +--- .../text/c/hover/AbstractAnnotationHover.java | 5 ++-- .../c/hover/CEditorTextHoverDescriptor.java | 3 +-- .../proposals/ChangeCorrectionProposal.java | 10 ++++---- .../text/doctools/DocCommentOwnerManager.java | 6 ++--- .../ui/text/spelling/SpellCheckIterator.java | 3 +-- .../typehierarchy/THInformationControl.java | 5 ++-- .../internal/ui/typehierarchy/THViewPart.java | 9 ++++---- .../cdt/internal/ui/util/EditorUtility.java | 5 ++-- .../cdt/internal/ui/util/Messages.java | 4 ++-- .../cdt/internal/ui/util/NameComposer.java | 3 +-- ...AbstractWorkingSetConfigsContribution.java | 3 +-- .../src/org/eclipse/cdt/ui/CUIPlugin.java | 3 +-- .../eclipse/cdt/ui/dialogs/IndexerBlock.java | 3 +-- .../dialogs/RegexErrorParserOptionPage.java | 6 ++--- .../eclipse/cdt/ui/newui/ErrorParsTab.java | 7 +++--- .../org/eclipse/cdt/ui/newui/UIMessages.java | 5 ++-- .../GenericTagDoubleClickStrategy.java | 3 +-- .../uitree/UIElementTreeBuilderHelper.java | 9 ++++---- .../uitree/uiwidgets/UISelectWidget.java | 3 +-- .../uitree/uiwidgets/UIStringListWidget.java | 3 +-- .../META-INF/MANIFEST.MF | 3 +-- .../eclipse/cdt/debug/core/CDebugUtils.java | 23 +++++++++---------- .../cdt/debug/core/DebugCoreMessages.java | 5 ++-- .../core/breakpoints/BreakpointProblems.java | 6 ++--- .../core/breakpoints/CAddressBreakpoint.java | 5 ++-- .../breakpoints/CAddressDynamicPrintf.java | 5 ++-- .../core/breakpoints/CAddressTracepoint.java | 5 ++-- .../core/breakpoints/CBreakpoint.java | 8 +++---- .../core/breakpoints/CFunctionBreakpoint.java | 5 ++-- .../breakpoints/CFunctionDynamicPrintf.java | 5 ++-- .../core/breakpoints/CFunctionTracepoint.java | 5 ++-- .../core/breakpoints/CLineBreakpoint.java | 7 +++--- .../core/breakpoints/CLineDynamicPrintf.java | 7 +++--- .../core/breakpoints/CLineTracepoint.java | 5 ++-- .../core/breakpoints/CWatchpoint.java | 5 ++-- .../core/sourcelookup/CSourceLocator.java | 7 +++--- .../sourcelookup/MapEntrySourceContainer.java | 5 ++-- .../core/sourcelookup/SourceUtils.java | 5 ++-- .../META-INF/MANIFEST.MF | 1 - .../internal/ui/CDebugModelPresentation.java | 3 +-- .../cdt/debug/internal/ui/CDebugUIUtils.java | 5 ++-- .../ui/actions/RegisterGroupDialog.java | 5 ++-- .../internal/ui/launch/LaunchMessages.java | 5 ++-- .../ui/propertypages/SignalPropertyPage.java | 6 ++--- .../ExecutablesContentProvider.java | 3 +-- .../executables/SourceFilesLabelProvider.java | 3 +-- .../breakpointactions/ExternalToolAction.java | 7 +++--- .../debug/ui/breakpointactions/LogAction.java | 5 ++-- .../ui/breakpointactions/ResumeAction.java | 5 ++-- .../ui/breakpointactions/SoundAction.java | 5 ++-- ...CEventBreakpointsLabelProviderFactory.java | 8 +++---- .../rulers/RulerColumnRegistry.java | 11 ++++----- .../sourcelookup/OldDefaultSourceLocator.java | 5 ++-- .../META-INF/MANIFEST.MF | 1 - .../META-INF/MANIFEST.MF | 1 - .../ui/launching/LaunchUIMessages.java | 5 ++-- .../ui/launching/ProcessPrompter.java | 3 +-- .../META-INF/MANIFEST.MF | 1 - .../memory/GdbMemoryBlockRetrieval.java | 3 +-- .../gdb/launching/InferiorRuntimeProcess.java | 5 ++-- .../cdt/dsf/gdb/launching/LaunchMessages.java | 5 ++-- .../GDBPatternMatchingExpressions.java | 3 +-- .../cdt/dsf/gdb/service/GDBProcesses_7_2.java | 3 +-- .../dsf/mi/service/MIBreakpointsManager.java | 6 ++--- .../mi/service/command/AbstractMIControl.java | 3 +-- .../META-INF/MANIFEST.MF | 1 - .../ui/CSourceNotFoundDescriptionFactory.java | 3 +-- .../ui/disassembly/DisassemblyPart.java | 5 ++-- .../numberformat/FormattedValueLabelText.java | 7 +++--- .../numberformat/FormattedValueVMUtil.java | 7 +++--- .../ui/viewmodel/properties/LabelText.java | 3 +-- .../META-INF/MANIFEST.MF | 3 +-- .../examples/dsf/pda/service/PDABackend.java | 10 ++++---- .../META-INF/MANIFEST.MF | 1 - .../cdt/launch/AbstractCLaunchDelegate.java | 5 ++-- .../org/eclipse/cdt/launch/LaunchUtils.java | 3 +-- .../internal/LocalRunLaunchDelegate.java | 3 +-- 148 files changed, 290 insertions(+), 514 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(); @@ -43,19 +42,10 @@ 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. */ @@ -59,19 +58,6 @@ public class FoldingMessages { return RESOURCE_BUNDLE; } - /** - * Returns the formatted resource string associated with the given key in the resource bundle. - * MessageFormat 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 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. * MessageFormat is used to format the message. If there isn't any value @@ -81,7 +67,7 @@ public class FoldingMessages { * @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(); @@ -43,19 +42,10 @@ 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 * diff --git a/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF index e8e5de27343..62645bb54d7 100644 --- a/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF +++ b/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF @@ -133,7 +133,6 @@ Require-Bundle: org.eclipse.cdt.core.native;bundle-version="[5.10.100,6.0.0)";vi org.eclipse.ltk.core.refactoring;bundle-version="[3.10.200,4.0.0)", org.eclipse.osgi.services;bundle-version="[3.8.0,4.0.0)", org.eclipse.text;bundle-version="[3.9.0,4.0.0)", - com.ibm.icu;bundle-version="4.4.2", com.google.gson, org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional Bundle-ActivationPolicy: lazy diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CoreModelMessages.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CoreModelMessages.java index efadd1b44b7..f7a94cda8d0 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CoreModelMessages.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CoreModelMessages.java @@ -13,11 +13,10 @@ *******************************************************************************/ package org.eclipse.cdt.internal.core.model; +import java.text.MessageFormat; import java.util.MissingResourceException; import java.util.ResourceBundle; -import com.ibm.icu.text.MessageFormat; - /** * @noreference This class is not intended to be referenced by clients. */ @@ -54,19 +53,10 @@ public class CoreModelMessages { return getString(key); } - /** - * Returns 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 {@code null} - */ - public static String getFormattedString(String key, Object arg) { - return MessageFormat.format(getString(key), new Object[] { arg }); - } - /** * Returns 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/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Util.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Util.java index c6f2d96b487..bdb9eb07ede 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Util.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Util.java @@ -23,6 +23,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.net.URI; +import java.text.MessageFormat; import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.ICLogConstants; @@ -45,8 +46,6 @@ import org.eclipse.core.runtime.preferences.InstanceScope; import org.osgi.service.prefs.BackingStoreException; import org.osgi.service.prefs.Preferences; -import com.ibm.icu.text.MessageFormat; - public class Util implements ICLogConstants { public static boolean VERBOSE_PARSER; public static boolean VERBOSE_SCANNER; @@ -197,8 +196,8 @@ public class Util implements ICLogConstants { if (CCorePlugin.getDefault().isDebugging() && isActive(client)) { // Time stamp if (addTimeStamp) - message = MessageFormat.format("[{0}] {1}", new Object[] { //$NON-NLS-1$ - Long.valueOf(System.currentTimeMillis()), message }); + message = MessageFormat.format("[{0}] {1}", //$NON-NLS-1$ + Long.valueOf(System.currentTimeMillis()), message); while (message.length() > 100) { String partial = message.substring(0, 100); message = message.substring(100); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/AbstractCProjectDescriptionStorage.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/AbstractCProjectDescriptionStorage.java index 98af3dbeb9d..d9917909607 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/AbstractCProjectDescriptionStorage.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/AbstractCProjectDescriptionStorage.java @@ -14,6 +14,8 @@ *******************************************************************************/ package org.eclipse.cdt.internal.core.settings.model; +import java.text.MessageFormat; + import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.settings.model.CProjectDescriptionEvent; @@ -34,8 +36,6 @@ import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.osgi.framework.Version; -import com.ibm.icu.text.MessageFormat; - /** * This abstract class provides an extension point for functionality for loading * a CDT Project Description from some kind of backing store. This allows @@ -159,7 +159,7 @@ public abstract class AbstractCProjectDescriptionStorage { if (!project.isAccessible()) throw ExceptionFactory.createCoreException( MessageFormat.format(CCorePlugin.getResourceString("ProjectDescription.ProjectNotAccessible"), //$NON-NLS-1$ - new Object[] { getProject().getName() })); + getProject().getName())); return currentThreadProjectDescription.get(); } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CProjectDescriptionManager.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CProjectDescriptionManager.java index 67a6c5cc218..1af6e5e3141 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CProjectDescriptionManager.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CProjectDescriptionManager.java @@ -27,6 +27,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.UnsupportedEncodingException; import java.net.URI; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -135,8 +136,6 @@ import org.w3c.dom.NodeList; import org.w3c.dom.ProcessingInstruction; import org.xml.sax.SAXException; -import com.ibm.icu.text.MessageFormat; - /** * The CProjectDescriptionManager is to marshall the loading and storing * of CDT Project Descriptions. @@ -846,7 +845,7 @@ public class CProjectDescriptionManager implements ICProjectDescriptionManager { if (!project.isAccessible()) throw ExceptionFactory.createCoreException(MessageFormat.format( CCorePlugin.getResourceString("ProjectDescription.ProjectNotAccessible"), //$NON-NLS-1$ - new Object[] { project.getName() })); + project.getName())); if (!des.isValid() && (!fAllowEmptyCreatingDescription || !des.isCdtProjectCreating())) throw ExceptionFactory.createCoreException( @@ -887,7 +886,7 @@ public class CProjectDescriptionManager implements ICProjectDescriptionManager { if (project == null || !project.isAccessible()) throw ExceptionFactory.createCoreException( MessageFormat.format(CCorePlugin.getResourceString("ProjectDescription.ProjectNotAccessible"), //$NON-NLS-1$ - new Object[] { project != null ? project.getName() : "" })); //$NON-NLS-1$ + project != null ? project.getName() : "")); //$NON-NLS-1$ AbstractCProjectDescriptionStorage storage = CProjectDescriptionStorageManager.getInstance() .getProjectDescriptionStorage(project); if (storage == null) @@ -1389,7 +1388,6 @@ public class CProjectDescriptionManager implements ICProjectDescriptionManager { /* void postProcessNewDescriptionCache(CProjectDescription des, ICProjectDescriptionDelta delta) { if (delta == null && delta.getDeltaKind() != ICProjectDescriptionDelta.CHANGED) return; - ICConfigurationDescription indexCfg = des.getIndexConfiguration(); ICConfigurationDescription activeCfg = des.getActiveConfiguration(); ICProjectDescriptionDelta activeCfgDelta = findDelta(activeCfg.getId(), delta); @@ -1399,8 +1397,6 @@ public class CProjectDescriptionManager implements ICProjectDescriptionManager { des.setIndexConfiguration(activeCfg); } } - - } */ private ICDescriptionDelta findDelta(String id, ICDescriptionDelta delta) { @@ -1933,18 +1929,6 @@ public class CProjectDescriptionManager implements ICProjectDescriptionManager { return result; } - /* public boolean entriesEqual(ICLanguageSettingEntry entries1[], ICLanguageSettingEntry entries2[]) { - if (entries1.length != entries2.length) - return false; - - for (int i = 0; i < entries1.length; i++) { - if (!entries1[i].equals(entries2[i])) - return false; - } - - return true; - } - */ private CProjectDescriptionDelta createDelta(ICBuildSetting newBuildSetting, ICBuildSetting oldBuildSetting) { CProjectDescriptionDelta delta = new CProjectDescriptionDelta(newBuildSetting, oldBuildSetting); if (!Arrays.equals(newBuildSetting.getErrorParserIDs(), oldBuildSetting.getErrorParserIDs())) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/index/export/ExternalExportProjectProvider.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/index/export/ExternalExportProjectProvider.java index 5b9485c5395..dffe1d80af7 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/index/export/ExternalExportProjectProvider.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/index/export/ExternalExportProjectProvider.java @@ -14,6 +14,8 @@ package org.eclipse.cdt.core.index.export; import java.io.File; +import java.text.DateFormat; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.Calendar; @@ -48,9 +50,6 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; -import com.ibm.icu.text.DateFormat; -import com.ibm.icu.text.MessageFormat; - /** * An IExportProjectProvider suitable for indexing an external folder. The arguments understood by this provider * are @@ -82,7 +81,7 @@ public class ExternalExportProjectProvider extends AbstractExportProjectProvider // -source File source = new File(getSingleString(OPT_SOURCE)); if (!source.exists()) { - fail(MessageFormat.format(Messages.ExternalContentPEM_LocationToIndexNonExistent, new Object[] { source })); + fail(MessageFormat.format(Messages.ExternalContentPEM_LocationToIndexNonExistent, source)); } // -include diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ASTProblem.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ASTProblem.java index 92c0d3149d1..31c8a75c257 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ASTProblem.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ASTProblem.java @@ -15,6 +15,7 @@ *******************************************************************************/ package org.eclipse.cdt.internal.core.dom.parser; +import java.text.MessageFormat; import java.util.HashMap; import java.util.Map; @@ -24,8 +25,6 @@ import org.eclipse.cdt.core.dom.ast.IASTNode; import org.eclipse.cdt.core.dom.ast.IASTProblem; import org.eclipse.cdt.internal.core.parser.ParserMessages; -import com.ibm.icu.text.MessageFormat; - /** * Models problems, all problems should derive from this class. */ @@ -170,7 +169,7 @@ public class ASTProblem extends ASTNode implements IASTProblem { msg = ""; //$NON-NLS-1$ if (arg != null) { - msg = MessageFormat.format(msg, new Object[] { arg }); + msg = MessageFormat.format(msg, arg); } if (originalProblem != null) { msg = MessageFormat.format("{0}: {1}", msg, originalProblem.getMessage()); //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ProblemBinding.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ProblemBinding.java index 6c2498d59e1..6c3a014cb3e 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ProblemBinding.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ProblemBinding.java @@ -16,6 +16,8 @@ *******************************************************************************/ package org.eclipse.cdt.internal.core.dom.parser; +import java.text.MessageFormat; + import org.eclipse.cdt.core.dom.ILinkage; import org.eclipse.cdt.core.dom.IName; import org.eclipse.cdt.core.dom.ast.DOMException; @@ -40,8 +42,6 @@ import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.EvalFixed; import org.eclipse.cdt.internal.core.parser.ParserMessages; import org.eclipse.core.runtime.PlatformObject; -import com.ibm.icu.text.MessageFormat; - /** * Implementation of problem bindings */ @@ -142,7 +142,7 @@ public class ProblemBinding extends PlatformObject implements IProblemBinding, I } if (arg != null) { - msg = MessageFormat.format(msg, new Object[] { new String(arg) }); + msg = MessageFormat.format(msg, new String(arg)); } return msg; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/indexer/StandaloneIndexerTask.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/indexer/StandaloneIndexerTask.java index ba297d1e5cf..68adb737005 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/indexer/StandaloneIndexerTask.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/indexer/StandaloneIndexerTask.java @@ -14,6 +14,7 @@ *******************************************************************************/ package org.eclipse.cdt.internal.core.indexer; +import java.text.MessageFormat; import java.text.NumberFormat; import java.util.Collection; import java.util.Iterator; @@ -27,8 +28,6 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; -import com.ibm.icu.text.MessageFormat; - /** * A task for index updates. * diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ParserMessages.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ParserMessages.java index 5aa7f207bb4..98900f63370 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ParserMessages.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ParserMessages.java @@ -13,13 +13,12 @@ *******************************************************************************/ package org.eclipse.cdt.internal.core.parser; +import java.text.MessageFormat; import java.util.MissingResourceException; import java.util.ResourceBundle; import org.eclipse.cdt.core.dom.ast.ISemanticProblem; -import com.ibm.icu.text.MessageFormat; - public class ParserMessages { private static final String BUNDLE_NAME = ParserMessages.class.getName(); private static ResourceBundle resourceBundle; @@ -66,7 +65,7 @@ public class ParserMessages { if (arg == null) arg = ""; //$NON-NLS-1$ - return MessageFormat.format(format, new Object[] { arg }); + return MessageFormat.format(format, arg); } public static String getProblemPattern(ISemanticProblem problem) { diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/PreprocessorMacro.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/PreprocessorMacro.java index 2549b2a1c09..b4bd9fc6ab4 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/PreprocessorMacro.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/PreprocessorMacro.java @@ -13,6 +13,7 @@ *******************************************************************************/ package org.eclipse.cdt.internal.core.parser.scanner; +import java.text.DateFormatSymbols; import java.util.Calendar; import org.eclipse.cdt.core.dom.ILinkage; @@ -25,8 +26,6 @@ import org.eclipse.cdt.core.parser.OffsetLimitReachedException; import org.eclipse.cdt.internal.core.dom.Linkage; import org.eclipse.cdt.internal.core.parser.scanner.Lexer.LexerOptions; -import com.ibm.icu.text.DateFormatSymbols; - /** * Models macros used by the preprocessor * @since 5.0 diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOMManager.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOMManager.java index 0a13c206af9..1b083a43233 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOMManager.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOMManager.java @@ -26,6 +26,8 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.text.MessageFormat; +import java.text.SimpleDateFormat; import java.util.ArrayDeque; import java.util.ArrayList; import java.util.Arrays; @@ -117,9 +119,6 @@ import org.eclipse.core.runtime.preferences.IEclipsePreferences.PreferenceChange import org.eclipse.core.runtime.preferences.IPreferencesService; import org.eclipse.core.runtime.preferences.InstanceScope; -import com.ibm.icu.text.MessageFormat; -import com.ibm.icu.text.SimpleDateFormat; - /** * Manages PDOM updates and events associated with them. Provides methods for index access. */ @@ -1227,8 +1226,8 @@ public class PDOMManager implements IWritableIndexManager, IListener { } } - String msg = MessageFormat.format(Messages.PDOMManager_indexMonitorDetail, new Object[] { - Integer.valueOf(sourceCount), Integer.valueOf(sourceEstimate), Integer.valueOf(headerCount) }); + String msg = MessageFormat.format(Messages.PDOMManager_indexMonitorDetail, Integer.valueOf(sourceCount), + Integer.valueOf(sourceEstimate), Integer.valueOf(headerCount)); if (detail != null) { msg += ": " + detail; //$NON-NLS-1$ } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/BTree.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/BTree.java index 2c6c7d28e82..9275a8bb7d6 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/BTree.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/BTree.java @@ -15,13 +15,13 @@ *******************************************************************************/ package org.eclipse.cdt.internal.core.pdom.db; +import java.text.MessageFormat; + import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; -import com.ibm.icu.text.MessageFormat; - /** * @author Doug Schaefer */ @@ -317,7 +317,7 @@ public class BTree { } throw new BTreeKeyNotFoundException( MessageFormat.format(Messages.getString("BTree.DeletionOnAbsentKey"), //$NON-NLS-1$ - new Object[] { Long.valueOf(key), Integer.valueOf(mode) })); + Long.valueOf(key), Integer.valueOf(mode))); } } else { if (keyIndexInNode != -1) { @@ -417,7 +417,7 @@ public class BTree { throw new BTreeKeyNotFoundException( MessageFormat.format(Messages.getString("BTree.DeletionOnAbsentKey"), //$NON-NLS-1$ - new Object[] { Long.valueOf(key), Integer.valueOf(mode) })); + Long.valueOf(key), Integer.valueOf(mode))); } } } @@ -674,8 +674,8 @@ public class BTree { if (!full && !empty) { valid = false; msg += MessageFormat.format(Messages.getString("BTree.IntegrityErrorA"), //$NON-NLS-1$ - new Object[] { Long.valueOf(node), Integer.valueOf(indexFirstBlankKey), - Integer.valueOf(indexLastNonBlankKey) }); + Long.valueOf(node), Integer.valueOf(indexFirstBlankKey), + Integer.valueOf(indexLastNonBlankKey)); } } @@ -683,7 +683,7 @@ public class BTree { if (childCount != 0 && childCount != keyCount + 1) { valid = false; msg += MessageFormat.format(Messages.getString("BTree.IntegrityErrorB"), //$NON-NLS-1$ - new Object[] { Long.valueOf(node) }); + Long.valueOf(node)); } // The root node is excused from the remaining node constraints. @@ -695,7 +695,7 @@ public class BTree { if (keyCount < MIN_RECORDS || keyCount > MAX_RECORDS) { valid = false; msg += MessageFormat.format(Messages.getString("BTree.IntegrityErrorC"), //$NON-NLS-1$ - new Object[] { Long.valueOf(node) }); + Long.valueOf(node)); } // Check: All leaf nodes are at the same depth diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/Database.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/Database.java index c3ff517248e..1ca0b85b51f 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/Database.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/Database.java @@ -28,6 +28,7 @@ import java.nio.ByteBuffer; import java.nio.channels.ClosedByInterruptException; import java.nio.channels.ClosedChannelException; import java.nio.channels.FileChannel; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -38,8 +39,6 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.osgi.util.NLS; -import com.ibm.icu.text.MessageFormat; - /** * Database encapsulates access to a flat binary format file with a memory-manager-like API for * obtaining and releasing areas of storage (memory). @@ -319,7 +318,7 @@ public class Database { private void databaseCorruptionDetected() throws CoreException { String msg = MessageFormat.format(Messages.getString("Database.CorruptedDatabase"), //$NON-NLS-1$ - new Object[] { fLocation.getName() }); + fLocation.getName()); throw new CoreException(new DBStatus(msg)); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/export/CLIUtil.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/export/CLIUtil.java index fb4e8167288..7935cd2a6ee 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/export/CLIUtil.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/export/CLIUtil.java @@ -13,6 +13,7 @@ *******************************************************************************/ package org.eclipse.cdt.internal.core.pdom.export; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -21,8 +22,6 @@ import java.util.Map; import org.eclipse.cdt.core.index.export.Messages; import org.eclipse.core.runtime.CoreException; -import com.ibm.icu.text.MessageFormat; - /** * Helper methods for command-line options *
@@ -43,8 +42,7 @@ public class CLIUtil { throws CoreException { List list = arguments.get(opt); if (list == null || list.size() != number) { - String msg = MessageFormat.format(Messages.CLIUtil_OptionParametersMismatch, - new Object[] { opt, "" + number }); //$NON-NLS-1$ + String msg = MessageFormat.format(Messages.CLIUtil_OptionParametersMismatch, opt, "" + number); //$NON-NLS-1$ GeneratePDOMApplication.fail(msg); } return list; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/export/GeneratePDOM.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/export/GeneratePDOM.java index 37cd352c6eb..19d3277310f 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/export/GeneratePDOM.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/export/GeneratePDOM.java @@ -16,6 +16,7 @@ package org.eclipse.cdt.internal.core.pdom.export; import java.io.File; +import java.text.MessageFormat; import java.util.Map; import org.eclipse.cdt.core.CCorePlugin; @@ -33,8 +34,6 @@ import org.eclipse.core.runtime.MultiStatus; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Status; -import com.ibm.icu.text.MessageFormat; - /** * An ISafeRunnable which *
    @@ -91,14 +90,13 @@ public class GeneratePDOM { final ICProject cproject = pm.createProject(); if (cproject == null) { fail(MessageFormat.format(Messages.GeneratePDOM_ProjectProviderReturnedNullCProject, - new Object[] { pm.getClass().getName() })); + pm.getClass().getName())); return null; // Cannot be reached, inform the compiler } IIndexLocationConverter converter = pm.getLocationConverter(cproject); if (converter == null) { - fail(MessageFormat.format(Messages.GeneratePDOM_NullLocationConverter, - new Object[] { pm.getClass().getName() })); + fail(MessageFormat.format(Messages.GeneratePDOM_NullLocationConverter, pm.getClass().getName())); } // Index the project @@ -149,8 +147,7 @@ public class GeneratePDOM { exportedPDOM.releaseWriteLock(); } } catch (InterruptedException ie) { - String msg = MessageFormat.format(Messages.GeneratePDOM_GenericGenerationFailed, - new Object[] { ie.getMessage() }); + String msg = MessageFormat.format(Messages.GeneratePDOM_GenericGenerationFailed, ie.getMessage()); throw new CoreException(CCorePlugin.createStatus(msg, ie)); } finally { if (deleteOnExit) { diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/export/GeneratePDOMApplication.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/export/GeneratePDOMApplication.java index 91b1f2ab80d..6b0762fa5c9 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/export/GeneratePDOMApplication.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/export/GeneratePDOMApplication.java @@ -16,6 +16,7 @@ package org.eclipse.cdt.internal.core.pdom.export; import java.io.File; import java.io.PrintStream; +import java.text.MessageFormat; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -40,8 +41,6 @@ import org.eclipse.core.runtime.jobs.ProgressProvider; import org.eclipse.equinox.app.IApplication; import org.eclipse.equinox.app.IApplicationContext; -import com.ibm.icu.text.MessageFormat; - /** * An eclipse application for generating PDOM's without starting the Workbench */ @@ -91,7 +90,7 @@ public class GeneratePDOMApplication implements IApplication { String pproviderFQN; if (!arguments.containsKey(OPT_PROJECTPROVIDER)) { output(MessageFormat.format(Messages.GeneratePDOMApplication_UsingDefaultProjectProvider, - new Object[] { DEFAULT_PROJECT_PROVIDER })); + DEFAULT_PROJECT_PROVIDER)); pproviderFQN = DEFAULT_PROJECT_PROVIDER; } else { pproviderFQN = CLIUtil.getArg(arguments, OPT_PROJECTPROVIDER, 1).get(0); @@ -105,8 +104,7 @@ public class GeneratePDOMApplication implements IApplication { if (indexerIDs.size() == 1) { indexerID = indexerIDs.get(0); } else if (indexerIDs.size() > 1) { - fail(MessageFormat.format(Messages.GeneratePDOMApplication_InvalidIndexerID, - new Object[] { OPT_INDEXER_ID })); + fail(MessageFormat.format(Messages.GeneratePDOMApplication_InvalidIndexerID, OPT_INDEXER_ID)); } } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/PDOMIndexerTask.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/PDOMIndexerTask.java index 5222cfcaa02..3d016d28c65 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/PDOMIndexerTask.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/PDOMIndexerTask.java @@ -15,6 +15,7 @@ *******************************************************************************/ package org.eclipse.cdt.internal.core.pdom.indexer; +import java.text.NumberFormat; import java.util.Arrays; import java.util.Calendar; import java.util.Collections; @@ -47,8 +48,6 @@ import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Status; import org.eclipse.osgi.util.NLS; -import com.ibm.icu.text.NumberFormat; - /** * Configures the abstract indexer task suitable for indexing projects. */ diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCorePlugin.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCorePlugin.java index a29d33f36f8..e06aca33027 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCorePlugin.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCorePlugin.java @@ -21,6 +21,7 @@ package org.eclipse.cdt.core; import java.io.IOException; import java.net.URL; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; @@ -101,8 +102,6 @@ import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; import org.osgi.framework.Version; -import com.ibm.icu.text.MessageFormat; - /** * CCorePlugin is the life-cycle owner of the core plug-in, and starting point * for access to many core APIs. @@ -337,7 +336,7 @@ public class CCorePlugin extends Plugin { } 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/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/resources/RefreshExclusion.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/resources/RefreshExclusion.java index 3def7c56ca7..851bb60c797 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/resources/RefreshExclusion.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/resources/RefreshExclusion.java @@ -13,6 +13,7 @@ *******************************************************************************/ package org.eclipse.cdt.core.resources; +import java.text.MessageFormat; import java.util.Collections; import java.util.Iterator; import java.util.LinkedList; @@ -23,8 +24,6 @@ import org.eclipse.cdt.core.settings.model.ICStorageElement; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; -import com.ibm.icu.text.MessageFormat; - /** * A RefreshExclusion represents a rule for excluding certain resources from being refreshed. * diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CConfigBasedDescriptor.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CConfigBasedDescriptor.java index 8ddc87f9910..bf1141962a8 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CConfigBasedDescriptor.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CConfigBasedDescriptor.java @@ -19,6 +19,7 @@ package org.eclipse.cdt.internal.core; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; import java.lang.reflect.Proxy; +import java.text.MessageFormat; import java.util.HashMap; import java.util.LinkedHashSet; import java.util.Map; @@ -58,8 +59,6 @@ import org.eclipse.core.runtime.jobs.Job; import org.w3c.dom.Element; import org.w3c.dom.Node; -import com.ibm.icu.text.MessageFormat; - /** * Concrete ICDescriptor for a Project. * @@ -136,7 +135,7 @@ final public class CConfigBasedDescriptor implements ICDescriptor { if (!getProject().isAccessible()) throw ExceptionFactory.createCoreException( MessageFormat.format(CCorePlugin.getResourceString("ProjectDescription.ProjectNotAccessible"), //$NON-NLS-1$ - new Object[] { getProject().getName() })); + getProject().getName())); if (fIsDirty) { ICProjectDescription des = fCfgDes.getProjectDescription(); if (des.isCdtProjectCreating()) diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CDTLogWriter.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CDTLogWriter.java index 291a4854926..6c7217590f9 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CDTLogWriter.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CDTLogWriter.java @@ -22,15 +22,14 @@ import java.io.OutputStreamWriter; import java.io.PrintWriter; import java.io.UnsupportedEncodingException; import java.io.Writer; +import java.text.DateFormat; +import java.text.SimpleDateFormat; import java.util.Date; import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IStatus; -import com.ibm.icu.text.DateFormat; -import com.ibm.icu.text.SimpleDateFormat; - public class CDTLogWriter { protected File logFile = null; protected Writer log = null; diff --git a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/ProcessHelper.java b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/ProcessHelper.java index 6478849ad7a..656f81b84b2 100644 --- a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/ProcessHelper.java +++ b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/ProcessHelper.java @@ -24,6 +24,7 @@ import java.io.IOException; import java.io.InputStreamReader; import java.io.RandomAccessFile; import java.net.URL; +import java.text.MessageFormat; import java.util.HashSet; import java.util.Map; import java.util.Set; @@ -32,8 +33,6 @@ import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; -import com.ibm.icu.text.MessageFormat; - /** * Acts as helper class for process the processes i.e., copy, replace and append files. */ diff --git a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/ProcessRunner.java b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/ProcessRunner.java index c2f4f132f4b..748ce73d6aa 100644 --- a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/ProcessRunner.java +++ b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/ProcessRunner.java @@ -13,12 +13,12 @@ *******************************************************************************/ package org.eclipse.cdt.core.templateengine.process; +import java.text.MessageFormat; + import org.eclipse.cdt.core.templateengine.TemplateCore; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; -import com.ibm.icu.text.MessageFormat; - /** * Abstract ProcessRunner class provides the methods to implement for processes. */ diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/Coff.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/Coff.java index c54594c7ce6..9f0c0d927f5 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/Coff.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/Coff.java @@ -18,14 +18,13 @@ import java.io.IOException; import java.io.RandomAccessFile; import java.nio.ByteBuffer; import java.nio.channels.FileChannel.MapMode; +import java.text.DateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; import org.eclipse.cdt.core.CCorePlugin; -import com.ibm.icu.text.DateFormat; - /** * @deprecated Deprecated as of CDT 6.9. Use 64 bit version {@link Coff64}. * This class is planned for removal in next major release. diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/Coff64.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/Coff64.java index 1530253c767..24b3abe0fbd 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/Coff64.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/Coff64.java @@ -19,14 +19,13 @@ import java.io.IOException; import java.io.RandomAccessFile; import java.nio.ByteBuffer; import java.nio.channels.FileChannel.MapMode; +import java.text.DateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; import org.eclipse.cdt.core.CCorePlugin; -import com.ibm.icu.text.DateFormat; - /** * @since 6.9 */ diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/xcoff/XCoff32.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/xcoff/XCoff32.java index 47f00173dcc..ac6c64ad78b 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/xcoff/XCoff32.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/xcoff/XCoff32.java @@ -16,14 +16,13 @@ package org.eclipse.cdt.utils.xcoff; import java.io.EOFException; import java.io.IOException; import java.io.RandomAccessFile; +import java.text.DateFormat; import java.util.ArrayList; import java.util.Date; import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.utils.coff.ReadMemoryAccess; -import com.ibm.icu.text.DateFormat; - /** * Representation of AIX XCOFF32 binary format * diff --git a/core/org.eclipse.cdt.ui.tests/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.ui.tests/META-INF/MANIFEST.MF index d27c3c03c21..ca3185b6887 100644 --- a/core/org.eclipse.cdt.ui.tests/META-INF/MANIFEST.MF +++ b/core/org.eclipse.cdt.ui.tests/META-INF/MANIFEST.MF @@ -34,7 +34,6 @@ Require-Bundle: org.eclipse.jface.text, org.eclipse.compare, org.eclipse.ui.console, org.eclipse.core.expressions, - com.ibm.icu, org.eclipse.ltk.core.refactoring;bundle-version="3.4.0", org.eclipse.core.filesystem;bundle-version="1.2.0", org.eclipse.ltk.ui.refactoring, diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/includes/BindingClassifierTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/includes/BindingClassifierTest.java index c24281ac673..f67add5486d 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/includes/BindingClassifierTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/includes/BindingClassifierTest.java @@ -13,6 +13,7 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.refactoring.includes; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -37,8 +38,6 @@ import org.eclipse.cdt.ui.PreferenceConstants; import org.eclipse.cdt.ui.testplugin.CTestPlugin; import org.eclipse.jface.preference.IPreferenceStore; -import com.ibm.icu.text.MessageFormat; - import junit.framework.TestSuite; /** diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/BreakIteratorTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/BreakIteratorTest.java index e15c175347e..aa3eb4fa649 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/BreakIteratorTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/BreakIteratorTest.java @@ -14,7 +14,7 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.text; -import com.ibm.icu.text.BreakIterator; +import java.text.BreakIterator; import junit.framework.TestCase; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/codemanipulation/IncludeInfo.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/codemanipulation/IncludeInfo.java index d44b1d5fe3f..127d370bf29 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/codemanipulation/IncludeInfo.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/codemanipulation/IncludeInfo.java @@ -13,7 +13,7 @@ *******************************************************************************/ package org.eclipse.cdt.internal.corext.codemanipulation; -import com.ibm.icu.text.Collator; +import java.text.Collator; public class IncludeInfo implements Comparable { private static final Collator COLLATOR = Collator.getInstance(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/FileTemplateContextType.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/FileTemplateContextType.java index 600ba89db3b..a55894c623c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/FileTemplateContextType.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/FileTemplateContextType.java @@ -13,6 +13,8 @@ *******************************************************************************/ package org.eclipse.cdt.internal.corext.template.c; +import java.text.DateFormat; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.List; @@ -33,9 +35,6 @@ import org.eclipse.jface.text.templates.TemplateVariableResolver; import org.eclipse.jface.text.templates.TemplateVariableType; import org.eclipse.text.templates.ContextTypeRegistry; -import com.ibm.icu.text.DateFormat; -import com.ibm.icu.text.SimpleDateFormat; - /** * A generic template context type for file resources based on content-type. * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/util/Messages.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/util/Messages.java index 0b9703cc630..d148532ef48 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/util/Messages.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/util/Messages.java @@ -13,7 +13,7 @@ *******************************************************************************/ package org.eclipse.cdt.internal.corext.util; -import com.ibm.icu.text.MessageFormat; +import java.text.MessageFormat; /** * Helper class to format message strings. @@ -22,11 +22,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 }); - } - - public static String format(String message, Object[] objects) { + public static String format(String message, Object... objects) { return MessageFormat.format(message, objects); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/FoldingMessages.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/FoldingMessages.java index a88fa49f62f..5b348edecce 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/FoldingMessages.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/FoldingMessages.java @@ -13,11 +13,10 @@ *******************************************************************************/ package org.eclipse.cdt.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. */ @@ -56,19 +55,6 @@ public class FoldingMessages { return RESOURCE_BUNDLE; } - /** - * Returns the formatted resource string associated with the given key in the resource bundle. - * MessageFormat 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 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. * MessageFormat is used to format the message. If there isn't any value @@ -78,7 +64,7 @@ public class FoldingMessages { * @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/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/TextFieldNavigationHandler.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/TextFieldNavigationHandler.java index 7d864c159af..7c6fe7bd50a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/TextFieldNavigationHandler.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/TextFieldNavigationHandler.java @@ -14,6 +14,7 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.dialogs; +import java.text.BreakIterator; import java.util.ArrayList; import java.util.List; @@ -49,8 +50,6 @@ import org.eclipse.ui.commands.ICommandService; import org.eclipse.ui.keys.IBindingService; import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds; -import com.ibm.icu.text.BreakIterator; - /** * Support for camelCase-aware sub-word navigation in dialog fields. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java index 9ddb6a982df..c80985776e0 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java @@ -20,6 +20,7 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.editor; +import java.text.BreakIterator; import java.text.CharacterIterator; import java.util.ArrayDeque; import java.util.ArrayList; @@ -239,8 +240,6 @@ import org.eclipse.ui.texteditor.link.EditorLinkedModeUI; import org.eclipse.ui.texteditor.templates.ITemplatesPage; import org.eclipse.ui.views.contentoutline.IContentOutlinePage; -import com.ibm.icu.text.BreakIterator; - /** * C/C++ source editor. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ConstructedCEditorMessages.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ConstructedCEditorMessages.java index 4146f22dad0..19cd3ffe0db 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ConstructedCEditorMessages.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ConstructedCEditorMessages.java @@ -13,11 +13,10 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.editor; +import java.text.MessageFormat; import java.util.MissingResourceException; import java.util.ResourceBundle; -import com.ibm.icu.text.MessageFormat; - public class ConstructedCEditorMessages { private static final String RESOURCE_BUNDLE = "org.eclipse.cdt.internal.ui.editor.ConstructedCEditorMessages"; //$NON-NLS-1$ @@ -50,14 +49,7 @@ public class ConstructedCEditorMessages { /** * 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); } - - /** - * Gets a string from the resource bundle and formats it with arguments - */ - public static String getFormattedString(String key, Object arg) { - return MessageFormat.format(getString(key), new Object[] { arg }); - } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SortLinesAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SortLinesAction.java index 3a94a33bcd1..677fffcadbc 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SortLinesAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SortLinesAction.java @@ -13,6 +13,7 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.editor; +import java.text.Collator; import java.util.Arrays; import org.eclipse.cdt.core.model.ICProject; @@ -37,8 +38,6 @@ import org.eclipse.ui.IEditorInput; import org.eclipse.ui.texteditor.ITextEditor; import org.eclipse.ui.texteditor.TextEditorAction; -import com.ibm.icu.text.Collator; - /** * Sorts selected lines in alphabetical order. If both, comment and non-comment lines * are selected, the non-comment lines are sorted, and the comments are moved together diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/FilterDescriptor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/FilterDescriptor.java index c6f4493300a..7a97d321c0f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/FilterDescriptor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/FilterDescriptor.java @@ -13,6 +13,7 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.filters; +import java.text.Collator; import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; @@ -29,8 +30,6 @@ import org.eclipse.jface.util.SafeRunnable; import org.eclipse.jface.viewers.ViewerFilter; import org.eclipse.osgi.util.NLS; -import com.ibm.icu.text.Collator; - /** * Represents a custom filter which is provided by the * "org.eclipse.jdt.ui.javaElementFilters" extension point. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorColoringConfigurationBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorColoringConfigurationBlock.java index 99427b5e4eb..950296a7230 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorColoringConfigurationBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorColoringConfigurationBlock.java @@ -18,6 +18,7 @@ package org.eclipse.cdt.internal.ui.preferences; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; +import java.text.Collator; import java.util.ArrayList; import java.util.List; @@ -76,8 +77,6 @@ import org.eclipse.ui.dialogs.PreferencesUtil; import org.eclipse.ui.editors.text.EditorsUI; import org.eclipse.ui.texteditor.ChainedPreferenceStore; -import com.ibm.icu.text.Collator; - /** * Configures C/C++ Editor code coloring preferences. * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/HeaderSubstitutionMapEditDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/HeaderSubstitutionMapEditDialog.java index 9d8faa6a295..e177bcfc39f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/HeaderSubstitutionMapEditDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/HeaderSubstitutionMapEditDialog.java @@ -21,6 +21,7 @@ import java.io.InputStreamReader; import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.Writer; +import java.text.Collator; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; @@ -71,8 +72,6 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.XMLMemento; -import com.ibm.icu.text.Collator; - /** * Dialog for editing a header file substitution map. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/AccessorDescriptor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/AccessorDescriptor.java index 5e95b478fd3..3fe566d5126 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/AccessorDescriptor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/AccessorDescriptor.java @@ -14,12 +14,12 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.refactoring.gettersandsetters; +import java.text.Collator; + import org.eclipse.cdt.core.dom.ast.IASTFunctionDefinition; import org.eclipse.cdt.core.dom.ast.IASTName; import org.eclipse.cdt.core.dom.ast.IASTSimpleDeclaration; -import com.ibm.icu.text.Collator; - public class AccessorDescriptor implements Comparable { public enum AccessorKind { GETTER, SETTER; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/IncludeCreator.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/IncludeCreator.java index fa47476381b..79d63dec7b7 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/IncludeCreator.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/IncludeCreator.java @@ -18,6 +18,7 @@ package org.eclipse.cdt.internal.ui.refactoring.includes; import static org.eclipse.cdt.core.index.IndexLocationFactory.getAbsolutePath; +import java.text.Collator; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -88,8 +89,6 @@ import org.eclipse.jface.text.ITextSelection; import org.eclipse.text.edits.InsertEdit; import org.eclipse.text.edits.MultiTextEdit; -import com.ibm.icu.text.Collator; - /** * Adds an include statement and, optionally, a 'using' declaration for the currently * selected name. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/IncludeOrganizer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/IncludeOrganizer.java index d7a44678cbc..587a7fc54a1 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/IncludeOrganizer.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/IncludeOrganizer.java @@ -17,6 +17,7 @@ package org.eclipse.cdt.internal.ui.refactoring.includes; import static org.eclipse.cdt.core.index.IndexLocationFactory.getAbsolutePath; import static org.eclipse.cdt.internal.ui.refactoring.includes.IncludeUtil.isContainedInRegion; +import java.text.Collator; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -80,8 +81,6 @@ import org.eclipse.text.edits.InsertEdit; import org.eclipse.text.edits.MultiTextEdit; import org.eclipse.text.edits.ReplaceEdit; -import com.ibm.icu.text.Collator; - /** * Organizes the include directives and forward declarations of a source or header file. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/SymbolExportMap.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/SymbolExportMap.java index fc581dbb5c0..c4e9ee6d4ca 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/SymbolExportMap.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/SymbolExportMap.java @@ -16,6 +16,7 @@ package org.eclipse.cdt.internal.ui.refactoring.includes; import java.io.IOException; import java.io.StringReader; import java.io.StringWriter; +import java.text.Collator; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -31,8 +32,6 @@ import org.eclipse.ui.IMemento; import org.eclipse.ui.WorkbenchException; import org.eclipse.ui.XMLMemento; -import com.ibm.icu.text.Collator; - /** * A set of header file substitution rules. */ @@ -72,7 +71,7 @@ public class SymbolExportMap { /** * Indicates that the given symbol is exported by the given header. - + * * @param symbol The symbol represented by its fully qualified name. * @param header The header file exporting the symbol. */ @@ -89,7 +88,7 @@ public class SymbolExportMap { /** * Indicates that the given symbol is exported by the given header. - + * * @param symbol The symbol represented by its fully qualified name. * @param header The header file exporting the symbol. The header is represented by an include * name optionally surrounded by double quotes or angle brackets. Angle brackets indicate diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchListContentProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchListContentProvider.java index 1e51dfd6ab4..b07d9b14ba5 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchListContentProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchListContentProvider.java @@ -14,6 +14,7 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.search; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.HashSet; import java.util.List; @@ -29,8 +30,6 @@ import org.eclipse.jface.viewers.IStructuredContentProvider; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.viewers.Viewer; -import com.ibm.icu.text.MessageFormat; - /** * @author Doug Schaefer */ @@ -93,13 +92,13 @@ public class CSearchListContentProvider implements IStructuredContentProvider, I private Status createUnindexedProjectWarningElement(ICProject project) { return new Status(IStatus.WARNING, CUIPlugin.PLUGIN_ID, MessageFormat.format(CSearchMessages.PDOMSearchListContentProvider_IndexerNotEnabledMessageFormat, - new Object[] { project.getProject().getName() })); + project.getProject().getName())); } private Status createClosedProjectWarningElement(ICProject project) { return new Status(IStatus.WARNING, CUIPlugin.PLUGIN_ID, MessageFormat.format(CSearchMessages.PDOMSearchListContentProvider_ProjectClosedMessageFormat, - new Object[] { project.getProject().getName() })); + project.getProject().getName())); } @Override diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/SelectionParseAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/SelectionParseAction.java index 9dd79dd4ecd..914f0960a0b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/SelectionParseAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/SelectionParseAction.java @@ -17,6 +17,8 @@ package org.eclipse.cdt.internal.ui.search.actions; +import java.text.MessageFormat; + import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.cdt.internal.ui.search.CSearchMessages; import org.eclipse.cdt.internal.ui.util.EditorUtility; @@ -31,8 +33,6 @@ import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IWorkbenchSite; import org.eclipse.ui.texteditor.ITextEditor; -import com.ibm.icu.text.MessageFormat; - /** * @author aniefer * Created on Jun 2, 2004 @@ -111,8 +111,8 @@ public class SelectionParseAction extends Action { } protected void reportSourceFileOpenFailure(IPath path) { - showStatusLineMessage(MessageFormat.format(CSearchMessages.SelectionParseAction_FileOpenFailure_format, - new Object[] { path.toOSString() })); + showStatusLineMessage( + MessageFormat.format(CSearchMessages.SelectionParseAction_FileOpenFailure_format, path.toOSString())); } protected void reportSelectionMatchFailure() { @@ -120,12 +120,12 @@ public class SelectionParseAction extends Action { } protected void reportSymbolLookupFailure(String symbol) { - showStatusLineMessage(MessageFormat.format(CSearchMessages.SelectionParseAction_SymbolNotFoundInIndex_format, - new Object[] { symbol })); + showStatusLineMessage( + MessageFormat.format(CSearchMessages.SelectionParseAction_SymbolNotFoundInIndex_format, symbol)); } protected void reportIncludeLookupFailure(String filename) { - showStatusLineMessage(MessageFormat.format(CSearchMessages.SelectionParseAction_IncludeNotFound_format, - new Object[] { filename })); + showStatusLineMessage( + MessageFormat.format(CSearchMessages.SelectionParseAction_IncludeNotFound_format, filename)); } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CBreakIterator.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CBreakIterator.java index 58e3713aa7b..72dc5d6074b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CBreakIterator.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CBreakIterator.java @@ -14,12 +14,11 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.text; +import java.text.BreakIterator; import java.text.CharacterIterator; import org.eclipse.core.runtime.Assert; -import com.ibm.icu.text.BreakIterator; - /** * A C break iterator. It returns all breaks, including before and after * whitespace, and it returns all camel case breaks. @@ -377,7 +376,6 @@ public class CBreakIterator extends BreakIterator { * Creates a break iterator given a char sequence. * @param newText the new text */ - @Override public void setText(CharSequence newText) { fText = newText; fIterator.setText(new SequenceCharacterIterator(newText)); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CWordIterator.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CWordIterator.java index 3f654e2edfa..0121f6ab9a7 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CWordIterator.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CWordIterator.java @@ -14,12 +14,11 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.text; +import java.text.BreakIterator; import java.text.CharacterIterator; import org.eclipse.core.runtime.Assert; -import com.ibm.icu.text.BreakIterator; - /** * Breaks C text into word starts, also stops at line start and end. No * direction dependency. @@ -183,7 +182,6 @@ public class CWordIterator extends BreakIterator { * Sets the text as CharSequence. * @param newText the new text */ - @Override public void setText(CharSequence newText) { fIterator.setText(newText); first(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/AbstractAnnotationHover.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/AbstractAnnotationHover.java index a1f4359f37f..85ab1b67cd6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/AbstractAnnotationHover.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/AbstractAnnotationHover.java @@ -16,6 +16,7 @@ package org.eclipse.cdt.internal.ui.text.c.hover; +import java.text.MessageFormat; import java.util.Iterator; import org.eclipse.cdt.internal.ui.CPluginImages; @@ -85,8 +86,6 @@ import org.eclipse.ui.editors.text.EditorsUI; import org.eclipse.ui.texteditor.AnnotationPreference; import org.eclipse.ui.texteditor.DefaultMarkerAnnotationAccess; -import com.ibm.icu.text.MessageFormat; - /** * AbstractAnnotationHover * Abstract super class for annotation hovers. @@ -352,7 +351,7 @@ public class AbstractAnnotationHover extends AbstractCEditorTextHover { text = CHoverMessages.AbstractAnnotationHover_message_singleQuickFix; } else { text = MessageFormat.format(CHoverMessages.AbstractAnnotationHover_message_multipleQuickFix, - new Object[] { String.valueOf(proposals.length) }); + String.valueOf(proposals.length)); } quickFixLabel.setText(text); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CEditorTextHoverDescriptor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CEditorTextHoverDescriptor.java index 9ac0a9f8b26..c51856c0776 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CEditorTextHoverDescriptor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CEditorTextHoverDescriptor.java @@ -14,6 +14,7 @@ package org.eclipse.cdt.internal.ui.text.c.hover; +import java.text.Collator; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -34,8 +35,6 @@ import org.eclipse.core.runtime.Status; import org.eclipse.swt.SWT; import org.osgi.framework.Bundle; -import com.ibm.icu.text.Collator; - /** * CEditorTexHoverDescriptor */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/proposals/ChangeCorrectionProposal.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/proposals/ChangeCorrectionProposal.java index 1a1ec441064..19c15cbf3d8 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/proposals/ChangeCorrectionProposal.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/proposals/ChangeCorrectionProposal.java @@ -15,6 +15,8 @@ package org.eclipse.cdt.internal.ui.text.correction.proposals; +import java.text.MessageFormat; + import org.eclipse.cdt.internal.ui.text.correction.CorrectionCommandHandler; import org.eclipse.cdt.internal.ui.text.correction.CorrectionMessages; import org.eclipse.cdt.internal.ui.text.correction.ICommandAccess; @@ -41,8 +43,6 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.Point; import org.eclipse.ui.IEditorPart; -import com.ibm.icu.text.MessageFormat; - /** * Implementation of a C completion proposal to be used for quick fix and quick assist * proposals that invoke a {@link Change}. The proposal offers a proposal information but no context @@ -177,8 +177,8 @@ public class ChangeCorrectionProposal implements ICCompletionProposal, ICommandA public String getDisplayString() { String shortCutString = CorrectionCommandHandler.getShortCutString(getCommandId()); if (shortCutString != null) { - return MessageFormat.format(CorrectionMessages.ChangeCorrectionProposal_name_with_shortcut, - new Object[] { getName(), shortCutString }); + return MessageFormat.format(CorrectionMessages.ChangeCorrectionProposal_name_with_shortcut, getName(), + shortCutString); } return getName(); } @@ -190,7 +190,7 @@ public class ChangeCorrectionProposal implements ICCompletionProposal, ICommandA String shortCutString = CorrectionCommandHandler.getShortCutString(getCommandId()); if (shortCutString != null) { String decorated = MessageFormat.format(CorrectionMessages.ChangeCorrectionProposal_name_with_shortcut, - new Object[] { getName(), shortCutString }); + getName(), shortCutString); return ColoringLabelProvider.decorateStyledString(str, decorated, StyledString.QUALIFIER_STYLER); } return str; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/doctools/DocCommentOwnerManager.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/doctools/DocCommentOwnerManager.java index 8e24c7cb57d..fabe0614779 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/doctools/DocCommentOwnerManager.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/doctools/DocCommentOwnerManager.java @@ -15,6 +15,7 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.text.doctools; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -42,8 +43,6 @@ import org.eclipse.core.runtime.preferences.DefaultScope; import org.eclipse.core.runtime.preferences.InstanceScope; import org.osgi.service.prefs.Preferences; -import com.ibm.icu.text.MessageFormat; - /** * This class manages which IDocCommentOwner's are available in the run-time, and how they map to * resources in projects. @@ -249,8 +248,7 @@ public class DocCommentOwnerManager { String id = element.getAttribute(ATTRKEY_OWNER_ID); String name = element.getAttribute(ATTRKEY_OWNER_NAME); if (result.put(id, new DocCommentOwner(id, name, multi, single)) != null) { - String msg = MessageFormat.format(Messages.DocCommentOwnerManager_DuplicateMapping0, - new Object[] { id }); + String msg = MessageFormat.format(Messages.DocCommentOwnerManager_DuplicateMapping0, id); CUIPlugin.log(new Status(IStatus.WARNING, CUIPlugin.PLUGIN_ID, msg)); } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/SpellCheckIterator.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/SpellCheckIterator.java index 52ed410dbc9..65f5f4917ba 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/SpellCheckIterator.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/SpellCheckIterator.java @@ -14,6 +14,7 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.text.spelling; +import java.text.BreakIterator; import java.util.LinkedList; import java.util.Locale; @@ -23,8 +24,6 @@ import org.eclipse.cdt.internal.ui.text.spelling.engine.ISpellCheckIterator; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IRegion; -import com.ibm.icu.text.BreakIterator; - /** * Iterator to spell check multiline comment regions. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THInformationControl.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THInformationControl.java index e1da1459b29..a4ba02c8a8e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THInformationControl.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THInformationControl.java @@ -14,6 +14,7 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.typehierarchy; +import java.text.MessageFormat; import java.util.Iterator; import org.eclipse.cdt.core.model.CModelException; @@ -44,8 +45,6 @@ import org.eclipse.swt.widgets.Tree; import org.eclipse.swt.widgets.TreeItem; import org.eclipse.ui.progress.IWorkbenchSiteProgressService; -import com.ibm.icu.text.MessageFormat; - public class THInformationControl extends AbstractInformationControl implements ITHModelPresenter { private THHierarchyModel fModel; private THLabelProvider fHierarchyLabelProvider; @@ -254,7 +253,7 @@ public class THInformationControl extends AbstractInformationControl implements default: break; } - return MessageFormat.format(message, new Object[] { keyName }); + return MessageFormat.format(message, keyName); } @Override diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THViewPart.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THViewPart.java index d7638ea3fa9..9de79af0bff 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THViewPart.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THViewPart.java @@ -14,6 +14,7 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.typehierarchy; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.Iterator; @@ -104,8 +105,6 @@ import org.eclipse.ui.part.PageBook; import org.eclipse.ui.part.ViewPart; import org.eclipse.ui.progress.IWorkbenchSiteProgressService; -import com.ibm.icu.text.MessageFormat; - /** * The view part for the include browser. */ @@ -399,8 +398,8 @@ public class THViewPart extends ViewPart implements ITHModelPresenter { if (elem != null) { menu.appendToGroup(IContextMenuConstants.GROUP_OPEN, fOpenElement); if (hierarchyView && !elem.equals(fModel.getInput())) { - String label = MessageFormat.format(Messages.THViewPart_FocusOn, new Object[] { CElementLabels - .getTextLabel(elem, CElementLabels.ALL_FULLY_QUALIFIED | CElementLabels.M_PARAMETER_TYPES) }); + String label = MessageFormat.format(Messages.THViewPart_FocusOn, CElementLabels.getTextLabel(elem, + CElementLabels.ALL_FULLY_QUALIFIED | CElementLabels.M_PARAMETER_TYPES)); menu.appendToGroup(IContextMenuConstants.GROUP_OPEN, new Action(label) { @Override public void run() { @@ -910,7 +909,7 @@ public class THViewPart extends ViewPart implements ITHModelPresenter { message = label; } else { String scope = workingSet.getLabel(); - message = MessageFormat.format("{0} - {1}", new Object[] { label, scope }); //$NON-NLS-1$ + message = MessageFormat.format("{0} - {1}", label, scope); //$NON-NLS-1$ } label = ""; //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/EditorUtility.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/EditorUtility.java index e6afd167317..373e8345841 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/EditorUtility.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/EditorUtility.java @@ -21,6 +21,7 @@ import java.io.ByteArrayInputStream; import java.io.File; import java.io.IOException; import java.net.URI; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.HashSet; import java.util.List; @@ -103,8 +104,6 @@ import org.eclipse.ui.part.MultiEditorInput; import org.eclipse.ui.texteditor.IDocumentProvider; import org.eclipse.ui.texteditor.ITextEditor; -import com.ibm.icu.text.MessageFormat; - public class EditorUtility { /** * The ID of the default text editor @@ -255,7 +254,7 @@ public class EditorUtility { MessageBox errorMsg = new MessageBox(CUIPlugin.getActiveWorkbenchShell(), SWT.ICON_ERROR | SWT.OK); errorMsg.setText(CUIPlugin.getResourceString("EditorUtility.closedproject")); //$NON-NLS-1$ String desc = CUIPlugin.getResourceString("Editorutility.closedproject.description"); //$NON-NLS-1$ - errorMsg.setMessage(MessageFormat.format(desc, new Object[] { project.getName() })); + errorMsg.setMessage(MessageFormat.format(desc, project.getName())); errorMsg.open(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/Messages.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/Messages.java index 61434e98d05..4787f17c924 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/Messages.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/Messages.java @@ -14,9 +14,9 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.util; -import org.eclipse.osgi.util.NLS; +import java.text.MessageFormat; -import com.ibm.icu.text.MessageFormat; +import org.eclipse.osgi.util.NLS; public class Messages extends NLS { public static String EditorUtility_calculatingChangedRegions_message; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/NameComposer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/NameComposer.java index d32da1e3e03..429c7761947 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/NameComposer.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/NameComposer.java @@ -13,6 +13,7 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.util; +import java.text.BreakIterator; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -20,8 +21,6 @@ import java.util.List; import org.eclipse.cdt.internal.ui.text.CBreakIterator; import org.eclipse.cdt.ui.PreferenceConstants; -import com.ibm.icu.text.BreakIterator; - /** * Composes names according to a particular style. A seed name is split into * words at non-alphanumeric characters and camel case boundaries. The resulting diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/AbstractWorkingSetConfigsContribution.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/AbstractWorkingSetConfigsContribution.java index 98b0ac8dc79..546547f64bd 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/AbstractWorkingSetConfigsContribution.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/AbstractWorkingSetConfigsContribution.java @@ -14,6 +14,7 @@ package org.eclipse.cdt.internal.ui.workingsets; +import java.text.Collator; import java.util.Collections; import java.util.Comparator; import java.util.List; @@ -25,8 +26,6 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.ui.IWorkingSet; import org.eclipse.ui.actions.CompoundContributionItem; -import com.ibm.icu.text.Collator; - /** * Common API of dynamic contribution of items to manipulate configurations of a working set. * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPlugin.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPlugin.java index 8211abea2f0..01d6be02ece 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPlugin.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPlugin.java @@ -20,6 +20,7 @@ package org.eclipse.cdt.ui; import java.io.IOException; import java.net.URL; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; @@ -111,8 +112,6 @@ import org.osgi.framework.BundleContext; import org.osgi.framework.BundleException; import org.osgi.framework.ServiceReference; -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. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/IndexerBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/IndexerBlock.java index dd7cf4c4bf3..0890e7e82b7 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/IndexerBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/IndexerBlock.java @@ -14,6 +14,7 @@ *******************************************************************************/ package org.eclipse.cdt.ui.dialogs; +import java.text.Collator; import java.util.Arrays; import java.util.Comparator; import java.util.HashMap; @@ -52,8 +53,6 @@ import org.eclipse.ui.IPluginContribution; import org.eclipse.ui.activities.WorkbenchActivityHelper; import org.eclipse.ui.dialogs.PropertyPage; -import com.ibm.icu.text.Collator; - /** * This IndexerBlock is used in the MakeProjectWizardOptionPage and * the NewManagedProjectOptionPage to display the indexer options during the creation of diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/RegexErrorParserOptionPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/RegexErrorParserOptionPage.java index 3dc2feb0415..be1453a685a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/RegexErrorParserOptionPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/RegexErrorParserOptionPage.java @@ -15,6 +15,7 @@ package org.eclipse.cdt.ui.dialogs; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.List; @@ -69,8 +70,6 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.ui.dialogs.PreferencesUtil; import org.eclipse.ui.fieldassist.ContentAssistCommandAdapter; -import com.ibm.icu.text.MessageFormat; - /** * Options page for RegexErrorParser in Error Parsers Tab of properties/preferences. * @@ -587,8 +586,7 @@ public final class RegexErrorParserOptionPage extends AbstractCOptionPage { columnViewer.getColumn().setText(DialogsMessages.RegexErrorParserOptionPage_EatColumn); columnViewer.getColumn().setResizable(true); - String message = MessageFormat.format(DialogsMessages.RegexErrorParserOptionPage_TooltipConsume, - new Object[] { EAT_NO }); + String message = MessageFormat.format(DialogsMessages.RegexErrorParserOptionPage_TooltipConsume, EAT_NO); columnViewer.getColumn().setToolTipText(message); columnViewer.setLabelProvider(new ColumnLabelProvider() { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ErrorParsTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ErrorParsTab.java index 86c060992f0..4127651beeb 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ErrorParsTab.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ErrorParsTab.java @@ -14,6 +14,7 @@ *******************************************************************************/ package org.eclipse.cdt.ui.newui; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -71,8 +72,6 @@ import org.eclipse.swt.widgets.TableItem; import org.eclipse.ui.PlatformUI; import org.osgi.service.prefs.BackingStoreException; -import com.ibm.icu.text.MessageFormat; - /** * This class represents Error Parser Tab in Project Properties or workspace Preferences * @@ -371,7 +370,7 @@ public class ErrorParsTab extends AbstractCPropertyTab { status.setError(Messages.ErrorParsTab_error_NonEmptyName); } else if (newText.indexOf(ErrorParserManager.ERROR_PARSER_DELIMITER) >= 0) { String message = MessageFormat.format(Messages.ErrorParsTab_error_IllegalCharacter, - new Object[] { ErrorParserManager.ERROR_PARSER_DELIMITER }); + ErrorParserManager.ERROR_PARSER_DELIMITER); status.setError(message); } else if (fAvailableErrorParsers.containsKey(makeId(newText))) { status.setError(Messages.ErrorParsTab_error_NonUniqueID); @@ -416,7 +415,7 @@ public class ErrorParsTab extends AbstractCPropertyTab { status.setError(Messages.ErrorParsTab_error_NonEmptyName); } else if (newText.indexOf(ErrorParserManager.ERROR_PARSER_DELIMITER) >= 0) { String message = MessageFormat.format(Messages.ErrorParsTab_error_IllegalCharacter, - new Object[] { ErrorParserManager.ERROR_PARSER_DELIMITER }); + ErrorParserManager.ERROR_PARSER_DELIMITER); status.setError(message); } return status; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/UIMessages.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/UIMessages.java index acf675a8309..094a5282864 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/UIMessages.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/UIMessages.java @@ -13,11 +13,10 @@ *******************************************************************************/ package org.eclipse.cdt.ui.newui; +import java.text.MessageFormat; import java.util.MissingResourceException; import java.util.ResourceBundle; -import com.ibm.icu.text.MessageFormat; - /** * @since 2.0 * @noextend This class is not intended to be subclassed by clients. @@ -45,7 +44,7 @@ public class UIMessages { public static String getFormattedString(String key, String arg) { key = toNlsFormatKey(key); - return MessageFormat.format(getString(key), new Object[] { arg }); + return MessageFormat.format(getString(key), arg); } public static String getFormattedString(String key, String[] args) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/generic/GenericTagDoubleClickStrategy.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/generic/GenericTagDoubleClickStrategy.java index 3422da62d2b..effc99f85cc 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/generic/GenericTagDoubleClickStrategy.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/generic/GenericTagDoubleClickStrategy.java @@ -13,6 +13,7 @@ *******************************************************************************/ package org.eclipse.cdt.ui.text.doctools.generic; +import java.text.BreakIterator; import java.text.CharacterIterator; import org.eclipse.jface.text.BadLocationException; @@ -22,8 +23,6 @@ import org.eclipse.jface.text.ITextDoubleClickStrategy; import org.eclipse.jface.text.ITextViewer; import org.eclipse.jface.text.Region; -import com.ibm.icu.text.BreakIterator; - /** * A double-click strategy for words starting with specified tag markers. * @since 5.0 diff --git a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/UIElementTreeBuilderHelper.java b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/UIElementTreeBuilderHelper.java index 135f0f42052..d610160f3af 100644 --- a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/UIElementTreeBuilderHelper.java +++ b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/UIElementTreeBuilderHelper.java @@ -14,6 +14,7 @@ *******************************************************************************/ package org.eclipse.cdt.ui.templateengine.uitree; +import java.text.MessageFormat; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -36,8 +37,6 @@ import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; -import com.ibm.icu.text.MessageFormat; - /** * UIElementTreeBuilderHelper provides methods to convert an Element (XML) into * UIElement. The UIElement can be a simple UI Widget or a group. @@ -128,14 +127,14 @@ public class UIElementTreeBuilderHelper implements IUIElementTreeBuilderHelper { if (label == null || value == null) { String msg = MessageFormat.format( Messages.getString("UIElementTreeBuilderHelper.InvalidEmptyLabel"), //$NON-NLS-1$ - new Object[] { id }); + id); CUIPlugin.log(TEMPLATE_ENGINE_ERROR, new CoreException(new Status(IStatus.ERROR, CUIPlugin.PLUGIN_ID, msg))); } else { if (value2name.put(value, label) != null) { String msg = MessageFormat.format( Messages.getString("UIElementTreeBuilderHelper.InvalidNonUniqueValue"), //$NON-NLS-1$ - new Object[] { value, id }); + value, id); CUIPlugin.log(TEMPLATE_ENGINE_ERROR, new CoreException(new Status(IStatus.ERROR, CUIPlugin.PLUGIN_ID, msg))); } @@ -162,7 +161,7 @@ public class UIElementTreeBuilderHelper implements IUIElementTreeBuilderHelper { // for generating UI pages as TABS in a single page. } else { String msg = MessageFormat.format(Messages.getString("UIElementTreeBuilderHelper.UnknownWidgetType0"), //$NON-NLS-1$ - new Object[] { type }); + type); CUIPlugin.log(TEMPLATE_ENGINE_ERROR, new CoreException(new Status(IStatus.ERROR, CUIPlugin.PLUGIN_ID, msg))); } diff --git a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UISelectWidget.java b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UISelectWidget.java index bbb9d35beaa..84ef797f46a 100644 --- a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UISelectWidget.java +++ b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UISelectWidget.java @@ -13,6 +13,7 @@ *******************************************************************************/ package org.eclipse.cdt.ui.templateengine.uitree.uiwidgets; +import java.text.MessageFormat; import java.util.HashMap; import java.util.Map; @@ -30,8 +31,6 @@ import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; -import com.ibm.icu.text.MessageFormat; - /** * This gives a Label and Combo widget. */ diff --git a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UIStringListWidget.java b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UIStringListWidget.java index e2f6185f7a4..a1063feaa79 100644 --- a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UIStringListWidget.java +++ b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UIStringListWidget.java @@ -14,6 +14,7 @@ package org.eclipse.cdt.ui.templateengine.uitree.uiwidgets; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -34,8 +35,6 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; -import com.ibm.icu.text.MessageFormat; - /** * This gives a Label and StringList Widget. * diff --git a/debug/org.eclipse.cdt.debug.core/META-INF/MANIFEST.MF b/debug/org.eclipse.cdt.debug.core/META-INF/MANIFEST.MF index dcc27bc7970..4b165ab9e48 100644 --- a/debug/org.eclipse.cdt.debug.core/META-INF/MANIFEST.MF +++ b/debug/org.eclipse.cdt.debug.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.cdt.debug.core; singleton:=true -Bundle-Version: 8.4.0.qualifier +Bundle-Version: 8.4.100.qualifier Bundle-Activator: org.eclipse.cdt.debug.core.CDebugCorePlugin Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -47,5 +47,4 @@ Require-Bundle: org.eclipse.cdt.core;bundle-version="[5.0.0,7.0.0)", org.eclipse.launchbar.core;bundle-version="2.0.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: com.ibm.icu.text Automatic-Module-Name: org.eclipse.cdt.debug.core diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDebugUtils.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDebugUtils.java index 1702cec334d..8541f7b11ea 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDebugUtils.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDebugUtils.java @@ -21,6 +21,7 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.nio.charset.Charset; import java.nio.charset.CharsetDecoder; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -64,8 +65,6 @@ import org.eclipse.debug.core.model.IBreakpoint; import org.osgi.service.prefs.BackingStoreException; import org.w3c.dom.Document; -import com.ibm.icu.text.MessageFormat; - /** * Utility methods. */ @@ -442,7 +441,7 @@ public class CDebugUtils { if (lineNumber > 0) { label.append(' '); label.append(MessageFormat.format(DebugCoreMessages.getString("CDebugUtils.0"), //$NON-NLS-1$ - (Object[]) new String[] { Integer.toString(lineNumber) })); + Integer.toString(lineNumber))); } return label; } @@ -452,7 +451,7 @@ public class CDebugUtils { try { label.append(' '); label.append(MessageFormat.format(DebugCoreMessages.getString("CDebugUtils.1"), //$NON-NLS-1$ - (Object[]) new String[] { breakpoint.getAddress() })); + breakpoint.getAddress())); } catch (NumberFormatException e) { } return label; @@ -464,7 +463,7 @@ public class CDebugUtils { if (function != null && function.trim().length() > 0) { label.append(' '); label.append(MessageFormat.format(DebugCoreMessages.getString("CDebugUtils.2"), //$NON-NLS-1$ - (Object[]) new String[] { function.trim() })); + function.trim())); } return label; } @@ -477,7 +476,7 @@ public class CDebugUtils { if (printfStr != null && printfStr.length() > 0) { buffer.append(' '); buffer.append(MessageFormat.format(DebugCoreMessages.getString("CDebugUtils.printfString"), //$NON-NLS-1$ - (Object[]) new String[] { printfStr })); + printfStr)); } } @@ -486,7 +485,7 @@ public class CDebugUtils { if (ignoreCount > 0) { label.append(' '); label.append(MessageFormat.format(DebugCoreMessages.getString("CDebugUtils.3"), //$NON-NLS-1$ - (Object[]) new String[] { Integer.toString(ignoreCount) })); + Integer.toString(ignoreCount))); } return label; } @@ -496,7 +495,7 @@ public class CDebugUtils { if (condition != null && condition.length() > 0) { buffer.append(' '); buffer.append(MessageFormat.format(DebugCoreMessages.getString("CDebugUtils.4"), //$NON-NLS-1$ - (Object[]) new String[] { condition })); + condition)); } } @@ -505,7 +504,7 @@ public class CDebugUtils { if (expression != null && expression.length() > 0) { label.append(' '); label.append(MessageFormat.format(DebugCoreMessages.getString("CDebugUtils.5"), //$NON-NLS-1$ - (Object[]) new String[] { expression })); + expression)); } } @@ -514,7 +513,7 @@ public class CDebugUtils { if (memorySpace != null && memorySpace.length() > 0) { label.append(' '); label.append(MessageFormat.format(DebugCoreMessages.getString("CDebugUtils.6"), //$NON-NLS-1$ - (Object[]) new String[] { memorySpace })); + memorySpace)); } } @@ -523,7 +522,7 @@ public class CDebugUtils { if (range.length() > 0 && !range.equals("0")) { //$NON-NLS-1$ label.append(' '); label.append(MessageFormat.format(DebugCoreMessages.getString("CDebugUtils.7"), //$NON-NLS-1$ - (Object[]) new String[] { range })); + range)); } } @@ -557,7 +556,7 @@ public class CDebugUtils { if (typeString.length() > 0) { label.append(' '); label.append(MessageFormat.format(DebugCoreMessages.getString("CDebugUtils.8"), //$NON-NLS-1$ - (Object[]) new String[] { typeString })); + typeString)); } } return label; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/DebugCoreMessages.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/DebugCoreMessages.java index 8de8801dbe3..44cddcfec68 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/DebugCoreMessages.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/DebugCoreMessages.java @@ -13,11 +13,10 @@ *******************************************************************************/ package org.eclipse.cdt.debug.core; +import java.text.MessageFormat; import java.util.MissingResourceException; import java.util.ResourceBundle; -import com.ibm.icu.text.MessageFormat; - public class DebugCoreMessages { private static final String BUNDLE_NAME = "org.eclipse.cdt.debug.core.DebugCoreMessages";//$NON-NLS-1$ @@ -28,7 +27,7 @@ public class DebugCoreMessages { } static String getFormattedString(String key, String arg) { - return MessageFormat.format(getString(key), new Object[] { arg }); + return MessageFormat.format(getString(key), arg); } static String getFormattedString(String key, String[] args) { diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/BreakpointProblems.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/BreakpointProblems.java index 035cc5cd504..528b24c3fee 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/BreakpointProblems.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/BreakpointProblems.java @@ -14,6 +14,8 @@ *******************************************************************************/ package org.eclipse.cdt.debug.internal.core.breakpoints; +import java.text.MessageFormat; + import org.eclipse.cdt.core.ProblemMarkerInfo; import org.eclipse.cdt.core.model.ICModelMarker; import org.eclipse.cdt.debug.core.CDebugCorePlugin; @@ -23,8 +25,6 @@ import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; -import com.ibm.icu.text.MessageFormat; - public class BreakpointProblems { /** @@ -44,7 +44,7 @@ public class BreakpointProblems { public static IMarker reportBreakpointMoved(ICBreakpoint breakpoint, int oldLineNumber, int newLineNumber, String contextName, String contextID) throws CoreException { String message = MessageFormat.format(BreakpointMessages.getString("BreakpointProblems_Moved"), //$NON-NLS-1$ - new Object[] { Integer.valueOf(oldLineNumber), Integer.valueOf(newLineNumber) }); + Integer.valueOf(oldLineNumber), Integer.valueOf(newLineNumber)); IMarker marker = BreakpointProblems.reportBreakpointProblem(breakpoint, message, IMarker.SEVERITY_INFO, MOVED, true, false, contextName, contextID); return marker; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CAddressBreakpoint.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CAddressBreakpoint.java index f3659f1c020..e9f47e168ae 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CAddressBreakpoint.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CAddressBreakpoint.java @@ -13,6 +13,7 @@ *******************************************************************************/ package org.eclipse.cdt.debug.internal.core.breakpoints; +import java.text.MessageFormat; import java.util.Map; import org.eclipse.cdt.debug.core.CDebugUtils; @@ -20,8 +21,6 @@ import org.eclipse.cdt.debug.core.model.ICAddressBreakpoint; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; -import com.ibm.icu.text.MessageFormat; - /** * A breakpoint that suspend the execution when a particular address is reached. */ @@ -51,6 +50,6 @@ public class CAddressBreakpoint extends AbstractLineBreakpoint implements ICAddr @Override protected String getMarkerMessage() throws CoreException { return MessageFormat.format(BreakpointMessages.getString("CAddressBreakpoint.0"), //$NON-NLS-1$ - (Object[]) new String[] { CDebugUtils.getBreakpointText(this, false) }); + CDebugUtils.getBreakpointText(this, false)); } } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CAddressDynamicPrintf.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CAddressDynamicPrintf.java index ab2c3768250..59ef33a73a8 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CAddressDynamicPrintf.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CAddressDynamicPrintf.java @@ -13,6 +13,7 @@ *******************************************************************************/ package org.eclipse.cdt.debug.internal.core.breakpoints; +import java.text.MessageFormat; import java.util.Map; import org.eclipse.cdt.debug.core.CDebugUtils; @@ -20,8 +21,6 @@ import org.eclipse.cdt.debug.core.model.ICAddressBreakpoint; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; -import com.ibm.icu.text.MessageFormat; - /** * A DynamicPrintf that prints a message when a particular address is reached. * @@ -47,6 +46,6 @@ public class CAddressDynamicPrintf extends AbstractDynamicPrintf implements ICAd @Override protected String getMarkerMessage() throws CoreException { return MessageFormat.format(BreakpointMessages.getString("CAddressDynamicPrintf.0"), //$NON-NLS-1$ - (Object[]) new String[] { CDebugUtils.getBreakpointText(this, false) }); + CDebugUtils.getBreakpointText(this, false)); } } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CAddressTracepoint.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CAddressTracepoint.java index 6a76e638999..f43b18c28dd 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CAddressTracepoint.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CAddressTracepoint.java @@ -13,6 +13,7 @@ *******************************************************************************/ package org.eclipse.cdt.debug.internal.core.breakpoints; +import java.text.MessageFormat; import java.util.Map; import org.eclipse.cdt.debug.core.CDebugUtils; @@ -20,8 +21,6 @@ import org.eclipse.cdt.debug.core.model.ICAddressBreakpoint; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; -import com.ibm.icu.text.MessageFormat; - /** * A tracepoint that collects data when a particular address is reached. * @@ -53,6 +52,6 @@ public class CAddressTracepoint extends AbstractTracepoint implements ICAddressB @Override protected String getMarkerMessage() throws CoreException { return MessageFormat.format(BreakpointMessages.getString("CAddressTracepoint.0"), //$NON-NLS-1$ - (Object[]) new String[] { CDebugUtils.getBreakpointText(this, false) }); + CDebugUtils.getBreakpointText(this, false)); } } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CBreakpoint.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CBreakpoint.java index 1a1af9adb0e..39b1fe4a100 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CBreakpoint.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CBreakpoint.java @@ -14,6 +14,7 @@ *******************************************************************************/ package org.eclipse.cdt.debug.internal.core.breakpoints; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -44,8 +45,6 @@ import org.eclipse.debug.core.DebugPlugin; import org.eclipse.debug.core.IDebugEventSetListener; import org.eclipse.debug.core.model.Breakpoint; -import com.ibm.icu.text.MessageFormat; - /** * The base class for all C/C++ specific breakpoints. */ @@ -237,12 +236,11 @@ public abstract class CBreakpoint extends Breakpoint StringBuilder sb = new StringBuilder(); int ignoreCount = getIgnoreCount(); if (ignoreCount > 0) { - sb.append( - MessageFormat.format(BreakpointMessages.getString("CBreakpoint.1"), new Object[] { ignoreCount })); //$NON-NLS-1$ + sb.append(MessageFormat.format(BreakpointMessages.getString("CBreakpoint.1"), ignoreCount)); //$NON-NLS-1$ } String condition = getCondition(); if (condition != null && condition.length() > 0) { - sb.append(MessageFormat.format(BreakpointMessages.getString("CBreakpoint.2"), new Object[] { condition })); //$NON-NLS-1$ + sb.append(MessageFormat.format(BreakpointMessages.getString("CBreakpoint.2"), condition)); //$NON-NLS-1$ } return sb.toString(); } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CFunctionBreakpoint.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CFunctionBreakpoint.java index 84e379fb7ed..55e1f222953 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CFunctionBreakpoint.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CFunctionBreakpoint.java @@ -13,6 +13,7 @@ *******************************************************************************/ package org.eclipse.cdt.debug.internal.core.breakpoints; +import java.text.MessageFormat; import java.util.Map; import org.eclipse.cdt.debug.core.CDebugUtils; @@ -20,8 +21,6 @@ import org.eclipse.cdt.debug.core.model.ICFunctionBreakpoint; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; -import com.ibm.icu.text.MessageFormat; - /** * A breakpoint that suspends the execution when a function is entered. */ @@ -54,6 +53,6 @@ public class CFunctionBreakpoint extends AbstractLineBreakpoint implements ICFun @Override protected String getMarkerMessage() throws CoreException { return MessageFormat.format(BreakpointMessages.getString("CFunctionBreakpoint.0"), //$NON-NLS-1$ - (Object[]) new String[] { CDebugUtils.getBreakpointText(this, false) }); + CDebugUtils.getBreakpointText(this, false)); } } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CFunctionDynamicPrintf.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CFunctionDynamicPrintf.java index 1a8b346e943..257e1238729 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CFunctionDynamicPrintf.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CFunctionDynamicPrintf.java @@ -13,6 +13,7 @@ *******************************************************************************/ package org.eclipse.cdt.debug.internal.core.breakpoints; +import java.text.MessageFormat; import java.util.Map; import org.eclipse.cdt.debug.core.CDebugUtils; @@ -20,8 +21,6 @@ import org.eclipse.cdt.debug.core.model.ICFunctionBreakpoint; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; -import com.ibm.icu.text.MessageFormat; - /** * A DynamicPrintf that collects data when a function is entered. * @@ -47,6 +46,6 @@ public class CFunctionDynamicPrintf extends AbstractDynamicPrintf implements ICF @Override protected String getMarkerMessage() throws CoreException { return MessageFormat.format(BreakpointMessages.getString("CFunctionDynamicPrintf.0"), //$NON-NLS-1$ - (Object[]) new String[] { CDebugUtils.getBreakpointText(this, false) }); + CDebugUtils.getBreakpointText(this, false)); } } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CFunctionTracepoint.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CFunctionTracepoint.java index 0cc8b35a279..ecbcb9f327c 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CFunctionTracepoint.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CFunctionTracepoint.java @@ -13,6 +13,7 @@ *******************************************************************************/ package org.eclipse.cdt.debug.internal.core.breakpoints; +import java.text.MessageFormat; import java.util.Map; import org.eclipse.cdt.debug.core.CDebugUtils; @@ -20,8 +21,6 @@ import org.eclipse.cdt.debug.core.model.ICFunctionBreakpoint; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; -import com.ibm.icu.text.MessageFormat; - /** * A tracepoint that collects data when a function is entered. * @@ -53,6 +52,6 @@ public class CFunctionTracepoint extends AbstractTracepoint implements ICFunctio @Override protected String getMarkerMessage() throws CoreException { return MessageFormat.format(BreakpointMessages.getString("CFunctionTracepoint.0"), //$NON-NLS-1$ - (Object[]) new String[] { CDebugUtils.getBreakpointText(this, false) }); + CDebugUtils.getBreakpointText(this, false)); } } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CLineBreakpoint.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CLineBreakpoint.java index 011feb78272..7938b922b44 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CLineBreakpoint.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CLineBreakpoint.java @@ -13,6 +13,7 @@ *******************************************************************************/ package org.eclipse.cdt.debug.internal.core.breakpoints; +import java.text.MessageFormat; import java.util.Map; import org.eclipse.cdt.debug.core.CDebugUtils; @@ -22,8 +23,6 @@ import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; -import com.ibm.icu.text.MessageFormat; - /** * A breakpoint that suspends the execution when a particular line of code is * reached. @@ -69,10 +68,10 @@ public class CLineBreakpoint extends AbstractLineBreakpoint { if (bp_line != bp_request_line || (bp_file == null && bp_reqest_file != null) || (bp_file != null && !bp_file.equals(bp_reqest_file))) { return MessageFormat.format(BreakpointMessages.getString("CLineBreakpoint.1"), //$NON-NLS-1$ - (Object[]) new String[] { CDebugUtils.getBreakpointText(this, false) }); + CDebugUtils.getBreakpointText(this, false)); } else { return MessageFormat.format(BreakpointMessages.getString("CLineBreakpoint.0"), //$NON-NLS-1$ - (Object[]) new String[] { CDebugUtils.getBreakpointText(this, false) }); + CDebugUtils.getBreakpointText(this, false)); } } } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CLineDynamicPrintf.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CLineDynamicPrintf.java index 583f1b193ea..36f8fa1544e 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CLineDynamicPrintf.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CLineDynamicPrintf.java @@ -13,6 +13,7 @@ *******************************************************************************/ package org.eclipse.cdt.debug.internal.core.breakpoints; +import java.text.MessageFormat; import java.util.Map; import org.eclipse.cdt.debug.core.CDebugUtils; @@ -22,8 +23,6 @@ import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; -import com.ibm.icu.text.MessageFormat; - /** * A DynamicPrintf that prints a string when a particular line of code is reached. * @@ -61,10 +60,10 @@ public class CLineDynamicPrintf extends AbstractDynamicPrintf { if (bp_line != bp_request_line || (bp_file == null && bp_reqest_file != null) || (bp_file != null && !bp_file.equals(bp_reqest_file))) { return MessageFormat.format(BreakpointMessages.getString("CLineDynamicPrintf.1"), //$NON-NLS-1$ - (Object[]) new String[] { CDebugUtils.getBreakpointText(this, false) }); + CDebugUtils.getBreakpointText(this, false)); } else { return MessageFormat.format(BreakpointMessages.getString("CLineDynamicPrintf.0"), //$NON-NLS-1$ - (Object[]) new String[] { CDebugUtils.getBreakpointText(this, false) }); + CDebugUtils.getBreakpointText(this, false)); } } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CLineTracepoint.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CLineTracepoint.java index 5c2bfb8ddd7..88b02ddf4e5 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CLineTracepoint.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CLineTracepoint.java @@ -13,6 +13,7 @@ *******************************************************************************/ package org.eclipse.cdt.debug.internal.core.breakpoints; +import java.text.MessageFormat; import java.util.Map; import org.eclipse.cdt.debug.core.CDebugUtils; @@ -22,8 +23,6 @@ import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; -import com.ibm.icu.text.MessageFormat; - /** * A tracepoint that collects data when a particular line of code is reached. * @@ -66,7 +65,7 @@ public class CLineTracepoint extends AbstractTracepoint implements ICLineBreakpo @Override protected String getMarkerMessage() throws CoreException { return MessageFormat.format(BreakpointMessages.getString("CLineTracepoint.0"), //$NON-NLS-1$ - (Object[]) new String[] { CDebugUtils.getBreakpointText(this, false) }); + CDebugUtils.getBreakpointText(this, false)); } @Override diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CWatchpoint.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CWatchpoint.java index c475621c429..f90509fd80f 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CWatchpoint.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CWatchpoint.java @@ -15,6 +15,7 @@ package org.eclipse.cdt.debug.internal.core.breakpoints; import java.math.BigInteger; +import java.text.MessageFormat; import java.util.Map; import org.eclipse.cdt.debug.core.CDebugUtils; @@ -23,8 +24,6 @@ import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; -import com.ibm.icu.text.MessageFormat; - /** * A watchpoint specific to the C/C++ debug model. */ @@ -84,7 +83,7 @@ public class CWatchpoint extends CBreakpoint implements ICWatchpoint2 { format = BreakpointMessages.getString("CWatchpoint.1"); //$NON-NLS-1$ else if (isWriteType() && isReadType()) format = BreakpointMessages.getString("CWatchpoint.2"); //$NON-NLS-1$ - return MessageFormat.format(format, new Object[] { CDebugUtils.getBreakpointText(this, false) }); + return MessageFormat.format(format, CDebugUtils.getBreakpointText(this, false)); } /* (non-Javadoc) diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CSourceLocator.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CSourceLocator.java index 862fd925185..1215c53cf66 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CSourceLocator.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CSourceLocator.java @@ -15,6 +15,7 @@ package org.eclipse.cdt.debug.internal.core.sourcelookup; import java.io.IOException; import java.io.StringReader; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; @@ -56,8 +57,6 @@ import org.w3c.dom.NodeList; import org.xml.sax.InputSource; import org.xml.sax.SAXException; -import com.ibm.icu.text.MessageFormat; - /** * Default source locator. */ @@ -348,8 +347,8 @@ public class CSourceLocator implements ICSourceLocator, IPersistableSourceLocato try { clazz = bundle.loadClass(className); } catch (ClassNotFoundException e) { - CDebugCorePlugin.log(MessageFormat.format( - "Unable to restore source location - class not found {0}", new Object[] { className })); //$NON-NLS-1$ + CDebugCorePlugin.log(MessageFormat + .format("Unable to restore source location - class not found {0}", className)); //$NON-NLS-1$ continue; } ICSourceLocation location = null; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/MapEntrySourceContainer.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/MapEntrySourceContainer.java index 1fa73a87f51..76c6d28ff44 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/MapEntrySourceContainer.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/MapEntrySourceContainer.java @@ -15,6 +15,7 @@ package org.eclipse.cdt.debug.internal.core.sourcelookup; import java.io.File; import java.io.IOException; +import java.text.MessageFormat; import java.util.ArrayList; import org.eclipse.cdt.core.model.CoreModel; @@ -33,8 +34,6 @@ import org.eclipse.debug.core.sourcelookup.ISourceLookupDirector; import org.eclipse.debug.core.sourcelookup.containers.AbstractSourceContainer; import org.eclipse.debug.core.sourcelookup.containers.LocalFileStorage; -import com.ibm.icu.text.MessageFormat; - /** * The source container that maps a backend path to the local filesystem path. */ @@ -200,7 +199,7 @@ public class MapEntrySourceContainer extends AbstractSourceContainer { @Override public String getName() { - return MessageFormat.format("{0} - {1}", new Object[] { getBackendPathStr(), getLocalPath().toOSString() }); //$NON-NLS-1$ + return MessageFormat.format("{0} - {1}", getBackendPathStr(), getLocalPath().toOSString()); //$NON-NLS-1$ } @Override diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/SourceUtils.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/SourceUtils.java index 83690389960..5ada3274269 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/SourceUtils.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/SourceUtils.java @@ -17,6 +17,7 @@ package org.eclipse.cdt.debug.internal.core.sourcelookup; import java.io.File; import java.io.IOException; import java.io.StringReader; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.HashSet; import java.util.LinkedList; @@ -62,8 +63,6 @@ import org.w3c.dom.NodeList; import org.xml.sax.InputSource; import org.xml.sax.SAXException; -import com.ibm.icu.text.MessageFormat; - public class SourceUtils { private static final String NAME_COMMON_SOURCE_LOCATIONS = "commonSourceLocations"; //$NON-NLS-1$ private static final String NAME_SOURCE_LOCATION = "sourceLocation"; //$NON-NLS-1$ @@ -151,7 +150,7 @@ public class SourceUtils { } catch (ClassNotFoundException e) { CDebugCorePlugin .log(MessageFormat.format("Unable to restore source location - class not found {0}", //$NON-NLS-1$ - (Object[]) new String[] { className })); + className)); continue; } ICSourceLocation location = null; diff --git a/debug/org.eclipse.cdt.debug.ui/META-INF/MANIFEST.MF b/debug/org.eclipse.cdt.debug.ui/META-INF/MANIFEST.MF index 24487a50110..3821d26d36e 100644 --- a/debug/org.eclipse.cdt.debug.ui/META-INF/MANIFEST.MF +++ b/debug/org.eclipse.cdt.debug.ui/META-INF/MANIFEST.MF @@ -61,5 +61,4 @@ Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.16.0,4.0.0)", org.eclipse.launchbar.ui;bundle-version="2.0.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: com.ibm.icu.text Automatic-Module-Name: org.eclipse.cdt.debug.ui diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugModelPresentation.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugModelPresentation.java index 50f266f578a..b0394099517 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugModelPresentation.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugModelPresentation.java @@ -20,6 +20,7 @@ package org.eclipse.cdt.debug.internal.ui; import java.io.File; import java.net.URI; +import java.text.MessageFormat; import java.util.HashMap; import org.eclipse.cdt.core.IAddress; @@ -97,8 +98,6 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.ui.ide.IDE; import org.eclipse.ui.part.FileEditorInput; -import com.ibm.icu.text.MessageFormat; - /** * @see IDebugModelPresentation */ diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugUIUtils.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugUIUtils.java index 1f4a34ff3e7..ed89429c0bb 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugUIUtils.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugUIUtils.java @@ -15,6 +15,7 @@ package org.eclipse.cdt.debug.internal.ui; import java.net.URI; +import java.text.MessageFormat; import java.util.Iterator; import org.eclipse.cdt.debug.core.model.ICBreakpoint; @@ -66,8 +67,6 @@ import org.eclipse.ui.progress.UIJob; import org.eclipse.ui.texteditor.ITextEditor; import org.eclipse.ui.texteditor.SimpleMarkerAnnotation; -import com.ibm.icu.text.MessageFormat; - /** * Utility methods for C/C++ Debug UI. */ @@ -129,7 +128,7 @@ public class CDebugUIUtils { StringBuilder label = new StringBuilder(); if (value instanceof ICDebugElementStatus && !((ICDebugElementStatus) value).isOK()) { label.append(MessageFormat.format(CDebugUIMessages.getString("CDTDebugModelPresentation.4"), //$NON-NLS-1$ - (Object[]) new String[] { ((ICDebugElementStatus) value).getMessage() })); + ((ICDebugElementStatus) value).getMessage())); } else if (value instanceof ICValue) { ICType type = null; try { diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RegisterGroupDialog.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RegisterGroupDialog.java index 31e8a8b2818..57e22af43a9 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RegisterGroupDialog.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RegisterGroupDialog.java @@ -13,6 +13,7 @@ *******************************************************************************/ package org.eclipse.cdt.debug.internal.ui.actions; +import java.text.MessageFormat; import java.util.Arrays; import java.util.List; @@ -40,8 +41,6 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.PlatformUI; -import com.ibm.icu.text.MessageFormat; - /** * This dialog is used to add/edit user-defined register groups. */ @@ -61,7 +60,7 @@ public class RegisterGroupDialog extends TitleAreaDialog { public String getText(Object element) { if (element instanceof IRegisterDescriptor) { IRegisterDescriptor rd = (IRegisterDescriptor) element; - return MessageFormat.format("{0} - {1}", new Object[] { rd.getName(), rd.getGroupName() }); //$NON-NLS-1$ + return MessageFormat.format("{0} - {1}", rd.getName(), rd.getGroupName()); //$NON-NLS-1$ } return super.getText(element); } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/launch/LaunchMessages.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/launch/LaunchMessages.java index b1ad4ec1d2b..dbcc2eaa455 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/launch/LaunchMessages.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/launch/LaunchMessages.java @@ -13,11 +13,10 @@ *******************************************************************************/ package org.eclipse.cdt.debug.internal.ui.launch; +import java.text.MessageFormat; import java.util.MissingResourceException; import java.util.ResourceBundle; -import com.ibm.icu.text.MessageFormat; - public class LaunchMessages { private static final String BUNDLE_NAME = "org.eclipse.cdt.debug.internal.ui.launch.LaunchMessages";//$NON-NLS-1$ private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME); @@ -26,7 +25,7 @@ public class LaunchMessages { } public static String getFormattedString(String key, String arg) { - return MessageFormat.format(getString(key), new Object[] { arg }); + return MessageFormat.format(getString(key), arg); } public static String getFormattedString(String key, String[] args) { diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/propertypages/SignalPropertyPage.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/propertypages/SignalPropertyPage.java index 7835a949a60..d0915a6715d 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/propertypages/SignalPropertyPage.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/propertypages/SignalPropertyPage.java @@ -13,6 +13,8 @@ *******************************************************************************/ package org.eclipse.cdt.debug.internal.ui.propertypages; +import java.text.MessageFormat; + import org.eclipse.cdt.debug.core.CDIDebugModel; import org.eclipse.cdt.debug.core.CDebugUtils; import org.eclipse.cdt.debug.core.model.ICSignal; @@ -33,8 +35,6 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; import org.eclipse.ui.dialogs.PropertyPage; -import com.ibm.icu.text.MessageFormat; - /** * The property page for a signal. */ @@ -60,7 +60,7 @@ public class SignalPropertyPage extends PropertyPage { String description = getSignal().getDescription(); Label label = new Label(composite, SWT.WRAP); label.setText(MessageFormat.format(PropertyPageMessages.getString("SignalPropertyPage.0"), //$NON-NLS-1$ - new Object[] { description })); + description)); GridData data = new GridData( GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_CENTER); data.widthHint = convertHorizontalDLUsToPixels(IDialogConstants.MINIMUM_MESSAGE_AREA_WIDTH); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/ExecutablesContentProvider.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/ExecutablesContentProvider.java index 0898e7d8ac6..3c21bd389b6 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/ExecutablesContentProvider.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/ExecutablesContentProvider.java @@ -14,6 +14,7 @@ package org.eclipse.cdt.debug.internal.ui.views.executables; +import java.text.DateFormat; import java.util.Date; import java.util.List; @@ -31,8 +32,6 @@ import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerCell; import org.eclipse.ui.progress.WorkbenchJob; -import com.ibm.icu.text.DateFormat; - class ExecutablesContentProvider extends ColumnLabelProvider implements ITreeContentProvider, IExecutablesChangeListener { diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/SourceFilesLabelProvider.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/SourceFilesLabelProvider.java index c3581dfa31c..e8cf86d07b5 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/SourceFilesLabelProvider.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/SourceFilesLabelProvider.java @@ -14,6 +14,7 @@ package org.eclipse.cdt.debug.internal.ui.views.executables; +import java.text.DateFormat; import java.util.Date; import java.util.List; @@ -33,8 +34,6 @@ import org.eclipse.swt.events.DisposeListener; import org.eclipse.swt.graphics.Font; import org.eclipse.swt.widgets.Display; -import com.ibm.icu.text.DateFormat; - public class SourceFilesLabelProvider extends TreeColumnViewerLabelProvider implements IExecutablesChangeListener { private SourceFilesViewer viewer; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ExternalToolAction.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ExternalToolAction.java index b664c08d21a..46844ab3781 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ExternalToolAction.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ExternalToolAction.java @@ -15,6 +15,7 @@ package org.eclipse.cdt.debug.ui.breakpointactions; import java.io.ByteArrayOutputStream; import java.io.StringReader; +import java.text.MessageFormat; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; @@ -45,8 +46,6 @@ import org.w3c.dom.Element; import org.xml.sax.InputSource; import org.xml.sax.helpers.DefaultHandler; -import com.ibm.icu.text.MessageFormat; - public class ExternalToolAction extends AbstractBreakpointAction { private String externalToolName = ""; //$NON-NLS-1$ @@ -87,7 +86,7 @@ public class ExternalToolAction extends AbstractBreakpointAction { } if (!launched) { String errorMsg = MessageFormat.format(Messages.getString("ExternalToolAction.error.0"), //$NON-NLS-1$ - new Object[] { externalToolName }); + externalToolName); errorStatus = new Status(IStatus.ERROR, CDIDebugModel.getPluginIdentifier(), ICDebugInternalConstants.STATUS_CODE_ERROR, errorMsg, null); } @@ -101,7 +100,7 @@ public class ExternalToolAction extends AbstractBreakpointAction { if (errorStatus != null) { String errorMsg = MessageFormat.format(Messages.getString("ExternalToolAction.error.1"), //$NON-NLS-1$ - new Object[] { externalToolName }); + externalToolName); MultiStatus ms = new MultiStatus(CDIDebugModel.getPluginIdentifier(), ICDebugInternalConstants.STATUS_CODE_ERROR, errorMsg, null); ms.add(errorStatus); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/LogAction.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/LogAction.java index 092ccd34e06..de31ebc5f22 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/LogAction.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/LogAction.java @@ -15,6 +15,7 @@ package org.eclipse.cdt.debug.ui.breakpointactions; import java.io.ByteArrayOutputStream; import java.io.StringReader; +import java.text.MessageFormat; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; @@ -42,8 +43,6 @@ import org.w3c.dom.Element; import org.xml.sax.InputSource; import org.xml.sax.helpers.DefaultHandler; -import com.ibm.icu.text.MessageFormat; - public class LogAction extends AbstractBreakpointAction { private String message = ""; //$NON-NLS-1$ @@ -76,7 +75,7 @@ public class LogAction extends AbstractBreakpointAction { stream.close(); } catch (Exception e) { String errorMsg = MessageFormat.format(Messages.getString("LogAction.error.0"), //$NON-NLS-1$ - new Object[] { getSummary() }); + getSummary()); result = new Status(IStatus.ERROR, CDIDebugModel.getPluginIdentifier(), ICDebugInternalConstants.STATUS_CODE_ERROR, errorMsg, e); } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ResumeAction.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ResumeAction.java index 47d3323abdf..4533b79a938 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ResumeAction.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ResumeAction.java @@ -15,6 +15,7 @@ package org.eclipse.cdt.debug.ui.breakpointactions; import java.io.ByteArrayOutputStream; import java.io.StringReader; +import java.text.MessageFormat; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; @@ -41,8 +42,6 @@ import org.w3c.dom.Element; import org.xml.sax.InputSource; import org.xml.sax.helpers.DefaultHandler; -import com.ibm.icu.text.MessageFormat; - public class ResumeAction extends AbstractBreakpointAction { final static int INCRIMENT_MSEC = 100; @@ -62,7 +61,7 @@ public class ResumeAction extends AbstractBreakpointAction { long currentTime = System.currentTimeMillis(); while (!monitor.isCanceled() && currentTime < endTime) { monitor.setTaskName(MessageFormat.format(Messages.getString("ResumeAction.SummaryResumeTime"), //$NON-NLS-1$ - new Object[] { Long.valueOf((endTime - currentTime) / 1000) })); //) + Long.valueOf((endTime - currentTime) / 1000))); //) monitor.worked(1); Thread.sleep(INCRIMENT_MSEC); currentTime = System.currentTimeMillis(); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/SoundAction.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/SoundAction.java index 5f0963b84ec..fa7a4a391de 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/SoundAction.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/SoundAction.java @@ -17,6 +17,7 @@ import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; import java.io.StringReader; +import java.text.MessageFormat; import javax.sound.sampled.AudioFormat; import javax.sound.sampled.AudioInputStream; @@ -46,8 +47,6 @@ import org.w3c.dom.Element; import org.xml.sax.InputSource; import org.xml.sax.helpers.DefaultHandler; -import com.ibm.icu.text.MessageFormat; - public class SoundAction extends AbstractBreakpointAction { static public void playSoundFile(final File soundFile) { @@ -104,7 +103,7 @@ public class SoundAction extends AbstractBreakpointAction { public IStatus execute(IBreakpoint breakpoint, IAdaptable context, IProgressMonitor monitor) { if (soundFile == null || !soundFile.exists()) { String errorMsg = MessageFormat.format(Messages.getString("SoundAction.error.0"), //$NON-NLS-1$ - new Object[] { getSummary() }); + getSummary()); return new Status(IStatus.ERROR, CDIDebugModel.getPluginIdentifier(), ICDebugInternalConstants.STATUS_CODE_ERROR, errorMsg, null); } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/CEventBreakpointsLabelProviderFactory.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/CEventBreakpointsLabelProviderFactory.java index 857dd821cd7..9f5667ea4f6 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/CEventBreakpointsLabelProviderFactory.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/CEventBreakpointsLabelProviderFactory.java @@ -15,6 +15,7 @@ *******************************************************************************/ package org.eclipse.cdt.debug.ui.breakpoints; +import java.text.MessageFormat; import java.util.Arrays; import org.eclipse.cdt.debug.core.DebugCoreMessages; @@ -30,8 +31,6 @@ import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.swt.graphics.Image; -import com.ibm.icu.text.MessageFormat; - /** * Factory for event breakpoint label provider */ @@ -103,7 +102,7 @@ public class CEventBreakpointsLabelProviderFactory implements IAdapterFactory { if (ignoreCount > 0) { label.append(' '); label.append(MessageFormat.format(DebugCoreMessages.getString("CDebugUtils.3"), //$NON-NLS-1$ - new Object[] { Integer.toString(ignoreCount) })); + Integer.toString(ignoreCount))); } return label; } @@ -112,8 +111,7 @@ public class CEventBreakpointsLabelProviderFactory implements IAdapterFactory { String condition = breakpoint.getCondition(); if (condition != null && condition.length() > 0) { buffer.append(' '); - buffer.append( - MessageFormat.format(DebugCoreMessages.getString("CDebugUtils.4"), new Object[] { condition })); //$NON-NLS-1$ + buffer.append(MessageFormat.format(DebugCoreMessages.getString("CDebugUtils.4"), condition)); //$NON-NLS-1$ } } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/disassembly/rulers/RulerColumnRegistry.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/disassembly/rulers/RulerColumnRegistry.java index a0868d93233..8af95916248 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/disassembly/rulers/RulerColumnRegistry.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/disassembly/rulers/RulerColumnRegistry.java @@ -14,6 +14,7 @@ *******************************************************************************/ package org.eclipse.cdt.debug.ui.disassembly.rulers; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -41,8 +42,6 @@ import org.eclipse.ui.internal.texteditor.rulers.RulerColumnMessages; import org.eclipse.ui.internal.texteditor.rulers.RulerColumnPlacementConstraint; import org.eclipse.ui.texteditor.ConfigurationElementSorter; -import com.ibm.icu.text.MessageFormat; - /** * A registry for all extensions to the * rulerColumns extension point. @@ -268,25 +267,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) }); + 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() }); + 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() }); + 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() }); + QUALIFIED_EXTENSION_POINT, desc.getId(), desc.getContributor()); warnUser(message, null); } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/sourcelookup/OldDefaultSourceLocator.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/sourcelookup/OldDefaultSourceLocator.java index 29775459fdd..6aa370a7e19 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/sourcelookup/OldDefaultSourceLocator.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/sourcelookup/OldDefaultSourceLocator.java @@ -15,6 +15,7 @@ package org.eclipse.cdt.debug.ui.sourcelookup; import java.io.IOException; import java.io.StringReader; +import java.text.MessageFormat; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; @@ -41,8 +42,6 @@ import org.w3c.dom.Element; import org.xml.sax.InputSource; import org.xml.sax.SAXException; -import com.ibm.icu.text.MessageFormat; - /** * Old default source locator. We keep it for migration purposes. */ @@ -129,7 +128,7 @@ public class OldDefaultSourceLocator implements IPersistableSourceLocator, IAdap return; if (project == null || !project.exists() || !project.isOpen()) abort(MessageFormat.format(SourceLookupMessages.getString("OldDefaultSourceLocator.4"), //$NON-NLS-1$ - new Object[] { projectName }), null); + projectName), null); IPersistableSourceLocator psl = getPersistableSourceLocator(); if (psl != null) psl.initializeFromMemento(data); diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/META-INF/MANIFEST.MF b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/META-INF/MANIFEST.MF index 1f003b0b1d8..29471e33f38 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/META-INF/MANIFEST.MF +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/META-INF/MANIFEST.MF @@ -19,7 +19,6 @@ Require-Bundle: org.eclipse.ui, org.eclipse.cdt.debug.ui Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: com.ibm.icu.text Export-Package: org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui;x-internal:=true, org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.actions;x-internal:=true, org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.model;x-internal:=true, diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/META-INF/MANIFEST.MF b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/META-INF/MANIFEST.MF index 22143a60767..3bd66eba5f2 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/META-INF/MANIFEST.MF +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/META-INF/MANIFEST.MF @@ -51,5 +51,4 @@ Export-Package: org.eclipse.cdt.dsf.gdb.internal.ui;x-friends:="org.eclipse.cdt. org.eclipse.cdt.dsf.gdb.internal.ui.viewmodel.breakpoints;x-internal:=true, org.eclipse.cdt.dsf.gdb.internal.ui.viewmodel.commands;x-internal:=true, org.eclipse.cdt.dsf.gdb.internal.ui.viewmodel.launch;x-internal:=true -Import-Package: com.ibm.icu.text Automatic-Module-Name: org.eclipse.cdt.dsf.gdb.ui diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/LaunchUIMessages.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/LaunchUIMessages.java index da7d91e0d97..07968585c74 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/LaunchUIMessages.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/LaunchUIMessages.java @@ -13,11 +13,10 @@ *******************************************************************************/ package org.eclipse.cdt.dsf.gdb.internal.ui.launching; +import java.text.MessageFormat; import java.util.MissingResourceException; import java.util.ResourceBundle; -import com.ibm.icu.text.MessageFormat; - public class LaunchUIMessages { private static final String BUNDLE_NAME = "org.eclipse.cdt.dsf.gdb.internal.ui.launching.LaunchUIMessages";//$NON-NLS-1$ @@ -35,7 +34,7 @@ public class LaunchUIMessages { } public static String getFormattedString(String key, String arg) { - return MessageFormat.format(getString(key), new Object[] { arg }); + return MessageFormat.format(getString(key), arg); } public static String getFormattedString(String key, String[] args) { diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/ProcessPrompter.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/ProcessPrompter.java index 770db858d63..eb8a5b1e800 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/ProcessPrompter.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/ProcessPrompter.java @@ -15,6 +15,7 @@ *******************************************************************************/ package org.eclipse.cdt.dsf.gdb.internal.ui.launching; +import java.text.MessageFormat; import java.util.List; import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants; @@ -36,8 +37,6 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.dialogs.ISelectionStatusValidator; -import com.ibm.icu.text.MessageFormat; - public class ProcessPrompter implements IStatusHandler { public static class PrompterInfo { diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/META-INF/MANIFEST.MF b/dsf-gdb/org.eclipse.cdt.dsf.gdb/META-INF/MANIFEST.MF index 329e6666197..45a8707b84c 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/META-INF/MANIFEST.MF +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/META-INF/MANIFEST.MF @@ -48,5 +48,4 @@ Export-Package: org.eclipse.cdt.dsf.gdb, org.eclipse.cdt.dsf.mi.service.command.commands, org.eclipse.cdt.dsf.mi.service.command.events, org.eclipse.cdt.dsf.mi.service.command.output -Import-Package: com.ibm.icu.text Automatic-Module-Name: org.eclipse.cdt.dsf.gdb diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/memory/GdbMemoryBlockRetrieval.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/memory/GdbMemoryBlockRetrieval.java index c0f8e14f2e7..5fd800a2121 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/memory/GdbMemoryBlockRetrieval.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/memory/GdbMemoryBlockRetrieval.java @@ -18,6 +18,7 @@ package org.eclipse.cdt.dsf.gdb.internal.memory; import java.math.BigInteger; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.List; import java.util.concurrent.ExecutionException; @@ -59,8 +60,6 @@ import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import com.ibm.icu.text.MessageFormat; - /** * A specialization of the DSF memory block retrieval implementation supporting * memory spaces. The memory space support is provisional, thus this class is diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/InferiorRuntimeProcess.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/InferiorRuntimeProcess.java index 2651b8df4cc..bea19441c6d 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/InferiorRuntimeProcess.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/InferiorRuntimeProcess.java @@ -14,6 +14,7 @@ *******************************************************************************/ package org.eclipse.cdt.dsf.gdb.launching; +import java.text.MessageFormat; import java.util.Map; import org.eclipse.cdt.dsf.gdb.IGdbDebugConstants; @@ -23,8 +24,6 @@ import org.eclipse.debug.core.ILaunchConfiguration; import org.eclipse.debug.core.model.IProcess; import org.eclipse.debug.core.model.RuntimeProcess; -import com.ibm.icu.text.MessageFormat; - /** * A process for the inferior to know it belongs to a DSF-GDB session. * This class also adds the exit code of the inferior to the console. @@ -89,7 +88,7 @@ public class InferiorRuntimeProcess extends RuntimeProcess { // Prefix with exit value buffer.insert(0, MessageFormat.format(LaunchMessages.getString("InferiorRuntimeProcess_ExitValue"), //$NON-NLS-1$ - new Object[] { exitValue })); + exitValue)); label = buffer.toString(); setAttribute(IProcess.ATTR_PROCESS_LABEL, label); diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/LaunchMessages.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/LaunchMessages.java index aa2b39be682..23f1ebdb16e 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/LaunchMessages.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/LaunchMessages.java @@ -15,11 +15,10 @@ *******************************************************************************/ package org.eclipse.cdt.dsf.gdb.launching; +import java.text.MessageFormat; import java.util.MissingResourceException; import java.util.ResourceBundle; -import com.ibm.icu.text.MessageFormat; - public class LaunchMessages { private static final String BUNDLE_NAME = "org.eclipse.cdt.dsf.gdb.launching.LaunchMessages";//$NON-NLS-1$ @@ -40,7 +39,7 @@ public class LaunchMessages { return MessageFormat.format(getString(key), arg); } - public static String getFormattedString(String key, String[] args) { + public static String getFormattedString(String key, String... args) { return MessageFormat.format(getString(key), (Object[]) args); } diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBPatternMatchingExpressions.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBPatternMatchingExpressions.java index 40da8bd16e1..f67c9d3450a 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBPatternMatchingExpressions.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBPatternMatchingExpressions.java @@ -16,6 +16,7 @@ *******************************************************************************/ package org.eclipse.cdt.dsf.gdb.service; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; @@ -57,8 +58,6 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.osgi.framework.BundleContext; -import com.ibm.icu.text.MessageFormat; - /** * Expressions service added as a layer above the standard Expressions service. * This layer allows to support expression-groups and glob-pattern matching. diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_2.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_2.java index 98e43c98481..eed8286d8e0 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_2.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_2.java @@ -16,6 +16,7 @@ *******************************************************************************/ package org.eclipse.cdt.dsf.gdb.service; +import java.text.MessageFormat; import java.util.Arrays; import java.util.HashMap; import java.util.HashSet; @@ -72,8 +73,6 @@ import org.eclipse.debug.core.ILaunch; import org.eclipse.launchbar.core.target.ILaunchTarget; import org.eclipse.launchbar.core.target.launch.ITargetedLaunch; -import com.ibm.icu.text.MessageFormat; - /** * Adding support for multi-process with GDB 7.2 * diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpointsManager.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpointsManager.java index 34837112624..7707275c870 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpointsManager.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpointsManager.java @@ -24,6 +24,7 @@ package org.eclipse.cdt.dsf.mi.service; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -112,8 +113,6 @@ import org.eclipse.debug.core.IBreakpointManagerListener; import org.eclipse.debug.core.model.IBreakpoint; import org.osgi.framework.BundleContext; -import com.ibm.icu.text.MessageFormat; - /** * Breakpoint service interface. The breakpoint service tracks CDT breakpoint * objects, and based on those, it manages breakpoints in the debugger back end. @@ -724,8 +723,7 @@ public class MIBreakpointsManager extends AbstractDsfService detailedMessage = getStatus().getMessage(); } String description = (detailedMessage == null) ? Messages.Breakpoint_attribute_problem - : MessageFormat.format(Messages.Breakpoint_attribute_detailed_problem, - new Object[] { detailedMessage }); + : MessageFormat.format(Messages.Breakpoint_attribute_detailed_problem, detailedMessage); addBreakpointProblemMarker(breakpoint, description, IMarker.SEVERITY_WARNING); installRM.done(); diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/AbstractMIControl.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/AbstractMIControl.java index d94e9dd2901..a41977336c5 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/AbstractMIControl.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/AbstractMIControl.java @@ -25,6 +25,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.io.OutputStream; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -75,8 +76,6 @@ import org.eclipse.core.runtime.preferences.IEclipsePreferences; import org.eclipse.core.runtime.preferences.InstanceScope; import org.eclipse.osgi.util.NLS; -import com.ibm.icu.text.MessageFormat; - /** * Base implementation of an MI control service. It provides basic handling * of input/output channels, and processing of the commands. diff --git a/dsf/org.eclipse.cdt.dsf.ui/META-INF/MANIFEST.MF b/dsf/org.eclipse.cdt.dsf.ui/META-INF/MANIFEST.MF index b3872d9eec3..6d7c9eaf31b 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/META-INF/MANIFEST.MF +++ b/dsf/org.eclipse.cdt.dsf.ui/META-INF/MANIFEST.MF @@ -81,5 +81,4 @@ Export-Package: org.eclipse.cdt.dsf.debug.internal.ui;x-internal:=true, org.eclipse.cdt.debug.edc.ui", org.eclipse.cdt.dsf.ui.viewmodel.update;x-friends:="org.eclipse.cdt.dsf.gdb.ui,org.eclipse.cdt.examples.dsf,org.eclipse.cdt.examples.dsf.pda.ui" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: com.ibm.icu.text Automatic-Module-Name: org.eclipse.cdt.dsf.ui diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/CSourceNotFoundDescriptionFactory.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/CSourceNotFoundDescriptionFactory.java index c6a4a5f84ac..8d85ebe719e 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/CSourceNotFoundDescriptionFactory.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/CSourceNotFoundDescriptionFactory.java @@ -13,6 +13,7 @@ *******************************************************************************/ package org.eclipse.cdt.dsf.debug.internal.ui; +import java.text.MessageFormat; import java.util.HashMap; import org.eclipse.cdt.core.IAddress; @@ -33,8 +34,6 @@ import org.eclipse.core.runtime.IAdapterFactory; import org.eclipse.core.runtime.Path; import org.eclipse.jface.preference.IPreferenceStore; -import com.ibm.icu.text.MessageFormat; - /** * This factory provides an instance of ICSourceNotFoundDescription that can * generate a description of a IFrameDMContext. diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java index e40499ca0ac..5509372b25a 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java @@ -25,6 +25,7 @@ import static org.eclipse.cdt.debug.internal.ui.disassembly.dsf.DisassemblyUtils import java.io.File; import java.math.BigInteger; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; @@ -187,8 +188,6 @@ import org.eclipse.ui.texteditor.MarkerAnnotationPreferences; import org.eclipse.ui.texteditor.SimpleMarkerAnnotation; import org.eclipse.ui.texteditor.SourceViewerDecorationSupport; -import com.ibm.icu.text.MessageFormat; - /** * DisassemblyPart */ @@ -603,7 +602,7 @@ public abstract class DisassemblyPart extends WorkbenchPart continue; final boolean isVisible = support.isColumnVisible(descriptor); IAction action = new Action(MessageFormat.format(DisassemblyMessages.DisassemblyPart_showRulerColumn_label, - new Object[] { descriptor.getName() }), IAction.AS_CHECK_BOX) { + descriptor.getName()), IAction.AS_CHECK_BOX) { @Override public void run() { if (descriptor.isGlobal()) diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/numberformat/FormattedValueLabelText.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/numberformat/FormattedValueLabelText.java index 97ae7b4aeb8..718b4de1a1b 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/numberformat/FormattedValueLabelText.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/numberformat/FormattedValueLabelText.java @@ -13,14 +13,13 @@ *******************************************************************************/ package org.eclipse.cdt.dsf.debug.ui.viewmodel.numberformat; +import java.text.MessageFormat; import java.util.Map; import org.eclipse.cdt.dsf.debug.ui.viewmodel.IDebugVMConstants; import org.eclipse.cdt.dsf.ui.viewmodel.properties.LabelText; import org.eclipse.core.runtime.IStatus; -import com.ibm.icu.text.MessageFormat; - /** * Label attribute that fills in the formatted value text using the active * number format for the view. @@ -74,8 +73,8 @@ public class FormattedValueLabelText extends LabelText { Object preferredFormat = properties.get(IDebugVMConstants.PROP_FORMATTED_VALUE_FORMAT_PREFERENCE); Object value = properties.get(PROP_ACTIVE_FORMAT_VALUE); if (value != null && activeFormat != null && !activeFormat.equals(preferredFormat)) { - return MessageFormat.format(MessagesForNumberFormat.FormattedValueLabelText__Value__text_format, - new Object[] { value, FormattedValueVMUtil.getFormatLabel((String) activeFormat) }); + return MessageFormat.format(MessagesForNumberFormat.FormattedValueLabelText__Value__text_format, value, + FormattedValueVMUtil.getFormatLabel((String) activeFormat)); } } return properties.get(propertyName); diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/numberformat/FormattedValueVMUtil.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/numberformat/FormattedValueVMUtil.java index d08ae709890..808f1a3148a 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/numberformat/FormattedValueVMUtil.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/numberformat/FormattedValueVMUtil.java @@ -13,6 +13,7 @@ *******************************************************************************/ package org.eclipse.cdt.dsf.debug.ui.viewmodel.numberformat; +import java.text.MessageFormat; import java.util.Collections; import java.util.HashMap; import java.util.Iterator; @@ -36,8 +37,6 @@ import org.eclipse.cdt.dsf.ui.viewmodel.datamodel.IDMVMContext; import org.eclipse.cdt.dsf.ui.viewmodel.properties.IPropertiesUpdate; import org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext; -import com.ibm.icu.text.MessageFormat; - /** * A helper class for View Model Node implementations that support elements * to be formatted using different number formats. The various static methods in @@ -95,13 +94,13 @@ public class FormattedValueVMUtil { return label; } else { return MessageFormat.format(MessagesForNumberFormat.FormattedValueVMUtil_Other_format__format_text, - new Object[] { formatId }); + formatId); } } /** * Returns an element property representing an element value in a given format. - + * * @deprecated Replaced by {@link #getPropertyForFormatId(String, String)} */ @Deprecated diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/properties/LabelText.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/properties/LabelText.java index e200b5b75d0..2453ccf890b 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/properties/LabelText.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/properties/LabelText.java @@ -13,6 +13,7 @@ *******************************************************************************/ package org.eclipse.cdt.dsf.ui.viewmodel.properties; +import java.text.MessageFormat; import java.util.Map; import org.eclipse.cdt.dsf.internal.ui.DsfUIPlugin; @@ -20,8 +21,6 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.debug.internal.ui.viewers.model.provisional.ILabelUpdate; -import com.ibm.icu.text.MessageFormat; - /** * The text attribute of a label. It uses a message format string in order to * compose the text string. The parameter names determine the array of objects diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda/META-INF/MANIFEST.MF b/dsf/org.eclipse.cdt.examples.dsf.pda/META-INF/MANIFEST.MF index 56d36677558..b1c5cbdf782 100644 --- a/dsf/org.eclipse.cdt.examples.dsf.pda/META-INF/MANIFEST.MF +++ b/dsf/org.eclipse.cdt.examples.dsf.pda/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.cdt.examples.dsf.pda;singleton:=true -Bundle-Version: 2.1.300.qualifier +Bundle-Version: 2.1.400.qualifier Bundle-Activator: org.eclipse.cdt.examples.dsf.pda.PDAPlugin Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime, @@ -21,5 +21,4 @@ Export-Package: org.eclipse.cdt.examples.dsf.pda, org.eclipse.cdt.examples.dsf.pda.sourcelookup Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: %providerName -Import-Package: com.ibm.icu.text Automatic-Module-Name: org.eclipse.cdt.examples.dsf.pda diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDABackend.java b/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDABackend.java index 91ab830cb01..bf2a29f0f4e 100644 --- a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDABackend.java +++ b/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDABackend.java @@ -21,6 +21,7 @@ import java.io.OutputStream; import java.net.ServerSocket; import java.net.Socket; import java.net.UnknownHostException; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.Hashtable; import java.util.List; @@ -44,8 +45,6 @@ import org.eclipse.debug.core.DebugPlugin; import org.eclipse.debug.core.Launch; import org.osgi.framework.BundleContext; -import com.ibm.icu.text.MessageFormat; - /** * Service that manages the backend process: starting the process * and monitoring for its shutdown. @@ -233,8 +232,7 @@ public class PDABackend extends AbstractDsfService { } File exe = new File(javaVMExec); if (!exe.exists()) { - abort(MessageFormat.format("Specified java VM executable {0} does not exist.", new Object[] { javaVMExec }), - null); + abort(MessageFormat.format("Specified java VM executable {0} does not exist.", javaVMExec), null); } fBackendProcessName = javaVMExec; @@ -267,8 +265,8 @@ public class PDABackend extends AbstractDsfService { if (file.exists()) absolutePath = file.getLocation().toPortableString(); else - abort(MessageFormat.format("PDA program {0} does not exist.", - new Object[] { file.getFullPath().toPortableString() }), null); + abort(MessageFormat.format("PDA program {0} does not exist.", file.getFullPath().toPortableString()), + null); } commandList.add(absolutePath); diff --git a/launch/org.eclipse.cdt.launch/META-INF/MANIFEST.MF b/launch/org.eclipse.cdt.launch/META-INF/MANIFEST.MF index 5a73fe6aa42..b5c1daa243c 100644 --- a/launch/org.eclipse.cdt.launch/META-INF/MANIFEST.MF +++ b/launch/org.eclipse.cdt.launch/META-INF/MANIFEST.MF @@ -30,5 +30,4 @@ Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)", org.eclipse.launchbar.core;bundle-version="2.1.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: com.ibm.icu.text Automatic-Module-Name: org.eclipse.cdt.launch diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/AbstractCLaunchDelegate.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/AbstractCLaunchDelegate.java index e1e73f1fb67..43724bcf183 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/AbstractCLaunchDelegate.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/AbstractCLaunchDelegate.java @@ -21,6 +21,8 @@ package org.eclipse.cdt.launch; import java.io.File; import java.io.FileNotFoundException; +import java.text.DateFormat; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.Date; @@ -77,9 +79,6 @@ import org.eclipse.debug.core.model.LaunchConfigurationDelegate; import org.eclipse.debug.ui.RefreshTab; import org.eclipse.osgi.util.NLS; -import com.ibm.icu.text.DateFormat; -import com.ibm.icu.text.MessageFormat; - /** * AbstractCLaunchDelegate is the launch delegate used by most CDI based debuggers. * It has been superseded by AbstractCLaunchDelegate2 which is used by most DSF based diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/LaunchUtils.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/LaunchUtils.java index e90b1be21cb..693079e2cec 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/LaunchUtils.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/LaunchUtils.java @@ -17,6 +17,7 @@ package org.eclipse.cdt.launch; import java.io.FileNotFoundException; import java.io.IOException; +import java.text.MessageFormat; import java.util.HashSet; import java.util.Set; @@ -56,8 +57,6 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.ui.activities.IActivityManager; import org.eclipse.ui.activities.IWorkbenchActivitySupport; -import com.ibm.icu.text.MessageFormat; - /** * Utility methods. */ diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalRunLaunchDelegate.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalRunLaunchDelegate.java index b7e28b2eb29..ccc13738661 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalRunLaunchDelegate.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalRunLaunchDelegate.java @@ -17,6 +17,7 @@ package org.eclipse.cdt.launch.internal; import java.io.File; import java.io.IOException; +import java.text.DateFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.Date; @@ -55,8 +56,6 @@ import org.eclipse.debug.core.ILaunchConfiguration; import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; import org.eclipse.debug.core.ILaunchManager; -import com.ibm.icu.text.DateFormat; - /** * The launch delegate for Run mode. */