You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by rd...@apache.org on 2008/05/11 16:02:00 UTC
svn commit: r655317 - in /james/server/trunk:
core-library/src/main/java/org/apache/james/mailboxmanager/
core-library/src/main/java/org/apache/james/mailboxmanager/impl/
core-library/src/test/java/org/apache/james/mailboxmanager/
torque-mailboxmanager...
Author: rdonkin
Date: Sun May 11 07:01:59 2008
New Revision: 655317
URL: http://svn.apache.org/viewvc?rev=655317&view=rev
Log:
Removed KEY.
Modified:
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/MessageResult.java
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/MessageResultUtils.java
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/impl/FetchGroupImpl.java
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/impl/MessageResultImpl.java
james/server/trunk/core-library/src/test/java/org/apache/james/mailboxmanager/MessageResultImplIncludedResultsTest.java
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/MessageRowUtils.java
Modified: james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/MessageResult.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/MessageResult.java?rev=655317&r1=655316&r2=655317&view=diff
==============================================================================
--- james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/MessageResult.java (original)
+++ james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/MessageResult.java Sun May 11 07:01:59 2008
@@ -75,10 +75,7 @@
*
*/
public static final int MIME_MESSAGE = 0x01;
- /**
- * return a string baded key (used by James)
- */
- public static final int KEY = 0x10;
+
public static final int SIZE = 0x20;
public static final int INTERNAL_DATE = 0x40;
public static final int FLAGS = 0x80;
@@ -184,8 +181,6 @@
*/
Flags getFlags() throws MailboxManagerException;
- String getKey();
-
int getSize();
/**
Modified: james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/MessageResultUtils.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/MessageResultUtils.java?rev=655317&r1=655316&r2=655317&view=diff
==============================================================================
--- james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/MessageResultUtils.java (original)
+++ james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/MessageResultUtils.java Sun May 11 07:01:59 2008
@@ -261,18 +261,6 @@
}
/**
- * Is {@link FetchGroup#KEY} included in these results?
- * @param message <code>MessageResult</code>, possibly null
- * @return true if <code>MessageResult</code> includes
- * KEY, false if <code>MessageResult</code> is null
- * or does not contain KEY
- * @see #isIncluded(MessageResult, int)
- */
- public static boolean isKeyIncluded(final MessageResult message) {
- return isIncluded(message, FetchGroup.KEY);
- }
-
- /**
* Is {@link FetchGroup#INTERNAL_DATE} included in these results?
* @param message <code>MessageResult</code>, possibly null
* @return true if <code>MessageResult</code> includes
Modified: james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/impl/FetchGroupImpl.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/impl/FetchGroupImpl.java?rev=655317&r1=655316&r2=655317&view=diff
==============================================================================
--- james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/impl/FetchGroupImpl.java (original)
+++ james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/impl/FetchGroupImpl.java Sun May 11 07:01:59 2008
@@ -36,8 +36,6 @@
= new FetchGroupImpl(MessageResult.FetchGroup.MINIMAL);
public static final MessageResult.FetchGroup MIME_MESSAGE
= new FetchGroupImpl(MessageResult.FetchGroup.MIME_MESSAGE);
- public static final MessageResult.FetchGroup KEY
- = new FetchGroupImpl(MessageResult.FetchGroup.KEY);
public static final MessageResult.FetchGroup SIZE
= new FetchGroupImpl(MessageResult.FetchGroup.SIZE);
public static final MessageResult.FetchGroup INTERNAL_DATE
Modified: james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/impl/MessageResultImpl.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/impl/MessageResultImpl.java?rev=655317&r1=655316&r2=655317&view=diff
==============================================================================
--- james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/impl/MessageResultImpl.java (original)
+++ james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/impl/MessageResultImpl.java Sun May 11 07:01:59 2008
@@ -44,7 +44,6 @@
private Flags flags;
private int size;
private Date internalDate;
- private String key;
private List headers;
private Content body;
private Content fullContent;
@@ -77,9 +76,6 @@
if (MessageResultUtils.isInternalDateIncluded(result)) {
setInternalDate(result.getInternalDate());
}
- if (MessageResultUtils.isKeyIncluded(result)) {
- setKey(result.getKey());
- }
if (MessageResultUtils.isHeadersIncluded(result)) {
setHeaders(IteratorUtils.toList(result.iterateHeaders()));
}
@@ -124,10 +120,6 @@
return flags;
}
- public String getKey() {
- return key;
- }
-
public void setUid(long uid) {
this.uid=uid;
}
@@ -170,13 +162,6 @@
}
}
- public void setKey(String key) {
- this.key=key;
- if (key != null) {
- includedResults |= FetchGroup.KEY;
- }
- }
-
public Iterator iterateHeaders() {
return headers.iterator();
}
@@ -229,7 +214,6 @@
+ "flags = " + this.flags + TAB
+ "size = " + this.size + TAB
+ "internalDate = " + this.internalDate + TAB
- + "key = " + this.key + TAB
+ "includedResults = " + this.includedResults + TAB
+ " )";
Modified: james/server/trunk/core-library/src/test/java/org/apache/james/mailboxmanager/MessageResultImplIncludedResultsTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/test/java/org/apache/james/mailboxmanager/MessageResultImplIncludedResultsTest.java?rev=655317&r1=655316&r2=655317&view=diff
==============================================================================
--- james/server/trunk/core-library/src/test/java/org/apache/james/mailboxmanager/MessageResultImplIncludedResultsTest.java (original)
+++ james/server/trunk/core-library/src/test/java/org/apache/james/mailboxmanager/MessageResultImplIncludedResultsTest.java Sun May 11 07:01:59 2008
@@ -85,15 +85,6 @@
assertEquals(FetchGroup.INTERNAL_DATE, result.getIncludedResults().content());
}
- public void testShouldIncludedResultsWhenKeySet() throws Exception {
- result.setKey(null);
- assertEquals(FetchGroup.MINIMAL, result.getIncludedResults().content());
- result.setKey("KEY");
- assertEquals(FetchGroup.KEY, result.getIncludedResults().content());
- result = new MessageResultImpl(this.result);
- assertEquals(FetchGroup.KEY, result.getIncludedResults().content());
- }
-
public void testShouldIncludedResultsWhenHeadersSet() throws Exception {
result.setHeaders(null);
assertEquals(FetchGroup.MINIMAL, result.getIncludedResults().content());
Modified: james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/MessageRowUtils.java
URL: http://svn.apache.org/viewvc/james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/MessageRowUtils.java?rev=655317&r1=655316&r2=655317&view=diff
==============================================================================
--- james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/MessageRowUtils.java (original)
+++ james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/MessageRowUtils.java Sun May 11 07:01:59 2008
@@ -140,10 +140,6 @@
messageResult.setInternalDate(messageRow.getInternalDate());
content -= FetchGroup.INTERNAL_DATE;
}
- if ((content & FetchGroup.KEY) > 0) {
- messageResult.setKey(uidToKeyConverter.toKey(messageRow.getUid()));
- content -= FetchGroup.KEY;
- }
if ((content & FetchGroup.HEADERS) > 0) {
addHeaders(messageRow, messageResult);
content -= FetchGroup.HEADERS;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org