Bug 561904 - Remove com.ibm.icu.text from p2I20200411-0950I20200411-0720

Change-Id: Ic95dcf957df322ccca4e6339fffe0dac9389caaf
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>

7 files changed, 71 insertions, 57 deletions

diff --git a/bundles/org.eclipse.equinox.p2.ui.discovery/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.ui.discovery/META-INF/MANIFEST.MF
index 1fe4fa385..12c0d2aaf 100644
--- a/bundles/org.eclipse.equinox.p2.ui.discovery/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.ui.discovery/META-INF/MANIFEST.MF
@@ -24,6 +24,5 @@ Export-Package: org.eclipse.equinox.internal.p2.ui.discovery;x-internal:=true,
  org.eclipse.equinox.internal.p2.ui.discovery.util;x-internal:=true,
  org.eclipse.equinox.internal.p2.ui.discovery.wizards;x-internal:=true
 Bundle-ClassPath: .
-Import-Package: com.ibm.icu.text,
- org.eclipse.equinox.p2.planner;version="2.0.0"
+Import-Package: org.eclipse.equinox.p2.planner;version="2.0.0"
 Automatic-Module-Name: org.eclipse.equinox.p2.ui.discovery
diff --git a/bundles/org.eclipse.equinox.p2.ui.discovery/src/org/eclipse/equinox/internal/p2/ui/discovery/util/PatternFilter.java b/bundles/org.eclipse.equinox.p2.ui.discovery/src/org/eclipse/equinox/internal/p2/ui/discovery/util/PatternFilter.java
index 0ff29eeb5..7724931da 100644
--- a/bundles/org.eclipse.equinox.p2.ui.discovery/src/org/eclipse/equinox/internal/p2/ui/discovery/util/PatternFilter.java
+++ b/bundles/org.eclipse.equinox.p2.ui.discovery/src/org/eclipse/equinox/internal/p2/ui/discovery/util/PatternFilter.java
@@ -14,7 +14,7 @@
  *******************************************************************************/
 package org.eclipse.equinox.internal.p2.ui.discovery.util;
 
-import com.ibm.icu.text.BreakIterator;
+import java.text.BreakIterator;
 import java.util.*;
 import org.eclipse.jface.viewers.*;
 import org.eclipse.ui.internal.misc.StringMatcher;
diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/META-INF/MANIFEST.MF
index a399455c5..cebdd8dea 100644
--- a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/META-INF/MANIFEST.MF
@@ -15,8 +15,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.equinox.p2.repository;bundle-version="2.3.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
-Import-Package: com.ibm.icu.util;version="4.0.1",
- org.eclipse.equinox.internal.p2.core.helpers,
+Import-Package: org.eclipse.equinox.internal.p2.core.helpers,
  org.eclipse.equinox.internal.p2.engine,
  org.eclipse.equinox.internal.p2.engine.phases,
  org.eclipse.equinox.internal.p2.garbagecollector,
diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/AutomaticUpdatesPreferencePage.java b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/AutomaticUpdatesPreferencePage.java
index a0840dfb4..f8184f6ad 100644
--- a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/AutomaticUpdatesPreferencePage.java
+++ b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/AutomaticUpdatesPreferencePage.java
@@ -16,10 +16,8 @@
  *******************************************************************************/
 package org.eclipse.equinox.internal.p2.ui.sdk.scheduler;
 
-import com.ibm.icu.util.Calendar;
 import java.text.DateFormat;
-import java.util.Date;
-import java.util.Locale;
+import java.util.*;
 import org.eclipse.core.runtime.IProduct;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.jface.dialogs.Dialog;
@@ -58,7 +56,8 @@ public class AutomaticUpdatesPreferencePage extends PreferencePage implements IW
 
 	@Override
 	protected Control createContents(Composite parent) {
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IAutomaticUpdaterHelpContextIds.AUTOMATIC_UPDATES_PREFERENCE_PAGE);
+		PlatformUI.getWorkbench().getHelpSystem().setHelp(parent,
+				IAutomaticUpdaterHelpContextIds.AUTOMATIC_UPDATES_PREFERENCE_PAGE);
 
 		Composite container = new Composite(parent, SWT.NULL);
 		GridLayout layout = new GridLayout();
