diff options
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.engine/src')
3 files changed, 10 insertions, 7 deletions
diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/ProfilePreferences.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/ProfilePreferences.java index 793b70548..01b9aa7ec 100644 --- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/ProfilePreferences.java +++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/ProfilePreferences.java @@ -7,6 +7,7 @@ * * Contributors: * IBM Corporation - initial API and implementation + * Ericsson AB (Pascal Rapicault) - reading preferences from base in shared install *******************************************************************************/ package org.eclipse.equinox.internal.p2.engine; diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SharedProfilePreferences.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SharedProfilePreferences.java index d10fc272d..e249bfce5 100644 --- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SharedProfilePreferences.java +++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SharedProfilePreferences.java @@ -1,12 +1,12 @@ /******************************************************************************* - * Copyright (c) 2004, 2010 IBM Corporation and others. + * Copyright (c) 2012 Ericsson AB and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * IBM Corporation - initial API and implementation + * Ericsson AB - initial API and implementation *******************************************************************************/ package org.eclipse.equinox.internal.p2.engine; @@ -48,11 +48,11 @@ public class SharedProfilePreferences extends ProfilePreferences { protected IProvisioningAgent getAgent(String segment) throws BackingStoreException { IProvisioningAgent agent = super.getAgent(segment); - return (IProvisioningAgent) agent.getService(IProvisioningAgent.SHARED_INSTALL_AGENT); + return (IProvisioningAgent) agent.getService(IProvisioningAgent.SHARED_BASE_AGENT); } protected void doSave(IProvisioningAgent agent) throws BackingStoreException { - throw new BackingStoreException("Can't store in shared install"); + throw new BackingStoreException("Can't store in shared install"); //$NON-NLS-1$ } protected EclipsePreferences internalCreate(EclipsePreferences nodeParent, String nodeName, Object context) { diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SimpleProfileRegistry.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SimpleProfileRegistry.java index 308e1e3af..945ec048e 100644 --- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SimpleProfileRegistry.java +++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SimpleProfileRegistry.java @@ -1,10 +1,12 @@ /******************************************************************************* - * Copyright (c) 2007, 2011 IBM Corporation and others. All rights reserved. This + * Copyright (c) 2007, 2012 IBM Corporation and others. All rights reserved. This * program and the accompanying materials are made available under the terms of * the Eclipse Public License v1.0 which accompanies this distribution, and is * available at http://www.eclipse.org/legal/epl-v10.html * - * Contributors: IBM Corporation - initial API and implementation + * Contributors: + * IBM Corporation - initial API and implementation + * Ericsson AB (Pascal Rapicault) - reading preferences from base in shared install ******************************************************************************/ package org.eclipse.equinox.internal.p2.engine; @@ -98,7 +100,7 @@ public class SimpleProfileRegistry implements IProfileRegistry, IAgentService { self = context.getProperty("eclipse.p2.profile"); //$NON-NLS-1$ } else if (agent.getService(IProvisioningAgent.SHARED_CURRENT_AGENT) != null) { // In shared mode, _SELF_ is the value of the current running profile for both agents current and shared - if (((IProvisioningAgent) agent.getService(IProvisioningAgent.SHARED_CURRENT_AGENT)).getService(IProvisioningAgent.SHARED_INSTALL_AGENT) == agent) { + if (((IProvisioningAgent) agent.getService(IProvisioningAgent.SHARED_CURRENT_AGENT)).getService(IProvisioningAgent.SHARED_BASE_AGENT) == agent) { self = context.getProperty("eclipse.p2.profile"); //$NON-NLS-1$ } } |