Index: compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java,v
retrieving revision 1.149
diff -u -r1.149 TextMergeViewer.java
--- compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java	28 Mar 2006 14:50:59 -0000	1.149
+++ compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java	9 Apr 2006 03:23:09 -0000
@@ -18,7 +18,7 @@
 import java.util.Map;
 import java.util.HashMap;
 import java.util.ResourceBundle;
-import java.text.MessageFormat;
+import com.ibm.icu.text.MessageFormat;
 
 import java.io.UnsupportedEncodingException;
 import java.lang.reflect.InvocationTargetException;
Index: compare/org/eclipse/compare/rangedifferencer/RangeDifferencer.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.compare/compare/org/eclipse/compare/rangedifferencer/RangeDifferencer.java,v
retrieving revision 1.16
diff -u -r1.16 RangeDifferencer.java
--- compare/org/eclipse/compare/rangedifferencer/RangeDifferencer.java	21 Jun 2005 12:37:19 -0000	1.16
+++ compare/org/eclipse/compare/rangedifferencer/RangeDifferencer.java	9 Apr 2006 03:23:15 -0000
@@ -10,7 +10,8 @@
  *******************************************************************************/
 package org.eclipse.compare.rangedifferencer;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 
 import org.eclipse.jface.util.Assert;
 
Index: compare/org/eclipse/compare/internal/ComparePreferencePage.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java,v
retrieving revision 1.42
diff -u -r1.42 ComparePreferencePage.java
--- compare/org/eclipse/compare/internal/ComparePreferencePage.java	28 Mar 2006 14:50:59 -0000	1.42
+++ compare/org/eclipse/compare/internal/ComparePreferencePage.java	9 Apr 2006 03:23:10 -0000
@@ -11,7 +11,9 @@
 package org.eclipse.compare.internal;
 
 import java.io.*;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
 
 import org.eclipse.ui.*;
 import org.eclipse.ui.dialogs.PreferenceLinkArea;
Index: compare/org/eclipse/compare/internal/Messages.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.compare/compare/org/eclipse/compare/internal/Messages.java,v
retrieving revision 1.1
diff -u -r1.1 Messages.java
--- compare/org/eclipse/compare/internal/Messages.java	14 Apr 2005 13:53:03 -0000	1.1
+++ compare/org/eclipse/compare/internal/Messages.java	9 Apr 2006 03:23:12 -0000
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.compare.internal;
 
-import java.text.MessageFormat;
+import com.ibm.icu.text.MessageFormat;
 
 /**
  * Helper class to format message strings.
Index: compare/org/eclipse/compare/internal/MergeSourceViewer.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.compare/compare/org/eclipse/compare/internal/MergeSourceViewer.java,v
retrieving revision 1.24
diff -u -r1.24 MergeSourceViewer.java
--- compare/org/eclipse/compare/internal/MergeSourceViewer.java	28 Mar 2006 14:50:59 -0000	1.24
+++ compare/org/eclipse/compare/internal/MergeSourceViewer.java	9 Apr 2006 03:23:12 -0000
@@ -10,7 +10,9 @@
  *******************************************************************************/
 package org.eclipse.compare.internal;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.ResourceBundle;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.StyledText;
Index: compare/org/eclipse/compare/internal/CompareFilter.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareFilter.java,v
retrieving revision 1.8
diff -u -r1.8 CompareFilter.java
--- compare/org/eclipse/compare/internal/CompareFilter.java	28 Mar 2006 14:50:59 -0000	1.8
+++ compare/org/eclipse/compare/internal/CompareFilter.java	9 Apr 2006 03:23:10 -0000
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.compare.internal;
 
-import java.text.MessageFormat;
+import com.ibm.icu.text.MessageFormat;
 import java.util.StringTokenizer;
 
 import org.eclipse.core.resources.*;
