Bug 561990 - Remove dependency on icu from platform.textI20200411-0950I20200411-0720I20200411-0510I20200411-0300I20200410-2300I20200410-1800

JVM classes do the same for our needs.

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

38 files changed, 44 insertions, 73 deletions

diff --git a/org.eclipse.jface.text/META-INF/MANIFEST.MF b/org.eclipse.jface.text/META-INF/MANIFEST.MF
index c48b43ff061..f356c826e03 100644
--- a/org.eclipse.jface.text/META-INF/MANIFEST.MF
+++ b/org.eclipse.jface.text/META-INF/MANIFEST.MF
@@ -38,5 +38,4 @@ Require-Bundle:
  org.eclipse.swt;bundle-version="[3.110.100,4.0.0)",
  org.eclipse.jface;bundle-version="[3.19.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: com.ibm.icu.text
 Automatic-Module-Name: org.eclipse.jface.text
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/HTMLMessages.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/HTMLMessages.java
index 1c31b9bbe33..8791289b892 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/HTMLMessages.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/HTMLMessages.java
@@ -13,11 +13,10 @@
  *******************************************************************************/
 package org.eclipse.jface.internal.text.html;
 
+import java.text.MessageFormat;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 
-import com.ibm.icu.text.MessageFormat;
-
 
 /**
  * Helper class to get NLSed messages.
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/ContentAssistMessages.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/ContentAssistMessages.java
index 8c043fba472..5b89cba3c73 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/ContentAssistMessages.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/ContentAssistMessages.java
@@ -14,11 +14,10 @@
 
 package org.eclipse.jface.internal.text.link.contentassist;
 
+import java.text.MessageFormat;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 
-import com.ibm.icu.text.MessageFormat;
-
 
 /**
  * Helper class to get NLSed messages.
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/LineBreakingReader.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/LineBreakingReader.java
index 8d5e644467e..81ae35cfe55 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/LineBreakingReader.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/LineBreakingReader.java
@@ -17,8 +17,7 @@ package org.eclipse.jface.internal.text.link.contentassist;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.Reader;
-
-import com.ibm.icu.text.BreakIterator;
+import java.text.BreakIterator;
 
 import org.eclipse.swt.graphics.GC;
 
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultTextDoubleClickStrategy.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultTextDoubleClickStrategy.java
index f3e472e24a5..e91a051c3ec 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultTextDoubleClickStrategy.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultTextDoubleClickStrategy.java
@@ -14,10 +14,10 @@
 
 package org.eclipse.jface.text;
 
+import java.text.BreakIterator;
 import java.text.CharacterIterator;
 import java.util.Locale;
 
-import com.ibm.icu.text.BreakIterator;
 
 
 /**
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/URLHyperlink.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/URLHyperlink.java
index 6a2cde42413..b5442cac7af 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/URLHyperlink.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/URLHyperlink.java
@@ -13,7 +13,8 @@
  *******************************************************************************/
 package org.eclipse.jface.text.hyperlink;
 
-import com.ibm.icu.text.MessageFormat;
+
+import java.text.MessageFormat;
 
 import org.eclipse.swt.program.Program;
 
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/JFaceTextMessages.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/JFaceTextMessages.java
index 45666fb4d8e..c81c68b2493 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/JFaceTextMessages.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/JFaceTextMessages.java
@@ -14,11 +14,10 @@
 
 package org.eclipse.jface.text.source;
 
+import java.text.MessageFormat;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 
-import com.ibm.icu.text.MessageFormat;
-
 /**
  * Accessor for the <code>JFaceTextMessages.properties</code> file in
  * package <code>org.eclipse.jface.text</code>.
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/JFaceTextTemplateMessages.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/JFaceTextTemplateMessages.java
index d2a6f0ff9f2..75fc6e10aaf 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/JFaceTextTemplateMessages.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/JFaceTextTemplateMessages.java
@@ -13,11 +13,10 @@
  *******************************************************************************/
 package org.eclipse.jface.text.templates;
 
