Author: norman Date: Thu Jul 27 08:10:07 2006 New Revision: 426098 URL: http://svn.apache.org/viewvc?rev=426098&view=rev Log: Code cleanup Add javadocs
Modified: james/server/trunk/src/java/org/apache/james/transport/matchers/AbstractQuotaMatcher.java james/server/trunk/src/java/org/apache/james/transport/matchers/All.java james/server/trunk/src/java/org/apache/james/transport/matchers/AttachmentFileNameIs.java james/server/trunk/src/java/org/apache/james/transport/matchers/CommandForListserv.java james/server/trunk/src/java/org/apache/james/transport/matchers/CompareNumericHeaderValue.java james/server/trunk/src/java/org/apache/james/transport/matchers/FetchedFrom.java james/server/trunk/src/java/org/apache/james/transport/matchers/FileRegexMatcher.java james/server/trunk/src/java/org/apache/james/transport/matchers/GenericRegexMatcher.java james/server/trunk/src/java/org/apache/james/transport/matchers/IsInWhiteList.java Modified: james/server/trunk/src/java/org/apache/james/transport/matchers/AbstractQuotaMatcher.java URL: http://svn.apache.org/viewvc/james/server/trunk/src/java/org/apache/james/transport/matchers/AbstractQuotaMatcher.java?rev=426098&r1=426097&r2=426098&view=diff ============================================================================== --- james/server/trunk/src/java/org/apache/james/transport/matchers/AbstractQuotaMatcher.java (original) +++ james/server/trunk/src/java/org/apache/james/transport/matchers/AbstractQuotaMatcher.java Thu Jul 27 08:10:07 2006 @@ -72,7 +72,6 @@ * @return true if over quota */ protected boolean isOverQuota(MailAddress address, Mail mail) { - String user = address.getUser(); try { boolean over = getQuota(address, mail) < getUsed(address, mail); if (over) log(address + " is over quota."); Modified: james/server/trunk/src/java/org/apache/james/transport/matchers/All.java URL: http://svn.apache.org/viewvc/james/server/trunk/src/java/org/apache/james/transport/matchers/All.java?rev=426098&r1=426097&r2=426098&view=diff ============================================================================== --- james/server/trunk/src/java/org/apache/james/transport/matchers/All.java (original) +++ james/server/trunk/src/java/org/apache/james/transport/matchers/All.java Thu Jul 27 08:10:07 2006 @@ -16,9 +16,6 @@ * specific language governing permissions and limitations * * under the License. * ****************************************************************/ - - - package org.apache.james.transport.matchers; import org.apache.mailet.GenericMatcher; @@ -30,6 +27,10 @@ * @version 1.0.0, 24/04/1999 */ public class All extends GenericMatcher { + + /** + * @see org.apache.mailet.GenericMatcher#match(Mail) + */ public Collection match(Mail mail) { return mail.getRecipients(); } Modified: james/server/trunk/src/java/org/apache/james/transport/matchers/AttachmentFileNameIs.java URL: http://svn.apache.org/viewvc/james/server/trunk/src/java/org/apache/james/transport/matchers/AttachmentFileNameIs.java?rev=426098&r1=426097&r2=426098&view=diff ============================================================================== --- james/server/trunk/src/java/org/apache/james/transport/matchers/AttachmentFileNameIs.java (original) +++ james/server/trunk/src/java/org/apache/james/transport/matchers/AttachmentFileNameIs.java Thu Jul 27 08:10:07 2006 @@ -85,6 +85,9 @@ /** True if unzip is requested. */ protected boolean unzipIsRequested; + /** + * @see org.apache.mailet.GenericMatcher#init() + */ public void init() throws MessagingException { /* sets up fileNameMasks variable by parsing the condition */ Modified: james/server/trunk/src/java/org/apache/james/transport/matchers/CommandForListserv.java URL: http://svn.apache.org/viewvc/james/server/trunk/src/java/org/apache/james/transport/matchers/CommandForListserv.java?rev=426098&r1=426097&r2=426098&view=diff ============================================================================== --- james/server/trunk/src/java/org/apache/james/transport/matchers/CommandForListserv.java (original) +++ james/server/trunk/src/java/org/apache/james/transport/matchers/CommandForListserv.java Thu Jul 27 08:10:07 2006 @@ -36,10 +36,16 @@ private MailAddress listservAddress; + /** + * @see org.apache.mailet.GenericRecipientMatcher#init() + */ public void init() throws MessagingException { listservAddress = new MailAddress(getCondition()); } + /** + * @see org.apache.mailet.GenericRecipientMatcher#matchRecipient(MailAddress) + */ public boolean matchRecipient(MailAddress recipient) { if (recipient.getHost().equals(listservAddress.getHost())) { if (recipient.getUser().equals(listservAddress.getUser() + "-on") Modified: james/server/trunk/src/java/org/apache/james/transport/matchers/CompareNumericHeaderValue.java URL: http://svn.apache.org/viewvc/james/server/trunk/src/java/org/apache/james/transport/matchers/CompareNumericHeaderValue.java?rev=426098&r1=426097&r2=426098&view=diff ============================================================================== --- james/server/trunk/src/java/org/apache/james/transport/matchers/CompareNumericHeaderValue.java (original) +++ james/server/trunk/src/java/org/apache/james/transport/matchers/CompareNumericHeaderValue.java Thu Jul 27 08:10:07 2006 @@ -63,6 +63,9 @@ private Double headerValue; + /** + * @see org.apache.mailet.GenericMatcher#init() + */ public void init() throws MessagingException { StringTokenizer st = new StringTokenizer(getCondition(), " \t", false); if (st.hasMoreTokens()) { @@ -118,6 +121,9 @@ } } + /** + * @see org.apache.mailet.GenericMatcher#match(Mail) + */ public Collection match(Mail mail) throws MessagingException { if (headerName == null) { // should never get here Modified: james/server/trunk/src/java/org/apache/james/transport/matchers/FetchedFrom.java URL: http://svn.apache.org/viewvc/james/server/trunk/src/java/org/apache/james/transport/matchers/FetchedFrom.java?rev=426098&r1=426097&r2=426098&view=diff ============================================================================== --- james/server/trunk/src/java/org/apache/james/transport/matchers/FetchedFrom.java (original) +++ james/server/trunk/src/java/org/apache/james/transport/matchers/FetchedFrom.java Thu Jul 27 08:10:07 2006 @@ -37,6 +37,10 @@ */ public class FetchedFrom extends GenericMatcher { + + /** + * @see org.apache.mailet.GenericMatcher#match(Mail) + */ public Collection match(Mail mail) throws javax.mail.MessagingException { MimeMessage message = mail.getMessage(); String fetch = message.getHeader("X-fetched-from", null); Modified: james/server/trunk/src/java/org/apache/james/transport/matchers/FileRegexMatcher.java URL: http://svn.apache.org/viewvc/james/server/trunk/src/java/org/apache/james/transport/matchers/FileRegexMatcher.java?rev=426098&r1=426097&r2=426098&view=diff ============================================================================== --- james/server/trunk/src/java/org/apache/james/transport/matchers/FileRegexMatcher.java (original) +++ james/server/trunk/src/java/org/apache/james/transport/matchers/FileRegexMatcher.java Thu Jul 27 08:10:07 2006 @@ -29,6 +29,10 @@ * */ public class FileRegexMatcher extends GenericRegexMatcher { + + /** + * @see org.apache.james.transport.matchers.GenericRegexMatcher#init() + */ public void init() throws MessagingException { try { java.io.RandomAccessFile patternSource = new java.io.RandomAccessFile(getCondition(), "r"); Modified: james/server/trunk/src/java/org/apache/james/transport/matchers/GenericRegexMatcher.java URL: http://svn.apache.org/viewvc/james/server/trunk/src/java/org/apache/james/transport/matchers/GenericRegexMatcher.java?rev=426098&r1=426097&r2=426098&view=diff ============================================================================== --- james/server/trunk/src/java/org/apache/james/transport/matchers/GenericRegexMatcher.java (original) +++ james/server/trunk/src/java/org/apache/james/transport/matchers/GenericRegexMatcher.java Thu Jul 27 08:10:07 2006 @@ -56,8 +56,14 @@ } } + /** + * @see org.apache.mailet.GenericMatcher#GenericMatcher() + */ abstract public void init() throws MessagingException; + /** + * @see org.apache.mailet.GenericMatcher#match(Mail) + */ public Collection match(Mail mail) throws MessagingException { MimeMessage message = mail.getMessage(); Perl5Matcher matcher = new Perl5Matcher(); Modified: james/server/trunk/src/java/org/apache/james/transport/matchers/IsInWhiteList.java URL: http://svn.apache.org/viewvc/james/server/trunk/src/java/org/apache/james/transport/matchers/IsInWhiteList.java?rev=426098&r1=426097&r2=426098&view=diff ============================================================================== --- james/server/trunk/src/java/org/apache/james/transport/matchers/IsInWhiteList.java (original) +++ james/server/trunk/src/java/org/apache/james/transport/matchers/IsInWhiteList.java Thu Jul 27 08:10:07 2006 @@ -102,14 +102,8 @@ } /** - * Setter for property sqlParameters. - * @param sqlParameters New value of property sqlParameters. + * @see org.apache.mailet.GenericMailet#init() */ - private void setSqlParameters(Map sqlParameters) { - - this.sqlParameters = sqlParameters; - } - public void init() throws javax.mail.MessagingException { String repositoryPath = null; StringTokenizer st = new StringTokenizer(getCondition(), ", \t", false); @@ -153,6 +147,9 @@ selectByPK = sqlQueries.getSqlString("selectByPK", true); } + /** + * @see org.apache.mailet.GenericMatcher#match(Mail) + */ public Collection match(Mail mail) throws MessagingException { // check if it's a local sender MailAddress senderMailAddress = mail.getSender(); @@ -253,7 +250,7 @@ * for finding the conf/sqlResources.xml file * @throws Exception If any error occurs */ - public void initSqlQueries(Connection conn, org.apache.mailet.MailetContext mailetContext) throws Exception { + private void initSqlQueries(Connection conn, org.apache.mailet.MailetContext mailetContext) throws Exception { try { if (conn.getAutoCommit()) { conn.setAutoCommit(false); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]