Remove direct dependency to ICU

Signed-off-by: Fred Bricon <[email protected]>
eclipse-jdtls · Feb 25, 2020 · affc94f · affc94f
1 parent 9eb5a29
commit affc94f
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 12 deletions.
diff --git a/org.eclipse.jdt.ls.core/META-INF/MANIFEST.MF b/org.eclipse.jdt.ls.core/META-INF/MANIFEST.MF
@@ -8,7 +8,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Localization: plugin
 Import-Package: org.osgi.framework;version="1.3.0"
 Bundle-ActivationPolicy: lazy
-Import-Package: com.ibm.icu.text
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.12.0",
  org.eclipse.core.resources,
  org.eclipse.core.net,

diff --git a/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/Messages.java b/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/Messages.java
@@ -14,7 +14,7 @@
  *******************************************************************************/
 package org.eclipse.jdt.ls.core.internal;
 
-import com.ibm.icu.text.MessageFormat;
+import java.text.MessageFormat;
 
 /**
  * Helper class to format message strings.

diff --git a/...e/src/org/eclipse/jdt/ls/core/internal/corext/refactoring/code/ExtractMethodAnalyzer.java b/...e/src/org/eclipse/jdt/ls/core/internal/corext/refactoring/code/ExtractMethodAnalyzer.java
@@ -17,6 +17,7 @@
  *******************************************************************************/
 package org.eclipse.jdt.ls.core.internal.corext.refactoring.code;
 
+import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -99,8 +100,6 @@
 import org.eclipse.jface.text.IRegion;
 import org.eclipse.ltk.core.refactoring.RefactoringStatus;
 
-import com.ibm.icu.text.MessageFormat;
-
 /* package */ class ExtractMethodAnalyzer extends CodeAnalyzer {
 
 	public static final int ERROR = -2;

diff --git a/...ipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/corext/refactoring/nls/NLSUtil.java b/...ipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/corext/refactoring/nls/NLSUtil.java
@@ -18,6 +18,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.text.Collator;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Iterator;
@@ -35,8 +36,6 @@
 import org.eclipse.text.edits.InsertEdit;
 import org.eclipse.text.edits.TextEdit;
 
-import com.ibm.icu.text.Collator;
-
 
 public class NLSUtil {
 

diff --git a/...src/org/eclipse/jdt/ls/core/internal/corext/refactoring/rename/RenamingNameSuggestor.java b/...src/org/eclipse/jdt/ls/core/internal/corext/refactoring/rename/RenamingNameSuggestor.java
@@ -14,6 +14,7 @@
  *******************************************************************************/
 package org.eclipse.jdt.ls.core.internal.corext.refactoring.rename;
 
+import java.text.BreakIterator;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -22,8 +23,6 @@
 import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.jdt.ls.core.internal.text.JavaWordIterator;
 
-import com.ibm.icu.text.BreakIterator;
-
 /**
  * This class contains methods for suggesting new names for variables or methods
  * whose name consists at least partly of the name of their declaring type (or

diff --git a/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/text/JavaBreakIterator.java b/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/text/JavaBreakIterator.java
@@ -14,12 +14,11 @@
  *******************************************************************************/
 package org.eclipse.jdt.ls.core.internal.text;
 
+import java.text.BreakIterator;
 import java.text.CharacterIterator;
 
 import org.eclipse.core.runtime.Assert;
 
-import com.ibm.icu.text.BreakIterator;
-
 /**
  * A java break iterator. It returns all breaks, including before and after
  * whitespace, and it returns all camel case breaks.

diff --git a/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/text/JavaWordIterator.java b/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/text/JavaWordIterator.java
@@ -14,12 +14,11 @@
  *******************************************************************************/
 package org.eclipse.jdt.ls.core.internal.text;
 
+import java.text.BreakIterator;
 import java.text.CharacterIterator;
 
 import org.eclipse.core.runtime.Assert;
 
-import com.ibm.icu.text.BreakIterator;
-
 
 /**
  * Breaks java text into word starts, also stops at line start and end. No