Tweak messages in migration wizardv20130304-212919I20130305-1032

4 files changed, 17 insertions, 17 deletions

diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/ImportFromInstallationPage_c.java b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/ImportFromInstallationPage_c.java
index 6aa83b326..bd85677fb 100644
--- a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/ImportFromInstallationPage_c.java
+++ b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/ImportFromInstallationPage_c.java
@@ -13,6 +13,7 @@
 package org.eclipse.equinox.internal.p2.ui.sdk.scheduler.migration;
 
 import java.net.URI;
+import org.eclipse.core.runtime.Platform;
 import org.eclipse.equinox.internal.p2.ui.ProvUI;
 import org.eclipse.equinox.internal.p2.ui.dialogs.ISelectableIUsPage;
 import org.eclipse.equinox.internal.p2.ui.dialogs.ProvisioningOperationWizard;
@@ -26,6 +27,7 @@ import org.eclipse.equinox.p2.repository.artifact.IArtifactRepositoryManager;
 import org.eclipse.equinox.p2.repository.metadata.IMetadataRepositoryManager;
 import org.eclipse.equinox.p2.ui.ProvisioningUI;
 import org.eclipse.jface.viewers.ITableLabelProvider;
+import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.widgets.Composite;
@@ -43,14 +45,14 @@ public class ImportFromInstallationPage_c extends AbstractImportPage_c implement
 
 	public ImportFromInstallationPage_c(ProvisioningUI ui, ProvisioningOperationWizard wizard) {
 		super("importfrominstancepage", ui, wizard); //$NON-NLS-1$
-		setTitle(org.eclipse.equinox.internal.p2.ui.sdk.scheduler.migration.ProvUIMessages.ImportFromInstallationPage_DIALOG_TITLE);
-		//		setDescription(ProvUIMessages.ImportFromInstallationPage_DIALOG_DESCRIPTION);
+		setTitle(ProvUIMessages.ImportFromInstallationPage_DIALOG_TITLE);
+		setDescription(NLS.bind(ProvUIMessages.ImportFromInstallationPage_DIALOG_DESCRIPTION, Platform.getProduct().getName()));
 	}
 
 	public ImportFromInstallationPage_c(ProvisioningUI ui, ImportFromInstallationWizard_c wizard, IProfile toImportFrom) {
 		super("importfrominstancepage", ui, wizard); //$NON-NLS-1$
 		setTitle(ProvUIMessages.ImportFromInstallationPage_DIALOG_TITLE);
-		//		setDescription(ProvUIMessages.ImportFromInstallationPage_DIALOG_DESCRIPTION);
+		setDescription(NLS.bind(ProvUIMessages.ImportFromInstallationPage_DIALOG_DESCRIPTION, Platform.getProduct().getName()));
 		toBeImportedProfile = toImportFrom;
 	}
 
