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