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 fe...@apache.org on 2011/04/14 13:21:16 UTC
svn commit: r1092137 [1/9] - in /james/imap/trunk:
api/src/main/java/org/apache/james/imap/api/
api/src/main/java/org/apache/james/imap/api/display/
api/src/main/java/org/apache/james/imap/api/message/
api/src/main/java/org/apache/james/imap/api/messag...
Author: felixk
Date: Thu Apr 14 11:21:11 2011
New Revision: 1092137
URL: http://svn.apache.org/viewvc?rev=1092137&view=rev
Log:
Formatting (see JAMES-711)
Modified:
james/imap/trunk/api/src/main/java/org/apache/james/imap/api/ImapCommand.java
james/imap/trunk/api/src/main/java/org/apache/james/imap/api/ImapConstants.java
james/imap/trunk/api/src/main/java/org/apache/james/imap/api/ImapMessage.java
james/imap/trunk/api/src/main/java/org/apache/james/imap/api/ImapSessionState.java
james/imap/trunk/api/src/main/java/org/apache/james/imap/api/ImapSessionUtils.java
james/imap/trunk/api/src/main/java/org/apache/james/imap/api/display/HumanReadableText.java
james/imap/trunk/api/src/main/java/org/apache/james/imap/api/display/Locales.java
james/imap/trunk/api/src/main/java/org/apache/james/imap/api/display/Localizer.java
james/imap/trunk/api/src/main/java/org/apache/james/imap/api/message/BodyFetchElement.java
james/imap/trunk/api/src/main/java/org/apache/james/imap/api/message/FetchData.java
james/imap/trunk/api/src/main/java/org/apache/james/imap/api/message/IdRange.java
james/imap/trunk/api/src/main/java/org/apache/james/imap/api/message/request/ImapRequest.java
james/imap/trunk/api/src/main/java/org/apache/james/imap/api/message/request/SearchKey.java
james/imap/trunk/api/src/main/java/org/apache/james/imap/api/message/response/StatusResponse.java
james/imap/trunk/api/src/main/java/org/apache/james/imap/api/message/response/StatusResponseFactory.java
james/imap/trunk/api/src/main/java/org/apache/james/imap/api/process/ImapProcessor.java
james/imap/trunk/api/src/main/java/org/apache/james/imap/api/process/ImapSession.java
james/imap/trunk/api/src/main/java/org/apache/james/imap/api/process/MailboxType.java
james/imap/trunk/api/src/main/java/org/apache/james/imap/api/process/MailboxTyper.java
james/imap/trunk/api/src/main/java/org/apache/james/imap/api/process/SelectedMailbox.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/DecoderUtils.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/DecodingException.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/DelegatingImapCommandParser.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/FetchPartPathDecoder.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/ImapCommandParser.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/ImapDecoder.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/ImapRequestLineReader.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/ImapRequestStreamLineReader.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/MessagingImapCommandParser.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/base/AbstractImapCommandParser.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/base/EolInputStream.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/base/FixedLengthInputStream.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/main/DefaultImapDecoder.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/AbstractUidCommandParser.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/AppendCommandParser.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/AuthenticateCommandParser.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/CapabilityCommandParser.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/CheckCommandParser.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/CloseCommandParser.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/CompressCommandParser.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/CopyCommandParser.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/CreateCommandParser.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/DeleteCommandParser.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/ExamineCommandParser.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/ExpungeCommandParser.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/FetchCommandParser.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/IdleCommandParser.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/ImapParserFactory.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/ListCommandParser.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/LoginCommandParser.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/LogoutCommandParser.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/LsubCommandParser.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/NamespaceCommandParser.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/NoopCommandParser.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/RenameCommandParser.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/SearchCommandParser.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/SelectCommandParser.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/StartTLSCommandParser.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/StatusCommandParser.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/StoreCommandParser.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/SubscribeCommandParser.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/UidCommandParser.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/UnselectCommandParser.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/UnsubscribeCommandParser.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/XListCommandParser.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/CapabilityResponseEncoder.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/ContinuationResponseEncoder.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/EncoderUtils.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/ExistsResponseEncoder.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/ExpungeResponseEncoder.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/FetchResponseEncoder.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/FlagsResponseEncoder.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/ImapEncoder.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/ImapResponseComposer.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/ImapResponseWriter.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/LSubResponseEncoder.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/ListResponseEncoder.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/ListingEncodingUtils.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/MailboxStatusResponseEncoder.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/NamespaceResponseEncoder.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/RecentResponseEncoder.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/SearchResponseEncoder.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/StatusResponseEncoder.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/XListResponseEncoder.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/base/AbstractChainedImapEncoder.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/base/EndImapEncoder.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/base/ImapResponseComposerImpl.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/main/DefaultImapEncoderFactory.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/main/DefaultLocalizer.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/main/AbstractImapRequestHandler.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/main/ChannelImapResponseWriter.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/main/ContextualLog.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/main/ImapRequestStreamHandler.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/main/ResponseEncoder.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/AbstractImapRequest.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/AbstractMailboxSelectionRequest.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/AppendRequest.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/AuthenticateRequest.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/CompressRequest.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/CopyRequest.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/CreateRequest.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/DeleteRequest.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/ExamineRequest.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/ExpungeRequest.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/FetchRequest.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/IdleRequest.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/ListRequest.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/LoginRequest.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/LogoutRequest.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/LsubRequest.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/RenameRequest.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/SearchRequest.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/SelectRequest.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/StartTLSRequest.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/StatusRequest.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/StoreRequest.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/SubscribeRequest.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/SystemMessage.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/UnselectRequest.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/UnsubscribeRequest.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/XListRequest.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/AbstactStatusResponseFactory.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/AbstractListingResponse.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/CapabilityResponse.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/ContinuationResponse.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/FetchResponse.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/ImmutableStatusResponse.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/LSubResponse.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/ListResponse.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/Literal.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/MailboxStatusResponse.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/NamespaceResponse.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/SearchResponse.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/UnpooledStatusResponseFactory.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/XListResponse.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractSubscriptionProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AppendProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AuthenticateProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/CapabilityImplementingProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/CapabilityProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/CheckProcessor.java
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/CompressProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/CopyProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/CreateProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/DefaultProcessorChain.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/DeleteProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/ExamineProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/ExpungeProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/IdleProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/LSubProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/ListProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/LoginProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/LogoutProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/NamespaceProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/NoopProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/RenameProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/SearchProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/SelectProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/StartTLSProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/StatusProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/StoreProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/SubscribeProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/SystemMessageProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/UnselectProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/UnsubscribeProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/XListProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/AbstractChainedProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/ImapResponseMessageProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/ImapStateAwareMailboxListener.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/MailboxEventAnalyser.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxImpl.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/UidToMsnConverter.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/UnknownRequestProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/AddressImpl.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/EnvelopeBuilder.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/EnvelopeImpl.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/FetchResponseBuilder.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/HeaderBodyElement.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/MessageResultUtils.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/MimeDescriptorStructure.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/PartialFetchBodyElement.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/PartialWritableByteChannel.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/main/DefaultImapProcessorFactory.java
Modified: james/imap/trunk/api/src/main/java/org/apache/james/imap/api/ImapCommand.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/api/src/main/java/org/apache/james/imap/api/ImapCommand.java?rev=1092137&r1=1092136&r2=1092137&view=diff
==============================================================================
--- james/imap/trunk/api/src/main/java/org/apache/james/imap/api/ImapCommand.java (original)
+++ james/imap/trunk/api/src/main/java/org/apache/james/imap/api/ImapCommand.java Thu Apr 14 11:21:11 2011
@@ -19,71 +19,66 @@
package org.apache.james.imap.api;
-
/**
* Represents a processor for a particular Imap command. Implementations of this
* interface should encpasulate all command specific processing.
- *
- * @version $Revision: 109034 $
*/
public class ImapCommand {
- public static ImapCommand nonAuthenticatedStateCommand(final String name) {
- return new ImapCommand(false, false, true, name);
- }
-
- public static ImapCommand authenticatedStateCommand(final String name) {
- return new ImapCommand(true, true, false, name);
- }
-
- public static ImapCommand selectedStateCommand(final String name) {
- return new ImapCommand(false, true, false, name);
- }
-
- public static ImapCommand anyStateCommand(final String name) {
- return new ImapCommand(true, true, true, name);
- }
-
- private final boolean validInAuthenticated;
-
- private final boolean validInSelected;
-
- private final boolean validInNonAuthenticated;
-
- private final String name;
-
- private ImapCommand(boolean validInAuthenticated,
- boolean validInSelected, boolean validInNonAuthenticated,
- final String name) {
- super();
- this.validInAuthenticated = validInAuthenticated;
- this.validInSelected = validInSelected;
- this.validInNonAuthenticated = validInNonAuthenticated;
- this.name = name;
- }
-
- public String getName() {
- return name;
- }
-
- public boolean validForState(ImapSessionState state) {
- final boolean result;
- switch (state) {
- case AUTHENTICATED:
- result = validInAuthenticated;
- break;
- case NON_AUTHENTICATED:
- result = validInNonAuthenticated;
- break;
- case SELECTED:
- result = validInSelected;
- break;
- default:
- result = false;
- }
- return result;
- }
-
- public String toString() {
- return name;
- }
+ public static ImapCommand nonAuthenticatedStateCommand(final String name) {
+ return new ImapCommand(false, false, true, name);
+ }
+
+ public static ImapCommand authenticatedStateCommand(final String name) {
+ return new ImapCommand(true, true, false, name);
+ }
+
+ public static ImapCommand selectedStateCommand(final String name) {
+ return new ImapCommand(false, true, false, name);
+ }
+
+ public static ImapCommand anyStateCommand(final String name) {
+ return new ImapCommand(true, true, true, name);
+ }
+
+ private final boolean validInAuthenticated;
+
+ private final boolean validInSelected;
+
+ private final boolean validInNonAuthenticated;
+
+ private final String name;
+
+ private ImapCommand(boolean validInAuthenticated, boolean validInSelected, boolean validInNonAuthenticated, final String name) {
+ super();
+ this.validInAuthenticated = validInAuthenticated;
+ this.validInSelected = validInSelected;
+ this.validInNonAuthenticated = validInNonAuthenticated;
+ this.name = name;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public boolean validForState(ImapSessionState state) {
+ final boolean result;
+ switch (state) {
+ case AUTHENTICATED:
+ result = validInAuthenticated;
+ break;
+ case NON_AUTHENTICATED:
+ result = validInNonAuthenticated;
+ break;
+ case SELECTED:
+ result = validInSelected;
+ break;
+ default:
+ result = false;
+ }
+ return result;
+ }
+
+ public String toString() {
+ return name;
+ }
}
Modified: james/imap/trunk/api/src/main/java/org/apache/james/imap/api/ImapConstants.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/api/src/main/java/org/apache/james/imap/api/ImapConstants.java?rev=1092137&r1=1092136&r2=1092137&view=diff
==============================================================================
--- james/imap/trunk/api/src/main/java/org/apache/james/imap/api/ImapConstants.java (original)
+++ james/imap/trunk/api/src/main/java/org/apache/james/imap/api/ImapConstants.java Thu Apr 14 11:21:11 2011
@@ -32,7 +32,7 @@ public interface ImapConstants {
public static final String UNTAGGED = "*";
public static final String CONTINUATION = "+";
-
+
public static final String SP = " ";
public static final String NIL = "NIL";
@@ -61,16 +61,12 @@ public interface ImapConstants {
public static final byte BYTE_OPEN_SQUARE_BRACKET = 0x5B;
-
public static final byte BYTE_CLOSE_SQUARE_BRACKET = 0x5D;
-
public static final byte BYTE_OPEN_BRACE = 0x7B;
-
public static final byte BYTE_CLOSE_BRACE = 0x7D;
-
public static final char OPENING_PARENTHESIS = '(';
public static final char CLOSING_PARENTHESIS = ')';
@@ -86,15 +82,15 @@ public interface ImapConstants {
public static final String VERSION = "IMAP4rev1";
public static final String SUPPORTS_LITERAL_PLUS = "LITERAL+";
-
+
public static final String SUPPORTS_RFC3348 = "CHILDREN";
-
+
public static final String SUPPORTS_NAMESPACES = "NAMESPACE";
public static final String SUPPORTS_STARTTLS = "STARTTLS";
public static final String SUPPORTS_IDLE = "IDLE";
-
+
public static final String SUPPORTS_XLIST = "XLIST";
public static final String INBOX_NAME = "INBOX";
@@ -170,7 +166,7 @@ public interface ImapConstants {
public static final String NOOP_COMMAND_NAME = "NOOP";
public static final String IDLE_COMMAND_NAME = "IDLE";
-
+
public static final String LSUB_COMMAND_NAME = "LSUB";
public static final String LOGOUT_COMMAND_NAME = "LOGOUT";
@@ -178,7 +174,7 @@ public interface ImapConstants {
public static final String LOGIN_COMMAND_NAME = "LOGIN";
public static final String LIST_COMMAND_NAME = "LIST";
-
+
public static final String XLIST_COMMAND_NAME = "XLIST";
public static final String FETCH_COMMAND_NAME = "FETCH";
@@ -204,7 +200,7 @@ public interface ImapConstants {
public static final String APPEND_COMMAND_NAME = "APPEND";
public static final String LIST_RESPONSE_NAME = "LIST";
-
+
public static final String XLIST_RESPONSE_NAME = "XLIST";
public static final String LSUB_RESPONSE_NAME = "LSUB";
@@ -234,15 +230,15 @@ public interface ImapConstants {
public static final String FETCH_BODY_STRUCTURE = "BODYSTRUCTURE";
public static final String FETCH_BODY = "BODY";
-
+
public static final String STARTTLS = "STARTTLS";
-
+
public static final String LINE_END = "\r\n";
public static final long MAX_NZ_NUMBER = 4294967295L;
public static final long MIN_NZ_NUMBER = 1L;
public static final String COMPRESS_COMMAND_NAME = "COMPRESS";
-
+
public static final int DEFAULT_BATCH_SIZE = 100;
}
Modified: james/imap/trunk/api/src/main/java/org/apache/james/imap/api/ImapMessage.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/api/src/main/java/org/apache/james/imap/api/ImapMessage.java?rev=1092137&r1=1092136&r2=1092137&view=diff
==============================================================================
--- james/imap/trunk/api/src/main/java/org/apache/james/imap/api/ImapMessage.java (original)
+++ james/imap/trunk/api/src/main/java/org/apache/james/imap/api/ImapMessage.java Thu Apr 14 11:21:11 2011
@@ -28,5 +28,5 @@ package org.apache.james.imap.api;
* </p>
*/
public interface ImapMessage {
-
+
}
Modified: james/imap/trunk/api/src/main/java/org/apache/james/imap/api/ImapSessionState.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/api/src/main/java/org/apache/james/imap/api/ImapSessionState.java?rev=1092137&r1=1092136&r2=1092137&view=diff
==============================================================================
--- james/imap/trunk/api/src/main/java/org/apache/james/imap/api/ImapSessionState.java (original)
+++ james/imap/trunk/api/src/main/java/org/apache/james/imap/api/ImapSessionState.java Thu Apr 14 11:21:11 2011
@@ -45,7 +45,7 @@ public enum ImapSessionState {
* <code>3.4 Logout State</code>
*/
LOGOUT("Logged Out State");
-
+
/** To aid debugging */
private final String name;
Modified: james/imap/trunk/api/src/main/java/org/apache/james/imap/api/ImapSessionUtils.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/api/src/main/java/org/apache/james/imap/api/ImapSessionUtils.java?rev=1092137&r1=1092136&r2=1092137&view=diff
==============================================================================
--- james/imap/trunk/api/src/main/java/org/apache/james/imap/api/ImapSessionUtils.java (original)
+++ james/imap/trunk/api/src/main/java/org/apache/james/imap/api/ImapSessionUtils.java Thu Apr 14 11:21:11 2011
@@ -29,8 +29,7 @@ public class ImapSessionUtils {
public static final String MAILBOX_SESSION_ATTRIBUTE_SESSION_KEY = "org.apache.james.api.imap.MAILBOX_SESSION_ATTRIBUTE_SESSION_KEY";
public static MailboxSession getMailboxSession(final ImapSession session) {
- final MailboxSession result = (MailboxSession) session
- .getAttribute(ImapSessionUtils.MAILBOX_SESSION_ATTRIBUTE_SESSION_KEY);
+ final MailboxSession result = (MailboxSession) session.getAttribute(ImapSessionUtils.MAILBOX_SESSION_ATTRIBUTE_SESSION_KEY);
return result;
}
Modified: james/imap/trunk/api/src/main/java/org/apache/james/imap/api/display/HumanReadableText.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/api/src/main/java/org/apache/james/imap/api/display/HumanReadableText.java?rev=1092137&r1=1092136&r2=1092137&view=diff
==============================================================================
--- james/imap/trunk/api/src/main/java/org/apache/james/imap/api/display/HumanReadableText.java (original)
+++ james/imap/trunk/api/src/main/java/org/apache/james/imap/api/display/HumanReadableText.java Thu Apr 14 11:21:11 2011
@@ -30,22 +30,18 @@ import org.apache.james.imap.api.ImapCon
*/
public class HumanReadableText {
- public static final HumanReadableText STARTTLS = new HumanReadableText(
- "org.apache.james.imap.STARTTLS", "Begin TLS negotiation now.");
-
- public static final HumanReadableText SELECT = new HumanReadableText(
- "org.apache.james.imap.SELECT", "completed.");
+ public static final HumanReadableText STARTTLS = new HumanReadableText("org.apache.james.imap.STARTTLS", "Begin TLS negotiation now.");
+
+ public static final HumanReadableText SELECT = new HumanReadableText("org.apache.james.imap.SELECT", "completed.");
public static final HumanReadableText unseen(long numberUnseen) {
- return new HumanReadableText("org.apache.james.imap.UNSEEN","Message "+ numberUnseen + " is first unseen");
+ return new HumanReadableText("org.apache.james.imap.UNSEEN", "Message " + numberUnseen + " is first unseen");
}
-
- public static final HumanReadableText UIDNEXT = new HumanReadableText(
- "org.apache.james.imap.UIDNEXT", "Predicted next UID");
-
- public static final HumanReadableText UID_VALIDITY = new HumanReadableText(
- "org.apache.james.imap.UID_VALIDITY", "UIDs valid");
-
+
+ public static final HumanReadableText UIDNEXT = new HumanReadableText("org.apache.james.imap.UIDNEXT", "Predicted next UID");
+
+ public static final HumanReadableText UID_VALIDITY = new HumanReadableText("org.apache.james.imap.UID_VALIDITY", "UIDs valid");
+
public static final HumanReadableText permanentFlags(Flags flags) {
String text;
if (flags.getSystemFlags() != null && flags.getSystemFlags().length > 0) {
@@ -55,187 +51,104 @@ public class HumanReadableText {
}
return new HumanReadableText("org.apache.james.imap.PERMANENT_FLAGS", text);
}
-
- public static final HumanReadableText GENERIC_LSUB_FAILURE = new HumanReadableText(
- "org.apache.james.imap.GENERIC_SUBSCRIPTION_FAILURE",
- "Cannot list subscriptions.");
-
- public static final HumanReadableText GENERIC_UNSUBSCRIPTION_FAILURE = new HumanReadableText(
- "org.apache.james.imap.GENERIC_SUBSCRIPTION_FAILURE",
- "Cannot unsubscribe.");
-
- public static final HumanReadableText GENERIC_SUBSCRIPTION_FAILURE = new HumanReadableText(
- "org.apache.james.imap.GENERIC_SUBSCRIPTION_FAILURE",
- "Cannot subscribe.");
-
- public static final HumanReadableText INVALID_MESSAGESET = new HumanReadableText(
- "org.apache.james.imap.INVALID_MESSAGESET",
- "failed. Invalid messageset.");
-
- public static final HumanReadableText INVALID_COMMAND = new HumanReadableText(
- "org.apache.james.imap.INVALID_COMMAND",
- "failed. Command not valid in this state.");
-
- public static final HumanReadableText ILLEGAL_TAG = new HumanReadableText(
- "org.apache.james.imap.ILLEGAL_TAG", "Illegal tag.");
-
- public static final HumanReadableText FAILURE_EXISTS_COUNT = new HumanReadableText(
- "org.apache.james.imap.FAILURE_EXISTS_COUNT", "Cannot count number of existing records.");
-
- public static final HumanReadableText FAILURE_TO_LOAD_FLAGS= new HumanReadableText(
- "org.apache.james.imap.FAILURE_TO_LOAD_FLAGS", "Failed to retrieve flags data.");
-
- public static final HumanReadableText ILLEGAL_ARGUMENTS = new HumanReadableText(
- "org.apache.james.imap.ILLEGAL_ARGUMENTS",
- "failed. Illegal arguments.");
-
- public static final HumanReadableText FAILURE_MAIL_PARSE = new HumanReadableText(
- "org.apache.james.imap.FAILURE_MAIL_PARSE",
- "failed. Mail cannot be parsed.");
-
- public static final HumanReadableText FAILURE_NO_SUCH_MAILBOX = new HumanReadableText(
- "org.apache.james.imap.FAILURE_NO_SUCH_MAILBOX",
- "failed. No such mailbox.");
-
- public static final HumanReadableText START_TRANSACTION_FAILED = new HumanReadableText(
- "org.apache.james.imap.START_TRANSACTION_FAILED",
- "failed. Cannot start transaction.");
-
- public static final HumanReadableText COMMIT_TRANSACTION_FAILED = new HumanReadableText(
- "org.apache.james.imap.COMMIT_TRANSACTION_FAILED",
- "failed. Transaction commit failed.");
-
- public static final HumanReadableText DELETED_FAILED = new HumanReadableText(
- "org.apache.james.imap.DELETED_FAILED",
- "failed. Deletion failed.");
-
- public static final HumanReadableText SEARCH_FAILED = new HumanReadableText(
- "org.apache.james.imap.SEARCH_FAILED",
- "failed. Search failed.");
-
- public static final HumanReadableText COUNT_FAILED = new HumanReadableText(
- "org.apache.james.imap.COUNT_FAILED",
- "failed. Count failed.");
-
- public static final HumanReadableText SAVE_FAILED = new HumanReadableText(
- "org.apache.james.imap.SAVE_FAILED",
- "failed. Save failed.");
-
- public static final HumanReadableText UNSUPPORTED_SEARCH = new HumanReadableText(
- "org.apache.james.imap.UNSUPPORTED_SEARCH",
- "failed. Unsupported search.");
-
- public static final HumanReadableText LOCK_FAILED = new HumanReadableText(
- "org.apache.james.imap.LOCK_FAILED",
- "failed. Failed to lock mailbox.");
-
- public static final HumanReadableText UNSUPPORTED = new HumanReadableText(
- "org.apache.james.imap.UNSUPPORTED",
- "failed. Unsupported operation.");
-
- public static final HumanReadableText DUPLICATE_MAILBOXES = new HumanReadableText(
- "org.apache.james.imap.DUPLICATE_MAILBOXES",
- "failed. Expected unique mailbox but duplicate exists.");
-
- public static final HumanReadableText MAILBOX_EXISTS = new HumanReadableText(
- "org.apache.james.imap.MAILBOX_EXISTS",
- "failed. Mailbox already exists.");
-
- public static final HumanReadableText MAILBOX_NOT_FOUND = new HumanReadableText(
- "org.apache.james.imap.MAILBOX_NOT_FOUND",
- "failed. Mailbox not found.");
-
- public static final HumanReadableText MAILBOX_DELETED = new HumanReadableText(
- "org.apache.james.imap.MAILBOX_DELETED",
- "failed. Mailbox has been deleted.");
-
- public static final HumanReadableText COMSUME_UID_FAILED = new HumanReadableText(
- "org.apache.james.imap.COMSUME_UID_FAILED",
- "failed. Failed to acquire UID.");
-
- public static final HumanReadableText GENERIC_FAILURE_DURING_PROCESSING = new HumanReadableText(
- "org.apache.james.imap.GENERIC_FAILURE_DURING_PROCESSING",
- "processing failed.");
-
- public static final HumanReadableText FAILURE_MAILBOX_EXISTS = new HumanReadableText(
- "org.apache.james.imap.FAILURE_NO_SUCH_MAILBOX",
- "failed. Mailbox already exists.");
-
- public static final HumanReadableText INIT_FAILED = new HumanReadableText(
- "org.apache.james.imap.INIT_FAILED",
- "failed. Cannot initialise.");
-
- public static final HumanReadableText SOCKET_IO_FAILURE = new HumanReadableText(
- "org.apache.james.imap.SOCKET_IO_FAILURE",
- "failed. IO failure.");
-
- public static final HumanReadableText BAD_IO_ENCODING = new HumanReadableText(
- "org.apache.james.imap.BAD_IO_ENCODING",
- "failed. Illegal encoding.");
- public static final HumanReadableText COMPLETED = new HumanReadableText(
- "org.apache.james.imap.COMPLETED", "completed.");
-
- public static final HumanReadableText INVALID_LOGIN = new HumanReadableText(
- "org.apache.james.imap.INVALID_LOGIN",
- "failed. Invalid login/password.");
-
- public static final HumanReadableText UNSUPPORTED_SEARCH_CRITERIA = new HumanReadableText(
- "org.apache.james.imap.UNSUPPORTED_CRITERIA",
- "failed. One or more search criteria is unsupported.");
-
- public static final HumanReadableText UNSUPPORTED_AUTHENTICATION_MECHANISM = new HumanReadableText(
- "org.apache.james.imap.UNSUPPORTED_AUTHENTICATION_MECHANISM",
- "failed. Authentication mechanism is unsupported.");
-
- public static final HumanReadableText UNKNOWN_COMMAND = new HumanReadableText(
- "org.apache.james.imap.UNKNOWN_COMMAND", "failed. Unknown command.");
-
- public static final HumanReadableText BAD_CHARSET = new HumanReadableText(
- "org.apache.james.imap.BAD_CHARSET",
- "failed. Charset is unsupported.");
-
- public static final HumanReadableText MAILBOX_IS_READ_ONLY = new HumanReadableText(
- "org.apache.james.imap.MAILBOX_IS_READ_ONLY",
- "failed. Mailbox is read only.");
-
- public static final HumanReadableText BYE = new HumanReadableText(
- "org.apache.james.imap.BYE", ImapConstants.VERSION
- + " Server logging out");
-
- public static final HumanReadableText TOO_MANY_FAILURES = new HumanReadableText(
- "org.apache.james.imap.TOO_MANY_FAILURES",
- "Login failed too many times.");
-
- public static final HumanReadableText BYE_UNKNOWN_COMMAND = new HumanReadableText(
- "org.apache.james.imap.BYE_UNKNOWN_COMMAND", "Unknown command.");
-
- public static final HumanReadableText IDLING = new HumanReadableText(
- "org.apache.james.imap.IDLING", "Idling");
- public static final HumanReadableText HEARTBEAT = new HumanReadableText(
- "org.apache.james.imap.HEARTBEAT", "Still here");
-
- public static final HumanReadableText DEFLATE_ACTIVE = new HumanReadableText(
- "org.apache.james.imap.DEFLATE", "DEFLATE active");
-
- public static final HumanReadableText COMPRESS_ALREADY_ACTIVE = new HumanReadableText(
- "org.apache.james.imap.DEFLATE", "already active");
-
-
-
- public static final HumanReadableText UNSELECT = new HumanReadableText(
- "org.apache.james.imap.UNSELECT", "No Mailbox selected.");
+ public static final HumanReadableText GENERIC_LSUB_FAILURE = new HumanReadableText("org.apache.james.imap.GENERIC_SUBSCRIPTION_FAILURE", "Cannot list subscriptions.");
+
+ public static final HumanReadableText GENERIC_UNSUBSCRIPTION_FAILURE = new HumanReadableText("org.apache.james.imap.GENERIC_SUBSCRIPTION_FAILURE", "Cannot unsubscribe.");
+
+ public static final HumanReadableText GENERIC_SUBSCRIPTION_FAILURE = new HumanReadableText("org.apache.james.imap.GENERIC_SUBSCRIPTION_FAILURE", "Cannot subscribe.");
+
+ public static final HumanReadableText INVALID_MESSAGESET = new HumanReadableText("org.apache.james.imap.INVALID_MESSAGESET", "failed. Invalid messageset.");
+
+ public static final HumanReadableText INVALID_COMMAND = new HumanReadableText("org.apache.james.imap.INVALID_COMMAND", "failed. Command not valid in this state.");
+
+ public static final HumanReadableText ILLEGAL_TAG = new HumanReadableText("org.apache.james.imap.ILLEGAL_TAG", "Illegal tag.");
+
+ public static final HumanReadableText FAILURE_EXISTS_COUNT = new HumanReadableText("org.apache.james.imap.FAILURE_EXISTS_COUNT", "Cannot count number of existing records.");
+
+ public static final HumanReadableText FAILURE_TO_LOAD_FLAGS = new HumanReadableText("org.apache.james.imap.FAILURE_TO_LOAD_FLAGS", "Failed to retrieve flags data.");
+
+ public static final HumanReadableText ILLEGAL_ARGUMENTS = new HumanReadableText("org.apache.james.imap.ILLEGAL_ARGUMENTS", "failed. Illegal arguments.");
+
+ public static final HumanReadableText FAILURE_MAIL_PARSE = new HumanReadableText("org.apache.james.imap.FAILURE_MAIL_PARSE", "failed. Mail cannot be parsed.");
+
+ public static final HumanReadableText FAILURE_NO_SUCH_MAILBOX = new HumanReadableText("org.apache.james.imap.FAILURE_NO_SUCH_MAILBOX", "failed. No such mailbox.");
+
+ public static final HumanReadableText START_TRANSACTION_FAILED = new HumanReadableText("org.apache.james.imap.START_TRANSACTION_FAILED", "failed. Cannot start transaction.");
+
+ public static final HumanReadableText COMMIT_TRANSACTION_FAILED = new HumanReadableText("org.apache.james.imap.COMMIT_TRANSACTION_FAILED", "failed. Transaction commit failed.");
+
+ public static final HumanReadableText DELETED_FAILED = new HumanReadableText("org.apache.james.imap.DELETED_FAILED", "failed. Deletion failed.");
+
+ public static final HumanReadableText SEARCH_FAILED = new HumanReadableText("org.apache.james.imap.SEARCH_FAILED", "failed. Search failed.");
+
+ public static final HumanReadableText COUNT_FAILED = new HumanReadableText("org.apache.james.imap.COUNT_FAILED", "failed. Count failed.");
+
+ public static final HumanReadableText SAVE_FAILED = new HumanReadableText("org.apache.james.imap.SAVE_FAILED", "failed. Save failed.");
+
+ public static final HumanReadableText UNSUPPORTED_SEARCH = new HumanReadableText("org.apache.james.imap.UNSUPPORTED_SEARCH", "failed. Unsupported search.");
+
+ public static final HumanReadableText LOCK_FAILED = new HumanReadableText("org.apache.james.imap.LOCK_FAILED", "failed. Failed to lock mailbox.");
+
+ public static final HumanReadableText UNSUPPORTED = new HumanReadableText("org.apache.james.imap.UNSUPPORTED", "failed. Unsupported operation.");
+
+ public static final HumanReadableText DUPLICATE_MAILBOXES = new HumanReadableText("org.apache.james.imap.DUPLICATE_MAILBOXES", "failed. Expected unique mailbox but duplicate exists.");
+
+ public static final HumanReadableText MAILBOX_EXISTS = new HumanReadableText("org.apache.james.imap.MAILBOX_EXISTS", "failed. Mailbox already exists.");
+
+ public static final HumanReadableText MAILBOX_NOT_FOUND = new HumanReadableText("org.apache.james.imap.MAILBOX_NOT_FOUND", "failed. Mailbox not found.");
+
+ public static final HumanReadableText MAILBOX_DELETED = new HumanReadableText("org.apache.james.imap.MAILBOX_DELETED", "failed. Mailbox has been deleted.");
+
+ public static final HumanReadableText COMSUME_UID_FAILED = new HumanReadableText("org.apache.james.imap.COMSUME_UID_FAILED", "failed. Failed to acquire UID.");
+
+ public static final HumanReadableText GENERIC_FAILURE_DURING_PROCESSING = new HumanReadableText("org.apache.james.imap.GENERIC_FAILURE_DURING_PROCESSING", "processing failed.");
+
+ public static final HumanReadableText FAILURE_MAILBOX_EXISTS = new HumanReadableText("org.apache.james.imap.FAILURE_NO_SUCH_MAILBOX", "failed. Mailbox already exists.");
+
+ public static final HumanReadableText INIT_FAILED = new HumanReadableText("org.apache.james.imap.INIT_FAILED", "failed. Cannot initialise.");
+
+ public static final HumanReadableText SOCKET_IO_FAILURE = new HumanReadableText("org.apache.james.imap.SOCKET_IO_FAILURE", "failed. IO failure.");
+
+ public static final HumanReadableText BAD_IO_ENCODING = new HumanReadableText("org.apache.james.imap.BAD_IO_ENCODING", "failed. Illegal encoding.");
+ public static final HumanReadableText COMPLETED = new HumanReadableText("org.apache.james.imap.COMPLETED", "completed.");
+
+ public static final HumanReadableText INVALID_LOGIN = new HumanReadableText("org.apache.james.imap.INVALID_LOGIN", "failed. Invalid login/password.");
+
+ public static final HumanReadableText UNSUPPORTED_SEARCH_CRITERIA = new HumanReadableText("org.apache.james.imap.UNSUPPORTED_CRITERIA", "failed. One or more search criteria is unsupported.");
+
+ public static final HumanReadableText UNSUPPORTED_AUTHENTICATION_MECHANISM = new HumanReadableText("org.apache.james.imap.UNSUPPORTED_AUTHENTICATION_MECHANISM", "failed. Authentication mechanism is unsupported.");
+
+ public static final HumanReadableText UNKNOWN_COMMAND = new HumanReadableText("org.apache.james.imap.UNKNOWN_COMMAND", "failed. Unknown command.");
+
+ public static final HumanReadableText BAD_CHARSET = new HumanReadableText("org.apache.james.imap.BAD_CHARSET", "failed. Charset is unsupported.");
+
+ public static final HumanReadableText MAILBOX_IS_READ_ONLY = new HumanReadableText("org.apache.james.imap.MAILBOX_IS_READ_ONLY", "failed. Mailbox is read only.");
+
+ public static final HumanReadableText BYE = new HumanReadableText("org.apache.james.imap.BYE", ImapConstants.VERSION + " Server logging out");
+
+ public static final HumanReadableText TOO_MANY_FAILURES = new HumanReadableText("org.apache.james.imap.TOO_MANY_FAILURES", "Login failed too many times.");
+
+ public static final HumanReadableText BYE_UNKNOWN_COMMAND = new HumanReadableText("org.apache.james.imap.BYE_UNKNOWN_COMMAND", "Unknown command.");
+
+ public static final HumanReadableText IDLING = new HumanReadableText("org.apache.james.imap.IDLING", "Idling");
+ public static final HumanReadableText HEARTBEAT = new HumanReadableText("org.apache.james.imap.HEARTBEAT", "Still here");
+
+ public static final HumanReadableText DEFLATE_ACTIVE = new HumanReadableText("org.apache.james.imap.DEFLATE", "DEFLATE active");
+
+ public static final HumanReadableText COMPRESS_ALREADY_ACTIVE = new HumanReadableText("org.apache.james.imap.DEFLATE", "already active");
+
+ public static final HumanReadableText UNSELECT = new HumanReadableText("org.apache.james.imap.UNSELECT", "No Mailbox selected.");
private final String defaultValue;
private final String key;
-
- private final Object[] parameters;
+ private final Object[] parameters;
public HumanReadableText(final String key, final String defaultValue) {
- this(key, defaultValue, (Object[])null);
+ this(key, defaultValue, (Object[]) null);
}
-
+
public HumanReadableText(final String key, final String defaultValue, final Object... parameters) {
super();
this.defaultValue = defaultValue;
@@ -264,12 +177,13 @@ public class HumanReadableText {
/**
* Gets parameters that may be substituted into the text.
- * @return substitution paramters, possibly null
+ *
+ * @return substitution parameters, possibly null
*/
public Object[] getParameters() {
return parameters;
}
-
+
@Override
public int hashCode() {
final int PRIME = 31;
Modified: james/imap/trunk/api/src/main/java/org/apache/james/imap/api/display/Locales.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/api/src/main/java/org/apache/james/imap/api/display/Locales.java?rev=1092137&r1=1092136&r2=1092137&view=diff
==============================================================================
--- james/imap/trunk/api/src/main/java/org/apache/james/imap/api/display/Locales.java (original)
+++ james/imap/trunk/api/src/main/java/org/apache/james/imap/api/display/Locales.java Thu Apr 14 11:21:11 2011
@@ -23,19 +23,23 @@ import java.util.List;
import java.util.Locale;
/**
- * <p>Immutable bean describing localisation preferences.</p>
- * <p>Two separate sources of information about localisation are available:</p>
+ * <p>
+ * Immutable bean describing localisation preferences.
+ * </p>
+ * <p>
+ * Two separate sources of information about localisation are available:
+ * </p>
* <ul>
* <li>A client may ask for a locale (see {@link #getClientPreference()})</li>
- * <li>Localisation preferences may be available from user data(see @link {@link #getUserPreferences()})</li>
+ * <li>Localisation preferences may be available from user data(see @link
+ * {@link #getUserPreferences()})</li>
* </ul>
*/
public class Locales {
-
private final List<Locale> userPreferences;
private final Locale clientPreference;
-
+
public Locales(final List<Locale> userPreferences, final Locale clientPreference) {
super();
this.userPreferences = userPreferences;
@@ -44,8 +48,9 @@ public class Locales {
/**
* Gets the locale preferred by the client.
- * @return when set, the locale currently preferred by the client
- * or null when no preference has been set by the client
+ *
+ * @return when set, the locale currently preferred by the client or null
+ * when no preference has been set by the client
* @see #getUserPreferences()
*/
public Locale getClientPreference() {
@@ -54,6 +59,7 @@ public class Locales {
/**
* Gets the list of locales preferred by the user.
+ *
* @return preferred first not null, possibly empty
* @see #getUserPreferences()
*/
Modified: james/imap/trunk/api/src/main/java/org/apache/james/imap/api/display/Localizer.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/api/src/main/java/org/apache/james/imap/api/display/Localizer.java?rev=1092137&r1=1092136&r2=1092137&view=diff
==============================================================================
--- james/imap/trunk/api/src/main/java/org/apache/james/imap/api/display/Localizer.java (original)
+++ james/imap/trunk/api/src/main/java/org/apache/james/imap/api/display/Localizer.java Thu Apr 14 11:21:11 2011
@@ -25,27 +25,33 @@ package org.apache.james.imap.api.displa
public interface Localizer {
/**
- * <p>Localizes the given text for display.</p>
* <p>
- * It is recommended that {@link HumanReadableText#getKey()} is
- * used as key. {@link HumanReadableText#getParameters()} may (optionally)
- * be used for substitution into a parameterised text.
+ * Localizes the given text for display.
* </p>
* <p>
- * Implementators are free to use any appropriate algorithm
- * to determine which locale should be used. A client application
- * may request a particular Locale based on it's local settings.
- * This preference SHOULD be made available (by the caller)
- * through {@link Locales#getClientPreference()}.
- * In addition, user data may contain localization preferences. These
- * SHOULD be made available (by the caller) through {@link Locales#getUserPreferences()}.
- * </p><p>
- * {@link HumanReadableText#getDefaultValue()} provides a simple, standard english phrase.
- * It is recommended that implementors use this value when a suitable localisation
- * cannot be discovered.
+ * It is recommended that {@link HumanReadableText#getKey()} is used as key.
+ * {@link HumanReadableText#getParameters()} may (optionally) be used for
+ * substitution into a parameterised text.
* </p>
- * @param text describes the text requiring localisation, not null
- * @param locales describes preferences, not null
+ * <p>
+ * Implementators are free to use any appropriate algorithm to determine
+ * which locale should be used. A client application may request a
+ * particular Locale based on it's local settings. This preference SHOULD be
+ * made available (by the caller) through
+ * {@link Locales#getClientPreference()}. In addition, user data may contain
+ * localization preferences. These SHOULD be made available (by the caller)
+ * through {@link Locales#getUserPreferences()}.
+ * </p>
+ * <p>
+ * {@link HumanReadableText#getDefaultValue()} provides a simple, standard
+ * english phrase. It is recommended that implementors use this value when a
+ * suitable localisation cannot be discovered.
+ * </p>
+ *
+ * @param text
+ * describes the text requiring localisation, not null
+ * @param locales
+ * describes preferences, not null
* @return localized message not null
*/
public String localize(HumanReadableText text, Locales locales);
Modified: james/imap/trunk/api/src/main/java/org/apache/james/imap/api/message/BodyFetchElement.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/api/src/main/java/org/apache/james/imap/api/message/BodyFetchElement.java?rev=1092137&r1=1092136&r2=1092137&view=diff
==============================================================================
--- james/imap/trunk/api/src/main/java/org/apache/james/imap/api/message/BodyFetchElement.java (original)
+++ james/imap/trunk/api/src/main/java/org/apache/james/imap/api/message/BodyFetchElement.java Thu Apr 14 11:21:11 2011
@@ -37,14 +37,11 @@ public class BodyFetchElement {
public static final int CONTENT = 5;
- private static final BodyFetchElement rfc822 = new BodyFetchElement(
- ImapConstants.FETCH_RFC822, CONTENT, null, null, null, null);
+ private static final BodyFetchElement rfc822 = new BodyFetchElement(ImapConstants.FETCH_RFC822, CONTENT, null, null, null, null);
- private static final BodyFetchElement rfc822Header = new BodyFetchElement(
- ImapConstants.FETCH_RFC822_HEADER, HEADER, null, null, null, null);
+ private static final BodyFetchElement rfc822Header = new BodyFetchElement(ImapConstants.FETCH_RFC822_HEADER, HEADER, null, null, null, null);
- private static final BodyFetchElement rfc822Text = new BodyFetchElement(
- ImapConstants.FETCH_RFC822_TEXT, TEXT, null, null, null, null);
+ private static final BodyFetchElement rfc822Text = new BodyFetchElement(ImapConstants.FETCH_RFC822_TEXT, TEXT, null, null, null, null);
public static final BodyFetchElement createRFC822() {
return rfc822;
@@ -70,9 +67,7 @@ public class BodyFetchElement {
private final Collection<String> fieldNames;
- public BodyFetchElement(final String name, final int sectionType,
- final int[] path, final Collection<String> fieldNames, Long firstOctet,
- Long numberOfOctets) {
+ public BodyFetchElement(final String name, final int sectionType, final int[] path, final Collection<String> fieldNames, Long firstOctet, Long numberOfOctets) {
this.name = name;
this.sectionType = sectionType;
this.fieldNames = fieldNames;
@@ -135,13 +130,10 @@ public class BodyFetchElement {
public int hashCode() {
final int PRIME = 31;
int result = 1;
- result = PRIME * result
- + ((fieldNames == null) ? 0 : fieldNames.hashCode());
- result = PRIME * result
- + ((firstOctet == null) ? 0 : firstOctet.hashCode());
+ result = PRIME * result + ((fieldNames == null) ? 0 : fieldNames.hashCode());
+ result = PRIME * result + ((firstOctet == null) ? 0 : firstOctet.hashCode());
result = PRIME * result + ((name == null) ? 0 : name.hashCode());
- result = PRIME * result
- + ((numberOfOctets == null) ? 0 : numberOfOctets.hashCode());
+ result = PRIME * result + ((numberOfOctets == null) ? 0 : numberOfOctets.hashCode());
result = PRIME * result + ((path == null) ? 0 : path.length);
result = PRIME * result + sectionType;
return result;
Modified: james/imap/trunk/api/src/main/java/org/apache/james/imap/api/message/FetchData.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/api/src/main/java/org/apache/james/imap/api/message/FetchData.java?rev=1092137&r1=1092136&r2=1092137&view=diff
==============================================================================
--- james/imap/trunk/api/src/main/java/org/apache/james/imap/api/message/FetchData.java (original)
+++ james/imap/trunk/api/src/main/java/org/apache/james/imap/api/message/FetchData.java Thu Apr 14 11:21:11 2011
@@ -116,8 +116,7 @@ public class FetchData {
final int PRIME = 31;
int result = 1;
result = PRIME * result + (body ? 1231 : 1237);
- result = PRIME * result
- + ((bodyElements == null) ? 0 : bodyElements.hashCode());
+ result = PRIME * result + ((bodyElements == null) ? 0 : bodyElements.hashCode());
result = PRIME * result + (bodyStructure ? 1231 : 1237);
result = PRIME * result + (envelope ? 1231 : 1237);
result = PRIME * result + (flags ? 1231 : 1237);
Modified: james/imap/trunk/api/src/main/java/org/apache/james/imap/api/message/IdRange.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/api/src/main/java/org/apache/james/imap/api/message/IdRange.java?rev=1092137&r1=1092136&r2=1092137&view=diff
==============================================================================
--- james/imap/trunk/api/src/main/java/org/apache/james/imap/api/message/IdRange.java (original)
+++ james/imap/trunk/api/src/main/java/org/apache/james/imap/api/message/IdRange.java Thu Apr 14 11:21:11 2011
@@ -39,7 +39,8 @@ public class IdRange {
}
public IdRange(long lowVal, long highVal) {
- if (lowVal > highVal) throw new IllegalArgumentException("LowVal must be <= HighVal");
+ if (lowVal > highVal)
+ throw new IllegalArgumentException("LowVal must be <= HighVal");
_lowVal = lowVal;
_highVal = highVal;
}
@@ -51,14 +52,16 @@ public class IdRange {
public long getHighVal() {
return _highVal;
}
-
+
public void setLowVal(long lowVal) {
- if (lowVal > _highVal) throw new IllegalArgumentException("LowVal must be <= HighVal");
+ if (lowVal > _highVal)
+ throw new IllegalArgumentException("LowVal must be <= HighVal");
_lowVal = lowVal;
}
-
+
public void setHighVal(long highVal) {
- if (_lowVal > highVal) throw new IllegalArgumentException("HighVal must be >= LowVal");
+ if (_lowVal > highVal)
+ throw new IllegalArgumentException("HighVal must be >= LowVal");
_highVal = highVal;
}
@@ -107,22 +110,21 @@ public class IdRange {
* @return a <code>String</code> representation of this object.
*/
public String toString() {
- final String retValue = "IdRange ( " + this._lowVal + "->"
- + this._highVal + " )";
+ final String retValue = "IdRange ( " + this._lowVal + "->" + this._highVal + " )";
return retValue;
}
-
+
public String getFormattedString() {
- if(this._lowVal == this._highVal)
- return Long.toString(this._lowVal);
- else
- return this._lowVal+":"+this._highVal;
+ if (this._lowVal == this._highVal)
+ return Long.toString(this._lowVal);
+ else
+ return this._lowVal + ":" + this._highVal;
}
-
+
/**
- * Utility method which will copy the given {@link List} and try to merge the
- * {@link IdRange} in the copy before return it.
+ * Utility method which will copy the given {@link List} and try to merge
+ * the {@link IdRange} in the copy before return it.
*
*
* @param ranges
@@ -131,12 +133,12 @@ public class IdRange {
public static List<IdRange> mergeRanges(final List<IdRange> ranges) {
List<IdRange> copy = new ArrayList<IdRange>(ranges);
Collections.sort(copy, IdRangeComperator.INSTANCE);
-
+
boolean lastUid = false;
-
- for (int i = 0; i < copy.size() -1; i++) {
+
+ for (int i = 0; i < copy.size() - 1; i++) {
IdRange current = copy.get(i);
- IdRange next = copy.get(i +1);
+ IdRange next = copy.get(i + 1);
if (next.getLowVal() == Long.MAX_VALUE && next.getHighVal() == Long.MAX_VALUE) {
if (lastUid) {
copy.remove(next);
@@ -144,20 +146,19 @@ public class IdRange {
} else {
lastUid = true;
}
- } else {
- // Make sure we handle the "*" and "*:*" correctly and don't remove ranges by error. See IMAP-289
- if ((current.getLowVal() != Long.MAX_VALUE && current.getHighVal() != Long.MAX_VALUE) && (current.getHighVal() >= next.getLowVal() -1)) {
+ } else {
+ // Make sure we handle the "*" and "*:*" correctly and don't
+ // remove ranges by error. See IMAP-289
+ if ((current.getLowVal() != Long.MAX_VALUE && current.getHighVal() != Long.MAX_VALUE) && (current.getHighVal() >= next.getLowVal() - 1)) {
if (next.getHighVal() > current.getHighVal()) {
current.setHighVal(next.getHighVal());
}
// remove the merged id range and decrease the count
copy.remove(next);
i--;
- }
+ }
}
-
-
-
+
}
return copy;
@@ -168,7 +169,7 @@ public class IdRange {
private static IdRangeComperator INSTANCE = new IdRangeComperator();
public int compare(IdRange range1, IdRange range2) {
-
+
// Correctly sort and respect "*" and "*:*" ranges. See IMAP-289
if (range1.getLowVal() == Long.MAX_VALUE && range1.getHighVal() == Long.MAX_VALUE && range2.getLowVal() == Long.MAX_VALUE && range2.getHighVal() == Long.MAX_VALUE) {
return 0;
Modified: james/imap/trunk/api/src/main/java/org/apache/james/imap/api/message/request/ImapRequest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/api/src/main/java/org/apache/james/imap/api/message/request/ImapRequest.java?rev=1092137&r1=1092136&r2=1092137&view=diff
==============================================================================
--- james/imap/trunk/api/src/main/java/org/apache/james/imap/api/message/request/ImapRequest.java (original)
+++ james/imap/trunk/api/src/main/java/org/apache/james/imap/api/message/request/ImapRequest.java Thu Apr 14 11:21:11 2011
@@ -24,9 +24,8 @@ import org.apache.james.imap.api.ImapMes
/**
* The actual Imap request
- *
*/
-public interface ImapRequest extends ImapMessage{
+public interface ImapRequest extends ImapMessage {
/**
* Gets the IMAP command whose execution is requested by the client.
Modified: james/imap/trunk/api/src/main/java/org/apache/james/imap/api/message/request/SearchKey.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/api/src/main/java/org/apache/james/imap/api/message/request/SearchKey.java?rev=1092137&r1=1092136&r2=1092137&view=diff
==============================================================================
--- james/imap/trunk/api/src/main/java/org/apache/james/imap/api/message/request/SearchKey.java (original)
+++ james/imap/trunk/api/src/main/java/org/apache/james/imap/api/message/request/SearchKey.java Thu Apr 14 11:21:11 2011
@@ -113,47 +113,33 @@ public final class SearchKey {
// AND
public static final int TYPE_AND = 37;
- private static final SearchKey UNSEEN = new SearchKey(TYPE_UNSEEN, null,
- null, 0, null, null, null);
+ private static final SearchKey UNSEEN = new SearchKey(TYPE_UNSEEN, null, null, 0, null, null, null);
- private static final SearchKey UNFLAGGED = new SearchKey(TYPE_UNFLAGGED,
- null, null, 0, null, null, null);
+ private static final SearchKey UNFLAGGED = new SearchKey(TYPE_UNFLAGGED, null, null, 0, null, null, null);
- private static final SearchKey UNDRAFT = new SearchKey(TYPE_UNDRAFT, null,
- null, 0, null, null, null);
+ private static final SearchKey UNDRAFT = new SearchKey(TYPE_UNDRAFT, null, null, 0, null, null, null);
- private static final SearchKey UNDELETED = new SearchKey(TYPE_UNDELETED,
- null, null, 0, null, null, null);
+ private static final SearchKey UNDELETED = new SearchKey(TYPE_UNDELETED, null, null, 0, null, null, null);
- private static final SearchKey UNANSWERED = new SearchKey(TYPE_UNANSWERED,
- null, null, 0, null, null, null);
+ private static final SearchKey UNANSWERED = new SearchKey(TYPE_UNANSWERED, null, null, 0, null, null, null);
- private static final SearchKey SEEN = new SearchKey(TYPE_SEEN, null, null,
- 0, null, null, null);
+ private static final SearchKey SEEN = new SearchKey(TYPE_SEEN, null, null, 0, null, null, null);
- private static final SearchKey RECENT = new SearchKey(TYPE_RECENT, null,
- null, 0, null, null, null);
+ private static final SearchKey RECENT = new SearchKey(TYPE_RECENT, null, null, 0, null, null, null);
- private static final SearchKey OLD = new SearchKey(TYPE_OLD, null, null, 0,
- null, null, null);
+ private static final SearchKey OLD = new SearchKey(TYPE_OLD, null, null, 0, null, null, null);
- private static final SearchKey NEW = new SearchKey(TYPE_NEW, null, null, 0,
- null, null, null);
+ private static final SearchKey NEW = new SearchKey(TYPE_NEW, null, null, 0, null, null, null);
- private static final SearchKey FLAGGED = new SearchKey(TYPE_FLAGGED, null,
- null, 0, null, null, null);
+ private static final SearchKey FLAGGED = new SearchKey(TYPE_FLAGGED, null, null, 0, null, null, null);
- private static final SearchKey DRAFT = new SearchKey(TYPE_DRAFT, null,
- null, 0, null, null, null);
+ private static final SearchKey DRAFT = new SearchKey(TYPE_DRAFT, null, null, 0, null, null, null);
- private static final SearchKey DELETED = new SearchKey(TYPE_DELETED, null,
- null, 0, null, null, null);
+ private static final SearchKey DELETED = new SearchKey(TYPE_DELETED, null, null, 0, null, null, null);
- private static final SearchKey ANSWERED = new SearchKey(TYPE_ANSWERED,
- null, null, 0, null, null, null);
+ private static final SearchKey ANSWERED = new SearchKey(TYPE_ANSWERED, null, null, 0, null, null, null);
- private static final SearchKey ALL = new SearchKey(TYPE_ALL, null, null, 0,
- null, null, null);
+ private static final SearchKey ALL = new SearchKey(TYPE_ALL, null, null, 0, null, null, null);
// NUMBERS
public static SearchKey buildSequenceSet(IdRange[] ids) {
@@ -337,9 +323,7 @@ public final class SearchKey {
private IdRange[] sequence;
- private SearchKey(final int type, final DayMonthYear date, final List<SearchKey> keys,
- final long number, final String name, final String value,
- IdRange[] sequence) {
+ private SearchKey(final int type, final DayMonthYear date, final List<SearchKey> keys, final long number, final String name, final String value, IdRange[] sequence) {
super();
this.type = type;
this.date = date;
Modified: james/imap/trunk/api/src/main/java/org/apache/james/imap/api/message/response/StatusResponse.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/api/src/main/java/org/apache/james/imap/api/message/response/StatusResponse.java?rev=1092137&r1=1092136&r2=1092137&view=diff
==============================================================================
--- james/imap/trunk/api/src/main/java/org/apache/james/imap/api/message/response/StatusResponse.java (original)
+++ james/imap/trunk/api/src/main/java/org/apache/james/imap/api/message/response/StatusResponse.java Thu Apr 14 11:21:11 2011
@@ -32,11 +32,11 @@ import org.apache.james.imap.api.message
/**
* <p>
- * Represents an <code>RFC2060</code> status response. The five specified
- * status server responses (<code>OK<code>.
- * <code>NO</code>, <code>BAD</code>, <code>PREAUTH</code>
- * and <code>BYE</code>) are modeled by this single interface.
- * They are differentiated by {@link #getServerResponseType()}
+ * Represents an <code>RFC2060</code> status response. The five specified status
+ * server responses (<code>OK<code>.
+ * <code>NO</code>, <code>BAD</code>, <code>PREAUTH</code> and <code>BYE</code>)
+ * are modeled by this single interface. They are differentiated by
+ * {@link #getServerResponseType()}
* </p>
*/
public interface StatusResponse extends ImapResponseMessage {
@@ -72,8 +72,7 @@ public interface StatusResponse extends
/**
* Gets the response code. Optional.
*
- * @return <code>ResponseCode</code>, or null if there is no response
- * code
+ * @return <code>ResponseCode</code>, or null if there is no response code
*/
public ResponseCode getResponseCode();
@@ -82,21 +81,22 @@ public interface StatusResponse extends
*/
public enum Type {
/** RFC2060 <code>OK</code> server response */
- OK ("OK"),
+ OK("OK"),
/** RFC2060 <code>OK</code> server response */
- NO ("NO"),
+ NO("NO"),
/** RFC2060 <code>BAD</code> server response */
- BAD ("BAD"),
+ BAD("BAD"),
/** RFC2060 <code>PREAUTH</code> server response */
- PREAUTH ("PREAUTH"),
+ PREAUTH("PREAUTH"),
/** RFC2060 <code>BYE</code> server response */
- BYE ("BYE");
+ BYE("BYE");
private final String code;
private Type(final String code) {
this.code = code;
}
+
public final String getCode() {
return code;
}
@@ -118,16 +118,13 @@ public interface StatusResponse extends
private static final ResponseCode PARSE = new ResponseCode("PARSE");
/** RFC2060 <code>READ_ONLY</code> response code */
- private static final ResponseCode READ_ONLY = new ResponseCode(
- "READ-ONLY");
+ private static final ResponseCode READ_ONLY = new ResponseCode("READ-ONLY");
/** RFC2060 <code>READ_WRITE</code> response code */
- private static final ResponseCode READ_WRITE = new ResponseCode(
- "READ-WRITE");
+ private static final ResponseCode READ_WRITE = new ResponseCode("READ-WRITE");
/** RFC2060 <code>TRYCREATE</code> response code */
- private static final ResponseCode TRYCREATE = new ResponseCode(
- "TRYCREATE");
+ private static final ResponseCode TRYCREATE = new ResponseCode("TRYCREATE");
/** RFC4315 <code>APPENDUID</code> response code */
public static ResponseCode appendUid(long uidValidity, IdRange[] uids) {
@@ -161,7 +158,7 @@ public interface StatusResponse extends
*
* @return <code>ResponseCode</code>, not null
*/
- public static ResponseCode alert() {
+ public static ResponseCode alert() {
return ALERT;
}
@@ -169,8 +166,7 @@ public interface StatusResponse extends
* Creates a RFC2060 <code>BADCHARSET</code> response code.
*
* @param charsetNames
- * <code>Collection<String></code> containing charset
- * names
+ * <code>Collection<String></code> containing charset names
* @return <code>ResponseCode</code>, not null
*/
public static ResponseCode badCharset(Collection<String> charsetNames) {
@@ -280,15 +276,15 @@ public interface StatusResponse extends
private final Collection<String> parameters;
private final long number;
-
+
private final boolean useParens;
- @SuppressWarnings ("unchecked")
+ @SuppressWarnings("unchecked")
private ResponseCode(final String code) {
this(code, Collections.EMPTY_LIST, 0, true);
}
- @SuppressWarnings ("unchecked")
+ @SuppressWarnings("unchecked")
private ResponseCode(final String code, final long number) {
this(code, Collections.EMPTY_LIST, number, true);
}
@@ -297,8 +293,7 @@ public interface StatusResponse extends
this(code, parameters, 0, true);
}
- private ResponseCode(final String code, final Collection<String> parameters,
- final long number, final boolean useParens) {
+ private ResponseCode(final String code, final Collection<String> parameters, final long number, final boolean useParens) {
super();
this.useParens = useParens;
this.code = code;
@@ -322,12 +317,12 @@ public interface StatusResponse extends
public boolean useParens() {
return useParens;
}
-
+
/**
* Gets parameters for this code.
*
- * @return the parameters <code>Collection</code> of
- * <code>String</code> parameters, not null
+ * @return the parameters <code>Collection</code> of <code>String</code>
+ * parameters, not null
*/
public Collection<String> getParameters() {
return parameters;
@@ -338,8 +333,7 @@ public interface StatusResponse extends
int result = 1;
result = PRIME * result + ((code == null) ? 0 : code.hashCode());
result = PRIME * result + (int) (number ^ (number >>> 32));
- result = PRIME * result
- + ((parameters == null) ? 0 : parameters.hashCode());
+ result = PRIME * result + ((parameters == null) ? 0 : parameters.hashCode());
return result;
}
Modified: james/imap/trunk/api/src/main/java/org/apache/james/imap/api/message/response/StatusResponseFactory.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/api/src/main/java/org/apache/james/imap/api/message/response/StatusResponseFactory.java?rev=1092137&r1=1092136&r2=1092137&view=diff
==============================================================================
--- james/imap/trunk/api/src/main/java/org/apache/james/imap/api/message/response/StatusResponseFactory.java (original)
+++ james/imap/trunk/api/src/main/java/org/apache/james/imap/api/message/response/StatusResponseFactory.java Thu Apr 14 11:21:11 2011
@@ -41,9 +41,7 @@ public interface StatusResponseFactory {
* <code>ResponseCode</code>, not null
* @return <code>StatusResponse</code>, not null
*/
- public StatusResponse taggedOk(String tag, ImapCommand command,
- HumanReadableText displayTextKey,
- StatusResponse.ResponseCode code);
+ public StatusResponse taggedOk(String tag, ImapCommand command, HumanReadableText displayTextKey, StatusResponse.ResponseCode code);
/**
* Creates a tagged NO status response.
@@ -58,9 +56,7 @@ public interface StatusResponseFactory {
* <code>ResponseCode</code>, not null
* @return <code>StatusResponse</code>, not null
*/
- public StatusResponse taggedNo(String tag, ImapCommand command,
- HumanReadableText displayTextKey,
- StatusResponse.ResponseCode code);
+ public StatusResponse taggedNo(String tag, ImapCommand command, HumanReadableText displayTextKey, StatusResponse.ResponseCode code);
/**
* Creates a tagged BAD status response.
@@ -75,9 +71,7 @@ public interface StatusResponseFactory {
* <code>ResponseCode</code>, not null
* @return <code>StatusResponse</code>, not null
*/
- public StatusResponse taggedBad(String tag, ImapCommand command,
- HumanReadableText displayTextKey,
- StatusResponse.ResponseCode code);
+ public StatusResponse taggedBad(String tag, ImapCommand command, HumanReadableText displayTextKey, StatusResponse.ResponseCode code);
/**
* Creates a untagged OK status response.
@@ -88,8 +82,7 @@ public interface StatusResponseFactory {
* <code>ResponseCode</code>, not null
* @return <code>StatusResponse</code>, not null
*/
- public StatusResponse untaggedOk(HumanReadableText displayTextKey,
- StatusResponse.ResponseCode code);
+ public StatusResponse untaggedOk(HumanReadableText displayTextKey, StatusResponse.ResponseCode code);
/**
* Creates a untagged NO status response.
@@ -100,8 +93,7 @@ public interface StatusResponseFactory {
* <code>ResponseCode</code>, not null
* @return <code>StatusResponse</code>, not null
*/
- public StatusResponse untaggedNo(HumanReadableText displayTextKey,
- StatusResponse.ResponseCode code);
+ public StatusResponse untaggedNo(HumanReadableText displayTextKey, StatusResponse.ResponseCode code);
/**
* Creates a untagged BAD status response.
@@ -112,8 +104,7 @@ public interface StatusResponseFactory {
* <code>ResponseCode</code>, not null
* @return <code>StatusResponse</code>, not null
*/
- public StatusResponse untaggedBad(HumanReadableText displayTextKey,
- StatusResponse.ResponseCode code);
+ public StatusResponse untaggedBad(HumanReadableText displayTextKey, StatusResponse.ResponseCode code);
/**
* Creates a PREAUTH status response. These are always untagged.
@@ -124,8 +115,7 @@ public interface StatusResponseFactory {
* <code>ResponseCode</code>, not null
* @return <code>StatusResponse</code>, not null
*/
- public StatusResponse preauth(HumanReadableText displayTextKey,
- StatusResponse.ResponseCode code);
+ public StatusResponse preauth(HumanReadableText displayTextKey, StatusResponse.ResponseCode code);
/**
* Creates a BYE status response. These are always untagged.
@@ -136,8 +126,7 @@ public interface StatusResponseFactory {
* <code>ResponseCode</code>, not null
* @return <code>StatusResponse</code>, not null
*/
- public StatusResponse bye(HumanReadableText displayTextKey,
- StatusResponse.ResponseCode code);
+ public StatusResponse bye(HumanReadableText displayTextKey, StatusResponse.ResponseCode code);
/**
* Creates a tagged OK status response.
@@ -150,8 +139,7 @@ public interface StatusResponseFactory {
* key to the human readable code to be displayed
* @return <code>StatusResponse</code>, not null
*/
- public StatusResponse taggedOk(String tag, ImapCommand command,
- HumanReadableText displayTextKey);
+ public StatusResponse taggedOk(String tag, ImapCommand command, HumanReadableText displayTextKey);
/**
* Creates a tagged NO status response.
@@ -164,8 +152,7 @@ public interface StatusResponseFactory {
* key to the human readable code to be displayed
* @return <code>StatusResponse</code>, not null
*/
- public StatusResponse taggedNo(String tag, ImapCommand command,
- HumanReadableText displayTextKey);
+ public StatusResponse taggedNo(String tag, ImapCommand command, HumanReadableText displayTextKey);
/**
* Creates a tagged BAD status response.
@@ -178,8 +165,7 @@ public interface StatusResponseFactory {
* key to the human readable code to be displayed
* @return <code>StatusResponse</code>, not null
*/
- public StatusResponse taggedBad(String tag, ImapCommand command,
- HumanReadableText displayTextKey);
+ public StatusResponse taggedBad(String tag, ImapCommand command, HumanReadableText displayTextKey);
/**
* Creates a untagged OK status response.
Modified: james/imap/trunk/api/src/main/java/org/apache/james/imap/api/process/ImapProcessor.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/api/src/main/java/org/apache/james/imap/api/process/ImapProcessor.java?rev=1092137&r1=1092136&r2=1092137&view=diff
==============================================================================
--- james/imap/trunk/api/src/main/java/org/apache/james/imap/api/process/ImapProcessor.java (original)
+++ james/imap/trunk/api/src/main/java/org/apache/james/imap/api/process/ImapProcessor.java Thu Apr 14 11:21:11 2011
@@ -43,8 +43,7 @@ public interface ImapProcessor {
* <code>ImapSession</code>
* @return response, not null
*/
- public void process(ImapMessage message, Responder responder,
- ImapSession session);
+ public void process(ImapMessage message, Responder responder, ImapSession session);
/**
* Response message sink.
Modified: james/imap/trunk/api/src/main/java/org/apache/james/imap/api/process/ImapSession.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/api/src/main/java/org/apache/james/imap/api/process/ImapSession.java?rev=1092137&r1=1092136&r2=1092137&view=diff
==============================================================================
--- james/imap/trunk/api/src/main/java/org/apache/james/imap/api/process/ImapSession.java (original)
+++ james/imap/trunk/api/src/main/java/org/apache/james/imap/api/process/ImapSession.java Thu Apr 14 11:21:11 2011
@@ -30,13 +30,13 @@ import org.slf4j.Logger;
* @version $Revision: 109034 $
*/
public interface ImapSession {
-
-
+
/**
- * Gets the context sensitive log for this session.
- * Understanding the context of a log message is an important
- * comprehension aid when analying multi-threaded systems.
- * Using this log allows context information to be associated.
+ * Gets the context sensitive log for this session. Understanding the
+ * context of a log message is an important comprehension aid when analying
+ * multi-threaded systems. Using this log allows context information to be
+ * associated.
+ *
* @return context sensitive log, not null
*/
Logger getLog();
@@ -91,8 +91,7 @@ public interface ImapSession {
*
* @param key
* name of the key, not null
- * @return <code>Object</code> value or null if this attribute has
- * unvalued
+ * @return <code>Object</code> value or null if this attribute has unvalued
*/
public Object getAttribute(String key);
@@ -107,28 +106,28 @@ public interface ImapSession {
* unvalued
*/
public void setAttribute(String key, Object value);
-
+
/**
- * Start TLS encryption of the session after the next response was written. So you must make sure
- * the next response will get send in clear text
+ * Start TLS encryption of the session after the next response was written.
+ * So you must make sure the next response will get send in clear text
*
* @return true if the encryption of the session was successfully
*/
public boolean startTLS();
-
+
/**
- * Support startTLS ?
+ * Support startTLS ?
*
* @return true if startTLS is supported
*/
public boolean supportStartTLS();
-
+
public boolean isCompressionSupported();
-
+
public boolean startCompression();
-
+
public void pushLineHandler(ImapLineHandler lineHandler);
-
+
public void popLineHandler();
-
+
}
Modified: james/imap/trunk/api/src/main/java/org/apache/james/imap/api/process/MailboxType.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/api/src/main/java/org/apache/james/imap/api/process/MailboxType.java?rev=1092137&r1=1092136&r2=1092137&view=diff
==============================================================================
--- james/imap/trunk/api/src/main/java/org/apache/james/imap/api/process/MailboxType.java (original)
+++ james/imap/trunk/api/src/main/java/org/apache/james/imap/api/process/MailboxType.java Thu Apr 14 11:21:11 2011
@@ -21,7 +21,6 @@ package org.apache.james.imap.api.proces
/**
* Represents well-known mailbox types along with their string representations
* used by XLIST command
- *
*/
public enum MailboxType {
@@ -33,6 +32,7 @@ public enum MailboxType {
STARRED("\\Starred"),
ALLMAIL("\\AllMail"),
OTHER(null);
+
private String attributeName;
MailboxType(String attributeName) {
Modified: james/imap/trunk/api/src/main/java/org/apache/james/imap/api/process/MailboxTyper.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/api/src/main/java/org/apache/james/imap/api/process/MailboxTyper.java?rev=1092137&r1=1092136&r2=1092137&view=diff
==============================================================================
--- james/imap/trunk/api/src/main/java/org/apache/james/imap/api/process/MailboxTyper.java (original)
+++ james/imap/trunk/api/src/main/java/org/apache/james/imap/api/process/MailboxTyper.java Thu Apr 14 11:21:11 2011
@@ -25,13 +25,15 @@ import org.apache.james.mailbox.MailboxP
*/
public interface MailboxTyper {
- /**
+ /**
* Returns MailboxType based on mailbox path
*
- * @param session current ImapSession
- * @param path path of mailbox, which type is being queried
- * @return MailboxType value for passed mailbox, if there's no special
- * function for particular mailbox, return OTHER.
+ * @param session
+ * current ImapSession
+ * @param path
+ * path of mailbox, which type is being queried
+ * @return MailboxType value for passed mailbox, if there's no special
+ * function for particular mailbox, return OTHER.
*/
- MailboxType getMailboxType(ImapSession session, MailboxPath path);
+ MailboxType getMailboxType(ImapSession session, MailboxPath path);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org