@@ -113,7 +115,7 @@ public class ImportFromInstallationPage_c extends AbstractImportPage_c implement
 
 	@Override
 	protected String getInvalidDestinationMessage() {
-		return ProvUIMessages.ImportFromInstallationPage_INVALID_DESTINATION;
+		return "";//ProvUIMessages.ImportFromInstallationPage_INVALID_DESTINATION; //$NON-NLS-1$
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/ImportFromInstallationWizard_c.java b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/ImportFromInstallationWizard_c.java
index 90c7a9f16..1f5edb3f3 100644
--- a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/ImportFromInstallationWizard_c.java
+++ b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/ImportFromInstallationWizard_c.java
@@ -24,8 +24,7 @@ import org.eclipse.equinox.p2.metadata.IInstallableUnit;
 import org.eclipse.equinox.p2.operations.InstallOperation;
 import org.eclipse.equinox.p2.ui.LoadMetadataRepositoryJob;
 import org.eclipse.equinox.p2.ui.ProvisioningUI;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.dialogs.*;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.ui.IImportWizard;
@@ -103,7 +102,8 @@ public class ImportFromInstallationWizard_c extends InstallWizard implements IIm
 
 	public boolean performCancel() {
 		boolean result = false;
-		MessageDialog dialog = new MessageDialog(getShell(), "Migration dialaog", null, ProvUIMessages.ImportFromInstallationPage_CONFIRMATION_DIALOG, MessageDialog.QUESTION, new String[] {"Yes", "Yes, but remind me later", "No"}, 2);
+		String[] buttons = new String[] {IDialogConstants.YES_LABEL, ProvUIMessages.ImportFromInstallationPag_LATER_BUTTON, IDialogConstants.NO_LABEL};
+		MessageDialog dialog = new MessageDialog(getShell(), ProvUIMessages.ImportFromInstallationPage_CONFIRMATION_TITLE, null, ProvUIMessages.ImportFromInstallationPage_CONFIRMATION_DIALOG, MessageDialog.QUESTION, buttons, 2);
 
 		int answer = dialog.open();
 		switch (answer) {
diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/ProvUIMessages.java b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/ProvUIMessages.java
index 08f1d1574..5068d3904 100644
--- a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/ProvUIMessages.java
+++ b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/ProvUIMessages.java
@@ -27,12 +27,11 @@ public class ProvUIMessages extends NLS {
 	public static String AbstractPage_ButtonSelectAll;
 	public static String AbstractPage_ButtonDeselectAll;
 	public static String PAGE_NOINSTALLTION_ERROR;
-	public static String ImportFromInstallationPage_DIALOG_DESCRIPTION;
 	public static String ImportFromInstallationPage_SELECT_COMPONENT;
 	public static String ImportFromInstallationPage_DIALOG_TITLE;
+	public static String ImportFromInstallationPage_DIALOG_DESCRIPTION;
 	public static String ImportWizard_WINDOWTITLE;
-	public static String ImportFromInstallationPage_INVALID_DESTINATION;
-	public static String REMIND_ME_TO_MIGRATE_LATER;
-	public static String ERROR_SAVING_PREFERENCES;
+	public static String ImportFromInstallationPage_CONFIRMATION_TITLE;
 	public static String ImportFromInstallationPage_CONFIRMATION_DIALOG;
+	public static String ImportFromInstallationPag_LATER_BUTTON;
 }
diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/messages.properties b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/messages.properties
index 696fca8ea..2c8854401 100644
--- a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/messages.properties
+++ b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/messages.properties
@@ -6,11 +6,10 @@ Column_Version=Version
 AbstractPage_ButtonSelectAll=&Select All
 AbstractPage_ButtonDeselectAll=&Deselect All
 PAGE_NOINSTALLTION_ERROR=Select at least one available element to be installed.
-ImportFromInstallationPage_DIALOG_DESCRIPTION=Import software items from the existing application installation.
 ImportFromInstallationPage_SELECT_COMPONENT=Select at least one available element to be installed.
 ImportWizard_WINDOWTITLE=Import
-ImportFromInstallationPage_INVALID_DESTINATION=Specify the path to a valid application installation.
-ImportFromInstallationPage_DIALOG_TITLE=Eclipse has been updated. Consequently, the plugins you have installed are disabled. This wizard allows you to migrate the software you had previously installed.
-ImportFromInstallationPage_CONFIRMATION_DIALOG= Canceling this migration wizard will make you loose the ability to import your plugins if eclipse has been update again. Are you sure you want to cancel?
-REMIND_ME_TO_MIGRATE_LATER= Remind me later.
-ERROR_SAVING_PREFERENCES=Error saving preferences.
+ImportFromInstallationPage_DIALOG_TITLE=Migration wizard
+ImportFromInstallationPage_DIALOG_DESCRIPTION=Because {0} has been updated, the plug-ins you had installed are now disabled.\nThis wizard will help you install those again.
+ImportFromInstallationPage_CONFIRMATION_TITLE=Migration cancellation
+ImportFromInstallationPage_CONFIRMATION_DIALOG=Cancelling this operation will stop the re-installation of your plug-ins. Are you sure you want to cancel?
+ImportFromInstallationPag_LATER_BUTTON=Yes, remind me later
\ No newline at end of file