james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rdon...@apache.org
Subject svn commit: r731079 - in /james/protocols/imap/trunk: api/src/main/java/org/apache/james/api/imap/process/ processor/src/main/java/org/apache/james/imap/processor/base/ processor/src/main/java/org/apache/james/imap/processor/imap4rev1/ processor/src/ma...
Date Sat, 03 Jan 2009 20:09:11 GMT
Author: rdonkin
Date: Sat Jan  3 12:09:10 2009
New Revision: 731079

URL: http://svn.apache.org/viewvc?rev=731079&view=rev
Log:
Shorted name

Added:
    james/protocols/imap/trunk/api/src/main/java/org/apache/james/api/imap/process/SelectedMailbox.java
  (contents, props changed)
      - copied, changed from r731024, james/protocols/imap/trunk/api/src/main/java/org/apache/james/api/imap/process/SelectedImapMailbox.java
Removed:
    james/protocols/imap/trunk/api/src/main/java/org/apache/james/api/imap/process/SelectedImapMailbox.java
Modified:
    james/protocols/imap/trunk/api/src/main/java/org/apache/james/api/imap/process/ImapSession.java
    james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/AbstractMailboxAwareProcessor.java
    james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxSessionImpl.java
    james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/AbstractMailboxSelectionProcessor.java
    james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/AppendProcessor.java
    james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/CopyProcessor.java
    james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/DeleteProcessor.java
    james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/ExpungeProcessor.java
    james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/SearchProcessor.java
    james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/StoreProcessor.java
    james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/fetch/FetchResponseBuilder.java
    james/protocols/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/imap4rev1/SearchProcessorTest.java
    james/protocols/imap/trunk/seda/src/main/java/org/apache/james/imap/main/ImapRequestHandler.java
    james/protocols/imap/trunk/seda/src/main/java/org/apache/james/imap/main/ImapSessionImpl.java

Modified: james/protocols/imap/trunk/api/src/main/java/org/apache/james/api/imap/process/ImapSession.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/api/src/main/java/org/apache/james/api/imap/process/ImapSession.java?rev=731079&r1=731078&r2=731079&view=diff
==============================================================================
--- james/protocols/imap/trunk/api/src/main/java/org/apache/james/api/imap/process/ImapSession.java
(original)
+++ james/protocols/imap/trunk/api/src/main/java/org/apache/james/api/imap/process/ImapSession.java
Sat Jan  3 12:09:10 2009
@@ -57,7 +57,7 @@
      *            If <code>true</code>, the selection is set to be read only.
      * @throws MailboxManagerException
      */
-    void selected(SelectedImapMailbox mailbox);
+    void selected(SelectedMailbox mailbox);
 
     /**
      * Moves the session out of {@link ImapSessionState#SELECTED} state and back
@@ -72,7 +72,7 @@
      * 
      * @return the currently selected mailbox.
      */
