Attachment 135197 Details for Bug 275252 – patch

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

[patch] patch

bug275252.patch (text/plain), 4.29 KB, created by Susan McCourt

on 2009-05-11 14:50:26 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Susan McCourt

Created: 2009-05-11 14:50:26 EDT

Size: 4.29 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.equinox.p2.ui
>Index: src/org/eclipse/equinox/internal/p2/ui/messages.properties
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/messages.properties,v
>retrieving revision 1.107
>diff -u -r1.107 messages.properties
>--- src/org/eclipse/equinox/internal/p2/ui/messages.properties	11 May 2009 18:10:45 -0000	1.107
>+++ src/org/eclipse/equinox/internal/p2/ui/messages.properties	11 May 2009 18:49:33 -0000
>@@ -134,7 +134,7 @@
> UpdateAction_UpdatesAvailableTitle=Available Updates
> UpdateOperation_NothingToUpdate=There is nothing to update.
> UpdateOrInstallWizardPage_Size=Size: {0}
>-URLValidator_UnrecognizedURL=The location {0} is not recognized.
>+URLValidator_UnrecognizedURL=The location {0} is not a valid software site location.
> UpdateManagerCompatibility_ExportSitesTitle=Export Sites
> UpdateManagerCompatibility_ImportSitesTitle=Import Sites
> UpdateManagerCompatibility_InvalidSiteFileMessage=The selected file does not contain any updates sites.  Please select another file.
>Index: src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/RepositorySelectionGroup.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/RepositorySelectionGroup.java,v
>retrieving revision 1.8
>diff -u -r1.8 RepositorySelectionGroup.java
>--- src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/RepositorySelectionGroup.java	4 May 2009 19:46:21 -0000	1.8
>+++ src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/RepositorySelectionGroup.java	11 May 2009 18:49:33 -0000
>@@ -78,7 +78,8 @@
> 	ProvUIProvisioningListener comboRepoListener;
> 
> 	Image info, warning, error;
>-	URI[] comboRepos;
>+	URI[] comboRepos; // the URIs shown in the combo, kept in sync with combo items
>+	HashMap disabledRepoProposals = new HashMap(); // proposal string -> disabled URI 
> 
> 	public RepositorySelectionGroup(IWizardContainer container, Composite parent, Policy policy, IUViewQueryContext queryContext) {
> 		this.container = container;
>@@ -425,10 +426,13 @@
> 		try {
> 			int flags = queryContext.getMetadataRepositoryFlags() | IRepositoryManager.REPOSITORIES_DISABLED;
> 			String[] items = repoCombo.getItems();
>+			// Clear any previously remembered disabled repos
>+			disabledRepoProposals = new HashMap();
> 			URI[] disabled = ProvisioningUtil.getMetadataRepositories(flags);
> 			String[] disabledItems = new String[disabled.length];
> 			for (int i = 0; i < disabledItems.length; i++) {
> 				disabledItems[i] = getSiteString(disabled[i]);
>+				disabledRepoProposals.put(disabledItems[i], disabled[i]);
> 			}
> 			String[] both = new String[items.length + disabledItems.length];
> 			System.arraycopy(items, 0, both, 0, items.length);
>@@ -534,14 +538,20 @@
> 			try {
> 				container.run(false, false, new IRunnableWithProgress() {
> 					public void run(IProgressMonitor monitor) {
>-						URI location = null;
>+						URI location;
> 						IStatus status;
>-						location = RepositoryLocationValidator.locationFromString(selectedRepo);
>-						if (location == null)
>-							status = RepositoryLocationValidator.getInvalidLocationStatus(selectedRepo);
>-						else {
>-							RepositoryLocationValidator validator = manipulator.getRepositoryLocationValidator(repoCombo.getShell());
>-							status = validator.validateRepositoryLocation(location, false, monitor);
>+						// This might be a disabled repo.  If so, no need to validate further.
>+						if (disabledRepoProposals.containsKey(selectedRepo)) {
>+							location = (URI) disabledRepoProposals.get(selectedRepo);
>+							status = Status.OK_STATUS;
>+						} else {
>+							location = RepositoryLocationValidator.locationFromString(selectedRepo);
>+							if (location == null)
>+								status = RepositoryLocationValidator.getInvalidLocationStatus(selectedRepo);
>+							else {
>+								RepositoryLocationValidator validator = manipulator.getRepositoryLocationValidator(repoCombo.getShell());
>+								status = validator.validateRepositoryLocation(location, false, monitor);
>+							}
> 						}
> 						if (status.isOK() && location != null) {
> 							try {

Actions: View | Diff

Attachments on bug 275252: 135197