Attachment 101994 Details for Bug 233970 – Proposed patch for both issues.

[patch] Proposed patch for both issues.

ShowMessageAndReaquirePatch.txt (text/plain), 2.10 KB, created by Don Yantzi

on 2008-05-26 11:40:08 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Don Yantzi

Created: 2008-05-26 11:40:08 EDT

Size: 2.10 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rse.ui
>Index: subsystems/org/eclipse/rse/ui/subsystems/StandardCredentialsProvider.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/ui/subsystems/StandardCredentialsProvider.java,v
>retrieving revision 1.21
>diff -u -r1.21 StandardCredentialsProvider.java
>--- subsystems/org/eclipse/rse/ui/subsystems/StandardCredentialsProvider.java	5 May 2008 13:53:34 -0000	1.21
>+++ subsystems/org/eclipse/rse/ui/subsystems/StandardCredentialsProvider.java	26 May 2008 15:35:23 -0000
>@@ -29,7 +29,6 @@
> import org.eclipse.rse.logging.Logger;
> import org.eclipse.rse.logging.LoggerFactory;
> import org.eclipse.rse.services.clientserver.messages.SystemMessage;
>-import org.eclipse.rse.ui.ISystemMessages;
> import org.eclipse.rse.ui.RSEUIPlugin;
> import org.eclipse.rse.ui.dialogs.ICredentialsValidator;
> import org.eclipse.rse.ui.dialogs.ISystemPasswordPromptDialog;
>@@ -205,17 +204,18 @@
> 			}
> 		}
> 		ICredentialsValidator validator = getSignonValidator();
>-		boolean signonValid = true;
>+//		boolean signonValid = true;
> 		if (validator != null) {
> 			SystemMessage m = validator.validate(getCredentials());
>-			signonValid = (m == null);
>-			if (!signonValid) { // If we ran into an invalid stored password we need to tell the user.
>+//			signonValid = (m == null);
>+			if (m != null) { // If we ran into an invalid stored password we need to tell the user.
> 				Shell shell = getShell();
> 				if (shell != null) {
>-					SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COMM_PWD_INVALID);
>-					msg.makeSubstitution(userId, getConnectorService().getHostName());
>-					SystemMessageDialog dialog = new SystemMessageDialog(shell, msg);
>+//					SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COMM_PWD_INVALID);
>+//					msg.makeSubstitution(userId, getConnectorService().getHostName());
>+					SystemMessageDialog dialog = new SystemMessageDialog(shell, m);
> 					dialog.open();
>+					reacquire = true;
> 				}
> 			}
> 		}

Flags:

ddykstal.eclipse: iplog+

Actions: View | Diff

Attachments on bug 233970: 101994