diff options
author | Hamdan Msheik | 2013-05-16 15:42:20 +0000 |
---|---|---|
committer | Pascal Rapicault | 2013-05-16 17:19:08 +0000 |
commit | 247bf1545b01b008b550ad21c83528d9545148bd (patch) | |
tree | 9aca549eccaca94889aee00ae35069217ad1915e /bundles | |
parent | 054533b73d0db12e67279ea48520bbc4c692e462 (diff) | |
download | rt.equinox.p2-247bf1545b01b008b550ad21c83528d9545148bd.tar.gz rt.equinox.p2-247bf1545b01b008b550ad21c83528d9545148bd.tar.xz rt.equinox.p2-247bf1545b01b008b550ad21c83528d9545148bd.zip |
Bug 408256 - Fixed Migration wizard does not go away
Diffstat (limited to 'bundles')
17 files changed, 5 insertions, 7 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 ec07010bb..da825d7e3 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 @@ -457,8 +457,6 @@ public class VerifierApplication implements IApplication { if (properties.getProperty("checkMigrationWizard.simulate.reinstall") == null) return; - IProfileRegistry reg = (IProfileRegistry) agent.getService(IProfileRegistry.SERVICE_NAME); - IProfile profile = reg.getProfile(IProfileRegistry.SELF); - new MigrationWizardTestHelper().rememberMigrationCompleted(profile.getProfileId()); + new MigrationWizardTestHelper().rememberMigrationCompleted(); } } 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 Binary files differindex 619f5f687..cc2d51c01 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 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 Binary files differindex f7d9e5d2c..e3845da72 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 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 Binary files differdeleted file mode 100644 index bc0d870b3..000000000 --- a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/Verifier_1.0.0.201304092108.jar +++ /dev/null diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/Verifier_1.0.0.201305161317.jar b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/Verifier_1.0.0.201305161317.jar Binary files differnew file mode 100644 index 000000000..6dda59ee2 --- /dev/null +++ b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/Verifier_1.0.0.201305161317.jar 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 Binary files differdeleted file mode 100644 index 3022e93e8..000000000 --- a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/p2TestFeature1_1.0.0.201304092108.jar +++ /dev/null diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/p2TestFeature1_1.0.0.201305161317.jar b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/p2TestFeature1_1.0.0.201305161317.jar Binary files differnew file mode 100644 index 000000000..3545b6a4b --- /dev/null +++ b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/p2TestFeature1_1.0.0.201305161317.jar 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 Binary files differdeleted file mode 100644 index 0ad1e5278..000000000 --- a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/p2TestFeature2_1.0.0.201304092108.jar +++ /dev/null diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/p2TestFeature2_1.0.0.201305161317.jar b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/p2TestFeature2_1.0.0.201305161317.jar Binary files differnew file mode 100644 index 000000000..17a65693e --- /dev/null +++ b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/p2TestFeature2_1.0.0.201305161317.jar 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 Binary files differdeleted file mode 100644 index 76f808d99..000000000 --- a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/org.eclipse.equinox.p2.tests.verifier_1.0.100.201304092108.jar +++ /dev/null diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/org.eclipse.equinox.p2.tests.verifier_1.0.100.201305161317.jar b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/org.eclipse.equinox.p2.tests.verifier_1.0.100.201305161317.jar Binary files differnew file mode 100644 index 000000000..79fc9f6bf --- /dev/null +++ b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/org.eclipse.equinox.p2.tests.verifier_1.0.100.201305161317.jar 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 Binary files differdeleted file mode 100644 index 4022a3a26..000000000 --- a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/p2TestBundle1_1.0.0.201304092108.jar +++ /dev/null diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/p2TestBundle1_1.0.0.201305161317.jar b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/p2TestBundle1_1.0.0.201305161317.jar Binary files differnew file mode 100644 index 000000000..f590a2a90 --- /dev/null +++ b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/p2TestBundle1_1.0.0.201305161317.jar 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 Binary files differdeleted file mode 100644 index f61720f75..000000000 --- a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/p2TestBundle2_1.0.0.201304092108.jar +++ /dev/null diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/p2TestBundle2_1.0.0.201305161317.jar b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/p2TestBundle2_1.0.0.201305161317.jar Binary files differnew file mode 100644 index 000000000..fa2aef5c7 --- /dev/null +++ b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/p2TestBundle2_1.0.0.201305161317.jar 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 d1c0902a3..8db2a274c 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 @@ -125,7 +125,7 @@ public class ImportFromInstallationWizard_c extends InstallWizard implements IIm //Remember that we completed the migration private void rememberMigrationCompleted() { - new MigrationSupport().rememberMigrationCompleted(toImportFrom.getProfileId()); + new MigrationSupport().rememberMigrationCompleted(); } //Purge the profile registry from all the entries that are no longer relevant 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 8098425a0..cda2896b5 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 @@ -76,7 +76,7 @@ public class MigrationSupport { openMigrationWizard(previousProfile, reposToMigrate); } else { //There is nothing to migrate, so we mark the migration complete - rememberMigrationCompleted(currentProfile.getProfileId()); + rememberMigrationCompleted(); } return true; } @@ -210,9 +210,9 @@ public class MigrationSupport { return activeWindow != null ? activeWindow.getShell() : null; } - public void rememberMigrationCompleted(String profileId) { + public void rememberMigrationCompleted() { IProfileRegistry registry = (IProfileRegistry) ProvisioningUI.getDefaultUI().getSession().getProvisioningAgent().getService(IProfileRegistry.SERVICE_NAME); - long[] history = registry.listProfileTimestamps(profileId); + long[] history = registry.listProfileTimestamps(ProvisioningUI.getDefaultUI().getProfileId()); AutomaticUpdatePlugin.getDefault().getPreferenceStore().setValue(AutomaticUpdateScheduler.MIGRATION_DIALOG_SHOWN, history[history.length - 1]); AutomaticUpdatePlugin.getDefault().savePreferences(); } |