Author: rdonkin
Date: Sat Jan 3 11:49:30 2009
New Revision: 731072
URL: http://svn.apache.org/viewvc?rev=731072&view=rev
Log:
Remove unnecessary variable
Modified:
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/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/CreateProcessor.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/LSubProcessor.java
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/ListProcessor.java
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/LoginProcessor.java
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/RenameProcessor.java
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/StatusProcessor.java
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/SubscribeProcessor.java
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/UnsubscribeProcessor.java
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=731072&r1=731071&r2=731072&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 11:49:30 2009
@@ -217,7 +217,7 @@
private Mailbox getMailbox(final ImapSession session, final
SelectedImapMailbox selected) throws MailboxException {
final String fullMailboxName = buildFullName(session,
selected.getName());
- final MailboxManager mailboxManager = getMailboxManager(session);
+ final MailboxManager mailboxManager = getMailboxManager();
final Mailbox mailbox = mailboxManager.getMailbox(fullMailboxName);
return mailbox;
}
@@ -295,20 +295,14 @@
public String buildFullName(final ImapSession session, String mailboxName)
throws MailboxException {
final String user = ImapSessionUtils.getUserName(session);
- return buildFullName(mailboxName, user);
- }
-
- private String buildFullName(String mailboxName, String user)
- throws MailboxException {
if (!mailboxName.startsWith(NAMESPACE_PREFIX)) {
mailboxName = mailboxManagerProvider.getMailboxManager().resolve(
user, mailboxName);
}
return mailboxName;
}
-
- public MailboxManager getMailboxManager(final ImapSession session)
- throws MailboxException {
+
+ public MailboxManager getMailboxManager() throws MailboxException {
// TODO: consolidate API by deleting provider and supply manager direct
final MailboxManager result =
mailboxManagerProvider.getMailboxManager();
return result;
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=731072&r1=731071&r2=731072&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 11:49:30 2009
@@ -176,7 +176,7 @@
private void selectMailbox(String mailboxName, ImapSession session)
throws MailboxException {
- final MailboxManager mailboxManager = getMailboxManager(session);
+ final MailboxManager mailboxManager = getMailboxManager();
final Mailbox mailbox = mailboxManager.getMailbox(mailboxName);
final MailboxSession mailboxSession = ImapSessionUtils
.getMailboxSession(session);
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=731072&r1=731071&r2=731072&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 11:49:30 2009
@@ -72,7 +72,7 @@
try {
final String fullMailboxName = buildFullName(session, mailboxName);
- final MailboxManager mailboxManager = getMailboxManager(session);
+ final MailboxManager mailboxManager = getMailboxManager();
final Mailbox mailbox = mailboxManager.getMailbox(fullMailboxName);
appendToMailbox(mimeMessage, datetime, session, tag, command,
mailbox, responder, fullMailboxName);
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=731072&r1=731071&r2=731072&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 11:49:30 2009
@@ -60,7 +60,7 @@
final SelectedImapMailbox currentMailbox = session.getSelected();
try {
final String fullMailboxName = buildFullName(session, mailboxName);
- final MailboxManager mailboxManager = getMailboxManager(session);
+ final MailboxManager mailboxManager = getMailboxManager();
final boolean mailboxExists = mailboxManager
.mailboxExists(fullMailboxName);
if (!mailboxExists) {
Modified:
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/CreateProcessor.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/CreateProcessor.java?rev=731072&r1=731071&r2=731072&view=diff
==============================================================================
---
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/CreateProcessor.java
(original)
+++
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/CreateProcessor.java
Sat Jan 3 11:49:30 2009
@@ -50,7 +50,7 @@
try {
final String fullMailboxName = buildFullName(session, mailboxName);
- final MailboxManager mailboxManager = getMailboxManager(session);
+ final MailboxManager mailboxManager = getMailboxManager();
mailboxManager.createMailbox(fullMailboxName);
unsolicitedResponses(session, responder, false);
okComplete(command, tag, responder);
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=731072&r1=731071&r2=731072&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 11:49:30 2009
@@ -55,7 +55,7 @@
if (selected != null &&
selected.getName().equals(fullMailboxName)) {
session.deselect();
}
- final MailboxManager mailboxManager = getMailboxManager(session);
+ final MailboxManager mailboxManager = getMailboxManager();
mailboxManager.deleteMailbox(fullMailboxName, ImapSessionUtils
.getMailboxSession(session));
unsolicitedResponses(session, responder, false);
Modified:
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/LSubProcessor.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/LSubProcessor.java?rev=731072&r1=731071&r2=731072&view=diff
==============================================================================
---
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/LSubProcessor.java
(original)
+++
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/LSubProcessor.java
Sat Jan 3 11:49:30 2009
@@ -91,7 +91,7 @@
final String referenceName, final String mailboxPattern)
throws SubscriptionException, MailboxException {
final String userName = ImapSessionUtils.getUserName(session);
- final MailboxManager manager = getMailboxManager(session);
+ final MailboxManager manager = getMailboxManager();
final Collection mailboxes = manager.subscriptions(userName);
final MailboxExpression expression = new MailboxExpression(
referenceName, mailboxPattern, '*', '%');
Modified:
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/ListProcessor.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/ListProcessor.java?rev=731072&r1=731071&r2=731072&view=diff
==============================================================================
---
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/ListProcessor.java
(original)
+++
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/ListProcessor.java
Sat Jan 3 11:49:30 2009
@@ -188,7 +188,7 @@
protected final ListResult[] doList(ImapSession session, String base,
String pattern) throws MailboxException {
- final MailboxManager mailboxManager = getMailboxManager(session);
+ final MailboxManager mailboxManager = getMailboxManager();
final ListResult[] result = mailboxManager.list(new MailboxExpression(
base, pattern, '*', '%'));
return result;
Modified:
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/LoginProcessor.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/LoginProcessor.java?rev=731072&r1=731071&r2=731072&view=diff
==============================================================================
---
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/LoginProcessor.java
(original)
+++
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/LoginProcessor.java
Sat Jan 3 11:49:30 2009
@@ -61,7 +61,7 @@
final LoginRequest request = (LoginRequest) message;
final String userid = request.getUserid();
final String passwd = request.getPassword();
- final MailboxManager mailboxManager = getMailboxManager(session);
+ final MailboxManager mailboxManager = getMailboxManager();
if (mailboxManager.isAuthentic(userid, passwd)) {
session.authenticated();
final MailboxSession mailboxSession =
mailboxManager.createSession();
Modified:
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/RenameProcessor.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/RenameProcessor.java?rev=731072&r1=731071&r2=731072&view=diff
==============================================================================
---
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/RenameProcessor.java
(original)
+++
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/RenameProcessor.java
Sat Jan 3 11:49:30 2009
@@ -55,7 +55,7 @@
final String fullExistingName = buildFullName(session,
existingName);
final String fullNewName = buildFullName(session, newName);
- final MailboxManager mailboxManager = getMailboxManager(session);
+ final MailboxManager mailboxManager = getMailboxManager();
mailboxManager.renameMailbox(fullExistingName, fullNewName);
okComplete(command, tag, responder);
unsolicitedResponses(session, responder, false);
Modified:
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/StatusProcessor.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/StatusProcessor.java?rev=731072&r1=731071&r2=731072&view=diff
==============================================================================
---
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/StatusProcessor.java
(original)
+++
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/StatusProcessor.java
Sat Jan 3 11:49:30 2009
@@ -66,7 +66,7 @@
+ " (" + fullMailboxName + ")");
}
- final MailboxManager mailboxManager = getMailboxManager(session);
+ final MailboxManager mailboxManager = getMailboxManager();
final Mailbox mailbox = mailboxManager.getMailbox(fullMailboxName);
final Long messages = messages(statusDataItems, mailboxSession,
Modified:
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/SubscribeProcessor.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/SubscribeProcessor.java?rev=731072&r1=731071&r2=731072&view=diff
==============================================================================
---
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/SubscribeProcessor.java
(original)
+++
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/SubscribeProcessor.java
Sat Jan 3 11:49:30 2009
@@ -52,7 +52,7 @@
final String mailboxName = request.getMailboxName();
final String userName = ImapSessionUtils.getUserName(session);
try {
- final MailboxManager manager = getMailboxManager(session);
+ final MailboxManager manager = getMailboxManager();
manager.subscribe(userName, mailboxName);
unsolicitedResponses(session, responder, false);
Modified:
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/UnsubscribeProcessor.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/UnsubscribeProcessor.java?rev=731072&r1=731071&r2=731072&view=diff
==============================================================================
---
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/UnsubscribeProcessor.java
(original)
+++
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/UnsubscribeProcessor.java
Sat Jan 3 11:49:30 2009
@@ -52,7 +52,7 @@
final String mailboxName = request.getMailboxName();
final String userName = ImapSessionUtils.getUserName(session);
try {
- final MailboxManager mailboxManager = getMailboxManager(session);
+ final MailboxManager mailboxManager = getMailboxManager();
mailboxManager.unsubscribe(userName, mailboxName);
unsolicitedResponses(session, responder, false);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
