Bug 562047 - Remove dependency on icu from platform.ui
Direct replacements only aka package import changes only.
Change-Id: Ide0b605ba8eea1c04ba7702a4fcf25e81d668a8e
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
diff --git a/bundles/org.eclipse.e4.ui.dialogs/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.ui.dialogs/META-INF/MANIFEST.MF
index dea3241..13858c4 100644
--- a/bundles/org.eclipse.e4.ui.dialogs/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.ui.dialogs/META-INF/MANIFEST.MF
@@ -12,5 +12,4 @@
org.eclipse.e4.ui.internal.dialogs.about;x-internal:=true
Require-Bundle: org.eclipse.jface;bundle-version="3.11.0",
org.eclipse.core.runtime;bundle-version="3.10.0"
-Import-Package: com.ibm.icu.text
Automatic-Module-Name: org.eclipse.e4.ui.dialogs
diff --git a/bundles/org.eclipse.e4.ui.dialogs/src/org/eclipse/e4/ui/dialogs/filteredtree/PatternFilter.java b/bundles/org.eclipse.e4.ui.dialogs/src/org/eclipse/e4/ui/dialogs/filteredtree/PatternFilter.java
index d66224e..eb95521 100644
--- a/bundles/org.eclipse.e4.ui.dialogs/src/org/eclipse/e4/ui/dialogs/filteredtree/PatternFilter.java
+++ b/bundles/org.eclipse.e4.ui.dialogs/src/org/eclipse/e4/ui/dialogs/filteredtree/PatternFilter.java
@@ -15,6 +15,7 @@
*******************************************************************************/
package org.eclipse.e4.ui.dialogs.filteredtree;
+import java.text.BreakIterator;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -33,8 +34,6 @@
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerFilter;
-import com.ibm.icu.text.BreakIterator;
-
/**
* Based on org.eclipse.ui.dialogs.PatternFilter.
*/
diff --git a/bundles/org.eclipse.e4.ui.dialogs/src/org/eclipse/e4/ui/internal/dialogs/about/ProductProperties.java b/bundles/org.eclipse.e4.ui.dialogs/src/org/eclipse/e4/ui/internal/dialogs/about/ProductProperties.java
index adbbfb6..381040f 100644
--- a/bundles/org.eclipse.e4.ui.dialogs/src/org/eclipse/e4/ui/internal/dialogs/about/ProductProperties.java
+++ b/bundles/org.eclipse.e4.ui.dialogs/src/org/eclipse/e4/ui/internal/dialogs/about/ProductProperties.java
@@ -14,6 +14,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -27,8 +28,6 @@
import org.eclipse.jface.resource.ImageDescriptor;
import org.osgi.framework.Bundle;
-import com.ibm.icu.text.MessageFormat;
-
/**
* A class that converts the strings returned by
* <code>org.eclipse.core.runtime.IProduct.getProperty</code> to the appropriate
diff --git a/bundles/org.eclipse.e4.ui.progress/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.ui.progress/META-INF/MANIFEST.MF
index 3392a2e..b23c1ad 100644
--- a/bundles/org.eclipse.e4.ui.progress/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.ui.progress/META-INF/MANIFEST.MF
@@ -12,7 +12,6 @@
org.eclipse.e4.core.di;bundle-version="1.3.0",
org.eclipse.e4.ui.di;bundle-version="1.0.0",
org.eclipse.jface;bundle-version="3.10.0",
- com.ibm.icu;bundle-version="50.1.1",
org.eclipse.e4.ui.workbench,
org.eclipse.e4.core.commands,
org.eclipse.e4.core.services,
diff --git a/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/ErrorInfo.java b/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/ErrorInfo.java
index 1ecf1c2..2890458 100644
--- a/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/ErrorInfo.java
+++ b/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/ErrorInfo.java
@@ -13,8 +13,9 @@
*******************************************************************************/
package org.eclipse.e4.ui.progress.internal;
-import com.ibm.icu.text.DateFormat;
+import java.text.DateFormat;
import java.util.Date;
+
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.resource.JFaceResources;
diff --git a/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/ProgressInfoItem.java b/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/ProgressInfoItem.java
index 8c5e2b7..bd46956 100644
--- a/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/ProgressInfoItem.java
+++ b/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/ProgressInfoItem.java
@@ -15,6 +15,7 @@
package org.eclipse.e4.ui.progress.internal;
import java.net.URL;
+import java.text.DateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.Iterator;
@@ -57,8 +58,6 @@
import org.eclipse.swt.widgets.ToolItem;
import org.osgi.framework.FrameworkUtil;
-import com.ibm.icu.text.DateFormat;
-
/**
* ProgressInfoItem is the item used to show jobs.
diff --git a/bundles/org.eclipse.ui.forms/META-INF/MANIFEST.MF b/bundles/org.eclipse.ui.forms/META-INF/MANIFEST.MF
index c1bbb22..9c7f768 100644
--- a/bundles/org.eclipse.ui.forms/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.ui.forms/META-INF/MANIFEST.MF
@@ -18,8 +18,7 @@
org.eclipse.ui;bundle-version="[3.105.0,4.0.0)";resolution:=optional,
org.eclipse.e4.ui.css.core;bundle-version="0.10.100",
org.eclipse.e4.ui.css.swt;bundle-version="0.11.100"
-Import-Package: com.ibm.icu.text,
- javax.xml.parsers,
+Import-Package: javax.xml.parsers,
org.w3c.dom,
org.xml.sax
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/bundles/org.eclipse.ui.forms/src/org/eclipse/ui/internal/forms/widgets/FormUtil.java b/bundles/org.eclipse.ui.forms/src/org/eclipse/ui/internal/forms/widgets/FormUtil.java
index 6ffa625..2e7ad46 100644
--- a/bundles/org.eclipse.ui.forms/src/org/eclipse/ui/internal/forms/widgets/FormUtil.java
+++ b/bundles/org.eclipse.ui.forms/src/org/eclipse/ui/internal/forms/widgets/FormUtil.java
@@ -14,6 +14,8 @@
*******************************************************************************/
package org.eclipse.ui.internal.forms.widgets;
+import java.text.BreakIterator;
+
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.ScrolledComposite;
import org.eclipse.swt.events.MouseEvent;
@@ -38,8 +40,6 @@
import org.eclipse.ui.forms.widgets.FormToolkit;
import org.eclipse.ui.forms.widgets.SizeCache;
-import com.ibm.icu.text.BreakIterator;
-
public class FormUtil {
public static final String PLUGIN_ID = "org.eclipse.ui.forms"; //$NON-NLS-1$
diff --git a/bundles/org.eclipse.ui.forms/src/org/eclipse/ui/internal/forms/widgets/TextSegment.java b/bundles/org.eclipse.ui.forms/src/org/eclipse/ui/internal/forms/widgets/TextSegment.java
index ccdb786..4e9eb11 100644
--- a/bundles/org.eclipse.ui.forms/src/org/eclipse/ui/internal/forms/widgets/TextSegment.java
+++ b/bundles/org.eclipse.ui.forms/src/org/eclipse/ui/internal/forms/widgets/TextSegment.java
@@ -14,6 +14,7 @@
*******************************************************************************/
package org.eclipse.ui.internal.forms.widgets;
+import java.text.BreakIterator;
import java.util.ArrayList;
import java.util.Hashtable;
import java.util.Vector;
@@ -27,8 +28,6 @@
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.graphics.Rectangle;
-import com.ibm.icu.text.BreakIterator;
-
/**
* @version 1.0
*/
diff --git a/bundles/org.eclipse.ui.ide.application/META-INF/MANIFEST.MF b/bundles/org.eclipse.ui.ide.application/META-INF/MANIFEST.MF
index bfbe8f0..68a4231 100644
--- a/bundles/org.eclipse.ui.ide.application/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.ui.ide.application/META-INF/MANIFEST.MF
@@ -25,8 +25,7 @@
Export-Package: org.eclipse.ui.internal.ide.application;x-internal:=true,
org.eclipse.ui.internal.ide.application.addons;x-internal:=true,
org.eclipse.ui.internal.ide.application.dialogs;x-internal:=true
-Import-Package: com.ibm.icu.text,
- javax.inject
+Import-Package: javax.inject
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: org.eclipse.ui.ide.application
diff --git a/bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/IDEWorkbenchAdvisor.java b/bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/IDEWorkbenchAdvisor.java
index 2765631..e5d601a 100644
--- a/bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/IDEWorkbenchAdvisor.java
+++ b/bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/IDEWorkbenchAdvisor.java
@@ -19,6 +19,7 @@
import java.lang.reflect.InvocationTargetException;
import java.net.URL;
+import java.text.Collator;
import java.util.ArrayList;
import java.util.Map;
import java.util.TreeMap;
@@ -88,8 +89,6 @@
import org.osgi.framework.ServiceReference;
import org.osgi.framework.Version;
-import com.ibm.icu.text.Collator;
-
/**
* IDE-specified workbench advisor which configures the workbench for use as an
* IDE.
diff --git a/bundles/org.eclipse.ui.ide/META-INF/MANIFEST.MF b/bundles/org.eclipse.ui.ide/META-INF/MANIFEST.MF
index 4a616e7..6e2bfca 100644
--- a/bundles/org.eclipse.ui.ide/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.ui.ide/META-INF/MANIFEST.MF
@@ -72,8 +72,7 @@
org.eclipse.ui.navigator;bundle-version="3.7.400",
org.eclipse.jface;bundle-version="[3.18.0,4.0.0)"
Import-Package: javax.annotation,
- javax.inject,
- com.ibm.icu.text
+ javax.inject
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.ui.ide
diff --git a/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/actions/CopyFilesAndFoldersOperation.java b/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/actions/CopyFilesAndFoldersOperation.java
index 71a8c0a..40d494a 100644
--- a/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/actions/CopyFilesAndFoldersOperation.java
+++ b/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/actions/CopyFilesAndFoldersOperation.java
@@ -20,6 +20,7 @@
import java.lang.reflect.InvocationTargetException;
import java.math.BigDecimal;
import java.net.URI;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -80,9 +81,6 @@
import org.eclipse.ui.wizards.datatransfer.FileStoreStructureProvider;
import org.eclipse.ui.wizards.datatransfer.ImportOperation;
-import com.ibm.icu.text.MessageFormat;
-
-
/**
* Perform the copy of file and folder resources from the clipboard when paste
* action is invoked.
diff --git a/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/actions/OpenWithMenu.java b/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/actions/OpenWithMenu.java
index 7eb70e6..5f5bd5d 100644
--- a/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/actions/OpenWithMenu.java
+++ b/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/actions/OpenWithMenu.java
@@ -16,6 +16,7 @@
*******************************************************************************/
package org.eclipse.ui.actions;
+import java.text.Collator;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -50,8 +51,6 @@
import org.eclipse.ui.internal.ide.IDEWorkbenchPlugin;
import org.eclipse.ui.part.FileEditorInput;
-import com.ibm.icu.text.Collator;
-
/**
* A menu for opening files in the workbench.
* <p>
diff --git a/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/actions/ReadOnlyStateChecker.java b/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/actions/ReadOnlyStateChecker.java
index 6b4bb47..71a806e 100644
--- a/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/actions/ReadOnlyStateChecker.java
+++ b/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/actions/ReadOnlyStateChecker.java
@@ -15,6 +15,7 @@
*******************************************************************************/
package org.eclipse.ui.actions;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.List;
@@ -29,8 +30,6 @@
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.internal.ide.IDEWorkbenchMessages;
-import com.ibm.icu.text.MessageFormat;
-
/**
* The ReadOnlyStateChecker is a helper class that takes a set of resource
* some of which may be read only and queries the user as to whether or
diff --git a/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/actions/RenameResourceAction.java b/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/actions/RenameResourceAction.java
index c884af1..0180752 100644
--- a/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/actions/RenameResourceAction.java
+++ b/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/actions/RenameResourceAction.java
@@ -14,6 +14,7 @@
*******************************************************************************/
package org.eclipse.ui.actions;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.List;
@@ -55,8 +56,6 @@
import org.eclipse.ui.internal.ide.IIDEHelpContextIds;
import org.eclipse.ui.internal.ide.actions.LTKLauncher;
-import com.ibm.icu.text.MessageFormat;
-
/**
* Standard action for renaming the selected resources.
* <p>
diff --git a/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/dialogs/FilteredResourcesSelectionDialog.java b/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/dialogs/FilteredResourcesSelectionDialog.java
index a514f87..bc09715 100644
--- a/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/dialogs/FilteredResourcesSelectionDialog.java
+++ b/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/dialogs/FilteredResourcesSelectionDialog.java
@@ -21,6 +21,7 @@
import java.io.IOException;
import java.io.StringReader;
import java.io.StringWriter;
+import java.text.Collator;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Comparator;
@@ -87,8 +88,6 @@
import org.eclipse.ui.model.WorkbenchLabelProvider;
import org.eclipse.ui.statushandlers.StatusManager;
-import com.ibm.icu.text.Collator;
-
/**
* Shows a list of resources to the user with a text entry field for a string
* pattern used to filter the list of resources.
diff --git a/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/dialogs/ResourceListSelectionDialog.java b/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/dialogs/ResourceListSelectionDialog.java
index 42e02d9..e460691 100644
--- a/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/dialogs/ResourceListSelectionDialog.java
+++ b/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/dialogs/ResourceListSelectionDialog.java
@@ -15,6 +15,7 @@
*******************************************************************************/
package org.eclipse.ui.dialogs;
+import java.text.Collator;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -46,8 +47,6 @@
import org.eclipse.ui.internal.ide.StringMatcher;
import org.eclipse.ui.model.WorkbenchLabelProvider;
-import com.ibm.icu.text.Collator;
-
/**
* Shows a list of resources to the user with a text entry field for a string
* pattern used to filter the list of resources.
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/EditorAssociationOverrideDescriptor.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/EditorAssociationOverrideDescriptor.java
index 33adc19..21ac606 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/EditorAssociationOverrideDescriptor.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/EditorAssociationOverrideDescriptor.java
@@ -14,6 +14,7 @@
*******************************************************************************/
package org.eclipse.ui.internal.ide;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.List;
@@ -29,9 +30,6 @@
import org.eclipse.jface.util.SafeRunnable;
import org.eclipse.ui.ide.IEditorAssociationOverride;
-import com.ibm.icu.text.MessageFormat;
-
-
/**
* Describes a contribution to the 'org.eclipse.ui.ide.editorAssociationOverride' extension point.
*
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/FeatureSelectionDialog.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/FeatureSelectionDialog.java
index e38b77f..eb0a02b 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/FeatureSelectionDialog.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/FeatureSelectionDialog.java
@@ -16,6 +16,7 @@
package org.eclipse.ui.internal.ide;
+import java.text.Collator;
import java.util.Arrays;
import java.util.Comparator;
import java.util.Locale;
@@ -33,8 +34,6 @@
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.PlatformUI;
-import com.ibm.icu.text.Collator;
-
/**
* Dialog to allow the user to select a feature from a list.
*/
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/IDEWorkbenchErrorHandler.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/IDEWorkbenchErrorHandler.java
index b06cb2f..fd9d9a5 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/IDEWorkbenchErrorHandler.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/IDEWorkbenchErrorHandler.java
@@ -15,6 +15,7 @@
package org.eclipse.ui.internal.ide;
+import java.text.MessageFormat;
import java.util.Collections;
import java.util.Map;
import java.util.WeakHashMap;
@@ -37,8 +38,6 @@
import org.eclipse.ui.statushandlers.StatusManager;
import org.eclipse.ui.statushandlers.WorkbenchErrorHandler;
-import com.ibm.icu.text.MessageFormat;
-
/**
* This is the IDE workbench error handler. The instance of this handler is
* returned from IDEWorkbenchAdvisor#getWorkbenchErrorHandler(). All handled
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/IDEWorkbenchPlugin.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/IDEWorkbenchPlugin.java
index d0e756d..a53e394 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/IDEWorkbenchPlugin.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/IDEWorkbenchPlugin.java
@@ -16,6 +16,7 @@
package org.eclipse.ui.internal.ide;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.List;
@@ -51,8 +52,6 @@
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
-import com.ibm.icu.text.MessageFormat;
-
/**
* This internal class represents the top of the IDE workbench.
*
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/FileStatesPage.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/FileStatesPage.java
index 4cfac4b..f1aa9ee 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/FileStatesPage.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/FileStatesPage.java
@@ -14,6 +14,7 @@
*******************************************************************************/
package org.eclipse.ui.internal.ide.dialogs;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
@@ -40,8 +41,6 @@
import org.eclipse.ui.internal.ide.IDEWorkbenchMessages;
import org.eclipse.ui.internal.ide.IIDEHelpContextIds;
-import com.ibm.icu.text.MessageFormat;
-
/**
* The FileStatesPage is the page used to set the file states sizes for the workbench.
*/
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/IDEResourceInfoUtils.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/IDEResourceInfoUtils.java
index c5a6b27..2f2afc5 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/IDEResourceInfoUtils.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/IDEResourceInfoUtils.java
@@ -16,6 +16,9 @@
package org.eclipse.ui.internal.ide.dialogs;
import java.net.URI;
+import java.text.DateFormat;
+import java.text.MessageFormat;
+import java.text.NumberFormat;
import java.util.ArrayList;
import java.util.Date;
@@ -38,10 +41,6 @@
import org.eclipse.ui.internal.ide.IDEWorkbenchPlugin;
import org.eclipse.ui.statushandlers.StatusManager;
-import com.ibm.icu.text.DateFormat;
-import com.ibm.icu.text.MessageFormat;
-import com.ibm.icu.text.NumberFormat;
-
/**
* Utility class supporting common information required from resources.
*
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/PathVariablesGroup.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/PathVariablesGroup.java
index 4e197b3..7ce89df0 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/PathVariablesGroup.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/PathVariablesGroup.java
@@ -19,6 +19,7 @@
package org.eclipse.ui.internal.ide.dialogs;
import java.net.URI;
+import java.text.Collator;
import java.util.HashSet;
import java.util.Map.Entry;
import java.util.Set;
@@ -75,8 +76,6 @@
import org.eclipse.ui.internal.ide.IDEWorkbenchMessages;
import org.eclipse.ui.internal.ide.IDEWorkbenchPlugin;
-import com.ibm.icu.text.Collator;
-
/**
* A widget group that displays path variables.
* Includes buttons to edit, remove existing variables and create new ones.
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/DeltaMarkerEntry.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/DeltaMarkerEntry.java
index fe49513..149d6ed 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/DeltaMarkerEntry.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/DeltaMarkerEntry.java
@@ -14,16 +14,15 @@
package org.eclipse.ui.internal.views.markers;
+import java.text.CollationKey;
+
import org.eclipse.core.resources.IMarkerDelta;
import org.eclipse.core.runtime.IPath;
import org.eclipse.ui.views.markers.MarkerViewUtil;
import org.eclipse.ui.views.markers.internal.MarkerTypesModel;
-import com.ibm.icu.text.CollationKey;
-
/**
* The DeltaMarkerEntry is the class that wraps an {@link IMarkerDelta} for testing.
-
*
* @since 3.6
*
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/ExtendedMarkersView.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/ExtendedMarkersView.java
index 9984929..4fcba07 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/ExtendedMarkersView.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/ExtendedMarkersView.java
@@ -19,6 +19,7 @@
*******************************************************************************/
package org.eclipse.ui.internal.views.markers;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
@@ -113,9 +114,6 @@
import org.eclipse.ui.views.markers.internal.MarkerMessages;
import org.eclipse.ui.views.markers.internal.MarkerSupportRegistry;
-import com.ibm.icu.text.MessageFormat;
-
-
/**
* The ExtendedMarkersView is the internal implementation of the view that shows
* markers using the markerGenerators extension point.
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/MarkerCreationTimeField.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/MarkerCreationTimeField.java
index db2371a..c4fd2a2 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/MarkerCreationTimeField.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/MarkerCreationTimeField.java
@@ -14,14 +14,13 @@
package org.eclipse.ui.internal.views.markers;
+import java.text.DateFormat;
import java.util.Date;
import org.eclipse.jface.viewers.ViewerCell;
import org.eclipse.ui.views.markers.MarkerField;
import org.eclipse.ui.views.markers.MarkerItem;
-import com.ibm.icu.text.DateFormat;
-
/**
* MarkerCreationTimeField is the field that shows the creation time of a field.
*
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/MarkerDescriptionField.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/MarkerDescriptionField.java
index 38e4d63..b082d7e 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/MarkerDescriptionField.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/MarkerDescriptionField.java
@@ -13,6 +13,8 @@
*******************************************************************************/
package org.eclipse.ui.internal.views.markers;
+import java.text.CollationKey;
+
import org.eclipse.core.resources.IMarker;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.jface.viewers.CellEditor;
@@ -25,8 +27,6 @@
import org.eclipse.ui.views.markers.MarkerField;
import org.eclipse.ui.views.markers.MarkerItem;
-import com.ibm.icu.text.CollationKey;
-
/**
* MarkerDescriptionField is the field for showing the description of a marker.
*
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/MarkerEntry.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/MarkerEntry.java
index af59276..0b84fc2 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/MarkerEntry.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/MarkerEntry.java
@@ -16,6 +16,8 @@
package org.eclipse.ui.internal.views.markers;
+import java.text.CollationKey;
+import java.text.Collator;
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
@@ -35,9 +37,6 @@
import org.eclipse.ui.views.markers.internal.MarkerMessages;
import org.eclipse.ui.views.markers.internal.MarkerTypesModel;
-import com.ibm.icu.text.CollationKey;
-import com.ibm.icu.text.Collator;
-
/**
* The MarkerEntry is the class that wrappers an {@link IMarker} for display in
* an {@link ExtendedMarkersView}.
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/MarkerSupportInternalUtilities.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/MarkerSupportInternalUtilities.java
index 77ee1da..d9d14d9 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/MarkerSupportInternalUtilities.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/MarkerSupportInternalUtilities.java
@@ -16,6 +16,8 @@
package org.eclipse.ui.internal.views.markers;
import java.net.URL;
+import java.text.CollationKey;
+import java.text.Collator;
import org.eclipse.core.resources.IMarker;
import org.eclipse.core.resources.IResource;
@@ -48,9 +50,6 @@
import org.eclipse.ui.views.markers.internal.MarkerGroupingEntry;
import org.eclipse.ui.views.markers.internal.MarkerMessages;
-import com.ibm.icu.text.CollationKey;
-import com.ibm.icu.text.Collator;
-
/**
* MarkerSupportUtilities is the class that maintains constants and
* functionality used by multiple classes.
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/bookmarkexplorer/MarkerUtil.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/bookmarkexplorer/MarkerUtil.java
index 7d95fb1..e98cd97 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/bookmarkexplorer/MarkerUtil.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/bookmarkexplorer/MarkerUtil.java
@@ -14,14 +14,13 @@
package org.eclipse.ui.views.bookmarkexplorer;
+import java.text.DateFormat;
import java.util.Date;
import org.eclipse.core.resources.IMarker;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
-import com.ibm.icu.text.DateFormat;
-
/**
* Utility class for accessing marker attributes.
*
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/markers/internal/ConcreteMarker.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/markers/internal/ConcreteMarker.java
index 609fb85..58c5fba 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/markers/internal/ConcreteMarker.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/markers/internal/ConcreteMarker.java
@@ -14,14 +14,14 @@
*******************************************************************************/
package org.eclipse.ui.views.markers.internal;
+import java.text.CollationKey;
+import java.text.Collator;
+
import org.eclipse.core.resources.IMarker;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.e4.ui.internal.workspace.markers.Translation;
-import com.ibm.icu.text.CollationKey;
-import com.ibm.icu.text.Collator;
-
/**
* This is a concrete class that stores the same type of information as the IMarkers
* used by the IDE. This class exists as an optimization. The various get* methods
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/markers/internal/Util.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/markers/internal/Util.java
index da6a66e..860fcbb 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/markers/internal/Util.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/markers/internal/Util.java
@@ -15,6 +15,7 @@
package org.eclipse.ui.views.markers.internal;
+import java.text.DateFormat;
import java.util.Date;
import org.eclipse.core.resources.IMarker;
@@ -31,8 +32,6 @@
import org.eclipse.ui.internal.ide.Policy;
import org.eclipse.ui.views.markers.MarkerViewUtil;
-import com.ibm.icu.text.DateFormat;
-
/**
* The Util class is the class of general utilities used by the marker support.
*
diff --git a/bundles/org.eclipse.ui.navigator.resources/META-INF/MANIFEST.MF b/bundles/org.eclipse.ui.navigator.resources/META-INF/MANIFEST.MF
index d8a1365..a111be2 100644
--- a/bundles/org.eclipse.ui.navigator.resources/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.ui.navigator.resources/META-INF/MANIFEST.MF
@@ -26,5 +26,4 @@
org.eclipse.core.expressions;bundle-version="3.6.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
-Import-Package: com.ibm.icu.text
Automatic-Module-Name: org.eclipse.ui.navigator.resources
diff --git a/bundles/org.eclipse.ui.navigator.resources/src/org/eclipse/ui/internal/navigator/resources/workbench/ResourceExtensionSorter.java b/bundles/org.eclipse.ui.navigator.resources/src/org/eclipse/ui/internal/navigator/resources/workbench/ResourceExtensionSorter.java
index fe0b7bd..0fea27a 100644
--- a/bundles/org.eclipse.ui.navigator.resources/src/org/eclipse/ui/internal/navigator/resources/workbench/ResourceExtensionSorter.java
+++ b/bundles/org.eclipse.ui.navigator.resources/src/org/eclipse/ui/internal/navigator/resources/workbench/ResourceExtensionSorter.java
@@ -14,7 +14,7 @@
package org.eclipse.ui.internal.navigator.resources.workbench;
-
+import java.text.Collator;
// Sadly, there is nothing that can be done about these warnings, as
// the INavigatorSorterService has a method that returns a ViewerSorter, so
@@ -22,8 +22,6 @@
import org.eclipse.core.resources.IResource;
import org.eclipse.ui.views.navigator.ResourceSorter;
-import com.ibm.icu.text.Collator;
-
/**
* TODO - This refers to the deprecated ResourceSorter, however we are stuck with this
* for the time being because the CommonSorter extension point uses a ViewerSorter.
diff --git a/bundles/org.eclipse.ui.views.log/META-INF/MANIFEST.MF b/bundles/org.eclipse.ui.views.log/META-INF/MANIFEST.MF
index 5e83fd1..b389052 100644
--- a/bundles/org.eclipse.ui.views.log/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.ui.views.log/META-INF/MANIFEST.MF
@@ -10,7 +10,6 @@
org.eclipse.ui;bundle-version="[3.3.0,4.0.0)",
org.eclipse.ui.ide;bundle-version="[3.3.0,4.0.0)";resolution:=optional,
org.eclipse.e4.ui.dialogs;bundle-version="1.1.600"
-Import-Package: com.ibm.icu.text
Eclipse-LazyStart: true
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/EventDetailsDialog.java b/bundles/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/EventDetailsDialog.java
index 9d7ff48..022eb88 100644
--- a/bundles/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/EventDetailsDialog.java
+++ b/bundles/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/EventDetailsDialog.java
@@ -16,9 +16,9 @@
*******************************************************************************/
package org.eclipse.ui.internal.views.log;
-import com.ibm.icu.text.DateFormat;
import java.io.*;
import java.text.Collator;
+import java.text.DateFormat;
import java.util.*;
import java.util.List;
import org.eclipse.core.runtime.IAdaptable;
diff --git a/bundles/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/LogEntry.java b/bundles/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/LogEntry.java
index fa7f2c9..936dba4 100644
--- a/bundles/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/LogEntry.java
+++ b/bundles/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/LogEntry.java
@@ -16,11 +16,9 @@
*******************************************************************************/
package org.eclipse.ui.internal.views.log;
-import com.ibm.icu.text.DateFormat;
-import com.ibm.icu.text.SimpleDateFormat;
import java.io.PrintWriter;
import java.io.StringWriter;
-import java.text.ParseException;
+import java.text.*;
import java.util.*;
import org.eclipse.core.runtime.IStatus;
diff --git a/bundles/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/LogSession.java b/bundles/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/LogSession.java
index d4e74f8..6399d77 100644
--- a/bundles/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/LogSession.java
+++ b/bundles/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/LogSession.java
@@ -15,9 +15,9 @@
*******************************************************************************/
package org.eclipse.ui.internal.views.log;
-import com.ibm.icu.text.SimpleDateFormat;
import java.io.PrintWriter;
import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.Date;
/**
diff --git a/bundles/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/LogView.java b/bundles/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/LogView.java
index 23f4658..e173670 100644
--- a/bundles/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/LogView.java
+++ b/bundles/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/LogView.java
@@ -22,11 +22,11 @@
package org.eclipse.ui.internal.views.log;
-import com.ibm.icu.text.DateFormat;
-import com.ibm.icu.text.SimpleDateFormat;
import java.io.*;
import java.lang.reflect.InvocationTargetException;
import java.nio.charset.StandardCharsets;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
import java.util.*;
import java.util.List;
import java.util.Map.Entry;
diff --git a/bundles/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/LogViewLabelProvider.java b/bundles/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/LogViewLabelProvider.java
index 7eadb3a..ed98ab6 100644
--- a/bundles/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/LogViewLabelProvider.java
+++ b/bundles/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/LogViewLabelProvider.java
@@ -15,7 +15,7 @@
*******************************************************************************/
package org.eclipse.ui.internal.views.log;
-import com.ibm.icu.text.DateFormat;
+import java.text.DateFormat;
import java.util.ArrayList;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.jface.resource.JFaceResources;
diff --git a/bundles/org.eclipse.ui.views.properties.tabbed/META-INF/MANIFEST.MF b/bundles/org.eclipse.ui.views.properties.tabbed/META-INF/MANIFEST.MF
index 987efc3..7fcba34 100644
--- a/bundles/org.eclipse.ui.views.properties.tabbed/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.ui.views.properties.tabbed/META-INF/MANIFEST.MF
@@ -17,6 +17,5 @@
org.eclipse.e4.ui.css.core;bundle-version="0.12.100",
org.eclipse.e4.ui.css.swt,
org.eclipse.jface;bundle-version="[3.18.0,4.0.0)"
-Import-Package: com.ibm.icu.text
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.ui.views.properties.tabbed
diff --git a/bundles/org.eclipse.ui.views.properties.tabbed/src/org/eclipse/ui/internal/views/properties/tabbed/view/SectionDescriptor.java b/bundles/org.eclipse.ui.views.properties.tabbed/src/org/eclipse/ui/internal/views/properties/tabbed/view/SectionDescriptor.java
index 34c1ec0..1242341 100755
--- a/bundles/org.eclipse.ui.views.properties.tabbed/src/org/eclipse/ui/internal/views/properties/tabbed/view/SectionDescriptor.java
+++ b/bundles/org.eclipse.ui.views.properties.tabbed/src/org/eclipse/ui/internal/views/properties/tabbed/view/SectionDescriptor.java
@@ -14,6 +14,7 @@
*******************************************************************************/
package org.eclipse.ui.internal.views.properties.tabbed.view;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.List;
@@ -31,8 +32,6 @@
import org.osgi.framework.Bundle;
import org.osgi.framework.FrameworkUtil;
-import com.ibm.icu.text.MessageFormat;
-
/**
* Represents the default implementation of a section descriptor on the tabbed
* property sections extensions. This implementation assumes that we are
diff --git a/bundles/org.eclipse.ui.views.properties.tabbed/src/org/eclipse/ui/internal/views/properties/tabbed/view/TabDescriptor.java b/bundles/org.eclipse.ui.views.properties.tabbed/src/org/eclipse/ui/internal/views/properties/tabbed/view/TabDescriptor.java
index 6491ec4..264e3d0 100755
--- a/bundles/org.eclipse.ui.views.properties.tabbed/src/org/eclipse/ui/internal/views/properties/tabbed/view/TabDescriptor.java
+++ b/bundles/org.eclipse.ui.views.properties.tabbed/src/org/eclipse/ui/internal/views/properties/tabbed/view/TabDescriptor.java
@@ -14,6 +14,8 @@
*******************************************************************************/
package org.eclipse.ui.internal.views.properties.tabbed.view;
+import java.text.MessageFormat;
+
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IStatus;
@@ -28,8 +30,6 @@
import org.osgi.framework.Bundle;
import org.osgi.framework.FrameworkUtil;
-import com.ibm.icu.text.MessageFormat;
-
/**
* Represents the default implementation of a tab descriptor on the tabbed
* property tabs extensions.
diff --git a/bundles/org.eclipse.ui.views.properties.tabbed/src/org/eclipse/ui/internal/views/properties/tabbed/view/TabbedPropertyRegistry.java b/bundles/org.eclipse.ui.views.properties.tabbed/src/org/eclipse/ui/internal/views/properties/tabbed/view/TabbedPropertyRegistry.java
index 76a74ba..5fa20ac 100755
--- a/bundles/org.eclipse.ui.views.properties.tabbed/src/org/eclipse/ui/internal/views/properties/tabbed/view/TabbedPropertyRegistry.java
+++ b/bundles/org.eclipse.ui.views.properties.tabbed/src/org/eclipse/ui/internal/views/properties/tabbed/view/TabbedPropertyRegistry.java
@@ -14,6 +14,7 @@
*******************************************************************************/
package org.eclipse.ui.internal.views.properties.tabbed.view;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
@@ -41,8 +42,6 @@
import org.osgi.framework.Bundle;
import org.osgi.framework.FrameworkUtil;
-import com.ibm.icu.text.MessageFormat;
-
/**
* Provides information about the tabbed property extension points. Each tabbed
* property registry is associated with a unique contributor ID.
diff --git a/bundles/org.eclipse.ui.win32/src/org/eclipse/ui/internal/editorsupport/win32/OleMessages.java b/bundles/org.eclipse.ui.win32/src/org/eclipse/ui/internal/editorsupport/win32/OleMessages.java
index 57f027b..ce0e6fa 100644
--- a/bundles/org.eclipse.ui.win32/src/org/eclipse/ui/internal/editorsupport/win32/OleMessages.java
+++ b/bundles/org.eclipse.ui.win32/src/org/eclipse/ui/internal/editorsupport/win32/OleMessages.java
@@ -13,7 +13,7 @@
*******************************************************************************/
package org.eclipse.ui.internal.editorsupport.win32;
-import com.ibm.icu.text.MessageFormat;
+import java.text.MessageFormat;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/PerspectiveMenu.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/PerspectiveMenu.java
index 9830935..15fbf57 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/PerspectiveMenu.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/PerspectiveMenu.java
@@ -15,7 +15,7 @@
*******************************************************************************/
package org.eclipse.ui.actions;
-import com.ibm.icu.text.Collator;
+import java.text.Collator;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/PreferenceLinkArea.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/PreferenceLinkArea.java
index 0a75e21..44dacd7 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/PreferenceLinkArea.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/PreferenceLinkArea.java
@@ -15,9 +15,8 @@
import static org.eclipse.swt.events.SelectionListener.widgetSelectedAdapter;
-import com.ibm.icu.text.MessageFormat;
+import java.text.MessageFormat;
import java.util.Iterator;
-
import org.eclipse.jface.preference.IPreferenceNode;
import org.eclipse.jface.preference.PreferenceManager;
import org.eclipse.osgi.util.NLS;
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/WorkingSetConfigurationBlock.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/WorkingSetConfigurationBlock.java
index 7b62d99..7a20017 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/WorkingSetConfigurationBlock.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/WorkingSetConfigurationBlock.java
@@ -17,7 +17,7 @@
import static org.eclipse.swt.events.SelectionListener.widgetSelectedAdapter;
-import com.ibm.icu.text.Collator;
+import java.text.Collator;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ConfigurationInfo.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ConfigurationInfo.java
index e517380..5104287 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ConfigurationInfo.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ConfigurationInfo.java
@@ -16,11 +16,12 @@
import java.io.PrintWriter;
import java.io.StringWriter;
+import java.text.Collator;
+import java.text.DateFormat;
import java.util.Arrays;
import java.util.Comparator;
import java.util.Date;
import java.util.Locale;
-
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.Platform;
@@ -29,9 +30,6 @@
import org.eclipse.ui.about.ISystemSummarySection;
import org.eclipse.ui.internal.registry.IWorkbenchRegistryConstants;
-import com.ibm.icu.text.Collator;
-import com.ibm.icu.text.DateFormat;
-
/**
* This class contains utility methods that clients may use to obtain
* information about the system configuration.
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/EarlyStartupRunnable.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/EarlyStartupRunnable.java
index 1f16ff6..c6525e2 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/EarlyStartupRunnable.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/EarlyStartupRunnable.java
@@ -14,7 +14,7 @@
*******************************************************************************/
package org.eclipse.ui.internal;
-import com.ibm.icu.text.MessageFormat;
+import java.text.MessageFormat;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IExtension;
import org.eclipse.core.runtime.IStatus;
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ProductProperties.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ProductProperties.java
index d1eaa44..8fd247d 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ProductProperties.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ProductProperties.java
@@ -13,10 +13,10 @@
*******************************************************************************/
package org.eclipse.ui.internal;
-import com.ibm.icu.text.MessageFormat;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.MissingResourceException;
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ShowViewMenu.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ShowViewMenu.java
index 2272d0b..59e76ad 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ShowViewMenu.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ShowViewMenu.java
@@ -15,7 +15,7 @@
package org.eclipse.ui.internal;
-import com.ibm.icu.text.Collator;
+import java.text.Collator;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchPlugin.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchPlugin.java
index 5bf0908..9108b87 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchPlugin.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchPlugin.java
@@ -16,8 +16,9 @@
package org.eclipse.ui.internal;
-import com.ibm.icu.text.MessageFormat;
import java.lang.reflect.InvocationTargetException;
+import java.text.Bidi;
+import java.text.MessageFormat;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
@@ -881,7 +882,7 @@
try {
// use qualified class name to avoid import statement
// and premature attempt to resolve class reference
- boolean isBidi = com.ibm.icu.text.Bidi.requiresBidi(message.toCharArray(), 0, message.length());
+ boolean isBidi = Bidi.requiresBidi(message.toCharArray(), 0, message.length());
return Boolean.valueOf(isBidi);
} catch (NoClassDefFoundError e) {
// the ICU Base bundle used in place of ICU?
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkingSetComparator.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkingSetComparator.java
index 4e89686..8537d24 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkingSetComparator.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkingSetComparator.java
@@ -13,12 +13,10 @@
*******************************************************************************/
package org.eclipse.ui.internal;
+import java.text.Collator;
import java.util.Comparator;
-
import org.eclipse.ui.IWorkingSet;
-import com.ibm.icu.text.Collator;
-
/**
* Compares two working sets by name.
*/
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/about/AboutData.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/about/AboutData.java
index 77d2a8e..d58a1a6 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/about/AboutData.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/about/AboutData.java
@@ -14,9 +14,9 @@
*******************************************************************************/
package org.eclipse.ui.internal.about;
-import com.ibm.icu.text.Collator;
import java.io.IOException;
import java.net.URL;
+import java.text.Collator;
import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ws/EnablementDialog.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ws/EnablementDialog.java
index 34aaa26..e940b10 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ws/EnablementDialog.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ws/EnablementDialog.java
@@ -14,7 +14,7 @@
*******************************************************************************/
package org.eclipse.ui.internal.activities.ws;
-import com.ibm.icu.text.MessageFormat;
+import java.text.MessageFormat;
import java.util.Collection;
import java.util.HashSet;
import java.util.Properties;
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/DecoratorsPreferencePage.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/DecoratorsPreferencePage.java
index 2dfaa9d..f4f0fad 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/DecoratorsPreferencePage.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/DecoratorsPreferencePage.java
@@ -13,7 +13,7 @@
*******************************************************************************/
package org.eclipse.ui.internal.dialogs;
-import com.ibm.icu.text.Collator;
+import java.text.Collator;
import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/PerspectivesPreferencePage.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/PerspectivesPreferencePage.java
index 864af35..ee751b9 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/PerspectivesPreferencePage.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/PerspectivesPreferencePage.java
@@ -19,7 +19,7 @@
import static org.eclipse.swt.events.SelectionListener.widgetSelectedAdapter;
-import com.ibm.icu.text.Collator;
+import java.text.Collator;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkbenchEditorsDialog.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkbenchEditorsDialog.java
index aad8f7f..631d6fd 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkbenchEditorsDialog.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkbenchEditorsDialog.java
@@ -15,7 +15,7 @@
import static org.eclipse.swt.events.SelectionListener.widgetSelectedAdapter;
-import com.ibm.icu.text.Collator;
+import java.text.Collator;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/KeysPreferencePage.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/KeysPreferencePage.java
index 7445dbe..b2dc9d7 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/KeysPreferencePage.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/KeysPreferencePage.java
@@ -19,12 +19,12 @@
import static org.eclipse.swt.events.SelectionListener.widgetDefaultSelectedAdapter;
import static org.eclipse.swt.events.SelectionListener.widgetSelectedAdapter;
-import com.ibm.icu.text.Collator;
-import com.ibm.icu.text.MessageFormat;
import java.io.BufferedWriter;
import java.io.FileWriter;
import java.io.IOException;
import java.io.Writer;
+import java.text.Collator;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/misc/StringMatcher.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/misc/StringMatcher.java
index 594402b..b08e694 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/misc/StringMatcher.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/misc/StringMatcher.java
@@ -15,7 +15,7 @@
*******************************************************************************/
package org.eclipse.ui.internal.misc;
-import com.ibm.icu.text.BreakIterator;
+import java.text.BreakIterator;
import java.util.ArrayList;
import java.util.List;
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressInfoItem.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressInfoItem.java
index 55d2a6e..45356d8 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressInfoItem.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressInfoItem.java
@@ -19,8 +19,8 @@
import static org.eclipse.swt.events.SelectionListener.widgetSelectedAdapter;
-import com.ibm.icu.text.DateFormat;
import java.net.URL;
+import java.text.DateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.Iterator;
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/EditorRegistry.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/EditorRegistry.java
index 920c44b..2b7ae5a 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/EditorRegistry.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/EditorRegistry.java
@@ -18,7 +18,6 @@
*******************************************************************************/
package org.eclipse.ui.internal.registry;
-import com.ibm.icu.text.Collator;
import java.io.BufferedReader;
import java.io.FileInputStream;
import java.io.IOException;
@@ -28,6 +27,7 @@
import java.io.StringWriter;
import java.io.Writer;
import java.nio.charset.StandardCharsets;
+import java.text.Collator;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/PreferenceTransferRegistryReader.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/PreferenceTransferRegistryReader.java
index 0478cb66..4e026d4 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/PreferenceTransferRegistryReader.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/PreferenceTransferRegistryReader.java
@@ -15,7 +15,7 @@
package org.eclipse.ui.internal.registry;
-import com.ibm.icu.text.Collator;
+import java.text.Collator;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/WizardsRegistryReader.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/WizardsRegistryReader.java
index fbebd22..91b3cc8 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/WizardsRegistryReader.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/WizardsRegistryReader.java
@@ -14,7 +14,7 @@
*******************************************************************************/
package org.eclipse.ui.internal.registry;
-import com.ibm.icu.text.Collator;
+import java.text.Collator;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/statushandlers/DefaultDetailsArea.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/statushandlers/DefaultDetailsArea.java
index 2fb3613..d600342 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/statushandlers/DefaultDetailsArea.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/statushandlers/DefaultDetailsArea.java
@@ -15,7 +15,7 @@
package org.eclipse.ui.internal.statushandlers;
-import com.ibm.icu.text.DateFormat;
+import java.text.DateFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/statushandlers/LabelProviderWrapper.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/statushandlers/LabelProviderWrapper.java
index 09586ce..b54ddab 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/statushandlers/LabelProviderWrapper.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/statushandlers/LabelProviderWrapper.java
@@ -13,8 +13,8 @@
******************************************************************************/
package org.eclipse.ui.internal.statushandlers;
-import com.ibm.icu.text.DateFormat;
import java.net.URL;
+import java.text.DateFormat;
import java.util.Collection;
import java.util.Date;
import java.util.Map;
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/ColorsAndFontsPreferencePage.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/ColorsAndFontsPreferencePage.java
index 6da22a6..1101139 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/ColorsAndFontsPreferencePage.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/ColorsAndFontsPreferencePage.java
@@ -21,7 +21,7 @@
import static org.eclipse.swt.events.SelectionListener.widgetSelectedAdapter;
import static org.eclipse.ui.internal.themes.WorkbenchThemeManager.EMPTY_COLOR_VALUE;
-import com.ibm.icu.text.MessageFormat;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/ThemeElementDefinition.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/ThemeElementDefinition.java
index 4067293..6e9ff88 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/ThemeElementDefinition.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/ThemeElementDefinition.java
@@ -15,7 +15,7 @@
package org.eclipse.ui.internal.themes;
-import com.ibm.icu.text.MessageFormat;
+import java.text.MessageFormat;
import java.util.ResourceBundle;
/**
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/WorkbenchPart.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/WorkbenchPart.java
index 2a2dfe5..7fa642c 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/WorkbenchPart.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/WorkbenchPart.java
@@ -15,7 +15,7 @@
*******************************************************************************/
package org.eclipse.ui.part;
-import com.ibm.icu.text.MessageFormat;
+import java.text.MessageFormat;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
diff --git a/bundles/org.eclipse.ui.workbench/META-INF/MANIFEST.MF b/bundles/org.eclipse.ui.workbench/META-INF/MANIFEST.MF
index 4decf8c..3431560 100644
--- a/bundles/org.eclipse.ui.workbench/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.ui.workbench/META-INF/MANIFEST.MF
@@ -117,8 +117,7 @@
org.eclipse.e4.ui.services;bundle-version="1.3.0",
org.eclipse.emf.ecore.xmi;bundle-version="2.11.0",
org.eclipse.e4.core.di.extensions;bundle-version="0.13.0"
-Import-Package: com.ibm.icu.text,
- com.ibm.icu.util,
+Import-Package: com.ibm.icu.util,
javax.annotation,
javax.inject;version="1.0.0",
javax.xml.parsers,
