Index: src/org/eclipse/ui/editors/text/TextEditor.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/TextEditor.java,v
retrieving revision 1.51
diff -u -r1.51 TextEditor.java
--- src/org/eclipse/ui/editors/text/TextEditor.java	17 Jun 2005 15:48:27 -0000	1.51
+++ src/org/eclipse/ui/editors/text/TextEditor.java	9 Apr 2006 03:38:52 -0000
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.ui.editors.text;
 
-import java.text.MessageFormat;
+import com.ibm.icu.text.MessageFormat;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IWorkspace;
Index: src/org/eclipse/ui/editors/text/DefaultEncodingSupport.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/DefaultEncodingSupport.java,v
retrieving revision 1.16
diff -u -r1.16 DefaultEncodingSupport.java
--- src/org/eclipse/ui/editors/text/DefaultEncodingSupport.java	28 Mar 2006 16:37:44 -0000	1.16
+++ src/org/eclipse/ui/editors/text/DefaultEncodingSupport.java	9 Apr 2006 03:38:51 -0000
@@ -12,7 +12,7 @@
 
 import java.io.CharConversionException;
 import java.io.UnsupportedEncodingException;
-import java.text.MessageFormat;
+import com.ibm.icu.text.MessageFormat;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.BusyIndicator;
Index: src/org/eclipse/ui/editors/text/EncodingActionGroup.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/EncodingActionGroup.java,v
retrieving revision 1.23
diff -u -r1.23 EncodingActionGroup.java
--- src/org/eclipse/ui/editors/text/EncodingActionGroup.java	28 Mar 2006 16:37:44 -0000	1.23
+++ src/org/eclipse/ui/editors/text/EncodingActionGroup.java	9 Apr 2006 03:38:52 -0000
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.ui.editors.text;
 
-import java.text.MessageFormat;
+import com.ibm.icu.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
Index: src/org/eclipse/ui/texteditor/MarkerAnnotationPreferences.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/MarkerAnnotationPreferences.java,v
retrieving revision 1.30
diff -u -r1.30 MarkerAnnotationPreferences.java
--- src/org/eclipse/ui/texteditor/MarkerAnnotationPreferences.java	6 Apr 2006 07:21:17 -0000	1.30
+++ src/org/eclipse/ui/texteditor/MarkerAnnotationPreferences.java	9 Apr 2006 03:38:53 -0000
@@ -11,7 +11,7 @@
 package org.eclipse.ui.texteditor;
 
 import java.net.URL;
-import java.text.Collator;
+import com.ibm.icu.text.Collator;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
Index: src/org/eclipse/ui/texteditor/DocumentProviderRegistry.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/DocumentProviderRegistry.java,v
retrieving revision 1.15
diff -u -r1.15 DocumentProviderRegistry.java
--- src/org/eclipse/ui/texteditor/DocumentProviderRegistry.java	28 Mar 2006 16:37:45 -0000	1.15
+++ src/org/eclipse/ui/texteditor/DocumentProviderRegistry.java	9 Apr 2006 03:38:53 -0000
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.ui.texteditor;
 
-import java.text.MessageFormat;
+import com.ibm.icu.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
Index: src/org/eclipse/ui/internal/editors/text/OpenExternalFileAction.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/OpenExternalFileAction.java,v
retrieving revision 1.22
diff -u -r1.22 OpenExternalFileAction.java
--- src/org/eclipse/ui/internal/editors/text/OpenExternalFileAction.java	31 Mar 2006 15:46:23 -0000	1.22
+++ src/org/eclipse/ui/internal/editors/text/OpenExternalFileAction.java	9 Apr 2006 03:38:53 -0000
@@ -13,7 +13,7 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
-import java.text.MessageFormat;
+import com.ibm.icu.text.MessageFormat;
 import java.util.ArrayList;
 
 import org.eclipse.swt.SWT;
Index: src/org/eclipse/ui/internal/editors/text/NextPreviousPulldownActionDelegate.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/NextPreviousPulldownActionDelegate.java,v
retrieving revision 1.11
diff -u -r1.11 NextPreviousPulldownActionDelegate.java
--- src/org/eclipse/ui/internal/editors/text/NextPreviousPulldownActionDelegate.java	4 Apr 2006 16:36:03 -0000	1.11
+++ src/org/eclipse/ui/internal/editors/text/NextPreviousPulldownActionDelegate.java	9 Apr 2006 03:38:53 -0000
@@ -11,7 +11,7 @@
 
 package org.eclipse.ui.internal.editors.text;
 
-import java.text.Collator;
+import com.ibm.icu.text.Collator;
 import java.util.Iterator;
 import java.util.SortedSet;
 import java.util.TreeSet;
Index: src/org/eclipse/ui/internal/editors/text/NLSUtility.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/NLSUtility.java,v
retrieving revision 1.2
diff -u -r1.2 NLSUtility.java
--- src/org/eclipse/ui/internal/editors/text/NLSUtility.java	19 Apr 2005 12:38:57 -0000	1.2
+++ src/org/eclipse/ui/internal/editors/text/NLSUtility.java	9 Apr 2006 03:38:52 -0000
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.ui.internal.editors.text;
 
-import java.text.MessageFormat;
+import com.ibm.icu.text.MessageFormat;
 
 /**
  * A number of routines used for string externalization.
Index: src/org/eclipse/ui/internal/editors/text/AnnotationsConfigurationBlock.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/AnnotationsConfigurationBlock.java,v
retrieving revision 1.19
diff -u -r1.19 AnnotationsConfigurationBlock.java
--- src/org/eclipse/ui/internal/editors/text/AnnotationsConfigurationBlock.java	4 Apr 2006 16:36:03 -0000	1.19
+++ src/org/eclipse/ui/internal/editors/text/AnnotationsConfigurationBlock.java	9 Apr 2006 03:38:52 -0000
@@ -11,7 +11,7 @@
 
 package org.eclipse.ui.internal.editors.text;
 
-import java.text.Collator;
+import com.ibm.icu.text.Collator;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
Index: src/org/eclipse/ui/internal/editors/quickdiff/QuickDiffMessages.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/quickdiff/QuickDiffMessages.java,v
retrieving revision 1.9
diff -u -r1.9 QuickDiffMessages.java
--- src/org/eclipse/ui/internal/editors/quickdiff/QuickDiffMessages.java	17 Jun 2005 15:48:27 -0000	1.9
+++ src/org/eclipse/ui/internal/editors/quickdiff/QuickDiffMessages.java	9 Apr 2006 03:38:52 -0000
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.ui.internal.editors.quickdiff;
 
-import java.text.MessageFormat;
+import com.ibm.icu.text.MessageFormat;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 
Index: META-INF/MANIFEST.MF
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.ui.editors/META-INF/MANIFEST.MF,v
retrieving revision 1.10
diff -u -r1.10 MANIFEST.MF
--- META-INF/MANIFEST.MF	6 Apr 2006 07:44:47 -0000	1.10
+++ META-INF/MANIFEST.MF	9 Apr 2006 03:38:51 -0000
@@ -24,3 +24,4 @@
  org.eclipse.core.filesystem;bundle-version="[1.0.0,2.0.0)"
 Eclipse-LazyStart: true
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
+Import-Package: com.ibm.icu.text