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 ba...@apache.org on 2007/07/05 00:10:40 UTC
svn commit: r553342 [1/3] - in /james/server/trunk:
imap-api/src/main/java/org/apache/james/api/imap/message/request/
imap-codec-library/src/main/java/org/apache/james/imap/message/request/base/
imap-codec-library/src/main/java/org/apache/james/imap/me...
Author: bago
Date: Wed Jul 4 15:10:37 2007
New Revision: 553342
URL: http://svn.apache.org/viewvc?view=rev&rev=553342
Log:
Formatting fixes: tab to spaces.
Modified:
james/server/trunk/imap-api/src/main/java/org/apache/james/api/imap/message/request/ImapRequest.java
james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/base/AbstractImapRequest.java
james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/AppendRequest.java
james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/AuthenticateRequest.java
james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/CheckRequest.java
james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/CloseRequest.java
james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/CopyRequest.java
james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/CreateRequest.java
james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/DeleteRequest.java
james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/ExamineRequest.java
james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/FetchRequest.java
james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/ListRequest.java
james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/LoginRequest.java
james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/LogoutRequest.java
james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/LsubRequest.java
james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/NoopRequest.java
james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/RenameRequest.java
james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/SearchRequest.java
james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/SelectRequest.java
james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/StatusRequest.java
james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/StoreRequest.java
james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/SubscribeRequest.java
james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/UnsubscribeRequest.java
james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/response/imap4rev1/legacy/BadResponse.java
james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/response/imap4rev1/legacy/ListResponse.java
james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/ImapResponseComposer.java
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/AbstractListingProcessor.java
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/AbstractMailboxSelectionProcessor.java
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/AppendProcessor.java
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/AuthenticateProcessor.java
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/CapabilityProcessor.java
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/CheckProcessor.java
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/CloseProcessor.java
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/CopyProcessor.java
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/CreateProcessor.java
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/DeleteProcessor.java
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/ExamineProcessor.java
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/ExpungeProcessor.java
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/FetchProcessor.java
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/Imap4Rev1ProcessorFactory.java
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/ListProcessor.java
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/LoginProcessor.java
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/LogoutProcessor.java
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/LsubProcessor.java
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/NoopProcessor.java
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/RenameProcessor.java
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/SearchProcessor.java
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/SelectProcessor.java
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/StatusProcessor.java
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/StoreProcessor.java
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/SubscribeProcessor.java
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/UnsubscribeProcessor.java
Modified: james/server/trunk/imap-api/src/main/java/org/apache/james/api/imap/message/request/ImapRequest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-api/src/main/java/org/apache/james/api/imap/message/request/ImapRequest.java?view=diff&rev=553342&r1=553341&r2=553342
==============================================================================
--- james/server/trunk/imap-api/src/main/java/org/apache/james/api/imap/message/request/ImapRequest.java (original)
+++ james/server/trunk/imap-api/src/main/java/org/apache/james/api/imap/message/request/ImapRequest.java Wed Jul 4 15:10:37 2007
@@ -23,16 +23,18 @@
public interface ImapRequest {
- /**
- * Gets the IMAP command whose execution is requested by the client.
- * @return <code>ImapCommand</code>, not null
- */
- public abstract ImapCommand getCommand();
+ /**
+ * Gets the IMAP command whose execution is requested by the client.
+ *
+ * @return <code>ImapCommand</code>, not null
+ */
+ public abstract ImapCommand getCommand();
- /**
- * Gets the prefix tag identifying this request.
- * @return the tag identifying the client request, not null
- */
- public abstract String getTag();
+ /**
+ * Gets the prefix tag identifying this request.
+ *
+ * @return the tag identifying the client request, not null
+ */
+ public abstract String getTag();
}
Modified: james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/base/AbstractImapRequest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/base/AbstractImapRequest.java?view=diff&rev=553342&r1=553341&r2=553342
==============================================================================
--- james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/base/AbstractImapRequest.java (original)
+++ james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/base/AbstractImapRequest.java Wed Jul 4 15:10:37 2007
@@ -23,29 +23,33 @@
import org.apache.james.api.imap.ImapMessage;
import org.apache.james.api.imap.message.request.ImapRequest;
-abstract public class AbstractImapRequest extends AbstractLogEnabled implements ImapMessage, ImapRequest {
-
- private final String tag;
+abstract public class AbstractImapRequest extends AbstractLogEnabled implements
+ ImapMessage, ImapRequest {
+
+ private final String tag;
+
private final ImapCommand command;
-
+
public AbstractImapRequest(final String tag, final ImapCommand command) {
this.tag = tag;
this.command = command;
}
-
- /**
- * Gets the IMAP command whose execution is requested by the client.
- * @see org.apache.james.api.imap.message.request.ImapRequest#getCommand()
- */
- public final ImapCommand getCommand() {
- return command;
- }
- /**
- * Gets the prefix tag identifying this request.
- * @see org.apache.james.api.imap.message.request.ImapRequest#getTag()
- */
- public final String getTag() {
- return tag;
- }
+ /**
+ * Gets the IMAP command whose execution is requested by the client.
+ *
+ * @see org.apache.james.api.imap.message.request.ImapRequest#getCommand()
+ */
+ public final ImapCommand getCommand() {
+ return command;
+ }
+
+ /**
+ * Gets the prefix tag identifying this request.
+ *
+ * @see org.apache.james.api.imap.message.request.ImapRequest#getTag()
+ */
+ public final String getTag() {
+ return tag;
+ }
}
Modified: james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/AppendRequest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/AppendRequest.java?view=diff&rev=553342&r1=553341&r2=553342
==============================================================================
--- james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/AppendRequest.java (original)
+++ james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/AppendRequest.java Wed Jul 4 15:10:37 2007
@@ -28,11 +28,14 @@
public class AppendRequest extends AbstractImapRequest {
private final String mailboxName;
+
private final Flags flags;
+
private final Date datetime;
+
private final MimeMessage message;
-
- public AppendRequest(ImapCommand command, String mailboxName, Flags flags,
+
+ public AppendRequest(ImapCommand command, String mailboxName, Flags flags,
Date datetime, MimeMessage message, String tag) {
super(tag, command);
this.mailboxName = mailboxName;
Modified: james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/AuthenticateRequest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/AuthenticateRequest.java?view=diff&rev=553342&r1=553341&r2=553342
==============================================================================
--- james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/AuthenticateRequest.java (original)
+++ james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/AuthenticateRequest.java Wed Jul 4 15:10:37 2007
@@ -24,13 +24,14 @@
public class AuthenticateRequest extends AbstractImapRequest {
private final String authType;
-
- public AuthenticateRequest(final ImapCommand command, final String authType, final String tag) {
+
+ public AuthenticateRequest(final ImapCommand command,
+ final String authType, final String tag) {
super(tag, command);
this.authType = authType;
}
-
+
public final String getAuthType() {
- return authType;
- }
+ return authType;
+ }
}
Modified: james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/CheckRequest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/CheckRequest.java?view=diff&rev=553342&r1=553341&r2=553342
==============================================================================
--- james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/CheckRequest.java (original)
+++ james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/CheckRequest.java Wed Jul 4 15:10:37 2007
@@ -22,7 +22,7 @@
import org.apache.james.imap.message.request.base.AbstractImapRequest;
public class CheckRequest extends AbstractImapRequest {
-
+
public CheckRequest(final ImapCommand command, final String tag) {
super(tag, command);
}
Modified: james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/CloseRequest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/CloseRequest.java?view=diff&rev=553342&r1=553341&r2=553342
==============================================================================
--- james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/CloseRequest.java (original)
+++ james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/CloseRequest.java Wed Jul 4 15:10:37 2007
@@ -22,7 +22,7 @@
import org.apache.james.imap.message.request.base.AbstractImapRequest;
public class CloseRequest extends AbstractImapRequest {
-
+
public CloseRequest(final ImapCommand command, final String tag) {
super(tag, command);
}
Modified: james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/CopyRequest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/CopyRequest.java?view=diff&rev=553342&r1=553341&r2=553342
==============================================================================
--- james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/CopyRequest.java (original)
+++ james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/CopyRequest.java Wed Jul 4 15:10:37 2007
@@ -25,26 +25,28 @@
public class CopyRequest extends AbstractImapRequest {
private final IdRange[] idSet;
+
private final String mailboxName;
+
private final boolean useUids;
- public CopyRequest(final ImapCommand command, final IdRange[] idSet, final String mailboxName,
- final boolean useUids, final String tag) {
+ public CopyRequest(final ImapCommand command, final IdRange[] idSet,
+ final String mailboxName, final boolean useUids, final String tag) {
super(tag, command);
this.idSet = idSet;
this.mailboxName = mailboxName;
this.useUids = useUids;
}
-
+
public final IdRange[] getIdSet() {
- return idSet;
- }
+ return idSet;
+ }
- public final String getMailboxName() {
- return mailboxName;
- }
-
- public final boolean isUseUids() {
- return useUids;
- }
+ public final String getMailboxName() {
+ return mailboxName;
+ }
+
+ public final boolean isUseUids() {
+ return useUids;
+ }
}
Modified: james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/CreateRequest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/CreateRequest.java?view=diff&rev=553342&r1=553341&r2=553342
==============================================================================
--- james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/CreateRequest.java (original)
+++ james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/CreateRequest.java Wed Jul 4 15:10:37 2007
@@ -23,12 +23,14 @@
public class CreateRequest extends AbstractImapRequest {
private final String mailboxName;
- public CreateRequest(final ImapCommand command, final String mailboxName, final String tag) {
+
+ public CreateRequest(final ImapCommand command, final String mailboxName,
+ final String tag) {
super(tag, command);
this.mailboxName = mailboxName;
}
-
+
public final String getMailboxName() {
- return mailboxName;
- }
+ return mailboxName;
+ }
}
Modified: james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/DeleteRequest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/DeleteRequest.java?view=diff&rev=553342&r1=553341&r2=553342
==============================================================================
--- james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/DeleteRequest.java (original)
+++ james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/DeleteRequest.java Wed Jul 4 15:10:37 2007
@@ -23,13 +23,14 @@
public class DeleteRequest extends AbstractImapRequest {
private final String mailboxName;
-
- public DeleteRequest(final ImapCommand command, final String mailboxName, final String tag) {
+
+ public DeleteRequest(final ImapCommand command, final String mailboxName,
+ final String tag) {
super(tag, command);
this.mailboxName = mailboxName;
}
- public final String getMailboxName() {
- return mailboxName;
- }
+ public final String getMailboxName() {
+ return mailboxName;
+ }
}
Modified: james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/ExamineRequest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/ExamineRequest.java?view=diff&rev=553342&r1=553341&r2=553342
==============================================================================
--- james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/ExamineRequest.java (original)
+++ james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/ExamineRequest.java Wed Jul 4 15:10:37 2007
@@ -22,16 +22,17 @@
import org.apache.james.imap.message.request.base.AbstractImapRequest;
public class ExamineRequest extends AbstractImapRequest {
-
+
private final String mailboxName;
-
- public ExamineRequest(final ImapCommand command, final String mailboxName, final String tag) {
+
+ public ExamineRequest(final ImapCommand command, final String mailboxName,
+ final String tag) {
super(tag, command);
this.mailboxName = mailboxName;
}
- public final String getMailboxName() {
- return mailboxName;
- }
-
+ public final String getMailboxName() {
+ return mailboxName;
+ }
+
}
Modified: james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/FetchRequest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/FetchRequest.java?view=diff&rev=553342&r1=553341&r2=553342
==============================================================================
--- james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/FetchRequest.java (original)
+++ james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/FetchRequest.java Wed Jul 4 15:10:37 2007
@@ -24,32 +24,33 @@
import org.apache.james.imap.message.request.base.AbstractImapRequest;
public class FetchRequest extends AbstractImapRequest {
- private final boolean useUids;
- private final IdRange[] idSet;
- private final FetchData fetch;
-
- public FetchRequest(final ImapCommand command, final boolean useUids, final IdRange[] idSet,
- final FetchData fetch, String tag) {
- super(tag, command);
- this.useUids = useUids;
- this.idSet = idSet;
- this.fetch = fetch;
- if (useUids) {
- fetch.setUid(true);
- }
+ private final boolean useUids;
+
+ private final IdRange[] idSet;
+
+ private final FetchData fetch;
+
+ public FetchRequest(final ImapCommand command, final boolean useUids,
+ final IdRange[] idSet, final FetchData fetch, String tag) {
+ super(tag, command);
+ this.useUids = useUids;
+ this.idSet = idSet;
+ this.fetch = fetch;
+ if (useUids) {
+ fetch.setUid(true);
}
+ }
- public final FetchData getFetch() {
- return fetch;
- }
-
- public final IdRange[] getIdSet() {
- return idSet;
- }
-
- public final boolean isUseUids() {
- return useUids;
- }
-
-
+ public final FetchData getFetch() {
+ return fetch;
}
+
+ public final IdRange[] getIdSet() {
+ return idSet;
+ }
+
+ public final boolean isUseUids() {
+ return useUids;
+ }
+
+}
Modified: james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/ListRequest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/ListRequest.java?view=diff&rev=553342&r1=553341&r2=553342
==============================================================================
--- james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/ListRequest.java (original)
+++ james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/ListRequest.java Wed Jul 4 15:10:37 2007
@@ -23,20 +23,21 @@
public class ListRequest extends AbstractImapRequest {
private final String baseReferenceName;
+
private final String mailboxPattern;
- public ListRequest(final ImapCommand command, final String referenceName, final String mailboxPattern,
- final String tag) {
+ public ListRequest(final ImapCommand command, final String referenceName,
+ final String mailboxPattern, final String tag) {
super(tag, command);
this.baseReferenceName = referenceName;
this.mailboxPattern = mailboxPattern;
}
-
+
public final String getBaseReferenceName() {
- return baseReferenceName;
- }
+ return baseReferenceName;
+ }
- public final String getMailboxPattern() {
- return mailboxPattern;
- }
+ public final String getMailboxPattern() {
+ return mailboxPattern;
+ }
}
Modified: james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/LoginRequest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/LoginRequest.java?view=diff&rev=553342&r1=553341&r2=553342
==============================================================================
--- james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/LoginRequest.java (original)
+++ james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/LoginRequest.java Wed Jul 4 15:10:37 2007
@@ -23,19 +23,21 @@
public class LoginRequest extends AbstractImapRequest {
private final String userid;
+
private final String password;
-
- public LoginRequest(final ImapCommand command, final String userid, final String password, String tag) {
+
+ public LoginRequest(final ImapCommand command, final String userid,
+ final String password, String tag) {
super(tag, command);
this.userid = userid;
this.password = password;
}
-
+
public final String getPassword() {
- return password;
- }
+ return password;
+ }
- public final String getUserid() {
- return userid;
- }
+ public final String getUserid() {
+ return userid;
+ }
}
Modified: james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/LogoutRequest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/LogoutRequest.java?view=diff&rev=553342&r1=553341&r2=553342
==============================================================================
--- james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/LogoutRequest.java (original)
+++ james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/LogoutRequest.java Wed Jul 4 15:10:37 2007
@@ -26,5 +26,5 @@
public LogoutRequest(final ImapCommand command, final String tag) {
super(tag, command);
}
-
+
}
Modified: james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/LsubRequest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/LsubRequest.java?view=diff&rev=553342&r1=553341&r2=553342
==============================================================================
--- james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/LsubRequest.java (original)
+++ james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/LsubRequest.java Wed Jul 4 15:10:37 2007
@@ -23,20 +23,21 @@
public class LsubRequest extends AbstractImapRequest {
private final String baseReferenceName;
+
private final String mailboxPattern;
- public LsubRequest(final ImapCommand command, final String referenceName, final String mailboxPattern,
- final String tag) {
+ public LsubRequest(final ImapCommand command, final String referenceName,
+ final String mailboxPattern, final String tag) {
super(tag, command);
this.baseReferenceName = referenceName;
this.mailboxPattern = mailboxPattern;
}
-
+
public final String getBaseReferenceName() {
- return baseReferenceName;
- }
+ return baseReferenceName;
+ }
- public final String getMailboxPattern() {
- return mailboxPattern;
- }
+ public final String getMailboxPattern() {
+ return mailboxPattern;
+ }
}
Modified: james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/NoopRequest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/NoopRequest.java?view=diff&rev=553342&r1=553341&r2=553342
==============================================================================
--- james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/NoopRequest.java (original)
+++ james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/NoopRequest.java Wed Jul 4 15:10:37 2007
@@ -22,7 +22,7 @@
import org.apache.james.imap.message.request.base.AbstractImapRequest;
public class NoopRequest extends AbstractImapRequest {
-
+
public NoopRequest(final ImapCommand command, final String tag) {
super(tag, command);
}
Modified: james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/RenameRequest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/RenameRequest.java?view=diff&rev=553342&r1=553341&r2=553342
==============================================================================
--- james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/RenameRequest.java (original)
+++ james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/RenameRequest.java Wed Jul 4 15:10:37 2007
@@ -23,20 +23,21 @@
public class RenameRequest extends AbstractImapRequest {
private final String existingName;
+
private final String newName;
-
- public RenameRequest(final ImapCommand command, final String existingName, final String newName,
- final String tag) {
+
+ public RenameRequest(final ImapCommand command, final String existingName,
+ final String newName, final String tag) {
super(tag, command);
this.existingName = existingName;
this.newName = newName;
}
public final String getExistingName() {
- return existingName;
- }
+ return existingName;
+ }
- public final String getNewName() {
- return newName;
- }
+ public final String getNewName() {
+ return newName;
+ }
}
Modified: james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/SearchRequest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/SearchRequest.java?view=diff&rev=553342&r1=553341&r2=553342
==============================================================================
--- james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/SearchRequest.java (original)
+++ james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/SearchRequest.java Wed Jul 4 15:10:37 2007
@@ -25,20 +25,21 @@
public class SearchRequest extends AbstractImapRequest {
private final SearchTerm searchTerm;
+
private final boolean useUids;
- public SearchRequest(final ImapCommand command, final SearchTerm searchTerm, final boolean useUids,
- final String tag) {
+ public SearchRequest(final ImapCommand command,
+ final SearchTerm searchTerm, final boolean useUids, final String tag) {
super(tag, command);
this.searchTerm = searchTerm;
this.useUids = useUids;
}
public final SearchTerm getSearchTerm() {
- return searchTerm;
- }
+ return searchTerm;
+ }
- public final boolean isUseUids() {
- return useUids;
- }
+ public final boolean isUseUids() {
+ return useUids;
+ }
}
Modified: james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/SelectRequest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/SelectRequest.java?view=diff&rev=553342&r1=553341&r2=553342
==============================================================================
--- james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/SelectRequest.java (original)
+++ james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/SelectRequest.java Wed Jul 4 15:10:37 2007
@@ -23,14 +23,15 @@
public class SelectRequest extends AbstractImapRequest {
private final String mailboxName;
-
- public SelectRequest(final ImapCommand command, final String mailboxName, final String tag) {
+
+ public SelectRequest(final ImapCommand command, final String mailboxName,
+ final String tag) {
super(tag, command);
this.mailboxName = mailboxName;
}
- public final String getMailboxName() {
- return mailboxName;
- }
-
+ public final String getMailboxName() {
+ return mailboxName;
+ }
+
}
Modified: james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/StatusRequest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/StatusRequest.java?view=diff&rev=553342&r1=553341&r2=553342
==============================================================================
--- james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/StatusRequest.java (original)
+++ james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/StatusRequest.java Wed Jul 4 15:10:37 2007
@@ -24,19 +24,21 @@
public class StatusRequest extends AbstractImapRequest {
private final String mailboxName;
+
private final StatusDataItems statusDataItems;
-
- public StatusRequest(final ImapCommand command, final String mailboxName, final StatusDataItems statusDataItems, final String tag) {
+
+ public StatusRequest(final ImapCommand command, final String mailboxName,
+ final StatusDataItems statusDataItems, final String tag) {
super(tag, command);
this.mailboxName = mailboxName;
this.statusDataItems = statusDataItems;
}
-
+
public final String getMailboxName() {
- return mailboxName;
- }
+ return mailboxName;
+ }
- public final StatusDataItems getStatusDataItems() {
- return statusDataItems;
- }
+ public final StatusDataItems getStatusDataItems() {
+ return statusDataItems;
+ }
}
Modified: james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/StoreRequest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/StoreRequest.java?view=diff&rev=553342&r1=553341&r2=553342
==============================================================================
--- james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/StoreRequest.java (original)
+++ james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/StoreRequest.java Wed Jul 4 15:10:37 2007
@@ -27,11 +27,15 @@
public class StoreRequest extends AbstractImapRequest {
private final IdRange[] idSet;
+
private final StoreDirective directive;
+
private final Flags flags;
+
private final boolean useUids;
-
- public StoreRequest(final ImapCommand command, final IdRange[] idSet, final StoreDirective directive, final Flags flags,
+
+ public StoreRequest(final ImapCommand command, final IdRange[] idSet,
+ final StoreDirective directive, final Flags flags,
final boolean useUids, final String tag) {
super(tag, command);
this.idSet = idSet;
@@ -39,20 +43,20 @@
this.flags = flags;
this.useUids = useUids;
}
-
+
public final StoreDirective getDirective() {
- return directive;
- }
+ return directive;
+ }
- public final Flags getFlags() {
- return flags;
- }
-
- public final IdRange[] getIdSet() {
- return idSet;
- }
-
- public final boolean isUseUids() {
- return useUids;
- }
+ public final Flags getFlags() {
+ return flags;
+ }
+
+ public final IdRange[] getIdSet() {
+ return idSet;
+ }
+
+ public final boolean isUseUids() {
+ return useUids;
+ }
}
Modified: james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/SubscribeRequest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/SubscribeRequest.java?view=diff&rev=553342&r1=553341&r2=553342
==============================================================================
--- james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/SubscribeRequest.java (original)
+++ james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/SubscribeRequest.java Wed Jul 4 15:10:37 2007
@@ -23,13 +23,14 @@
public class SubscribeRequest extends AbstractImapRequest {
private final String mailboxName;
-
- public SubscribeRequest(final ImapCommand command, final String mailboxName, final String tag) {
+
+ public SubscribeRequest(final ImapCommand command,
+ final String mailboxName, final String tag) {
super(tag, command);
this.mailboxName = mailboxName;
}
- public final String getMailboxName() {
- return mailboxName;
- }
+ public final String getMailboxName() {
+ return mailboxName;
+ }
}
Modified: james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/UnsubscribeRequest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/UnsubscribeRequest.java?view=diff&rev=553342&r1=553341&r2=553342
==============================================================================
--- james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/UnsubscribeRequest.java (original)
+++ james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/request/imap4rev1/UnsubscribeRequest.java Wed Jul 4 15:10:37 2007
@@ -24,12 +24,13 @@
public class UnsubscribeRequest extends AbstractImapRequest {
private final String mailboxName;
- public UnsubscribeRequest(final ImapCommand command, final String mailboxName, final String tag) {
+ public UnsubscribeRequest(final ImapCommand command,
+ final String mailboxName, final String tag) {
super(tag, command);
this.mailboxName = mailboxName;
}
- public final String getMailboxName() {
- return mailboxName;
- }
+ public final String getMailboxName() {
+ return mailboxName;
+ }
}
Modified: james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/response/imap4rev1/legacy/BadResponse.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/response/imap4rev1/legacy/BadResponse.java?view=diff&rev=553342&r1=553341&r2=553342
==============================================================================
--- james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/response/imap4rev1/legacy/BadResponse.java (original)
+++ james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/response/imap4rev1/legacy/BadResponse.java Wed Jul 4 15:10:37 2007
@@ -24,19 +24,20 @@
/**
* Carries the response to a request with bad syntax..
+ *
* @deprecated responses should correspond directly to the specification
*/
-public class BadResponse implements ImapMessage,
- ImapResponseMessage {
+public class BadResponse implements ImapMessage, ImapResponseMessage {
private final String message;
+
private final String tag;
-
+
public BadResponse(final String message) {
- // TODO: check calls that use this are specficiation compliant
- this(message, null);
+ // TODO: check calls that use this are specficiation compliant
+ this(message, null);
}
-
+
public BadResponse(final String message, final String tag) {
super();
this.message = message;
Modified: james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/response/imap4rev1/legacy/ListResponse.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/response/imap4rev1/legacy/ListResponse.java?view=diff&rev=553342&r1=553341&r2=553342
==============================================================================
--- james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/response/imap4rev1/legacy/ListResponse.java (original)
+++ james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/response/imap4rev1/legacy/ListResponse.java Wed Jul 4 15:10:37 2007
@@ -30,18 +30,18 @@
*/
public class ListResponse extends AbstractImapResponse {
private List messages = new ArrayList();
-
+
public ListResponse(final ImapCommand command, final String tag) {
super(command, tag);
}
-
+
public void addMessageData(String message) {
// TODO: this isn't efficient
// TODO: better to stream results
- // TODO: pass data objects back and then encode
+ // TODO: pass data objects back and then encode
messages.add(message);
}
-
+
public List getMessages() {
return Collections.unmodifiableList(messages);
}
Modified: james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/ImapResponseComposer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/ImapResponseComposer.java?view=diff&rev=553342&r1=553341&r2=553342
==============================================================================
--- james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/ImapResponseComposer.java (original)
+++ james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/ImapResponseComposer.java Wed Jul 4 15:10:37 2007
@@ -28,265 +28,280 @@
import org.apache.james.api.imap.message.MessageFlags;
/**
- * Class providing methods to send response messages from the server
- * to the client.
+ * Class providing methods to send response messages from the server to the
+ * client.
*/
-public class ImapResponseComposer extends AbstractLogEnabled implements ImapConstants, ImapResponseWriter {
-
+public class ImapResponseComposer extends AbstractLogEnabled implements
+ ImapConstants, ImapResponseWriter {
+
public static final String FETCH = "FETCH";
+
public static final String EXPUNGE = "EXPUNGE";
+
public static final String RECENT = "RECENT";
+
public static final String EXISTS = "EXISTS";
+
public static final String FLAGS = "FLAGS";
+
public static final String FAILED = "failed.";
+
private final ImapResponseWriter writer;
- public ImapResponseComposer( final ImapResponseWriter writer )
- {
+ public ImapResponseComposer(final ImapResponseWriter writer) {
this.writer = writer;
}
/**
- * Writes a standard tagged OK response on completion of a command.
- * Response is writen as:
- * <pre> a01 OK COMMAND_NAME completed.</pre>
- *
- * @param command The ImapCommand which was completed.
- */
- public void commandComplete( final ImapCommand command, final String tag )
- {
- commandComplete( command, null , tag);
+ * Writes a standard tagged OK response on completion of a command. Response
+ * is writen as:
+ *
+ * <pre>
+ * a01 OK COMMAND_NAME completed.
+ * </pre>
+ *
+ * @param command
+ * The ImapCommand which was completed.
+ */
+ public void commandComplete(final ImapCommand command, final String tag) {
+ commandComplete(command, null, tag);
}
/**
- * Writes a standard tagged OK response on completion of a command,
- * with a response code (eg READ-WRITE)
- * Response is writen as:
- * <pre> a01 OK [responseCode] COMMAND_NAME completed.</pre>
- *
- * @param command The ImapCommand which was completed.
- * @param responseCode A string response code to send to the client.
+ * Writes a standard tagged OK response on completion of a command, with a
+ * response code (eg READ-WRITE) Response is writen as:
+ *
+ * <pre>
+ * a01 OK [responseCode] COMMAND_NAME completed.
+ * </pre>
+ *
+ * @param command
+ * The ImapCommand which was completed.
+ * @param responseCode
+ * A string response code to send to the client.
*/
- public void commandComplete( final ImapCommand command, final String responseCode, final String tag)
- {
+ public void commandComplete(final ImapCommand command,
+ final String responseCode, final String tag) {
tag(tag);
- message( OK );
- responseCode( responseCode );
- commandName( command );
- message( "completed." );
+ message(OK);
+ responseCode(responseCode);
+ commandName(command);
+ message("completed.");
end();
}
/**
* Writes a standard NO response on command failure, together with a
- * descriptive message.
- * Response is writen as:
- * <pre> a01 NO COMMAND_NAME failed. <reason></pre>
- *
- * @param command The ImapCommand which failed.
- * @param reason A message describing why the command failed.
- */
- public void commandFailed( final ImapCommand command, final String reason , final String tag)
- {
- commandFailed( command, null, reason , tag);
+ * descriptive message. Response is writen as:
+ *
+ * <pre>
+ * a01 NO COMMAND_NAME failed. <reason>
+ * </pre>
+ *
+ * @param command
+ * The ImapCommand which failed.
+ * @param reason
+ * A message describing why the command failed.
+ */
+ public void commandFailed(final ImapCommand command, final String reason,
+ final String tag) {
+ commandFailed(command, null, reason, tag);
}
/**
* Writes a standard NO response on command failure, together with a
- * descriptive message.
- * Response is writen as:
- * <pre> a01 NO [responseCode] COMMAND_NAME failed. <reason></pre>
- *
- * @param command The ImapCommand which failed.
- * @param responseCode The Imap response code to send.
- * @param reason A message describing why the command failed.
- */
- public void commandFailed( ImapCommand command,
- String responseCode,
- String reason,
- final String tag)
- {
+ * descriptive message. Response is writen as:
+ *
+ * <pre>
+ * a01 NO [responseCode] COMMAND_NAME failed. <reason>
+ * </pre>
+ *
+ * @param command
+ * The ImapCommand which failed.
+ * @param responseCode
+ * The Imap response code to send.
+ * @param reason
+ * A message describing why the command failed.
+ */
+ public void commandFailed(ImapCommand command, String responseCode,
+ String reason, final String tag) {
tag(tag);
- message( NO );
- responseCode( responseCode );
- commandName( command );
- message( FAILED );
- message( reason );
+ message(NO);
+ responseCode(responseCode);
+ commandName(command);
+ message(FAILED);
+ message(reason);
end();
final Logger logger = getLogger();
- if (logger!= null && logger.isInfoEnabled()) {
+ if (logger != null && logger.isInfoEnabled()) {
logger.info("COMMAND FAILED [" + responseCode + "] - " + reason);
}
}
/**
* Writes a standard BAD response on command error, together with a
- * descriptive message.
- * Response is writen as:
- * <pre> a01 BAD <message></pre>
- *
- * @param message The descriptive error message.
+ * descriptive message. Response is writen as:
+ *
+ * <pre>
+ * a01 BAD <message>
+ * </pre>
+ *
+ * @param message
+ * The descriptive error message.
*/
- public void commandError( final String message, final String tag )
- {
+ public void commandError(final String message, final String tag) {
tag(tag);
- message( BAD );
- message( message );
+ message(BAD);
+ message(message);
end();
final Logger logger = getLogger();
if (logger != null && logger.isInfoEnabled()) {
- logger.info("ERROR - " + message);
+ logger.info("ERROR - " + message);
}
}
/**
- * Writes a standard untagged BAD response, together with a descriptive message.
+ * Writes a standard untagged BAD response, together with a descriptive
+ * message.
*/
- public void badResponse( String message )
- {
+ public void badResponse(String message) {
untagged();
- message( BAD );
- message( message );
+ message(BAD);
+ message(message);
end();
- final Logger logger = getLogger();
- if (logger != null && logger.isInfoEnabled()) {
- logger.info("BAD - " + message);
+ final Logger logger = getLogger();
+ if (logger != null && logger.isInfoEnabled()) {
+ logger.info("BAD - " + message);
}
}
-
+
/**
- * Writes a standard untagged BAD response, together with a descriptive message.
+ * Writes a standard untagged BAD response, together with a descriptive
+ * message.
*/
- public void badResponse( String message , String tag )
- {
- tag(tag);
- message( BAD );
- message( message );
- end();
- final Logger logger = getLogger();
- if (logger != null && logger.isInfoEnabled()) {
- logger.info("BAD - " + message);
+ public void badResponse(String message, String tag) {
+ tag(tag);
+ message(BAD);
+ message(message);
+ end();
+ final Logger logger = getLogger();
+ if (logger != null && logger.isInfoEnabled()) {
+ logger.info("BAD - " + message);
}
}
-
+
/**
- * Writes an untagged OK response, with the supplied response code,
- * and an optional message.
- * @param responseCode The response code, included in [].
- * @param message The message to follow the []
+ * Writes an untagged OK response, with the supplied response code, and an
+ * optional message.
+ *
+ * @param responseCode
+ * The response code, included in [].
+ * @param message
+ * The message to follow the []
*/
- public void okResponse( String responseCode, String message )
- {
+ public void okResponse(String responseCode, String message) {
untagged();
- message( OK );
- responseCode( responseCode );
- message( message );
+ message(OK);
+ responseCode(responseCode);
+ message(message);
end();
}
/**
- * Writes an untagged NO response.
- * Indicates that a warning.
- * The command may still complete sucessfully.
- * @param displayMessage message for display, not null
- * @param responseCode response code
- * or null when there is no response code
+ * Writes an untagged NO response. Indicates that a warning. The command may
+ * still complete sucessfully.
+ *
+ * @param displayMessage
+ * message for display, not null
+ * @param responseCode
+ * response code or null when there is no response code
*/
- public void untaggedNoResponse(String displayMessage, String responseCode)
- {
+ public void untaggedNoResponse(String displayMessage, String responseCode) {
untagged();
- message( NO );
- responseCode( responseCode );
- message( displayMessage );
+ message(NO);
+ responseCode(responseCode);
+ message(displayMessage);
end();
}
-
- public void flagsResponse( Flags flags )
- {
+
+ public void flagsResponse(Flags flags) {
untagged();
- message( FLAGS );
- message( MessageFlags.format(flags) );
+ message(FLAGS);
+ message(MessageFlags.format(flags));
end();
}
- public void existsResponse( int count )
- {
+ public void existsResponse(int count) {
untagged();
- message( count );
- message( EXISTS );
+ message(count);
+ message(EXISTS);
end();
}
- public void recentResponse( int count )
- {
+ public void recentResponse(int count) {
untagged();
- message( count );
- message( RECENT );
+ message(count);
+ message(RECENT);
end();
}
- public void expungeResponse( int msn )
- {
+ public void expungeResponse(int msn) {
untagged();
- message( msn );
- message( EXPUNGE );
+ message(msn);
+ message(EXPUNGE);
end();
}
- public void fetchResponse( int msn, String msgData )
- {
+ public void fetchResponse(int msn, String msgData) {
untagged();
- message( msn );
- message( FETCH );
- message( "(" + msgData + ")" );
+ message(msn);
+ message(FETCH);
+ message("(" + msgData + ")");
end();
}
- public void commandResponse( ImapCommand command, String message )
- {
+ public void commandResponse(ImapCommand command, String message) {
untagged();
- commandName( command );
- message( message );
+ commandName(command);
+ message(message);
end();
}
/**
- * Writes the message provided to the client, prepended with the
- * request tag.
- *
- * @param message The message to write to the client.
+ * Writes the message provided to the client, prepended with the request
+ * tag.
+ *
+ * @param message
+ * The message to write to the client.
*/
- public void taggedResponse( String message, String tag )
- {
+ public void taggedResponse(String message, String tag) {
tag(tag);
- message( message );
+ message(message);
end();
}
/**
- * Writes the message provided to the client, prepended with the
- * untagged marker "*".
- *
- * @param message The message to write to the client.
+ * Writes the message provided to the client, prepended with the untagged
+ * marker "*".
+ *
+ * @param message
+ * The message to write to the client.
*/
- public void untaggedResponse( String message )
- {
+ public void untaggedResponse(String message) {
untagged();
- message( message );
+ message(message);
end();
}
-
- public void byeResponse( String message ) {
+
+ public void byeResponse(String message) {
untaggedResponse(BYE + SP + message);
}
- public void untagged()
- {
+ public void untagged() {
writer.untagged();
}
- private void commandName( final ImapCommand command )
- {
+ private void commandName(final ImapCommand command) {
final String name = command.getName();
commandName(name);
}
@@ -295,9 +310,8 @@
writer.commandName(name);
}
- public void message( final String message )
- {
- if ( message != null ) {
+ public void message(final String message) {
+ if (message != null) {
// TODO: consider message normalisation
// TODO: CR/NFs in message must be replaced
// TODO: probably best done in the writer
@@ -305,20 +319,17 @@
}
}
- public void message( final int number )
- {
+ public void message(final int number) {
writer.message(number);
}
- public void responseCode( final String responseCode )
- {
- if ( responseCode != null ) {
+ public void responseCode(final String responseCode) {
+ if (responseCode != null) {
writer.responseCode(responseCode);
}
}
- public void end()
- {
+ public void end() {
writer.end();
}
Modified: james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/AbstractListingProcessor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/AbstractListingProcessor.java?view=diff&rev=553342&r1=553341&r2=553342
==============================================================================
--- james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/AbstractListingProcessor.java (original)
+++ james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/AbstractListingProcessor.java Wed Jul 4 15:10:37 2007
@@ -37,16 +37,17 @@
import org.apache.james.mailboxmanager.manager.MailboxManagerProvider;
import org.apache.james.services.User;
-
abstract class AbstractListingProcessor extends AbstractMailboxAwareProcessor {
-
- public AbstractListingProcessor(final ImapProcessor next,
+
+ public AbstractListingProcessor(final ImapProcessor next,
final MailboxManagerProvider mailboxManagerProvider) {
super(next, mailboxManagerProvider);
}
- protected final ImapResponseMessage doProcess(final String baseReferenceName, final String mailboxPattern,
- ImapSession session, String tag, ImapCommand command) throws MailboxException, AuthorizationException, ProtocolException {
+ protected final ImapResponseMessage doProcess(
+ final String baseReferenceName, final String mailboxPattern,
+ ImapSession session, String tag, ImapCommand command)
+ throws MailboxException, AuthorizationException, ProtocolException {
final ListResponse result = new ListResponse(command, tag);
String referenceName = baseReferenceName;
@@ -56,29 +57,29 @@
ListResult[] listResults;
final User user = ImapSessionUtils.getUser(session);
- String personalNamespace = ImapConstants.USER_NAMESPACE + ImapConstants.HIERARCHY_DELIMITER_CHAR
- + user.getUserName();
+ String personalNamespace = ImapConstants.USER_NAMESPACE
+ + ImapConstants.HIERARCHY_DELIMITER_CHAR + user.getUserName();
- if ( mailboxPattern.length() == 0 ) {
- // An empty mailboxPattern signifies a request for the hierarchy delimiter
+ if (mailboxPattern.length() == 0) {
+ // An empty mailboxPattern signifies a request for the hierarchy
+ // delimiter
// and root name of the referenceName argument
String referenceRoot;
- if ( referenceName.startsWith( ImapConstants.NAMESPACE_PREFIX ) )
- {
+ if (referenceName.startsWith(ImapConstants.NAMESPACE_PREFIX)) {
// A qualified reference name - get the first element,
// and don't remove the user prefix
removeUserPrefix = false;
- int firstDelimiter = referenceName.indexOf( ImapConstants.HIERARCHY_DELIMITER_CHAR );
- if ( firstDelimiter == -1 ) {
+ int firstDelimiter = referenceName
+ .indexOf(ImapConstants.HIERARCHY_DELIMITER_CHAR);
+ if (firstDelimiter == -1) {
referenceRoot = referenceName;
+ } else {
+ referenceRoot = referenceName.substring(0, firstDelimiter);
}
- else {
- referenceRoot = referenceName.substring(0, firstDelimiter );
- }
- }
- else {
- // A relative reference name - need to remove user prefix from results.
+ } else {
+ // A relative reference name - need to remove user prefix from
+ // results.
referenceRoot = "";
removeUserPrefix = true;
@@ -86,76 +87,76 @@
// Get the mailbox for the reference name.
listResults = new ListResult[1];
- listResults[0]=new ListResultImpl(referenceRoot,ImapConstants.HIERARCHY_DELIMITER);
- }
- else {
+ listResults[0] = new ListResultImpl(referenceRoot,
+ ImapConstants.HIERARCHY_DELIMITER);
+ } else {
// If the mailboxPattern is fully qualified, ignore the
// reference name.
- if ( mailboxPattern.charAt( 0 ) == ImapConstants.NAMESPACE_PREFIX_CHAR ) {
- referenceName="";
+ if (mailboxPattern.charAt(0) == ImapConstants.NAMESPACE_PREFIX_CHAR) {
+ referenceName = "";
}
- // If the search pattern is relative, need to remove user prefix from results.
- removeUserPrefix = ( (referenceName+mailboxPattern).charAt(0) != ImapConstants.NAMESPACE_PREFIX_CHAR );
+ // If the search pattern is relative, need to remove user prefix
+ // from results.
+ removeUserPrefix = ((referenceName + mailboxPattern).charAt(0) != ImapConstants.NAMESPACE_PREFIX_CHAR);
if (removeUserPrefix) {
- referenceName=personalNamespace+"."+referenceName;
+ referenceName = personalNamespace + "." + referenceName;
}
- listResults = doList( session, referenceName, mailboxPattern );
+ listResults = doList(session, referenceName, mailboxPattern);
}
-
int prefixLength = personalNamespace.length();
for (int i = 0; i < listResults.length; i++) {
- StringBuffer message = new StringBuffer( "(" );
- String[] attrs=listResults[i].getAttributes();
+ StringBuffer message = new StringBuffer("(");
+ String[] attrs = listResults[i].getAttributes();
for (int j = 0; j < attrs.length; j++) {
if (j > 0) {
message.append(' ');
}
- message.append( attrs[j] );
+ message.append(attrs[j]);
}
- message.append( ") \"" );
- message.append( listResults[i].getHierarchyDelimiter() );
- message.append( "\" " );
+ message.append(") \"");
+ message.append(listResults[i].getHierarchyDelimiter());
+ message.append("\" ");
String mailboxName = listResults[i].getName();
- if ( removeUserPrefix ) {
- if ( mailboxName.length() <= prefixLength ) {
+ if (removeUserPrefix) {
+ if (mailboxName.length() <= prefixLength) {
mailboxName = "";
- }
- else {
- mailboxName = mailboxName.substring( prefixLength + 1 );
+ } else {
+ mailboxName = mailboxName.substring(prefixLength + 1);
}
}
// TODO: need to check if the mailbox name needs quoting.
- if ( mailboxName.length() == 0 ) {
+ if (mailboxName.length() == 0) {
message.append("\"\"");
- }
- else {
- message.append( mailboxName );
+ } else {
+ message.append(mailboxName);
}
- result.addMessageData( message.toString() );
+ result.addMessageData(message.toString());
}
- ImapSessionUtils.addUnsolicitedResponses( result, session, false );
+ ImapSessionUtils.addUnsolicitedResponses(result, session, false);
return result;
}
-
- protected abstract ListResult[] doList( ImapSession session, String base, String pattern ) throws MailboxException;
-
- protected final ListResult[] doList( ImapSession session, String base, String pattern, boolean subscribed ) throws MailboxException
- {
+
+ protected abstract ListResult[] doList(ImapSession session, String base,
+ String pattern) throws MailboxException;
+
+ protected final ListResult[] doList(ImapSession session, String base,
+ String pattern, boolean subscribed) throws MailboxException {
try {
final MailboxManager mailboxManager = getMailboxManager(session);
- final ListResult[] result = mailboxManager.list(base,pattern,false);
+ final ListResult[] result = mailboxManager.list(base, pattern,
+ false);
return result;
} catch (MailboxManagerException e) {
- throw new MailboxException(e);
+ throw new MailboxException(e);
}
}
}
Modified: james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/AbstractMailboxSelectionProcessor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/AbstractMailboxSelectionProcessor.java?view=diff&rev=553342&r1=553341&r2=553342
==============================================================================
--- james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/AbstractMailboxSelectionProcessor.java (original)
+++ james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/AbstractMailboxSelectionProcessor.java Wed Jul 4 15:10:37 2007
@@ -39,20 +39,22 @@
import org.apache.james.mailboxmanager.manager.MailboxManager;
import org.apache.james.mailboxmanager.manager.MailboxManagerProvider;
+abstract public class AbstractMailboxSelectionProcessor extends
+ AbstractMailboxAwareProcessor {
-abstract public class AbstractMailboxSelectionProcessor extends AbstractMailboxAwareProcessor {
-
- public AbstractMailboxSelectionProcessor(final ImapProcessor next,
+ public AbstractMailboxSelectionProcessor(final ImapProcessor next,
final MailboxManagerProvider mailboxManagerProvider) {
super(next, mailboxManagerProvider);
}
- protected final ImapResponseMessage doProcess(String mailboxName, boolean isExamine,
- ImapSession session, String tag, ImapCommand command) throws MailboxException, AuthorizationException, ProtocolException {
+ protected final ImapResponseMessage doProcess(String mailboxName,
+ boolean isExamine, ImapSession session, String tag,
+ ImapCommand command) throws MailboxException,
+ AuthorizationException, ProtocolException {
ImapResponseMessage result;
session.deselect();
try {
- String fullMailboxName=buildFullName(session, mailboxName);
+ String fullMailboxName = buildFullName(session, mailboxName);
selectMailbox(fullMailboxName, session, isExamine);
ImapMailboxSession mailbox = ImapSessionUtils.getMailbox(session);
final Flags permanentFlags = mailbox.getPermanentFlags();
@@ -60,7 +62,8 @@
final boolean resetRecent = !isExamine;
final int recentCount = mailbox.getRecentCount(resetRecent);
final long uidValidity = mailbox.getUidValidity();
- final MessageResult firstUnseen = mailbox.getFirstUnseen(MessageResult.MSN);
+ final MessageResult firstUnseen = mailbox
+ .getFirstUnseen(MessageResult.MSN);
final int messageCount = mailbox.getMessageCount();
final int msn;
if (firstUnseen == null) {
@@ -68,26 +71,30 @@
} else {
msn = firstUnseen.getMsn();
}
- result = new ExamineAndSelectResponse(command, permanentFlags,
- writeable, recentCount, uidValidity, msn, messageCount,
- tag);
+ result = new ExamineAndSelectResponse(command, permanentFlags,
+ writeable, recentCount, uidValidity, msn, messageCount, tag);
} catch (MailboxManagerException e) {
throw new MailboxException(e);
}
return result;
- }
-
- private boolean selectMailbox(String mailboxName, ImapSession session, boolean readOnly) throws MailboxException, MailboxManagerException {
+ }
+
+ private boolean selectMailbox(String mailboxName, ImapSession session,
+ boolean readOnly) throws MailboxException, MailboxManagerException {
final MailboxManager mailboxManager = getMailboxManager(session);
- final ImapMailboxSession mailbox = mailboxManager.getImapMailboxSession(mailboxName);
+ final ImapMailboxSession mailbox = mailboxManager
+ .getImapMailboxSession(mailboxName);
- if ( !mailbox.isSelectable() ) {
- throw new MailboxException( "Nonselectable mailbox." );
+ if (!mailbox.isSelectable()) {
+ throw new MailboxException("Nonselectable mailbox.");
}
-
- SelectedImapMailbox sessionMailbox = new SelectedMailboxSessionImpl(mailbox, session);
- session.selected( sessionMailbox);
- session.setAttribute( ImapSessionUtils.SELECTED_MAILBOX_ATTRIBUTE_SESSION_KEY, mailbox );
+
+ SelectedImapMailbox sessionMailbox = new SelectedMailboxSessionImpl(
+ mailbox, session);
+ session.selected(sessionMailbox);
+ session.setAttribute(
+ ImapSessionUtils.SELECTED_MAILBOX_ATTRIBUTE_SESSION_KEY,
+ mailbox);
return readOnly;
}
}
Modified: james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/AppendProcessor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/AppendProcessor.java?view=diff&rev=553342&r1=553341&r2=553342
==============================================================================
--- james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/AppendProcessor.java (original)
+++ james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/AppendProcessor.java Wed Jul 4 15:10:37 2007
@@ -43,7 +43,7 @@
public class AppendProcessor extends AbstractMailboxAwareProcessor {
- public AppendProcessor(final ImapProcessor next,
+ public AppendProcessor(final ImapProcessor next,
final MailboxManagerProvider mailboxManagerProvider) {
super(next, mailboxManagerProvider);
}
@@ -95,7 +95,8 @@
// TODO why not TRYCREATE?
throw new MailboxException(e);
}
- final CommandCompleteResponse result = new CommandCompleteResponse(command, tag);
+ final CommandCompleteResponse result = new CommandCompleteResponse(
+ command, tag);
ImapSessionUtils.addUnsolicitedResponses(result, session, false);
return result;
}
Modified: james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/AuthenticateProcessor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/AuthenticateProcessor.java?view=diff&rev=553342&r1=553341&r2=553342
==============================================================================
--- james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/AuthenticateProcessor.java (original)
+++ james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/AuthenticateProcessor.java Wed Jul 4 15:10:37 2007
@@ -32,33 +32,39 @@
import org.apache.james.imapserver.processor.base.AuthorizationException;
import org.apache.james.imapserver.store.MailboxException;
-
public class AuthenticateProcessor extends AbstractImapRequestProcessor {
-
- public AuthenticateProcessor(final ImapProcessor next) {
+
+ public AuthenticateProcessor(final ImapProcessor next) {
super(next);
}
protected boolean isAcceptable(ImapMessage message) {
return (message instanceof AuthenticateRequest);
}
-
- protected ImapResponseMessage doProcess(ImapRequest message, ImapSession session, String tag, ImapCommand command) throws MailboxException, AuthorizationException, ProtocolException {
+
+ protected ImapResponseMessage doProcess(ImapRequest message,
+ ImapSession session, String tag, ImapCommand command)
+ throws MailboxException, AuthorizationException, ProtocolException {
final AuthenticateRequest request = (AuthenticateRequest) message;
- final ImapResponseMessage result = doProcess(request, session, tag, command);
- return result;
- }
+ final ImapResponseMessage result = doProcess(request, session, tag,
+ command);
+ return result;
+ }
- private ImapResponseMessage doProcess(AuthenticateRequest request, ImapSession session, String tag, ImapCommand command) throws MailboxException, AuthorizationException, ProtocolException {
- final String authType = request.getAuthType();
- final ImapResponseMessage result = doProcess(authType, session, tag, command);
- return result;
- }
-
- private ImapResponseMessage doProcess(String authType,
- ImapSession session, String tag, ImapCommand command) throws MailboxException, AuthorizationException, ProtocolException {
- final CommandFailedResponse result = new CommandFailedResponse(command,
+ private ImapResponseMessage doProcess(AuthenticateRequest request,
+ ImapSession session, String tag, ImapCommand command)
+ throws MailboxException, AuthorizationException, ProtocolException {
+ final String authType = request.getAuthType();
+ final ImapResponseMessage result = doProcess(authType, session, tag,
+ command);
+ return result;
+ }
+
+ private ImapResponseMessage doProcess(String authType, ImapSession session,
+ String tag, ImapCommand command) throws MailboxException,
+ AuthorizationException, ProtocolException {
+ final CommandFailedResponse result = new CommandFailedResponse(command,
"Unsupported authentication mechanism '" + authType + "'", tag);
return result;
- }
+ }
}
Modified: james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/CapabilityProcessor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/CapabilityProcessor.java?view=diff&rev=553342&r1=553341&r2=553342
==============================================================================
--- james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/CapabilityProcessor.java (original)
+++ james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/CapabilityProcessor.java Wed Jul 4 15:10:37 2007
@@ -33,34 +33,41 @@
import org.apache.james.imapserver.processor.base.ImapSessionUtils;
import org.apache.james.imapserver.store.MailboxException;
-
public class CapabilityProcessor extends AbstractImapRequestProcessor {
-
- //TODO: capability text should be injected
-
- public CapabilityProcessor(final ImapProcessor next) {
+
+ // TODO: capability text should be injected
+
+ public CapabilityProcessor(final ImapProcessor next) {
super(next);
}
protected boolean isAcceptable(ImapMessage message) {
return (message instanceof CapabilityRequest);
}
-
- protected ImapResponseMessage doProcess(ImapRequest message, ImapSession session, String tag, ImapCommand command) throws MailboxException, AuthorizationException, ProtocolException {
+
+ protected ImapResponseMessage doProcess(ImapRequest message,
+ ImapSession session, String tag, ImapCommand command)
+ throws MailboxException, AuthorizationException, ProtocolException {
final CapabilityRequest request = (CapabilityRequest) message;
- final ImapResponseMessage result = doProcess(request, session, tag, command);
- return result;
- }
-
- private ImapResponseMessage doProcess(CapabilityRequest request, ImapSession session, String tag, ImapCommand command) throws MailboxException, AuthorizationException, ProtocolException {
- final ImapResponseMessage result = doProcess(session, tag, command);
- return result;
- }
-
- private ImapResponseMessage doProcess(ImapSession session, String tag, ImapCommand command) throws MailboxException, AuthorizationException, ProtocolException {
+ final ImapResponseMessage result = doProcess(request, session, tag,
+ command);
+ return result;
+ }
+
+ private ImapResponseMessage doProcess(CapabilityRequest request,
+ ImapSession session, String tag, ImapCommand command)
+ throws MailboxException, AuthorizationException, ProtocolException {
+ final ImapResponseMessage result = doProcess(session, tag, command);
+ return result;
+ }
+
+ private ImapResponseMessage doProcess(ImapSession session, String tag,
+ ImapCommand command) throws MailboxException,
+ AuthorizationException, ProtocolException {
// TODO: accurately report the capabilities of the server
- final CapabilityResponse result = new CapabilityResponse(command, tag);
- ImapSessionUtils.addUnsolicitedResponses(result, session, false);;
+ final CapabilityResponse result = new CapabilityResponse(command, tag);
+ ImapSessionUtils.addUnsolicitedResponses(result, session, false);
+ ;
return result;
- }
+ }
}
Modified: james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/CheckProcessor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/CheckProcessor.java?view=diff&rev=553342&r1=553341&r2=553342
==============================================================================
--- james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/CheckProcessor.java (original)
+++ james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/CheckProcessor.java Wed Jul 4 15:10:37 2007
@@ -33,31 +33,38 @@
import org.apache.james.imapserver.processor.base.ImapSessionUtils;
import org.apache.james.imapserver.store.MailboxException;
-
public class CheckProcessor extends AbstractImapRequestProcessor {
-
- public CheckProcessor(final ImapProcessor next) {
+
+ public CheckProcessor(final ImapProcessor next) {
super(next);
}
protected boolean isAcceptable(ImapMessage message) {
return (message instanceof CheckRequest);
}
-
- protected ImapResponseMessage doProcess(ImapRequest message, ImapSession session, String tag, ImapCommand command) throws MailboxException, AuthorizationException, ProtocolException {
+
+ protected ImapResponseMessage doProcess(ImapRequest message,
+ ImapSession session, String tag, ImapCommand command)
+ throws MailboxException, AuthorizationException, ProtocolException {
final CheckRequest request = (CheckRequest) message;
- final ImapResponseMessage result = doProcess(request, session, tag, command);
- return result;
- }
+ final ImapResponseMessage result = doProcess(request, session, tag,
+ command);
+ return result;
+ }
- private ImapResponseMessage doProcess(CheckRequest request, ImapSession session, String tag, ImapCommand command) throws MailboxException, AuthorizationException, ProtocolException {
- final ImapResponseMessage result = doProcess(session, tag, command);
- return result;
- }
-
- private ImapResponseMessage doProcess(ImapSession session, String tag, ImapCommand command) throws MailboxException, AuthorizationException, ProtocolException {
- final CommandCompleteResponse result = new CommandCompleteResponse(command, tag);
+ private ImapResponseMessage doProcess(CheckRequest request,
+ ImapSession session, String tag, ImapCommand command)
+ throws MailboxException, AuthorizationException, ProtocolException {
+ final ImapResponseMessage result = doProcess(session, tag, command);
+ return result;
+ }
+
+ private ImapResponseMessage doProcess(ImapSession session, String tag,
+ ImapCommand command) throws MailboxException,
+ AuthorizationException, ProtocolException {
+ final CommandCompleteResponse result = new CommandCompleteResponse(
+ command, tag);
ImapSessionUtils.addUnsolicitedResponses(result, session, false);
return result;
- }
+ }
}
Modified: james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/CloseProcessor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/CloseProcessor.java?view=diff&rev=553342&r1=553341&r2=553342
==============================================================================
--- james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/CloseProcessor.java (original)
+++ james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/CloseProcessor.java Wed Jul 4 15:10:37 2007
@@ -37,10 +37,9 @@
import org.apache.james.mailboxmanager.impl.GeneralMessageSetImpl;
import org.apache.james.mailboxmanager.mailbox.ImapMailboxSession;
-
public class CloseProcessor extends AbstractImapRequestProcessor {
-
- public CloseProcessor(final ImapProcessor next) {
+
+ public CloseProcessor(final ImapProcessor next) {
super(next);
}
@@ -48,33 +47,42 @@
return (message instanceof CloseRequest);
}
- protected ImapResponseMessage doProcess(ImapRequest message, ImapSession session, String tag, ImapCommand command) throws MailboxException, AuthorizationException, ProtocolException {
+ protected ImapResponseMessage doProcess(ImapRequest message,
+ ImapSession session, String tag, ImapCommand command)
+ throws MailboxException, AuthorizationException, ProtocolException {
final CloseRequest request = (CloseRequest) message;
- final ImapResponseMessage result = doProcess(request, session, tag, command);
- return result;
- }
+ final ImapResponseMessage result = doProcess(request, session, tag,
+ command);
+ return result;
+ }
- private ImapResponseMessage doProcess(CloseRequest request, ImapSession session, String tag, ImapCommand command) throws MailboxException, AuthorizationException, ProtocolException {
- final ImapResponseMessage result = doProcess(session, tag, command);
- return result;
- }
-
- private ImapResponseMessage doProcess(ImapSession session, String tag, ImapCommand command) throws MailboxException, AuthorizationException, ProtocolException {
+ private ImapResponseMessage doProcess(CloseRequest request,
+ ImapSession session, String tag, ImapCommand command)
+ throws MailboxException, AuthorizationException, ProtocolException {
+ final ImapResponseMessage result = doProcess(session, tag, command);
+ return result;
+ }
+
+ private ImapResponseMessage doProcess(ImapSession session, String tag,
+ ImapCommand command) throws MailboxException,
+ AuthorizationException, ProtocolException {
ImapMailboxSession mailbox = ImapSessionUtils.getMailbox(session);
- if ( mailbox.isWriteable() ) {
+ if (mailbox.isWriteable()) {
try {
- mailbox.expunge(GeneralMessageSetImpl.all(),MessageResult.NOTHING);
+ mailbox.expunge(GeneralMessageSetImpl.all(),
+ MessageResult.NOTHING);
} catch (MailboxManagerException e) {
- throw new MailboxException(e);
+ throw new MailboxException(e);
}
}
session.deselect();
final CloseResponse result = new CloseResponse(command, tag);
- //TODO: the following comment was present in the code before refactoring
- //TODO: doesn't seem to match the implementation
- //TODO: check that implementation is correct
- // Don't send unsolicited responses on close.
+ // TODO: the following comment was present in the code before
+ // refactoring
+ // TODO: doesn't seem to match the implementation
+ // TODO: check that implementation is correct
+ // Don't send unsolicited responses on close.
ImapSessionUtils.addUnsolicitedResponses(result, session, false);
return result;
- }
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org