+import java.text.MessageFormat;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 
-import com.ibm.icu.text.MessageFormat;
-
 /**
  * @since 3.0
  */
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/persistence/TemplatePersistenceMessages.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/persistence/TemplatePersistenceMessages.java
index ccf5221a7bd..c34cfd36828 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/persistence/TemplatePersistenceMessages.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/persistence/TemplatePersistenceMessages.java
@@ -13,11 +13,10 @@
  *******************************************************************************/
 package org.eclipse.jface.text.templates.persistence;
 
+import java.text.MessageFormat;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 
-import com.ibm.icu.text.MessageFormat;
-
 /**
  * @since 3.0
  */
diff --git a/org.eclipse.search/META-INF/MANIFEST.MF b/org.eclipse.search/META-INF/MANIFEST.MF
index e5298f8ac23..aaf65271720 100644
--- a/org.eclipse.search/META-INF/MANIFEST.MF
+++ b/org.eclipse.search/META-INF/MANIFEST.MF
@@ -32,5 +32,4 @@ Require-Bundle:
  org.eclipse.ltk.core.refactoring;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.ltk.ui.refactoring;bundle-version="[3.5.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: com.ibm.icu.text
 Automatic-Module-Name: org.eclipse.search
diff --git a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchHistoryDropDownAction.java b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchHistoryDropDownAction.java
index 1e0874d34e9..d19ab5645b3 100644
--- a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchHistoryDropDownAction.java
+++ b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchHistoryDropDownAction.java
@@ -13,7 +13,7 @@
  *******************************************************************************/
 package org.eclipse.search2.internal.ui;
 
-import com.ibm.icu.text.MessageFormat;
+import java.text.MessageFormat;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Control;
diff --git a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchHistorySelectionDialog.java b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchHistorySelectionDialog.java
index 3911399008f..de272c5d706 100644
--- a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchHistorySelectionDialog.java
+++ b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchHistorySelectionDialog.java
@@ -14,12 +14,11 @@
  *******************************************************************************/
 package org.eclipse.search2.internal.ui;
 
+import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import com.ibm.icu.text.MessageFormat;
-
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.MouseAdapter;
 import org.eclipse.swt.events.MouseEvent;
diff --git a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchView.java b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchView.java
index 0533f9212db..1294c94239e 100644
--- a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchView.java
+++ b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchView.java
@@ -17,11 +17,10 @@
  *******************************************************************************/
 package org.eclipse.search2.internal.ui;
 
+import java.text.MessageFormat;
 import java.util.HashMap;
 import java.util.Map.Entry;
 
-import com.ibm.icu.text.MessageFormat;
-
 import org.eclipse.osgi.util.NLS;
 
 import org.eclipse.swt.SWT;
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/Messages.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/Messages.java
index 41c34578a52..e13aecbc25f 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/ui/Messages.java
+++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/Messages.java
@@ -13,7 +13,7 @@
  *******************************************************************************/
 package org.eclipse.search.internal.ui;
 
-import com.ibm.icu.text.MessageFormat;
+import java.text.MessageFormat;
 
 /**
  * Helper class to format message strings.
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPreferencePage.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPreferencePage.java
index bc8fd238658..e88d75c3cac 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPreferencePage.java
+++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPreferencePage.java
@@ -13,11 +13,10 @@
  *******************************************************************************/
 package org.eclipse.search.internal.ui;
 
+import java.text.Collator;
 import java.util.Arrays;
 import java.util.Comparator;
 
-import com.ibm.icu.text.Collator;
-
 import org.eclipse.swt.graphics.RGB;
 import org.eclipse.swt.widgets.Composite;
 
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/WorkingSetComparator.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/WorkingSetComparator.java
index 798701c4268..b9b0b049043 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/ui/WorkingSetComparator.java
+++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/WorkingSetComparator.java
@@ -13,10 +13,9 @@
  *******************************************************************************/
 package org.eclipse.search.internal.ui;
 
