Skip to content

Commit dd6e4dd

Browse files
authored
Fix documentation for supported mail protocols (#6861)
Signed-off-by: lance <leehaut@gmail.com>
1 parent 4c51db7 commit dd6e4dd

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

docs/hop-user-manual/modules/ROOT/pages/metadata-types/mail-server-connection.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ xref:workflow/actions/mail.adoc[Mail] action
3333
|===
3434
|Option |Description
3535
|Connection name|The name to use for this mail server connection
36-
|Connection protocol|The connection protocol to use for this connection. Supported options are SMTP, IMAP, POP, MBOX (Only SMTP is currently supported).
36+
|Connection protocol|The connection protocol to use for this connection. Supported options are SMTP, IMAP, and POP. MBOX is currently not supported.
3737
|Server host|The mail server hostname to use for this connection
3838
|Server port|The mail server port to use for this connection
3939
|Use authentication?|Use authentication with this connection?

plugins/misc/mail/src/main/java/org/apache/hop/mail/metadata/MailServerConnectionEditor.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ public void createControl(Composite composite) {
173173
FormData fdlUseAuthenticationLabel = new FormData();
174174
fdlUseAuthenticationLabel.top = new FormAttachment(lastControl, margin);
175175
fdlUseAuthenticationLabel.left = new FormAttachment(0, 0);
176-
fdlUseAuthenticationLabel.right = new FormAttachment(middle, 0);
176+
fdlUseAuthenticationLabel.right = new FormAttachment(middle, -margin);
177177
wlUseAuthenticationLabel.setLayoutData(fdlUseAuthenticationLabel);
178178
wUseAuthentication = new Button(composite, SWT.CHECK | SWT.LEFT);
179179
PropsUi.setLook(wUseAuthentication);
@@ -275,7 +275,6 @@ public void createControl(Composite composite) {
275275
fdSecureConnectionType.left = new FormAttachment(middle, 0);
276276
fdSecureConnectionType.right = new FormAttachment(100, 0);
277277
wSecureConnectionType.setLayoutData(fdSecureConnectionType);
278-
String[] secureConnectionType = new String[] {"SSL", "TLS", "TLS 1.2"};
279278
lastControl = wSecureConnectionType;
280279

281280
// Use check server identity
@@ -285,8 +284,8 @@ public void createControl(Composite composite) {
285284
PropsUi.setLook(wlCheckServerIdentity);
286285
FormData fdlCheckServerIdentity = new FormData();
287286
fdlCheckServerIdentity.left = new FormAttachment(0, 0);
288-
fdlCheckServerIdentity.top = new FormAttachment(lastControl, 0);
289-
fdlCheckServerIdentity.right = new FormAttachment(middle, 0);
287+
fdlCheckServerIdentity.top = new FormAttachment(lastControl, margin);
288+
fdlCheckServerIdentity.right = new FormAttachment(middle, -margin);
290289
wlCheckServerIdentity.setLayoutData(fdlCheckServerIdentity);
291290
wCheckServerIdentity = new Button(composite, SWT.CHECK | SWT.LEFT);
292291
PropsUi.setLook(wCheckServerIdentity);
@@ -302,7 +301,6 @@ public void widgetSelected(SelectionEvent e) {
302301
setChanged();
303302
}
304303
});
305-
lastControl = wCheckServerIdentity;
306304

307305
// Trusted Hosts line
308306
wTrustedHosts =
@@ -369,7 +367,6 @@ public void widgetSelected(SelectionEvent e) {
369367
fdProxyPassword.left = new FormAttachment(middle, 0);
370368
fdProxyPassword.right = new FormAttachment(100, 0);
371369
wProxyPassword.setLayoutData(fdProxyPassword);
372-
lastControl = wProxyPassword;
373370

374371
setWidgetsContent();
375372

0 commit comments

Comments
 (0)