Make Address, EmailHeader visible to other EmailSenders

Change-Id: If1412645f4d68a5d0ebd70e4790a8ba79a4eac6c
Signed-off-by: Shawn O. Pearce <sop@google.com>
This commit is contained in:
Shawn O. Pearce
2010-06-10 14:54:25 -07:00
parent d41cfc5fb3
commit 7474c69272
2 changed files with 43 additions and 22 deletions

View File

@@ -16,8 +16,8 @@ package com.google.gerrit.server.mail;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
class Address { public class Address {
static Address parse(final String in) { public static Address parse(final String in) {
final int lt = in.indexOf('<'); final int lt = in.indexOf('<');
final int gt = in.indexOf('>'); final int gt = in.indexOf('>');
final int at = in.indexOf("@"); final int at = in.indexOf("@");
@@ -37,15 +37,23 @@ class Address {
final String name; final String name;
final String email; final String email;
Address(String email) { public Address(String email) {
this(null, email); this(null, email);
} }
Address(String name, String email) { public Address(String name, String email) {
this.name = name; this.name = name;
this.email = email; this.email = email;
} }
public String getName() {
return name;
}
public String getEmail() {
return email;
}
@Override @Override
public String toString() { public String toString() {
try { try {
@@ -55,7 +63,7 @@ class Address {
} }
} }
String toHeaderString() throws UnsupportedEncodingException { public String toHeaderString() throws UnsupportedEncodingException {
if (name != null) { if (name != null) {
return quotedPhrase(name) + " <" + email + ">"; return quotedPhrase(name) + " <" + email + ">";
} else if (isSimple()) { } else if (isSimple()) {

View File

@@ -20,28 +20,33 @@ import java.io.Writer;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Iterator; import java.util.Iterator;
import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
abstract class EmailHeader { public abstract class EmailHeader {
abstract boolean isEmpty(); public abstract boolean isEmpty();
abstract void write(Writer w) throws IOException; public abstract void write(Writer w) throws IOException;
static class String extends EmailHeader { public static class String extends EmailHeader {
private java.lang.String value; private java.lang.String value;
String(java.lang.String v) { public String(java.lang.String v) {
value = v; value = v;
} }
public java.lang.String getString() {
return value;
}
@Override @Override
boolean isEmpty() { public boolean isEmpty() {
return value == null || value.length() == 0; return value == null || value.length() == 0;
} }
@Override @Override
void write(Writer w) throws IOException { public void write(Writer w) throws IOException {
if (needsQuotedPrintable(value)) { if (needsQuotedPrintable(value)) {
w.write(quotedPrintable(value)); w.write(quotedPrintable(value));
} else { } else {
@@ -84,20 +89,24 @@ abstract class EmailHeader {
return r.toString(); return r.toString();
} }
static class Date extends EmailHeader { public static class Date extends EmailHeader {
private java.util.Date value; private java.util.Date value;
Date(java.util.Date v) { public Date(java.util.Date v) {
value = v; value = v;
} }
public java.util.Date getDate() {
return value;
}
@Override @Override
boolean isEmpty() { public boolean isEmpty() {
return value == null; return value == null;
} }
@Override @Override
void write(Writer w) throws IOException { public void write(Writer w) throws IOException {
final SimpleDateFormat fmt; final SimpleDateFormat fmt;
// Mon, 1 Jun 2009 10:49:44 -0700 // Mon, 1 Jun 2009 10:49:44 -0700
fmt = new SimpleDateFormat("EEE, d MMM yyyy HH:mm:ss Z", Locale.ENGLISH); fmt = new SimpleDateFormat("EEE, d MMM yyyy HH:mm:ss Z", Locale.ENGLISH);
@@ -105,17 +114,21 @@ abstract class EmailHeader {
} }
} }
static class AddressList extends EmailHeader { public static class AddressList extends EmailHeader {
private final List<Address> list = new ArrayList<Address>(); private final List<Address> list = new ArrayList<Address>();
AddressList() { public AddressList() {
} }
AddressList(Address addr) { public AddressList(Address addr) {
add(addr); add(addr);
} }
void add(Address addr) { public List<Address> getAddressList() {
return Collections.unmodifiableList(list);
}
public void add(Address addr) {
list.add(addr); list.add(addr);
} }
@@ -128,12 +141,12 @@ abstract class EmailHeader {
} }
@Override @Override
boolean isEmpty() { public boolean isEmpty() {
return list.isEmpty(); return list.isEmpty();
} }
@Override @Override
void write(Writer w) throws IOException { public void write(Writer w) throws IOException {
int len = 8; int len = 8;
boolean firstAddress = true; boolean firstAddress = true;
boolean needComma = false; boolean needComma = false;