+import java.text.Collator;
 import java.util.Comparator;
 
-import com.ibm.icu.text.Collator;
-
 import org.eclipse.ui.IWorkingSet;
 
 public class WorkingSetComparator implements Comparator<IWorkingSet> {
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ReplaceRefactoring.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ReplaceRefactoring.java
index de099fdac6c..37a2bc5bcdd 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ReplaceRefactoring.java
+++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ReplaceRefactoring.java
@@ -14,6 +14,7 @@
 package org.eclipse.search.internal.ui.text;
 
 import java.net.URI;
+import java.text.Collator;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -26,8 +27,6 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 
-import com.ibm.icu.text.Collator;
-
 import org.eclipse.core.filesystem.URIUtil;
 
 import org.eclipse.core.runtime.Assert;
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/util/FileLabelProvider.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/util/FileLabelProvider.java
index ddc8ead3e1a..73fa6512785 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/ui/util/FileLabelProvider.java
+++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/util/FileLabelProvider.java
@@ -13,7 +13,8 @@
  *******************************************************************************/
 package org.eclipse.search.internal.ui.util;
 
-import com.ibm.icu.text.MessageFormat;
+
+import java.text.MessageFormat;
 
 import org.eclipse.swt.graphics.Image;
 
diff --git a/org.eclipse.text.tests/META-INF/MANIFEST.MF b/org.eclipse.text.tests/META-INF/MANIFEST.MF
index 69265e59593..320f20062c0 100644
--- a/org.eclipse.text.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.text.tests/META-INF/MANIFEST.MF
@@ -16,6 +16,4 @@ Require-Bundle:
  org.junit;bundle-version="4.12.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Eclipse-BundleShape: dir
-Import-Package: com.ibm.icu.text,
- com.ibm.icu.util
 Automatic-Module-Name: org.eclipse.text.tests
diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/templates/GlobalTemplateVariablesDateTest.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/templates/GlobalTemplateVariablesDateTest.java
index f84cf4ce7af..b13f190fdf2 100644
--- a/org.eclipse.text.tests/src/org/eclipse/text/tests/templates/GlobalTemplateVariablesDateTest.java
+++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/templates/GlobalTemplateVariablesDateTest.java
@@ -17,9 +17,9 @@ package org.eclipse.text.tests.templates;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-import com.ibm.icu.text.DateFormat;
-import com.ibm.icu.text.SimpleDateFormat;
-import com.ibm.icu.util.ULocale;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Locale;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -82,9 +82,9 @@ public class GlobalTemplateVariablesDateTest  {
 
 		StringBuilder expected= new StringBuilder();
 		expected.append("From ");
-		expected.append(new SimpleDateFormat("dd MMM YYYY", ULocale.FRENCH).format(new java.util.Date()));
+		expected.append(new SimpleDateFormat("dd MMM YYYY", Locale.FRENCH).format(new java.util.Date()));
 		expected.append(" to ");
-		expected.append(new SimpleDateFormat("dd MMM YYYY", ULocale.FRENCH).format(new java.util.Date()));
+		expected.append(new SimpleDateFormat("dd MMM YYYY", Locale.FRENCH).format(new java.util.Date()));
 		assertBufferStringAndVariables(expected.toString(), buffer);
 	}
 
@@ -95,9 +95,9 @@ public class GlobalTemplateVariablesDateTest  {
 
 		StringBuilder expected= new StringBuilder();
 		expected.append("France ");
-		expected.append(new SimpleDateFormat("EEEE dd MMMM YYYY", ULocale.FRANCE).format(new java.util.Date()));
+		expected.append(new SimpleDateFormat("EEEE dd MMMM YYYY", Locale.FRANCE).format(new java.util.Date()));
 		expected.append(" and Germany ");
-		expected.append(new SimpleDateFormat("EEEE dd. MMMM YYYY", ULocale.GERMANY).format(new java.util.Date()));
+		expected.append(new SimpleDateFormat("EEEE dd. MMMM YYYY", Locale.GERMANY).format(new java.util.Date()));
 		assertBufferStringAndVariables(expected.toString(), buffer);
 	}
 
@@ -120,7 +120,8 @@ public class GlobalTemplateVariablesDateTest  {
 
 		StringBuilder expected= new StringBuilder();
 		expected.append("Today is ");
-		expected.append(new SimpleDateFormat("YYYY-MM-dd", new ULocale("this_invalid_locale")).format(new java.util.Date()));
+		expected.append(
+				new SimpleDateFormat("YYYY-MM-dd", new Locale("this_invalid_locale")).format(new java.util.Date()));
 		expected.append("!");
 		assertBufferStringAndVariables(expected.toString(), buffer);
 	}
diff --git a/org.eclipse.text/src/org/eclipse/jface/text/TextMessages.java b/org.eclipse.text/src/org/eclipse/jface/text/TextMessages.java
index 25b2b84cb02..a3af556c1cf 100644
--- a/org.eclipse.text/src/org/eclipse/jface/text/TextMessages.java
+++ b/org.eclipse.text/src/org/eclipse/jface/text/TextMessages.java
@@ -13,12 +13,10 @@
  *******************************************************************************/
 package org.eclipse.jface.text;
 
+import java.text.MessageFormat;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 
-import com.ibm.icu.text.MessageFormat;
-
-
 /**
  * Helper class to get NLSed messages.
  *
diff --git a/org.eclipse.text/src/org/eclipse/jface/text/templates/TextTemplateMessages.java b/org.eclipse.text/src/org/eclipse/jface/text/templates/TextTemplateMessages.java
index ca92177b2b1..ac16e0aab12 100644
--- a/org.eclipse.text/src/org/eclipse/jface/text/templates/TextTemplateMessages.java
+++ b/org.eclipse.text/src/org/eclipse/jface/text/templates/TextTemplateMessages.java
@@ -13,11 +13,10 @@
  *******************************************************************************/
 package org.eclipse.jface.text.templates;
 
+import java.text.MessageFormat;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 
-import com.ibm.icu.text.MessageFormat;
-
 /*
  * @since 3.0
  */
diff --git a/org.eclipse.text/src/org/eclipse/text/edits/TextEditMessages.java b/org.eclipse.text/src/org/eclipse/text/edits/TextEditMessages.java
index aa19981e898..51fcd7e3310 100644
--- a/org.eclipse.text/src/org/eclipse/text/edits/TextEditMessages.java
+++ b/org.eclipse.text/src/org/eclipse/text/edits/TextEditMessages.java
@@ -13,11 +13,10 @@
  *******************************************************************************/
 package org.eclipse.text.edits;
 
+import java.text.MessageFormat;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 
-import com.ibm.icu.text.MessageFormat;
-
 class TextEditMessages {
 
 	private static final String BUNDLE_NAME= "org.eclipse.text.edits.Messages"; //$NON-NLS-1$
diff --git a/org.eclipse.text/src/org/eclipse/text/templates/TextTemplateMessages.java b/org.eclipse.text/src/org/eclipse/text/templates/TextTemplateMessages.java
index 053a780cf80..2984dad20b9 100644
--- a/org.eclipse.text/src/org/eclipse/text/templates/TextTemplateMessages.java
+++ b/org.eclipse.text/src/org/eclipse/text/templates/TextTemplateMessages.java
@@ -13,11 +13,10 @@
  *******************************************************************************/
 package org.eclipse.text.templates;
 
+import java.text.MessageFormat;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 
-import com.ibm.icu.text.MessageFormat;
-
 /*
  * @since 3.0
  */
diff --git a/org.eclipse.text/src/org/eclipse/text/undo/UndoMessages.java b/org.eclipse.text/src/org/eclipse/text/undo/UndoMessages.java
index 5d39dc16026..7a5ef4d21ee 100644
--- a/org.eclipse.text/src/org/eclipse/text/undo/UndoMessages.java
+++ b/org.eclipse.text/src/org/eclipse/text/undo/UndoMessages.java
@@ -13,11 +13,10 @@
  *******************************************************************************/
 package org.eclipse.text.undo;
 
+import java.text.MessageFormat;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 
-import com.ibm.icu.text.MessageFormat;
-
 /**
  * Helper class to get NLSed messages.
  *
diff --git a/org.eclipse.ui.editors/META-INF/MANIFEST.MF b/org.eclipse.ui.editors/META-INF/MANIFEST.MF
index 35c9e70402f..df5880b0436 100644
--- a/org.eclipse.ui.editors/META-INF/MANIFEST.MF
+++ b/org.eclipse.ui.editors/META-INF/MANIFEST.MF
@@ -29,5 +29,4 @@ Require-Bundle:
  org.eclipse.core.filesystem;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.jdt.annotation;bundle-version="2.2";resolution:=optional
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: com.ibm.icu.text
 Automatic-Module-Name: org.eclipse.ui.editors
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/AnnotationsConfigurationBlock.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/AnnotationsConfigurationBlock.java
index f3e9b86722c..3d6f8717344 100644
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/AnnotationsConfigurationBlock.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/AnnotationsConfigurationBlock.java
@@ -13,6 +13,7 @@
  *******************************************************************************/
 package org.eclipse.ui.internal.editors.text;
 
+import java.text.Collator;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -20,8 +21,6 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
 
-import com.ibm.icu.text.Collator;
-
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.SelectionListener;
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/HyperlinkDetectorsConfigurationBlock.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/HyperlinkDetectorsConfigurationBlock.java
index 020c7e4982d..5d3e5e2874b 100644
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/HyperlinkDetectorsConfigurationBlock.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/HyperlinkDetectorsConfigurationBlock.java
@@ -13,14 +13,13 @@
  *******************************************************************************/
 package org.eclipse.ui.internal.editors.text;
 
+import java.text.Collator;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 import java.util.StringTokenizer;
 
-import com.ibm.icu.text.Collator;
-
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.KeyEvent;
 import org.eclipse.swt.events.KeyListener;
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/LinkedModeConfigurationBlock.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/LinkedModeConfigurationBlock.java
index 67b83d3c85f..1bdba46b0eb 100755
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/LinkedModeConfigurationBlock.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/LinkedModeConfigurationBlock.java
@@ -13,13 +13,12 @@
  *******************************************************************************/
 package org.eclipse.ui.internal.editors.text;
 
+import java.text.Collator;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 
-import com.ibm.icu.text.Collator;
-
 import org.osgi.service.prefs.BackingStoreException;
 
 import org.eclipse.swt.SWT;
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/NLSUtility.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/NLSUtility.java
index b4a3c9e799e..7f9bf921c4b 100644
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/NLSUtility.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/NLSUtility.java
@@ -13,7 +13,7 @@
  *******************************************************************************/
 package org.eclipse.ui.internal.editors.text;
 
-import com.ibm.icu.text.MessageFormat;
+import java.text.MessageFormat;
 
 /**
  * A number of routines used for string externalization.
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/NextPreviousPulldownActionDelegate.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/NextPreviousPulldownActionDelegate.java
index 18814d16806..cc2e8fae9be 100644
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/NextPreviousPulldownActionDelegate.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/NextPreviousPulldownActionDelegate.java
@@ -14,12 +14,11 @@
 
 package org.eclipse.ui.internal.editors.text;
 
+import java.text.Collator;
 import java.util.Iterator;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
-import com.ibm.icu.text.Collator;
-
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Menu;
 
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AbstractDecoratedTextEditor.java b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AbstractDecoratedTextEditor.java
index 7ecc2afba9b..8fd1c36628d 100644
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AbstractDecoratedTextEditor.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AbstractDecoratedTextEditor.java
@@ -20,11 +20,10 @@ import java.nio.charset.CharsetEncoder;
 import java.nio.charset.IllegalCharsetNameException;
 import java.nio.charset.StandardCharsets;
 import java.nio.charset.UnsupportedCharsetException;
+import java.text.BreakIterator;
+import java.text.MessageFormat;
 import java.util.Iterator;
 
-import com.ibm.icu.text.BreakIterator;
-import com.ibm.icu.text.MessageFormat;
-
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.StyledText;
 import org.eclipse.swt.custom.StyledTextPrintOptions;
diff --git a/org.eclipse.ui.workbench.texteditor/META-INF/MANIFEST.MF b/org.eclipse.ui.workbench.texteditor/META-INF/MANIFEST.MF
index 31285c10e5c..8b6a2bad045 100644
--- a/org.eclipse.ui.workbench.texteditor/META-INF/MANIFEST.MF
+++ b/org.eclipse.ui.workbench.texteditor/META-INF/MANIFEST.MF
@@ -30,5 +30,4 @@ Require-Bundle:
  org.eclipse.swt;bundle-version="[3.107.0,4.0.0)",
  org.eclipse.ui;bundle-version="[3.5.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: com.ibm.icu.text
 Automatic-Module-Name: org.eclipse.ui.workbench.texteditor
diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/NLSUtility.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/NLSUtility.java
index 9bade5b7aa1..f9e92900c2f 100644
--- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/NLSUtility.java
+++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/NLSUtility.java
@@ -13,7 +13,7 @@
  *******************************************************************************/
 package org.eclipse.ui.internal.texteditor;
 
-import com.ibm.icu.text.MessageFormat;
+import java.text.MessageFormat;
 
 /**
  * A number of routines used for string externalization.
diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/rulers/ExtensionPointHelper.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/rulers/ExtensionPointHelper.java
index 85df73f1b33..df52cf951f5 100644
--- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/rulers/ExtensionPointHelper.java
+++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/rulers/ExtensionPointHelper.java
@@ -14,8 +14,7 @@
 package org.eclipse.ui.internal.texteditor.rulers;
 
 import java.net.URL;
-
-import com.ibm.icu.text.MessageFormat;
+import java.text.MessageFormat;
 
 import org.osgi.framework.Bundle;
 
diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/rulers/RulerColumnRegistry.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/rulers/RulerColumnRegistry.java
index 1f6871ebf6f..fcb6c18616b 100644
--- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/rulers/RulerColumnRegistry.java
+++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/rulers/RulerColumnRegistry.java
@@ -13,6 +13,7 @@
  *******************************************************************************/
 package org.eclipse.ui.texteditor.rulers;
 
+import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -24,8 +25,6 @@ import java.util.ListIterator;
 import java.util.Map;
 import java.util.Set;
 
-import com.ibm.icu.text.MessageFormat;
-
 import org.eclipse.core.runtime.Assert;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IConfigurationElement;
diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/AbstractTemplatesPage.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/AbstractTemplatesPage.java
index 9be5cf36e80..8b797de5748 100644
--- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/AbstractTemplatesPage.java
+++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/AbstractTemplatesPage.java
@@ -15,13 +15,12 @@
 package org.eclipse.ui.texteditor.templates;
 
 import java.io.IOException;
+import java.text.Collator;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 
-import com.ibm.icu.text.Collator;
-
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CLabel;
 import org.eclipse.swt.custom.SashForm;
diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplatePreferencePage.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplatePreferencePage.java
index b1077de8b81..d99e2c573cf 100644
--- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplatePreferencePage.java
+++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplatePreferencePage.java
@@ -23,6 +23,7 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.text.Collator;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -32,8 +33,6 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import com.ibm.icu.text.Collator;
-
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.StyledText;
 import org.eclipse.swt.events.FocusEvent;