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 fe...@apache.org on 2011/10/06 16:18:51 UTC

svn commit: r1179640 [1/2] - in /james/mailbox/trunk/store/src: main/java/org/apache/james/mailbox/store/ main/java/org/apache/james/mailbox/store/mail/ main/java/org/apache/james/mailbox/store/mail/model/ main/java/org/apache/james/mailbox/store/mail/...

Author: felixk
Date: Thu Oct  6 14:18:49 2011
New Revision: 1179640

URL: http://svn.apache.org/viewvc?rev=1179640&view=rev
Log:
Update javadocs. Not that everything is fully documented now, but at least what was there (mainly links) should be correct again

Modified:
    james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/AbstractDelegatingMailboxListener.java
    james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/AbstractMailboxPathLocker.java
    james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/HashMapDelegatingMailboxListener.java
    james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/JVMMailboxPathLocker.java
    james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MailboxEventDispatcher.java
    james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MailboxMetaData.java
    james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MailboxSessionMapperFactory.java
    james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java
    james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java
    james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/ResultHeader.java
    james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/ResultUtils.java
    james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/SimpleMailboxMetaData.java
    james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/SimpleMailboxSession.java
    james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/SimpleMessageMetaData.java
    james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java
    james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
    james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreSubscriptionManager.java
    james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/AbstractMessageMapper.java
    james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/MailboxMapper.java
    james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/MessageMapper.java
    james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/MessageMapperFactory.java
    james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/AbstractMessage.java
    james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/Mailbox.java
    james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/Message.java
    james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/PropertyBuilder.java
    james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailbox.java
    james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMessage.java
    james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleProperty.java
    james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/quota/FixedQuotaManager.java
    james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/quota/ListeningQuotaManager.java
    james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/ListeningMessageSearchIndex.java
    james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearchIndex.java
    james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearcher.java
    james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearches.java
    james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/SearchUtil.java
    james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/BodyOffsetInputStream.java
    james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/ByteContent.java
    james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/CountingInputStream.java
    james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/InputStreamContent.java
    james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/transaction/NonTransactionalMapper.java
    james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/transaction/TransactionalMapper.java
    james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/user/model/impl/SimpleSubscription.java
    james/mailbox/trunk/store/src/test/java/org/apache/james/mailbox/store/SimpleMailboxMembership.java

Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/AbstractDelegatingMailboxListener.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/AbstractDelegatingMailboxListener.java?rev=1179640&r1=1179639&r2=1179640&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/AbstractDelegatingMailboxListener.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/AbstractDelegatingMailboxListener.java Thu Oct  6 14:18:49 2011
@@ -34,7 +34,8 @@ public abstract class AbstractDelegating
     }
     
     /**
-     * Receive the event and dispatch it to the right {@link MailboxListener} depending on {@link Event#getMailboxPath()}
+     * Receive the event and dispatch it to the right {@link MailboxListener} depending on
+     * {@link org.apache.james.mailbox.MailboxListener.Event#getMailboxPath()}
      */
     public void event(Event event) {
         MailboxPath path = event.getMailboxPath();
@@ -90,8 +91,7 @@ public abstract class AbstractDelegating
         
     }
     
-    /*
-     * (non-Javadoc)
+    /**
      * @see org.apache.james.mailbox.MailboxListenerSupport#addListener(org.apache.james.mailbox.MailboxPath, org.apache.james.mailbox.MailboxListener, org.apache.james.mailbox.MailboxSession)
      */
     public void addListener(MailboxPath path, MailboxListener listener, MailboxSession session) throws MailboxException {
@@ -113,9 +113,7 @@ public abstract class AbstractDelegating
         }
     }
 
-
-    /*
-     * (non-Javadoc)
+    /**
      * @see org.apache.james.mailbox.MailboxListenerSupport#addGlobalListener(org.apache.james.mailbox.MailboxListener, org.apache.james.mailbox.MailboxSession)
      */
     public void addGlobalListener(MailboxListener listener, MailboxSession session) throws MailboxException {
@@ -130,10 +128,7 @@ public abstract class AbstractDelegating
         }
     }
 
-    
-    
-    /*
-     * (non-Javadoc)
+    /**
      * @see org.apache.james.mailbox.MailboxListenerSupport#removeListener(org.apache.james.mailbox.MailboxPath, org.apache.james.mailbox.MailboxListener, org.apache.james.mailbox.MailboxSession)
      */
     public void removeListener(MailboxPath mailboxPath, MailboxListener listener, MailboxSession session) throws MailboxException {
@@ -154,8 +149,7 @@ public abstract class AbstractDelegating
         }
     }
 
