You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ie...@apache.org on 2011/12/16 16:43:26 UTC
svn commit: r1215190 - in
/james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir:
./ mail/ mail/model/ user/
Author: ieugen
Date: Fri Dec 16 15:43:26 2011
New Revision: 1215190
URL: http://svn.apache.org/viewvc?rev=1215190&view=rev
Log:
Added @Override to methods, updated strange equals between String (was != ).
One test fails.
Modified:
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirMessageName.java
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
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirMessage.java
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/user/MaildirSubscriptionMapper.java
Modified: james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirMessageName.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirMessageName.java?rev=1215190&r1=1215189&r2=1215190&view=diff
==============================================================================
--- james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirMessageName.java (original)
+++ james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirMessageName.java Fri Dec 16 15:43:26 2011
@@ -168,7 +168,7 @@ public class MaildirMessageName {
*/
public String getFullName() {
if (this.fullName == null) {
- StringBuffer fullBuffer = new StringBuffer();
+ StringBuilder fullBuffer = new StringBuilder();
fullBuffer.append(timestamp);
fullBuffer.append(".");
fullBuffer.append(uniqueString);
@@ -203,7 +203,7 @@ public class MaildirMessageName {
*/
public FilenameFilter getFilenameFilter() {
split();
- StringBuffer pattern = new StringBuffer();
+ StringBuilder pattern = new StringBuilder();
pattern.append(timestamp);
pattern.append("\\.");
pattern.append(uniqueString);
@@ -316,7 +316,7 @@ public class MaildirMessageName {
*/
public String getBaseName() {
split();
- StringBuffer baseName = new StringBuffer();
+ StringBuilder baseName = new StringBuilder();
baseName.append(timestamp);
baseName.append(".");
baseName.append(uniqueString);
@@ -331,18 +331,18 @@ public class MaildirMessageName {
* @return A String valid for Maildir
*/
public String encodeFlags(Flags flags) {
- StringBuffer flagsString = new StringBuffer(":2,");
+ StringBuilder localFlagsString = new StringBuilder(":2,");
if (flags.contains(Flags.Flag.DRAFT))
- flagsString.append(FLAG_DRAFT);
+ localFlagsString.append(FLAG_DRAFT);
if (flags.contains(Flags.Flag.FLAGGED))
- flagsString.append(FLAG_FLAGGED);
+ localFlagsString.append(FLAG_FLAGGED);
if (flags.contains(Flags.Flag.ANSWERED))
- flagsString.append(FLAG_ANSWERD);
+ localFlagsString.append(FLAG_ANSWERD);
if (flags.contains(Flags.Flag.SEEN))
- flagsString.append(FLAG_SEEN);
+ localFlagsString.append(FLAG_SEEN);
if (flags.contains(Flags.Flag.DELETED))
- flagsString.append(FLAG_DELETED);
- return flagsString.toString();
+ localFlagsString.append(FLAG_DELETED);
+ return localFlagsString.toString();
}
/**
@@ -352,18 +352,18 @@ public class MaildirMessageName {
* @return A Flags object containing the flags read form the String
*/
public Flags decodeFlags(String flagsString) {
- Flags flags = new Flags();
+ Flags localFlags = new Flags();
if (flagsString.contains(FLAG_DRAFT))
- flags.add(Flags.Flag.DRAFT);
+ localFlags.add(Flags.Flag.DRAFT);
if (flagsString.contains(FLAG_FLAGGED))
- flags.add(Flags.Flag.FLAGGED);
+ localFlags.add(Flags.Flag.FLAGGED);
if (flagsString.contains(FLAG_ANSWERD))
- flags.add(Flags.Flag.ANSWERED);
+ localFlags.add(Flags.Flag.ANSWERED);
if (flagsString.contains(FLAG_SEEN))
- flags.add(Flags.Flag.SEEN);
+ localFlags.add(Flags.Flag.SEEN);
if (flagsString.contains(FLAG_DELETED))
- flags.add(Flags.Flag.DELETED);
- return flags;
+ localFlags.add(Flags.Flag.DELETED);
+ return localFlags;
}
/**
@@ -402,7 +402,7 @@ public class MaildirMessageName {
public static MaildirMessageName createUniqueName(MaildirFolder parentFolder, long size) {
String timestamp = String.valueOf(System.currentTimeMillis());
timestamp = timestamp.substring(0, timestamp.length()-3); // time in seconds
- StringBuffer uniquePart = new StringBuffer();
+ StringBuilder uniquePart = new StringBuilder();
uniquePart.append(Integer.toHexString(random.nextInt())); // random number as hex
uniquePart.append(timestamp.substring(timestamp.length()-3)); // milliseconds
uniquePart.append(processName); // process name
@@ -421,6 +421,7 @@ public class MaildirMessageName {
public static FilenameFilter createRegexFilter(final Pattern pattern) {
return new FilenameFilter() {
+ @Override
public boolean accept(File dir, String name) {
Matcher matcher = pattern.matcher(name);
return matcher.matches();
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=1215190&r1=1215189&r2=1215190&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 Fri Dec 16 15:43:26 2011
@@ -207,7 +207,7 @@ public class MaildirStore implements Uid
// if INBOX => location == maildirLocation
if (name.equals(MailboxConstants.INBOX))
return root;
- StringBuffer folder = new StringBuffer(root);
+ StringBuilder folder = new StringBuilder(root);
if (!root.endsWith(File.pathSeparator))
folder.append(File.separator);
folder.append(".");
@@ -236,6 +236,7 @@ public class MaildirStore implements Uid
/**
* @see org.apache.james.mailbox.store.mail.UidProvider#nextUid(org.apache.james.mailbox.MailboxSession, org.apache.james.mailbox.store.mail.model.Mailbox)
*/
+ @Override
public long nextUid(MailboxSession session, Mailbox<Integer> mailbox) throws MailboxException {
try {
return createMaildirFolder(mailbox).getLastUid(session) +1;
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=1215190&r1=1215189&r2=1215190&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 Fri Dec 16 15:43:26 2011
@@ -63,6 +63,7 @@ public class MaildirMailboxMapper extend
/**
* @see org.apache.james.mailbox.store.mail.MailboxMapper#delete(org.apache.james.mailbox.store.mail.model.Mailbox)
*/
+ @Override
public void delete(Mailbox<Integer> mailbox) throws MailboxException {
String folderName = maildirStore.getFolderName(mailbox);
@@ -97,6 +98,7 @@ public class MaildirMailboxMapper extend
/**
* @see org.apache.james.mailbox.store.mail.MailboxMapper#findMailboxByPath(org.apache.james.mailbox.MailboxPath)
*/
+ @Override
public Mailbox<Integer> findMailboxByPath(MailboxPath mailboxPath)
throws MailboxException, MailboxNotFoundException {
Mailbox<Integer> mailbox = maildirStore.loadMailbox(session, mailboxPath);
@@ -106,6 +108,7 @@ public class MaildirMailboxMapper extend
/**
* @see org.apache.james.mailbox.store.mail.MailboxMapper#findMailboxWithPathLike(org.apache.james.mailbox.MailboxPath)
*/
+ @Override
public List<Mailbox<Integer>> findMailboxWithPathLike(MailboxPath mailboxPath)
throws MailboxException {
final Pattern searchPattern = Pattern.compile("[" + MaildirStore.maildirDelimiter + "]"
@@ -130,6 +133,7 @@ public class MaildirMailboxMapper extend
/**
* @see org.apache.james.mailbox.store.mail.MailboxMapper#hasChildren(org.apache.james.mailbox.store.mail.model.Mailbox, char)
*/
+ @Override
public boolean hasChildren(Mailbox<Integer> mailbox, char delimiter) throws MailboxException, MailboxNotFoundException {
String searchString = mailbox.getName() + MaildirStore.maildirDelimiter + MaildirStore.WILDCARD;
List<Mailbox<Integer>> mailboxes = findMailboxWithPathLike(
@@ -140,11 +144,13 @@ public class MaildirMailboxMapper extend
/**
* @see org.apache.james.mailbox.store.mail.MailboxMapper#save(org.apache.james.mailbox.store.mail.model.Mailbox)
*/
+ @Override
public void save(Mailbox<Integer> mailbox) throws MailboxException {
try {
Mailbox<Integer> originalMailbox = getCachedMailbox(mailbox.getMailboxId());
MaildirFolder folder = maildirStore.createMaildirFolder(mailbox);
- if (originalMailbox.getName() != mailbox.getName()) {
+ // equals with null check
+ if (originalMailbox.getName() == null ? mailbox.getName() != null : !originalMailbox.getName().equals(mailbox.getName())) {
if (folder.exists())
throw new MailboxExistsException(mailbox.getName());
@@ -216,6 +222,7 @@ public class MaildirMailboxMapper extend
/**
* @see org.apache.james.mailbox.store.mail.MailboxMapper#list()
*/
+ @Override
public List<Mailbox<Integer>> list() throws MailboxException {
File maildirRoot = maildirStore.getMaildirRoot();
@@ -239,6 +246,7 @@ public class MaildirMailboxMapper extend
/**
* @see org.apache.james.mailbox.store.transaction.TransactionalMapper#endRequest()
*/
+ @Override
public void endRequest() {
mailboxCache.clear();
}
@@ -293,6 +301,7 @@ public class MaildirMailboxMapper extend
// List all INBOX sub folders.
File[] mailboxes = user.listFiles(new FileFilter() {
+ @Override
public boolean accept(File pathname) {
return pathname.getName().startsWith(".");
}
Modified: james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java?rev=1215190&r1=1215189&r2=1215190&view=diff
==============================================================================
--- james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java (original)
+++ james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java Fri Dec 16 15:43:26 2011
@@ -65,6 +65,7 @@ public class MaildirMessageMapper extend
/**
* @see org.apache.james.mailbox.store.mail.MessageMapper#countMessagesInMailbox(org.apache.james.mailbox.store.mail.model.Mailbox)
*/
+ @Override
public long countMessagesInMailbox(Mailbox<Integer> mailbox) throws MailboxException {
MaildirFolder folder = maildirStore.createMaildirFolder(mailbox);
File newFolder = folder.getNewFolder();
@@ -81,6 +82,7 @@ public class MaildirMessageMapper extend
/**
* @see org.apache.james.mailbox.store.mail.MessageMapper#countUnseenMessagesInMailbox(org.apache.james.mailbox.store.mail.model.Mailbox)
*/
+ @Override
public long countUnseenMessagesInMailbox(Mailbox<Integer> mailbox) throws MailboxException {
MaildirFolder folder = maildirStore.createMaildirFolder(mailbox);
File newFolder = folder.getNewFolder();
@@ -97,6 +99,7 @@ public class MaildirMessageMapper extend
/**
* @see org.apache.james.mailbox.store.mail.MessageMapper#delete(org.apache.james.mailbox.store.mail.model.Mailbox, org.apache.james.mailbox.store.mail.model.Message)
*/
+ @Override
public void delete(Mailbox<Integer> mailbox, Message<Integer> message) throws MailboxException {
MaildirFolder folder = maildirStore.createMaildirFolder(mailbox);
try {
@@ -109,6 +112,7 @@ public class MaildirMessageMapper extend
/**
* @see org.apache.james.mailbox.store.mail.MessageMapper#findInMailbox(org.apache.james.mailbox.store.mail.model.Mailbox, org.apache.james.mailbox.MessageRange, org.apache.james.mailbox.store.mail.MessageMapper.FetchType, int)
*/
+ @Override
public Iterator<Message<Integer>> findInMailbox(Mailbox<Integer> mailbox, MessageRange set, FetchType fType, int max)
throws MailboxException {
final List<Message<Integer>> results;
@@ -214,6 +218,7 @@ public class MaildirMessageMapper extend
/**
* @see org.apache.james.mailbox.store.mail.MessageMapper#findRecentMessageUidsInMailbox(org.apache.james.mailbox.store.mail.model.Mailbox)
*/
+ @Override
public List<Long> findRecentMessageUidsInMailbox(Mailbox<Integer> mailbox)
throws MailboxException {
MaildirFolder folder = maildirStore.createMaildirFolder(mailbox);
@@ -226,6 +231,7 @@ public class MaildirMessageMapper extend
/**
* @see org.apache.james.mailbox.store.mail.MessageMapper#findFirstUnseenMessageUid(org.apache.james.mailbox.store.mail.model.Mailbox)
*/
+ @Override
public Long findFirstUnseenMessageUid(Mailbox<Integer> mailbox)
throws MailboxException {
List<Message<Integer>> result = findMessagesInMailbox(mailbox, MaildirMessageName.FILTER_UNSEEN_MESSAGES, 1);
@@ -240,6 +246,7 @@ public class MaildirMessageMapper extend
/**
* @see org.apache.james.mailbox.store.transaction.TransactionalMapper#endRequest()
*/
+ @Override
public void endRequest() {
// not used
@@ -249,6 +256,7 @@ public class MaildirMessageMapper extend
/**
* @see org.apache.james.mailbox.store.mail.AbstractMessageMapper#copy(org.apache.james.mailbox.store.mail.model.Mailbox, long, long, org.apache.james.mailbox.store.mail.model.Message)
*/
+ @Override
protected MessageMetaData copy(Mailbox<Integer> mailbox, long uid, long modSeq, Message<Integer> original) throws MailboxException {
SimpleMessage<Integer> theCopy = new SimpleMessage<Integer>(mailbox, original);
Flags flags = theCopy.createFlags();
@@ -262,6 +270,7 @@ public class MaildirMessageMapper extend
* org.apache.james.mailbox.store.mail.AbstractMessageMapper#save(org.apache.james.mailbox.store.mail.model.Mailbox,
* org.apache.james.mailbox.store.mail.model.Message)
*/
+ @Override
protected MessageMetaData save(Mailbox<Integer> mailbox, Message<Integer> message) throws MailboxException {
MaildirFolder folder = maildirStore.createMaildirFolder(mailbox);
long uid = 0;
@@ -343,6 +352,7 @@ public class MaildirMessageMapper extend
/**
* @see org.apache.james.mailbox.store.transaction.TransactionalMapper#begin()
*/
+ @Override
protected void begin() throws MailboxException {
//nothing todo
}
@@ -351,6 +361,7 @@ public class MaildirMessageMapper extend
/**
* @see org.apache.james.mailbox.store.transaction.TransactionalMapper#commit()
*/
+ @Override
protected void commit() throws MailboxException {
//nothing todo
}
@@ -359,6 +370,7 @@ public class MaildirMessageMapper extend
/**
* @see org.apache.james.mailbox.store.transaction.TransactionalMapper#rollback()
*/
+ @Override
protected void rollback() throws MailboxException {
//nothing todo
}
@@ -366,6 +378,7 @@ public class MaildirMessageMapper extend
/**
* @see org.apache.james.mailbox.store.mail.MessageMapper#updateFlags(org.apache.james.mailbox.store.mail.model.Mailbox, javax.mail.Flags, boolean, boolean, org.apache.james.mailbox.MessageRange)
*/
+ @Override
public Iterator<UpdatedFlags> updateFlags(final Mailbox<Integer> mailbox, final Flags flags, final boolean value, final boolean replace, final MessageRange set) throws MailboxException {
final List<UpdatedFlags> updatedFlags = new ArrayList<UpdatedFlags>();
final MaildirFolder folder = maildirStore.createMaildirFolder(mailbox);
Modified: james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirMessage.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirMessage.java?rev=1215190&r1=1215189&r2=1215190&view=diff
==============================================================================
--- james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirMessage.java (original)
+++ james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirMessage.java Fri Dec 16 15:43:26 2011
@@ -86,14 +86,17 @@ public class MaildirMessage extends Abst
}
+ @Override
public Integer getMailboxId() {
return mailbox.getMailboxId();
}
+ @Override
public long getUid() {
return uid;
}
+ @Override
public void setUid(long uid) {
this.uid = uid;
}
@@ -102,6 +105,7 @@ public class MaildirMessage extends Abst
* org.apache.james.mailbox.store.mail.model.Message#setFlags(
* javax.mail.Flags)
*/
+ @Override
public void setFlags(Flags flags) {
if (flags != null) {
answered = flags.contains(Flags.Flag.ANSWERED);
@@ -117,6 +121,7 @@ public class MaildirMessage extends Abst
* @see
* org.apache.james.mailbox.store.mail.model.Message#isAnswered()
*/
+ @Override
public boolean isAnswered() {
return answered;
}
@@ -125,6 +130,7 @@ public class MaildirMessage extends Abst
* @see
* org.apache.james.mailbox.store.mail.model.Message#isDeleted()
*/
+ @Override
public boolean isDeleted() {
return deleted;
}
@@ -133,6 +139,7 @@ public class MaildirMessage extends Abst
* @see
* org.apache.james.mailbox.store.mail.model.Message#isDraft()
*/
+ @Override
public boolean isDraft() {
return draft;
}
@@ -141,6 +148,7 @@ public class MaildirMessage extends Abst
* @see
* org.apache.james.mailbox.store.mail.model.Message#isFlagged()
*/
+ @Override
public boolean isFlagged() {
return flagged;
}
@@ -149,6 +157,7 @@ public class MaildirMessage extends Abst
* @see
* org.apache.james.mailbox.store.mail.model.Message#isRecent()
*/
+ @Override
public boolean isRecent() {
return recent;
}
@@ -156,6 +165,7 @@ public class MaildirMessage extends Abst
/**
* @see org.apache.james.mailbox.store.mail.model.Message#isSeen()
*/
+ @Override
public boolean isSeen() {
return seen;
}
@@ -172,7 +182,7 @@ public class MaildirMessage extends Abst
@Override
public String toString() {
- StringBuffer theString = new StringBuffer("MaildirMessage ");
+ StringBuilder theString = new StringBuilder("MaildirMessage ");
theString.append(getUid());
theString.append(" {");
Flags flags = createFlags();
@@ -194,6 +204,7 @@ public class MaildirMessage extends Abst
/**
* @see org.apache.james.mailbox.store.mail.model.Message#getModSeq()
*/
+ @Override
public long getModSeq() {
return modSeq;
}
@@ -201,6 +212,7 @@ public class MaildirMessage extends Abst
/**
* @see org.apache.james.mailbox.store.mail.model.Message#setModSeq(long)
*/
+ @Override
public void setModSeq(long modSeq) {
this.modSeq = modSeq;
}
@@ -316,7 +328,7 @@ public class MaildirMessage extends Abst
private int bodyStartOctet(InputStream msgIn) throws IOException {
// we need to pushback maximal 3 bytes
PushbackInputStream in = new PushbackInputStream(msgIn, 3);
- int bodyStartOctet = in.available();
+ int localBodyStartOctet = in.available();
int i = -1;
int count = 0;
while ((i = in.read()) != -1 && in.available() > 4) {
@@ -329,7 +341,7 @@ public class MaildirMessage extends Abst
int c = in.read();
if (c == 0x0A) {
- bodyStartOctet = count + 4;
+ localBodyStartOctet = count + 4;
break;
}
in.unread(c);
@@ -340,12 +352,13 @@ public class MaildirMessage extends Abst
}
count++;
}
- return bodyStartOctet;
+ return localBodyStartOctet;
}
/**
* @see org.apache.james.mailbox.store.mail.model.Message#getMediaType()
*/
+ @Override
public String getMediaType() {
parseMessage();
return propertyBuilder.getMediaType();
@@ -354,6 +367,7 @@ public class MaildirMessage extends Abst
/**
* @see org.apache.james.mailbox.store.mail.model.Message#getSubType()
*/
+ @Override
public String getSubType() {
parseMessage();
return propertyBuilder.getSubType();
@@ -362,6 +376,7 @@ public class MaildirMessage extends Abst
/**
* @see org.apache.james.mailbox.store.mail.model.Message#getFullContentOctets()
*/
+ @Override
public long getFullContentOctets() {
return messageName.getSize();
}
@@ -369,6 +384,7 @@ public class MaildirMessage extends Abst
/**
* @see org.apache.james.mailbox.store.mail.model.Message#getTextualLineCount()
*/
+ @Override
public Long getTextualLineCount() {
parseMessage();
return propertyBuilder.getTextualLineCount();
@@ -377,6 +393,7 @@ public class MaildirMessage extends Abst
/**
* @see org.apache.james.mailbox.store.mail.model.Message#getProperties()
*/
+ @Override
public List<Property> getProperties() {
parseMessage();
return propertyBuilder.toProperties();
@@ -385,6 +402,7 @@ public class MaildirMessage extends Abst
/**
* @see org.apache.james.mailbox.store.mail.model.Message#getInternalDate()
*/
+ @Override
public Date getInternalDate() {
return messageName.getInternalDate();
}
@@ -400,6 +418,7 @@ public class MaildirMessage extends Abst
/**
* @see org.apache.james.mailbox.store.mail.model.Message#getBodyContent()
*/
+ @Override
public InputStream getBodyContent() throws IOException {
parseMessage();
FileInputStream body = new FileInputStream(messageName.getFile());
@@ -411,6 +430,7 @@ public class MaildirMessage extends Abst
/**
* @see org.apache.james.mailbox.store.mail.model.AbstractMessage#getBodyStartOctet()
*/
+ @Override
protected int getBodyStartOctet() {
parseMessage();
return bodyStartOctet;
Modified: james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/user/MaildirSubscriptionMapper.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/user/MaildirSubscriptionMapper.java?rev=1215190&r1=1215189&r2=1215190&view=diff
==============================================================================
--- james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/user/MaildirSubscriptionMapper.java (original)
+++ james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/user/MaildirSubscriptionMapper.java Fri Dec 16 15:43:26 2011
@@ -49,6 +49,7 @@ public class MaildirSubscriptionMapper e
/**
* @see org.apache.james.mailbox.store.user.SubscriptionMapper#delete(org.apache.james.mailbox.store.user.model.Subscription)
*/
+ @Override
public void delete(Subscription subscription) throws SubscriptionException {
// TODO: we need some kind of file locking here
Set<String> subscriptionNames = readSubscriptionsForUser(subscription.getUser());
@@ -65,6 +66,7 @@ public class MaildirSubscriptionMapper e
/**
* @see org.apache.james.mailbox.store.user.SubscriptionMapper#findSubscriptionsForUser(java.lang.String)
*/
+ @Override
public List<Subscription> findSubscriptionsForUser(String user) throws SubscriptionException {
Set<String> subscriptionNames = readSubscriptionsForUser(user);
ArrayList<Subscription> subscriptions = new ArrayList<Subscription>();
@@ -77,6 +79,7 @@ public class MaildirSubscriptionMapper e
/**
* @see org.apache.james.mailbox.store.user.SubscriptionMapper#findMailboxSubscriptionForUser(java.lang.String, java.lang.String)
*/
+ @Override
public Subscription findMailboxSubscriptionForUser(String user, String mailbox) throws SubscriptionException {
File userRoot = new File(store.userRoot(user));
Set<String> subscriptionNames;
@@ -93,6 +96,7 @@ public class MaildirSubscriptionMapper e
/**
* @see org.apache.james.mailbox.store.user.SubscriptionMapper#save(org.apache.james.mailbox.store.user.model.Subscription)
*/
+ @Override
public void save(Subscription subscription) throws SubscriptionException {
// TODO: we need some kind of file locking here
Set<String> subscriptionNames = readSubscriptionsForUser(subscription.getUser());
@@ -109,6 +113,7 @@ public class MaildirSubscriptionMapper e
/**
* @see org.apache.james.mailbox.store.transaction.TransactionalMapper#endRequest()
*/
+ @Override
public void endRequest() {
// nothing to do
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org