Index: compare/org/eclipse/compare/internal/ResourceCompareInput.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.compare/compare/org/eclipse/compare/internal/ResourceCompareInput.java,v
retrieving revision 1.31
diff -u -r1.31 ResourceCompareInput.java
--- compare/org/eclipse/compare/internal/ResourceCompareInput.java	28 Mar 2006 14:50:59 -0000	1.31
+++ compare/org/eclipse/compare/internal/ResourceCompareInput.java	9 Apr 2006 03:23:12 -0000
@@ -11,7 +11,7 @@
 package org.eclipse.compare.internal;
 
 import java.lang.reflect.InvocationTargetException;
-import java.text.MessageFormat;
+import com.ibm.icu.text.MessageFormat;
 import java.util.HashSet;
 import java.util.Set;
 
Index: compare/org/eclipse/compare/internal/DocumentManager.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.compare/compare/org/eclipse/compare/internal/DocumentManager.java,v
retrieving revision 1.6
diff -u -r1.6 DocumentManager.java
--- compare/org/eclipse/compare/internal/DocumentManager.java	28 Mar 2006 14:50:59 -0000	1.6
+++ compare/org/eclipse/compare/internal/DocumentManager.java	9 Apr 2006 03:23:11 -0000
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.compare.internal;
 
-import java.util.*;
+import java.util.ArrayList;
 
 import org.eclipse.jface.text.IDocument;
 
Index: compare/org/eclipse/compare/internal/CompareUIPlugin.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java,v
retrieving revision 1.59
diff -u -r1.59 CompareUIPlugin.java
--- compare/org/eclipse/compare/internal/CompareUIPlugin.java	28 Mar 2006 14:50:59 -0000	1.59
+++ compare/org/eclipse/compare/internal/CompareUIPlugin.java	9 Apr 2006 03:23:11 -0000
@@ -13,8 +13,16 @@
 import java.io.*;
 import java.lang.reflect.InvocationTargetException;
 import java.net.*;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Hashtable;
+import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
+import java.util.ResourceBundle;
+import java.util.Set;
+import java.util.StringTokenizer;
 
 import org.eclipse.ui.*;
 import org.eclipse.ui.model.IWorkbenchAdapter;
Index: compare/org/eclipse/compare/internal/Utilities.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java,v
retrieving revision 1.47
diff -u -r1.47 Utilities.java
--- compare/org/eclipse/compare/internal/Utilities.java	28 Mar 2006 14:50:58 -0000	1.47
+++ compare/org/eclipse/compare/internal/Utilities.java	9 Apr 2006 03:23:12 -0000
@@ -11,9 +11,14 @@
 package org.eclipse.compare.internal;
 
 import java.io.*;
-import java.text.MessageFormat;
-import java.util.*;
+import com.ibm.icu.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
 
 import org.eclipse.swt.widgets.*;
 
Index: compare/org/eclipse/compare/internal/AddFromHistoryDialog.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryDialog.java,v
retrieving revision 1.27
diff -u -r1.27 AddFromHistoryDialog.java
--- compare/org/eclipse/compare/internal/AddFromHistoryDialog.java	28 Mar 2006 14:50:59 -0000	1.27
+++ compare/org/eclipse/compare/internal/AddFromHistoryDialog.java	9 Apr 2006 03:23:10 -0000
@@ -11,8 +11,13 @@
 package org.eclipse.compare.internal;
 
 import java.io.*;
-import java.text.*;
-import java.util.*;
+import com.ibm.icu.text.DateFormat;
+import com.ibm.icu.text.MessageFormat;
+import java.util.ArrayList;
+import com.ibm.icu.util.Calendar;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.ResourceBundle;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.*;
Index: compare/org/eclipse/compare/internal/BinaryCompareViewer.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.compare/compare/org/eclipse/compare/internal/BinaryCompareViewer.java,v
retrieving revision 1.19
diff -u -r1.19 BinaryCompareViewer.java
--- compare/org/eclipse/compare/internal/BinaryCompareViewer.java	28 Mar 2006 14:50:58 -0000	1.19
+++ compare/org/eclipse/compare/internal/BinaryCompareViewer.java	9 Apr 2006 03:23:10 -0000
@@ -12,7 +12,7 @@
 
 import java.io.*;
 import java.util.ResourceBundle;
