Author: rdonkin
Date: Sun May 11 06:06:48 2008
New Revision: 655312
URL: http://svn.apache.org/viewvc?rev=655312&view=rev
Log:
Remove key from message set
Modified:
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/GeneralMessageSet.java
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/impl/GeneralMessageSetImpl.java
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java
Modified:
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/GeneralMessageSet.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/GeneralMessageSet.java?rev=655312&r1=655311&r2=655312&view=diff
==============================================================================
---
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/GeneralMessageSet.java
(original)
+++
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/GeneralMessageSet.java
Sun May 11 06:06:48 2008
@@ -28,9 +28,7 @@
public interface GeneralMessageSet {
- public static int TYPE_NOTHING=0;
public static int TYPE_UID=2;
- public static int TYPE_KEY=4;
public static int TYPE_ALL=16;
int getType();
@@ -38,9 +36,4 @@
long getUidFrom();
long getUidTo();
-
- String getKey();
-
- boolean isValid();
-
}
Modified:
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/impl/GeneralMessageSetImpl.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/impl/GeneralMessageSetImpl.java?rev=655312&r1=655311&r2=655312&view=diff
==============================================================================
---
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/impl/GeneralMessageSetImpl.java
(original)
+++
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/impl/GeneralMessageSetImpl.java
Sun May 11 06:06:48 2008
@@ -23,91 +23,54 @@
public class GeneralMessageSetImpl implements GeneralMessageSet {
- private int type;
+ private static final int NOT_A_UID = -1;
- private long uidFrom;
+ private final int type;
- private long uidTo;
+ private final long uidFrom;
- private String key;
+ private final long uidTo;
- private GeneralMessageSetImpl() {
+
+ private GeneralMessageSetImpl(final int type, final long uidFrom, final
long uidTo) {
+ super();
+ this.type = type;
+ this.uidFrom = uidFrom;
+ this.uidTo = uidTo;
}
public int getType() {
return type;
}
- public long getUidFrom() throws IllegalStateException {
- if (type != TYPE_UID)
- throw new IllegalStateException("not in UID mode");
+ public long getUidFrom() {
return uidFrom;
}
- public long getUidTo() throws IllegalStateException {
- if (type != TYPE_UID)
- throw new IllegalStateException("not in UID mode");
+ public long getUidTo() {
return uidTo;
}
- public String getKey() throws IllegalStateException {
- return key;
- }
public static GeneralMessageSet oneUid(long uid) {
- GeneralMessageSetImpl gms = new GeneralMessageSetImpl();
- gms.type = TYPE_UID;
- gms.uidFrom = uid;
- gms.uidTo = uid;
- return gms;
+ GeneralMessageSetImpl result = new GeneralMessageSetImpl(TYPE_UID,
uid, uid);
+ return result;
}
public static GeneralMessageSet all() {
- GeneralMessageSetImpl gms = new GeneralMessageSetImpl();
- gms.type = TYPE_ALL;
- return gms;
+ GeneralMessageSetImpl result = new GeneralMessageSetImpl(TYPE_ALL,
NOT_A_UID, NOT_A_UID);
+ return result;
}
public static GeneralMessageSet uidRange(long from, long to) {
- GeneralMessageSetImpl gms = new GeneralMessageSetImpl();
if (to == Long.MAX_VALUE) {
- to = -1;
+ to = NOT_A_UID;
}
- gms.type = TYPE_UID;
- gms.uidFrom = from;
- gms.uidTo = to;
- return gms;
+ GeneralMessageSetImpl result = new GeneralMessageSetImpl(TYPE_UID,
from, to);
+ return result;
}
public String toString() {
return "TYPE: " + type + " UID: " + uidFrom + ":" + uidTo;
}
-
- public boolean isValid() {
- if (type == TYPE_ALL) {
- return true;
- } else if (type == TYPE_UID) {
- if (uidTo < 0) {
- return true;
- } else {
- return (uidFrom <= uidTo);
- }
- } else {
- return false;
- }
-
- }
-
- public static GeneralMessageSet oneKey(String key) {
- GeneralMessageSetImpl gms = new GeneralMessageSetImpl();
- gms.type = TYPE_KEY;
- gms.key=key;
- return gms;
- }
-
- public static GeneralMessageSet nothing() {
- GeneralMessageSetImpl gms = new GeneralMessageSetImpl();
- gms.type = TYPE_NOTHING;
- return gms;
- }
}
Modified:
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java?rev=655312&r1=655311&r2=655312&view=diff
==============================================================================
---
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java
(original)
+++
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java
Sun May 11 06:06:48 2008
@@ -47,7 +47,6 @@
import org.apache.james.mailboxmanager.SearchQuery.Criterion;
import org.apache.james.mailboxmanager.SearchQuery.NumericRange;
import org.apache.james.mailboxmanager.impl.FetchGroupImpl;
-import org.apache.james.mailboxmanager.impl.GeneralMessageSetImpl;
import org.apache.james.mailboxmanager.mailbox.Mailbox;
import org.apache.james.mailboxmanager.torque.om.MailboxRow;
import org.apache.james.mailboxmanager.torque.om.MailboxRowPeer;
@@ -262,16 +261,12 @@
return criteria;
}
- public Iterator getMessages(GeneralMessageSet set, FetchGroup fetchGroup,
MailboxSession mailboxSession)
+ public Iterator getMessages(final GeneralMessageSet set, FetchGroup
fetchGroup, MailboxSession mailboxSession)
throws MailboxManagerException {
try {
lock.readLock().acquire();
try {
checkAccess();
- set=toUidSet(set);
- if (!set.isValid() ||
set.getType()==GeneralMessageSet.TYPE_NOTHING) {
- return IteratorUtils.EMPTY_ITERATOR;
- }
UidRange range = uidRangeForMessageSet(set);
try {
Criteria c = criteriaForMessageSet(set);
@@ -448,12 +443,8 @@
}
}
- private Iterator doExpunge(GeneralMessageSet set, FetchGroup fetchGroup)
throws MailboxManagerException {
+ private Iterator doExpunge(final GeneralMessageSet set, FetchGroup
fetchGroup) throws MailboxManagerException {
checkAccess();
- set=toUidSet(set);
- if (!set.isValid() || set.getType()==GeneralMessageSet.TYPE_NOTHING) {
- return IteratorUtils.EMPTY_ITERATOR;
- }
try {
// TODO put this into a serializable transaction
final Criteria c = criteriaForMessageSet(set);
@@ -510,12 +501,8 @@
}
private Iterator doSetFlags(Flags flags, boolean value, boolean replace,
- GeneralMessageSet set, FetchGroup fetchGroup, MailboxSession
mailboxSession) throws MailboxManagerException {
- checkAccess();
- set=toUidSet(set);
- if (!set.isValid() || set.getType()==GeneralMessageSet.TYPE_NOTHING) {
- return Collections.EMPTY_LIST.iterator();
- }
+ final GeneralMessageSet set, FetchGroup fetchGroup, MailboxSession
mailboxSession) throws MailboxManagerException {
+ checkAccess();
try {
// TODO put this into a serializeable transaction
final List messageRows = getMailboxRow()
@@ -722,18 +709,6 @@
}
}
- private GeneralMessageSet toUidSet(GeneralMessageSet set) {
- if (set.getType()==GeneralMessageSet.TYPE_KEY) {
- Long uid=getUidToKeyConverter().toUid(set.getKey());
- if (uid!=null) {
- set=GeneralMessageSetImpl.oneUid(uid.longValue());
- } else {
- set=GeneralMessageSetImpl.nothing();
- }
- }
- return set;
- }
-
public boolean isWriteable() {
return true;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
