| Revision | 143 (tree) |
|---|---|
| Time | 2015-11-17 22:44:40 |
| Author | t_nakayama1971 |
(empty log message)
| @@ -389,7 +389,7 @@ | ||
| 389 | 389 | // 認証 |
| 390 | 390 | Authenticator auth = null; |
| 391 | 391 | if (this.user != null) { |
| 392 | - auth = new Auth(this.user, this.password); | |
| 392 | + auth = new PasswordAuthenticator(this.user, this.password); | |
| 393 | 393 | props.setProperty("mail.smtp.auth", "true"); |
| 394 | 394 | props.setProperty("mail.smtp.port", "587"); |
| 395 | 395 | props.setProperty("mail.smtp.starttls.enable", "true"); |
| @@ -502,8 +502,9 @@ | ||
| 502 | 502 | for (int i = 0; i < ret.length; i++) { |
| 503 | 503 | int loc = address[i].lastIndexOf(':'); |
| 504 | 504 | if (0 <= loc) { |
| 505 | - ret[i] = new InternetAddressEx(address[i].substring(0, loc), | |
| 506 | - address[i].substring(loc + ":".length())); | |
| 505 | + InternetAddressEx ex = new InternetAddressEx(address[i].substring(0, loc)); | |
| 506 | + ex.setPersonal(address[i].substring(loc + ":".length())); | |
| 507 | + ret[i] = ex; | |
| 507 | 508 | } else { |
| 508 | 509 | ret[i] = new InternetAddress(address[i]); |
| 509 | 510 | } |
| @@ -515,19 +516,24 @@ | ||
| 515 | 516 | * InternetAddress拡張 |
| 516 | 517 | * @author Tadashi Nakayama |
| 517 | 518 | */ |
| 518 | - private static final class InternetAddressEx extends InternetAddress { | |
| 519 | + public static final class InternetAddressEx extends InternetAddress { | |
| 519 | 520 | /** serialVersionUID */ |
| 520 | 521 | private static final long serialVersionUID = 8583837194606507146L; |
| 521 | 522 | |
| 522 | 523 | /** |
| 523 | 524 | * コンストラクタ |
| 524 | - * @param ads アドレス | |
| 525 | - * @param psn 人物 | |
| 526 | - * @throws UnsupportedEncodingException 例外 | |
| 525 | + * @param val アドレス | |
| 527 | 526 | */ |
| 528 | - InternetAddressEx(final String ads, final String psn) | |
| 529 | - throws UnsupportedEncodingException { | |
| 530 | - super(ads, psn, MojiUtil.CHARSET_XJIS.name()); | |
| 527 | + public InternetAddressEx(final String val) { | |
| 528 | + super.setAddress(val); | |
| 529 | + } | |
| 530 | + | |
| 531 | + /** | |
| 532 | + * @see javax.mail.internet.InternetAddress#setPersonal(java.lang.String) | |
| 533 | + */ | |
| 534 | + @Override | |
| 535 | + public void setPersonal(final String name) throws UnsupportedEncodingException { | |
| 536 | + super.setPersonal(name, MojiUtil.CHARSET_XJIS.name()); | |
| 531 | 537 | if (super.encodedPersonal != null) { |
| 532 | 538 | super.encodedPersonal = super.encodedPersonal.replace( |
| 533 | 539 | MojiUtil.CHARSET_XJIS.name(), MojiUtil.CHARSET_JIS.name()); |
| @@ -541,7 +547,7 @@ | ||
| 541 | 547 | * @author Tadashi Nakayama |
| 542 | 548 | * @version 1.0.0 |
| 543 | 549 | */ |
| 544 | - private static final class Auth extends Authenticator { | |
| 550 | + public static final class PasswordAuthenticator extends Authenticator { | |
| 545 | 551 | /** ユーザID */ |
| 546 | 552 | private final String user; |
| 547 | 553 | /** パスワード */ |
| @@ -553,7 +559,7 @@ | ||
| 553 | 559 | * @param u ユーザID |
| 554 | 560 | * @param p パスワード |
| 555 | 561 | */ |
| 556 | - Auth(final String u, final String p) { | |
| 562 | + public PasswordAuthenticator(final String u, final String p) { | |
| 557 | 563 | this.user = u; |
| 558 | 564 | this.password = p; |
| 559 | 565 | } |
| @@ -573,7 +579,7 @@ | ||
| 573 | 579 | * @author Tadashi Nakayama |
| 574 | 580 | * @version 1.0.0 |
| 575 | 581 | */ |
| 576 | - private static final class JisDataSource implements DataSource { | |
| 582 | + public static final class JisDataSource implements DataSource { | |
| 577 | 583 | /** 文字列 */ |
| 578 | 584 | private final String data; |
| 579 | 585 |
| @@ -582,7 +588,7 @@ | ||
| 582 | 588 | * |
| 583 | 589 | * @param str 文字列 |
| 584 | 590 | */ |
| 585 | - JisDataSource(final String str) { | |
| 591 | + public JisDataSource(final String str) { | |
| 586 | 592 | this.data = str; |
| 587 | 593 | } |
| 588 | 594 |