Author: rdonkin
Date: Fri Jan 2 01:38:53 2009
New Revision: 730685
URL: http://svn.apache.org/viewvc?rev=730685&view=rev
Log:
Remove name method from API.
Modified:
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailbox.java
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/Mailbox.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
Modified:
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailbox.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailbox.java?rev=730685&r1=730684&r2=730685&view=diff
==============================================================================
---
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailbox.java
(original)
+++
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailbox.java
Fri Jan 2 01:38:53 2009
@@ -74,10 +74,6 @@
this.entityManagerFactory = entityManagerfactory;
}
- public String getName() throws MailboxException {
- return getMailboxRow().getName();
- }
-
public int getMessageCount(MailboxSession mailboxSession)
throws MailboxException {
try {
Modified:
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/Mailbox.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/Mailbox.java?rev=730685&r1=730684&r2=730685&view=diff
==============================================================================
---
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/Mailbox.java
(original)
+++
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/Mailbox.java
Fri Jan 2 01:38:53 2009
@@ -32,16 +32,7 @@
public static final long ANONYMOUS_SESSION = 0;
- /**
- * Example #mail.paul.lists.apache.james-dev (3rd level folder of user
paul)
- *
- * @return Full folder name with namespace
- * @throws MailboxException
- */
- String getName() throws MailboxException;
-
- int getMessageCount(MailboxSession mailboxSession)
- throws MailboxException;
+ int getMessageCount(MailboxSession mailboxSession) throws MailboxException;
boolean isWriteable();
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=730685&r1=730684&r2=730685&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
Fri Jan 2 01:38:53 2009
@@ -64,7 +64,7 @@
private final String name;
public SelectedMailboxSessionImpl(Mailbox mailbox, List uids,
- MailboxSession mailboxSession) throws MailboxException {
+ MailboxSession mailboxSession, final String name) throws
MailboxException {
this.mailbox = mailbox;
this.mailboxSession = mailboxSession;
recentUids = new TreeSet();
@@ -76,7 +76,7 @@
mailbox.addListener(events);
converter = new UidToMsnConverter(uids);
mailbox.addListener(converter);
- name = mailbox.getName();
+ this.name = name;
}
/**
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=730685&r1=730684&r2=730685&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
Fri Jan 2 01:38:53 2009
@@ -186,7 +186,7 @@
if (currentMailbox == null
|| !currentMailbox.getName().equals(mailboxName)) {
sessionMailbox = createNewSelectedMailbox(mailbox, mailboxSession,
- session);
+ session, mailboxName);
} else {
sessionMailbox = currentMailbox;
}
@@ -194,7 +194,7 @@
}
private SelectedImapMailbox createNewSelectedMailbox(final Mailbox mailbox,
- final MailboxSession mailboxSession, ImapSession session)
+ final MailboxSession mailboxSession, ImapSession session, String
name)
throws MailboxException {
final SelectedImapMailbox sessionMailbox;
final Iterator it = mailbox.getMessages(MessageRangeImpl.all(),
@@ -205,7 +205,7 @@
uids.add(new Long(result.getUid()));
}
sessionMailbox = new SelectedMailboxSessionImpl(mailbox, uids,
- mailboxSession);
+ mailboxSession, name);
session.selected(sessionMailbox);
session.setAttribute(
ImapSessionUtils.SELECTED_MAILBOX_ATTRIBUTE_SESSION_KEY,
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=730685&r1=730684&r2=730685&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
Fri Jan 2 01:38:53 2009
@@ -76,7 +76,7 @@
final Mailbox mailbox = mailboxManager.getMailbox(fullMailboxName,
false);
appendToMailbox(mimeMessage, datetime, session, tag, command,
- mailbox, responder);
+ mailbox, responder, fullMailboxName);
} catch (MailboxException mme) {
// Mailbox API does not provide facilities for diagnosing the
@@ -98,15 +98,15 @@
}
- private void appendToMailbox(MimeMessage message, Date datetime,
- ImapSession session, String tag, ImapCommand command,
- Mailbox mailbox, Responder responder) {
+ private void appendToMailbox(final MimeMessage message, final Date
datetime,
+ final ImapSession session, final String tag, final ImapCommand
command,
+ final Mailbox mailbox, Responder responder, final String
fullMailboxName) {
try {
final MailboxSession mailboxSession = ImapSessionUtils
.getMailboxSession(session);
final SelectedImapMailbox selectedMailbox = session.getSelected();
final boolean isSelectedMailbox = selectedMailbox != null
- && mailbox.getName().equals(selectedMailbox.getName());
+ && fullMailboxName.equals(selectedMailbox.getName());
if (!isSelectedMailbox) {
message.setFlag(Flag.RECENT, true);
}
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=730685&r1=730684&r2=730685&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
Fri Jan 2 01:38:53 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.imap.mailbox.Mailbox;
+import org.apache.james.api.imap.process.SelectedImapMailbox;
import org.apache.james.imap.mailbox.MailboxException;
import org.apache.james.imap.mailbox.MailboxManager;
import org.apache.james.imap.mailbox.MailboxManagerProvider;
@@ -57,9 +57,9 @@
final String mailboxName = request.getMailboxName();
final IdRange[] idSet = request.getIdSet();
final boolean useUids = request.isUseUids();
- Mailbox currentMailbox = ImapSessionUtils.getMailbox(session);
+ final SelectedImapMailbox currentMailbox = session.getSelected();
try {
- String fullMailboxName = buildFullName(session, mailboxName);
+ final String fullMailboxName = buildFullName(session, mailboxName);
final MailboxManager mailboxManager = getMailboxManager(session);
final boolean mailboxExists = mailboxManager
.existsMailbox(fullMailboxName);
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=730685&r1=730684&r2=730685&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
Fri Jan 2 01:38:53 2009
@@ -25,6 +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.imap.mailbox.MailboxException;
import org.apache.james.imap.mailbox.MailboxManager;
import org.apache.james.imap.mailbox.MailboxManagerProvider;
@@ -50,11 +51,9 @@
final String mailboxName = request.getMailboxName();
try {
final String fullMailboxName = buildFullName(session, mailboxName);
- if (session.getSelected() != null) {
- if (ImapSessionUtils.getMailbox(session).getName().equals(
- fullMailboxName)) {
- session.deselect();
- }
+ final SelectedImapMailbox selected = session.getSelected();
+ if (selected != null &&
selected.getName().equals(fullMailboxName)) {
+ session.deselect();
}
final MailboxManager mailboxManager = getMailboxManager(session);
mailboxManager.deleteMailbox(fullMailboxName, ImapSessionUtils
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
