Author: eric
Date: Tue Aug 24 06:14:33 2010
New Revision: 988396
URL: http://svn.apache.org/viewvc?rev=988396&view=rev
Log:
Rename getDocument method to getMessage (IMAP-207)
Modified:
james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/model/JCRMessage.java
james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/openjpa/JPAMailboxMembership.java
james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/openjpa/JPAStreamingMailboxMembership.java
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MessageSearches.java
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultIterator.java
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultUtils.java
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/mail/model/MailboxMembership.java
james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SimpleMailboxMembership.java
Modified:
james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/model/JCRMessage.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/model/JCRMessage.java?rev=988396&r1=988395&r2=988396&view=diff
==============================================================================
---
james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/model/JCRMessage.java
(original)
+++
james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/model/JCRMessage.java
Tue Aug 24 06:14:33 2010
@@ -479,9 +479,9 @@ public class JCRMessage extends Abstract
* (non-Javadoc)
*
* @see
- * org.apache.james.imap.store.mail.model.MailboxMembership#getDocument()
+ * org.apache.james.imap.store.mail.model.MailboxMembership#getMessage()
*/
- public Message getDocument() {
+ public Message getMessage() {
if (isPersistent()) {
//TODO: Why not "this"?
return new JCRMessage(node, logger);
Modified:
james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/openjpa/JPAMailboxMembership.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/openjpa/JPAMailboxMembership.java?rev=988396&r1=988395&r2=988396&view=diff
==============================================================================
---
james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/openjpa/JPAMailboxMembership.java
(original)
+++
james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/openjpa/JPAMailboxMembership.java
Tue Aug 24 06:14:33 2010
@@ -62,7 +62,7 @@ public class JPAMailboxMembership extend
public JPAMailboxMembership(long mailboxId, AbstractJPAMailboxMembership
original) throws MailboxException {
super(mailboxId, original);
try {
- this.message = new JPAMessage((JPAMessage) original.getDocument());
+ this.message = new JPAMessage((JPAMessage) original.getMessage());
} catch (IOException e) {
throw new MailboxException(HumanReadableText.FAILURE_MAIL_PARSE,e);
}
@@ -72,7 +72,7 @@ public class JPAMailboxMembership extend
* Gets the message member.
* @return message, not null
*/
- public Message getDocument() {
+ public Message getMessage() {
return message;
}
Modified:
james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/openjpa/JPAStreamingMailboxMembership.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/openjpa/JPAStreamingMailboxMembership.java?rev=988396&r1=988395&r2=988396&view=diff
==============================================================================
---
james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/openjpa/JPAStreamingMailboxMembership.java
(original)
+++
james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/openjpa/JPAStreamingMailboxMembership.java
Tue Aug 24 06:14:33 2010
@@ -61,7 +61,7 @@ public class JPAStreamingMailboxMembersh
public JPAStreamingMailboxMembership(long mailboxId, MailboxMembership<?>
original) throws MailboxException {
super(mailboxId, original);
try {
- this.message = new JPAStreamingMessage(original.getDocument());
+ this.message = new JPAStreamingMessage(original.getMessage());
} catch (IOException e) {
throw new MailboxException(HumanReadableText.FAILURE_MAIL_PARSE,e);
}
@@ -71,7 +71,7 @@ public class JPAStreamingMailboxMembersh
* Gets the message member.
* @return message, not null
*/
- public Message getDocument() {
+ public Message getMessage() {
return message;
}
Modified:
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MessageSearches.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MessageSearches.java?rev=988396&r1=988395&r2=988396&view=diff
==============================================================================
---
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MessageSearches.java
(original)
+++
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MessageSearches.java
Tue Aug 24 06:14:33 2010
@@ -292,7 +292,7 @@ public class MessageSearches {
private boolean exists(String headerName, MailboxMembership<?> message) {
boolean result = false;
- final List<Header> headers = message.getDocument().getHeaders();
+ final List<Header> headers = message.getMessage().getHeaders();
for (Header header:headers) {
final String name = header.getFieldName();
if (headerName.equalsIgnoreCase(name)) {
@@ -307,7 +307,7 @@ public class MessageSearches {
final String headerName, final MailboxMembership<?> message) {
final String text = operator.getValue().toUpperCase();
boolean result = false;
- final List<Header> headers = message.getDocument().getHeaders();
+ final List<Header> headers = message.getMessage().getHeaders();
for (Header header:headers) {
final String name = header.getFieldName();
if (headerName.equalsIgnoreCase(name)) {
@@ -353,7 +353,7 @@ public class MessageSearches {
}
private String headerValue(final String headerName, final
MailboxMembership<?> message) {
- final List<Header> headers = message.getDocument().getHeaders();
+ final List<Header> headers = message.getMessage().getHeaders();
String value = null;
for (Header header:headers) {
final String name = header.getFieldName();
@@ -376,7 +376,7 @@ public class MessageSearches {
private boolean matches(SearchQuery.SizeCriterion criterion,
MailboxMembership<?> message)
throws UnsupportedSearchException {
final SearchQuery.NumericOperator operator = criterion.getOperator();
- final long size = message.getDocument().getFullContentOctets();
+ final long size = message.getMessage().getFullContentOctets();
final long value = operator.getValue();
switch (operator.getType()) {
case LESS_THAN:
Modified:
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultIterator.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultIterator.java?rev=988396&r1=988395&r2=988396&view=diff
==============================================================================
---
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultIterator.java
(original)
+++
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultIterator.java
Tue Aug 24 06:14:33 2010
@@ -101,7 +101,7 @@ public class ResultIterator<Id> implemen
final MailboxException exception) {
super();
internalDate = message.getInternalDate();
- size = message.getDocument().getFullContentOctets();
+ size = message.getMessage().getFullContentOctets();
uid = message.getUid();
this.exception = exception;
}
Modified:
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultUtils.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultUtils.java?rev=988396&r1=988395&r2=988396&view=diff
==============================================================================
---
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultUtils.java
(original)
+++
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultUtils.java
Tue Aug 24 06:14:33 2010
@@ -58,7 +58,7 @@ public class ResultUtils {
static final Charset US_ASCII = Charset.forName("US-ASCII");
public static List<MessageResult.Header>
createHeaders(MailboxMembership<?> message) {
- final org.apache.james.imap.store.mail.model.Message document =
message.getDocument();
+ final org.apache.james.imap.store.mail.model.Message document =
message.getMessage();
return createHeaders(document);
}
@@ -87,7 +87,7 @@ public class ResultUtils {
* @throws IOException
*/
public static Content createBodyContent(MailboxMembership<?> membership)
throws IOException {
- final RewindableInputStream stream =
membership.getDocument().getBodyContent();
+ final RewindableInputStream stream =
membership.getMessage().getBodyContent();
final InputStreamContent result = new InputStreamContent(stream);
return result;
}
@@ -100,7 +100,7 @@ public class ResultUtils {
* @throws IOException
*/
public static Content createFullContent(final MailboxMembership<?>
membership) throws IOException {
- final RewindableInputStream stream =
membership.getDocument().getFullContent();
+ final RewindableInputStream stream =
membership.getMessage().getFullContent();
final InputStreamContent results = new InputStreamContent(stream);
return results;
}
@@ -121,7 +121,7 @@ public class ResultUtils {
if (fetchGroup != null) {
int content = fetchGroup.content();
messageResult.setFlags(message.createFlags());
-
messageResult.setSize((int)message.getDocument().getFullContentOctets());
+
messageResult.setSize((int)message.getMessage().getFullContentOctets());
messageResult.setInternalDate(message.getInternalDate());
try {
@@ -157,7 +157,7 @@ public class ResultUtils {
}
private static void addMimeDescriptor(MailboxMembership<?> message,
MessageResultImpl messageResult) throws IOException, MimeException {
- MimeDescriptor descriptor =
MimeDescriptorImpl.build(message.getDocument());
+ MimeDescriptor descriptor =
MimeDescriptorImpl.build(message.getMessage());
messageResult.setMimeDescriptor(descriptor);
}
@@ -241,7 +241,7 @@ public class ResultUtils {
*/
public static InputStream toInput(final MailboxMembership<?> membership)
throws IOException {
- final org.apache.james.imap.store.mail.model.Message document =
membership.getDocument();
+ final org.apache.james.imap.store.mail.model.Message document =
membership.getMessage();
return toInput(document);
}
Modified:
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/mail/model/MailboxMembership.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/imap/store/mail/model/MailboxMembership.java?rev=988396&r1=988395&r2=988396&view=diff
==============================================================================
---
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/mail/model/MailboxMembership.java
(original)
+++
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/mail/model/MailboxMembership.java
Tue Aug 24 06:14:33 2010
@@ -48,7 +48,7 @@ public interface MailboxMembership<Id> {
*
* @return document
*/
- public abstract Message getDocument();
+ public abstract Message getMessage();
/**
* Return if it was marked as answered
Modified:
james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SimpleMailboxMembership.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SimpleMailboxMembership.java?rev=988396&r1=988395&r2=988396&view=diff
==============================================================================
---
james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SimpleMailboxMembership.java
(original)
+++
james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SimpleMailboxMembership.java
Tue Aug 24 06:14:33 2010
@@ -229,7 +229,7 @@ public class SimpleMailboxMembership imp
return retValue;
}
- public Message getDocument() {
+ public Message getMessage() {
return message;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
