- * This must be called right after instantiating this dialog. + * This must be called prior to opening this dialog. */ - public void setSystemInput(IConnectorService systemObject) - { - setInputObject(systemObject); + public void setSystemInput(IConnectorService connectorService) { + this.connectorService = connectorService; } + /** - * Call this to specify a validator for the userId. It will be called per keystroke. + * Sets the validator for the userId. If not null it will be called per keystroke. + *
+ * This must be called prior to opening this dialog if something other than the default is needed. */ - public void setUserIdValidator(ISystemValidator v) - { + public void setUserIdValidator(ISystemValidator v) { userIdValidator = v; } + /** - * Call this to specify a validator for the password. It will be called per keystroke. + * Sets the validator for the password. If not null it will be called per keystroke. + * The default validator is null. + *
+ * This must be called prior to opening this dialog if something other than the default is needed. */ - public void setPasswordValidator(ISystemValidator v) - { + public void setPasswordValidator(ISystemValidator v) { passwordValidator = v; } + /** - * Call this to specify a validator for the signon. It will be called when the user presses OK. + * Sets the validator for the signon. + * The default validator is null. + * If not null the validator will be called when the user presses OK. + *
+ * This must be called prior to opening this dialog if something other than the default is needed. */ - public void setSignonValidator(ISignonValidator v) - { + public void setSignonValidator(ISignonValidator v) { signonValidator = v; } + /** - * Call this to force the userId and password to uppercase + * Sets the option to force the userId and password to uppercase. + *
+ * The default is false.
+ * This must be called prior to opening this dialog if something other than the default is needed.
*/
- public void setForceToUpperCase(boolean force)
- {
+ public void setForceToUpperCase(boolean force) {
this.forceToUpperCase = force;
}
+
/**
* Call this to query the force-to-uppercase setting
*/
- public boolean getForceToUpperCase()
- {
+ public boolean getForceToUpperCase() {
return forceToUpperCase;
}
- /**
- * @see SystemPromptDialog#getInitialFocusControl()
- */
- protected Control getInitialFocusControl()
- {
- okButton.setEnabled(false);
-
-
- if (textUserId.getText().length()==0)
- return textUserId;
- else
- {
- if (password != null)
- {
- validatePasswordInput();
- textPassword.selectAll();
- }
- return textPassword;
- }
- }
-
/**
* @see SystemPromptDialog#createInner(Composite)
*/
- protected Control createInner(Composite parent)
- {
- // top level composite
- Composite composite = new Composite(parent,SWT.NONE);
+ protected Control createInner(Composite parent) {
+
+ // top level composite
+ Composite composite = new Composite(parent, SWT.NONE);
composite.setLayout(new GridLayout());
- composite.setLayoutData(new GridData(
- GridData.VERTICAL_ALIGN_FILL | GridData.HORIZONTAL_ALIGN_FILL));
+ composite.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_FILL | GridData.HORIZONTAL_ALIGN_FILL));
// Inner composite
- Composite composite_prompts = SystemWidgetHelpers.createComposite(
- composite, 2);
+ Composite composite_prompts = SystemWidgetHelpers.createComposite(composite, 2);
- IConnectorService systemObject = (IConnectorService)getInputObject();
+ // yantzi: artemis 6.0, at request of zOS team I am changing the system type and hostname
+ // to labels so they are clearer to read than non-editable entry fields
// System type
- //textSystemType = SystemWidgetHelpers.createLabeledReadonlyTextField(
- // composite_prompts,rb,RESID_CONNECTION_SYSTEMTYPE_READONLY_ROOT);
String text = SystemWidgetHelpers.appendColon(SystemResources.RESID_CONNECTION_SYSTEMTYPE_READONLY_LABEL);
Label label = SystemWidgetHelpers.createLabel(composite_prompts, text);
GridData gd = new GridData();
- gd.heightHint = LABEL_HEIGHT;
- label.setLayoutData(gd);
-
- label = SystemWidgetHelpers.createLabel(composite_prompts, systemObject.getHostType());
+// gd.heightHint = LABEL_HEIGHT;
+ label.setLayoutData(gd);
+ label = SystemWidgetHelpers.createLabel(composite_prompts, connectorService.getHostType());
gd = new GridData();
- gd.heightHint = LABEL_HEIGHT;
- label.setLayoutData(gd);
+// gd.heightHint = LABEL_HEIGHT;
+ label.setLayoutData(gd);
// Host name
- //textHostName = SystemWidgetHelpers.createLabeledReadonlyTextField(
- // composite_prompts, rb, ISystemConstants.RESID_CONNECTION_HOSTNAME_READONLY_ROOT);
text = SystemWidgetHelpers.appendColon(SystemResources.RESID_CONNECTION_HOSTNAME_READONLY_LABEL);
label = SystemWidgetHelpers.createLabel(composite_prompts, text);
gd = new GridData();
- gd.heightHint = LABEL_HEIGHT;
- label.setLayoutData(gd);
- label = SystemWidgetHelpers.createLabel(composite_prompts, systemObject.getHostName());
+// gd.heightHint = LABEL_HEIGHT;
+ label.setLayoutData(gd);
+ label = SystemWidgetHelpers.createLabel(composite_prompts, connectorService.getHostName());
gd = new GridData();
- gd.heightHint = LABEL_HEIGHT;
- label.setLayoutData(gd);
-
+// gd.heightHint = LABEL_HEIGHT;
+ label.setLayoutData(gd);
+
// UserId
- textUserId = SystemWidgetHelpers.createLabeledTextField(
- composite_prompts,this,SystemResources.RESID_CONNECTION_USERID_LABEL, SystemResources.RESID_CONNECTION_USERID_TIP);
-
- // Password prompt
- textPassword = SystemWidgetHelpers.createLabeledTextField(
- composite_prompts,this,SystemResources.RESID_PASSWORD_LABEL, SystemResources.RESID_PASSWORD_TIP);
- textPassword.setEchoChar('*');
+ if (connectorService.supportsUserId()) {
+ textUserId = SystemWidgetHelpers.createLabeledTextField(composite_prompts, this, SystemResources.RESID_CONNECTION_USERID_LABEL, SystemResources.RESID_CONNECTION_USERID_TIP);
+ }
+
+ // Password prompt
+ if (connectorService.supportsPassword()) {
+ textPassword = SystemWidgetHelpers.createLabeledTextField(composite_prompts, this, SystemResources.RESID_PASSWORD_LABEL, SystemResources.RESID_PASSWORD_TIP);
+ textPassword.setEchoChar('*');
+ }
// UserId_make_permanent checkbox
// DY: align user ID checkbox with entry fields
// yantzi:5.1 move checkboxes to be below entry fields
- SystemWidgetHelpers.createLabel(composite_prompts, "");
- userIdPermanentCB = SystemWidgetHelpers.createCheckBox(
- composite_prompts, 1, this, SystemResources.RESID_PASSWORD_USERID_ISPERMANENT_LABEL, SystemResources.RESID_PASSWORD_USERID_ISPERMANENT_TIP );
- userIdPermanentCB.setEnabled(false);
+ if (connectorService.supportsUserId()) {
+ SystemWidgetHelpers.createLabel(composite_prompts, "");
+ userIdPermanentCB = SystemWidgetHelpers.createCheckBox(composite_prompts, 1, this, SystemResources.RESID_PASSWORD_USERID_ISPERMANENT_LABEL,
+ SystemResources.RESID_PASSWORD_USERID_ISPERMANENT_TIP);
+ userIdPermanentCB.setEnabled(false);
+ }
- // Save signon information checkbox
- // DY: align password checkbox with entry fields
- SystemWidgetHelpers.createLabel(composite_prompts, "");
- savePasswordCB = SystemWidgetHelpers.createCheckBox(
- composite_prompts, 1, this, SystemResources.RESID_PASSWORD_SAVE_LABEL, SystemResources.RESID_PASSWORD_SAVE_TOOLTIP);
- savePasswordCB.setSelection(savePassword);
- // disable until the user enters something for consistency with the save user ID checkbox
- savePasswordCB.setEnabled(false);
-
- initializeInput();
+ // Save signon information checkbox
+ // DY: align password checkbox with entry fields
+ if (connectorService.supportsPassword()) {
+ SystemWidgetHelpers.createLabel(composite_prompts, "");
+ savePasswordCB = SystemWidgetHelpers.createCheckBox(composite_prompts, 1, this, SystemResources.RESID_PASSWORD_SAVE_LABEL, SystemResources.RESID_PASSWORD_SAVE_TOOLTIP);
+ savePasswordCB.setSelection(savePassword);
+ // disable until the user enters something for consistency with the save user ID checkbox
+ savePasswordCB.setEnabled(false);
+ }
+
+ initializeInput();
// add keystroke listeners...
- textUserId.addModifyListener(
- new ModifyListener() {
+ if (textUserId != null) {
+ textUserId.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent e) {
- validateUserIdInput();
+ processUserIdField();
}
- }
- );
- textPassword.addModifyListener(
- new ModifyListener() {
+ });
+ }
+ if (textPassword != null) {
+ textPassword.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent e) {
- validatePasswordInput();
+ processPasswordField();
}
- }
- );
-
-
- //SystemWidgetHelpers.setHelp(composite, RSEUIPlugin.HELPPREFIX+"pwdp0000");
- return composite;
+ });
+ }
+
+ return composite;
}
-// yantzi: artemis 6.0 not required, the Window class handles ESC processing
-// /**
-// * @see SystemPromptDialog#createContents(Composite)
-// */
-// protected Control createContents(Composite parent)
-// {
-// //System.out.println("INSIDE CREATECONTENTS");
-// Control c = super.createContents(parent);
-// // Listen for ESC keypress, simulate the user pressing
-// // the cancel button
-//
-// KeyListener keyListener = new KeyAdapter() {
-// public void keyPressed(KeyEvent e) {
-// if (e.character == SWT.ESC) {
-// buttonPressed(CANCEL_ID);
-// }
-// }
-// };
-//
-// textUserId.addKeyListener(keyListener);
-// textPassword.addKeyListener(keyListener);
-// userIdPermanentCB.addKeyListener(keyListener);
-// okButton.addKeyListener(keyListener);
-// cancelButton.addKeyListener(keyListener);
-//
-// return c;
-// }
+ /**
+ * @see SystemPromptDialog#getInitialFocusControl()
+ */
+ protected Control getInitialFocusControl() {
+ okButton.setEnabled(true);
+ processUserIdField();
+ processPasswordField();
+ if (textUserId != null) {
+ if (userId.length() == 0 || textPassword == null) {
+ return textUserId;
+ }
+ }
+ if (textPassword != null) {
+ textPassword.selectAll();
+ return textPassword;
+ }
+ if (okButton.isEnabled()) return okButton;
+ return cancelButton;
+ }
+ /**
+ * Initialize values using input data
+ */
+ private void initializeInput() {
+ originalUserId = connectorService.getUserId();
+ userId = originalUserId;
+ if (connectorService.supportsUserId() && (userId == null || userId.length() == 0)) {
+ userId = SystemPreferencesManager.getPreferencesManager().getDefaultUserId(connectorService.getHostType());
+ }
+ if (textUserId != null && userId != null) {
+ textUserId.setText(userId);
+ }
+ if (textPassword != null && password != null) {
+ textPassword.setText(password);
+ }
+ }
+
+ /**
+ * Retrieves the userId entered by user
+ */
+ private void internalGetUserId() {
+ if (textUserId != null) {
+ userId = textUserId.getText().trim();
+ }
+ }
+
+ /**
+ * Retrieves the password entered by user
+ */
+ private void internalGetPassword() {
+ if (textPassword != null) {
+ password = textPassword.getText().trim();
+ }
+ }
+
+ /**
+ * Retrieves the value of the "save user id" checkbox
+ */
+ private void internalGetIsUserIdChangePermanent() {
+ if (userIdPermanentCB != null) {
+ userIdPermanent = userIdPermanentCB.isEnabled() && userIdPermanentCB.getSelection();
+ }
+ }
+
+ /**
+ * Retrieves the value of the "save password" checkbox
+ */
+ private void internalGetIsSavePassword() {
+ if (savePasswordCB != null) {
+ savePassword = savePasswordCB.isEnabled() && savePasswordCB.getSelection();
+ }
+ }
+
+ /**
+ * This method is called whenever the text changes in the user id input field.
+ * Checks the user id field and if there are no errors, other fields on the dialog.
+ * If an error was reported it is displayed on the message line.
+ * @see #setUserIdValidator(ISystemValidator)
+ */
+ private void processUserIdField() {
+ internalGetUserId();
+ internalGetPassword();
+ SystemMessage m = checkUserId();
+ if (m == null) {
+ m = checkPassword();
+ }
+ okButton.setEnabled(m == null);
+ setErrorMessage(m);
+ if (userId == null || originalUserId == null) {
+ userIdChanged = (userId != originalUserId);
+ } else {
+ userIdChanged = !userId.equals(originalUserId);
+ }
+ if (userIdPermanentCB != null) {
+ userIdPermanentCB.setEnabled(userIdChanged);
+ }
+ }
/**
- * Init values using input data
+ * Performs the actual validation check for the user id.
+ * Delegates the request to an ISystemValidator object.
+ * @return the message returned by the validator or null.
*/
- protected void initializeInput()
- {
- IConnectorService systemObject = (IConnectorService)getInputObject();
- //textSystemType.setText(systemObject.getSystemType());
- //textHostName.setText(systemObject.getHostName());
- originalUserId = systemObject.getUserId();
- if ((originalUserId != null) && (originalUserId.length()>0))
- {
- //textUserId.setEditable(false);
- //textUserId.setEnabled(false);
- textUserId.setText(originalUserId);
+ private SystemMessage checkUserId() {
+ SystemMessage m = null;
+ if (connectorService.supportsUserId() && validate) {
+ if (userIdValidator != null) {
+ m = userIdValidator.validate(userId);
+ } else if (connectorService.requiresUserId() && userId.length() == 0) {
+ m = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_USERID_EMPTY);
+ }
}
- else
- {
- // added by phil: if we don't prompt for userId at new connection time,
- // then we should default here to the preferences setting for the user id,
- // by SystemType...
- String preferencesUserId = SystemPreferencesManager.getPreferencesManager().getDefaultUserId(systemObject.getHostType());
- if (preferencesUserId != null)
- textUserId.setText(preferencesUserId);
- originalUserId = "";
- }
-
- if (password != null)
- {
- textPassword.setText(password);
- }
-
- }
- /**
- * Return the userId entered by user
- */
- private String internalGetUserId()
- {
- userId = textUserId.getText().trim();
- return userId;
- }
-
- /**
- * Return the password entered by user
- */
- private String internalGetPassword()
- {
- password = textPassword.getText().trim();
- return password;
- }
- /**
- * Return true if the user elected to make the changed user Id a permanent change.
- */
- private boolean internalGetIsUserIdChangePermanent()
- {
- userIdPermanent = userIdPermanentCB.getSelection();
- return userIdPermanent;
- }
- /**
- * Return true if the user elected to save the password
- */
- private boolean internalGetIsSavePassword()
- {
- savePassword = savePasswordCB.getSelection();
- return savePassword;
- }
-
-
- /**
- * This hook method is called whenever the text changes in the user Id input field.
- * The default implementation delegates the request to an ISystemValidator object.
- * If the ISystemValidator reports an error the error message is displayed
- * in the Dialog's message line.
- * @see #setUserIdValidator(ISystemValidator)
- */
- protected SystemMessage validateUserIdInput()
- {
- if (noValidate)
- return null;
- clearErrorMessage();
- errorMessage= null;
- String userId = internalGetUserId();
- userIdChanged = !userId.equals(originalUserId);
- userIdPermanentCB.setEnabled(userIdChanged);
- if (userIdValidator != null)
- errorMessage= userIdValidator.validate(userId);
- else if (userId.equals(""))
- errorMessage = RSEUIPlugin.getPluginMessage(MSG_VALIDATE_USERID_EMPTY);
- userIdOK = (errorMessage == null);
- if (!userIdOK)
- {
- okButton.setEnabled(false);
- setErrorMessage(errorMessage);
- }
- else
- okButton.setEnabled(passwordOK);
- return errorMessage;
+ return m;
}
- /**
- * This hook method is called whenever the text changes in the password input field.
+ /**
+ * This method is called whenever the text changes in the password input field.
* The default implementation delegates the request to an ISystemValidator object.
* If the ISystemValidator reports an error the error message is displayed
* in the Dialog's message line.
* @see #setPasswordValidator(ISystemValidator)
- */
- protected SystemMessage validatePasswordInput()
- {
- // yantzi: artemis 6.0, disable save checkbox when blank
- savePasswordCB.setEnabled(!internalGetPassword().equals(""));
-
- if (noValidate)
- return null;
- clearErrorMessage();
- errorMessage= null;
- String password = internalGetPassword();
- if (passwordValidator != null)
- errorMessage= passwordValidator.validate(password);
- else if (password.equals(""))
- errorMessage = RSEUIPlugin.getPluginMessage(MSG_VALIDATE_PASSWORD_EMPTY);
- passwordOK = (errorMessage == null);
- if (!passwordOK)
- {
- setErrorMessage(errorMessage);
- okButton.setEnabled(false);
- }
- else
- okButton.setEnabled(userIdOK);
- return errorMessage;
+ */
+ private void processPasswordField() {
+ internalGetUserId();
+ internalGetPassword();
+ SystemMessage m = checkPassword();
+ if (m == null) {
+ m = checkUserId();
+ }
+ okButton.setEnabled(m == null);
+ setErrorMessage(m);
+ if (savePasswordCB != null) {
+ savePasswordCB.setEnabled(password.length() > 0); // yantzi: artemis 6.0, disable save checkbox when blank
+ }
}
-
- /**
- * Return the userId entered by user
- */
- public String getUserId()
- {
- return userId;
- }
-
- /**
- * Return the password entered by user
- */
- public String getPassword()
- {
- return password;
- }
/**
- * Sets the password
+ * Checks the value of the password instance variable.
*/
- public void setPassword(String password)
- {
+ private SystemMessage checkPassword() {
+ SystemMessage m = null;
+ if (connectorService.supportsPassword() && validate) {
+ if (passwordValidator != null) {
+ m = passwordValidator.validate(password);
+ } else if (connectorService.requiresPassword() && password.length() == 0) {
+ m = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_PASSWORD_EMPTY);
+ }
+ }
+ return m;
+ }
+
+ /**
+ * Return the userId entered by user
+ */
+ public String getUserId() {
+ return userId;
+ }
+
+ /**
+ * Returns the password may have been modified by the user.
+ */
+ public String getPassword() {
+ return password;
+ }
+
+ /**
+ * Sets the password, may be null if no password is available.
+ */
+ public void setPassword(String password) {
this.password = password;
}
- /**
- * Return true if the user changed the user id
- */
- public boolean getIsUserIdChanged()
- {
- return userIdChanged;
- }
- /**
- * Return true if the user elected to make the changed user Id a permanent change.
- */
- public boolean getIsUserIdChangePermanent()
- {
- return userIdPermanent;
- }
- /**
- * Return true if the user elected to make the changed user Id a permanent change.
- */
- public boolean getIsSavePassword()
- {
- return savePassword;
- }
- /**
- * Preselect the save password checkbox. Default value is to not
- * select the save password checkbox.
- */
- public void setSavePassword(boolean save)
- {
- savePassword = save;
- }
+
+ /**
+ * Return true if the user changed the user id
+ */
+ public boolean getIsUserIdChanged() {
+ return userIdChanged;
+ }
+
+ /**
+ * Return true if the user elected to make the changed user Id a permanent change.
+ */
+ public boolean getIsUserIdChangePermanent() {
+ return userIdPermanent;
+ }
+
+ /**
+ * Return true if the user elected to make the changed user Id a permanent change.
+ */
+ public boolean getIsSavePassword() {
+ return savePassword;
+ }
+
+ /**
+ * Preselect the save password checkbox. Default value is to not
+ * select the save password checkbox.
+ */
+ public void setSavePassword(boolean save) {
+ savePassword = save;
+ }
+
/**
* Verifies all input.
* @return true if there are no errors in the user input
*/
- protected boolean verify()
- {
- SystemMessage errMsg = null;
+ private void verify() {
Control controlInError = null;
- clearErrorMessage();
- errorMessage = null;
- errMsg = validateUserIdInput();
- if (errMsg != null)
- controlInError = textUserId;
- else
- {
- errMsg = validatePasswordInput();
- if (errMsg != null)
- controlInError = textPassword;
- }
- if (errMsg != null)
- controlInError.setFocus(); // validate methods already displayed error message
- return (errMsg == null);
+ processUserIdField();
+ if (getErrorMessage() != null) {
+ controlInError = textUserId;
+ } else {
+ processPasswordField();
+ if (getErrorMessage() != null) {
+ controlInError = textPassword;
+ }
+ }
+ if (getErrorMessage() != null) {
+ controlInError.setFocus(); // validate methods already displayed error message
+ }
}
-
+
/**
* Called when user presses OK button.
* Return true to close dialog.
* Return false to not close dialog.
*/
- protected boolean processOK()
- {
- //busyCursor = new Cursor(getShell().getDisplay(), SWT.CURSOR_WAIT);
- //getShell().setCursor(busyCursor);
- setBusyCursor(true); // phil
-
- password = internalGetPassword();
- userId = internalGetUserId();
- userIdPermanent = internalGetIsUserIdChangePermanent();
- savePassword = internalGetIsSavePassword();
- if (forceToUpperCase)
- {
- userId = userId.toUpperCase();
- password = password.toUpperCase();
- noValidate = true;
- textUserId.setText(userId);
- textPassword.setText(password);
- noValidate = false;
- }
-
- boolean closeDialog = verify();
-
- //getShell().setCursor(null);
- //busyCursor.dispose();
- setBusyCursor(false); // phil
-
- // If all inputs are OK then verify signon
- if (closeDialog && (signonValidator != null))
- {
- SystemMessage msg = signonValidator.isValid(this, userId, password);
- if (msg != null)
- {
- closeDialog = false;
- setErrorMessage(msg);
- }
+ protected boolean processOK() {
+ setBusyCursor(true);
+ internalGetPassword();
+ internalGetUserId();
+ internalGetIsUserIdChangePermanent();
+ internalGetIsSavePassword();
+ if (forceToUpperCase) {
+ userId = userId.toUpperCase();
+ password = password.toUpperCase();
+ validate = false;
+ textUserId.setText(userId);
+ textPassword.setText(password);
+ validate = true;
}
-
+
+ verify();
+ setBusyCursor(false); // phil
+
+ // If all inputs are OK then validate signon
+ if (getErrorMessage() == null && (signonValidator != null)) {
+ SystemMessage m = signonValidator.isValid(this, userId, password);
+ setErrorMessage(m);
+ }
+ boolean closeDialog = (getErrorMessage() == null);
return closeDialog;
- }
+ }
}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemSubSystemPropertyPageCoreForm.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemSubSystemPropertyPageCoreForm.java
index fb1a85d2c27..9bb1b6adbcc 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemSubSystemPropertyPageCoreForm.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemSubSystemPropertyPageCoreForm.java
@@ -127,7 +127,7 @@ public class SystemSubSystemPropertyPageCoreForm extends AbstractSystemSubSystem
*/
protected boolean isUserIdApplicable()
{
- return getSubSystem().getSubSystemConfiguration().supportsUserId();
+ return getSubSystem().getConnectorService().supportsUserId();
}
private ISystemValidator getPortValidator()
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SubSystemConfigurationAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SubSystemConfigurationAdapter.java
index d49f2056bd4..c03c43ec4bd 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SubSystemConfigurationAdapter.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SubSystemConfigurationAdapter.java
@@ -529,7 +529,7 @@ public class SubSystemConfigurationAdapter implements ISubSystemConfigurationAda
if (factory.supportsSubSystemConnect())
{
//nbrBaseActions += 2; // 4; MJB: RE defect 50854
- if (factory.supportsUserId())
+ if (selectedSubSystem.getConnectorService().supportsUserId())
nbrBaseActions += 1;
}
//if (supportsFilters())
@@ -542,7 +542,7 @@ public class SubSystemConfigurationAdapter implements ISubSystemConfigurationAda
//subSystemActions[ssIdx++] = new SystemConnectAction(shell);
//subSystemActions[ssIdx++] = new SystemDisconnectAction(shell);
- if (factory.supportsUserId())
+ if (selectedSubSystem.getConnectorService().supportsUserId())
subSystemActions[ssIdx++] = new SystemClearPasswordAction(shell);
}
} // end if subsystemActons == null
diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/AbstractConnectorService.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/AbstractConnectorService.java
index 12893919209..cf514305240 100644
--- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/AbstractConnectorService.java
+++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/AbstractConnectorService.java
@@ -45,7 +45,7 @@ import org.eclipse.swt.widgets.Shell;
* This is a base class to make it easier to create connector service classes.
*
* An {@link org.eclipse.rse.core.subsystems.IConnectorService} object - * is returned from a subsystem object via getSystem(), and + * is returned from a subsystem object via getConnectorService(), and * it is used to represent the live connection to a particular subsystem. *
* You must override/implement @@ -61,6 +61,13 @@ import org.eclipse.swt.widgets.Shell; *
Returns the password for this connector service. - *
+ * Sets the signon information for this connector service. * The search order for the password is as follows:
** By default returns an instance of SystemPasswordPromptDialog. Calls forcePasswordToUpperCase() to decide whether the user Id and password should be folded to uppercase. *
@@ -618,7 +659,6 @@ public abstract class AbstractConnectorService extends RSEModelObject implements
{
ISystemPasswordPromptDialog dlg = new SystemPasswordPromptDialog(shell);
dlg.setForceToUpperCase(forcePasswordToUpperCase());
- //dlg.setBlockOnOpen(true); now done by default in SystemPromptDialog
dlg.setUserIdValidator(getUserIdValidator());
dlg.setPasswordValidator(getPasswordValidator());
dlg.setSignonValidator(getSignonValidator());
@@ -697,7 +737,7 @@ public abstract class AbstractConnectorService extends RSEModelObject implements
return getPrimarySubSystem().forceUserIdToUpperCase();
}
- /**
+ /**
* Useful utility method. Fully implemented, no need to override.
* Get the userId input validator to use in the password dialog prompt.
*
@@ -708,6 +748,7 @@ public abstract class AbstractConnectorService extends RSEModelObject implements
{
return getPrimarySubSystem().getSubSystemConfiguration().getUserIdValidator();
}
+
/**
* Useful utility method. Fully implemented, no need to override.
* Get the password input validator to use in the password dialog prompt.
diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/IConnectorService.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/IConnectorService.java
index 76c82c52f0b..8c973a19ee2 100644
--- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/IConnectorService.java
+++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/IConnectorService.java
@@ -291,16 +291,49 @@ public interface IConnectorService extends IRSEModelObject
*/
void setRemoteServerLauncherProperties(IServerLauncherProperties value);
-
boolean hasRemoteServerLauncherProperties();
boolean supportsRemoteServerLaunching();
/**
* Tell us if this subsystem factory supports server launch properties, which allow the user
- * to configure how the server-side code for these subsystems are started. There is a Server
- * Launch Setting property page, with a pluggable composite, where users can configure these
- * properties.
+ * to configure how the server-side code for these subsystems are started. There is a Server
+ * Launch Setting property page, with a pluggable composite, where users can configure these
+ * properties.
*/
public boolean supportsServerLaunchProperties();
+
+ /**
+ * Report if this connector service can use a user identifier.
+ * Returns true in default implementation.
+ * Typically used to indicate if a login dialog needs to be presented when connecting.
+ * @return true if and only if the connector service can use a user id.
+ */
+ public boolean supportsUserId();
+
+ /**
+ * Report if this connector service requires a user id.
+ * Returns true in default implementation.
+ * Typically used to indicate if a login dialog can allow an empty user id.
+ * Must be ignored if supportsUserId() is false.
+ * @return true or false to indicate if the connector service requires a user id.
+ */
+ public boolean requiresUserId();
+
+ /**
+ * Can be used to determine if a password field is present on a login dialog for this connector service.
+ * The default implementation of this interface should return true.
+ * @return true if the subsystem can use a password, false if a password is irrelevant.
+ */
+ public boolean supportsPassword();
+
+ /**
+ * If a password is supported this is used to determine if the password is required.
+ * Must be ignored if supportsPassword() returns false.
+ * The default implementation of this interface should return true.
+ * @return true if the connector service requires a password, false if a password may be empty.
+ */
+ public boolean requiresPassword();
+
+
}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/ISubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/ISubSystemConfiguration.java
index 14d7078bf1f..0c13dfe9cb7 100644
--- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/ISubSystemConfiguration.java
+++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/ISubSystemConfiguration.java
@@ -53,39 +53,6 @@ public interface ISubSystemConfiguration extends ISystemFilterPoolManagerProvide
// ---------------------------------
// CRITICAL METHODS...
// ---------------------------------
- /**
- * Determines if a user id is relevant for this subsystem.
- * Returns true in default implementation.
- * Typically used to indicate if a login dialog needs to be presented when the subsystem
- * connects.
- * @return true or false to indicate if subsystems can use a user id.
- */
- public boolean supportsUserId();
-
- /**
- * Determines if a user id is required if a user id can be used to connect subsystems of this configuration.
- * Returns true in default implementation.
- * Typically used to indicate if a login dialog can allow an empty user id.
- * @return true or false to indicate if subsystems requires a user id.
- */
- public boolean requiresUserId();
-
- /**
- * Can be used to determine if a password field is present on a login dialog for subsystems
- * of this configuration.
- * The default implementation of this interface should return true.
- * @return true if the subsystem can use a password, false if a password is irrelevant.
- */
- public boolean supportsPassword();
-
- /**
- * If a password is supported this is used to determine if the password can be the empty string.
- * Must be ignored if supportsPassword() returns false.
- * The default implementation of this interface should return true.
- * @return true if the subsystem requires, false if a password may be empty.
- */
- public boolean requiresPassword();
-
/**
* Return true if the subsystem supports more than one filter string
*
RETURNS true BY DEFAULT diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java index 870e41ebf7e..10fcb059f04 100644 --- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java +++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java @@ -2508,16 +2508,16 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS /** * Connect to the remote system, optionally forcing a signon prompt even if the password * is cached in memory or on disk. - * You do not need to override this, as it does the progress monitor and error message - * displaying for you. - *
- * Override internalConnect if you want, but by default it calls getSystem().connect(IProgressMonitor). - * - * @param Shell parent shell used to show error message. Null means you will handle showing the error message. - * @param forcePrompt Forces the signon prompt to be displayed even if a valid password in cached in memory - * or saved on disk. + * You do not need to override this, as it does the progress monitor and error message + * displaying for you. + *
+ * Override internalConnect if you want, but by default it calls getSystem().connect(IProgressMonitor). + * + * @param Shell parent shell used to show error message. Null means you will handle showing the error message. + * @param forcePrompt Forces the signon prompt to be displayed even if a valid password in cached in memory + * or saved on disk. */ - public void connect(Shell shell, boolean forcePrompt) throws Exception { + public void connect(Shell shell, boolean forcePrompt) throws Exception { // yantzi: artemis60, (defect 53082) check that the connection has not been deleted before continuing, // this is a defenisve measure to protect against code that stores a handle to subsystems but does // not do this check @@ -2543,9 +2543,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS if (runnableContext instanceof ProgressMonitorDialog) { ((ProgressMonitorDialog) runnableContext).setCancelable(true); } - if (getSubSystemConfiguration().supportsUserId()) { - getConnectorService().promptForPassword(shell, forcePrompt); // prompt for userid and password - } + getConnectorService().promptForPassword(shell, forcePrompt); // prompt for userid and password ConnectJob job = new ConnectJob(); scheduleJob(job, null, shell != null); IStatus status = job.getResult(); @@ -2558,13 +2556,24 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS /** - * Prompt the user for a password to the remote system. The primary request was something else, - * but we have detected the user is not connected so we prompt for password outside - * of the progress monitor, then set a flag to do the connection within the progress - * monitor. - * @param Shell parent shell used to show error message. Null means you will handle showing the error message. + * A convenience method, fully equivalent to promptForPassword(shell, false). + * @param Shell parent shell used to show any error messages. */ public boolean promptForPassword(Shell shell) throws Exception + { + return promptForPassword(shell, false); + } + + /** + * Prompt the user for a password to the remote system. The primary request was something else, + * but we have detected the user is not connected so we prompt for password outside + * of the progress monitor, then set a flag to do the connection within the progress + * monitor. + * @param Shell parent shell used to show error messages. + * @param force true if the prompting should be forced, false if prompting can be skipped if credentials have been stored. + * @return true if the credentials are obtained + */ + public boolean promptForPassword(Shell shell, boolean force) throws Exception { boolean ok = false; if (!supportsConnecting) @@ -2581,17 +2590,10 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS doConnection = true; // this gets handled later when it comes time to connect return true; } - else if (!getSubSystemConfiguration().supportsUserId()) - { - // subsystem needs no user id so dont bother prompting - doConnection = true; // this gets handled later when it comes time to connect - return true; - } - try { - getConnectorService().promptForPassword(shell, false); // prompt for password + getConnectorService().promptForPassword(shell, force); // prompt for password doConnection = true; ok = true; } @@ -2768,45 +2770,45 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS } /** - * Actually connect to the remote host. This is called by the run(IProgressMonitor monitor) method. + * Connect to the remote host. This is called by the run(IProgressMonitor monitor) method. *
- * You DO NOT OVERRIDE THIS typically. Rather, this calls connect(IProgressMonitor) in your - * ISystem class that is returned from getSystem(). That is where your code to connect should go! + * DO NOT OVERRIDE THIS. Rather, this calls connect(IProgressMonitor) in the + * IConnectorService class that is returned from getConnectorService(). *
- * Your connect method in your ISystem class must follow these IRunnableWithProgress rules: + * Your connect method in your IConnectorService class must follow these IRunnableWithProgress rules: *
- * You DO NOT OVERRIDE THIS typically. Rather, this calls connect(IProgressMonitor) in your - * ISystem class that is returned from getSystem(). That is where your code to disconnect should go! + * You DO NOT OVERRIDE THIS. Rather, this calls connect(IProgressMonitor) in your + * IConnectorService class that is returned from getConnectorService(). That is where your code to disconnect should go! *
- * Your connect method in your ISystem class must follow these IRunnableWithProgress rules: + * Your disconnect method in your IConnectorService class must follow these IRunnableWithProgress rules: *
- * Returns TRUE by default. - */ - public boolean supportsUserId() - { - return true; - } - - /* (non-Javadoc) - * @see org.eclipse.rse.core.subsystems.ISubSystemConfiguration#requiresUserId() - */ - public boolean requiresUserId() { - return true; - } - - /* (non-Javadoc) - * @see org.eclipse.rse.core.subsystems.ISubSystemConfiguration#supportsPassword() - */ - public boolean supportsPassword() { - return true; - } - - /* (non-Javadoc) - * @see org.eclipse.rse.core.subsystems.ISubSystemConfiguration#requiresPassword() - */ - public boolean requiresPassword() { - return true; - } /** * Return true if instance of this factory's subsystems support connect and disconnect actions. diff --git a/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/PasswordPersistenceManager.java b/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/PasswordPersistenceManager.java index c02a6c5d778..b7bd0b721f0 100644 --- a/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/PasswordPersistenceManager.java +++ b/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/PasswordPersistenceManager.java @@ -429,10 +429,6 @@ public class PasswordPersistenceManager { */ public SystemSignonInformation find(String systemtype, String hostname, String userid) { - if (userid == null) - { - return null; - } return find(systemtype, hostname, userid, true); } @@ -550,7 +546,7 @@ public class PasswordPersistenceManager { { String hostname = hname;//RSEUIPlugin.getQualifiedHostName(hname); // Convert userid to upper case if required - if (!isUserIDCaseSensitive(systemtype)) + if (!isUserIDCaseSensitive(systemtype) && userid != null) { userid = userid.toUpperCase(); }