Attachment 134717 Details for Bug 275233 – updated patch - removed already released lines

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

[patch] updated patch - removed already released lines

275233.txt (text/plain), 3.16 KB, created by Henrik Lindberg

on 2009-05-06 20:37:44 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Henrik Lindberg

Created: 2009-05-06 20:37:44 EDT

Size: 3.16 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.equinox.p2.repository
>Index: src/org/eclipse/equinox/internal/p2/repository/Credentials.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/Credentials.java,v
>retrieving revision 1.6
>diff -u -r1.6 Credentials.java
>--- src/org/eclipse/equinox/internal/p2/repository/Credentials.java	28 Apr 2009 00:27:12 -0000	1.6
>+++ src/org/eclipse/equinox/internal/p2/repository/Credentials.java	7 May 2009 00:37:41 -0000
>@@ -30,6 +30,11 @@
>  * in a store, if none is provided the user is optionally prompted for the information. 
>  */
> public class Credentials {
>+	public static class LoginCanceledException extends Exception {
>+		private static final long serialVersionUID = 1L;
>+
>+	}
>+
> 	private static final Map savedAuthInfo = Collections.synchronizedMap(new HashMap());
> 
> 	/**
>@@ -48,7 +53,7 @@
> 	 * @throws CoreException if the password cannot be read or saved
> 	 * @return The authentication info.
> 	 */
>-	public static AuthenticationInfo forLocation(URI location, boolean prompt) throws UserCancelledException, CoreException {
>+	public static AuthenticationInfo forLocation(URI location, boolean prompt) throws LoginCanceledException, CoreException {
> 		return forLocation(location, prompt, null);
> 	}
> 
>@@ -70,7 +75,7 @@
> 	 * @throws UserCancelledException - user canceled the prompt for name/password
> 	 * @throws CoreException if there is an error
> 	 */
>-	public static AuthenticationInfo forLocation(URI location, boolean prompt, AuthenticationInfo lastUsed) throws UserCancelledException, CoreException {
>+	public static AuthenticationInfo forLocation(URI location, boolean prompt, AuthenticationInfo lastUsed) throws LoginCanceledException, CoreException {
> 		ISecurePreferences securePreferences = SecurePreferencesFactory.getDefault();
> 
> 		// if URI is not opaque, just getting the host may be enough
>@@ -137,7 +142,7 @@
> 			loginDetails = lastUsed != null ? adminUIService.getUsernamePassword(host, lastUsed) : adminUIService.getUsernamePassword(host);
> 		//null result means user canceled password dialog
> 		if (loginDetails == null)
>-			throw new UserCancelledException();
>+			throw new LoginCanceledException();
> 		//save user name and password if requested by user
> 		if (loginDetails.saveResult()) {
> 			if (prefNode == null)
>Index: src/org/eclipse/equinox/internal/p2/repository/Messages.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/Messages.java,v
>retrieving revision 1.5
>diff -u -r1.5 Messages.java
>--- src/org/eclipse/equinox/internal/p2/repository/Messages.java	29 Apr 2009 16:10:52 -0000	1.5
>+++ src/org/eclipse/equinox/internal/p2/repository/Messages.java	7 May 2009 00:37:41 -0000
>@@ -72,7 +72,7 @@
> 	public static String FileTransport_reader;
> 
> 	public static String UnableToRead_0_TooManyAttempts;
>-
>+	public static String UnableToRead_0_UserCanceled;
> 	static {
> 		// initialize resource bundles
> 		NLS.initializeMessages(BUNDLE_NAME, Messages.class);

Actions: View | Diff

Attachments on bug 275233: 134716 | 134717 | 134763