From 165e8bfe7a46564ea98bb16cb059102ba356a1b5 Mon Sep 17 00:00:00 2001 From: Makoto Onuki Date: Fri, 7 May 2010 15:26:31 -0700 Subject: [PATCH] Cleanup: Add @Override (Note it's for froyo-plus-asop) Change-Id: Ic4211c08586e33c44d5d6267c0c9d37f8c7cdc85 --- .../android/email/FixedLengthInputStream.java | 1 + .../android/email/PeekableInputStream.java | 1 + src/com/android/email/mail/Address.java | 1 + src/com/android/email/mail/PackedString.java | 1 + .../email/mail/internet/MimeMessage.java | 19 +++++++++++++++++++ .../email/mail/internet/MimeMultipart.java | 1 + .../android/email/mail/store/ImapStore.java | 11 +++++++++++ .../android/email/mail/store/LocalStore.java | 2 ++ .../android/email/mail/store/Pop3Store.java | 8 ++++++++ .../email/MessagingControllerUnitTests.java | 1 + 10 files changed, 46 insertions(+) diff --git a/src/com/android/email/FixedLengthInputStream.java b/src/com/android/email/FixedLengthInputStream.java index bac33758f..4312d4323 100644 --- a/src/com/android/email/FixedLengthInputStream.java +++ b/src/com/android/email/FixedLengthInputStream.java @@ -69,6 +69,7 @@ public class FixedLengthInputStream extends InputStream { return read(b, 0, b.length); } + @Override public String toString() { return String.format("FixedLengthInputStream(in=%s, length=%d)", mIn.toString(), mLength); } diff --git a/src/com/android/email/PeekableInputStream.java b/src/com/android/email/PeekableInputStream.java index cef54f90e..9149bd167 100644 --- a/src/com/android/email/PeekableInputStream.java +++ b/src/com/android/email/PeekableInputStream.java @@ -72,6 +72,7 @@ public class PeekableInputStream extends InputStream { return read(b, 0, b.length); } + @Override public String toString() { return String.format("PeekableInputStream(in=%s, peeked=%b, peekedByte=%d)", mIn.toString(), mPeeked, mPeekedByte); diff --git a/src/com/android/email/mail/Address.java b/src/com/android/email/mail/Address.java index bc7bc1130..f96562693 100644 --- a/src/com/android/email/mail/Address.java +++ b/src/com/android/email/mail/Address.java @@ -198,6 +198,7 @@ public class Address { * * @return Human readable address string. Not quoted and not encoded. */ + @Override public String toString() { if (mPersonal != null) { if (mPersonal.matches(".*[\\(\\)<>@,;:\\\\\".\\[\\]].*")) { diff --git a/src/com/android/email/mail/PackedString.java b/src/com/android/email/mail/PackedString.java index d3073b80f..c36182a7f 100644 --- a/src/com/android/email/mail/PackedString.java +++ b/src/com/android/email/mail/PackedString.java @@ -159,6 +159,7 @@ public class PackedString { /** * Pack the values and return a single, encoded string */ + @Override public String toString() { StringBuilder sb = new StringBuilder(); for (Map.Entry entry : mMap.entrySet()) { diff --git a/src/com/android/email/mail/internet/MimeMessage.java b/src/com/android/email/mail/internet/MimeMessage.java index 33ecc133e..134a7ef3d 100644 --- a/src/com/android/email/mail/internet/MimeMessage.java +++ b/src/com/android/email/mail/internet/MimeMessage.java @@ -147,10 +147,12 @@ public class MimeMessage extends Message { return mHeader; } + @Override public Date getReceivedDate() throws MessagingException { return null; } + @Override public Date getSentDate() throws MessagingException { if (mSentDate == null) { try { @@ -164,11 +166,13 @@ public class MimeMessage extends Message { return mSentDate; } + @Override public void setSentDate(Date sentDate) throws MessagingException { setHeader("Date", DATE_FORMAT.format(sentDate)); this.mSentDate = sentDate; } + @Override public String getContentType() throws MessagingException { String contentType = getFirstHeader(MimeHeader.HEADER_CONTENT_TYPE); if (contentType == null) { @@ -209,6 +213,7 @@ public class MimeMessage extends Message { * Returns a list of the given recipient type from this message. If no addresses are * found the method returns an empty array. */ + @Override public Address[] getRecipients(RecipientType type) throws MessagingException { if (type == RecipientType.TO) { if (mTo == null) { @@ -230,6 +235,7 @@ public class MimeMessage extends Message { } } + @Override public void setRecipients(RecipientType type, Address[] addresses) throws MessagingException { final int TO_LENGTH = 4; // "To: " final int CC_LENGTH = 4; // "Cc: " @@ -266,15 +272,18 @@ public class MimeMessage extends Message { /** * Returns the unfolded, decoded value of the Subject header. */ + @Override public String getSubject() throws MessagingException { return MimeUtility.unfoldAndDecode(getFirstHeader("Subject")); } + @Override public void setSubject(String subject) throws MessagingException { final int HEADER_NAME_LENGTH = 9; // "Subject: " setHeader("Subject", MimeUtility.foldAndEncode2(subject, HEADER_NAME_LENGTH)); } + @Override public Address[] getFrom() throws MessagingException { if (mFrom == null) { String list = MimeUtility.unfold(getFirstHeader("From")); @@ -286,6 +295,7 @@ public class MimeMessage extends Message { return mFrom; } + @Override public void setFrom(Address from) throws MessagingException { final int FROM_LENGTH = 6; // "From: " if (from != null) { @@ -298,6 +308,7 @@ public class MimeMessage extends Message { } } + @Override public Address[] getReplyTo() throws MessagingException { if (mReplyTo == null) { mReplyTo = Address.parse(MimeUtility.unfold(getFirstHeader("Reply-to"))); @@ -305,6 +316,7 @@ public class MimeMessage extends Message { return mReplyTo; } + @Override public void setReplyTo(Address[] replyTo) throws MessagingException { final int REPLY_TO_LENGTH = 10; // "Reply-to: " if (replyTo == null || replyTo.length == 0) { @@ -342,14 +354,17 @@ public class MimeMessage extends Message { return messageId; } + @Override public void saveChanges() throws MessagingException { throw new MessagingException("saveChanges not yet implemented"); } + @Override public Body getBody() throws MessagingException { return mBody; } + @Override public void setBody(Body body) throws MessagingException { this.mBody = body; if (body instanceof com.android.email.mail.Multipart) { @@ -369,18 +384,22 @@ public class MimeMessage extends Message { return getMimeHeaders().getFirstHeader(name); } + @Override public void addHeader(String name, String value) throws MessagingException { getMimeHeaders().addHeader(name, value); } + @Override public void setHeader(String name, String value) throws MessagingException { getMimeHeaders().setHeader(name, value); } + @Override public String[] getHeader(String name) throws MessagingException { return getMimeHeaders().getHeader(name); } + @Override public void removeHeader(String name) throws MessagingException { getMimeHeaders().removeHeader(name); if ("Message-ID".equalsIgnoreCase(name)) { diff --git a/src/com/android/email/mail/internet/MimeMultipart.java b/src/com/android/email/mail/internet/MimeMultipart.java index b0a2ddc71..629d56df5 100644 --- a/src/com/android/email/mail/internet/MimeMultipart.java +++ b/src/com/android/email/mail/internet/MimeMultipart.java @@ -72,6 +72,7 @@ public class MimeMultipart extends Multipart { this.mPreamble = preamble; } + @Override public String getContentType() throws MessagingException { return mContentType; } diff --git a/src/com/android/email/mail/store/ImapStore.java b/src/com/android/email/mail/store/ImapStore.java index b4feb1658..ab0f88edf 100644 --- a/src/com/android/email/mail/store/ImapStore.java +++ b/src/com/android/email/mail/store/ImapStore.java @@ -480,6 +480,7 @@ public class ImapStore extends Store { this.mName = name; } + @Override public void open(OpenMode mode, PersistentDataCallbacks callbacks) throws MessagingException { if (isOpen() && mMode == mode) { @@ -542,6 +543,7 @@ public class ImapStore extends Store { } } + @Override public boolean isOpen() { return mConnection != null; } @@ -551,6 +553,7 @@ public class ImapStore extends Store { return mMode; } + @Override public void close(boolean expunge) { if (!isOpen()) { return; @@ -563,10 +566,12 @@ public class ImapStore extends Store { } } + @Override public String getName() { return mName; } + @Override public boolean exists() throws MessagingException { if (mExists) { return true; @@ -605,10 +610,12 @@ public class ImapStore extends Store { } // IMAP supports folder creation + @Override public boolean canCreate(FolderType type) { return true; } + @Override public boolean create(FolderType type) throws MessagingException { /* * This method needs to operate in the unselected mode as well as the selected mode @@ -756,10 +763,12 @@ public class ImapStore extends Store { return messages.toArray(new Message[] {}); } + @Override public Message[] getMessages(MessageRetrievalListener listener) throws MessagingException { return getMessages(null, listener); } + @Override public Message[] getMessages(String[] uids, MessageRetrievalListener listener) throws MessagingException { checkOpen(); @@ -1160,6 +1169,7 @@ public class ImapStore extends Store { * the new UID of the given message on the IMAP server and sets the Message's UID to the * new server UID. */ + @Override public void appendMessages(Message[] messages) throws MessagingException { checkOpen(); try { @@ -1245,6 +1255,7 @@ public class ImapStore extends Store { } } + @Override public Message[] expunge() throws MessagingException { checkOpen(); try { diff --git a/src/com/android/email/mail/store/LocalStore.java b/src/com/android/email/mail/store/LocalStore.java index a75dfba7d..d1e0914c2 100644 --- a/src/com/android/email/mail/store/LocalStore.java +++ b/src/com/android/email/mail/store/LocalStore.java @@ -1639,6 +1639,7 @@ public class LocalStore extends Store implements PersistentDataCallbacks { return mAttachmentCount; } + @Override public void parse(InputStream in) throws IOException, MessagingException { super.parse(in); } @@ -1793,6 +1794,7 @@ public class LocalStore extends Store implements PersistentDataCallbacks { mAttachmentId = attachmentId; } + @Override public String toString() { return "" + mAttachmentId; } diff --git a/src/com/android/email/mail/store/Pop3Store.java b/src/com/android/email/mail/store/Pop3Store.java index ade7a5ca0..771354ede 100644 --- a/src/com/android/email/mail/store/Pop3Store.java +++ b/src/com/android/email/mail/store/Pop3Store.java @@ -325,6 +325,7 @@ public class Pop3Store extends Store { } // POP3 does not folder creation + @Override public boolean canCreate(FolderType type) { return false; } @@ -611,6 +612,7 @@ public class Pop3Store extends Store { * @param fp * @throws MessagingException */ + @Override public void fetch(Message[] messages, FetchProfile fp, MessageRetrievalListener listener) throws MessagingException { if (messages == null || messages.length == 0) { @@ -805,16 +807,20 @@ public class Pop3Store extends Store { return PERMANENT_FLAGS; } + @Override public void appendMessages(Message[] messages) throws MessagingException { } + @Override public void delete(boolean recurse) throws MessagingException { } + @Override public Message[] expunge() throws MessagingException { return null; } + @Override public void setFlags(Message[] messages, Flag[] flags, boolean value) throws MessagingException { if (!value || !Utility.arrayContains(flags, Flag.DELETED)) { @@ -953,6 +959,7 @@ public class Pop3Store extends Store { mSize = size; } + @Override protected void parse(InputStream in) throws IOException, MessagingException { super.parse(in); } @@ -980,6 +987,7 @@ public class Pop3Store extends Store { /** the server is capable of accepting multiple commands at a time (unused) */ public boolean pipelining; + @Override public String toString() { return String.format("STLS %b, TOP %b, USER %b, UIDL %b, PIPELINING %b", stls, diff --git a/tests/src/com/android/email/MessagingControllerUnitTests.java b/tests/src/com/android/email/MessagingControllerUnitTests.java index 43852f2e6..f35708d05 100644 --- a/tests/src/com/android/email/MessagingControllerUnitTests.java +++ b/tests/src/com/android/email/MessagingControllerUnitTests.java @@ -61,6 +61,7 @@ public class MessagingControllerUnitTests extends AndroidTestCase { mName = name; } + @Override public String getName() { return mName; }