Author: norman
Date: Thu Jan 20 07:07:33 2011
New Revision: 1061141
URL: http://svn.apache.org/viewvc?rev=1061141&view=rev
Log:
Hardcoding the free and wildchar. There is no gain to not do so
Modified:
james/imap/trunk/api/src/main/java/org/apache/james/imap/api/ImapConstants.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/LSubProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/ListProcessor.java
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=1061141&r1=1061140&r2=1061141&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 Jan 20 07:07:33 2011
@@ -109,9 +109,6 @@ public interface ImapConstants {
public static final String SUPPORTS_IDLE = "IDLE";
- public static final char NAMESPACE_PREFIX_CHAR = '#';
-
- public static final String NAMESPACE_PREFIX =
String.valueOf(NAMESPACE_PREFIX_CHAR);
public static final String INBOX_NAME = "INBOX";
Modified:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java?rev=1061141&r1=1061140&r2=1061141&view=diff
==============================================================================
---
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java
(original)
+++
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java
Thu Jan 20 07:07:33 2011
@@ -24,7 +24,6 @@ import java.util.Iterator;
import javax.mail.Flags;
import org.apache.james.imap.api.ImapCommand;
-import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.ImapMessage;
import org.apache.james.imap.api.ImapSessionUtils;
import org.apache.james.imap.api.display.HumanReadableText;
@@ -288,7 +287,7 @@ abstract public class AbstractMailboxPro
if (mailboxName == null || mailboxName.length() == 0) {
return new MailboxPath("", "", "");
}
- if (mailboxName.charAt(0) == ImapConstants.NAMESPACE_PREFIX_CHAR) {
+ if (mailboxName.charAt(0) == MailboxConstants.NAMESPACE_PREFIX_CHAR) {
int namespaceLength =
mailboxName.indexOf(mailboxSession.getPathDelimiter());
if (namespaceLength > -1) {
namespace = mailboxName.substring(0, namespaceLength);
Modified:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/LSubProcessor.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/LSubProcessor.java?rev=1061141&r1=1061140&r2=1061141&view=diff
==============================================================================
---
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/LSubProcessor.java
(original)
+++
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/LSubProcessor.java
Thu Jan 20 07:07:33 2011
@@ -23,7 +23,6 @@ import java.util.ArrayList;
import java.util.Collection;
import org.apache.james.imap.api.ImapCommand;
-import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.ImapMessage;
import org.apache.james.imap.api.ImapSessionUtils;
import org.apache.james.imap.api.display.HumanReadableText;
@@ -60,12 +59,12 @@ public class LSubProcessor extends Abstr
// If the mailboxName is fully qualified, ignore the reference name.
String finalReferencename = referenceName;
- if (mailboxName.charAt(0) == ImapConstants.NAMESPACE_PREFIX_CHAR) {
+ if (mailboxName.charAt(0) == MailboxConstants.NAMESPACE_PREFIX_CHAR) {
finalReferencename = "";
}
// Is the interpreted (combined) pattern relative?
- boolean isRelative = ((finalReferencename + mailboxName).charAt(0) !=
ImapConstants.NAMESPACE_PREFIX_CHAR);
+ boolean isRelative = ((finalReferencename + mailboxName).charAt(0) !=
MailboxConstants.NAMESPACE_PREFIX_CHAR);
MailboxPath basePath = null;
if (isRelative) {
basePath = new MailboxPath(MailboxConstants.USER_NAMESPACE,
@@ -76,7 +75,7 @@ public class LSubProcessor extends Abstr
}
- final MailboxQuery expression = new MailboxQuery(basePath,
mailboxName, '*', '%', mailboxSession.getPathDelimiter());
+ final MailboxQuery expression = new MailboxQuery(basePath,
mailboxName, mailboxSession.getPathDelimiter());
final Collection<String> mailboxResponses = new ArrayList<String>();
for (final String mailbox: mailboxes) {
respond(responder, expression, mailbox, true, mailboxes,
mailboxResponses, mailboxSession.getPathDelimiter());
Modified:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/ListProcessor.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/ListProcessor.java?rev=1061141&r1=1061140&r2=1061141&view=diff
==============================================================================
---
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/ListProcessor.java
(original)
+++
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/ListProcessor.java
Thu Jan 20 07:07:33 2011
@@ -23,7 +23,6 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.james.imap.api.ImapCommand;
-import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.ImapMessage;
import org.apache.james.imap.api.ImapSessionUtils;
import org.apache.james.imap.api.display.HumanReadableText;
@@ -109,7 +108,7 @@ public class ListProcessor extends Abstr
// delimiter and root name of the referenceName argument
String referenceRoot;
- if (referenceName.startsWith(ImapConstants.NAMESPACE_PREFIX)) {
+ if (referenceName.length() > 0 && referenceName.charAt(0) ==
MailboxConstants.NAMESPACE_PREFIX_CHAR) {
// A qualified reference name - get the root element
isRelative = false;
int firstDelimiter =
referenceName.indexOf(mailboxSession.getPathDelimiter());
@@ -133,11 +132,11 @@ public class ListProcessor extends Abstr
else {
// If the mailboxPattern is fully qualified, ignore the
reference name.
String finalReferencename = referenceName;
- if (mailboxName.charAt(0) ==
ImapConstants.NAMESPACE_PREFIX_CHAR) {
+ if (mailboxName.charAt(0) ==
MailboxConstants.NAMESPACE_PREFIX_CHAR) {
finalReferencename = "";
}
// Is the interpreted (combined) pattern relative?
- isRelative = ((finalReferencename + mailboxName).charAt(0) !=
ImapConstants.NAMESPACE_PREFIX_CHAR);
+ isRelative = ((finalReferencename + mailboxName).charAt(0) !=
MailboxConstants.NAMESPACE_PREFIX_CHAR);
MailboxPath basePath = null;
if (isRelative) {
@@ -147,7 +146,7 @@ public class ListProcessor extends Abstr
basePath = buildFullPath(session, finalReferencename);
}
- results = getMailboxManager().search(new
MailboxQuery(basePath, mailboxName, '*', '%',
mailboxSession.getPathDelimiter()),
+ results = getMailboxManager().search(new
MailboxQuery(basePath, mailboxName, mailboxSession.getPathDelimiter()),
mailboxSession);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
