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>

7 files changed, 7 insertions, 13 deletions

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;