@@ -71,7 +70,8 @@ public class AutomaticUpdatesPreferencePage extends PreferencePage implements IW
 		createSpacer(container, 1);
 
 		updateScheduleGroup = new Group(container, SWT.NONE);
-		updateScheduleGroup.setText(NLS.bind(AutomaticUpdateMessages.AutomaticUpdatesPreferencePage_UpdateSchedule, lastCheckForUpdateDateString()));
+		updateScheduleGroup.setText(NLS.bind(AutomaticUpdateMessages.AutomaticUpdatesPreferencePage_UpdateSchedule,
+				lastCheckForUpdateDateString()));
 		layout = new GridLayout();
 		layout.numColumns = 3;
 		updateScheduleGroup.setLayout(layout);
@@ -80,8 +80,10 @@ public class AutomaticUpdatesPreferencePage extends PreferencePage implements IW
 
 		onStartupRadio = new Button(updateScheduleGroup, SWT.RADIO);
 		IProduct product = Platform.getProduct();
-		String productName = product != null && product.getName() != null ? product.getName() : AutomaticUpdateMessages.AutomaticUpdatesPreferencePage_GenericProductName;
-		onStartupRadio.setText(NLS.bind(AutomaticUpdateMessages.AutomaticUpdatesPreferencePage_findOnStart, productName));
+		String productName = product != null && product.getName() != null ? product.getName()
+				: AutomaticUpdateMessages.AutomaticUpdatesPreferencePage_GenericProductName;
+		onStartupRadio
+				.setText(NLS.bind(AutomaticUpdateMessages.AutomaticUpdatesPreferencePage_findOnStart, productName));
 		gd = new GridData();
 		gd.horizontalSpan = 3;
 		onStartupRadio.setLayoutData(gd);
@@ -172,12 +174,14 @@ public class AutomaticUpdatesPreferencePage extends PreferencePage implements IW
 	}
 
 	private static String lastCheckForUpdateDateString() {
-		Date lastCheckDate = new LastAutoCheckForUpdateMemo(AutomaticUpdatePlugin.getDefault().getAgentLocation()).read();
+		Date lastCheckDate = new LastAutoCheckForUpdateMemo(AutomaticUpdatePlugin.getDefault().getAgentLocation())
+				.read();
 		if (lastCheckDate == null) {
 			return AutomaticUpdateMessages.AutomaticUpdatesPreferencePage_never;
 		}
 
-		DateFormat formatter = DateFormat.getDateTimeInstance(DateFormat.DEFAULT, DateFormat.SHORT, Locale.getDefault());
+		DateFormat formatter = DateFormat.getDateTimeInstance(DateFormat.DEFAULT, DateFormat.SHORT,
+				Locale.getDefault());
 		return formatter.format(lastCheckDate);
 	}
 
@@ -197,7 +201,8 @@ public class AutomaticUpdatesPreferencePage extends PreferencePage implements IW
 
 		remindScheduleRadio.setSelection(pref.getBoolean(PreferenceConstants.PREF_REMIND_SCHEDULE));
 		remindOnceRadio.setSelection(!pref.getBoolean(PreferenceConstants.PREF_REMIND_SCHEDULE));
-		remindElapseCombo.setText(AutomaticUpdatesPopup.getElapsedTimeString(pref.getString(PreferenceConstants.PREF_REMIND_ELAPSED)));
+		remindElapseCombo.setText(
+				AutomaticUpdatesPopup.getElapsedTimeString(pref.getString(PreferenceConstants.PREF_REMIND_ELAPSED)));
 		searchOnlyRadio.setSelection(!pref.getBoolean(PreferenceConstants.PREF_DOWNLOAD_ONLY));
 		searchAndDownloadRadio.setSelection(pref.getBoolean(PreferenceConstants.PREF_DOWNLOAD_ONLY));
 		showUpdateWizard.setSelection(pref.getBoolean(PreferenceConstants.PREF_SHOW_UPDATE_WIZARD));
