Attachment 112121 Details for Bug 236077 – patch to AddColocatedRepositoryOperation

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] patch to AddColocatedRepositoryOperation

236077.patch (text/plain), 4.45 KB, created by Susan McCourt

on 2008-09-09 15:23:53 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Susan McCourt

Created: 2008-09-09 15:23:53 EDT

Size: 4.45 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.equinox.p2.ui
>Index: src/org/eclipse/equinox/internal/provisional/p2/ui/operations/AddColocatedRepositoryOperation.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/AddColocatedRepositoryOperation.java,v
>retrieving revision 1.3.2.2
>diff -u -r1.3.2.2 AddColocatedRepositoryOperation.java
>--- src/org/eclipse/equinox/internal/provisional/p2/ui/operations/AddColocatedRepositoryOperation.java	9 Sep 2008 19:09:13 -0000	1.3.2.2
>+++ src/org/eclipse/equinox/internal/provisional/p2/ui/operations/AddColocatedRepositoryOperation.java	9 Sep 2008 19:21:40 -0000
>@@ -11,8 +11,17 @@
> package org.eclipse.equinox.internal.provisional.p2.ui.operations;
> 
> import java.net.URL;
>+import java.util.ArrayList;
> import org.eclipse.core.runtime.*;
>+import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper;
>+import org.eclipse.equinox.internal.p2.ui.ProvUIActivator;
>+import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepositoryManager;
> import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
>+import org.eclipse.equinox.internal.provisional.p2.core.eventbus.IProvisioningEventBus;
>+import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository;
>+import org.eclipse.equinox.internal.provisional.p2.core.repository.RepositoryEvent;
>+import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepositoryManager;
>+import org.osgi.framework.ServiceReference;
> 
> /**
>  * Operation that adds colocated artifact and metadata repositories
>@@ -33,14 +42,47 @@
> 	}
> 
> 	protected IStatus doBatchedExecute(IProgressMonitor monitor, IAdaptable uiInfo) throws ProvisionException {
>+		// Special case:  if a repo is already known by the manager is disabled,
>+		// then enable it.  Note that this means the implementation of undo is
>+		// not correct.  Undoing this operation will remove the repos, but we do not make use
>+		// of the undo protocol in 3.4.x so we live with this problem.
>+		// see https://bugs.eclipse.org/bugs/show_bug.cgi?id=236077
>+		ArrayList disabledMetaRepos = new ArrayList();
>+		IMetadataRepositoryManager metaMgr = (IMetadataRepositoryManager) ServiceHelper.getService(ProvUIActivator.getContext(), IMetadataRepositoryManager.class.getName());
>+		if (metaMgr != null) {
>+			URL[] disabled = metaMgr.getKnownRepositories(IMetadataRepositoryManager.REPOSITORIES_DISABLED);
>+			for (int i = 0; i < disabled.length; i++)
>+				disabledMetaRepos.add(disabled[i].toExternalForm());
>+		}
>+		ArrayList disabledArtifactRepos = new ArrayList();
>+		IArtifactRepositoryManager artifactMgr = (IArtifactRepositoryManager) ServiceHelper.getService(ProvUIActivator.getContext(), IArtifactRepositoryManager.class.getName());
>+		if (artifactMgr != null) {
>+			URL[] disabled = artifactMgr.getKnownRepositories(IArtifactRepositoryManager.REPOSITORIES_DISABLED);
>+			for (int i = 0; i < disabled.length; i++)
>+				disabledArtifactRepos.add(disabled[i].toExternalForm());
>+		}
> 		for (int i = 0; i < urls.length; i++) {
>-			ProvisioningUtil.addMetadataRepository(urls[i]);
>-			ProvisioningUtil.addArtifactRepository(urls[i]);
>+			if (metaMgr != null && disabledMetaRepos.contains(urls[i].toExternalForm())) {
>+				metaMgr.setEnabled(urls[i], true);
>+				publishEvent(new RepositoryEvent(urls[i], IRepository.TYPE_METADATA, RepositoryEvent.ADDED, true));
>+			} else
>+				ProvisioningUtil.addMetadataRepository(urls[i]);
>+			if (artifactMgr != null && disabledArtifactRepos.contains(urls[i].toExternalForm())) {
>+				artifactMgr.setEnabled(urls[i], true);
>+				publishEvent(new RepositoryEvent(urls[i], IRepository.TYPE_ARTIFACT, RepositoryEvent.ADDED, true));
>+			} else
>+				ProvisioningUtil.addArtifactRepository(urls[i]);
> 		}
> 		added = true;
> 		return okStatus();
> 	}
> 
>+	private void publishEvent(RepositoryEvent event) {
>+		ServiceReference busReference = ProvUIActivator.getContext().getServiceReference(IProvisioningEventBus.SERVICE_NAME);
>+		if (busReference != null)
>+			((IProvisioningEventBus) ProvUIActivator.getContext().getService(busReference)).publishEvent(event);
>+	}
>+
> 	protected IStatus doBatchedUndo(IProgressMonitor monitor, IAdaptable uiInfo) throws ProvisionException {
> 		for (int i = 0; i < urls.length; i++) {
> 			ProvisioningUtil.removeMetadataRepository(urls[i], monitor);

Actions: View | Diff

Attachments on bug 236077: 112121