Author: norman
Date: Sun Aug 14 17:20:14 2011
New Revision: 1157567
URL: http://svn.apache.org/viewvc?rev=1157567&view=rev
Log:
Remove usage of @deprecated methods
Modified:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/CloseProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/ExpungeProcessor.java
Modified:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/CloseProcessor.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/CloseProcessor.java?rev=1157567&r1=1157566&r2=1157567&view=diff
==============================================================================
---
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/CloseProcessor.java
(original)
+++
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/CloseProcessor.java
Sun Aug 14 17:20:14 2011
@@ -31,6 +31,7 @@ import org.apache.james.mailbox.MailboxM
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MessageManager;
import org.apache.james.mailbox.MessageRange;
+import org.apache.james.mailbox.MessageManager.MetaData.FetchGroup;
public class CloseProcessor extends AbstractMailboxProcessor<CloseRequest> {
@@ -42,8 +43,7 @@ public class CloseProcessor extends Abst
try {
MessageManager mailbox = getSelectedMailbox(session);
final MailboxSession mailboxSession =
ImapSessionUtils.getMailboxSession(session);
- if (mailbox.isWriteable(mailboxSession)) {
-
+ if (mailbox.getMetaData(false, mailboxSession,
FetchGroup.NO_COUNT).isWriteable()) {
mailbox.expunge(MessageRange.all(), mailboxSession);
session.deselect();
Modified:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/ExpungeProcessor.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/ExpungeProcessor.java?rev=1157567&r1=1157566&r2=1157567&view=diff
==============================================================================
---
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/ExpungeProcessor.java
(original)
+++
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/ExpungeProcessor.java
Sun Aug 14 17:20:14 2011
@@ -57,7 +57,9 @@ public class ExpungeProcessor extends Ab
final MailboxSession mailboxSession =
ImapSessionUtils.getMailboxSession(session);
int expunged = 0;
- if (!mailbox.isWriteable(mailboxSession)) {
+ MetaData mdata = mailbox.getMetaData(false, mailboxSession,
FetchGroup.NO_COUNT);
+
+ if (!mdata.isWriteable()) {
no(command, tag, responder,
HumanReadableText.MAILBOX_IS_READ_ONLY);
} else {
IdRange[] ranges = request.getUidSet();
@@ -82,7 +84,6 @@ public class ExpungeProcessor extends Ab
//
// See RFC5162 3.3 EXPUNGE Command 3.5. UID EXPUNGE Command
if
(EnableProcessor.getEnabledCapabilities(session).contains(ImapConstants.SUPPORTS_QRESYNC)
&& expunged > 0) {
- MetaData mdata = mailbox.getMetaData(false,
mailboxSession, FetchGroup.NO_COUNT);
okComplete(command, tag,
ResponseCode.highestModSeq(mdata.getHighestModSeq()), responder);
} else {
okComplete(command, tag, responder);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
