Bug 560614 - Drop dependency on ICU4J

Straightforward conversion. Still usages left that need deeper
investigation how to be done proper.
Some long time commented code removed as java formatter breaks trailing
whitespaces on save.


Change-Id: If74259bed5735b0d4cc98fc2cfa609c9c53c80c9
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>

14 files changed, 31 insertions, 45 deletions

diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugModelPresentation.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugModelPresentation.java
index 50f266f578a..b0394099517 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugModelPresentation.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugModelPresentation.java
@@ -20,6 +20,7 @@ package org.eclipse.cdt.debug.internal.ui;
 
 import java.io.File;
 import java.net.URI;
+import java.text.MessageFormat;
 import java.util.HashMap;
 
 import org.eclipse.cdt.core.IAddress;
@@ -97,8 +98,6 @@ import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.ide.IDE;
 import org.eclipse.ui.part.FileEditorInput;
 
-import com.ibm.icu.text.MessageFormat;
-
 /**
  * @see IDebugModelPresentation
  */
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugUIUtils.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugUIUtils.java
index 1f4a34ff3e7..ed89429c0bb 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugUIUtils.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugUIUtils.java
@@ -15,6 +15,7 @@
 package org.eclipse.cdt.debug.internal.ui;
 
 import java.net.URI;
+import java.text.MessageFormat;
 import java.util.Iterator;
 
 import org.eclipse.cdt.debug.core.model.ICBreakpoint;
@@ -66,8 +67,6 @@ import org.eclipse.ui.progress.UIJob;
 import org.eclipse.ui.texteditor.ITextEditor;
 import org.eclipse.ui.texteditor.SimpleMarkerAnnotation;
 
-import com.ibm.icu.text.MessageFormat;
-
 /**
  * Utility methods for C/C++ Debug UI.
  */