@@ -239,7 +244,8 @@ public class AutomaticUpdatesPreferencePage extends PreferencePage implements IW
 
 		remindOnceRadio.setSelection(!pref.getDefaultBoolean(PreferenceConstants.PREF_REMIND_SCHEDULE));
 		remindScheduleRadio.setSelection(pref.getDefaultBoolean(PreferenceConstants.PREF_REMIND_SCHEDULE));
-		remindElapseCombo.setText(AutomaticUpdatesPopup.getElapsedTimeString(pref.getDefaultString(PreferenceConstants.PREF_REMIND_ELAPSED)));
+		remindElapseCombo.setText(AutomaticUpdatesPopup
+				.getElapsedTimeString(pref.getDefaultString(PreferenceConstants.PREF_REMIND_ELAPSED)));
 
 		searchOnlyRadio.setSelection(!pref.getDefaultBoolean(PreferenceConstants.PREF_DOWNLOAD_ONLY));
 		searchAndDownloadRadio.setSelection(pref.getDefaultBoolean(PreferenceConstants.PREF_DOWNLOAD_ONLY));
@@ -259,15 +265,18 @@ public class AutomaticUpdatesPreferencePage extends PreferencePage implements IW
 		if (onStartupRadio.getSelection()) {
 			pref.setValue(PreferenceConstants.PREF_AUTO_UPDATE_SCHEDULE, PreferenceConstants.PREF_UPDATE_ON_STARTUP);
 		} else if (onFuzzyScheduleRadio.getSelection()) {
-			pref.setValue(PreferenceConstants.PREF_AUTO_UPDATE_SCHEDULE, PreferenceConstants.PREF_UPDATE_ON_FUZZY_SCHEDULE);
-			new LastAutoCheckForUpdateMemo(AutomaticUpdatePlugin.getDefault().getAgentLocation()).readAndStoreIfAbsent(Calendar.getInstance().getTime());
+			pref.setValue(PreferenceConstants.PREF_AUTO_UPDATE_SCHEDULE,
+					PreferenceConstants.PREF_UPDATE_ON_FUZZY_SCHEDULE);
+			new LastAutoCheckForUpdateMemo(AutomaticUpdatePlugin.getDefault().getAgentLocation())
+					.readAndStoreIfAbsent(Calendar.getInstance().getTime());
 		} else {
 			pref.setValue(PreferenceConstants.PREF_AUTO_UPDATE_SCHEDULE, PreferenceConstants.PREF_UPDATE_ON_SCHEDULE);
 		}
 
 		if (remindScheduleRadio.getSelection()) {
 			pref.setValue(PreferenceConstants.PREF_REMIND_SCHEDULE, true);
-			pref.setValue(PreferenceConstants.PREF_REMIND_ELAPSED, AutomaticUpdatesPopup.ELAPSED_VALUES[remindElapseCombo.getSelectionIndex()]);
+			pref.setValue(PreferenceConstants.PREF_REMIND_ELAPSED,
+					AutomaticUpdatesPopup.ELAPSED_VALUES[remindElapseCombo.getSelectionIndex()]);
 		} else {
 			pref.setValue(PreferenceConstants.PREF_REMIND_SCHEDULE, false);
 		}
