Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHamdan Msheik2013-05-16 11:42:20 -0400
committerPascal Rapicault2013-05-16 13:19:08 -0400
commit247bf1545b01b008b550ad21c83528d9545148bd (patch)
tree9aca549eccaca94889aee00ae35069217ad1915e /bundles/org.eclipse.equinox.p2.ui.sdk.scheduler
parent054533b73d0db12e67279ea48520bbc4c692e462 (diff)
downloadrt.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/org.eclipse.equinox.p2.ui.sdk.scheduler')
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/ImportFromInstallationWizard_c.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/MigrationSupport.java6
2 files changed, 4 insertions, 4 deletions
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();
}

Back to the top