-    /*
-     * (non-Javadoc)
+    /**
      * @see org.apache.james.mailbox.MailboxListenerSupport#removeGlobalListener(org.apache.james.mailbox.MailboxListener, org.apache.james.mailbox.MailboxSession)
      */
     public void removeGlobalListener(MailboxListener listener, MailboxSession session) throws MailboxException {

Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/AbstractMailboxPathLocker.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/AbstractMailboxPathLocker.java?rev=1179640&r1=1179639&r2=1179640&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/AbstractMailboxPathLocker.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/AbstractMailboxPathLocker.java Thu Oct  6 14:18:49 2011
@@ -26,8 +26,7 @@ import org.apache.james.mailbox.MailboxS
 
 public abstract class AbstractMailboxPathLocker implements MailboxPathLocker{
 
-    /*
-     * (non-Javadoc)
+    /**
      * @see org.apache.james.mailbox.MailboxPathLocker#executeWithLock(org.apache.james.mailbox.MailboxSession, org.apache.james.mailbox.MailboxPath, org.apache.james.mailbox.MailboxPathLocker.LockAwareExecution)
      */
     public <T> T executeWithLock(MailboxSession session, MailboxPath path, LockAwareExecution<T> execution) throws MailboxException {

Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/HashMapDelegatingMailboxListener.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/HashMapDelegatingMailboxListener.java?rev=1179640&r1=1179639&r2=1179640&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/HashMapDelegatingMailboxListener.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/HashMapDelegatingMailboxListener.java Thu Oct  6 14:18:49 2011
@@ -28,7 +28,8 @@ import org.apache.james.mailbox.MailboxL
 import org.apache.james.mailbox.MailboxPath;
 
 /**
- * Receive a {@link Event} and delegate it to an other {@link MailboxListener} depending on the registered name
+ * Receive a {@link org.apache.james.mailbox.MailboxListener.Event} and delegate it to an other
+ * {@link MailboxListener} depending on the registered name
  *
  */
 public class HashMapDelegatingMailboxListener extends AbstractDelegatingMailboxListener{

Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/JVMMailboxPathLocker.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/JVMMailboxPathLocker.java?rev=1179640&r1=1179639&r2=1179640&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/JVMMailboxPathLocker.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/JVMMailboxPathLocker.java Thu Oct  6 14:18:49 2011
@@ -41,8 +41,7 @@ public final class JVMMailboxPathLocker 
     private final ConcurrentHashMap<MailboxPath, ReadWriteLock> paths = new ConcurrentHashMap<MailboxPath, ReadWriteLock>();
 
 
-    /*
-     * (non-Javadoc)
+    /**
      * @see org.apache.james.mailbox.store.AbstractMailboxPathLocker#lock(org.apache.james.mailbox.MailboxSession, org.apache.james.mailbox.MailboxPath, boolean)
      */
     protected void lock(MailboxSession session, MailboxPath path, boolean writeLock) throws MailboxException {
@@ -57,9 +56,8 @@ public final class JVMMailboxPathLocker 
         getLock(lock, writeLock).lock();
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.mailbox.store.AbstractMailboxPathLocker#unlock(org.apache.james.mailbox.MailboxSession, org.apache.james.mailbox.MailboxPath)
+    /**
+     * @see org.apache.james.mailbox.store.AbstractMailboxPathLocker#unlock(MailboxSession, MailboxPath, boolean)
      */
     protected void unlock(MailboxSession session, MailboxPath path, boolean writeLock) throws MailboxException {
         ReadWriteLock lock = paths.get(path);

Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MailboxEventDispatcher.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MailboxEventDispatcher.java?rev=1179640&r1=1179639&r2=1179640&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MailboxEventDispatcher.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MailboxEventDispatcher.java Thu Oct  6 14:18:49 2011
@@ -33,7 +33,7 @@ import org.apache.james.mailbox.UpdatedF
 import org.apache.james.mailbox.store.mail.model.Mailbox;
 
 /**
- * Helper class to dispatch {@link Event}'s to registerend MailboxListener
+ * Helper class to dispatch {@link org.apache.james.mailbox.MailboxListener.Event}'s to registerend MailboxListener
  */
 public class MailboxEventDispatcher<Id> {
 
@@ -49,9 +49,9 @@ public class MailboxEventDispatcher<Id> 
      * Should get called when a new message was added to a Mailbox. All
      * registered MailboxListener will get triggered then
      * 
-     * @param uids
-     * @param sessionId
-     * @param path
+     * @param session The mailbox session
+     * @param uids Sorted map with uids and message meta data
+     * @param mailbox The mailbox
      */
     public void added(MailboxSession session, SortedMap<Long, MessageMetaData> uids, Mailbox<Id> mailbox) {
         final AddedImpl added = new AddedImpl(session, mailbox, uids);
@@ -62,9 +62,9 @@ public class MailboxEventDispatcher<Id> 
      * Should get called when a message was expunged from a Mailbox. All
      * registered MailboxListener will get triggered then
      * 
-     * @param session
-     * @param uids
-     * @param path
+     * @param session The mailbox session
+     * @param uids Sorted map with uids and message meta data
+     * @param mailbox The mailbox
      */
     public void expunged(final MailboxSession session,  Map<Long, MessageMetaData> uids, Mailbox<Id> mailbox) {
         final ExpungedImpl expunged = new ExpungedImpl(session, mailbox, uids);
@@ -77,9 +77,8 @@ public class MailboxEventDispatcher<Id> 
      * 
      * @param session
      * @param uids
-     * @param path
-     * @param original
-     * @param updated
+     * @param mailbox
+     * @param uflags
      */
     public void flagsUpdated(MailboxSession session, final List<Long> uids, final Mailbox<Id> mailbox, final List<UpdatedFlags> uflags) {
         final FlagsUpdatedImpl flags = new FlagsUpdatedImpl(session, mailbox, uids, uflags);
@@ -92,9 +91,9 @@ public class MailboxEventDispatcher<Id> 
      * Should get called when a Mailbox was renamed. All registered
      * MailboxListener will get triggered then
      * 
+     * @param session
      * @param from
      * @param to
-     * @param sessionId
      */
     public void mailboxRenamed(MailboxSession session, MailboxPath from, Mailbox<Id> to) {
         listener.event(new MailboxRenamedEventImpl(session, from, to));
@@ -115,16 +114,14 @@ public class MailboxEventDispatcher<Id> 
             this.mailbox = mailbox;
         }
 
-        /*
-         * (non-Javadoc)
+        /**
          * @see org.apache.james.mailbox.MailboxListener.MessageEvent#getUids()
          */
         public List<Long> getUids() {
             return new ArrayList<Long>(added.keySet());
         }
 
-        /*
-         * (non-Javadoc)
+        /**
          * @see org.apache.james.mailbox.MailboxListener.Added#getMetaData(long)
          */
         public MessageMetaData getMetaData(long uid) {
@@ -149,16 +146,15 @@ public class MailboxEventDispatcher<Id> 
             this.uids = uids;
             this.mailbox = mailbox;
         }
-        /*
-         * (non-Javadoc)
+
+        /**
          * @see org.apache.james.mailbox.MailboxListener.MessageEvent#getUids()
          */
         public List<Long> getUids() {
             return new ArrayList<Long>(uids.keySet());
         }
         
-        /*
-         * (non-Javadoc)
+        /**
          * @see org.apache.james.mailbox.MailboxListener.Expunged#getMetaData(long)
          */
         public MessageMetaData getMetaData(long uid) {
@@ -188,16 +184,14 @@ public class MailboxEventDispatcher<Id> 
             this.mailbox = mailbox;
         }
 
-        /*
-         * (non-Javadoc)
+        /**
          * @see org.apache.james.mailbox.MailboxListener.MessageEvent#getUids()
          */
         public List<Long> getUids() {
             return uids;
         }
 
-        /*
-         * (non-Javadoc)
+        /**
          * @see org.apache.james.mailbox.MailboxListener.FlagsUpdated#getUpdatedFlags()
          */
         public List<UpdatedFlags> getUpdatedFlags() {
@@ -253,7 +247,7 @@ public class MailboxEventDispatcher<Id> 
      * MailboxListener will get triggered then
      * 
      * @param session
-     * @param path
+     * @param mailbox
      */
     public void mailboxDeleted(MailboxSession session, Mailbox<Id> mailbox) {
         final MailboxDeletion event = new MailboxDeletionImpl(session, mailbox);
@@ -265,7 +259,7 @@ public class MailboxEventDispatcher<Id> 
      * MailboxListener will get triggered then
      * 
      * @param session
-     * @param path
+     * @param mailbox
      */
     public void mailboxAdded(MailboxSession session, Mailbox<Id> mailbox) {
         final MailboxAdded event = new MailboxAddedImpl(session, mailbox);
@@ -287,9 +281,7 @@ public class MailboxEventDispatcher<Id> 
             this.newMailbox = newMailbox;
         }
 
-        /*
-         * (non-Javadoc)
-         * 
+        /**
          * @see
          * org.apache.james.mailbox.MailboxListener.MailboxRenamed#getNewPath()
          */

Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MailboxMetaData.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MailboxMetaData.java?rev=1179640&r1=1179639&r2=1179640&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MailboxMetaData.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MailboxMetaData.java Thu Oct  6 14:18:49 2011
@@ -67,81 +67,77 @@ public class MailboxMetaData implements 
     }
 
     /**
-     * @see {@link Mailbox.MetaData#countRecent()()}
+     * @see MailboxMetaData#countRecent()
      */
     public long countRecent() {
         return recentCount;
     }
 
     /**
-     * @see {@link Mailbox.MetaData#getPermanentFlags()()}
+     * @see MailboxMetaData#getPermanentFlags()
      */
     public Flags getPermanentFlags() {
         return premanentFlags;
     }
 
     /**
-     * @see {@link MessageManager.MetaData#getRecent()}
+     * @see MailboxMetaData#getRecent()
      */
     public List<Long> getRecent() {
         return recent;
     }
 
     /**
-     * @see {@link MessageManager.MetaData#getUidValidity()}
+     * @see MailboxMetaData#getUidValidity()
      */
     public long getUidValidity() {
         return uidValidity;
     }
 
     /**
-     * @see {@link MessageManager.MetaData#getUidNext()}
+     * @see MailboxMetaData#getUidNext()
      */
     public long getUidNext() {
         return nextUid;
     }
 
     /**
-     * @see {@link MessageManager.MetaData#getMessageCount()}
+     * @see MailboxMetaData#getMessageCount()
      */
     public long getMessageCount() {
         return messageCount;
     }
 
     /**
-     * @see {@link MessageManager.MetaData#getUnseenCount()}
+     * @see MailboxMetaData#getUnseenCount()
      */
     public long getUnseenCount() {
         return unseenCount;
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.mailbox.Mailbox.MetaData#getFirstUnseen()
+    /**
+     * @see MailboxMetaData#getFirstUnseen()
      */
     public Long getFirstUnseen() {
         return firstUnseen;
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.mailbox.Mailbox.MetaData#isWriteable()
+    /**
+     * @see MailboxMetaData#isWriteable()
      */
     public boolean isWriteable() {
         return writeable;
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.mailbox.MessageManager.MetaData#getHighestModSeq()
+    /**
+     * @see MailboxMetaData#getHighestModSeq()
      */
     public long getHighestModSeq() {
         return highestModSeq;
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.mailbox.MessageManager.MetaData#isModSeqPermanent()
+    /**
+     * @see MailboxMetaData#isModSeqPermanent()
      */
     public boolean isModSeqPermanent() {
         return modSeqPermanent;

Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MailboxSessionMapperFactory.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MailboxSessionMapperFactory.java?rev=1179640&r1=1179639&r2=1179640&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MailboxSessionMapperFactory.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MailboxSessionMapperFactory.java Thu Oct  6 14:18:49 2011
@@ -42,9 +42,8 @@ public abstract class MailboxSessionMapp
     
     
     
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.mailbox.store.MessageMapperFactory#getMessageMapper(org.apache.james.mailbox.MailboxSession)
+    /**
+     * @see org.apache.james.mailbox.store.mail.MessageMapperFactory#getMessageMapper(MailboxSession)
      */
     @SuppressWarnings("unchecked")
     public MessageMapper<Id> getMessageMapper(MailboxSession session) throws MailboxException {
@@ -66,9 +65,8 @@ public abstract class MailboxSessionMapp
     protected abstract MessageMapper<Id> createMessageMapper(MailboxSession session) throws MailboxException;
 
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.mailbox.store.MailboxMapperFactory#getMailboxMapper(org.apache.james.mailbox.MailboxSession)
+    /**
+     * @see org.apache.james.mailbox.store.mail.MailboxMapperFactory#getMailboxMapper(MailboxSession)
      */
     @SuppressWarnings("unchecked")
     public MailboxMapper<Id> getMailboxMapper(MailboxSession session) throws MailboxException {

Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java?rev=1179640&r1=1179639&r2=1179640&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java Thu Oct  6 14:18:49 2011
@@ -61,45 +61,35 @@ public class MessageResultImpl implement
         
     }
 
-    /*
-     * (non-Javadoc)
-     * 
+    /**
      * @see org.apache.james.mailbox.MessageResult#getUid()
      */
     public long getUid() {
         return message.getUid();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
+    /**
      * @see org.apache.james.mailbox.MessageResult#getInternalDate()
      */
     public Date getInternalDate() {
         return message.getInternalDate();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
+    /**
      * @see org.apache.james.mailbox.MessageResult#getFlags()
      */
     public Flags getFlags() {
         return message.createFlags();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
+    /**
      * @see org.apache.james.mailbox.MessageResult#getSize()
      */
     public long getSize() {
         return message.getFullContentOctets();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
+    /**
      * @see java.lang.Comparable#compareTo(java.lang.Object)
      */
     public int compareTo(MessageResult that) {
@@ -141,9 +131,7 @@ public class MessageResultImpl implement
         return false;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
+    /**
      * @see org.apache.james.mailbox.MessageResult#getFullContent()
      */
     public final Content getFullContent() throws IOException {
@@ -153,9 +141,7 @@ public class MessageResultImpl implement
         return fullContent;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
+    /**
      * @see org.apache.james.mailbox.MessageResult#getBody()
      */
     public final Content getBody() throws IOException {
@@ -179,12 +165,9 @@ public class MessageResultImpl implement
         return retValue;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
+    /**
      * @see
-     * org.apache.james.mailbox.MessageResult#getBody(org.apache.james.mailbox
-     * .MessageResult.MimePath)
+     * org.apache.james.mailbox.MessageResult#getBody(org.apache.james.mailbox.MessageResult.MimePath)
      */
     public Content getBody(MimePath path) throws MailboxException {
         final Content result;
@@ -197,12 +180,9 @@ public class MessageResultImpl implement
         return result;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
+    /**
      * @see
-     * org.apache.james.mailbox.MessageResult#getMimeBody(org.apache.james.mailbox
-     * .MessageResult.MimePath)
+     * org.apache.james.mailbox.MessageResult#getMimeBody(org.apache.james.mailbox.MessageResult.MimePath)
      */
     public Content getMimeBody(MimePath path) throws MailboxException {
         final Content result;
@@ -215,12 +195,9 @@ public class MessageResultImpl implement
         return result;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
+    /**
      * @see
-     * org.apache.james.mailbox.MessageResult#getFullContent(org.apache.james
-     * .mailbox.MessageResult.MimePath)
+     * org.apache.james.mailbox.MessageResult#getFullContent(org.apache.james.mailbox.MessageResult.MimePath)
      */
     public Content getFullContent(MimePath path) throws MailboxException {
         final Content result;
@@ -233,12 +210,9 @@ public class MessageResultImpl implement
         return result;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
+    /**
      * @see
-     * org.apache.james.mailbox.MessageResult#iterateHeaders(org.apache.james
-     * .mailbox.MessageResult.MimePath)
+     * org.apache.james.mailbox.MessageResult#iterateHeaders(org.apache.james.mailbox.MessageResult.MimePath)
      */
     public Iterator<Header> iterateHeaders(MimePath path) throws MailboxException {
         final Iterator<Header> result;
@@ -251,12 +225,9 @@ public class MessageResultImpl implement
         return result;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
+    /**
      * @see
-     * org.apache.james.mailbox.MessageResult#iterateMimeHeaders(org.apache.
-     * james.mailbox.MessageResult.MimePath)
+     * org.apache.james.mailbox.MessageResult#iterateMimeHeaders(org.apache.james.mailbox.MessageResult.MimePath)
      */
     public Iterator<Header> iterateMimeHeaders(MimePath path) throws MailboxException {
         final Iterator<Header> result;
@@ -362,9 +333,7 @@ public class MessageResultImpl implement
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * 
+    /**
      * @see org.apache.james.mailbox.MessageResult#getMimeDescriptor()
      */
     public MimeDescriptor getMimeDescriptor() throws MailboxException {
@@ -387,8 +356,7 @@ public class MessageResultImpl implement
         return mimeDescriptor;
     }
 
-    /*
-     * (non-Javadoc)
+    /**
      * @see org.apache.james.mailbox.MessageMetaData#getModSeq()
      */
     public long getModSeq() {

Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java?rev=1179640&r1=1179639&r2=1179640&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java Thu Oct  6 14:18:49 2011
@@ -51,7 +51,7 @@ public class MimeDescriptorImpl implemen
      * Is this a composite media type (as per RFC2045)?
      * 
      * TODO: Move to Mime4j
-     * @param mediaType, possibly null
+     * @param mediaType possibly null
      * @return true when the type is composite,
      * false otherwise
      */

Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/ResultHeader.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/ResultHeader.java?rev=1179640&r1=1179639&r2=1179640&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/ResultHeader.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/ResultHeader.java Thu Oct  6 14:18:49 2011
@@ -44,24 +44,21 @@ public final class ResultHeader implemen
         size = name.length() + value.length() + 2;
     }
 
-    /*
-     * (non-Javadoc)
+    /**
      * @see org.apache.james.mailbox.MessageResult.Header#getName()
      */
     public String getName() throws MailboxException {
         return name;
     }
 
-    /*
-     * (non-Javadoc)
+    /**
      * @see org.apache.james.mailbox.MessageResult.Header#getValue()
      */
     public String getValue() throws MailboxException {
         return value;
     }
 
-    /*
-     * (non-Javadoc)
+    /**
      * @see org.apache.james.mailbox.Content#size()
      */
     public long size() {
@@ -72,8 +69,7 @@ public final class ResultHeader implemen
         return "[HEADER " + name + ": " + value + "]";
     }
 
-    /*
-     * (non-Javadoc)
+    /**
      * @see org.apache.james.mailbox.InputStreamContent#getInputStream()
      */
     public InputStream getInputStream() throws IOException {

Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/ResultUtils.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/ResultUtils.java?rev=1179640&r1=1179639&r2=1179640&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/ResultUtils.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/ResultUtils.java Thu Oct  6 14:18:49 2011
@@ -101,7 +101,7 @@ public class ResultUtils {
   
     
     /**
-     * Return the {@link MessageResult} for the given {@link MailboxMembership} and {@link FetchGroup}
+     * Return the {@link MessageResult} for the given {@link Message} and {@link FetchGroup}
      * 
      * @param message
      * @param fetchGroup

Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/SimpleMailboxMetaData.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/SimpleMailboxMetaData.java?rev=1179640&r1=1179639&r2=1179640&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/SimpleMailboxMetaData.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/SimpleMailboxMetaData.java Thu Oct  6 14:18:49 2011
@@ -65,27 +65,21 @@ public class SimpleMailboxMetaData imple
         return selectability;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
+    /**
      * @see org.apache.james.mailbox.MailboxMetaData#getHierarchyDelimiter()
      */
     public char getHierarchyDelimiter() {
         return delimiter;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
+    /**
      * @see org.apache.james.mailbox.MailboxMetaData#getPath()
      */
     public MailboxPath getPath() {
         return path;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
+    /**
      * @see java.lang.Object#toString()
      */
     public String toString() {
@@ -121,9 +115,7 @@ public class SimpleMailboxMetaData imple
         return true;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
+    /**
      * @see java.lang.Comparable#compareTo(java.lang.Object)
      */
     public int compareTo(MailboxMetaData o) {

Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/SimpleMailboxSession.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/SimpleMailboxSession.java?rev=1179640&r1=1179639&r2=1179640&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/SimpleMailboxSession.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/SimpleMailboxSession.java Thu Oct  6 14:18:49 2011
@@ -85,32 +85,28 @@ public class SimpleMailboxSession implem
         this.pathSeparator = pathSeparator;
     }
     
-    /*
-     * (non-Javadoc)
+    /**
      * @see org.apache.james.mailbox.MailboxSession#getLog()
      */
     public Logger getLog() {
         return log;
     }
 
-    /*
-     * (non-Javadoc)
+    /**
      * @see org.apache.james.mailbox.MailboxSession#close()
      */
     public void close() {
         open = false;
     }
 
-    /*
-     * (non-Javadoc)
+    /**
      * @see org.apache.james.mailbox.MailboxSession#getSessionId()
      */
     public long getSessionId() {
         return sessionId;
     }
 
-    /*
-     * (non-Javadoc)
+    /**
      * @see org.apache.james.mailbox.MailboxSession#isOpen()
      */
     public boolean isOpen() {
@@ -163,7 +159,7 @@ public class SimpleMailboxSession implem
     }
 
     /**
-     * @see org.apache.james.mailbox.MailboxSession#getSharedSpace()
+     * @see org.apache.james.mailbox.MailboxSession#getSharedSpaces()
      */
     public Collection<String> getSharedSpaces() {
         return sharedSpaces;
@@ -176,16 +172,14 @@ public class SimpleMailboxSession implem
         return localePreferences;
     }
 
-    /*
-     * (non-Javadoc)
+    /**
      * @see org.apache.james.mailbox.MailboxSession#getAttributes()
      */
     public Map<Object, Object> getAttributes() {
         return attributes;
     }
 
-    /*
-     * (non-Javadoc)
+    /**
      * @see org.apache.james.mailbox.MailboxSession.User#getPassword()
      */
     public String getPassword() {
@@ -199,8 +193,7 @@ public class SimpleMailboxSession implem
         return pathSeparator;
     }
 
-    /*
-     * (non-Javadoc)
+    /**
      * @see org.apache.james.mailbox.MailboxSession#getType()
      */
     public SessionType getType() {

Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/SimpleMessageMetaData.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/SimpleMessageMetaData.java?rev=1179640&r1=1179639&r2=1179640&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/SimpleMessageMetaData.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/SimpleMessageMetaData.java Thu Oct  6 14:18:49 2011
@@ -46,34 +46,29 @@ public class SimpleMessageMetaData imple
         this(message.getUid(), message.getModSeq(), message.createFlags(), message.getFullContentOctets(), message.getInternalDate());
     }
     
-    
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.mailbox.MailboxListener.Added.MessageMetaData#getFlags()
+    /**
+     * @see org.apache.james.mailbox.MessageMetaData#getFlags()
      */
     public Flags getFlags() {
         return flags;
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.mailbox.MailboxListener.Added.MessageMetaData#getSize()
+    /**
+     * @see org.apache.james.mailbox.MessageMetaData#getSize()
      */
     public long getSize() {
         return size;
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.mailbox.MailboxListener.Added.MessageMetaData#getInternalDate()
+    /**
+     * @see org.apache.james.mailbox.MessageMetaData#getInternalDate()
      */
     public Date getInternalDate() {
         return internalDate;
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.mailbox.MailboxListener.Added.MessageMetaData#getUid()
+    /**
+     * @see org.apache.james.mailbox.MessageMetaData#getUid()
      */
     public long getUid() {
         return uid;
@@ -95,8 +90,7 @@ public class SimpleMessageMetaData imple
         return result;
     }
 
-    /*
-     * (non-Javadoc)
+    /**
      * @see org.apache.james.mailbox.MessageMetaData#getModSeq()
      */
     public long getModSeq() {

Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java?rev=1179640&r1=1179639&r2=1179640&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java Thu Oct  6 14:18:49 2011
@@ -210,8 +210,7 @@ public class StoreMailboxManager<Id> imp
         return Math.abs(RANDOM.nextInt());
     }
     
-    /*
-     * (non-Javadoc)
+    /**
      * @see org.apache.james.mailbox.MailboxManager#createSystemSession(java.lang.String, org.slf4j.Logger)
      */
     public MailboxSession createSystemSession(String userName, Logger log) {
@@ -238,8 +237,7 @@ public class StoreMailboxManager<Id> imp
         return idGenerator.nextId();
     }
     
-    /*
-     * (non-Javadoc)
+    /**
      * @see org.apache.james.mailbox.MailboxManager#getDelimiter()
      */
     public char getDelimiter() {
@@ -257,8 +255,7 @@ public class StoreMailboxManager<Id> imp
         return authenticator.isAuthentic(userid, passwd);
     }
     
-    /*
-     * (non-Javadoc)
+    /**
      * @see org.apache.james.mailbox.MailboxManager#login(java.lang.String, java.lang.String, org.slf4j.Logger)
      */
     public MailboxSession login(String userid, String passwd, Logger log) throws BadCredentialsException, MailboxException {
@@ -279,7 +276,7 @@ public class StoreMailboxManager<Id> imp
     }
   
     /**
-     * Create a {@link MapperStoreMessageManager} for the given Mailbox. By default this will return a {@link StoreMessageManager}. If
+     * Create a {@link MailboxManager} for the given Mailbox. By default this will return a {@link StoreMessageManager}. If
      * your implementation needs something different, just override this method
      * 
      * @param mailbox
@@ -291,20 +288,20 @@ public class StoreMailboxManager<Id> imp
     }
 
     /**
-     * Create a Mailbox for the given namespace. This will by default return a {@link SimpleMailbox}.
+     * Create a Mailbox for the given mailbox path. This will by default return a {@link SimpleMailbox}.
      * 
      * If you need to return something more special just override this method
      * 
-     * @param namespaceName
+     * @param mailboxPath
+     * @param session
      * @throws MailboxException
      */
     protected org.apache.james.mailbox.store.mail.model.Mailbox<Id> doCreateMailbox(MailboxPath mailboxPath, final MailboxSession session) throws MailboxException {
         return new SimpleMailbox<Id>(mailboxPath, randomUidValidity());
     }
     
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.mailbox.MailboxManager#getMailbox(org.apache.james.imap.api.MailboxPath, org.apache.james.mailbox.MailboxSession)
+    /**
+     * @see org.apache.james.mailbox.MailboxManager#getMailbox(MailboxPath, MailboxSession)
      */
     public org.apache.james.mailbox.MessageManager getMailbox(MailboxPath mailboxPath, MailboxSession session)
     throws MailboxException {
@@ -324,11 +321,8 @@ public class StoreMailboxManager<Id> imp
         }
     }
 
-    
-    
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.mailbox.MailboxManager#createMailbox(org.apache.james.imap.api.MailboxPath, org.apache.james.mailbox.MailboxSession)
+    /**
+     * @see org.apache.james.mailbox.MailboxManager#createMailbox(MailboxPath, MailboxSession)
      */
     public void createMailbox(MailboxPath mailboxPath, final MailboxSession mailboxSession)
     throws MailboxException {
@@ -371,9 +365,8 @@ public class StoreMailboxManager<Id> imp
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.mailbox.MailboxManager#deleteMailbox(org.apache.james.imap.api.MailboxPath, org.apache.james.mailbox.MailboxSession)
+    /**
+     * @see org.apache.james.mailbox.MailboxManager#deleteMailbox(MailboxPath, MailboxSession)
      */
     public void deleteMailbox(final MailboxPath mailboxPath, final MailboxSession session) throws MailboxException {
         session.getLog().info("deleteMailbox " + mailboxPath);
@@ -400,9 +393,8 @@ public class StoreMailboxManager<Id> imp
 
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.mailbox.MailboxManager#renameMailbox(org.apache.james.imap.api.MailboxPath, org.apache.james.imap.api.MailboxPath, org.apache.james.mailbox.MailboxSession)
+    /**
+     * @see org.apache.james.mailbox.MailboxManager#renameMailbox(MailboxPath, MailboxPath, MailboxSession)
      */
     public void renameMailbox(final MailboxPath from, final MailboxPath to, final MailboxSession session) throws MailboxException {
         final Logger log = session.getLog();
@@ -459,9 +451,8 @@ public class StoreMailboxManager<Id> imp
     }
 
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.mailbox.MailboxManager#copyMessages(org.apache.james.mailbox.MessageRange, org.apache.james.imap.api.MailboxPath, org.apache.james.imap.api.MailboxPath, org.apache.james.mailbox.MailboxSession)
+    /**
+     * @see org.apache.james.mailbox.MailboxManager#copyMessages(MessageRange, MailboxPath, MailboxPath, MailboxSession)
      */
     @SuppressWarnings("unchecked")
 	public List<MessageRange> copyMessages(MessageRange set, MailboxPath from, MailboxPath to, MailboxSession session) throws MailboxException {
@@ -480,8 +471,7 @@ public class StoreMailboxManager<Id> imp
         }
     }
 
-    /*
-     * (non-Javadoc)
+    /**
      * @see org.apache.james.mailbox.MailboxManager#search(org.apache.james.mailbox.MailboxQuery, org.apache.james.mailbox.MailboxSession)
      */
     public List<MailboxMetaData> search(final MailboxQuery mailboxExpression, MailboxSession session)
@@ -523,9 +513,8 @@ public class StoreMailboxManager<Id> imp
         return results;
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.mailbox.MailboxManager#mailboxExists(org.apache.james.imap.api.MailboxPath, org.apache.james.mailbox.MailboxSession)
+    /**
+     * @see org.apache.james.mailbox.MailboxManager#mailboxExists(MailboxPath, MailboxSession)
      */
     public boolean mailboxExists(MailboxPath mailboxPath, MailboxSession session) throws MailboxException {
         try {
@@ -538,10 +527,8 @@ public class StoreMailboxManager<Id> imp
 
     }
 
-
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.mailbox.MailboxManager#addListener(org.apache.james.imap.api.MailboxPath, org.apache.james.mailbox.MailboxListener, org.apache.james.mailbox.MailboxSession)
+    /**
+     * @see org.apache.james.mailbox.MailboxManager#addListener(MailboxPath, MailboxListener, MailboxSession)
      */
     public void addListener(MailboxPath path, MailboxListener listener, MailboxSession session) throws MailboxException {
         delegatingListener.addListener(path, listener, session);
@@ -564,8 +551,7 @@ public class StoreMailboxManager<Id> imp
         
     }
 
-    /*
-     * (non-Javadoc)
+    /**
      * @see org.apache.james.mailbox.MailboxManager#list(org.apache.james.mailbox.MailboxSession)
      */
     public List<MailboxPath> list(MailboxSession session) throws MailboxException {
@@ -579,16 +565,14 @@ public class StoreMailboxManager<Id> imp
         
     }
 
-    /*
-     * (non-Javadoc)
+    /**
      * @see org.apache.james.mailbox.MailboxListenerSupport#addGlobalListener(org.apache.james.mailbox.MailboxListener, org.apache.james.mailbox.MailboxSession)
      */
     public void addGlobalListener(MailboxListener listener, MailboxSession session) throws MailboxException {
         delegatingListener.addGlobalListener(listener, session);
     }
 
-    /*
-     * (non-Javadoc)
+    /**
      * @see org.apache.james.mailbox.MailboxListenerSupport#removeListener(org.apache.james.mailbox.MailboxPath, org.apache.james.mailbox.MailboxListener, org.apache.james.mailbox.MailboxSession)
      */
     public void removeListener(MailboxPath mailboxPath, MailboxListener listener, MailboxSession session) throws MailboxException {

Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java?rev=1179640&r1=1179639&r2=1179640&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java Thu Oct  6 14:18:49 2011
@@ -142,7 +142,6 @@ public class StoreMessageManager<Id> imp
     /**
      * Return the underlying {@link Mailbox}
      * 
-     * @param session
      * @return mailbox
      * @throws MailboxException
      */
@@ -190,11 +189,8 @@ public class StoreMessageManager<Id> imp
         return true;
     }
 
-
-
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.mailbox.Mailbox#expunge(org.apache.james.mailbox.MessageRange, org.apache.james.mailbox.MailboxSession)
+    /**
+     * @see org.apache.james.mailbox.MessageManager#expunge(org.apache.james.mailbox.MessageRange, org.apache.james.mailbox.MailboxSession)
      */
     public Iterator<Long> expunge(final MessageRange set, MailboxSession mailboxSession) throws MailboxException {
         if (!isWriteable(mailboxSession)) {
@@ -206,12 +202,11 @@ public class StoreMessageManager<Id> imp
         return uids.keySet().iterator();    
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.mailbox.Mailbox#appendMessage(byte[], java.util.Date, org.apache.james.mailbox.MailboxSession, boolean, javax.mail.Flags)
+    /**
+     * @see org.apache.james.mailbox.MessageManager#appendMessage(java.io.InputStream, java.util.Date, org.apache.james.mailbox.MailboxSession, boolean, javax.mail.Flags)
      */
     public long appendMessage(final InputStream msgIn, Date internalDate,
-            final MailboxSession mailboxSession,final boolean isRecent, final Flags flagsToBeSet)
+            final MailboxSession mailboxSession, final boolean isRecent, final Flags flagsToBeSet)
     throws MailboxException {
         
         File file = null;
@@ -372,7 +367,7 @@ public class StoreMessageManager<Id> imp
 
 
     /**
-     * Create a new {@link MailboxMembership} for the given data
+     * Create a new {@link Message} for the given data
      * 
      * @param internalDate
      * @param size
@@ -396,7 +391,7 @@ public class StoreMessageManager<Id> imp
     
     
     /**
-     * @see {@link Mailbox#getMetaData(boolean, MailboxSession, FetchGroup)}
+     * @see MessageManager#getMetaData(boolean, MailboxSession, org.apache.james.mailbox.MessageManager.MetaData.FetchGroup)
      */
     public MetaData getMetaData(boolean resetRecent, MailboxSession mailboxSession, 
             org.apache.james.mailbox.MessageManager.MetaData.FetchGroup fetchGroup) throws MailboxException {
@@ -479,9 +474,8 @@ public class StoreMessageManager<Id> imp
       
     }
     
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.mailbox.Mailbox#setFlags(javax.mail.Flags, boolean, boolean, org.apache.james.mailbox.MessageRange, org.apache.james.mailbox.MailboxSession)
+    /**
+     * @see org.apache.james.mailbox.MessageManager#setFlags(javax.mail.Flags, boolean, boolean, org.apache.james.mailbox.MessageRange, org.apache.james.mailbox.MailboxSession)
      */
     public Map<Long, Flags> setFlags(final Flags flags, final boolean value, final boolean replace,
             final MessageRange set, MailboxSession mailboxSession) throws MailboxException {
@@ -518,7 +512,7 @@ public class StoreMessageManager<Id> imp
 
 
     /**
-     * Copy the {@link MessageSet} to the {@link MapperStoreMessageManager}
+     * Copy the {@link MessageRange} to the {@link StoreMessageManager}
      * 
      * @param set
      * @param toMailbox
@@ -552,21 +546,14 @@ public class StoreMessageManager<Id> imp
         });
     }
 
-
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.mailbox.Mailbox#getMessageCount(org.apache.james.mailbox.MailboxSession)
+    /**
+     * @see org.apache.james.mailbox.MessageManager#getMessageCount(org.apache.james.mailbox.MailboxSession)
      */
     public long getMessageCount(MailboxSession mailboxSession) throws MailboxException {
         return mapperFactory.getMessageMapper(mailboxSession).countMessagesInMailbox(getMailboxEntity());
     }
 
-
-
-
-
-    /*
-     * (non-Javadoc)
+    /**
      * @see org.apache.james.mailbox.MessageManager#getMessages(org.apache.james.mailbox.MessageRange, org.apache.james.mailbox.MessageResult.FetchGroup, org.apache.james.mailbox.MailboxSession)
      */
     public MessageResultIterator getMessages(final MessageRange set, FetchGroup fetchGroup, MailboxSession mailboxSession) throws MailboxException {
@@ -574,8 +561,6 @@ public class StoreMessageManager<Id> imp
         return new StoreMessageResultIterator<Id>(messageMapper, mailbox, set, fetchBatchSize, fetchGroup);
     }
 
- 
-
     /**
      * Return a List which holds all uids of recent messages and optional reset
      * the recent flag on the messages for the uids
@@ -612,8 +597,7 @@ public class StoreMessageManager<Id> imp
         });
         
     }
-
-    
+   
     protected Map<Long, MessageMetaData> deleteMarkedInMailbox(final MessageRange range, final MailboxSession session) throws MailboxException {
 
         final MessageMapper<Id> messageMapper = mapperFactory.getMessageMapper(session);
@@ -627,12 +611,8 @@ public class StoreMessageManager<Id> imp
         });       
     }
 
-
-
-
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.mailbox.Mailbox#search(org.apache.james.mailbox.SearchQuery, org.apache.james.mailbox.MailboxSession)
+    /**
+     * @see org.apache.james.mailbox.MessageManager#search(org.apache.james.mailbox.SearchQuery, org.apache.james.mailbox.MailboxSession)
      */
     public Iterator<Long> search(SearchQuery query, MailboxSession mailboxSession) throws MailboxException {
         return index.search(mailboxSession, getMailboxEntity(), query);
@@ -656,8 +636,7 @@ public class StoreMessageManager<Id> imp
         return copiedRows.iterator();
     }
 
-    /*
-     * (non-Javadoc)
+    /**
      * @see org.apache.james.mailbox.store.AbstractStoreMessageManager#copy(org.apache.james.mailbox.MessageRange, org.apache.james.mailbox.store.AbstractStoreMessageManager, org.apache.james.mailbox.MailboxSession)
      */
     private SortedMap<Long, MessageMetaData> copy(MessageRange set, final StoreMessageManager<Id> to, final MailboxSession session) throws MailboxException {
@@ -674,13 +653,11 @@ public class StoreMessageManager<Id> imp
         return copiedMessages;
     }
 
-
     /**
      * Return the count of unseen messages
      * 
-     * @param mailbox
      * @param session
-     * @return
+     * @return count of unseen messages
      * @throws MailboxException
      */
     protected long countUnseenMessagesInMailbox(MailboxSession session) throws MailboxException {
@@ -688,12 +665,9 @@ public class StoreMessageManager<Id> imp
         return messageMapper.countUnseenMessagesInMailbox(getMailboxEntity());
     }
 
-
-
     /**
      * Return the uid of the first unseen message or null of none is found
      * 
-     * @param mailbox
      * @param session
      * @return uid
      * @throws MailboxException

Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreSubscriptionManager.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreSubscriptionManager.java?rev=1179640&r1=1179639&r2=1179640&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreSubscriptionManager.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreSubscriptionManager.java Thu Oct  6 14:18:49 2011
@@ -46,8 +46,7 @@ public class StoreSubscriptionManager im
         this.mapperFactory = mapperFactory;
     }
 
-    /*
-     * (non-Javadoc)
+    /**
      * @see org.apache.james.mailbox.SubscriptionManager#subscribe(org.apache.james.mailbox.MailboxSession, java.lang.String)
      */
     public void subscribe(final MailboxSession session, final String mailbox) throws SubscriptionException {
@@ -82,9 +81,7 @@ public class StoreSubscriptionManager im
         return new SimpleSubscription(session.getUser().getUserName(), mailbox);
     }
 
-
-    /*
-     * (non-Javadoc)
+    /**
      * @see org.apache.james.mailbox.SubscriptionManager#subscriptions(org.apache.james.mailbox.MailboxSession)
      */
     public Collection<String> subscriptions(final MailboxSession session) throws SubscriptionException {
@@ -97,8 +94,7 @@ public class StoreSubscriptionManager im
         return results;
     }
 
-    /*
-     * (non-Javadoc)
+    /**
      * @see org.apache.james.mailbox.SubscriptionManager#unsubscribe(org.apache.james.mailbox.MailboxSession, java.lang.String)
      */
     public void unsubscribe(final MailboxSession session, final String mailbox) throws SubscriptionException {
@@ -119,8 +115,7 @@ public class StoreSubscriptionManager im
         }
     }
 
-    /*
-     * (non-Javadoc)
+    /**
      * @see org.apache.james.mailbox.SubscriptionManager#endProcessingRequest(org.apache.james.mailbox.MailboxSession)
      */
     public void endProcessingRequest(MailboxSession session) {

Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/AbstractMessageMapper.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/AbstractMessageMapper.java?rev=1179640&r1=1179639&r2=1179640&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/AbstractMessageMapper.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/AbstractMessageMapper.java Thu Oct  6 14:18:49 2011
@@ -52,16 +52,14 @@ public abstract class AbstractMessageMap
     }
     
     
-    /*
-     * (non-Javadoc)
+    /**
      * @see org.apache.james.mailbox.store.mail.MessageMapper#getHighestModSeq(org.apache.james.mailbox.store.mail.model.Mailbox)
      */
     public long getHighestModSeq(Mailbox<Id> mailbox) throws MailboxException {
         return modSeqProvider.highestModSeq(mailboxSession, mailbox);
     }
 
-    /*
-     * (non-Javadoc)
+    /**
      * @see org.apache.james.mailbox.store.mail.MessageMapper#getLastUid(org.apache.james.mailbox.store.mail.model.Mailbox)
      */
     public long getLastUid(Mailbox<Id> mailbox) throws MailboxException {
@@ -71,8 +69,7 @@ public abstract class AbstractMessageMap
 
 
     
-    /*
-     * (non-Javadoc)
+    /**
      * @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)
      */
     public Iterator<UpdatedFlags> updateFlags(final Mailbox<Id> mailbox, final Flags flags, final boolean value, final boolean replace, final MessageRange set) throws MailboxException {
@@ -117,8 +114,8 @@ public abstract class AbstractMessageMap
         return updatedFlags.iterator();
 
     }
-    /*
-     * (non-Javadoc)
+
+    /**
      * @see org.apache.james.mailbox.store.mail.MessageMapper#add(org.apache.james.mailbox.store.mail.model.Mailbox, org.apache.james.mailbox.store.mail.model.Message)
      */
     public MessageMetaData add(final Mailbox<Id> mailbox, Message<Id> message) throws MailboxException {
@@ -135,8 +132,7 @@ public abstract class AbstractMessageMap
     }
 
     
-    /*
-     * (non-Javadoc)
+    /**
      * @see org.apache.james.mailbox.store.mail.MessageMapper#copy(org.apache.james.mailbox.store.mail.model.Mailbox, org.apache.james.mailbox.store.mail.model.Message)
      */
     public MessageMetaData copy(final Mailbox<Id> mailbox, final Message<Id> original) throws MailboxException {

Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/MailboxMapper.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/MailboxMapper.java?rev=1179640&r1=1179639&r2=1179640&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/MailboxMapper.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/MailboxMapper.java Thu Oct  6 14:18:49 2011
@@ -53,7 +53,7 @@ public interface MailboxMapper<Id> exten
     /**
      * Return the {@link Mailbox} for the given name
      * 
-     * @param name 
+     * @param mailboxName 
      * @return mailbox
      * @throws MailboxException
      * @throws MailboxNotFoundException
@@ -64,7 +64,7 @@ public interface MailboxMapper<Id> exten
     /**
      * Return a List of {@link Mailbox} which name is like the given name
      * 
-     * @param name
+     * @param mailboxPath
      * @return mailboxList
      * @throws MailboxException
      */

Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/MessageMapper.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/MessageMapper.java?rev=1179640&r1=1179639&r2=1179640&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/MessageMapper.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/MessageMapper.java Thu Oct  6 14:18:49 2011
@@ -40,7 +40,7 @@ import org.apache.james.mailbox.store.tr
 public interface MessageMapper<Id> extends Mapper {
 
     /**
-     * Return a List of {@link MailboxMembership} using {@link MailboxMembershipCallback<Id>} which represent the given {@link MessageRange}
+     * Return a {@link Iterator} which holds the messages for the given criterias
      * The list must be ordered by the {@link Message} uid
      * 
      * @param mailbox The mailbox to search
@@ -87,7 +87,7 @@ public interface MessageMapper<Id> exten
 
 
     /**
-     * Delete the given {@link MailboxMembership}
+     * Delete the given {@link Message}
      * 
      * @param mailbox
      * @param message
@@ -106,7 +106,7 @@ public interface MessageMapper<Id> exten
     Long findFirstUnseenMessageUid(Mailbox<Id> mailbox) throws MailboxException;
 
     /**
-     * Return a List of {@link MailboxMembership} which are recent.
+     * Return a List of {@link Message} which are recent.
      * The list must be ordered by the {@link Message} uid. 
      * 
      * @param mailbox
@@ -117,7 +117,7 @@ public interface MessageMapper<Id> exten
 
 
     /**
-     * Add the given {@link MailboxMembership} to the underlying storage. Be aware that implementation may choose to replace the uid of the given message while storing.
+     * Add the given {@link Message} to the underlying storage. Be aware that implementation may choose to replace the uid of the given message while storing.
      * So you should only depend on the returned uid.
      * 
      * 
@@ -143,11 +143,10 @@ public interface MessageMapper<Id> exten
             final MessageRange set) throws MailboxException;
     
     /**
-     * Copy the given {@link MailboxMembership} to a new mailbox and return the uid of the copy. Be aware that the given uid is just a suggestion for the uid of the copied
+     * Copy the given {@link Message} to a new mailbox and return the uid of the copy. Be aware that the given uid is just a suggestion for the uid of the copied
      * message. Implementation may choose to use a different one, so only depend on the returned uid!
      * 
      * @param mailbox the Mailbox to copy to
-     * @param uid the uid to use for the new MailboxMembership.
      * @param original the original to copy
      * @throws StorageException
      */
@@ -167,7 +166,6 @@ public interface MessageMapper<Id> exten
     /**
      * Return the higest mod-sequence which were used for storing a Message in the {@link Mailbox}
      * 
-     * @param session
      * @param mailbox
      * @return lastUid
      * @throws MailboxException
@@ -198,11 +196,11 @@ public interface MessageMapper<Id> exten
          */
         Metadata,
         /**
-         * Fetch the {@link #Metadata}, {@link Property}'s and the {@link Header}'s for the {@link Message}. This includes:
+         * Fetch the {@link #Metadata}, {@link Property}'s and the {@link #Headers}'s for the {@link Message}. This includes:
          * 
          * <p>
          * {@link Message#getProperties()}
-         * {@link Message#getHeaders()}
+         * {@link Message#getHeaderContent()}
          * </p>
          */
         Headers,

Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/MessageMapperFactory.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/MessageMapperFactory.java?rev=1179640&r1=1179639&r2=1179640&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/MessageMapperFactory.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/MessageMapperFactory.java Thu Oct  6 14:18:49 2011
@@ -27,7 +27,6 @@ public interface MessageMapperFactory<Id
      * Create a {@link MessageMapper} instance of return the one which exists for the {@link MailboxSession} already
      * 
      * @param session
-     * @param mailboxId
      * @return mapper
      */
     MessageMapper<Id> getMessageMapper(MailboxSession session) throws MailboxException;

Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/AbstractMessage.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/AbstractMessage.java?rev=1179640&r1=1179639&r2=1179640&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/AbstractMessage.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/AbstractMessage.java Thu Oct  6 14:18:49 2011
@@ -33,8 +33,7 @@ import javax.mail.Flags;
 public abstract class AbstractMessage<Id> implements Message<Id> {
     
 
-    /*
-     * (non-Javadoc)
+    /**
      * @see java.lang.Comparable#compareTo(java.lang.Object)
      */
     public int compareTo(Message<Id> other) {
@@ -44,7 +43,7 @@ public abstract class AbstractMessage<Id
     
 
     /**
-     * @see org.apache.james.mailbox.store.mail.model.MailboxMembership#createFlags()
+     * @see org.apache.james.mailbox.store.mail.model.Message#createFlags()
      */
     public final Flags createFlags() {
         final Flags flags = new Flags();

Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/Mailbox.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/Mailbox.java?rev=1179640&r1=1179639&r2=1179640&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/Mailbox.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/Mailbox.java Thu Oct  6 14:18:49 2011
@@ -37,7 +37,7 @@ public interface Mailbox<Id> {
     
     /**
      * Sets the current namespace for this mailbox.
-     * @param name not null
+     * @param namespace not null
      */
     void setNamespace(String namespace);
 
@@ -49,7 +49,7 @@ public interface Mailbox<Id> {
     
     /**
      * Sets the current user for this mailbox.
-     * @param name not null
+     * @param user not null
      */
     void setUser(String user);
 

Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/Message.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/Message.java?rev=1179640&r1=1179639&r2=1179640&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/Message.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/Message.java Thu Oct  6 14:18:49 2011
@@ -62,7 +62,7 @@ public interface Message<Id> extends Com
      * Set the mod-sequence for the message. This must be called before the message is added to the store 
      * or any flags are changed. This must be unique / sequential.
      * 
-     * @param uid
+     * @param modSeq
      */
     void setModSeq(long modSeq);
     

Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/PropertyBuilder.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/PropertyBuilder.java?rev=1179640&r1=1179639&r2=1179640&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/PropertyBuilder.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/PropertyBuilder.java Thu Oct  6 14:18:49 2011
@@ -83,7 +83,7 @@ public class PropertyBuilder {
 
     /**
      * Aets the number of CRLF in a textual document.
-     * @param CRLF count when document is textual,
+     * @param textualLineCount count when document is textual,
      * null otherwise
      */
     public void setTextualLineCount(Long textualLineCount) {
@@ -149,7 +149,7 @@ public class PropertyBuilder {
      * Sets a multiple valued property.
      * @param namespace not null
      * @param localName not null
-     * @param value null to remove property
+     * @param values null to remove property
      */
     public void setProperty(final String namespace, final String localName, final List<String> values)
     {
@@ -445,7 +445,7 @@ public class PropertyBuilder {
     /**
      * Sets RFC1766 Content-Language.
      * 
-     * @param list of parsed langauge tags from the RFC1766 Content-Language, 
+     * @param values list of parsed language tags from the RFC1766 Content-Language, 
      * possibly empty
      */
     public void setContentLanguage(List<String> values) {

Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailbox.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailbox.java?rev=1179640&r1=1179639&r2=1179640&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailbox.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailbox.java Thu Oct  6 14:18:49 2011
@@ -44,57 +44,49 @@ public class SimpleMailbox<Id> implement
         this.uidValidity = mailbox.getUidValidity();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
+    /**
      * @see org.apache.james.mailbox.store.mail.model.Mailbox#getMailboxId()
      */
     public Id getMailboxId() {
         return id;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
+    /**
      * @see org.apache.james.mailbox.store.mail.model.Mailbox#getNamespace()
      */
     public String getNamespace() {
         return namespace;
     }
 
-    /* (non-Javadoc)
+    /**
      * @see org.apache.james.mailbox.store.mail.model.Mailbox#setNamespace(java.lang.String)
      */
     public void setNamespace(String namespace) {
         this.namespace = namespace;
     }
 
-    /* (non-Javadoc)
+    /**
      * @see org.apache.james.mailbox.store.mail.model.Mailbox#getUser()
      */
     public String getUser() {
         return user;
     }
 
-    /* (non-Javadoc)
+    /**
      * @see org.apache.james.mailbox.store.mail.model.Mailbox#setUser(java.lang.String)
      */
     public void setUser(String user) {
         this.user = user;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
+    /**
      * @see org.apache.james.mailbox.store.mail.model.Mailbox#getName()
      */
     public String getName() {
         return name;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
+    /**
      * @see
      * org.apache.james.mailbox.store.mail.model.Mailbox#setName(java.lang.String
      * )
@@ -103,18 +95,14 @@ public class SimpleMailbox<Id> implement
         this.name = name;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
+    /**
      * @see org.apache.james.mailbox.store.mail.model.Mailbox#getUidValidity()
      */
     public long getUidValidity() {
         return uidValidity;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
+    /**
      * @see java.lang.Object#equals(java.lang.Object)
      */
     @SuppressWarnings("unchecked")
@@ -134,9 +122,7 @@ public class SimpleMailbox<Id> implement
         return false;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
+    /**
      * @see java.lang.Object#hashCode()
      */
     @Override
@@ -149,9 +135,7 @@ public class SimpleMailbox<Id> implement
         return result;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
+    /**
      * @see java.lang.Object#toString()
      */
     @Override

Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMessage.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMessage.java?rev=1179640&r1=1179639&r2=1179640&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMessage.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMessage.java Thu Oct  6 14:18:49 2011
@@ -220,24 +220,21 @@ public class SimpleMessage<Id> extends A
         return bodyStartOctet;
     }
 
-    /*
-     * (non-Javadoc)
+    /**
      * @see org.apache.james.mailbox.store.mail.model.Message#getModSeq()
      */
     public long getModSeq() {
         return modSeq;
     }
 
-    /*
-     * (non-Javadoc)
+    /**
      * @see org.apache.james.mailbox.store.mail.model.Message#setModSeq(long)
      */
     public void setModSeq(long modSeq) {
         this.modSeq = modSeq;
     }
 
-    /*
-     * (non-Javadoc)
+    /**
      * @see org.apache.james.mailbox.store.mail.model.Message#setUid(long)
      */
     public void setUid(long uid) {

Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleProperty.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleProperty.java?rev=1179640&r1=1179639&r2=1179640&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleProperty.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleProperty.java Thu Oct  6 14:18:49 2011
@@ -42,24 +42,21 @@ public final class SimpleProperty implem
         this(property.getNamespace(), property.getLocalName(), property.getValue());
     }
 
-    /*
-     * (non-Javadoc)
+    /**
      * @see org.apache.james.mailbox.store.mail.model.Property#getLocalName()
      */
     public String getLocalName() {
         return localName;
     }
     
-    /*
-     * (non-Javadoc)
+    /**
      * @see org.apache.james.mailbox.store.mail.model.Property#getNamespace()
      */
     public String getNamespace() {
         return namespace;
     }
     
-    /*
-     * (non-Javadoc)
+    /**
      * @see org.apache.james.mailbox.store.mail.model.Property#getValue()
      */
     public String getValue() {

Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/quota/FixedQuotaManager.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/quota/FixedQuotaManager.java?rev=1179640&r1=1179639&r2=1179640&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/quota/FixedQuotaManager.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/quota/FixedQuotaManager.java Thu Oct  6 14:18:49 2011
@@ -27,9 +27,6 @@ import org.apache.james.mailbox.store.St
  * {@link ListeningQuotaManager} which use the same quota for all users.
  * 
  * By default this means not quota at all
- * 
- *
- * @param <Id>
  */
 public class FixedQuotaManager extends ListeningQuotaManager{
 

Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/quota/ListeningQuotaManager.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/quota/ListeningQuotaManager.java?rev=1179640&r1=1179639&r2=1179640&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/quota/ListeningQuotaManager.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/quota/ListeningQuotaManager.java Thu Oct  6 14:18:49 2011
@@ -38,7 +38,7 @@ import org.apache.james.mailbox.store.ma
 import org.apache.james.mailbox.store.mail.MessageMapper.FetchType;
 
 /**
- * {@link QuotaManager} which will keep track of quota by listing for {@link Event}'s.
+ * {@link QuotaManager} which will keep track of quota by listing for {@link org.apache.james.mailbox.MailboxListener.Event}'s.
  * 
  * The whole quota is keeped in memory after it was lazy-fetched on the first access
  *  *
@@ -129,7 +129,6 @@ public abstract class ListeningQuotaMana
      * The returned valued must be in <strong>bytes</strong>
      * 
      * @param session
-     * @param mailbox
      * @return maxBytes
      * @throws MailboxException
      */
@@ -140,8 +139,7 @@ public abstract class ListeningQuotaMana
      * Return the maximum message count which is allowed for the given {@link MailboxSession} (in fact the user which the session is bound to)
      * 
      * @param session
-     * @param mailbox
-     * @return
+     * @return maximum of allowed message count
      * @throws MailboxException
      */
     protected abstract long getMaxMessage(MailboxSession session) throws MailboxException;

Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/ListeningMessageSearchIndex.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/ListeningMessageSearchIndex.java?rev=1179640&r1=1179639&r2=1179640&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/ListeningMessageSearchIndex.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/ListeningMessageSearchIndex.java Thu Oct  6 14:18:49 2011
@@ -64,7 +64,8 @@ public abstract class ListeningMessageSe
     
     
     /**
-     * Process the {@link Event} and update the index if something relevant is received
+     * Process the {@link org.apache.james.mailbox.MailboxListener.Event} and update the index if
+     * something relevant is received
      */
     @SuppressWarnings({ "rawtypes", "unchecked" })
     @Override

Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearchIndex.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearchIndex.java?rev=1179640&r1=1179639&r2=1179640&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearchIndex.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearchIndex.java Thu Oct  6 14:18:49 2011
@@ -38,11 +38,11 @@ import org.apache.james.mailbox.store.ma
 public interface MessageSearchIndex<Id> {
     
     /**
-     * Return all uids of the previous indexed {@link MailboxMembership}'s which match the {@link SearchQuery}
+     * Return all uids of the previous indexed {@link Mailbox}'s which match the {@link SearchQuery}
      * 
      * @param mailbox
      * @param searchQuery
-     * @return
+     * @return Iterator on found uids
      * @throws MailboxException
      */
     Iterator<Long> search(MailboxSession session, Mailbox<Id> mailbox, SearchQuery searchQuery) throws MailboxException;

Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearcher.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearcher.java?rev=1179640&r1=1179639&r2=1179640&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearcher.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearcher.java Thu Oct  6 14:18:49 2011
@@ -72,8 +72,8 @@ public class MessageSearcher {
     /**
      * Sets whether the search should include headers.
      * 
-     * @param true
-     *            if header values are included, false otherwise
+     * @param includesHeaders
+     *            <code>true</code> if header values are included, <code>false</code> otherwise
      */
     public synchronized void setIncludeHeaders(boolean includesHeaders) {
         this.includeHeaders = includesHeaders;

Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearches.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearches.java?rev=1179640&r1=1179639&r2=1179640&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearches.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearches.java Thu Oct  6 14:18:49 2011
@@ -100,9 +100,11 @@ public class MessageSearches implements 
      * 
      * @param query
      *            <code>SearchQuery</code>, not null
-     * @param row
-     *            <code>MessageRow</code>, not null
-     * @return true if the row matches the given criteria, false otherwise
+     * @param message
+     *            <code>Message</code>, not null
+     * @param log
+     *            the logger to use
+     * @return <code>true</code> if the row matches the given criteria, <code>false</code> otherwise
      * @throws MailboxException 
      */
     public static boolean isMatch(final SearchQuery query, final Message<?> message, Logger log)
@@ -125,11 +127,15 @@ public class MessageSearches implements 
     /**
      * Does the row match the given criterion?
      * 
-     * @param query
-     *            <code>SearchQuery.Criterion</code>, not null
+     * @param criterion
+     *            the criterion to use
      * @param message
-     *            <code>MessageRow</code>, not null
-     * @return true if the row matches the given criterion, false otherwise
+     *            <code>Message</code>, not null
+     * @param recentMessageUids
+     *            collection of recent message uids
+     * @param log
+     *            the logger to use
+     * @return <code>true</code> if the row matches the given criterion, <code>false</code> otherwise
      * @throws MailboxException 
      */
     public static boolean isMatch(SearchQuery.Criterion criterion, Message<?> message,

Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/SearchUtil.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/SearchUtil.java?rev=1179640&r1=1179639&r2=1179640&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/SearchUtil.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/SearchUtil.java Thu Oct  6 14:18:49 2011
@@ -101,7 +101,7 @@ public class SearchUtil {
     /**
      * Parse the headerValue and delegate to {@link #getDisplayAddress(Mailbox)}
      * 
-     * If an {@link ParseException} was thrown, an empty String is returned
+     * If no display address is found an empty String is returned
      * 
      * @param headerValue
      * @return display
@@ -143,7 +143,7 @@ public class SearchUtil {
     /**
      * Parse the headerValue and delegate to {@link #getMailboxAddress(Mailbox)}
      * 
-     * If an {@link ParseException} was thrown, an empty String is returned
+     * If no mailbox name is found an empty String is returned
      * 
      * @param headerValue
      * @return mailbox

Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/BodyOffsetInputStream.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/BodyOffsetInputStream.java?rev=1179640&r1=1179639&r2=1179640&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/BodyOffsetInputStream.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/BodyOffsetInputStream.java Thu Oct  6 14:18:49 2011
@@ -40,8 +40,7 @@ public class BodyOffsetInputStream exten
         this.in = new PushbackInputStream(in, 3);
     }
 
-    /*
-     * (non-Javadoc)
+    /**
      * @see java.io.InputStream#read()
      */
     public int read() throws IOException {

Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/ByteContent.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/ByteContent.java?rev=1179640&r1=1179639&r2=1179640&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/ByteContent.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/ByteContent.java Thu Oct  6 14:18:49 2011
@@ -39,8 +39,7 @@ public final class ByteContent implement
         size = contents.length;
     }
 
-    /*
-     * (non-Javadoc)
+    /**
      * @see org.apache.james.mailbox.Content#size()
      */
     public long size() {

Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/CountingInputStream.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/CountingInputStream.java?rev=1179640&r1=1179639&r2=1179640&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/CountingInputStream.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/CountingInputStream.java Thu Oct  6 14:18:49 2011
@@ -43,8 +43,7 @@ final public class CountingInputStream e
         this.in = in;
     }
 
-    /*
-     * (non-Javadoc)
+    /**
      * @see java.io.InputStream#read()
      */
     public int read() throws IOException {

Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/InputStreamContent.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/InputStreamContent.java?rev=1179640&r1=1179639&r2=1179640&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/InputStreamContent.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/InputStreamContent.java Thu Oct  6 14:18:49 2011
@@ -42,8 +42,7 @@ public final class InputStreamContent im
         this.type = type;
     }
     
-    /*
-     * (non-Javadoc)
+    /**
      * @see org.apache.james.mailbox.Content#size()
      */
     public long size() {
@@ -56,8 +55,7 @@ public final class InputStreamContent im
         }
     }
 
-    /*
-     * (non-Javadoc)
+    /**
      * @see org.apache.james.mailbox.InputStreamContent#getInputStream()
      */
     public InputStream getInputStream() throws IOException {

Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/transaction/NonTransactionalMapper.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/transaction/NonTransactionalMapper.java?rev=1179640&r1=1179639&r2=1179640&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/transaction/NonTransactionalMapper.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/transaction/NonTransactionalMapper.java Thu Oct  6 14:18:49 2011
@@ -28,7 +28,7 @@ import org.apache.james.mailbox.MailboxE
  */
 public abstract class NonTransactionalMapper implements Mapper {
 
-	/* (non-Javadoc)
+    /**
 	 * @see org.apache.james.mailbox.store.transaction.Mapper#execute(org.apache.james.mailbox.store.transaction.Mapper.Transaction)
 	 */
 	public final <T> T execute(Transaction<T> transaction) throws MailboxException {

Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/transaction/TransactionalMapper.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/transaction/TransactionalMapper.java?rev=1179640&r1=1179639&r2=1179640&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/transaction/TransactionalMapper.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/transaction/TransactionalMapper.java Thu Oct  6 14:18:49 2011
@@ -28,9 +28,8 @@ import org.apache.james.mailbox.MailboxE
  */
 public abstract class TransactionalMapper implements Mapper {
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.mailbox.store.transaction.TransactionalMapper#execute(org.apache.james.mailbox.store.transaction.TransactionalMapper.Transaction)
+    /**
+     * @see org.apache.james.mailbox.store.transaction.Mapper#execute(org.apache.james.mailbox.store.transaction.Mapper.Transaction)
      */
     public final <T> T execute(Transaction<T> transaction) throws MailboxException {
         begin();



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org