summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rapicault (Ericsson)2013-04-09 21:46:06 (EDT)
committerPascal Rapicault2013-04-16 12:10:05 (EDT)
commit2a251ffa6ee938ab71f29c6d6db26bc7d7634c21 (patch)
tree6da90d4a66912449db6fabd7e85c0fcbaf5dc66f
parenta6167da69e88b22dc13248c6a6d4efd8ee7371eb (diff)
downloadrt.equinox.p2-2a251ffa6ee938ab71f29c6d6db26bc7d7634c21.zip
rt.equinox.p2-2a251ffa6ee938ab71f29c6d6db26bc7d7634c21.tar.gz
rt.equinox.p2-2a251ffa6ee938ab71f29c6d6db26bc7d7634c21.tar.bz2
Better message when doing first time migration
-rw-r--r--bundles/org.eclipse.equinox.p2.tests.verifier/src/org/eclipse/equinox/internal/p2/tests/verifier/VerifierApplication.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/artifacts.jarbin664 -> 663 bytes
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/content.jarbin1435 -> 1528 bytes
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/Verifier_1.0.0.201304052215.jarbin424 -> 0 bytes
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/Verifier_1.0.0.201304092108.jarbin0 -> 423 bytes
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/p2TestFeature1_1.0.0.201304052215.jarbin407 -> 0 bytes
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/p2TestFeature1_1.0.0.201304092108.jarbin0 -> 407 bytes
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/p2TestFeature2_1.0.0.201304052215.jarbin407 -> 0 bytes
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/p2TestFeature2_1.0.0.201304092108.jarbin0 -> 407 bytes
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/org.eclipse.equinox.p2.tests.verifier_1.0.100.201304052215.jarbin22440 -> 0 bytes
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/org.eclipse.equinox.p2.tests.verifier_1.0.100.201304092108.jarbin0 -> 11604 bytes
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/p2TestBundle1_1.0.0.201304052215.jarbin393 -> 0 bytes
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/p2TestBundle1_1.0.0.201304092108.jarbin0 -> 394 bytes
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/p2TestBundle2_1.0.0.201304052215.jarbin392 -> 0 bytes
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/p2TestBundle2_1.0.0.201304092108.jarbin0 -> 393 bytes
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/testData/sharedPrefs/test1/baseInstall/epp.package.java.profile/.data/.settings/org.eclipse.equinox.p2.artifact.repository.prefs (renamed from bundles/org.eclipse.equinox.p2.tests/testData/sharedPrefs/baseInstall/epp.package.java.profile/.data/.settings/org.eclipse.equinox.p2.artifact.repository.prefs)0
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/testData/sharedPrefs/test1/baseInstall/epp.package.java.profile/.data/.settings/org.eclipse.equinox.p2.metadata.repository.prefs (renamed from bundles/org.eclipse.equinox.p2.tests/testData/sharedPrefs/baseInstall/epp.package.java.profile/.data/.settings/org.eclipse.equinox.p2.metadata.repository.prefs)0
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/testData/sharedPrefs/test1/baseInstall/epp.package.java.profile/.lock (renamed from bundles/org.eclipse.equinox.p2.tests/testData/sharedPrefs/baseInstall/epp.package.java.profile/.lock)0
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/testData/sharedPrefs/test1/baseInstall/epp.package.java.profile/1339695683273.profile (renamed from bundles/org.eclipse.equinox.p2.tests/testData/sharedPrefs/baseInstall/epp.package.java.profile/1339695683273.profile)0
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/testData/sharedPrefs/test1/baseInstall/epp.package.java.profile/state.properties (renamed from bundles/org.eclipse.equinox.p2.tests/testData/sharedPrefs/baseInstall/epp.package.java.profile/state.properties)0
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/testData/sharedPrefs/test1/userHome/.settings/org.eclipse.equinox.p2.metadata.repository.prefs (renamed from bundles/org.eclipse.equinox.p2.tests/testData/sharedPrefs/userHome/.settings/org.eclipse.equinox.p2.metadata.repository.prefs)0
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/ImportFromInstallationPage_c.java10
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/ImportFromInstallationWizard_c.java12
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/MigrationSupport.java4
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/ProvUIMessages.java3
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/messages.properties5
26 files changed, 22 insertions, 14 deletions
diff --git a/bundles/org.eclipse.equinox.p2.tests.verifier/src/org/eclipse/equinox/internal/p2/tests/verifier/VerifierApplication.java b/bundles/org.eclipse.equinox.p2.tests.verifier/src/org/eclipse/equinox/internal/p2/tests/verifier/VerifierApplication.java
index 70b8b7b..ec07010 100644
--- a/bundles/org.eclipse.equinox.p2.tests.verifier/src/org/eclipse/equinox/internal/p2/tests/verifier/VerifierApplication.java
+++ b/bundles/org.eclipse.equinox.p2.tests.verifier/src/org/eclipse/equinox/internal/p2/tests/verifier/VerifierApplication.java
@@ -342,7 +342,7 @@ public class VerifierApplication implements IApplication {
IProfileRegistry reg = (IProfileRegistry) agent.getService(IProfileRegistry.SERVICE_NAME);
IProfile profile = reg.getProfile(IProfileRegistry.SELF);
- ImportFromInstallationWizard_c wizardPage = new ImportFromInstallationWizard_c(profile, new URI[0]);
+ ImportFromInstallationWizard_c wizardPage = new ImportFromInstallationWizard_c(profile, new URI[0], false);
int cancelAnswer = Integer.parseInt(properties.getProperty("checkMigration.cancelAnswer"));
wizardPage.rememberCancellationDecision(cancelAnswer);
}
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/artifacts.jar b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/artifacts.jar
index 1e39046..619f5f6 100644
--- a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/artifacts.jar
+++ b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/artifacts.jar
Binary files differ
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/content.jar b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/content.jar
index 87057b6..f7d9e5d 100644
--- a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/content.jar
+++ b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/content.jar
Binary files differ
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/Verifier_1.0.0.201304052215.jar b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/Verifier_1.0.0.201304052215.jar
deleted file mode 100644
index 81c140e..0000000
--- a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/Verifier_1.0.0.201304052215.jar
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/Verifier_1.0.0.201304092108.jar b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/Verifier_1.0.0.201304092108.jar
new file mode 100644
index 0000000..bc0d870
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/Verifier_1.0.0.201304092108.jar
Binary files differ
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/p2TestFeature1_1.0.0.201304052215.jar b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/p2TestFeature1_1.0.0.201304052215.jar
deleted file mode 100644
index ca707ab..0000000
--- a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/p2TestFeature1_1.0.0.201304052215.jar
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/p2TestFeature1_1.0.0.201304092108.jar b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/p2TestFeature1_1.0.0.201304092108.jar
new file mode 100644
index 0000000..3022e93
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/p2TestFeature1_1.0.0.201304092108.jar
Binary files differ
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/p2TestFeature2_1.0.0.201304052215.jar b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/p2TestFeature2_1.0.0.201304052215.jar
deleted file mode 100644
index 30f0987..0000000
--- a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/p2TestFeature2_1.0.0.201304052215.jar
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/p2TestFeature2_1.0.0.201304092108.jar b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/p2TestFeature2_1.0.0.201304092108.jar
new file mode 100644
index 0000000..0ad1e52
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/p2TestFeature2_1.0.0.201304092108.jar
Binary files differ
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/org.eclipse.equinox.p2.tests.verifier_1.0.100.201304052215.jar b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/org.eclipse.equinox.p2.tests.verifier_1.0.100.201304052215.jar
deleted file mode 100644
index 26486ff..0000000
--- a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/org.eclipse.equinox.p2.tests.verifier_1.0.100.201304052215.jar
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/org.eclipse.equinox.p2.tests.verifier_1.0.100.201304092108.jar b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/org.eclipse.equinox.p2.tests.verifier_1.0.100.201304092108.jar
new file mode 100644
index 0000000..76f808d
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/org.eclipse.equinox.p2.tests.verifier_1.0.100.201304092108.jar
Binary files differ
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/p2TestBundle1_1.0.0.201304052215.jar b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/p2TestBundle1_1.0.0.201304052215.jar
deleted file mode 100644
index a26f71b..0000000
--- a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/p2TestBundle1_1.0.0.201304052215.jar
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/p2TestBundle1_1.0.0.201304092108.jar b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/p2TestBundle1_1.0.0.201304092108.jar
new file mode 100644
index 0000000..4022a3a
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/p2TestBundle1_1.0.0.201304092108.jar
Binary files differ
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/p2TestBundle2_1.0.0.201304052215.jar b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/p2TestBundle2_1.0.0.201304052215.jar
deleted file mode 100644
index c5dbbe6..0000000
--- a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/p2TestBundle2_1.0.0.201304052215.jar
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/p2TestBundle2_1.0.0.201304092108.jar b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/p2TestBundle2_1.0.0.201304092108.jar
new file mode 100644
index 0000000..f61720f
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/p2TestBundle2_1.0.0.201304092108.jar
Binary files differ
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedPrefs/baseInstall/epp.package.java.profile/.data/.settings/org.eclipse.equinox.p2.artifact.repository.prefs b/bundles/org.eclipse.equinox.p2.tests/testData/sharedPrefs/test1/baseInstall/epp.package.java.profile/.data/.settings/org.eclipse.equinox.p2.artifact.repository.prefs
index 8cb4991..8cb4991 100644
--- a/bundles/org.eclipse.equinox.p2.tests/testData/sharedPrefs/baseInstall/epp.package.java.profile/.data/.settings/org.eclipse.equinox.p2.artifact.repository.prefs
+++ b/bundles/org.eclipse.equinox.p2.tests/testData/sharedPrefs/test1/baseInstall/epp.package.java.profile/.data/.settings/org.eclipse.equinox.p2.artifact.repository.prefs
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedPrefs/baseInstall/epp.package.java.profile/.data/.settings/org.eclipse.equinox.p2.metadata.repository.prefs b/bundles/org.eclipse.equinox.p2.tests/testData/sharedPrefs/test1/baseInstall/epp.package.java.profile/.data/.settings/org.eclipse.equinox.p2.metadata.repository.prefs
index 8cb4991..8cb4991 100644
--- a/bundles/org.eclipse.equinox.p2.tests/testData/sharedPrefs/baseInstall/epp.package.java.profile/.data/.settings/org.eclipse.equinox.p2.metadata.repository.prefs
+++ b/bundles/org.eclipse.equinox.p2.tests/testData/sharedPrefs/test1/baseInstall/epp.package.java.profile/.data/.settings/org.eclipse.equinox.p2.metadata.repository.prefs
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedPrefs/baseInstall/epp.package.java.profile/.lock b/bundles/org.eclipse.equinox.p2.tests/testData/sharedPrefs/test1/baseInstall/epp.package.java.profile/.lock
index e69de29..e69de29 100644
--- a/bundles/org.eclipse.equinox.p2.tests/testData/sharedPrefs/baseInstall/epp.package.java.profile/.lock
+++ b/bundles/org.eclipse.equinox.p2.tests/testData/sharedPrefs/test1/baseInstall/epp.package.java.profile/.lock
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedPrefs/baseInstall/epp.package.java.profile/1339695683273.profile b/bundles/org.eclipse.equinox.p2.tests/testData/sharedPrefs/test1/baseInstall/epp.package.java.profile/1339695683273.profile
index 6f18bb0..6f18bb0 100644
--- a/bundles/org.eclipse.equinox.p2.tests/testData/sharedPrefs/baseInstall/epp.package.java.profile/1339695683273.profile
+++ b/bundles/org.eclipse.equinox.p2.tests/testData/sharedPrefs/test1/baseInstall/epp.package.java.profile/1339695683273.profile
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedPrefs/baseInstall/epp.package.java.profile/state.properties b/bundles/org.eclipse.equinox.p2.tests/testData/sharedPrefs/test1/baseInstall/epp.package.java.profile/state.properties
index bd469b5..bd469b5 100644
--- a/bundles/org.eclipse.equinox.p2.tests/testData/sharedPrefs/baseInstall/epp.package.java.profile/state.properties
+++ b/bundles/org.eclipse.equinox.p2.tests/testData/sharedPrefs/test1/baseInstall/epp.package.java.profile/state.properties
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedPrefs/userHome/.settings/org.eclipse.equinox.p2.metadata.repository.prefs b/bundles/org.eclipse.equinox.p2.tests/testData/sharedPrefs/test1/userHome/.settings/org.eclipse.equinox.p2.metadata.repository.prefs
index dd3534d..dd3534d 100644
--- a/bundles/org.eclipse.equinox.p2.tests/testData/sharedPrefs/userHome/.settings/org.eclipse.equinox.p2.metadata.repository.prefs
+++ b/bundles/org.eclipse.equinox.p2.tests/testData/sharedPrefs/test1/userHome/.settings/org.eclipse.equinox.p2.metadata.repository.prefs
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 bd85677..b6dc568 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
@@ -43,16 +43,16 @@ public class ImportFromInstallationPage_c extends AbstractImportPage_c implement
// private IProvisioningAgentProvider agentProvider;
- public ImportFromInstallationPage_c(ProvisioningUI ui, ProvisioningOperationWizard wizard) {
+ public ImportFromInstallationPage_c(ProvisioningUI ui, ProvisioningOperationWizard wizard, boolean firstTime) {
super("importfrominstancepage", ui, wizard); //$NON-NLS-1$
- setTitle(ProvUIMessages.ImportFromInstallationPage_DIALOG_TITLE);
+ setTitle(firstTime ? ProvUIMessages.ImportFromInstallationPage_DIALOG_TITLE_FIRSTRUN : ProvUIMessages.ImportFromInstallationPage_DIALOG_TITLE);
setDescription(NLS.bind(ProvUIMessages.ImportFromInstallationPage_DIALOG_DESCRIPTION, Platform.getProduct().getName()));
}
- public ImportFromInstallationPage_c(ProvisioningUI ui, ImportFromInstallationWizard_c wizard, IProfile toImportFrom) {
+ public ImportFromInstallationPage_c(ProvisioningUI ui, ImportFromInstallationWizard_c wizard, IProfile toImportFrom, boolean firstTime) {
super("importfrominstancepage", ui, wizard); //$NON-NLS-1$
- setTitle(ProvUIMessages.ImportFromInstallationPage_DIALOG_TITLE);
- setDescription(NLS.bind(ProvUIMessages.ImportFromInstallationPage_DIALOG_DESCRIPTION, Platform.getProduct().getName()));
+ setTitle(firstTime ? ProvUIMessages.ImportFromInstallationPage_DIALOG_TITLE_FIRSTRUN : ProvUIMessages.ImportFromInstallationPage_DIALOG_TITLE);
+ setDescription(NLS.bind(firstTime ? ProvUIMessages.ImportFromInstallationPage_DIALOG_DESCRIPTION_FIRSTRUN : ProvUIMessages.ImportFromInstallationPage_DIALOG_DESCRIPTION, Platform.getProduct().getName()));
toBeImportedProfile = toImportFrom;
}
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 623ba4c..d1c0902 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
@@ -40,22 +40,24 @@ public class ImportFromInstallationWizard_c extends InstallWizard implements IIm
private IProfile toImportFrom;
private URI[] reposToMigrate;
private List<URI> addedRepos = new ArrayList<URI>();
+ private boolean firstTime = false;
public ImportFromInstallationWizard_c() {
this(ProvisioningUI.getDefaultUI(), null, null, null);
}
- public ImportFromInstallationWizard_c(IProfile toImportFrom, URI[] reposToMigrate) {
+ public ImportFromInstallationWizard_c(IProfile toImportFrom, URI[] reposToMigrate, boolean firstTime) {
this(ProvisioningUI.getDefaultUI(), null, null, null);
this.toImportFrom = toImportFrom;
this.reposToMigrate = reposToMigrate;
+ this.firstTime = firstTime;
addRepos();
}
public ImportFromInstallationWizard_c(ProvisioningUI ui, InstallOperation operation, Collection<IInstallableUnit> initialSelections, LoadMetadataRepositoryJob preloadJob) {
super(ui, operation, initialSelections, preloadJob);
IDialogSettings workbenchSettings = ProvUIActivator.getDefault().getDialogSettings();
- String sectionName = "ImportFromInstallationWizard"; //$NON-NLS-1$
+ String sectionName = "MigrationWizard"; //$NON-NLS-1$
IDialogSettings section = workbenchSettings.getSection(sectionName);
if (section == null) {
section = workbenchSettings.addNewSection(sectionName);
@@ -64,7 +66,7 @@ public class ImportFromInstallationWizard_c extends InstallWizard implements IIm
}
public void init(IWorkbench workbench, IStructuredSelection selection) {
- setWindowTitle(ProvUIMessages.ImportWizard_WINDOWTITLE);
+ setWindowTitle(firstTime ? ProvUIMessages.ImportWizard_WINDOWTITLE_FIRSTRUN : ProvUIMessages.ImportWizard_WINDOWTITLE);
setDefaultPageImageDescriptor(ImageDescriptor.createFromURL(Platform.getBundle(ProvUIActivator.PLUGIN_ID).getEntry("icons/install_wiz.gif"))); //$NON-NLS-1$
setNeedsProgressMonitor(true);
}
@@ -72,8 +74,8 @@ public class ImportFromInstallationWizard_c extends InstallWizard implements IIm
@Override
protected ISelectableIUsPage createMainPage(IUElementListRoot input, Object[] selections) {
if (toImportFrom != null)
- return new ImportFromInstallationPage_c(ui, this, toImportFrom);
- return new ImportFromInstallationPage_c(ui, this);
+ return new ImportFromInstallationPage_c(ui, this, toImportFrom, firstTime);
+ return new ImportFromInstallationPage_c(ui, this, firstTime);
}
@Override
diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/MigrationSupport.java b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/MigrationSupport.java
index 572211f..734ebdc 100644
--- a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/MigrationSupport.java
+++ b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/MigrationSupport.java
@@ -112,7 +112,7 @@ public class MigrationSupport {
private boolean isFirstTimeRunningThisSharedInstance(IProvisioningAgent agent, IProfileRegistry registry, IProfile currentProfile) {
long[] history = registry.listProfileTimestamps(currentProfile.getProfileId());
- boolean isInitial = !IProfile.STATE_SHARED_INSTALL_VALUE_INITIAL.equals(registry.getProfileStateProperties(currentProfile.getProfileId(), history[0]).get(IProfile.STATE_PROP_SHARED_INSTALL));
+ boolean isInitial = IProfile.STATE_SHARED_INSTALL_VALUE_INITIAL.equals(registry.getProfileStateProperties(currentProfile.getProfileId(), history[0]).get(IProfile.STATE_PROP_SHARED_INSTALL));
if (isInitial) {
if (getLastMigration() >= history[0])
return false;
@@ -161,7 +161,7 @@ public class MigrationSupport {
Display d = Display.getDefault();
d.asyncExec(new Runnable() {
public void run() {
- WizardDialog migrateWizard = new WizardDialog(getWorkbenchWindowShell(), new ImportFromInstallationWizard_c(inputProfile, reposToMigrate));
+ WizardDialog migrateWizard = new WizardDialog(getWorkbenchWindowShell(), new ImportFromInstallationWizard_c(inputProfile, reposToMigrate, reposToMigrate != null));
migrateWizard.create();
migrateWizard.open();
}
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 5068d39..5feb422 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
@@ -29,8 +29,11 @@ public class ProvUIMessages extends NLS {
public static String PAGE_NOINSTALLTION_ERROR;
public static String ImportFromInstallationPage_SELECT_COMPONENT;
public static String ImportFromInstallationPage_DIALOG_TITLE;
+ public static String ImportFromInstallationPage_DIALOG_TITLE_FIRSTRUN;
public static String ImportFromInstallationPage_DIALOG_DESCRIPTION;
+ public static String ImportFromInstallationPage_DIALOG_DESCRIPTION_FIRSTRUN;
public static String ImportWizard_WINDOWTITLE;
+ public static String ImportWizard_WINDOWTITLE_FIRSTRUN;
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 2c88544..8bb0ab7 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
@@ -7,9 +7,12 @@ AbstractPage_ButtonSelectAll=&Select All
AbstractPage_ButtonDeselectAll=&Deselect All
PAGE_NOINSTALLTION_ERROR=Select at least one available element to be installed.
ImportFromInstallationPage_SELECT_COMPONENT=Select at least one available element to be installed.
-ImportWizard_WINDOWTITLE=Import
+ImportWizard_WINDOWTITLE=Migrate
+ImportWizard_WINDOWTITLE_FIRSTRUN=Import
ImportFromInstallationPage_DIALOG_TITLE=Migration wizard
+ImportFromInstallationPage_DIALOG_TITLE_FIRSTRUN=Import 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_DIALOG_DESCRIPTION_FIRSTRUN=It is the first time you are running {0} from this location.\nThis wizard will help you install plug-ins you may have previously installed.
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