-import java.text.MessageFormat;
+import com.ibm.icu.text.MessageFormat;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.*;
Index: compare/org/eclipse/compare/structuremergeviewer/DiffNode.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffNode.java,v
retrieving revision 1.22
diff -u -r1.22 DiffNode.java
--- compare/org/eclipse/compare/structuremergeviewer/DiffNode.java	28 Mar 2006 14:50:59 -0000	1.22
+++ compare/org/eclipse/compare/structuremergeviewer/DiffNode.java	9 Apr 2006 03:23:15 -0000
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.compare.structuremergeviewer;
 
-import java.text.MessageFormat;
+import com.ibm.icu.text.MessageFormat;
 
 import org.eclipse.swt.graphics.Image;
 
Index: compare/org/eclipse/compare/structuremergeviewer/Differencer.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/Differencer.java,v
retrieving revision 1.17
diff -u -r1.17 Differencer.java
--- compare/org/eclipse/compare/structuremergeviewer/Differencer.java	21 Jun 2005 12:37:18 -0000	1.17
+++ compare/org/eclipse/compare/structuremergeviewer/Differencer.java	9 Apr 2006 03:23:16 -0000
@@ -11,8 +11,14 @@
 package org.eclipse.compare.structuremergeviewer;
 
 import java.io.*;
-import java.util.*;
-import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import com.ibm.icu.text.MessageFormat;
 
 import org.eclipse.jface.util.Assert;
 
Index: compare/org/eclipse/compare/internal/patch/LineReader.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/LineReader.java,v
retrieving revision 1.12
diff -u -r1.12 LineReader.java
--- compare/org/eclipse/compare/internal/patch/LineReader.java	28 Mar 2006 14:51:00 -0000	1.12
+++ compare/org/eclipse/compare/internal/patch/LineReader.java	9 Apr 2006 03:23:13 -0000
@@ -11,7 +11,8 @@
 package org.eclipse.compare.internal.patch;
 
 import java.io.*;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 
 import org.eclipse.jface.util.Assert;
 
Index: compare/org/eclipse/compare/internal/patch/Patcher.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/Patcher.java,v
retrieving revision 1.36
diff -u -r1.36 Patcher.java
--- compare/org/eclipse/compare/internal/patch/Patcher.java	6 Oct 2005 17:18:00 -0000	1.36
+++ compare/org/eclipse/compare/internal/patch/Patcher.java	9 Apr 2006 03:23:14 -0000
@@ -12,8 +12,15 @@
 package org.eclipse.compare.internal.patch;
 
 import java.io.*;
-import java.text.*;
-import java.util.*;
+import com.ibm.icu.text.DateFormat;
+import com.ibm.icu.text.SimpleDateFormat;
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.StringTokenizer;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Shell;
Index: compare/org/eclipse/compare/internal/patch/PreviewPatchPage.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PreviewPatchPage.java,v
retrieving revision 1.32
diff -u -r1.32 PreviewPatchPage.java
--- compare/org/eclipse/compare/internal/patch/PreviewPatchPage.java	17 Mar 2006 22:03:27 -0000	1.32
+++ compare/org/eclipse/compare/internal/patch/PreviewPatchPage.java	9 Apr 2006 03:23:15 -0000
@@ -14,7 +14,7 @@
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.lang.reflect.InvocationTargetException;
-import java.text.MessageFormat;
+import com.ibm.icu.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
Index: compare/org/eclipse/compare/internal/patch/PatchTargetPage.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchTargetPage.java,v
retrieving revision 1.4
diff -u -r1.4 PatchTargetPage.java
--- compare/org/eclipse/compare/internal/patch/PatchTargetPage.java	28 Mar 2006 14:51:00 -0000	1.4
+++ compare/org/eclipse/compare/internal/patch/PatchTargetPage.java	9 Apr 2006 03:23:13 -0000
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.compare.internal.patch;
 
