Author: norman Date: Sun May 2 13:58:29 2010 New Revision: 940226 URL: http://svn.apache.org/viewvc?rev=940226&view=rev Log: cleanup / javadocs fixes
Modified: james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/RemoveMimeHeader.java james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/All.java james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/AttachmentFileNameIs.java james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/CommandForListserv.java james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/CommandListservMatcher.java james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/CompareNumericHeaderValue.java james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/FetchedFrom.java james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/HasMailAttribute.java james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValue.java james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/SizeGreaterThan.java Modified: james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/RemoveMimeHeader.java URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/RemoveMimeHeader.java?rev=940226&r1=940225&r2=940226&view=diff ============================================================================== --- james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/RemoveMimeHeader.java (original) +++ james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/RemoveMimeHeader.java Sun May 2 13:58:29 2010 @@ -90,8 +90,9 @@ public class RemoveMimeHeader extends Ge } } - /** - * @see org.apache.mailet.GenericMailet#getMailetInfo() + /* + * (non-Javadoc) + * @see org.apache.mailet.base.GenericMailet#getMailetInfo() */ public String getMailetInfo() { return "RemoveMimeHeader Mailet"; Modified: james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/All.java URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/All.java?rev=940226&r1=940225&r2=940226&view=diff ============================================================================== --- james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/All.java (original) +++ james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/All.java Sun May 2 13:58:29 2010 @@ -29,8 +29,10 @@ import java.util.Collection; */ public class All extends GenericMatcher { - /** - * @see org.apache.mailet.GenericMatcher#match(Mail) + + /* + * (non-Javadoc) + * @see org.apache.mailet.base.GenericMatcher#match(org.apache.mailet.Mail) */ public Collection match(Mail mail) { return mail.getRecipients(); Modified: james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/AttachmentFileNameIs.java URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/AttachmentFileNameIs.java?rev=940226&r1=940225&r2=940226&view=diff ============================================================================== --- james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/AttachmentFileNameIs.java (original) +++ james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/AttachmentFileNameIs.java Sun May 2 13:58:29 2010 @@ -85,8 +85,10 @@ public class AttachmentFileNameIs extend /** True if unzip is requested. */ protected boolean unzipIsRequested; - /** - * @see org.apache.mailet.GenericMatcher#init() + + /* + * (non-Javadoc) + * @see org.apache.mailet.base.GenericMatcher#init() */ public void init() throws MessagingException { /* sets up fileNameMasks variable by parsing the condition */ @@ -123,6 +125,7 @@ public class AttachmentFileNameIs extend /** * Either every recipient is matching or neither of them. + * @param mail * @throws MessagingException if no matching attachment is found and at least one exception was thrown */ public Collection match(Mail mail) throws MessagingException { @@ -146,6 +149,8 @@ public class AttachmentFileNameIs extend /** * Checks if <I>part</I> matches with at least one of the <CODE>masks</CODE>. + * + * @param part */ protected boolean matchFound(Part part) throws Exception { @@ -209,6 +214,8 @@ public class AttachmentFileNameIs extend /** * Checks if <I>fileName</I> matches with at least one of the <CODE>masks</CODE>. + * + * @param fileName */ protected boolean matchFound(String fileName) { for (int j = 0; j < masks.length; j++) { @@ -230,6 +237,8 @@ public class AttachmentFileNameIs extend /** * Checks if <I>part</I> is a zip containing a file that matches with at least one of the <CODE>masks</CODE>. + * + *...@param part */ protected boolean matchFoundInZip(Part part) throws MessagingException, IOException { ZipInputStream zis = new ZipInputStream(part.getInputStream()); @@ -256,6 +265,8 @@ public class AttachmentFileNameIs extend /** * Transforms <I>fileName<I> in a trimmed lowercase string usable for matching agains the masks. + * + * @param fileName */ protected String cleanFileName(String fileName) { return fileName.toLowerCase(Locale.US).trim(); Modified: james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/CommandForListserv.java URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/CommandForListserv.java?rev=940226&r1=940225&r2=940226&view=diff ============================================================================== --- james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/CommandForListserv.java (original) +++ james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/CommandForListserv.java Sun May 2 13:58:29 2010 @@ -36,15 +36,19 @@ public class CommandForListserv extends private MailAddress listservAddress; - /** - * @see org.apache.mailet.GenericRecipientMatcher#init() + + /* + * (non-Javadoc) + * @see org.apache.mailet.base.GenericMatcher#init() */ public void init() throws MessagingException { listservAddress = new MailAddress(getCondition()); } - /** - * @see org.apache.mailet.GenericRecipientMatcher#matchRecipient(MailAddress) + + /* + * (non-Javadoc) + * @see org.apache.mailet.base.GenericRecipientMatcher#matchRecipient(org.apache.mailet.MailAddress) */ public boolean matchRecipient(MailAddress recipient) { if (recipient.getDomain().equals(listservAddress.getDomain())) { Modified: james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/CommandListservMatcher.java URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/CommandListservMatcher.java?rev=940226&r1=940225&r2=940226&view=diff ============================================================================== --- james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/CommandListservMatcher.java (original) +++ james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/CommandListservMatcher.java Sun May 2 13:58:29 2010 @@ -27,7 +27,7 @@ import org.apache.mailet.MailAddress; import javax.mail.MessagingException; /** - * CommandListservMatcher is the matcher that pairs with the {...@link org.apache.james.transport.mailets.CommandListservManager} + * CommandListservMatcher is the matcher that pairs with the CommandListservManager * It checks to see if the request is intended for the ListservManager, but doesn't guarantee that it is a valid command. * <br /> * To configure, insert this into the config.xml inside of the root processor block. @@ -39,18 +39,21 @@ import javax.mail.MessagingException; * * @version CVS $Revision$ $Date$ * @since 2.2.0 - * @see org.apache.james.transport.mailets.CommandListservManager */ public class CommandListservMatcher extends GenericRecipientMatcher { private MailAddress listservAddress; + /* + * (non-Javadoc) + * @see org.apache.mailet.base.GenericMatcher#init() + */ public void init() throws MessagingException { listservAddress = new MailAddress(getCondition()); } /** - * This doesn't perform an exact match, but checks to see if the request is at lesast + * This doesn't perform an exact match, but checks to see if the request is at least * intended to go to the list serv manager. * @param recipient * @return true if matches, false otherwise Modified: james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/CompareNumericHeaderValue.java URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/CompareNumericHeaderValue.java?rev=940226&r1=940225&r2=940226&view=diff ============================================================================== --- james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/CompareNumericHeaderValue.java (original) +++ james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/CompareNumericHeaderValue.java Sun May 2 13:58:29 2010 @@ -63,8 +63,9 @@ public class CompareNumericHeaderValue e private Double headerValue; - /** - * @see org.apache.mailet.GenericMatcher#init() + /* + * (non-Javadoc) + * @see org.apache.mailet.base.GenericMatcher#init() */ public void init() throws MessagingException { StringTokenizer st = new StringTokenizer(getCondition(), " \t", false); @@ -121,8 +122,10 @@ public class CompareNumericHeaderValue e } } - /** - * @see org.apache.mailet.GenericMatcher#match(Mail) + + /* + * (non-Javadoc) + * @see org.apache.mailet.base.GenericMatcher#match(org.apache.mailet.Mail) */ public Collection match(Mail mail) throws MessagingException { if (headerName == null) { Modified: james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/FetchedFrom.java URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/FetchedFrom.java?rev=940226&r1=940225&r2=940226&view=diff ============================================================================== --- james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/FetchedFrom.java (original) +++ james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/FetchedFrom.java Sun May 2 13:58:29 2010 @@ -38,8 +38,10 @@ import java.util.Collection; public class FetchedFrom extends GenericMatcher { - /** - * @see org.apache.mailet.GenericMatcher#match(Mail) + + /* + * (non-Javadoc) + * @see org.apache.mailet.base.GenericMatcher#match(org.apache.mailet.Mail) */ public Collection match(Mail mail) throws javax.mail.MessagingException { MimeMessage message = mail.getMessage(); Modified: james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/HasMailAttribute.java URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/HasMailAttribute.java?rev=940226&r1=940225&r2=940226&view=diff ============================================================================== --- james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/HasMailAttribute.java (original) +++ james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/HasMailAttribute.java Sun May 2 13:58:29 2010 @@ -54,6 +54,10 @@ public class HasMailAttribute extends Ge return "Has Mail Attribute Matcher"; } + /* + * (non-Javadoc) + * @see org.apache.mailet.base.GenericMatcher#init() + */ public void init () throws MessagingException { attributeName = getCondition(); Modified: james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValue.java URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValue.java?rev=940226&r1=940225&r2=940226&view=diff ============================================================================== --- james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValue.java (original) +++ james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValue.java Sun May 2 13:58:29 2010 @@ -82,7 +82,7 @@ public class HasMailAttributeWithValue e * <p>Answers the recipients of the mail if the attribute is present, * and has a toString() value equal to the configured value.</p> * - * @see org.apache.mailet.Matcher#match(Mail) + * @param mail */ public Collection match(Mail mail) throws MessagingException { @@ -130,8 +130,9 @@ public class HasMailAttributeWithValue e fieldAttributeValue = attributeValue; } - /** - * @see org.apache.mailet.Matcher#init() + /* + * (non-Javadoc) + * @see org.apache.mailet.base.GenericMatcher#init() */ public void init() throws MessagingException { Modified: james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/SizeGreaterThan.java URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/SizeGreaterThan.java?rev=940226&r1=940225&r2=940226&view=diff ============================================================================== --- james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/SizeGreaterThan.java (original) +++ james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/SizeGreaterThan.java Sun May 2 13:58:29 2010 @@ -39,6 +39,10 @@ public class SizeGreaterThan extends Gen int cutoff = 0; + /* + * (non-Javadoc) + * @see org.apache.mailet.base.GenericMatcher#init() + */ public void init() throws MessagingException { String amount = getCondition(); @@ -62,8 +66,9 @@ public class SizeGreaterThan extends Gen } } - /** - * @see org.apache.mailet.GenericMatcher#match(org.apache.mailet.Mail) + /* + * (non-Javadoc) + * @see org.apache.mailet.base.GenericMatcher#match(org.apache.mailet.Mail) */ public Collection match(Mail mail) throws MessagingException { if (mail.getMessageSize() > cutoff) { --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org