Author: norman Date: Mon Jan 10 14:37:14 2011 New Revision: 1057214 URL: http://svn.apache.org/viewvc?rev=1057214&view=rev Log: Reuse MailboxConstants
Modified: james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirStore.java james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMailboxMapper.java Modified: james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirStore.java URL: http://svn.apache.org/viewvc/james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirStore.java?rev=1057214&r1=1057213&r2=1057214&view=diff ============================================================================== --- james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirStore.java (original) +++ james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirStore.java Mon Jan 10 14:37:14 2011 @@ -21,6 +21,7 @@ package org.apache.james.mailbox.maildir import java.io.File; import java.io.IOException; +import org.apache.james.mailbox.MailboxConstants; import org.apache.james.mailbox.MailboxException; import org.apache.james.mailbox.MailboxNotFoundException; import org.apache.james.mailbox.MailboxPath; @@ -35,7 +36,6 @@ public class MaildirStore implements Uid public static final String PATH_DOMAIN = "%domain"; public static final String PATH_FULLUSER = "%fulluser"; public static final String WILDCARD = "%"; - public static final String INBOX = "INBOX"; public static final String maildirDelimiter = "."; @@ -172,7 +172,7 @@ public class MaildirStore implements Uid */ public String getMailboxNameFromFolderName(String folderName) { String mName; - if (folderName.equals("")) mName = INBOX; + if (folderName.equals("")) mName = MailboxConstants.INBOX; else // remove leading dot mName = folderName.substring(1); @@ -192,7 +192,7 @@ public class MaildirStore implements Uid public String getFolderName(String namespace, String user, String name) { String root = userRoot(user); // if INBOX => location == maildirLocation - if (name.equals(INBOX)) + if (name.equals(MailboxConstants.INBOX)) return root; StringBuffer folder = new StringBuffer(root); if (!root.endsWith(File.pathSeparator)) Modified: james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMailboxMapper.java URL: http://svn.apache.org/viewvc/james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMailboxMapper.java?rev=1057214&r1=1057213&r2=1057214&view=diff ============================================================================== --- james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMailboxMapper.java (original) +++ james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMailboxMapper.java Mon Jan 10 14:37:14 2011 @@ -27,6 +27,7 @@ import java.util.List; import java.util.regex.Pattern; import org.apache.commons.io.FileUtils; +import org.apache.james.mailbox.MailboxConstants; import org.apache.james.mailbox.MailboxException; import org.apache.james.mailbox.MailboxExistsException; import org.apache.james.mailbox.MailboxNotFoundException; @@ -106,7 +107,7 @@ public class MaildirMailboxMapper extend mailboxList.add(cacheMailbox(mailbox)); } // INBOX is in the root of the folder - if (Pattern.matches(mailboxPath.getName().replace(MaildirStore.WILDCARD, ".*"), MaildirStore.INBOX)) { + if (Pattern.matches(mailboxPath.getName().replace(MaildirStore.WILDCARD, ".*"), MailboxConstants.INBOX)) { Mailbox<Integer> mailbox = maildirStore.loadMailbox(root, mailboxPath.getNamespace(), mailboxPath.getUser(), ""); mailboxList.add(0, cacheMailbox(mailbox)); } @@ -138,7 +139,7 @@ public class MaildirMailboxMapper extend MaildirFolder originalFolder = maildirStore.createMaildirFolder(originalMailbox); // renaming the INBOX means to move its contents to the new folder - if (originalMailbox.getName().equals(MaildirStore.INBOX)) { + if (originalMailbox.getName().equals(MailboxConstants.INBOX)) { File inboxFolder = originalFolder.getRootFile(); File newFolder = folder.getRootFile(); if (!newFolder.mkdirs()) @@ -257,9 +258,7 @@ public class MaildirMailboxMapper extend // Special case for INBOX: Let's use the user's folder. - MailboxPath inboxMailboxPath = new MailboxPath("#private", - user.getName() + "@" + domain.getName(), - "INBOX"); + MailboxPath inboxMailboxPath = MailboxPath.inbox(user.getName() + "@" + domain.getName()); mailboxList.add(maildirStore.loadMailbox(user, inboxMailboxPath)); // List all INBOX sub folders. @@ -279,7 +278,7 @@ public class MaildirMailboxMapper extend userName = user.getName() + "@" + domain.getName(); } - MailboxPath mailboxPath = new MailboxPath("#private", + MailboxPath mailboxPath = new MailboxPath(MailboxConstants.USER_NAMESPACE, userName, mailbox.getName().substring(1)); mailboxList.add(maildirStore.loadMailbox(mailbox, mailboxPath)); --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org