-import java.text.MessageFormat;
+import com.ibm.icu.text.MessageFormat;
 
 import org.eclipse.compare.internal.ICompareContextIds;
 import org.eclipse.compare.internal.Utilities;
Index: compare/org/eclipse/compare/internal/patch/InputPatchPage.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/InputPatchPage.java,v
retrieving revision 1.30
diff -u -r1.30 InputPatchPage.java
--- compare/org/eclipse/compare/internal/patch/InputPatchPage.java	17 Mar 2006 22:03:27 -0000	1.30
+++ compare/org/eclipse/compare/internal/patch/InputPatchPage.java	9 Apr 2006 03:23:13 -0000
@@ -18,7 +18,7 @@
 import java.io.IOException;
 import java.io.Reader;
 import java.io.StringReader;
-import java.text.MessageFormat;
+import com.ibm.icu.text.MessageFormat;
 
 import org.eclipse.compare.internal.ICompareContextIds;
 import org.eclipse.compare.internal.Utilities;
Index: compare/org/eclipse/compare/ZipFileStructureCreator.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.compare/compare/org/eclipse/compare/ZipFileStructureCreator.java,v
retrieving revision 1.18
diff -u -r1.18 ZipFileStructureCreator.java
--- compare/org/eclipse/compare/ZipFileStructureCreator.java	21 Jun 2005 12:37:18 -0000	1.18
+++ compare/org/eclipse/compare/ZipFileStructureCreator.java	9 Apr 2006 03:23:06 -0000
@@ -11,7 +11,8 @@
 package org.eclipse.compare;
 
 import java.io.*;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Iterator;
 import java.util.zip.*;
 
 import org.eclipse.core.runtime.CoreException;
Index: compare/org/eclipse/compare/CompareViewerSwitchingPane.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.compare/compare/org/eclipse/compare/CompareViewerSwitchingPane.java,v
retrieving revision 1.24
diff -u -r1.24 CompareViewerSwitchingPane.java
--- compare/org/eclipse/compare/CompareViewerSwitchingPane.java	28 Mar 2006 14:50:59 -0000	1.24
+++ compare/org/eclipse/compare/CompareViewerSwitchingPane.java	9 Apr 2006 03:23:05 -0000
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.compare;
 
-import java.text.MessageFormat;
+import com.ibm.icu.text.MessageFormat;
 
 import org.eclipse.swt.events.*;
 import org.eclipse.swt.graphics.Image;
Index: compare/org/eclipse/compare/EditionSelectionDialog.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java,v
retrieving revision 1.59
diff -u -r1.59 EditionSelectionDialog.java
--- compare/org/eclipse/compare/EditionSelectionDialog.java	28 Mar 2006 14:50:59 -0000	1.59
+++ compare/org/eclipse/compare/EditionSelectionDialog.java	9 Apr 2006 03:23:06 -0000
@@ -18,9 +18,10 @@
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.HashSet;
-import java.util.Calendar;
+import com.ibm.icu.util.Calendar;
 import java.util.Comparator;
-import java.text.*;
+import com.ibm.icu.text.DateFormat;
+import com.ibm.icu.text.MessageFormat;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.*;
Index: META-INF/MANIFEST.MF
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.compare/META-INF/MANIFEST.MF,v
retrieving revision 1.6
diff -u -r1.6 MANIFEST.MF
--- META-INF/MANIFEST.MF	26 Jan 2006 21:54:29 -0000	1.6
+++ META-INF/MANIFEST.MF	9 Apr 2006 03:23:05 -0000
@@ -22,3 +22,4 @@
  org.eclipse.ui.workbench.texteditor;bundle-version="[3.1.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.1.0,4.0.0)"
 Eclipse-LazyStart: true
+Import-Package: com.ibm.icu.text