@@ -129,7 +128,7 @@ public class CDebugUIUtils {
 		StringBuilder label = new StringBuilder();
 		if (value instanceof ICDebugElementStatus && !((ICDebugElementStatus) value).isOK()) {
 			label.append(MessageFormat.format(CDebugUIMessages.getString("CDTDebugModelPresentation.4"), //$NON-NLS-1$
-					(Object[]) new String[] { ((ICDebugElementStatus) value).getMessage() }));
+					((ICDebugElementStatus) value).getMessage()));
 		} else if (value instanceof ICValue) {
 			ICType type = null;
 			try {
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RegisterGroupDialog.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RegisterGroupDialog.java
index 31e8a8b2818..57e22af43a9 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RegisterGroupDialog.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RegisterGroupDialog.java
@@ -13,6 +13,7 @@
  *******************************************************************************/
 package org.eclipse.cdt.debug.internal.ui.actions;
 
+import java.text.MessageFormat;
 import java.util.Arrays;
 import java.util.List;
 
@@ -40,8 +41,6 @@ import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.PlatformUI;
 
-import com.ibm.icu.text.MessageFormat;
-
 /**
  * This dialog is used to add/edit user-defined register groups.
  */
@@ -61,7 +60,7 @@ public class RegisterGroupDialog extends TitleAreaDialog {
 		public String getText(Object element) {
 			if (element instanceof IRegisterDescriptor) {
 				IRegisterDescriptor rd = (IRegisterDescriptor) element;
-				return MessageFormat.format("{0} - {1}", new Object[] { rd.getName(), rd.getGroupName() }); //$NON-NLS-1$
+				return MessageFormat.format("{0} - {1}", rd.getName(), rd.getGroupName()); //$NON-NLS-1$
 			}
 			return super.getText(element);
 		}
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/launch/LaunchMessages.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/launch/LaunchMessages.java
index b1ad4ec1d2b..dbcc2eaa455 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/launch/LaunchMessages.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/launch/LaunchMessages.java
@@ -13,11 +13,10 @@
  *******************************************************************************/
 package org.eclipse.cdt.debug.internal.ui.launch;
 
+import java.text.MessageFormat;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 
-import com.ibm.icu.text.MessageFormat;
-
 public class LaunchMessages {
 	private static final String BUNDLE_NAME = "org.eclipse.cdt.debug.internal.ui.launch.LaunchMessages";//$NON-NLS-1$
 	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
@@ -26,7 +25,7 @@ public class LaunchMessages {
 	}
 
 	public static String getFormattedString(String key, String arg) {
-		return MessageFormat.format(getString(key), new Object[] { arg });
+		return MessageFormat.format(getString(key), arg);
 	}
 
 	public static String getFormattedString(String key, String[] args) {
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/propertypages/SignalPropertyPage.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/propertypages/SignalPropertyPage.java
index 7835a949a60..d0915a6715d 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/propertypages/SignalPropertyPage.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/propertypages/SignalPropertyPage.java
@@ -13,6 +13,8 @@
  *******************************************************************************/
 package org.eclipse.cdt.debug.internal.ui.propertypages;
 
+import java.text.MessageFormat;
+
 import org.eclipse.cdt.debug.core.CDIDebugModel;
 import org.eclipse.cdt.debug.core.CDebugUtils;
 import org.eclipse.cdt.debug.core.model.ICSignal;
@@ -33,8 +35,6 @@ import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.ui.dialogs.PropertyPage;
 
-import com.ibm.icu.text.MessageFormat;
-
 /**
  * The property page for a signal.
  */
@@ -60,7 +60,7 @@ public class SignalPropertyPage extends PropertyPage {
 			String description = getSignal().getDescription();
 			Label label = new Label(composite, SWT.WRAP);
 			label.setText(MessageFormat.format(PropertyPageMessages.getString("SignalPropertyPage.0"), //$NON-NLS-1$
-					new Object[] { description }));
+					description));
 			GridData data = new GridData(
 					GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_CENTER);
 			data.widthHint = convertHorizontalDLUsToPixels(IDialogConstants.MINIMUM_MESSAGE_AREA_WIDTH);
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/ExecutablesContentProvider.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/ExecutablesContentProvider.java
index 0898e7d8ac6..3c21bd389b6 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/ExecutablesContentProvider.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/ExecutablesContentProvider.java
@@ -14,6 +14,7 @@
 
 package org.eclipse.cdt.debug.internal.ui.views.executables;
 
+import java.text.DateFormat;
 import java.util.Date;
 import java.util.List;
 
@@ -31,8 +32,6 @@ import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerCell;
 import org.eclipse.ui.progress.WorkbenchJob;
 
-import com.ibm.icu.text.DateFormat;
-
 class ExecutablesContentProvider extends ColumnLabelProvider
 		implements ITreeContentProvider, IExecutablesChangeListener {
 
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/SourceFilesLabelProvider.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/SourceFilesLabelProvider.java
index c3581dfa31c..e8cf86d07b5 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/SourceFilesLabelProvider.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/SourceFilesLabelProvider.java
@@ -14,6 +14,7 @@
 
 package org.eclipse.cdt.debug.internal.ui.views.executables;
 
+import java.text.DateFormat;
 import java.util.Date;
 import java.util.List;
 
@@ -33,8 +34,6 @@ import org.eclipse.swt.events.DisposeListener;
 import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.widgets.Display;
 
-import com.ibm.icu.text.DateFormat;
-
 public class SourceFilesLabelProvider extends TreeColumnViewerLabelProvider implements IExecutablesChangeListener {
 
 	private SourceFilesViewer viewer;
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ExternalToolAction.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ExternalToolAction.java
index b664c08d21a..46844ab3781 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ExternalToolAction.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ExternalToolAction.java
@@ -15,6 +15,7 @@ package org.eclipse.cdt.debug.ui.breakpointactions;
 
 import java.io.ByteArrayOutputStream;
 import java.io.StringReader;
+import java.text.MessageFormat;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -45,8 +46,6 @@ import org.w3c.dom.Element;
 import org.xml.sax.InputSource;
 import org.xml.sax.helpers.DefaultHandler;
 
-import com.ibm.icu.text.MessageFormat;
-
 public class ExternalToolAction extends AbstractBreakpointAction {
 
 	private String externalToolName = ""; //$NON-NLS-1$
@@ -87,7 +86,7 @@ public class ExternalToolAction extends AbstractBreakpointAction {
 			}
 			if (!launched) {
 				String errorMsg = MessageFormat.format(Messages.getString("ExternalToolAction.error.0"), //$NON-NLS-1$
-						new Object[] { externalToolName });
+						externalToolName);
 				errorStatus = new Status(IStatus.ERROR, CDIDebugModel.getPluginIdentifier(),
 						ICDebugInternalConstants.STATUS_CODE_ERROR, errorMsg, null);
 			}
@@ -101,7 +100,7 @@ public class ExternalToolAction extends AbstractBreakpointAction {
 
 		if (errorStatus != null) {
 			String errorMsg = MessageFormat.format(Messages.getString("ExternalToolAction.error.1"), //$NON-NLS-1$
-					new Object[] { externalToolName });
+					externalToolName);
 			MultiStatus ms = new MultiStatus(CDIDebugModel.getPluginIdentifier(),
 					ICDebugInternalConstants.STATUS_CODE_ERROR, errorMsg, null);
 			ms.add(errorStatus);
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/LogAction.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/LogAction.java
index 092ccd34e06..de31ebc5f22 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/LogAction.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/LogAction.java
@@ -15,6 +15,7 @@ package org.eclipse.cdt.debug.ui.breakpointactions;
 
 import java.io.ByteArrayOutputStream;
 import java.io.StringReader;
+import java.text.MessageFormat;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -42,8 +43,6 @@ import org.w3c.dom.Element;
 import org.xml.sax.InputSource;
 import org.xml.sax.helpers.DefaultHandler;
 
-import com.ibm.icu.text.MessageFormat;
-
 public class LogAction extends AbstractBreakpointAction {
 
 	private String message = ""; //$NON-NLS-1$
@@ -76,7 +75,7 @@ public class LogAction extends AbstractBreakpointAction {
 			stream.close();
 		} catch (Exception e) {
 			String errorMsg = MessageFormat.format(Messages.getString("LogAction.error.0"), //$NON-NLS-1$
-					new Object[] { getSummary() });
+					getSummary());
 			result = new Status(IStatus.ERROR, CDIDebugModel.getPluginIdentifier(),
 					ICDebugInternalConstants.STATUS_CODE_ERROR, errorMsg, e);
 		}
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ResumeAction.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ResumeAction.java
index 47d3323abdf..4533b79a938 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ResumeAction.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ResumeAction.java
@@ -15,6 +15,7 @@ package org.eclipse.cdt.debug.ui.breakpointactions;
 
 import java.io.ByteArrayOutputStream;
 import java.io.StringReader;
+import java.text.MessageFormat;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -41,8 +42,6 @@ import org.w3c.dom.Element;
 import org.xml.sax.InputSource;
 import org.xml.sax.helpers.DefaultHandler;
 
-import com.ibm.icu.text.MessageFormat;
-
 public class ResumeAction extends AbstractBreakpointAction {
 
 	final static int INCRIMENT_MSEC = 100;
@@ -62,7 +61,7 @@ public class ResumeAction extends AbstractBreakpointAction {
 				long currentTime = System.currentTimeMillis();
 				while (!monitor.isCanceled() && currentTime < endTime) {
 					monitor.setTaskName(MessageFormat.format(Messages.getString("ResumeAction.SummaryResumeTime"), //$NON-NLS-1$
-							new Object[] { Long.valueOf((endTime - currentTime) / 1000) })); //)
+							Long.valueOf((endTime - currentTime) / 1000))); //)
 					monitor.worked(1);
 					Thread.sleep(INCRIMENT_MSEC);
 					currentTime = System.currentTimeMillis();
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/SoundAction.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/SoundAction.java
index 5f0963b84ec..fa7a4a391de 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/SoundAction.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/SoundAction.java
@@ -17,6 +17,7 @@ import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.StringReader;
+import java.text.MessageFormat;
 
 import javax.sound.sampled.AudioFormat;
 import javax.sound.sampled.AudioInputStream;
@@ -46,8 +47,6 @@ import org.w3c.dom.Element;
 import org.xml.sax.InputSource;
 import org.xml.sax.helpers.DefaultHandler;
 
-import com.ibm.icu.text.MessageFormat;
-
 public class SoundAction extends AbstractBreakpointAction {
 
 	static public void playSoundFile(final File soundFile) {
@@ -104,7 +103,7 @@ public class SoundAction extends AbstractBreakpointAction {
 	public IStatus execute(IBreakpoint breakpoint, IAdaptable context, IProgressMonitor monitor) {
 		if (soundFile == null || !soundFile.exists()) {
 			String errorMsg = MessageFormat.format(Messages.getString("SoundAction.error.0"), //$NON-NLS-1$
-					new Object[] { getSummary() });
+					getSummary());
 			return new Status(IStatus.ERROR, CDIDebugModel.getPluginIdentifier(),
 					ICDebugInternalConstants.STATUS_CODE_ERROR, errorMsg, null);
 		}
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/CEventBreakpointsLabelProviderFactory.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/CEventBreakpointsLabelProviderFactory.java
index 857dd821cd7..9f5667ea4f6 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/CEventBreakpointsLabelProviderFactory.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/CEventBreakpointsLabelProviderFactory.java
@@ -15,6 +15,7 @@
  *******************************************************************************/
 package org.eclipse.cdt.debug.ui.breakpoints;
 
+import java.text.MessageFormat;
 import java.util.Arrays;
 
 import org.eclipse.cdt.debug.core.DebugCoreMessages;
@@ -30,8 +31,6 @@ import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.swt.graphics.Image;
 
-import com.ibm.icu.text.MessageFormat;
-
 /**
  * Factory for event breakpoint label provider
  */
@@ -103,7 +102,7 @@ public class CEventBreakpointsLabelProviderFactory implements IAdapterFactory {
 		if (ignoreCount > 0) {
 			label.append(' ');
 			label.append(MessageFormat.format(DebugCoreMessages.getString("CDebugUtils.3"), //$NON-NLS-1$
-					new Object[] { Integer.toString(ignoreCount) }));
+					Integer.toString(ignoreCount)));
 		}
 		return label;
 	}
@@ -112,8 +111,7 @@ public class CEventBreakpointsLabelProviderFactory implements IAdapterFactory {
 		String condition = breakpoint.getCondition();
 		if (condition != null && condition.length() > 0) {
 			buffer.append(' ');
-			buffer.append(
-					MessageFormat.format(DebugCoreMessages.getString("CDebugUtils.4"), new Object[] { condition })); //$NON-NLS-1$
+			buffer.append(MessageFormat.format(DebugCoreMessages.getString("CDebugUtils.4"), condition)); //$NON-NLS-1$
 		}
 	}
 
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/disassembly/rulers/RulerColumnRegistry.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/disassembly/rulers/RulerColumnRegistry.java
index a0868d93233..8af95916248 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/disassembly/rulers/RulerColumnRegistry.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/disassembly/rulers/RulerColumnRegistry.java
@@ -14,6 +14,7 @@
  *******************************************************************************/
 package org.eclipse.cdt.debug.ui.disassembly.rulers;
 
+import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -41,8 +42,6 @@ import org.eclipse.ui.internal.texteditor.rulers.RulerColumnMessages;
 import org.eclipse.ui.internal.texteditor.rulers.RulerColumnPlacementConstraint;
 import org.eclipse.ui.texteditor.ConfigurationElementSorter;
 
-import com.ibm.icu.text.MessageFormat;
-
 /**
  * A registry for all extensions to the
  * <code>rulerColumns</code> extension point.
@@ -268,25 +267,25 @@ public final class RulerColumnRegistry {
 
 	private void noteInvalidExtension(IConfigurationElement element, InvalidRegistryObjectException x) {
 		String message = MessageFormat.format(RulerColumnMessages.RulerColumnRegistry_invalid_msg,
-				new Object[] { ExtensionPointHelper.findId(element) });
+				ExtensionPointHelper.findId(element));
 		warnUser(message, x);
 	}
 
 	private void noteUnknownTarget(RulerColumnDescriptor desc, String referencedId) {
 		String message = MessageFormat.format(RulerColumnMessages.RulerColumnRegistry_unresolved_placement_msg,
-				new Object[] { QUALIFIED_EXTENSION_POINT, referencedId, desc.getName(), desc.getContributor() });
+				QUALIFIED_EXTENSION_POINT, referencedId, desc.getName(), desc.getContributor());
 		warnUser(message, null);
 	}
 
 	private void noteCycle(RulerColumnDescriptor desc, RulerColumnDescriptor target) {
 		String message = MessageFormat.format(RulerColumnMessages.RulerColumnRegistry_cyclic_placement_msg,
-				new Object[] { QUALIFIED_EXTENSION_POINT, target.getName(), desc.getName(), desc.getContributor() });
+				QUALIFIED_EXTENSION_POINT, target.getName(), desc.getName(), desc.getContributor());
 		warnUser(message, null);
 	}
 
 	private void noteDuplicateId(RulerColumnDescriptor desc) {
 		String message = MessageFormat.format(RulerColumnMessages.RulerColumnRegistry_duplicate_id_msg,
-				new Object[] { QUALIFIED_EXTENSION_POINT, desc.getId(), desc.getContributor() });
+				QUALIFIED_EXTENSION_POINT, desc.getId(), desc.getContributor());
 		warnUser(message, null);
 	}
 
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/sourcelookup/OldDefaultSourceLocator.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/sourcelookup/OldDefaultSourceLocator.java
index 29775459fdd..6aa370a7e19 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/sourcelookup/OldDefaultSourceLocator.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/sourcelookup/OldDefaultSourceLocator.java
@@ -15,6 +15,7 @@ package org.eclipse.cdt.debug.ui.sourcelookup;
 
 import java.io.IOException;
 import java.io.StringReader;
+import java.text.MessageFormat;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -41,8 +42,6 @@ import org.w3c.dom.Element;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
-import com.ibm.icu.text.MessageFormat;
-
 /**
  * Old default source locator. We keep it for migration purposes.
  */
@@ -129,7 +128,7 @@ public class OldDefaultSourceLocator implements IPersistableSourceLocator, IAdap
 				return;
 			if (project == null || !project.exists() || !project.isOpen())
 				abort(MessageFormat.format(SourceLookupMessages.getString("OldDefaultSourceLocator.4"), //$NON-NLS-1$
-						new Object[] { projectName }), null);
+						projectName), null);
 			IPersistableSourceLocator psl = getPersistableSourceLocator();
 			if (psl != null)
 				psl.initializeFromMemento(data);