From fa3911cd905301dcf5d6aebd1aca553c20531f0d Mon Sep 17 00:00:00 2001 From: Vivian Kong Date: Fri, 13 Mar 2009 13:47:48 +0000 Subject: [PATCH] bug 254200 - use ICU4J --- build/org.eclipse.cdt.make.core/META-INF/MANIFEST.MF | 1 + .../eclipse/cdt/make/internal/core/MakeMessages.java | 2 +- .../internal/core/scannerconfig/util/LogWriter.java | 4 ++-- build/org.eclipse.cdt.make.ui/META-INF/MANIFEST.MF | 1 + .../cdt/make/internal/ui/MakeEnvironmentBlock.java | 2 +- .../cdt/make/internal/ui/dnd/MakeTargetDndUtil.java | 2 +- .../ui/dnd/TextTransferDropTargetListener.java | 2 +- .../internal/ui/part/WizardCheckboxTablePart.java | 2 +- .../AbstractMakefileEditorPreferencePage.java | 2 +- .../eclipse/cdt/make/ui/views/DeleteTargetAction.java | 2 +- .../META-INF/MANIFEST.MF | 1 + .../internal/buildmodel/BuildModelMessages.java | 2 +- .../internal/core/ManagedMakeMessages.java | 2 +- .../internal/dataprovider/DataProviderMessages.java | 2 +- .../projectconverter/ConverterMessages.java | 2 +- .../cdt/newmake/internal/core/MakeMessages.java | 2 +- .../META-INF/MANIFEST.MF | 1 + .../managedbuilder/ui/properties/NewVarDialog.java | 2 +- core/org.eclipse.cdt.core/META-INF/MANIFEST.MF | 1 + .../cdt/internal/core/model/CoreModelMessages.java | 2 +- .../org/eclipse/cdt/internal/core/model/Util.java | 2 +- .../model/AbstractCProjectDescriptionStorage.java | 7 ++++--- .../settings/model/CProjectDescriptionManager.java | 8 ++++---- .../index/export/ExternalExportProjectProvider.java | 4 ++-- .../cdt/internal/core/dom/parser/ASTProblem.java | 6 +++--- .../cdt/internal/core/dom/parser/ProblemBinding.java | 2 +- .../parser/cpp/CPPASTAmbiguousTemplateArgument.java | 5 +++-- .../eclipse/cdt/internal/core/index/IndexFactory.java | 2 +- .../core/index/provider/IndexProviderManager.java | 2 +- .../internal/core/indexer/StandaloneIndexerTask.java | 4 ++-- .../cdt/internal/core/parser/ParserMessages.java | 2 +- .../core/parser/scanner/PreprocessorMacro.java | 2 +- .../eclipse/cdt/internal/core/pdom/PDOMManager.java | 2 +- .../org/eclipse/cdt/internal/core/pdom/db/BTree.java | 2 +- .../cdt/internal/core/pdom/export/CLIUtil.java | 2 +- .../cdt/internal/core/pdom/export/GeneratePDOM.java | 2 +- .../core/pdom/export/GeneratePDOMApplication.java | 2 +- .../internal/core/pdom/indexer/PDOMIndexerTask.java | 2 +- .../src/org/eclipse/cdt/core/CCorePlugin.java | 2 +- .../cdt/internal/core/CConfigBasedDescriptor.java | 7 ++++--- .../org/eclipse/cdt/internal/core/CDTLogWriter.java | 4 ++-- .../eclipse/cdt/core/templateengine/TemplateCore.java | 2 +- .../cdt/core/templateengine/TemplateDescriptor.java | 2 +- .../utils/org/eclipse/cdt/utils/coff/Coff.java | 2 +- .../utils/org/eclipse/cdt/utils/xcoff/XCoff32.java | 2 +- .../corext/template/c/FileTemplateContextType.java | 4 ++-- .../cdt/internal/ui/actions/ActionMessages.java | 2 +- .../ui/editor/ConstructedCEditorMessages.java | 2 +- .../cdt/internal/ui/filters/FilterDescriptor.java | 2 +- .../ui/preferences/ScalabilityPreferencePage.java | 6 +++--- .../internal/ui/refactoring/rename/ASTManager.java | 2 +- .../ui/refactoring/rename/CRenameProcessor.java | 2 +- .../refactoring/rename/CRenameProcessorDelegate.java | 2 +- .../ui/refactoring/utils/IdentifierHelper.java | 2 +- .../ui/search/actions/SelectionParseAction.java | 10 +++++----- .../ui/text/c/hover/AbstractAnnotationHover.java | 7 ++++--- .../ui/text/c/hover/CEditorTextHoverDescriptor.java | 2 +- .../proposals/ChangeCorrectionProposal.java | 8 ++++---- .../ui/text/doctools/DocCommentOwnerManager.java | 7 ++++--- .../eclipse/cdt/internal/ui/util/EditorUtility.java | 2 +- .../org/eclipse/cdt/internal/ui/util/Messages.java | 2 +- .../src/org/eclipse/cdt/ui/CUIPlugin.java | 7 ++++--- .../src/org/eclipse/cdt/ui/newui/UIMessages.java | 2 +- .../uitree/UIElementTreeBuilderHelper.java | 11 ++++++----- debug/org.eclipse.cdt.debug.core/META-INF/MANIFEST.MF | 1 + .../src/org/eclipse/cdt/debug/core/CDebugUtils.java | 2 +- .../cdt/debug/internal/core/CDebugAdapter.java | 4 ++-- .../internal/core/CMemoryBlockRetrievalExtension.java | 2 +- .../internal/core/breakpoints/BreakpointProblems.java | 2 +- .../internal/core/breakpoints/CAddressBreakpoint.java | 2 +- .../debug/internal/core/breakpoints/CBreakpoint.java | 2 +- .../core/breakpoints/CFunctionBreakpoint.java | 2 +- .../internal/core/breakpoints/CLineBreakpoint.java | 2 +- .../debug/internal/core/breakpoints/CWatchpoint.java | 2 +- .../cdt/debug/internal/core/model/CDebugElement.java | 2 +- .../cdt/debug/internal/core/model/CDebugTarget.java | 2 +- .../cdt/debug/internal/core/model/CModule.java | 2 +- .../cdt/debug/internal/core/model/CStackFrame.java | 4 ++-- .../cdt/debug/internal/core/model/CThread.java | 2 +- .../cdt/debug/internal/core/model/CVariable.java | 2 +- .../debug/internal/core/model/CVariableFactory.java | 2 +- .../core/sourcelookup/CDirectorySourceLocation.java | 2 +- .../core/sourcelookup/CProjectSourceLocation.java | 2 +- .../internal/core/sourcelookup/CSourceLocator.java | 2 +- .../core/sourcelookup/MapEntrySourceContainer.java | 2 +- .../debug/internal/core/sourcelookup/SourceUtils.java | 2 +- .../META-INF/MANIFEST.MF | 1 + .../cdt/debug/mi/core/AbstractGDBCDIDebugger.java | 4 ++-- .../org/eclipse/cdt/debug/mi/core/GDBCDIDebugger.java | 4 ++-- .../eclipse/cdt/debug/mi/core/GDBCDIDebugger2.java | 2 +- .../src/org/eclipse/cdt/debug/mi/core/MIPlugin.java | 2 +- .../org.eclipse.cdt.debug.mi.ui/META-INF/MANIFEST.MF | 1 + .../mi/internal/ui/preferences/MIPreferencePage.java | 2 +- debug/org.eclipse.cdt.debug.ui/META-INF/MANIFEST.MF | 1 + .../debug/internal/ui/CDebugModelPresentation.java | 2 +- .../eclipse/cdt/debug/internal/ui/CDebugUIUtils.java | 2 +- .../internal/ui/actions/RegisterGroupDialog.java | 2 +- .../adapters/DisassemblyElementLabelProvider.java | 9 +++++---- .../cdt/debug/internal/ui/launch/LaunchMessages.java | 2 +- .../internal/ui/preferences/CDebugPreferencePage.java | 2 +- .../internal/ui/preferences/DebuggerTypesPage.java | 2 +- .../internal/ui/propertypages/SignalPropertyPage.java | 2 +- .../ui/sourcelookup/CSourceNotFoundEditor.java | 2 +- .../views/executables/ExecutablesContentProvider.java | 2 +- .../views/executables/SourceFilesLabelProvider.java | 2 +- .../ui/breakpointactions/ExternalToolAction.java | 2 +- .../cdt/debug/ui/breakpointactions/LogAction.java | 2 +- .../cdt/debug/ui/breakpointactions/ResumeAction.java | 2 +- .../cdt/debug/ui/breakpointactions/SoundAction.java | 2 +- .../CEventBreakpointsLabelProviderFactory.java | 2 +- .../ui/sourcelookup/OldDefaultSourceLocator.java | 2 +- .../META-INF/MANIFEST.MF | 1 + launch/org.eclipse.cdt.launch/META-INF/MANIFEST.MF | 1 + .../eclipse/cdt/launch/AbstractCLaunchDelegate.java | 4 ++-- .../cdt/launch/internal/ui/LaunchMessages.java | 2 +- .../src/org/eclipse/cdt/launch/ui/CDebuggerTab.java | 4 ++-- 116 files changed, 167 insertions(+), 148 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 6df102be2c8..b648924c089 100644 --- a/build/org.eclipse.cdt.make.core/META-INF/MANIFEST.MF +++ b/build/org.eclipse.cdt.make.core/META-INF/MANIFEST.MF @@ -26,3 +26,4 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)", org.eclipse.core.filesystem;bundle-version="1.2.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Import-Package: com.ibm.icu.text 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 b56515be531..83aeceea2eb 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 @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.cdt.make.internal.core; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import java.util.MissingResourceException; import java.util.ResourceBundle; 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 bd77ab02a1b..9be79005200 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 @@ -17,8 +17,8 @@ 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 com.ibm.icu.text.DateFormat; +import com.ibm.icu.text.SimpleDateFormat; import java.util.Date; import org.eclipse.core.runtime.CoreException; 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 e611970bd1f..abd605569a9 100644 --- a/build/org.eclipse.cdt.make.ui/META-INF/MANIFEST.MF +++ b/build/org.eclipse.cdt.make.ui/META-INF/MANIFEST.MF @@ -38,3 +38,4 @@ Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)", org.eclipse.core.filesystem;bundle-version="1.2.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Import-Package: com.ibm.icu.text 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 f20c7d684e0..0de0eced6ca 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 @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.cdt.make.internal.ui; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import java.util.Comparator; import java.util.HashMap; import java.util.Iterator; 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 767f9eccf82..6e34e4b67f8 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 @@ -12,7 +12,7 @@ package org.eclipse.cdt.make.internal.ui.dnd; import java.lang.reflect.InvocationTargetException; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import java.util.ArrayList; import java.util.List; 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 3a514d0375d..0010bd45a3b 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 @@ -11,7 +11,7 @@ package org.eclipse.cdt.make.internal.ui.dnd; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import java.util.ArrayList; import java.util.List; 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 991973792fd..eb2b24e8e17 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 @@ -9,7 +9,7 @@ * IBM Corporation - initial API and implementation *******************************************************************************/ package org.eclipse.cdt.make.internal.ui.part; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import org.eclipse.cdt.make.internal.ui.MakeUIPlugin; import org.eclipse.jface.viewers.CheckboxTableViewer; 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 1743f70da85..6d1b0a5252c 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 @@ -14,7 +14,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 com.ibm.icu.text.MessageFormat; import java.util.HashMap; import java.util.Iterator; import java.util.Map; 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 bdbce6a0941..9cf0c2ea783 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 @@ -11,7 +11,7 @@ package org.eclipse.cdt.make.ui.views; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import java.util.List; import org.eclipse.cdt.make.core.IMakeTarget; 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 0668857dbc1..79d3d7dde1d 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/META-INF/MANIFEST.MF +++ b/build/org.eclipse.cdt.managedbuilder.core/META-INF/MANIFEST.MF @@ -36,3 +36,4 @@ Require-Bundle: org.eclipse.cdt.core;bundle-version="[5.0.0,6.0.0)", org.eclipse.cdt.make.core;visibility:=reexport Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Import-Package: com.ibm.icu.text 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 a160b82a368..f91f40a041f 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 @@ -11,7 +11,7 @@ *******************************************************************************/ package org.eclipse.cdt.managedbuilder.internal.buildmodel; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import java.util.MissingResourceException; import java.util.ResourceBundle; 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 5eab6d5506e..acf31cc414d 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 @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.cdt.managedbuilder.internal.core; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import java.util.MissingResourceException; import java.util.ResourceBundle; 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 59279a408c3..f8ab0ccf69a 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 @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.cdt.managedbuilder.internal.dataprovider; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import java.util.MissingResourceException; import java.util.ResourceBundle; 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 d24bed16b67..af8ff4c2205 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 @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.cdt.managedbuilder.projectconverter; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import java.util.MissingResourceException; import java.util.ResourceBundle; 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 eef8ab4cde9..10037d8ac4e 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 @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.cdt.newmake.internal.core; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import java.util.MissingResourceException; import java.util.ResourceBundle; 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 1dda1d4f7ba..c3048f7f216 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/META-INF/MANIFEST.MF +++ b/build/org.eclipse.cdt.managedbuilder.ui/META-INF/MANIFEST.MF @@ -23,3 +23,4 @@ Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)", org.eclipse.core.filesystem Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Import-Package: com.ibm.icu.text 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 fd9992d84d3..7788d28d5b3 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 @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.cdt.managedbuilder.ui.properties; -import java.text.Collator; +import com.ibm.icu.text.Collator; import java.util.Arrays; import java.util.Comparator; diff --git a/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF index 3873c4a3f7b..7cc1a178d48 100644 --- a/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF +++ b/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF @@ -106,3 +106,4 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)", org.eclipse.ltk.core.refactoring;bundle-version="3.4.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Import-Package: com.ibm.icu.text 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 2974a09cbb6..0375c03f9c9 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 @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.cdt.internal.core.model; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import java.util.MissingResourceException; import java.util.ResourceBundle; 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 f0810052fe7..cfd76e236fb 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 @@ -20,7 +20,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.net.URI; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.ICLogConstants; 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 48743c81aac..e32109438f0 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008 Broadcom Corporation and others. + * Copyright (c) 2008, 2009 Broadcom Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,10 +7,11 @@ * * Contributors: * James Blackburn (Broadcom Corp.) + * IBM Corporation *******************************************************************************/ package org.eclipse.cdt.internal.core.settings.model; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.model.ICProject; @@ -155,7 +156,7 @@ public abstract class AbstractCProjectDescriptionStorage { */ public ICProjectDescription getProjectDescription(int flags, IProgressMonitor monitor) throws CoreException { if (!project.isAccessible()) - throw ExceptionFactory.createCoreException(MessageFormat.format(CCorePlugin.getResourceString("ProjectDescription.ProjectNotAccessible"), getProject().getName())); //$NON-NLS-1$ + throw ExceptionFactory.createCoreException(MessageFormat.format(CCorePlugin.getResourceString("ProjectDescription.ProjectNotAccessible"), new Object[] {getProject().getName()})); //$NON-NLS-1$ 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 c4aa61e0da4..e292d411288 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2008 Intel Corporation and others. + * Copyright (c) 2007, 2009 Intel Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -22,7 +22,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.UnsupportedEncodingException; import java.net.URI; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -764,7 +764,7 @@ public class CProjectDescriptionManager implements ICProjectDescriptionManager { settingProjectDescription.set(true); if(des != null){ if (!project.isAccessible()) - throw ExceptionFactory.createCoreException(MessageFormat.format(CCorePlugin.getResourceString("ProjectDescription.ProjectNotAccessible"), project.getName())); //$NON-NLS-1$ + throw ExceptionFactory.createCoreException(MessageFormat.format(CCorePlugin.getResourceString("ProjectDescription.ProjectNotAccessible"), new Object[] {project.getName()})); //$NON-NLS-1$ if(!des.isValid() && (!fAllowEmptyCreatingDescription || !des.isCdtProjectCreating())) throw ExceptionFactory.createCoreException(SettingsModelMessages.getString("CProjectDescriptionManager.17") + project.getName()); //$NON-NLS-1$ @@ -1018,7 +1018,7 @@ public class CProjectDescriptionManager implements ICProjectDescriptionManager { && cfgId.equals(child.getAttribute(CConfigurationSpecSettings.ID))) throw ExceptionFactory.createCoreException(MessageFormat .format(SettingsModelMessages.getString("CProjectDescriptionManager.cfgIDAlreadyExists"), //$NON-NLS-1$ - cfgId)); + new Object[] {cfgId})); } ICStorageElement config = rootElement.importChild(base); config.setAttribute(CConfigurationSpecSettings.ID, cfgId); 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 b7f3eb85e24..2c3a180967c 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 @@ -11,8 +11,8 @@ package org.eclipse.cdt.core.index.export; import java.io.File; -import java.text.DateFormat; -import java.text.MessageFormat; +import com.ibm.icu.text.DateFormat; +import com.ibm.icu.text.MessageFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.Calendar; 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 cc7b392ef55..12e01a07163 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2008 IBM Corporation and others. + * Copyright (c) 2004, 2009 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.cdt.internal.core.dom.parser; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import java.util.HashMap; import java.util.Map; @@ -82,7 +82,7 @@ public class ASTProblem extends ASTNode implements IASTProblem { msg = ""; //$NON-NLS-1$ if (arg != null) { - return MessageFormat.format(msg, arg); + return MessageFormat.format(msg, new Object[] {arg}); } return msg; } 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 76f7474b1ff..a96de938c92 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 @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.cdt.internal.core.dom.parser; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import org.eclipse.cdt.core.dom.ILinkage; import org.eclipse.cdt.core.dom.IName; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTAmbiguousTemplateArgument.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTAmbiguousTemplateArgument.java index 02a212385eb..e41dece1cd1 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTAmbiguousTemplateArgument.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTAmbiguousTemplateArgument.java @@ -8,10 +8,11 @@ * Contributors: * Andrew Ferguson (Symbian) - Initial Implementation * Markus Schorn (Wind River Systems) + * IBM Corporation *******************************************************************************/ package org.eclipse.cdt.internal.core.dom.parser.cpp; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import java.util.ArrayList; import java.util.List; @@ -44,7 +45,7 @@ public class CPPASTAmbiguousTemplateArgument extends ASTAmbiguousNode implements fNodes.add(node); } else { String ns= node == null ? "null" : node.getClass().getName(); //$NON-NLS-1$ - String msg= MessageFormat.format(ParserMessages.getString("CPPASTAmbiguousTemplateArgument_InvalidConstruction"), ns); //$NON-NLS-1$ + String msg= MessageFormat.format(ParserMessages.getString("CPPASTAmbiguousTemplateArgument_InvalidConstruction"), new Object[] {ns}); //$NON-NLS-1$ throw new IllegalArgumentException(msg); } } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IndexFactory.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IndexFactory.java index 4307facdf79..81126906561 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IndexFactory.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IndexFactory.java @@ -12,7 +12,7 @@ package org.eclipse.cdt.internal.core.index; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/provider/IndexProviderManager.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/provider/IndexProviderManager.java index 6eb60025c01..734dbb1f37b 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/provider/IndexProviderManager.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/provider/IndexProviderManager.java @@ -11,7 +11,7 @@ *******************************************************************************/ package org.eclipse.cdt.internal.core.index.provider; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; 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 36938fffe9c..342142dfd16 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 @@ -12,8 +12,8 @@ package org.eclipse.cdt.internal.core.indexer; -import java.text.MessageFormat; -import java.text.NumberFormat; +import com.ibm.icu.text.MessageFormat; +import com.ibm.icu.text.NumberFormat; import java.util.Collection; import java.util.Iterator; 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 8ab2c3eeece..dd3eb09e838 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 @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.cdt.internal.core.parser; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import java.util.MissingResourceException; import java.util.ResourceBundle; 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 6d091fb1958..ee69e3f29be 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 @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.cdt.internal.core.parser.scanner; -import java.text.DateFormatSymbols; +import com.ibm.icu.text.DateFormatSymbols; import java.util.Calendar; import org.eclipse.cdt.core.dom.ILinkage; 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 644dbfec740..44bd1b5a79e 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 @@ -21,7 +21,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.nio.channels.FileChannel; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; 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 0fe99a4aee0..26e92b194d1 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 @@ -13,7 +13,7 @@ package org.eclipse.cdt.internal.core.pdom.db; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.core.runtime.CoreException; 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 bb59bc68c32..af6a52844d8 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 @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.cdt.internal.core.pdom.export; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import java.util.ArrayList; import java.util.HashMap; import java.util.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 f231605ec87..4396bf558a7 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 @@ -12,7 +12,7 @@ package org.eclipse.cdt.internal.core.pdom.export; import java.io.File; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import java.util.Map; import org.eclipse.cdt.core.CCorePlugin; 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 dd3e1307385..35efd8cdf4e 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 @@ -12,7 +12,7 @@ package org.eclipse.cdt.internal.core.pdom.export; import java.io.File; import java.io.PrintStream; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import java.util.HashMap; import java.util.List; import java.util.Map; 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 e08c1ed3105..d35315696d0 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 @@ -11,7 +11,7 @@ *******************************************************************************/ package org.eclipse.cdt.internal.core.pdom.indexer; -import java.text.NumberFormat; +import com.ibm.icu.text.NumberFormat; import java.util.Calendar; import java.util.Map; 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 9e3245efa49..b125309ffd8 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 @@ -15,7 +15,7 @@ package org.eclipse.cdt.core; import java.io.IOException; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; 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 b97c7def805..c7e2ea073db 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2008 Intel Corporation and others. + * Copyright (c) 2007, 2009 Intel Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -9,13 +9,14 @@ * Intel Corporation - Initial API and implementation * Anton Leherbauer (Wind River Systems) * James Blackburn (Broadcom Corp.) + * IBM Corporation *******************************************************************************/ 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 com.ibm.icu.text.MessageFormat; import java.util.HashMap; import java.util.LinkedHashSet; import java.util.Map; @@ -127,7 +128,7 @@ final public class CConfigBasedDescriptor implements ICDescriptor { public void serialize() throws CoreException { if (!getProject().isAccessible()) - throw ExceptionFactory.createCoreException(MessageFormat.format(CCorePlugin.getResourceString("ProjectDescription.ProjectNotAccessible"), getProject().getName())); //$NON-NLS-1$ + throw ExceptionFactory.createCoreException(MessageFormat.format(CCorePlugin.getResourceString("ProjectDescription.ProjectNotAccessible"), new Object[] {getProject().getName()})); //$NON-NLS-1$ 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 f3e6d9d3f4c..0ddd5fecccd 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 @@ -19,8 +19,8 @@ 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 com.ibm.icu.text.DateFormat; +import com.ibm.icu.text.SimpleDateFormat; import java.util.Date; import org.eclipse.cdt.core.CCorePlugin; diff --git a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/TemplateCore.java b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/TemplateCore.java index 6ae700c5219..2a14ce535b1 100644 --- a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/TemplateCore.java +++ b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/TemplateCore.java @@ -12,7 +12,7 @@ package org.eclipse.cdt.core.templateengine; import java.io.IOException; import java.net.URL; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import java.util.Comparator; import java.util.HashMap; import java.util.Iterator; diff --git a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/TemplateDescriptor.java b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/TemplateDescriptor.java index a146be89df0..83f283f6f5f 100644 --- a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/TemplateDescriptor.java +++ b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/TemplateDescriptor.java @@ -12,7 +12,7 @@ package org.eclipse.cdt.core.templateengine; import java.io.IOException; import java.net.URL; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import java.util.ArrayList; import java.util.HashMap; import java.util.List; 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 18e0e5dcb5a..09cfc38dc32 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 @@ -13,7 +13,7 @@ package org.eclipse.cdt.utils.coff; import java.io.EOFException; import java.io.IOException; import java.io.RandomAccessFile; -import java.text.DateFormat; +import com.ibm.icu.text.DateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; 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 75ff224421a..c03ca6a1602 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 @@ -13,7 +13,7 @@ package org.eclipse.cdt.utils.xcoff; import java.io.EOFException; import java.io.IOException; import java.io.RandomAccessFile; -import java.text.DateFormat; +import com.ibm.icu.text.DateFormat; import java.util.ArrayList; import java.util.Date; 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 dc81102920f..a66fb362130 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 @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.cdt.internal.corext.template.c; -import java.text.DateFormat; -import java.text.SimpleDateFormat; +import com.ibm.icu.text.DateFormat; +import com.ibm.icu.text.SimpleDateFormat; import java.util.ArrayList; import java.util.List; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/ActionMessages.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/ActionMessages.java index 6f3b66a4331..39d8a52e6b3 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/ActionMessages.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/ActionMessages.java @@ -11,7 +11,7 @@ package org.eclipse.cdt.internal.ui.actions; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import java.util.MissingResourceException; import java.util.ResourceBundle; 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 a9e5ba169b1..faa54030006 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 @@ -11,7 +11,7 @@ package org.eclipse.cdt.internal.ui.editor; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import java.util.MissingResourceException; import java.util.ResourceBundle; 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 19f39f7235d..4ecc1759d50 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 @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.filters; -import java.text.Collator; +import com.ibm.icu.text.Collator; import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/ScalabilityPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/ScalabilityPreferencePage.java index aef06bf8996..65cb9c17f48 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/ScalabilityPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/ScalabilityPreferencePage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2008 IBM Corporation and others. + * Copyright (c) 2000, 2009 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -12,7 +12,7 @@ package org.eclipse.cdt.internal.ui.preferences; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; @@ -193,7 +193,7 @@ public class ScalabilityPreferencePage extends PreferencePage implements fLinesToTrigger.setValidRange( 1, Integer.MAX_VALUE ); String minValue = Integer.toString( 1 ); String maxValue = Integer.toString( Integer.MAX_VALUE ); - fLinesToTrigger.setErrorMessage( MessageFormat.format(PreferencesMessages.ScalabilityPreferencePage_error, minValue, maxValue) ); + fLinesToTrigger.setErrorMessage( MessageFormat.format(PreferencesMessages.ScalabilityPreferencePage_error, new Object[] {minValue, maxValue}) ); fLinesToTrigger.load(); fLinesToTrigger.setPropertyChangeListener( new IPropertyChangeListener() { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/ASTManager.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/ASTManager.java index ad0d18954b1..d431bc3e2da 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/ASTManager.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/ASTManager.java @@ -11,7 +11,7 @@ ******************************************************************************/ package org.eclipse.cdt.internal.ui.refactoring.rename; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameProcessor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameProcessor.java index 45c41ea33d1..279dc2b6831 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameProcessor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameProcessor.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.refactoring.rename; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameProcessorDelegate.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameProcessorDelegate.java index 2ae3a57473f..bcc9990fa8f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameProcessorDelegate.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameProcessorDelegate.java @@ -11,7 +11,7 @@ ******************************************************************************/ package org.eclipse.cdt.internal.ui.refactoring.rename; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/IdentifierHelper.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/IdentifierHelper.java index e2ba0a48985..ca43e536168 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/IdentifierHelper.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/IdentifierHelper.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.refactoring.utils; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; 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 16591713447..f97c903126e 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2008 IBM Corporation and others. + * Copyright (c) 2004, 2009 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -14,7 +14,7 @@ package org.eclipse.cdt.internal.ui.search.actions; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; @@ -122,7 +122,7 @@ public class SelectionParseAction extends Action { protected void reportSourceFileOpenFailure(IPath path) { showStatusLineMessage(MessageFormat.format( CSearchMessages.SelectionParseAction_FileOpenFailure_format, - path.toOSString())); + new Object[] {path.toOSString()})); } protected void reportSelectionMatchFailure() { @@ -132,13 +132,13 @@ public class SelectionParseAction extends Action { protected void reportSymbolLookupFailure(String symbol) { showStatusLineMessage(MessageFormat.format( CSearchMessages.SelectionParseAction_SymbolNotFoundInIndex_format, - symbol)); + new Object[] {symbol})); } protected void reportIncludeLookupFailure(String filename) { showStatusLineMessage(MessageFormat.format( CSearchMessages.SelectionParseAction_IncludeNotFound_format, - filename)); + new Object[] {filename})); } } 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 81f43a4f723..774c3519fe7 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2002, 2006 QNX Software Systems and others. + * Copyright (c) 2002, 2009 QNX Software Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -8,11 +8,12 @@ * Contributors: * QNX Software Systems - Initial API and implementation * Sergey Prigogin (Google) + * IBM Corporation *******************************************************************************/ package org.eclipse.cdt.internal.ui.text.c.hover; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import java.util.Iterator; import org.eclipse.core.filebuffers.FileBuffers; @@ -336,7 +337,7 @@ public class AbstractAnnotationHover extends AbstractCEditorTextHover { if (proposals.length == 1) { text= CHoverMessages.AbstractAnnotationHover_message_singleQuickFix; } else { - text= MessageFormat.format(CHoverMessages.AbstractAnnotationHover_message_multipleQuickFix, String.valueOf(proposals.length)); + text= MessageFormat.format(CHoverMessages.AbstractAnnotationHover_message_multipleQuickFix, new Object[] {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 66725ca8ad2..72681141efd 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 @@ -11,7 +11,7 @@ package org.eclipse.cdt.internal.ui.text.c.hover; -import java.text.Collator; +import com.ibm.icu.text.Collator; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; 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 7d15051efb3..d56e3c04ed1 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2008 IBM Corporation and others. + * Copyright (c) 2000, 2009 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -12,7 +12,7 @@ package org.eclipse.cdt.internal.ui.text.correction.proposals; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IStatus; @@ -185,7 +185,7 @@ 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, getName(), shortCutString); + return MessageFormat.format(CorrectionMessages.ChangeCorrectionProposal_name_with_shortcut, new Object[] {getName(), shortCutString}); } return getName(); } @@ -198,7 +198,7 @@ public class ChangeCorrectionProposal implements ICCompletionProposal, ICommandA String shortCutString= CorrectionCommandHandler.getShortCutString(getCommandId()); if (shortCutString != null) { - String decorated= MessageFormat.format(CorrectionMessages.ChangeCorrectionProposal_name_with_shortcut, getName(), shortCutString); + String decorated= MessageFormat.format(CorrectionMessages.ChangeCorrectionProposal_name_with_shortcut, new Object[] {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 1a68ef12d03..83dc6e987c8 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008 Symbian Software Systems and others. + * Copyright (c) 2008, 2009 Symbian Software Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,10 +7,11 @@ * * Contributors: * Andrew Ferguson (Symbian) - Initial implementation + * IBM Corporation *******************************************************************************/ package org.eclipse.cdt.internal.ui.text.doctools; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -234,7 +235,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, id); + String msg= MessageFormat.format(Messages.DocCommentOwnerManager_DuplicateMapping0, new Object[] {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/util/EditorUtility.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/EditorUtility.java index dbf2cffde35..e2d50a9a9cd 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 @@ -18,7 +18,7 @@ import java.io.ByteArrayInputStream; import java.io.File; import java.io.IOException; import java.net.URI; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import org.eclipse.core.filesystem.EFS; import org.eclipse.core.filesystem.IFileStore; 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 4eb02a97faf..fd5d024cba2 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 @@ -11,7 +11,7 @@ package org.eclipse.cdt.internal.ui.util; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; public class Messages { public static String format(String pattern, Object[] args) { 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 b5f2a575f21..00a4ab93367 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2008 IBM Corporation and others. + * Copyright (c) 2003, 2009 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -16,7 +16,6 @@ package org.eclipse.cdt.ui; import java.io.IOException; -import java.text.MessageFormat; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; @@ -63,6 +62,8 @@ import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.BundleException; +import com.ibm.icu.text.MessageFormat; + import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.model.ICElement; @@ -269,7 +270,7 @@ public class CUIPlugin extends AbstractUIPlugin { } public static String getFormattedString(String key, String arg) { - return MessageFormat.format(getResourceString(key), arg); + return MessageFormat.format(getResourceString(key), new Object[] {arg}); } public static String getFormattedString(String key, String[] args) { 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 d19fb7660c3..81085a74c49 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 @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.cdt.ui.newui; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import java.util.MissingResourceException; import java.util.ResourceBundle; 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 860b09d6a42..7a35b154c96 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Symbian Software Limited and others. + * Copyright (c) 2007, 2009 Symbian Software Limited and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,10 +7,11 @@ * * Contributors: * Bala Torati (Symbian) - Initial API and implementation + * IBM Corporation *******************************************************************************/ package org.eclipse.cdt.ui.templateengine.uitree; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -118,11 +119,11 @@ public class UIElementTreeBuilderHelper implements IUIElementTreeBuilderHelper { } if(label==null || value==null) { String msg= Messages.getString("UIElementTreeBuilderHelper.InvalidEmptyLabel"); //$NON-NLS-1$ - CUIPlugin.log(MessageFormat.format(msg, id), null); + CUIPlugin.log(MessageFormat.format(msg, new Object[] {id}), null); } else { if(value2name.put(value, label)!=null) { String msg= Messages.getString("UIElementTreeBuilderHelper.InvalidNonUniqueValue"); //$NON-NLS-1$ - CUIPlugin.log(MessageFormat.format(msg, id), null); + CUIPlugin.log(MessageFormat.format(msg, new Object[] {id}), null); } } } @@ -146,7 +147,7 @@ public class UIElementTreeBuilderHelper implements IUIElementTreeBuilderHelper { // Note: This is not implemented now as we haven't found a use case // for generating UI pages as TABS in a single page. } else { - String msg= MessageFormat.format(Messages.getString("UIElementTreeBuilderHelper.UnknownWidgetType0"), type); //$NON-NLS-1$ + String msg= MessageFormat.format(Messages.getString("UIElementTreeBuilderHelper.UnknownWidgetType0"), new Object[] {type}); //$NON-NLS-1$ CUIPlugin.log(msg, null); } 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 14f31a60bc8..89c0c6cf279 100644 --- a/debug/org.eclipse.cdt.debug.core/META-INF/MANIFEST.MF +++ b/debug/org.eclipse.cdt.debug.core/META-INF/MANIFEST.MF @@ -27,3 +27,4 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)", org.eclipse.core.filesystem;bundle-version="1.2.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Import-Package: com.ibm.icu.text 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 4b088a477a5..3652f785363 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 @@ -15,7 +15,7 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.nio.charset.Charset; import java.nio.charset.CharsetDecoder; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.Iterator; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CDebugAdapter.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CDebugAdapter.java index 258cae377c6..6e2e0bedabe 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CDebugAdapter.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CDebugAdapter.java @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.cdt.debug.internal.core; -import java.text.DateFormat; -import java.text.MessageFormat; +import com.ibm.icu.text.DateFormat; +import com.ibm.icu.text.MessageFormat; import java.util.Date; import org.eclipse.cdt.core.CCorePlugin; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CMemoryBlockRetrievalExtension.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CMemoryBlockRetrievalExtension.java index b91f8dcb2c0..a02c7d7e2f1 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CMemoryBlockRetrievalExtension.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CMemoryBlockRetrievalExtension.java @@ -11,7 +11,7 @@ package org.eclipse.cdt.debug.internal.core; import java.math.BigInteger; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import java.util.ArrayList; import java.util.List; 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 27b9e0ee115..6ac1c081e0a 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 @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.cdt.debug.internal.core.breakpoints; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import org.eclipse.cdt.core.ProblemMarkerInfo; import org.eclipse.cdt.core.model.ICModelMarker; 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 e24cef222b8..ec7e09d069c 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 @@ -16,7 +16,7 @@ import org.eclipse.cdt.debug.core.CDebugUtils; import org.eclipse.cdt.debug.core.model.ICAddressBreakpoint; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; /** * A breakpoint that suspend the execution when a particular address is reached. 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 2190c84d78c..0cfee93e5b4 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 @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.cdt.debug.internal.core.breakpoints; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import java.util.ArrayList; import java.util.HashMap; import java.util.List; 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 5b9b75134aa..9336ad06a6f 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 @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.cdt.debug.internal.core.breakpoints; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import java.util.Map; import org.eclipse.cdt.debug.core.CDebugUtils; 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 51068db4567..dac36cbb1dd 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 @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.cdt.debug.internal.core.breakpoints; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import java.util.Map; import org.eclipse.cdt.debug.core.CDebugUtils; 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 8e87a3be1c9..d7011ff775b 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 @@ -12,7 +12,7 @@ package org.eclipse.cdt.debug.internal.core.breakpoints; import java.math.BigInteger; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import java.util.Map; import org.eclipse.cdt.debug.core.CDebugUtils; import org.eclipse.cdt.debug.core.model.ICWatchpoint2; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugElement.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugElement.java index 2459da6dbfd..e23bbba37da 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugElement.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugElement.java @@ -11,7 +11,7 @@ *******************************************************************************/ package org.eclipse.cdt.debug.internal.core.model; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import org.eclipse.cdt.debug.core.CDIDebugModel; import org.eclipse.cdt.debug.core.CDebugCorePlugin; import org.eclipse.cdt.debug.core.CDebugUtils; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java index f4b6634e596..15b82bfaf85 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java @@ -13,7 +13,7 @@ package org.eclipse.cdt.debug.internal.core.model; import java.io.File; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import java.util.ArrayList; import java.util.Iterator; import java.util.List; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CModule.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CModule.java index 880c2f1a2ac..a68d36e6053 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CModule.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CModule.java @@ -11,7 +11,7 @@ package org.eclipse.cdt.debug.internal.core.model; import java.math.BigInteger; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import org.eclipse.cdt.core.IAddress; import org.eclipse.cdt.core.IAddressFactory; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CStackFrame.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CStackFrame.java index 22b6d9fa877..13e267fa90b 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CStackFrame.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CStackFrame.java @@ -11,8 +11,8 @@ package org.eclipse.cdt.debug.internal.core.model; import java.math.BigInteger; -import java.text.MessageFormat; -import java.text.NumberFormat; +import com.ibm.icu.text.MessageFormat; +import com.ibm.icu.text.NumberFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CThread.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CThread.java index 8b7132fa5c2..d7598b3afd8 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CThread.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CThread.java @@ -14,7 +14,7 @@ *******************************************************************************/ package org.eclipse.cdt.debug.internal.core.model; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CVariable.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CVariable.java index 994c8f5ea75..41d1a6e7908 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CVariable.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CVariable.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.cdt.debug.internal.core.model; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import org.eclipse.cdt.debug.core.CDebugCorePlugin; import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CVariableFactory.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CVariableFactory.java index cd9a86866e0..41427de571d 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CVariableFactory.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CVariableFactory.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.cdt.debug.internal.core.model; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import org.eclipse.cdt.core.IBinaryParser.ISymbol; import org.eclipse.cdt.core.model.IBinaryModule; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CDirectorySourceLocation.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CDirectorySourceLocation.java index 13889604976..d95588e6520 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CDirectorySourceLocation.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CDirectorySourceLocation.java @@ -14,7 +14,7 @@ import java.io.File; import java.io.FileFilter; import java.io.IOException; import java.io.StringReader; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.LinkedList; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CProjectSourceLocation.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CProjectSourceLocation.java index b67dbaa5664..12984a6c216 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CProjectSourceLocation.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CProjectSourceLocation.java @@ -13,7 +13,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 com.ibm.icu.text.MessageFormat; import java.util.HashMap; import java.util.HashSet; import java.util.LinkedList; 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 6d2635ff0d1..fb4371749a3 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 @@ -12,7 +12,7 @@ package org.eclipse.cdt.debug.internal.core.sourcelookup; import java.io.IOException; import java.io.StringReader; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; 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 bd298663bae..6abcd56dc74 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 @@ -12,7 +12,7 @@ package org.eclipse.cdt.debug.internal.core.sourcelookup; import java.io.File; import java.io.IOException; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import java.util.ArrayList; import org.eclipse.cdt.core.model.CoreModel; 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 ab7dd1b0c71..00a67cd6e83 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 @@ -12,7 +12,7 @@ package org.eclipse.cdt.debug.internal.core.sourcelookup; import java.io.IOException; import java.io.StringReader; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import java.util.ArrayList; import java.util.LinkedList; import java.util.List; diff --git a/debug/org.eclipse.cdt.debug.mi.core/META-INF/MANIFEST.MF b/debug/org.eclipse.cdt.debug.mi.core/META-INF/MANIFEST.MF index 115a8289cc0..786d6e0cd02 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/META-INF/MANIFEST.MF +++ b/debug/org.eclipse.cdt.debug.mi.core/META-INF/MANIFEST.MF @@ -26,3 +26,4 @@ Require-Bundle: org.eclipse.cdt.debug.core;bundle-version="[6.0.0,7.0.0)", org.eclipse.core.variables;bundle-version="3.2.200" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Import-Package: com.ibm.icu.text diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/AbstractGDBCDIDebugger.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/AbstractGDBCDIDebugger.java index 55b1f47ad97..9559caa398b 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/AbstractGDBCDIDebugger.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/AbstractGDBCDIDebugger.java @@ -11,8 +11,8 @@ package org.eclipse.cdt.debug.mi.core; import java.io.File; -import java.text.DateFormat; -import java.text.MessageFormat; +import com.ibm.icu.text.DateFormat; +import com.ibm.icu.text.MessageFormat; import java.util.Date; import java.util.Map; import org.eclipse.cdt.core.IBinaryParser.IBinaryObject; diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBCDIDebugger.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBCDIDebugger.java index 6566ef61222..c9a195e57d5 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBCDIDebugger.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBCDIDebugger.java @@ -13,8 +13,8 @@ package org.eclipse.cdt.debug.mi.core; import java.io.File; -import java.text.DateFormat; -import java.text.MessageFormat; +import com.ibm.icu.text.DateFormat; +import com.ibm.icu.text.MessageFormat; import java.util.Collections; import java.util.Date; import java.util.List; diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBCDIDebugger2.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBCDIDebugger2.java index 430aca22c45..7131cd19c4e 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBCDIDebugger2.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBCDIDebugger2.java @@ -11,7 +11,7 @@ package org.eclipse.cdt.debug.mi.core; import java.io.File; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MIPlugin.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MIPlugin.java index 7e575c6fe90..cbe577c54f4 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MIPlugin.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MIPlugin.java @@ -14,7 +14,7 @@ import java.io.File; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.MissingResourceException; diff --git a/debug/org.eclipse.cdt.debug.mi.ui/META-INF/MANIFEST.MF b/debug/org.eclipse.cdt.debug.mi.ui/META-INF/MANIFEST.MF index 8807e7a2b9a..5186665a608 100644 --- a/debug/org.eclipse.cdt.debug.mi.ui/META-INF/MANIFEST.MF +++ b/debug/org.eclipse.cdt.debug.mi.ui/META-INF/MANIFEST.MF @@ -26,3 +26,4 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)", org.eclipse.jface.text;bundle-version="[3.2.0,4.0.0)" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Import-Package: com.ibm.icu.text diff --git a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/preferences/MIPreferencePage.java b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/preferences/MIPreferencePage.java index 355ade608e9..b6b6a82a566 100644 --- a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/preferences/MIPreferencePage.java +++ b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/preferences/MIPreferencePage.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.cdt.debug.mi.internal.ui.preferences; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import java.util.HashMap; import java.util.Iterator; import org.eclipse.cdt.debug.mi.core.IMIConstants; 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 99469be9415..9caf563b7f0 100644 --- a/debug/org.eclipse.cdt.debug.ui/META-INF/MANIFEST.MF +++ b/debug/org.eclipse.cdt.debug.ui/META-INF/MANIFEST.MF @@ -43,3 +43,4 @@ Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)", org.eclipse.core.expressions Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Import-Package: com.ibm.icu.text 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 e7737cc2e54..67eb6e6ffd9 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 @@ -14,7 +14,7 @@ package org.eclipse.cdt.debug.internal.ui; import java.io.File; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import java.util.HashMap; import org.eclipse.cdt.core.IAddress; 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 ed0730cb84b..7590fc71ab4 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 @@ -11,7 +11,7 @@ *******************************************************************************/ package org.eclipse.cdt.debug.internal.ui; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import org.eclipse.cdt.debug.core.CDebugUtils; import org.eclipse.cdt.debug.core.model.ICDebugElementStatus; 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 5bdc09c83bb..3ae750f2223 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 @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.cdt.debug.internal.ui.actions; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import java.util.Arrays; import java.util.List; import org.eclipse.cdt.debug.core.model.IRegisterDescriptor; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/DisassemblyElementLabelProvider.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/DisassemblyElementLabelProvider.java index 82b11f76e97..a9ab9685ac4 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/DisassemblyElementLabelProvider.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/DisassemblyElementLabelProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008 ARM Limited and others. + * Copyright (c) 2008, 2009 ARM Limited and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * ARM Limited - Initial API and implementation + * IBM Corporation *******************************************************************************/ package org.eclipse.cdt.debug.internal.ui.elements.adapters; @@ -16,7 +17,7 @@ import java.io.File; import java.io.FileReader; import java.io.IOException; import java.math.BigInteger; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import org.eclipse.cdt.debug.core.CDebugUtils; import org.eclipse.cdt.debug.core.model.IDisassemblyInstruction; @@ -97,7 +98,7 @@ public class DisassemblyElementLabelProvider implements IDocumentElementLabelPro private String getSourceLineText( IDisassemblySourceLine line ) { File file = line.getFile(); - String text = MessageFormat.format( "File {0} not found.", file.getPath() ); + String text = MessageFormat.format( "File {0} not found.", new Object[] {file.getPath()} ); ISourceLocator locator = line.getDebugTarget().getLaunch().getSourceLocator(); if ( locator instanceof ISourceLookupDirector ) { ISourceLookupDirector director = (ISourceLookupDirector)locator; @@ -141,6 +142,6 @@ public class DisassemblyElementLabelProvider implements IDocumentElementLabelPro br.close(); } - throw new IOException( MessageFormat.format( "Line {0} doesn't exist in {1}.", Integer.valueOf( lineNumber ), file.getPath() ) ); + throw new IOException( MessageFormat.format( "Line {0} doesn't exist in {1}.", new Object[] {Integer.valueOf( lineNumber ), file.getPath()}) ); } } 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 75c20450d4f..7e6a20357bb 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 @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.cdt.debug.internal.ui.launch; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import java.util.MissingResourceException; import java.util.ResourceBundle; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/preferences/CDebugPreferencePage.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/preferences/CDebugPreferencePage.java index f8b48a0cde0..c22a307910b 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/preferences/CDebugPreferencePage.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/preferences/CDebugPreferencePage.java @@ -12,7 +12,7 @@ package org.eclipse.cdt.debug.internal.ui.preferences; import java.nio.charset.Charset; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import java.util.ArrayList; import java.util.Iterator; import java.util.SortedMap; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/preferences/DebuggerTypesPage.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/preferences/DebuggerTypesPage.java index d8fc303ce72..02d6cc645b8 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/preferences/DebuggerTypesPage.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/preferences/DebuggerTypesPage.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.cdt.debug.internal.ui.preferences; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import java.util.Arrays; import java.util.List; import org.eclipse.cdt.debug.core.CDebugCorePlugin; 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 46f6f86ad94..7ac165880cb 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 @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.cdt.debug.internal.ui.propertypages; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import org.eclipse.cdt.debug.core.CDIDebugModel; import org.eclipse.cdt.debug.core.CDebugUtils; import org.eclipse.cdt.debug.core.model.ICSignal; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/CSourceNotFoundEditor.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/CSourceNotFoundEditor.java index e15c0f7acd2..94feb2d63f8 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/CSourceNotFoundEditor.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/CSourceNotFoundEditor.java @@ -12,7 +12,7 @@ package org.eclipse.cdt.debug.internal.ui.sourcelookup; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.Iterator; 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 22ca3a13274..b16caff7fd1 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 @@ -11,7 +11,7 @@ package org.eclipse.cdt.debug.internal.ui.views.executables; -import java.text.DateFormat; +import com.ibm.icu.text.DateFormat; import java.util.Date; import org.eclipse.cdt.debug.core.executables.Executable; 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 d813154c0ed..ed497aef281 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 @@ -11,7 +11,7 @@ package org.eclipse.cdt.debug.internal.ui.views.executables; -import java.text.DateFormat; +import com.ibm.icu.text.DateFormat; import java.util.Date; import org.eclipse.cdt.core.model.ITranslationUnit; 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 c0efb683a1d..4562a926b1f 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 @@ -12,7 +12,7 @@ package org.eclipse.cdt.debug.ui.breakpointactions; import java.io.ByteArrayOutputStream; import java.io.StringReader; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; 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 76c94e30a6f..eb661b566e5 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 @@ -12,7 +12,7 @@ package org.eclipse.cdt.debug.ui.breakpointactions; import java.io.ByteArrayOutputStream; import java.io.StringReader; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; 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 77370235dc7..859ed489c59 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 @@ -12,7 +12,7 @@ package org.eclipse.cdt.debug.ui.breakpointactions; import java.io.ByteArrayOutputStream; import java.io.StringReader; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; 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 719dc1e27c5..e441a42d221 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 @@ -14,7 +14,7 @@ import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; import java.io.StringReader; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import javax.sound.sampled.AudioFormat; import javax.sound.sampled.AudioInputStream; 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 b93ee2a4019..544370dc1dd 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 @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.cdt.debug.ui.breakpoints; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import org.eclipse.cdt.debug.core.DebugCoreMessages; import org.eclipse.cdt.debug.core.model.ICBreakpoint; 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 bf693e10799..dd05af7d7f8 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 @@ -12,7 +12,7 @@ package org.eclipse.cdt.debug.ui.sourcelookup; import java.io.IOException; import java.io.StringReader; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core/META-INF/MANIFEST.MF b/jtag/org.eclipse.cdt.debug.gdbjtag.core/META-INF/MANIFEST.MF index 1dd2222fcb1..cdc9e7f7527 100644 --- a/jtag/org.eclipse.cdt.debug.gdbjtag.core/META-INF/MANIFEST.MF +++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core/META-INF/MANIFEST.MF @@ -16,3 +16,4 @@ Eclipse-LazyStart: true Export-Package: org.eclipse.cdt.debug.gdbjtag.core, org.eclipse.cdt.debug.gdbjtag.core.jtagdevice Bundle-Vendor: %providerName +Import-Package: com.ibm.icu.text diff --git a/launch/org.eclipse.cdt.launch/META-INF/MANIFEST.MF b/launch/org.eclipse.cdt.launch/META-INF/MANIFEST.MF index b3d93fd1612..c189dadfbd3 100644 --- a/launch/org.eclipse.cdt.launch/META-INF/MANIFEST.MF +++ b/launch/org.eclipse.cdt.launch/META-INF/MANIFEST.MF @@ -24,3 +24,4 @@ Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)", org.eclipse.core.variables;bundle-version="[3.1.100,4.0.0)" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Import-Package: com.ibm.icu.text 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 0aaf238ae62..ff08d612e48 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 @@ -16,8 +16,8 @@ package org.eclipse.cdt.launch; import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; -import java.text.DateFormat; -import java.text.MessageFormat; +import com.ibm.icu.text.DateFormat; +import com.ibm.icu.text.MessageFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.Date; diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/LaunchMessages.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/LaunchMessages.java index 86bb066054f..64597f6375f 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/LaunchMessages.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/LaunchMessages.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.cdt.launch.internal.ui; -import java.text.MessageFormat; +import com.ibm.icu.text.MessageFormat; import java.util.MissingResourceException; import java.util.ResourceBundle; diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CDebuggerTab.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CDebuggerTab.java index c447ddc1ffd..0357677ba6b 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CDebuggerTab.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CDebuggerTab.java @@ -13,8 +13,8 @@ package org.eclipse.cdt.launch.ui; import java.io.IOException; -import java.text.Collator; -import java.text.MessageFormat; +import com.ibm.icu.text.Collator; +import com.ibm.icu.text.MessageFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.Comparator;