@@ -284,7 +293,8 @@ public class AutomaticUpdatesPreferencePage extends PreferencePage implements IW
 	}
 
 	private int getFuzzyRecurrence(IPreferenceStore pref, boolean useDefault) {
-		String day = useDefault ? pref.getDefaultString(AutomaticUpdateScheduler.P_FUZZY_RECURRENCE) : pref.getString(AutomaticUpdateScheduler.P_FUZZY_RECURRENCE);
+		String day = useDefault ? pref.getDefaultString(AutomaticUpdateScheduler.P_FUZZY_RECURRENCE)
+				: pref.getString(AutomaticUpdateScheduler.P_FUZZY_RECURRENCE);
 		for (int i = 0; i < AutomaticUpdateScheduler.FUZZY_RECURRENCE.length; i++)
 			if (AutomaticUpdateScheduler.FUZZY_RECURRENCE[i].equals(day))
 				return i;
diff --git a/bundles/org.eclipse.equinox.p2.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.ui/META-INF/MANIFEST.MF
index 719b02426..ce1747bd1 100644
--- a/bundles/org.eclipse.equinox.p2.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.ui/META-INF/MANIFEST.MF
@@ -36,8 +36,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.107.0",
  org.eclipse.core.expressions,
  org.eclipse.equinox.security.ui;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.e4.ui.dialogs;bundle-version="1.1.600"
-Import-Package: com.ibm.icu.text,
- javax.xml.parsers,
+Import-Package: javax.xml.parsers,
  org.eclipse.equinox.internal.p2.artifact.repository,
  org.eclipse.equinox.internal.p2.core.helpers,
  org.eclipse.equinox.internal.p2.director,
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RepositorySelectionGroup.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RepositorySelectionGroup.java
index bd9047a9a..2936e3987 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RepositorySelectionGroup.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RepositorySelectionGroup.java
@@ -15,10 +15,10 @@
  *******************************************************************************/
 package org.eclipse.equinox.internal.p2.ui.dialogs;
 
-import com.ibm.icu.text.Collator;
 import java.lang.reflect.InvocationTargetException;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.text.Collator;
 import java.util.*;
 import org.eclipse.core.runtime.*;
 import org.eclipse.equinox.internal.p2.ui.*;
@@ -47,8 +47,8 @@ import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.*;
 
 /**
- * A RepositorySelectionGroup is a reusable UI component that displays
- * available repositories and allows the user to select them.
+ * A RepositorySelectionGroup is a reusable UI component that displays available
+ * repositories and allows the user to select them.
  *
  * @since 3.5
  */
@@ -81,7 +81,8 @@ public class RepositorySelectionGroup {
 	URI[] comboRepos; // the URIs shown in the combo, kept in sync with combo items
 	HashMap<String, URI> disabledRepoProposals = new HashMap<>(); // proposal string -> disabled URI
 
-	public RepositorySelectionGroup(ProvisioningUI ui, IWizardContainer container, Composite parent, IUViewQueryContext queryContext) {
+	public RepositorySelectionGroup(ProvisioningUI ui, IWizardContainer container, Composite parent,
+			IUViewQueryContext queryContext) {
 		this.container = container;
 		this.queryContext = queryContext;
 		this.ui = ui;
@@ -99,8 +100,10 @@ public class RepositorySelectionGroup {
 	protected void createControl(Composite parent) {
 		final RepositoryTracker tracker = ui.getRepositoryTracker();
 		// Get the possible field error indicators
-		info = FieldDecorationRegistry.getDefault().getFieldDecoration(FieldDecorationRegistry.DEC_INFORMATION).getImage();
-		warning = FieldDecorationRegistry.getDefault().getFieldDecoration(FieldDecorationRegistry.DEC_WARNING).getImage();
+		info = FieldDecorationRegistry.getDefault().getFieldDecoration(FieldDecorationRegistry.DEC_INFORMATION)
+				.getImage();
+		warning = FieldDecorationRegistry.getDefault().getFieldDecoration(FieldDecorationRegistry.DEC_WARNING)
+				.getImage();
 		error = FieldDecorationRegistry.getDefault().getFieldDecoration(FieldDecorationRegistry.DEC_ERROR).getImage();
 
 		// Combo that filters sites
@@ -133,7 +136,8 @@ public class RepositorySelectionGroup {
 			}
 
 		});
-		// Auto complete - install before our own key listeners, so that auto complete gets first shot.
+		// Auto complete - install before our own key listeners, so that auto complete
+		// gets first shot.
 		repoAutoComplete = new ComboAutoCompleteField(repoCombo);
 		repoCombo.setVisibleItemCount(COUNT_VISIBLE_ITEMS);
 		repoCombo.addKeyListener(KeyListener.keyPressedAdapter(e -> {
@@ -166,10 +170,11 @@ public class RepositorySelectionGroup {
 					if (location == null) {
 						status = tracker.getInvalidLocationStatus(repoCombo.getText());
 					} else {
-						status = tracker.validateRepositoryLocation(ui.getSession(), location, false, new NullProgressMonitor());
+						status = tracker.validateRepositoryLocation(ui.getSession(), location, false,
+								new NullProgressMonitor());
 					}
 				} else {
-					// user typed or pasted an existing location.  Select it.
+					// user typed or pasted an existing location. Select it.
 					repoComboSelectionChanged();
 				}
 			}
@@ -192,7 +197,7 @@ public class RepositorySelectionGroup {
 		repoDec.setMarginWidth(DEC_MARGIN_WIDTH);
 
 		DropTarget target = new DropTarget(repoCombo, DND.DROP_MOVE | DND.DROP_COPY | DND.DROP_LINK);
-		target.setTransfer(new Transfer[] {URLTransfer.getInstance(), FileTransfer.getInstance()});
+		target.setTransfer(new Transfer[] { URLTransfer.getInstance(), FileTransfer.getInstance() });
 		target.addDropListener(new URLDropAdapter(true) {
 			@Override
 			protected void handleDrop(String urlText, DropTargetEvent event) {
@@ -260,17 +265,17 @@ public class RepositorySelectionGroup {
 
 	public void setRepositorySelection(int scope, URI location) {
 		switch (scope) {
-			case AvailableIUGroup.AVAILABLE_ALL :
-				fillRepoCombo(SITE_ALL);
-				break;
-			case AvailableIUGroup.AVAILABLE_LOCAL :
-				fillRepoCombo(SITE_LOCAL);
-				break;
-			case AvailableIUGroup.AVAILABLE_SPECIFIED :
-				fillRepoCombo(getSiteString(location));
-				break;
-			default :
-				fillRepoCombo(SITE_NONE);
+		case AvailableIUGroup.AVAILABLE_ALL:
+			fillRepoCombo(SITE_ALL);
+			break;
+		case AvailableIUGroup.AVAILABLE_LOCAL:
+			fillRepoCombo(SITE_LOCAL);
+			break;
+		case AvailableIUGroup.AVAILABLE_SPECIFIED:
+			fillRepoCombo(getSiteString(location));
+			break;
+		default:
+			fillRepoCombo(SITE_NONE);
 		}
 		setRepoComboDecoration(null);
 	}
@@ -285,7 +290,7 @@ public class RepositorySelectionGroup {
 			repoDec.setDescriptionText(ProvUIMessages.AvailableIUsPage_RepoFilterInstructions);
 			repoDec.setImage(info);
 			// We may have been previously showing an error or warning
-			// hover.  We will need to dismiss it, but if there is no text
+			// hover. We will need to dismiss it, but if there is no text
 			// typed, don't do this, so that the user gets the info cue
 			if (repoCombo.getText().length() > 0)
 				repoDec.showHoverText(null);
@@ -311,9 +316,9 @@ public class RepositorySelectionGroup {
 	}
 
 	/*
-	 * Fill the repo combo and use the specified string
-	 * as the selection.  If the selection is null, then the
-	 * current selection should be preserved if applicable.
+	 * Fill the repo combo and use the specified string as the selection. If the
+	 * selection is null, then the current selection should be preserved if
+	 * applicable.
 	 */
 	void fillRepoCombo(final String selection) {
 		RepositoryTracker tracker = ui.getRepositoryTracker();
@@ -379,7 +384,8 @@ public class RepositorySelectionGroup {
 	String getSiteString(URI uri) {
 		String nickname = getMetadataRepositoryManager().getRepositoryProperty(uri, IRepository.PROP_NICKNAME);
 		if (nickname != null && nickname.length() > 0)
-			return NLS.bind(ProvUIMessages.AvailableIUsPage_NameWithLocation, new Object[] {nickname, ProvUIMessages.RepositorySelectionGroup_NameAndLocationSeparator, URIUtil.toUnencodedString(uri)});
+			return NLS.bind(ProvUIMessages.AvailableIUsPage_NameWithLocation, new Object[] { nickname,
+					ProvUIMessages.RepositorySelectionGroup_NameAndLocationSeparator, URIUtil.toUnencodedString(uri) });
 		return URIUtil.toUnencodedString(uri);
 	}
 
@@ -445,7 +451,7 @@ public class RepositorySelectionGroup {
 		}
 		// Look for URI match - the user may have pasted or dragged
 		// in a location that matches one we already know about, even
-		// if the text does not match completely.  (slashes, no name, etc.)
+		// if the text does not match completely. (slashes, no name, etc.)
 		try {
 			URI location = URIUtil.fromString(repoText);
 			for (int i = 0; i < comboRepos.length; i++)
@@ -456,7 +462,7 @@ public class RepositorySelectionGroup {
 			// never mind
 		}
 
-		// Special case.  The user has typed a URI with a trailing slash.
+		// Special case. The user has typed a URI with a trailing slash.
 		// Make a URI without the trailing slash and see if it matches
 		// a location we know about.
 		// see https://bugs.eclipse.org/bugs/show_bug.cgi?id=268580
@@ -469,7 +475,8 @@ public class RepositorySelectionGroup {
 
 	void addComboProvisioningListeners() {
 		// We need to monitor repository events so that we can adjust the repo combo.
-		comboRepoListener = new ProvUIProvisioningListener(getClass().getName(), ProvUIProvisioningListener.PROV_EVENT_METADATA_REPOSITORY, ui.getOperationRunner()) {
+		comboRepoListener = new ProvUIProvisioningListener(getClass().getName(),
+				ProvUIProvisioningListener.PROV_EVENT_METADATA_REPOSITORY, ui.getOperationRunner()) {
 			@Override
 			protected void repositoryAdded(RepositoryEvent e) {
 				fillRepoCombo(getSiteString(e.getRepositoryLocation()));
@@ -497,8 +504,8 @@ public class RepositorySelectionGroup {
 	}
 
 	/*
-	 *  Add a repository using the text in the combo or launch a dialog if the text
-	 *  represents an already known repo.
+	 * Add a repository using the text in the combo or launch a dialog if the text
+	 * represents an already known repo.
 	 */
 	void addRepository(boolean alwaysPrompt) {
 		final RepositoryTracker manipulator = ui.getRepositoryTracker();
@@ -548,7 +555,7 @@ public class RepositorySelectionGroup {
 				container.run(false, false, monitor -> {
 					URI location;
 					IStatus status;
-					// This might be a disabled repo.  If so, no need to validate further.
+					// This might be a disabled repo. If so, no need to validate further.
 					if (disabledRepoProposals.containsKey(selectedRepo)) {
 						location = disabledRepoProposals.get(selectedRepo);
 						status = Status.OK_STATUS;
@@ -595,8 +602,8 @@ public class RepositorySelectionGroup {
 		}
 		// A single site is selected.
 		ProvisioningContext context = new ProvisioningContext(ui.getSession().getProvisioningAgent());
-		context.setMetadataRepositories(new URI[] {comboRepos[siteSel]});
-		context.setArtifactRepositories(new URI[] {comboRepos[siteSel]});
+		context.setMetadataRepositories(new URI[] { comboRepos[siteSel] });
+		context.setArtifactRepositories(new URI[] { comboRepos[siteSel] });
 		return context;
 	}
 
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/RollbackProfileElement.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/RollbackProfileElement.java
index e4a8ffb3a..f167a1406 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/RollbackProfileElement.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/RollbackProfileElement.java
@@ -14,7 +14,7 @@
  *******************************************************************************/
 package org.eclipse.equinox.internal.p2.ui.model;
 
-import com.ibm.icu.text.DateFormat;
+import java.text.DateFormat;
 import java.util.Date;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.NullProgressMonitor;