diff options
author | Pascal Rapicault (Ericsson) | 2013-02-14 16:59:02 +0000 |
---|---|---|
committer | Pascal Rapicault | 2013-02-14 16:59:02 +0000 |
commit | 329093cd0dbe85d70f4f92b7937b7a2ba54fd4ac (patch) | |
tree | 99e239fa81ccaa66c08e3091745f30f373859099 | |
parent | 09c95b56130c94ebde8da0ed19d8f3655e5699f9 (diff) | |
download | rt.equinox.p2-329093cd0dbe85d70f4f92b7937b7a2ba54fd4ac.tar.gz rt.equinox.p2-329093cd0dbe85d70f4f92b7937b7a2ba54fd4ac.tar.xz rt.equinox.p2-329093cd0dbe85d70f4f92b7937b7a2ba54fd4ac.zip |
Rename system property to eclipse.p2.skipMigrationWizard
-rw-r--r-- | bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/AutomaticUpdateScheduler.java | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/AutomaticUpdateScheduler.java b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/AutomaticUpdateScheduler.java index 07e013419..59627db36 100644 --- a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/AutomaticUpdateScheduler.java +++ b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/AutomaticUpdateScheduler.java @@ -12,9 +12,6 @@ *******************************************************************************/ package org.eclipse.equinox.internal.p2.ui.sdk.scheduler; -import org.eclipse.equinox.internal.p2.ui.dialogs.AbstractPage_c; -import org.eclipse.equinox.internal.p2.ui.dialogs.ImportFromInstallationWizard_c; - import com.ibm.icu.util.Calendar; import com.ibm.icu.util.ULocale; import java.util.Set; @@ -23,6 +20,8 @@ import org.eclipse.core.runtime.preferences.ConfigurationScope; import org.eclipse.core.runtime.preferences.IScopeContext; import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper; import org.eclipse.equinox.internal.p2.garbagecollector.GarbageCollector; +import org.eclipse.equinox.internal.p2.ui.dialogs.AbstractPage_c; +import org.eclipse.equinox.internal.p2.ui.dialogs.ImportFromInstallationWizard_c; import org.eclipse.equinox.internal.provisional.p2.updatechecker.*; import org.eclipse.equinox.p2.core.IProvisioningAgent; import org.eclipse.equinox.p2.engine.IProfile; @@ -44,6 +43,9 @@ import org.eclipse.ui.statushandlers.StatusManager; * @since 3.5 */ public class AutomaticUpdateScheduler implements IStartup { + + private static final String ECLIPSE_P2_SKIP_MIGRATION_WIZARD = "eclipse.p2.skipMigrationWizard"; //$NON-NLS-1$ + // values are to be picked up from the arrays DAYS and HOURS public static final String P_DAY = "day"; //$NON-NLS-1$ @@ -95,9 +97,9 @@ public class AutomaticUpdateScheduler implements IStartup { IProfileRegistry registry = (IProfileRegistry) agent.getService(IProfileRegistry.SERVICE_NAME); IProfile currentProfile = registry.getProfile(profileId); - boolean testing = System.getProperty("ignoreMigrationWizard") == null ? false : System.getProperty("ignoreMigrationWizard").equalsIgnoreCase("true") == true ? true : false; + boolean skipWizard = Boolean.TRUE.toString().equalsIgnoreCase(System.getProperty(ECLIPSE_P2_SKIP_MIGRATION_WIZARD)); - if (baseChanged(agent, registry, currentProfile) && !testing) { + if (baseChanged(agent, registry, currentProfile) && !skipWizard) { IScopeContext[] contexts = new IScopeContext[] {ConfigurationScope.INSTANCE}; boolean remindMeLater = Platform.getPreferencesService().getBoolean("org.eclipse.equinox.p2.ui", AbstractPage_c.REMIND_ME_LATER, true, contexts); |