Author: norman
Date: Thu Jan 20 07:06:08 2011
New Revision: 1061139
URL: http://svn.apache.org/viewvc?rev=1061139&view=rev
Log:
Hardcoding the free and wildchar. There is no gain to not do so
Modified:
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxConstants.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxQuery.java
james/mailbox/trunk/api/src/test/java/org/apache/james/mailbox/MailboxExpressionTest.java
Modified:
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxConstants.java
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxConstants.java?rev=1061139&r1=1061138&r2=1061139&view=diff
==============================================================================
---
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxConstants.java
(original)
+++
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxConstants.java
Thu Jan 20 07:06:08 2011
@@ -20,11 +20,13 @@
package org.apache.james.mailbox;
public interface MailboxConstants {
-
+
+ public static final char NAMESPACE_PREFIX_CHAR = '#';
+
/**
* The namespace used for store user inboxes
*/
- public static final String USER_NAMESPACE = "#private";
+ public static final String USER_NAMESPACE = NAMESPACE_PREFIX_CHAR +
"private";
/**
* The default delimiter used to seperated parent/child folders
Modified:
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxQuery.java
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxQuery.java?rev=1061139&r1=1061138&r2=1061139&view=diff
==============================================================================
---
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxQuery.java
(original)
+++
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxQuery.java
Thu Jan 20 07:06:08 2011
@@ -49,8 +49,7 @@ public class MailboxQuery {
* matches any sequence of characters up to the next hierarchy
* delimiter
*/
- public MailboxQuery(final MailboxPath base, final String expression,
- final char freeWildcard, final char localWildcard, final char
pathDelimiter) {
+ public MailboxQuery(final MailboxPath base, final String expression, final
char pathDelimiter) {
super();
this.base = base;
if (base.getName() == null)
@@ -61,8 +60,8 @@ public class MailboxQuery {
this.expression = expression;
}
expressionLength = this.expression.length();
- this.freeWildcard = freeWildcard;
- this.localWildcard = localWildcard;
+ this.freeWildcard = '*';
+ this.localWildcard = '%';
this.pathDelimiter = pathDelimiter;
}
Modified:
james/mailbox/trunk/api/src/test/java/org/apache/james/mailbox/MailboxExpressionTest.java
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/api/src/test/java/org/apache/james/mailbox/MailboxExpressionTest.java?rev=1061139&r1=1061138&r2=1061139&view=diff
==============================================================================
---
james/mailbox/trunk/api/src/test/java/org/apache/james/mailbox/MailboxExpressionTest.java
(original)
+++
james/mailbox/trunk/api/src/test/java/org/apache/james/mailbox/MailboxExpressionTest.java
Thu Jan 20 07:06:08 2011
@@ -36,7 +36,7 @@ public class MailboxExpressionTest {
private MailboxQuery create(String expression) {
- return new MailboxQuery(BASE_PATH, expression, '*', '%', '.');
+ return new MailboxQuery(BASE_PATH, expression, '.');
}
@Test
@@ -56,13 +56,13 @@ public class MailboxExpressionTest {
@Test
public void testCombinedNameEmptyPart() throws Exception {
- MailboxQuery expression = new MailboxQuery(BASE_PATH, "", '*', '%',
'.');
+ MailboxQuery expression = new MailboxQuery(BASE_PATH, "", '.');
assertEquals(BASE, expression.getCombinedName());
}
@Test
public void testNullCombinedName() throws Exception {
- MailboxQuery expression = new MailboxQuery(new MailboxPath(null, null,
null), null, '*', '%', '.');
+ MailboxQuery expression = new MailboxQuery(new MailboxPath(null, null,
null), null, '.');
assertNotNull(expression.getCombinedName());
}
@@ -80,14 +80,14 @@ public class MailboxExpressionTest {
@Test
public void testCombinedNameBaseEndsWithDelimiter() throws Exception {
- MailboxQuery expression = new MailboxQuery(new MailboxPath(null, null,
BASE + '.'), PART, '*', '%', '.');
+ MailboxQuery expression = new MailboxQuery(new MailboxPath(null, null,
BASE + '.'), PART, '.');
assertEquals(BASE + "." + PART, expression.getCombinedName());
}
@Test
public void testCombinedNameBaseEndsWithDelimiterPartStarts()
throws Exception {
- MailboxQuery expression = new MailboxQuery(new MailboxPath(null, null,
BASE + '.'), '.' + PART, '*', '%', '.');
+ MailboxQuery expression = new MailboxQuery(new MailboxPath(null, null,
BASE + '.'), '.' + PART, '.');
assertEquals(BASE + "." + PART, expression.getCombinedName());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