-    SelectedImapMailbox getSelected();
+    SelectedMailbox getSelected();
 
     /**
      * Gets an attribute of this session by name. Implementations should ensure

Copied: james/protocols/imap/trunk/api/src/main/java/org/apache/james/api/imap/process/SelectedMailbox.java
(from r731024, james/protocols/imap/trunk/api/src/main/java/org/apache/james/api/imap/process/SelectedImapMailbox.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/api/src/main/java/org/apache/james/api/imap/process/SelectedMailbox.java?p2=james/protocols/imap/trunk/api/src/main/java/org/apache/james/api/imap/process/SelectedMailbox.java&p1=james/protocols/imap/trunk/api/src/main/java/org/apache/james/api/imap/process/SelectedImapMailbox.java&r1=731024&r2=731079&rev=731079&view=diff
==============================================================================
--- james/protocols/imap/trunk/api/src/main/java/org/apache/james/api/imap/process/SelectedImapMailbox.java
(original)
+++ james/protocols/imap/trunk/api/src/main/java/org/apache/james/api/imap/process/SelectedMailbox.java
Sat Jan  3 12:09:10 2009
@@ -22,7 +22,7 @@
 import java.util.Collection;
 
 
-public interface SelectedImapMailbox {
+public interface SelectedMailbox {
 
     public abstract void deselect();
 

Propchange: james/protocols/imap/trunk/api/src/main/java/org/apache/james/api/imap/process/SelectedMailbox.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/AbstractMailboxAwareProcessor.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/AbstractMailboxAwareProcessor.java?rev=731079&r1=731078&r2=731079&view=diff
==============================================================================
--- james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/AbstractMailboxAwareProcessor.java
(original)
+++ james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/AbstractMailboxAwareProcessor.java
Sat Jan  3 12:09:10 2009
@@ -36,7 +36,7 @@
 import org.apache.james.api.imap.message.response.imap4rev1.StatusResponseFactory;
 import org.apache.james.api.imap.process.ImapProcessor;
 import org.apache.james.api.imap.process.ImapSession;
-import org.apache.james.api.imap.process.SelectedImapMailbox;
+import org.apache.james.api.imap.process.SelectedMailbox;
 import org.apache.james.imap.mailbox.Mailbox;
 import org.apache.james.imap.mailbox.MailboxException;
 import org.apache.james.imap.mailbox.MailboxExistsException;
@@ -125,7 +125,7 @@
      */
     protected void unsolicitedResponses(final ImapSession session, final ImapProcessor.Responder
responder, 
             boolean omitExpunged, boolean useUid) {
-        final SelectedImapMailbox selected = session.getSelected();
+        final SelectedMailbox selected = session.getSelected();
         if (selected == null) {
             getLog().debug("No mailbox selected");
         } else {
@@ -134,11 +134,11 @@
     }
 
     /**
-     * @see org.apache.james.api.imap.process.SelectedImapMailbox#unsolicitedResponses(boolean,
+     * @see org.apache.james.api.imap.process.SelectedMailbox#unsolicitedResponses(boolean,
      *      boolean)
      */
     public void unsolicitedResponses(final ImapSession session, final ImapProcessor.Responder
responder, 
-            final SelectedImapMailbox selected, boolean omitExpunged, boolean useUid) {
+            final SelectedMailbox selected, boolean omitExpunged, boolean useUid) {
         final boolean sizeChanged = selected.isSizeChanged();
         // New message response
             if (sizeChanged) {
@@ -159,7 +159,7 @@
             selected.resetEvents();
     }
 
-    private void addExpungedResponses(final SelectedImapMailbox selected, final ImapProcessor.Responder
responder) {
+    private void addExpungedResponses(final SelectedMailbox selected, final ImapProcessor.Responder
responder) {
         final Collection<Long> expungedUids = selected.expungedUids();
         for (final Long uid: expungedUids) {
             final long uidValue = uid.longValue();
@@ -171,7 +171,7 @@
         selected.expunged(expungedUids);
     }
 
-    private void addFlagsResponses(final ImapSession session, final SelectedImapMailbox selected,

+    private void addFlagsResponses(final ImapSession session, final SelectedMailbox selected,

             final ImapProcessor.Responder responder, boolean useUid) {
         try {
             final Collection<Long> flagUpdateUids = selected.flagUpdateUids();
@@ -189,7 +189,7 @@
         }
     }
 
-    private void addFlagsResponses(final ImapSession session, final SelectedImapMailbox selected,

+    private void addFlagsResponses(final ImapSession session, final SelectedMailbox selected,

             final ImapProcessor.Responder responder, boolean useUid, MessageRange messageSet,
Mailbox mailbox, MailboxSession mailboxSession)
     throws MailboxException {
         final Iterator it = mailbox.getMessages(messageSet, FetchGroupImpl.FLAGS, mailboxSession);
@@ -215,21 +215,21 @@
         }
     }
 
-    private Mailbox getMailbox(final ImapSession session, final SelectedImapMailbox selected)
throws MailboxException {
+    private Mailbox getMailbox(final ImapSession session, final SelectedMailbox selected)
throws MailboxException {
         final String fullMailboxName = buildFullName(session, selected.getName());
         final MailboxManager mailboxManager = getMailboxManager();
         final Mailbox mailbox = mailboxManager.getMailbox(fullMailboxName);
         return mailbox;
     }
 
-    private void addRecentResponses(final SelectedImapMailbox selected, final ImapProcessor.Responder
responder) {
+    private void addRecentResponses(final SelectedMailbox selected, final ImapProcessor.Responder
responder) {
         final int recentCount = selected.recentCount();
 //      TODO: use factory
         RecentResponse response = new RecentResponse(recentCount);
         responder.respond(response);
     }
 
-    private void addExistsResponses(final ImapSession session, final SelectedImapMailbox
selected, 
+    private void addExistsResponses(final ImapSession session, final SelectedMailbox selected,

             final ImapProcessor.Responder responder) {
         try {
             final Mailbox mailbox = getMailbox(session, selected);

Modified: james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxSessionImpl.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxSessionImpl.java?rev=731079&r1=731078&r2=731079&view=diff
==============================================================================
--- james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxSessionImpl.java
(original)
+++ james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxSessionImpl.java
Sat Jan  3 12:09:10 2009
@@ -26,7 +26,7 @@
 import java.util.TreeSet;
 
 import org.apache.james.api.imap.AbstractLogEnabled;
-import org.apache.james.api.imap.process.SelectedImapMailbox;
+import org.apache.james.api.imap.process.SelectedMailbox;
 import org.apache.james.imap.mailbox.Mailbox;
 import org.apache.james.imap.mailbox.MailboxException;
 import org.apache.james.imap.mailbox.MailboxSession;
@@ -35,7 +35,7 @@
 
 // TODO: deal with deleted or renamed mailboxes
 public class SelectedMailboxSessionImpl extends AbstractLogEnabled implements
-        SelectedImapMailbox {
+        SelectedMailbox {
 
     private final Mailbox mailbox;
 
@@ -65,7 +65,7 @@
     }
 
     /**
-     * @see org.apache.james.api.imap.process.SelectedImapMailbox#deselect()
+     * @see org.apache.james.api.imap.process.SelectedMailbox#deselect()
      */
     public void deselect() {
         mailbox.removeListener(events);

Modified: james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/AbstractMailboxSelectionProcessor.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/AbstractMailboxSelectionProcessor.java?rev=731079&r1=731078&r2=731079&view=diff
==============================================================================
--- james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/AbstractMailboxSelectionProcessor.java
(original)
+++ james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/AbstractMailboxSelectionProcessor.java
Sat Jan  3 12:09:10 2009
@@ -33,7 +33,7 @@
 import org.apache.james.api.imap.message.response.imap4rev1.StatusResponse.ResponseCode;
 import org.apache.james.api.imap.process.ImapProcessor;
 import org.apache.james.api.imap.process.ImapSession;
-import org.apache.james.api.imap.process.SelectedImapMailbox;
+import org.apache.james.api.imap.process.SelectedMailbox;
 import org.apache.james.imap.mailbox.Mailbox;
 import org.apache.james.imap.mailbox.MailboxException;
 import org.apache.james.imap.mailbox.MailboxManager;
@@ -98,7 +98,7 @@
         Mailbox mailbox = getSelectedMailbox(session);
         final MailboxSession mailboxSession = ImapSessionUtils
                 .getMailboxSession(session);
-        final SelectedImapMailbox selected = session.getSelected();
+        final SelectedMailbox selected = session.getSelected();
 
         // TODO: compact this into a single API call for meta-data about the
         // repository
@@ -139,7 +139,7 @@
 
     private void unseen(Responder responder, Mailbox mailbox,
             final MailboxSession mailboxSession,
-            final SelectedImapMailbox selected) throws MailboxException {
+            final SelectedMailbox selected) throws MailboxException {
         final MessageResult firstUnseen = mailbox.getFirstUnseen(
                 FetchGroupImpl.MINIMAL, mailboxSession);
         if (firstUnseen != null) {
@@ -161,7 +161,7 @@
         responder.respond(untaggedOk);
     }
 
-    private void recent(Responder responder, final SelectedImapMailbox selected) {
+    private void recent(Responder responder, final SelectedMailbox selected) {
         final int recentCount = selected.recentCount();
         final RecentResponse recentResponse = new RecentResponse(recentCount);
         responder.respond(recentResponse);
@@ -181,8 +181,8 @@
         final MailboxSession mailboxSession = ImapSessionUtils
                 .getMailboxSession(session);
 
-        final SelectedImapMailbox sessionMailbox;
-        final SelectedImapMailbox currentMailbox = session.getSelected();
+        final SelectedMailbox sessionMailbox;
+        final SelectedMailbox currentMailbox = session.getSelected();
         if (currentMailbox == null
                 || !currentMailbox.getName().equals(mailboxName)) {
             sessionMailbox = createNewSelectedMailbox(mailbox, mailboxSession,
@@ -193,10 +193,10 @@
         addRecent(mailbox, mailboxSession, sessionMailbox);
     }
 
-    private SelectedImapMailbox createNewSelectedMailbox(final Mailbox mailbox,
+    private SelectedMailbox createNewSelectedMailbox(final Mailbox mailbox,
             final MailboxSession mailboxSession, ImapSession session, String name)
             throws MailboxException {
-        final SelectedImapMailbox sessionMailbox;
+        final SelectedMailbox sessionMailbox;
         final Iterator it = mailbox.getMessages(MessageRangeImpl.all(),
                 FetchGroupImpl.MINIMAL, mailboxSession);
         final List uids = new ArrayList();
@@ -215,7 +215,7 @@
 
     private void addRecent(final Mailbox mailbox,
             final MailboxSession mailboxSession,
-            SelectedImapMailbox sessionMailbox) throws MailboxException {
+            SelectedMailbox sessionMailbox) throws MailboxException {
         final long[] recentUids = mailbox.recent(!openReadOnly, mailboxSession);
         for (int i = 0; i < recentUids.length; i++) {
             long uid = recentUids[i];

Modified: james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/AppendProcessor.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/AppendProcessor.java?rev=731079&r1=731078&r2=731079&view=diff
==============================================================================
--- james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/AppendProcessor.java
(original)
+++ james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/AppendProcessor.java
Sat Jan  3 12:09:10 2009
@@ -34,7 +34,7 @@
 import org.apache.james.api.imap.message.response.imap4rev1.StatusResponseFactory;
 import org.apache.james.api.imap.process.ImapProcessor;
 import org.apache.james.api.imap.process.ImapSession;
-import org.apache.james.api.imap.process.SelectedImapMailbox;
+import org.apache.james.api.imap.process.SelectedMailbox;
 import org.apache.james.imap.mailbox.Mailbox;
 import org.apache.james.imap.mailbox.MailboxException;
 import org.apache.james.imap.mailbox.MailboxManager;
@@ -103,7 +103,7 @@
         try {
             final MailboxSession mailboxSession = ImapSessionUtils
                     .getMailboxSession(session);
-            final SelectedImapMailbox selectedMailbox = session.getSelected();
+            final SelectedMailbox selectedMailbox = session.getSelected();
             final boolean isSelectedMailbox = selectedMailbox != null
                     && fullMailboxName.equals(selectedMailbox.getName());
             if (!isSelectedMailbox) {

Modified: james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/CopyProcessor.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/CopyProcessor.java?rev=731079&r1=731078&r2=731079&view=diff
==============================================================================
--- james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/CopyProcessor.java
(original)
+++ james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/CopyProcessor.java
Sat Jan  3 12:09:10 2009
@@ -28,7 +28,7 @@
 import org.apache.james.api.imap.message.response.imap4rev1.StatusResponse.ResponseCode;
 import org.apache.james.api.imap.process.ImapProcessor;
 import org.apache.james.api.imap.process.ImapSession;
-import org.apache.james.api.imap.process.SelectedImapMailbox;
+import org.apache.james.api.imap.process.SelectedMailbox;
 import org.apache.james.imap.mailbox.MailboxException;
 import org.apache.james.imap.mailbox.MailboxManager;
 import org.apache.james.imap.mailbox.MailboxManagerProvider;
@@ -57,7 +57,7 @@
         final String mailboxName = request.getMailboxName();
         final IdRange[] idSet = request.getIdSet();
         final boolean useUids = request.isUseUids();
-        final SelectedImapMailbox currentMailbox = session.getSelected();
+        final SelectedMailbox currentMailbox = session.getSelected();
         try {
             final String fullMailboxName = buildFullName(session, mailboxName);
             final MailboxManager mailboxManager = getMailboxManager();

Modified: james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/DeleteProcessor.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/DeleteProcessor.java?rev=731079&r1=731078&r2=731079&view=diff
==============================================================================
--- james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/DeleteProcessor.java
(original)
+++ james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/DeleteProcessor.java
Sat Jan  3 12:09:10 2009
@@ -25,7 +25,7 @@
 import org.apache.james.api.imap.message.response.imap4rev1.StatusResponseFactory;
 import org.apache.james.api.imap.process.ImapProcessor;
 import org.apache.james.api.imap.process.ImapSession;
-import org.apache.james.api.imap.process.SelectedImapMailbox;
+import org.apache.james.api.imap.process.SelectedMailbox;
 import org.apache.james.imap.mailbox.MailboxException;
 import org.apache.james.imap.mailbox.MailboxManager;
 import org.apache.james.imap.mailbox.MailboxManagerProvider;
@@ -51,7 +51,7 @@
         final String mailboxName = request.getMailboxName();
         try {
             final String fullMailboxName = buildFullName(session, mailboxName);
-            final SelectedImapMailbox selected = session.getSelected();
+            final SelectedMailbox selected = session.getSelected();
             if (selected != null && selected.getName().equals(fullMailboxName)) {
                 session.deselect();
             }

Modified: james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/ExpungeProcessor.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/ExpungeProcessor.java?rev=731079&r1=731078&r2=731079&view=diff
==============================================================================
--- james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/ExpungeProcessor.java
(original)
+++ james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/ExpungeProcessor.java
Sat Jan  3 12:09:10 2009
@@ -28,7 +28,7 @@
 import org.apache.james.api.imap.message.response.imap4rev1.StatusResponseFactory;
 import org.apache.james.api.imap.process.ImapProcessor;
 import org.apache.james.api.imap.process.ImapSession;
-import org.apache.james.api.imap.process.SelectedImapMailbox;
+import org.apache.james.api.imap.process.SelectedMailbox;
 import org.apache.james.imap.mailbox.Mailbox;
 import org.apache.james.imap.mailbox.MailboxException;
 import org.apache.james.imap.mailbox.MailboxManagerProvider;
@@ -62,7 +62,7 @@
                 final Iterator it = mailbox.expunge(MessageRangeImpl.all(),
                         FetchGroupImpl.MINIMAL, ImapSessionUtils
                                 .getMailboxSession(session));
-                final SelectedImapMailbox mailboxSession = session
+                final SelectedMailbox mailboxSession = session
                         .getSelected();
                 if (mailboxSession != null) {
                     while (it.hasNext()) {

Modified: james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/SearchProcessor.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/SearchProcessor.java?rev=731079&r1=731078&r2=731079&view=diff
==============================================================================
--- james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/SearchProcessor.java
(original)
+++ james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/SearchProcessor.java
Sat Jan  3 12:09:10 2009
@@ -37,7 +37,7 @@
 import org.apache.james.api.imap.message.response.imap4rev1.StatusResponseFactory;
 import org.apache.james.api.imap.process.ImapProcessor;
 import org.apache.james.api.imap.process.ImapSession;
-import org.apache.james.api.imap.process.SelectedImapMailbox;
+import org.apache.james.api.imap.process.SelectedMailbox;
 import org.apache.james.imap.mailbox.Mailbox;
 import org.apache.james.imap.mailbox.MailboxException;
 import org.apache.james.imap.mailbox.MailboxManagerProvider;
@@ -121,7 +121,7 @@
 
     private SearchQuery toQuery(final SearchKey key, final ImapSession session) {
         final SearchQuery result = new SearchQuery();
-        final SelectedImapMailbox selected = session.getSelected();
+        final SelectedMailbox selected = session.getSelected();
         if (selected != null) {
             result.addRecentMessageUids(selected.getRecent());
         }
@@ -239,7 +239,7 @@
             final long lowUid;
             final long highUid;
             if (msn) {
-                final SelectedImapMailbox selected = session.getSelected();
+                final SelectedMailbox selected = session.getSelected();
                 if (highVal == Long.MAX_VALUE) {
                     highUid = Long.MAX_VALUE;
                 } else {

Modified: james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/StoreProcessor.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/StoreProcessor.java?rev=731079&r1=731078&r2=731079&view=diff
==============================================================================
--- james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/StoreProcessor.java
(original)
+++ james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/StoreProcessor.java
Sat Jan  3 12:09:10 2009
@@ -31,7 +31,7 @@
 import org.apache.james.api.imap.message.response.imap4rev1.StatusResponseFactory;
 import org.apache.james.api.imap.process.ImapProcessor;
 import org.apache.james.api.imap.process.ImapSession;
-import org.apache.james.api.imap.process.SelectedImapMailbox;
+import org.apache.james.api.imap.process.SelectedMailbox;
 import org.apache.james.imap.mailbox.Mailbox;
 import org.apache.james.imap.mailbox.MailboxException;
 import org.apache.james.imap.mailbox.MailboxManagerProvider;
@@ -87,7 +87,7 @@
             for (int i = 0; i < idSet.length; i++) {
                 final long lowVal;
                 final long highVal;
-                final SelectedImapMailbox selected = session.getSelected();
+                final SelectedMailbox selected = session.getSelected();
                 if (useUids) {
                     lowVal = idSet[i].getLowVal();
                     highVal = idSet[i].getHighVal();

Modified: james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/fetch/FetchResponseBuilder.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/fetch/FetchResponseBuilder.java?rev=731079&r1=731078&r2=731079&view=diff
==============================================================================
--- james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/fetch/FetchResponseBuilder.java
(original)
+++ james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/fetch/FetchResponseBuilder.java
Sat Jan  3 12:09:10 2009
@@ -35,7 +35,7 @@
 import org.apache.james.api.imap.message.BodyFetchElement;
 import org.apache.james.api.imap.message.FetchData;
 import org.apache.james.api.imap.process.ImapSession;
-import org.apache.james.api.imap.process.SelectedImapMailbox;
+import org.apache.james.api.imap.process.SelectedMailbox;
 import org.apache.james.imap.mailbox.Headers;
 import org.apache.james.imap.mailbox.Mailbox;
 import org.apache.james.imap.mailbox.MailboxException;
@@ -106,7 +106,7 @@
     public FetchResponse build(FetchData fetch, MessageResult result, Mailbox mailbox, 
             ImapSession session, boolean useUids) throws MessagingException,
             ParseException {
-        final SelectedImapMailbox selected = session.getSelected();
+        final SelectedMailbox selected = session.getSelected();
         final long resultUid = result.getUid();
         final int resultMsn = selected.msn(resultUid);
         setMsn(resultMsn);

Modified: james/protocols/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/imap4rev1/SearchProcessorTest.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/imap4rev1/SearchProcessorTest.java?rev=731079&r1=731078&r2=731079&view=diff
==============================================================================
--- james/protocols/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/imap4rev1/SearchProcessorTest.java
(original)
+++ james/protocols/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/imap4rev1/SearchProcessorTest.java
Sat Jan  3 12:09:10 2009
@@ -35,7 +35,7 @@
 import org.apache.james.api.imap.message.response.imap4rev1.StatusResponseFactory;
 import org.apache.james.api.imap.process.ImapProcessor;
 import org.apache.james.api.imap.process.ImapSession;
-import org.apache.james.api.imap.process.SelectedImapMailbox;
+import org.apache.james.api.imap.process.SelectedMailbox;
 import org.apache.james.api.imap.process.ImapProcessor.Responder;
 import org.apache.james.imap.mailbox.Mailbox;
 import org.apache.james.imap.mailbox.MailboxManager;
@@ -137,7 +137,7 @@
         final IdRange[] ids = { new IdRange(Long.MAX_VALUE, 1729) };
         final SearchQuery.NumericRange[] ranges = { new SearchQuery.NumericRange(
                 Long.MAX_VALUE, 1729L) };
-        Mock selectedMailbox = mock(SelectedImapMailbox.class);
+        Mock selectedMailbox = mock(SelectedMailbox.class);
         selectedMailbox.expects(once()).method("uid").with(eq(1729)).will(
                 returnValue(1729L));
         
@@ -170,7 +170,7 @@
         final IdRange[] ids = { new IdRange(1, Long.MAX_VALUE) };
         final SearchQuery.NumericRange[] ranges = { new SearchQuery.NumericRange(
                 42, Long.MAX_VALUE) };
-        Mock selectedMailbox = mock(SelectedImapMailbox.class);
+        Mock selectedMailbox = mock(SelectedMailbox.class);
         selectedMailbox.expects(once()).method("uid").with(eq(1)).will(
                 returnValue(42L));
         allowUnsolicitedResponses(selectedMailbox);
@@ -185,7 +185,7 @@
         final IdRange[] ids = { new IdRange(1, 5) };
         final SearchQuery.NumericRange[] ranges = { new SearchQuery.NumericRange(
                 42, 1729) };
-        Mock selectedMailbox = mock(SelectedImapMailbox.class);
+        Mock selectedMailbox = mock(SelectedMailbox.class);
         selectedMailbox.expects(once()).method("uid").with(eq(1)).will(
                 returnValue(42L));
         selectedMailbox.expects(once()).method("uid").with(eq(5)).will(
@@ -202,7 +202,7 @@
         final IdRange[] ids = { new IdRange(1) };
         final SearchQuery.NumericRange[] ranges = { new SearchQuery.NumericRange(
                 42) };
-        Mock selectedMailbox = mock(SelectedImapMailbox.class);
+        Mock selectedMailbox = mock(SelectedMailbox.class);
         selectedMailbox.expects(exactly(2)).method("uid").with(eq(1)).will(
                 returnValue(42L));
         selectedMailbox.expects(once()).method("getRecent").will(

Modified: james/protocols/imap/trunk/seda/src/main/java/org/apache/james/imap/main/ImapRequestHandler.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/seda/src/main/java/org/apache/james/imap/main/ImapRequestHandler.java?rev=731079&r1=731078&r2=731079&view=diff
==============================================================================
--- james/protocols/imap/trunk/seda/src/main/java/org/apache/james/imap/main/ImapRequestHandler.java
(original)
+++ james/protocols/imap/trunk/seda/src/main/java/org/apache/james/imap/main/ImapRequestHandler.java
Sat Jan  3 12:09:10 2009
@@ -30,7 +30,7 @@
 import org.apache.james.api.imap.message.response.ImapResponseMessage;
 import org.apache.james.api.imap.process.ImapProcessor;
 import org.apache.james.api.imap.process.ImapSession;
-import org.apache.james.api.imap.process.SelectedImapMailbox;
+import org.apache.james.api.imap.process.SelectedMailbox;
 import org.apache.james.api.imap.process.ImapProcessor.Responder;
 import org.apache.james.imap.decode.ImapDecoder;
 import org.apache.james.imap.decode.ImapRequestLineReader;
@@ -147,7 +147,7 @@
 
     private boolean isSelectedMailboxDeleted(ImapSession session) {
         final boolean selectedMailboxIsDeleted;
-        final SelectedImapMailbox mailbox = session.getSelected();
+        final SelectedMailbox mailbox = session.getSelected();
         if (mailbox != null) {
             selectedMailboxIsDeleted = mailbox.isDeletedByOtherSession();
         } else {

Modified: james/protocols/imap/trunk/seda/src/main/java/org/apache/james/imap/main/ImapSessionImpl.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/seda/src/main/java/org/apache/james/imap/main/ImapSessionImpl.java?rev=731079&r1=731078&r2=731079&view=diff
==============================================================================
--- james/protocols/imap/trunk/seda/src/main/java/org/apache/james/imap/main/ImapSessionImpl.java
(original)
+++ james/protocols/imap/trunk/seda/src/main/java/org/apache/james/imap/main/ImapSessionImpl.java
Sat Jan  3 12:09:10 2009
@@ -26,7 +26,7 @@
 import org.apache.james.api.imap.ImapConstants;
 import org.apache.james.api.imap.ImapSessionState;
 import org.apache.james.api.imap.process.ImapSession;
-import org.apache.james.api.imap.process.SelectedImapMailbox;
+import org.apache.james.api.imap.process.SelectedMailbox;
 
 /**
  * Implements a session.
@@ -35,7 +35,7 @@
         ImapSession, ImapConstants {
     private ImapSessionState state = ImapSessionState.NON_AUTHENTICATED;
 
-    private SelectedImapMailbox selectedMailbox = null;
+    private SelectedMailbox selectedMailbox = null;
 
     private final Map<String, Object> attributesByKey;
 
@@ -57,14 +57,14 @@
         closeMailbox();
     }
 
-    public void selected(SelectedImapMailbox mailbox) {
+    public void selected(SelectedMailbox mailbox) {
         setupLogger(mailbox);
         this.state = ImapSessionState.SELECTED;
         closeMailbox();
         this.selectedMailbox = mailbox;
     }
 
-    public SelectedImapMailbox getSelected() {
+    public SelectedMailbox getSelected() {
         return this.selectedMailbox;
     }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


Mime
View raw message