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 ba...@apache.org on 2007/09/21 11:32:05 UTC

svn commit: r578033 [3/5] - in /james/jsieve/trunk/src/main/java/org/apache/jsieve: ./ commands/ commands/extensions/ commands/optional/ comparators/ exception/ mail/ mail/optional/ parser/ parser/address/ samples/james/ tests/ tests/optional/ util/check/

Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/Redirect.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/Redirect.java?rev=578033&r1=578032&r2=578033&view=diff
==============================================================================
--- james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/Redirect.java (original)
+++ james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/Redirect.java Fri Sep 21 02:32:00 2007
@@ -17,7 +17,6 @@
  * under the License.                                           *
  ****************************************************************/
 
-
 package org.apache.jsieve.commands;
 
 import java.util.List;
@@ -31,37 +30,34 @@
 import org.apache.jsieve.mail.MailAdapter;
 
 /**
- * Class Redirect implements the Redirect Command as defined in RFC 3028, section 4.3.
+ * Class Redirect implements the Redirect Command as defined in RFC 3028,
+ * section 4.3.
  */
-public class Redirect extends AbstractActionCommand
-{
+public class Redirect extends AbstractActionCommand {
 
     /**
      * Constructor for Redirect.
      */
-    public Redirect()
-    {
+    public Redirect() {
         super();
     }
 
     /**
-     * <p>Add an ActionRedirect to the List of Actions to be performed passing the
-     * sole StringList argument as the recipient.</p>
-     * <p>Also,
-     * @see org.apache.jsieve.commands.AbstractCommand#executeBasic(MailAdapter, Arguments, Block, SieveContext)
+     * <p>
+     * Add an ActionRedirect to the List of Actions to be performed passing the
+     * sole StringList argument as the recipient.
      * </p>
-     */  
-    protected Object executeBasic(
-        MailAdapter mail,
-        Arguments arguments,
-        Block block, SieveContext context)
-        throws SieveException
-    {
-        String recipient =
-            (String) ((StringListArgument) arguments.getArgumentList().get(0))
-                .getList()
-                .get(
-                0);
+     * <p>
+     * Also,
+     * 
+     * @see org.apache.jsieve.commands.AbstractCommand#executeBasic(MailAdapter,
+     *      Arguments, Block, SieveContext)
+     *      </p>
+     */
+    protected Object executeBasic(MailAdapter mail, Arguments arguments,
+            Block block, SieveContext context) throws SieveException {
+        String recipient = (String) ((StringListArgument) arguments
+                .getArgumentList().get(0)).getList().get(0);
 
         mail.addAction(new ActionRedirect(recipient));
 
@@ -69,21 +65,24 @@
     }
 
     /**
-     * @see org.apache.jsieve.commands.AbstractCommand#validateArguments(Arguments, SieveContext)
+     * @see org.apache.jsieve.commands.AbstractCommand#validateArguments(Arguments,
+     *      SieveContext)
      */
-    protected void validateArguments(Arguments arguments, SieveContext context) throws SieveException
-    {
+    protected void validateArguments(Arguments arguments, SieveContext context)
+            throws SieveException {
         List args = arguments.getArgumentList();
         if (args.size() != 1)
             throw context.getCoordinate().syntaxException(
-                "Exactly 1 argument permitted. Found " + args.size());
+                    "Exactly 1 argument permitted. Found " + args.size());
 
         Object argument = args.get(0);
         if (!(argument instanceof StringListArgument))
-            throw context.getCoordinate().syntaxException("Expecting a string-list");
+            throw context.getCoordinate().syntaxException(
+                    "Expecting a string-list");
 
         if (1 != ((StringListArgument) argument).getList().size())
-            throw context.getCoordinate().syntaxException("Expecting exactly one argument");
+            throw context.getCoordinate().syntaxException(
+                    "Expecting exactly one argument");
     }
 
 }

Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/Require.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/Require.java?rev=578033&r1=578032&r2=578033&view=diff
==============================================================================
--- james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/Require.java (original)
+++ james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/Require.java Fri Sep 21 02:32:00 2007
@@ -17,7 +17,6 @@
  * under the License.                                           *
  ****************************************************************/
 
-
 package org.apache.jsieve.commands;
 
 import java.util.Iterator;
@@ -35,111 +34,102 @@
 import org.apache.jsieve.mail.MailAdapter;
 
 /**
- * Class Require implements the Require Command as defined in RFC 3028, section 3.2.
+ * Class Require implements the Require Command as defined in RFC 3028, section
+ * 3.2.
  */
-public class Require extends AbstractPrologCommand
-{
+public class Require extends AbstractPrologCommand {
 
     /**
      * Constructor for Require.
      */
-    public Require()
-    {
+    public Require() {
         super();
     }
 
     /**
-     * <p>Ensure the required feature is configured.</p>
-     * <p>Also,
-     * @see org.apache.jsieve.commands.AbstractCommand#executeBasic(MailAdapter, Arguments, Block, SieveContext)
+     * <p>
+     * Ensure the required feature is configured.
      * </p>
-     */ 
-    protected Object executeBasic(
-        MailAdapter mail,
-        Arguments arguments,
-        Block block, SieveContext context)
-        throws SieveException
-    {
-        Iterator stringsIter =
-            ((StringListArgument) arguments.getArgumentList().get(0))
-                .getList()
-                .iterator();
+     * <p>
+     * Also,
+     * 
+     * @see org.apache.jsieve.commands.AbstractCommand#executeBasic(MailAdapter,
+     *      Arguments, Block, SieveContext)
+     *      </p>
+     */
+    protected Object executeBasic(MailAdapter mail, Arguments arguments,
+            Block block, SieveContext context) throws SieveException {
+        Iterator stringsIter = ((StringListArgument) arguments
+                .getArgumentList().get(0)).getList().iterator();
 
-        while (stringsIter.hasNext())
-        {
+        while (stringsIter.hasNext()) {
             validateFeature((String) stringsIter.next(), mail);
         }
         return null;
     }
 
     /**
-     * Method validateFeature validates the required feature is configured as either
-     * a Command or a Test.
+     * Method validateFeature validates the required feature is configured as
+     * either a Command or a Test.
+     * 
      * @param name
      * @param mail
      * @throws FeatureException
      */
     protected void validateFeature(String name, MailAdapter mail)
-        throws FeatureException
-    {
+            throws FeatureException {
         // Validate as a Command
-        try
-        {
+        try {
             validateCommand(name);
             return;
-        }
-        catch (LookupException e)
-        {
+        } catch (LookupException e) {
             // Not a command
-        }       
-        
-        // Validate as a Test             
-        try
-        {
-            validateTest(name);
         }
-        catch (LookupException e)
-        {
-            throw new FeatureException(
-                "Feature \"" + name + "\" is not supported.");
+
+        // Validate as a Test
+        try {
+            validateTest(name);
+        } catch (LookupException e) {
+            throw new FeatureException("Feature \"" + name
+                    + "\" is not supported.");
         }
     }
-    
+
     /**
      * Method validateCommand.
+     * 
      * @param name
      * @throws LookupException
      */
-    protected void validateCommand(String name)
-        throws LookupException
-    {
+    protected void validateCommand(String name) throws LookupException {
         CommandManager.getInstance().lookup(name);
     }
-    
+
     /**
      * Method validateTest.
+     * 
      * @param name
      * @throws LookupException
      */
-    protected void validateTest(String name)
-        throws LookupException
-    {
+    protected void validateTest(String name) throws LookupException {
         TestManager.getInstance().lookup(name);
     }
-    
+
     /**
-     * @see org.apache.jsieve.commands.AbstractCommand#validateArguments(Arguments, SieveContext)
+     * @see org.apache.jsieve.commands.AbstractCommand#validateArguments(Arguments,
+     *      SieveContext)
      */
-    protected void validateArguments(Arguments arguments, SieveContext context) throws SieveException
-    {
+    protected void validateArguments(Arguments arguments, SieveContext context)
+            throws SieveException {
         List args = arguments.getArgumentList();
         if (args.size() != 1)
             throw context.getCoordinate().syntaxException(
-                "Exactly 1 argument permitted. Found " + args.size());
+                    "Exactly 1 argument permitted. Found " + args.size());
 
         Object argument = args.get(0);
         if (!(argument instanceof StringListArgument))
-            throw context.getCoordinate().syntaxException("Expecting a string-list");
+            throw context.getCoordinate().syntaxException(
+                    "Expecting a string-list");
     }
-    
+
 }

Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/Stop.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/Stop.java?rev=578033&r1=578032&r2=578033&view=diff
==============================================================================
--- james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/Stop.java (original)
+++ james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/Stop.java Fri Sep 21 02:32:00 2007
@@ -17,7 +17,6 @@
  * under the License.                                           *
  ****************************************************************/
 
-
 package org.apache.jsieve.commands;
 
 import org.apache.jsieve.Arguments;
@@ -30,26 +29,28 @@
 /**
  * Class Stop implements the Stop Command as defined in RFC 3028, section 3.3.
  */
-public class Stop extends AbstractControlCommand
-{
+public class Stop extends AbstractControlCommand {
 
     /**
      * Constructor for Require.
      */
-    public Stop()
-    {
+    public Stop() {
         super();
     }
 
     /**
-     * <p>Throws a StopException.</p>
-     * <p>Also,
-     * @see org.apache.jsieve.commands.AbstractCommand#executeBasic(MailAdapter, Arguments, Block, SieveContext)
+     * <p>
+     * Throws a StopException.
      * </p>
-     */ 
-    protected Object executeBasic(MailAdapter mail, Arguments arguments, Block block, SieveContext context)
-        throws SieveException
-    {
+     * <p>
+     * Also,
+     * 
+     * @see org.apache.jsieve.commands.AbstractCommand#executeBasic(MailAdapter,
+     *      Arguments, Block, SieveContext)
+     *      </p>
+     */
+    protected Object executeBasic(MailAdapter mail, Arguments arguments,
+            Block block, SieveContext context) throws SieveException {
         throw new StopException("Stop requested");
     }
 

Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/extensions/Log.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/extensions/Log.java?rev=578033&r1=578032&r2=578033&view=diff
==============================================================================
--- james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/extensions/Log.java (original)
+++ james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/extensions/Log.java Fri Sep 21 02:32:00 2007
@@ -17,7 +17,6 @@
  * under the License.                                           *
  ****************************************************************/
 
-
 package org.apache.jsieve.commands.extensions;
 
 import java.util.List;
@@ -35,60 +34,55 @@
 import org.apache.jsieve.mail.MailAdapter;
 
 /**
- * <p>Class Log is an extension that implements a Command to write messages to the 
- * Sieve Log. The BNF syntax is...</p>
+ * <p>
+ * Class Log is an extension that implements a Command to write messages to the
+ * Sieve Log. The BNF syntax is...
+ * </p>
  * <code>log [(:fatal / :error / :warn / :info / :debug / :trace)] string</code>
- * <p>The default log level is :info.</p>
+ * <p>
+ * The default log level is :info.
+ * </p>
  */
-public class Log extends AbstractCommand implements LogLevelTags
-{          
+public class Log extends AbstractCommand implements LogLevelTags {
     /**
      * Constructor for Log.
      */
-    public Log()
-    {
+    public Log() {
         super();
     }
 
     /**
-     * @see org.apache.jsieve.commands.AbstractCommand#executeBasic(MailAdapter, Arguments, Block, SieveContext)
+     * @see org.apache.jsieve.commands.AbstractCommand#executeBasic(MailAdapter,
+     *      Arguments, Block, SieveContext)
      */
-    protected Object executeBasic(
-        MailAdapter mail,
-        Arguments arguments,
-        Block block, SieveContext context)
-        throws SieveException
-    {
+    protected Object executeBasic(MailAdapter mail, Arguments arguments,
+            Block block, SieveContext context) throws SieveException {
         String logLevel = null;
         String message = null;
 
-        // First MAY be a tag argument of fatal, error, warn, info, debug or trace.
+        // First MAY be a tag argument of fatal, error, warn, info, debug or
+        // trace.
         // default is info.
         ListIterator argumentsIter = arguments.getArgumentList().listIterator();
         boolean stop = false;
 
         // Tag processing
-        while (!stop && argumentsIter.hasNext())
-        {
+        while (!stop && argumentsIter.hasNext()) {
             Object argument = argumentsIter.next();
-            if (argument instanceof TagArgument)
-            {
+            if (argument instanceof TagArgument) {
                 String tag = ((TagArgument) argument).getTag();
 
                 // LogLevel?
                 if (null == logLevel
-                    && (tag.equals(FATAL_TAG)
-                        || tag.equals(ERROR_TAG)
-                        || tag.equals(WARN_TAG)
-                        || tag.equals(INFO_TAG)
-                        || tag.equals(DEBUG_TAG)
-                        || tag.equals(TRACE_TAG)))
+                        && (tag.equals(FATAL_TAG) || tag.equals(ERROR_TAG)
+                                || tag.equals(WARN_TAG) || tag.equals(INFO_TAG)
+                                || tag.equals(DEBUG_TAG) || tag
+                                .equals(TRACE_TAG)))
                     logLevel = tag;
                 else
-                    throw context.getCoordinate().syntaxException("Found unexpected TagArgument");
-            }
-            else
-            {
+                    throw context.getCoordinate().syntaxException(
+                            "Found unexpected TagArgument");
+            } else {
                 // Stop when a non-tag argument is encountered
                 argumentsIter.previous();
                 stop = true;
@@ -96,11 +90,9 @@
         }
 
         // Next MUST be a String
-        if (argumentsIter.hasNext())
-        {
+        if (argumentsIter.hasNext()) {
             Object argument = argumentsIter.next();
-            if (argument instanceof StringListArgument)
-            {
+            if (argument instanceof StringListArgument) {
                 List strings = ((StringListArgument) argument).getList();
                 if (1 == strings.size())
                     message = (String) strings.get(0);
@@ -111,7 +103,8 @@
 
         // Everthing else is an error
         if (argumentsIter.hasNext())
-            throw context.getCoordinate().syntaxException("Found unexpected arguments");
+            throw context.getCoordinate().syntaxException(
+                    "Found unexpected arguments");
 
         log(null == logLevel ? ":info" : logLevel, message, context);
 
@@ -120,12 +113,13 @@
 
     /**
      * Method log.
+     * 
      * @param logLevel
      * @param message
      * @throws SyntaxException
      */
-    protected void log(String logLevel, String message, SieveContext context) throws SyntaxException
-    {
+    protected void log(String logLevel, String message, SieveContext context)
+            throws SyntaxException {
         if (logLevel.equals(INFO_TAG))
             logInfo(message);
         else if (logLevel.equals(ERROR_TAG))
@@ -133,87 +127,88 @@
         else if (logLevel.equals(WARN_TAG))
             logWarn(message);
         else if (logLevel.equals(DEBUG_TAG))
-            logDebug(message);            
+            logDebug(message);
         else if (logLevel.equals(FATAL_TAG))
-            logFatal(message);            
+            logFatal(message);
         else if (logLevel.equals(TRACE_TAG))
             logTrace(message);
         else
-            throw context.getCoordinate().syntaxException("Unsupported logging level: " + logLevel);
+            throw context.getCoordinate().syntaxException(
+                    "Unsupported logging level: " + logLevel);
     }
 
-    
     /**
      * Method logFatal.
+     * 
      * @param message
      */
-    protected void logFatal(String message)
-    {
+    protected void logFatal(String message) {
         org.apache.commons.logging.Log log = Logger.getLog();
         if (log.isFatalEnabled())
             log.fatal(message);
     }
-    
+
     /**
      * Method logWarn.
+     * 
      * @param message
      */
-    protected void logWarn(String message)
-    {
+    protected void logWarn(String message) {
         org.apache.commons.logging.Log log = Logger.getLog();
         if (log.isWarnEnabled())
             log.warn(message);
-    } 
-    
+    }
+
     /**
      * Method logInfo.
+     * 
      * @param message
      */
-    protected void logInfo(String message)
-    {
+    protected void logInfo(String message) {
         org.apache.commons.logging.Log log = Logger.getLog();
         if (log.isInfoEnabled())
             log.info(message);
     }
-    
+
     /**
      * Method logDebug.
+     * 
      * @param message
      */
-    protected void logDebug(String message)
-    {
+    protected void logDebug(String message) {
         org.apache.commons.logging.Log log = Logger.getLog();
         if (log.isDebugEnabled())
             log.debug(message);
-    } 
-    
+    }
+
     /**
      * Method logTrace.
+     * 
      * @param message
      */
-    protected void logTrace(String message)
-    {
+    protected void logTrace(String message) {
         org.apache.commons.logging.Log log = Logger.getLog();
         if (log.isTraceEnabled())
             log.trace(message);
-    }                   
-    
+    }
+
     /**
      * Method logError.
+     * 
      * @param message
      */
-    protected void logError(String message)
-    {
+    protected void logError(String message) {
         org.apache.commons.logging.Log log = Logger.getLog();
         if (log.isErrorEnabled())
             log.error(message);
-    }    
+    }
 
     /**
-     * @see org.apache.jsieve.commands.AbstractCommand#validateArguments(Arguments, SieveContext)
+     * @see org.apache.jsieve.commands.AbstractCommand#validateArguments(Arguments,
+     *      SieveContext)
      */
-    protected void validateArguments(Arguments arguments, SieveContext context) throws SieveException
-    {
+    protected void validateArguments(Arguments arguments, SieveContext context)
+            throws SieveException {
         // Validation is performed in executeBasic()
     }
 

Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/extensions/LogLevelTags.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/extensions/LogLevelTags.java?rev=578033&r1=578032&r2=578033&view=diff
==============================================================================
--- james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/extensions/LogLevelTags.java (original)
+++ james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/extensions/LogLevelTags.java Fri Sep 21 02:32:00 2007
@@ -17,20 +17,23 @@
  * under the License.                                           *
  ****************************************************************/
 
-
 package org.apache.jsieve.commands.extensions;
 
 /**
  * Interface LogLevelTags defines the String constants for the tags used to
  * specify the logging level.
  */
-public interface LogLevelTags
-{
+public interface LogLevelTags {
     public static final String DEBUG_TAG = ":debug";
+
     public static final String ERROR_TAG = ":error";
+
     public static final String FATAL_TAG = ":fatal";
+
     public static final String INFO_TAG = ":info";
-    public static final String TRACE_TAG = ":trace";    
-    public static final String WARN_TAG = ":warn"; 
+
+    public static final String TRACE_TAG = ":trace";
+
+    public static final String WARN_TAG = ":warn";
 
 }

Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/optional/FileInto.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/optional/FileInto.java?rev=578033&r1=578032&r2=578033&view=diff
==============================================================================
--- james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/optional/FileInto.java (original)
+++ james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/optional/FileInto.java Fri Sep 21 02:32:00 2007
@@ -17,7 +17,6 @@
  * under the License.                                           *
  ****************************************************************/
 
-
 package org.apache.jsieve.commands.optional;
 
 import java.util.List;
@@ -34,54 +33,46 @@
 import org.apache.jsieve.mail.MailAdapter;
 
 /**
- * Class FileInto implements the FileInto Command as defined in RFC 3028, section 
- * 4.2.
+ * Class FileInto implements the FileInto Command as defined in RFC 3028,
+ * section 4.2.
  */
-public class FileInto extends AbstractActionCommand
-{
+public class FileInto extends AbstractActionCommand {
 
     /**
      * Constructor for Require.
      */
-    public FileInto()
-    {
+    public FileInto() {
         super();
     }
 
     /**
-     * <p>Add an ActionFileInto to the List of Actions to be performed passing the
+     * <p>
+     * Add an ActionFileInto to the List of Actions to be performed passing the
      * sole StringList argument as the destination. RFC 3028 mandates that there
      * should be only one FileInto per destination. If this is a duplicate, this
-     * Command is silently ignored. 
-     * </p>
-     * <p>Also,
-     * @see org.apache.jsieve.commands.AbstractCommand#executeBasic(MailAdapter, Arguments, Block, SieveContext)
+     * Command is silently ignored.
      * </p>
+     * <p>
+     * Also,
+     * 
+     * @see org.apache.jsieve.commands.AbstractCommand#executeBasic(MailAdapter,
+     *      Arguments, Block, SieveContext)
+     *      </p>
      */
-    protected Object executeBasic(
-        MailAdapter mail,
-        Arguments arguments,
-        Block block, SieveContext context)
-        throws SieveException
-    {
-        String destination =
-            (String) ((StringListArgument) arguments.getArgumentList().get(0))
-                .getList()
-                .get(
-                0);
+    protected Object executeBasic(MailAdapter mail, Arguments arguments,
+            Block block, SieveContext context) throws SieveException {
+        String destination = (String) ((StringListArgument) arguments
+                .getArgumentList().get(0)).getList().get(0);
 
         // Only one fileinto per destination allowed, others should be
-        // discarded            
+        // discarded
         ListIterator actionsIter = mail.getActionsIterator();
         boolean isDuplicate = false;
-        while (actionsIter.hasNext())
-        {
+        while (actionsIter.hasNext()) {
             Action action = (Action) actionsIter.next();
-            isDuplicate =
-                (action instanceof ActionFileInto)
-                    && (((ActionFileInto) action)
-                        .getDestination()
-                        .equals(destination));
+            isDuplicate = (action instanceof ActionFileInto)
+                    && (((ActionFileInto) action).getDestination()
+                            .equals(destination));
         }
 
         if (!isDuplicate)
@@ -89,26 +80,26 @@
 
         return null;
     }
-    
+
     /**
-     * @see org.apache.jsieve.commands.AbstractCommand#validateArguments(Arguments, SieveContext)
+     * @see org.apache.jsieve.commands.AbstractCommand#validateArguments(Arguments,
+     *      SieveContext)
      */
-    protected void validateArguments(Arguments arguments, SieveContext context) throws SieveException
-    {
+    protected void validateArguments(Arguments arguments, SieveContext context)
+            throws SieveException {
         List args = arguments.getArgumentList();
         if (args.size() != 1)
             throw context.getCoordinate().syntaxException(
-                "Exactly 1 argument permitted. Found " + args.size());
+                    "Exactly 1 argument permitted. Found " + args.size());
 
         Object argument = args.get(0);
         if (!(argument instanceof StringListArgument))
-            throw context.getCoordinate().syntaxException("Expecting a string-list");
+            throw context.getCoordinate().syntaxException(
+                    "Expecting a string-list");
 
         if (1 != ((StringListArgument) argument).getList().size())
-            throw context.getCoordinate().syntaxException("Expecting exactly one argument");
+            throw context.getCoordinate().syntaxException(
+                    "Expecting exactly one argument");
     }
-    
-
-    
 
 }

Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/optional/Reject.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/optional/Reject.java?rev=578033&r1=578032&r2=578033&view=diff
==============================================================================
--- james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/optional/Reject.java (original)
+++ james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/optional/Reject.java Fri Sep 21 02:32:00 2007
@@ -17,7 +17,6 @@
  * under the License.                                           *
  ****************************************************************/
 
-
 package org.apache.jsieve.commands.optional;
 
 import java.util.List;
@@ -37,79 +36,84 @@
  * Class | Interface Enter description here
  * 
  * Creation Date: 11-Jan-04
+ * 
  * @author sbrewin
  * 
  * Copyright 2003, Synergy Systems Limited
  */
 /**
- * Class Reject implements the Reject Command as defined in RFC 3028, section 4.1.
+ * Class Reject implements the Reject Command as defined in RFC 3028, section
+ * 4.1.
  */
-public class Reject extends AbstractActionCommand
-{
+public class Reject extends AbstractActionCommand {
 
     /**
      * Constructor for Reject.
      */
-    public Reject()
-    {
+    public Reject() {
         super();
     }
 
     /**
-     * <p>Add an ActionReject to the List of Actions to be performed.</p>
-     * <p>Also,
-     * @see org.apache.jsieve.commands.AbstractCommand#executeBasic(MailAdapter, Arguments, Block, SieveContext)
+     * <p>
+     * Add an ActionReject to the List of Actions to be performed.
      * </p>
-     */  
-    protected Object executeBasic(MailAdapter mail, Arguments arguments, Block block, SieveContext context)
-        throws SieveException
-    {
-        String message =
-            (String) ((StringListArgument) arguments.getArgumentList().get(0))
-                .getList()
-                .get(
-                0);
-                        
+     * <p>
+     * Also,
+     * 
+     * @see org.apache.jsieve.commands.AbstractCommand#executeBasic(MailAdapter,
+     *      Arguments, Block, SieveContext)
+     *      </p>
+     */
+    protected Object executeBasic(MailAdapter mail, Arguments arguments,
+            Block block, SieveContext context) throws SieveException {
+        String message = (String) ((StringListArgument) arguments
+                .getArgumentList().get(0)).getList().get(0);
+
         mail.addAction(new ActionReject(message));
         return null;
     }
-    
+
     /**
      * @see org.apache.jsieve.commands.AbstractCommand#validateState(SieveContext)
      */
-    protected void validateState(SieveContext context) throws CommandException
-    {
+    protected void validateState(SieveContext context) throws CommandException {
         super.validateState(context);
 
         if (CommandStateManager.getInstance().isHasActions())
-            throw context.getCoordinate().commandException("The \"reject\" command is not allowed with other Action Commands");
+            throw context
+                    .getCoordinate()
+                    .commandException(
+                            "The \"reject\" command is not allowed with other Action Commands");
     }
-    
+
     /**
      * @see org.apache.jsieve.commands.AbstractCommand#updateState()
      */
-    protected void updateState()
-    {
-        super.updateState();        
-        CommandStateManager.getInstance().setRejected(true);        
-    } 
-    
+    protected void updateState() {
+        super.updateState();
+        CommandStateManager.getInstance().setRejected(true);
+    }
+
     /**
-     * @see org.apache.jsieve.commands.AbstractCommand#validateArguments(Arguments, SieveContext)
+     * @see org.apache.jsieve.commands.AbstractCommand#validateArguments(Arguments,
+     *      SieveContext)
      */
-    protected void validateArguments(Arguments arguments, SieveContext context) throws SieveException
-    {
+    protected void validateArguments(Arguments arguments, SieveContext context)
+            throws SieveException {
         List args = arguments.getArgumentList();
         if (args.size() != 1)
             throw context.getCoordinate().syntaxException(
-                "Exactly 1 argument permitted. Found " + args.size());
+                    "Exactly 1 argument permitted. Found " + args.size());
 
         Object argument = args.get(0);
         if (!(argument instanceof StringListArgument))
-            throw context.getCoordinate().syntaxException("Expecting a string-list");
+            throw context.getCoordinate().syntaxException(
+                    "Expecting a string-list");
 
         if (1 != ((StringListArgument) argument).getList().size())
-            throw context.getCoordinate().syntaxException("Expecting exactly one argument");
-    }  
+            throw context.getCoordinate().syntaxException(
+                    "Expecting exactly one argument");
+    }
 
 }

Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/comparators/AsciiCasemap.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/comparators/AsciiCasemap.java?rev=578033&r1=578032&r2=578033&view=diff
==============================================================================
--- james/jsieve/trunk/src/main/java/org/apache/jsieve/comparators/AsciiCasemap.java (original)
+++ james/jsieve/trunk/src/main/java/org/apache/jsieve/comparators/AsciiCasemap.java Fri Sep 21 02:32:00 2007
@@ -17,53 +17,48 @@
  * under the License.                                           *
  ****************************************************************/
 
-
 package org.apache.jsieve.comparators;
 
 import org.apache.jsieve.exception.SievePatternException;
 
 /**
  * Class AsciiCasemap implements the EQUALITY operation of the i;ascii-casemap
- * comparator as defined by RFC2244, section 3.4 - "With this function the values
- * "hello" and "HELLO" have the same ordinal value and are considered equal".
+ * comparator as defined by RFC2244, section 3.4 - "With this function the
+ * values "hello" and "HELLO" have the same ordinal value and are considered
+ * equal".
  */
-public class AsciiCasemap implements Comparator
-{
+public class AsciiCasemap implements Comparator {
 
     /**
      * Constructor for AsciiCasemap.
      */
-    public AsciiCasemap()
-    {
+    public AsciiCasemap() {
         super();
     }
 
     /**
      * @see org.apache.jsieve.comparators.Equals#equals(String, String)
      */
-    public boolean equals(String string1, String string2)
-    {
-        return ComparatorUtils.equals(
-            string1.toUpperCase(),
-            string2.toUpperCase());
+    public boolean equals(String string1, String string2) {
+        return ComparatorUtils.equals(string1.toUpperCase(), string2
+                .toUpperCase());
     }
 
     /**
      * @see org.apache.jsieve.comparators.Contains#contains(String, String)
      */
-    public boolean contains(String container, String content)
-    {
-        return ComparatorUtils.contains(
-            container.toUpperCase(),
-            content.toUpperCase());
+    public boolean contains(String container, String content) {
+        return ComparatorUtils.contains(container.toUpperCase(), content
+                .toUpperCase());
     }
 
     /**
      * @see org.apache.jsieve.comparators.Matches#matches(String, String)
      */
-    public boolean matches(String string, String glob) throws SievePatternException
-    {
-        return ComparatorUtils.matches(string.toUpperCase(), glob.toUpperCase()); 
+    public boolean matches(String string, String glob)
+            throws SievePatternException {
+        return ComparatorUtils
+                .matches(string.toUpperCase(), glob.toUpperCase());
     }
 
 }

Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/comparators/AsciiNumeric.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/comparators/AsciiNumeric.java?rev=578033&r1=578032&r2=578033&view=diff
==============================================================================
--- james/jsieve/trunk/src/main/java/org/apache/jsieve/comparators/AsciiNumeric.java (original)
+++ james/jsieve/trunk/src/main/java/org/apache/jsieve/comparators/AsciiNumeric.java Fri Sep 21 02:32:00 2007
@@ -17,7 +17,6 @@
  * under the License.                                           *
  ****************************************************************/
 
-
 package org.apache.jsieve.comparators;
 
 import org.apache.jsieve.exception.SievePatternException;
@@ -26,38 +25,33 @@
  * Class AsciiNumeric implements the EQUALITY operation of the i;ascii-numeric
  * comparator as defined by RFC2244, section 3.4.
  */
-public class AsciiNumeric implements Comparator
-{
+public class AsciiNumeric implements Comparator {
 
     /**
      * Constructor for AsciiNumeric.
      */
-    public AsciiNumeric()
-    {
+    public AsciiNumeric() {
         super();
     }
 
     /**
      * @see org.apache.jsieve.comparators.Equals#equals(String, String)
      */
-    public boolean equals(String string1, String string2)
-    {
-        return ComparatorUtils.equals(
-            computeCompareString(string1),
-            computeCompareString(string2));
+    public boolean equals(String string1, String string2) {
+        return ComparatorUtils.equals(computeCompareString(string1),
+                computeCompareString(string2));
     }
 
     /**
-     * Method getCompareString answers a <code>String</code> in which all non-digit
-     * characters are translated to the character 0xff.
+     * Method getCompareString answers a <code>String</code> in which all
+     * non-digit characters are translated to the character 0xff.
+     * 
      * @param string
      * @return String
      */
-    protected String computeCompareString(String string)
-    {
+    protected String computeCompareString(String string) {
         char[] chars = string.toCharArray();
-        for (int i = chars.length; i < chars.length; i++)
-        {
+        for (int i = chars.length; i < chars.length; i++) {
             if (!Character.isDigit(chars[i]))
                 chars[i] = 0xff;
         }
@@ -67,24 +61,23 @@
     /**
      * @see org.apache.jsieve.comparators.Contains#contains(String, String)
      */
-    public boolean contains(String container, String content)
-    {
-        return ComparatorUtils.contains(
-            computeCompareString(container),
-            computeCompareString(content));
+    public boolean contains(String container, String content) {
+        return ComparatorUtils.contains(computeCompareString(container),
+                computeCompareString(content));
     }
 
     /**
      * @see org.apache.jsieve.comparators.Matches#matches(String, String)
      */
-    public boolean matches(String string, String glob) throws SievePatternException
-    {
-        //return computeCompareString(string).matches(regex);
-        
+    public boolean matches(String string, String glob)
+            throws SievePatternException {
+        // return computeCompareString(string).matches(regex);
+
         // Still to fix: computeCompareString(glob) will remove glob characters!
-        // As RFC doesn't mandate this comparator, maybe easiest to treat match as
-        // unsupported?
-        return ComparatorUtils.matches(computeCompareString(string), computeCompareString(glob));        
+        // As RFC doesn't mandate this comparator, maybe easiest to treat match
+        // as unsupported?
+        return ComparatorUtils.matches(computeCompareString(string),
+                computeCompareString(glob));
     }
 
 }

Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/comparators/Comparator.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/comparators/Comparator.java?rev=578033&r1=578032&r2=578033&view=diff
==============================================================================
--- james/jsieve/trunk/src/main/java/org/apache/jsieve/comparators/Comparator.java (original)
+++ james/jsieve/trunk/src/main/java/org/apache/jsieve/comparators/Comparator.java Fri Sep 21 02:32:00 2007
@@ -17,14 +17,12 @@
  * under the License.                                           *
  ****************************************************************/
 
-
 package org.apache.jsieve.comparators;
 
 /**
- * Interface Comparator defines the method signatures for Sieve comparators. It 
+ * Interface Comparator defines the method signatures for Sieve comparators. It
  * consists of Equals, Contains and Matches Comparisons.
  */
-public interface Comparator extends Equals, Contains, Matches
-{
+public interface Comparator extends Equals, Contains, Matches {
 
 }

Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/comparators/ComparatorNames.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/comparators/ComparatorNames.java?rev=578033&r1=578032&r2=578033&view=diff
==============================================================================
--- james/jsieve/trunk/src/main/java/org/apache/jsieve/comparators/ComparatorNames.java (original)
+++ james/jsieve/trunk/src/main/java/org/apache/jsieve/comparators/ComparatorNames.java Fri Sep 21 02:32:00 2007
@@ -17,15 +17,14 @@
  * under the License.                                           *
  ****************************************************************/
 
-
 package org.apache.jsieve.comparators;
 
 /**
- * Interface ComparatorNames defines the String constants used to specify
- * a COMPARATOR name. 
+ * Interface ComparatorNames defines the String constants used to specify a
+ * COMPARATOR name.
  */
-public interface ComparatorNames
-{
+public interface ComparatorNames {
     public static final String OCTET_COMPARATOR = "i;octet";
-    public static final String ASCII_CASEMAP_COMPARATOR = "i;ascii-casemap";        
+
+    public static final String ASCII_CASEMAP_COMPARATOR = "i;ascii-casemap";
 }

Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/comparators/ComparatorUtils.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/comparators/ComparatorUtils.java?rev=578033&r1=578032&r2=578033&view=diff
==============================================================================
--- james/jsieve/trunk/src/main/java/org/apache/jsieve/comparators/ComparatorUtils.java (original)
+++ james/jsieve/trunk/src/main/java/org/apache/jsieve/comparators/ComparatorUtils.java Fri Sep 21 02:32:00 2007
@@ -17,7 +17,6 @@
  * under the License.                                           *
  ****************************************************************/
 
-
 package org.apache.jsieve.comparators;
 
 import org.apache.oro.text.GlobCompiler;
@@ -34,31 +33,29 @@
 /**
  * Class ComparatorUtils implements utility methods used by Comparators.
  */
-public class ComparatorUtils implements MatchTypeTags
-{
+public class ComparatorUtils implements MatchTypeTags {
     /**
      * One per thread GlobCompiler.
-     */ 
+     */
     static private ThreadLocal fieldGlobCompiler;
-    
+
     /**
      * One per thread Perl5Matcher.
-     */ 
-    static private ThreadLocal fieldPerl5Matcher;    
+     */
+    static private ThreadLocal fieldPerl5Matcher;
 
     /**
      * Constructor for ComparatorUtils.
      */
-    private ComparatorUtils()
-    {
+    private ComparatorUtils() {
         super();
     }
-    
+
     /**
-     * Method <code>match</code> answers a boolean indicating if the parameter 
-     * <code>matchTarget</code> compares to parameter <code>matchArgument</code> 
-     * is a match of <code>matchType</code> using the comparator 
-     * <code>comparatorName</code>.
+     * Method <code>match</code> answers a boolean indicating if the parameter
+     * <code>matchTarget</code> compares to parameter
+     * <code>matchArgument</code> is a match of <code>matchType</code> using
+     * the comparator <code>comparatorName</code>.
      * 
      * @param comparatorName
      * @param matchType
@@ -66,12 +63,8 @@
      * @param matchTarget
      * @return boolean
      */
-    public static boolean match(
-        String comparatorName,
-        String matchType,
-        String matchTarget,
-        String matchArgument) throws SieveException
-    {
+    public static boolean match(String comparatorName, String matchType,
+            String matchTarget, String matchArgument) throws SieveException {
         boolean isMatched = false;
         if (matchType.equals(IS_TAG))
             isMatched = is(comparatorName, matchTarget, matchArgument);
@@ -81,76 +74,78 @@
             isMatched = matches(comparatorName, matchTarget, matchArgument);
         return isMatched;
     }
-    
-    /**   
-     * <p>Method <code>matches</code> answers a boolean indicating if the parameter 
-     * <code>string</code> matches the glob pattern described by parameter 
-     * <code>glob</code>.
+
+    /**
+     * <p>
+     * Method <code>matches</code> answers a boolean indicating if the
+     * parameter <code>string</code> matches the glob pattern described by
+     * parameter <code>glob</code>.
+     * 
      * @param string
      * @param glob
      * @return boolean
      * @throws SievePatternException
      */
     static public boolean matches(String string, String glob)
-        throws SievePatternException
-    {
+            throws SievePatternException {
         // This requires optimization
         // 1) DONE - Keep one compiler and one matcher in thread variables
         // 2) Is there a way to re-use the compiled pattern?
         Pattern pattern = null;
-        try
-        {
+        try {
             pattern = getGlobCompiler().compile(glob);
-        }
-        catch (MalformedPatternException e)
-        {
+        } catch (MalformedPatternException e) {
             throw new SievePatternException(e.getMessage());
         }
         PatternMatcher matcher = getPerl5Matcher();
         return matcher.matches(string, pattern);
     }
-    
+
     /**
-     * <p>Method <code>contains</code> answers a boolean indicating if the parameter 
-     * <code>container</code> contains the parameter <code>contents</code>.
+     * <p>
+     * Method <code>contains</code> answers a boolean indicating if the
+     * parameter <code>container</code> contains the parameter
+     * <code>contents</code>.
      * </p>
      * 
      * @param container
      * @param contents
      * @return boolean
      */
-    static public boolean contains(String container, String contents)
-    {
-        return container.indexOf(contents) > -1;     
+    static public boolean contains(String container, String contents) {
+        return container.indexOf(contents) > -1;
     }
-    
+
     /**
-     * <p>Method <code>equals</code> answers a boolean indicating if the parameter 
-     * <code>string1</code> is equal to the parameter <code>string2</code>.
+     * <p>
+     * Method <code>equals</code> answers a boolean indicating if the
+     * parameter <code>string1</code> is equal to the parameter
+     * <code>string2</code>.
      * </p>
      * 
      * @param string1
      * @param string2
      * @return boolean
      */
-    static public boolean equals(String string1, String string2)
-    {
-        return string1.equals(string2);     
-    }            
+    static public boolean equals(String string1, String string2) {
+        return string1.equals(string2);
+    }
 
     /**
-     * <p>Returns the globCompiler, intialises if required.</p>
+     * <p>
+     * Returns the globCompiler, intialises if required.
+     * </p>
      * 
-     * <p>Note that this must be synchronized to prevent another thread 
-     * detecting the null state while this thread is initialising.</p>
+     * <p>
+     * Note that this must be synchronized to prevent another thread detecting
+     * the null state while this thread is initialising.
+     * </p>
      * 
      * @return GlobCompiler
      */
-    static synchronized protected GlobCompiler getGlobCompiler()
-    {
+    static synchronized protected GlobCompiler getGlobCompiler() {
         GlobCompiler globCompiler = null;
-        if (null == (globCompiler = getGlobCompilerBasic()))
-        {
+        if (null == (globCompiler = getGlobCompilerBasic())) {
             updateGlobCompiler();
             return getGlobCompiler();
         }
@@ -159,76 +154,77 @@
 
     /**
      * Returns the globCompiler.
+     * 
      * @return GlobCompiler
      */
-    private static GlobCompiler getGlobCompilerBasic()
-    {
+    private static GlobCompiler getGlobCompilerBasic() {
         if (null == fieldGlobCompiler)
             return null;
-        return (GlobCompiler)fieldGlobCompiler.get();
+        return (GlobCompiler) fieldGlobCompiler.get();
     }
-    
+
     /**
      * Updates the current GlobCompiler.
      */
-    static protected void updateGlobCompiler()
-    {
+    static protected void updateGlobCompiler() {
         setGlobCompiler(computeGlobCompiler());
     }
-    
+
     /**
      * Answers a new GlobCompiler.
+     * 
      * @return GlobCompiler
      */
-    static protected GlobCompiler computeGlobCompiler()
-    {
+    static protected GlobCompiler computeGlobCompiler() {
         return new GlobCompiler();
-    }        
+    }
 
     /**
-     * <p>Returns the perl5Matcher, intialises if required.</p>
+     * <p>
+     * Returns the perl5Matcher, intialises if required.
+     * </p>
      * 
-     * <p>Note that this must be synchronized to prevent another thread 
-     * detecting the null state while this thread is initialising.</p>
+     * <p>
+     * Note that this must be synchronized to prevent another thread detecting
+     * the null state while this thread is initialising.
+     * </p>
      * 
      * @return Perl5Matcher
      */
-    static synchronized protected Perl5Matcher getPerl5Matcher()
-    {
+    static synchronized protected Perl5Matcher getPerl5Matcher() {
         Perl5Matcher perl5Matcher = null;
-        if (null == (perl5Matcher = getPerl5MatcherBasic()))
-        {
+        if (null == (perl5Matcher = getPerl5MatcherBasic())) {
             updatePerl5Matcher();
             return getPerl5Matcher();
         }
         return perl5Matcher;
     }
-    
+
     /**
      * Returns the perl5Matcher.
+     * 
      * @return Perl5Matcher
-     */    
-    private static Perl5Matcher getPerl5MatcherBasic()
-    {
+     */
+    private static Perl5Matcher getPerl5MatcherBasic() {
         if (null == fieldPerl5Matcher)
             return null;
-        return (Perl5Matcher)fieldPerl5Matcher.get();
+        return (Perl5Matcher) fieldPerl5Matcher.get();
     }
-    
+
     /**
      * Updates the current Perl5Matcher.
      */
-    static protected void updatePerl5Matcher()
-    {
+    static protected void updatePerl5Matcher() {
         setPerl5Matcher(computePerl5Matcher());
-    }        
+    }
 
     /**
      * Sets the globCompiler.
-     * @param globCompiler The globCompiler to set
+     * 
+     * @param globCompiler
+     *                The globCompiler to set
      */
-    protected static void setGlobCompiler(GlobCompiler globCompiler)
-    {
+    protected static void setGlobCompiler(GlobCompiler globCompiler) {
         if (null == fieldGlobCompiler)
             fieldGlobCompiler = new ThreadLocal();
         fieldGlobCompiler.set(globCompiler);
@@ -236,24 +232,25 @@
 
     /**
      * Sets the perl5Matcher.
-     * @param perl5Matcher The perl5Matcher to set
+     * 
+     * @param perl5Matcher
+     *                The perl5Matcher to set
      */
-    protected static void setPerl5Matcher(Perl5Matcher perl5Matcher)
-    {
+    protected static void setPerl5Matcher(Perl5Matcher perl5Matcher) {
         if (null == fieldPerl5Matcher)
             fieldPerl5Matcher = new ThreadLocal();
         fieldPerl5Matcher.set(perl5Matcher);
     }
-    
+
     /**
      * Answers a new perl5Matcher.
+     * 
      * @return Perl5Matcher
      */
-    static protected Perl5Matcher computePerl5Matcher()
-    {
+    static protected Perl5Matcher computePerl5Matcher() {
         return new Perl5Matcher();
     }
-    
+
     /**
      * Method <code>contains<code> answers a boolean indicating if the parameter 
      * <code>container</code> contains the parameter <code>contents</code> using an
@@ -263,18 +260,13 @@
      * @param contents
      * @return boolean
      */
-    public static boolean contains(
-        String comparatorName,
-        String container,
-        String contents) throws LookupException
-    {
-        Contains comparatorObj =
-            ComparatorManager.getInstance().newInstance(comparatorName);
-        return comparatorObj.contains(container, contents); 
+    public static boolean contains(String comparatorName, String container,
+            String contents) throws LookupException {
+        Contains comparatorObj = ComparatorManager.getInstance().newInstance(
+                comparatorName);
+        return comparatorObj.contains(container, contents);
     }
 
-
-
     /**
      * Method <code>is<code> answers a boolean indicating if the parameter 
      * <code>container</code> is equal to the parameter <code>contents</code> using 
@@ -284,25 +276,16 @@
      * @param string2
      * @return boolean
      */
-    public static boolean is(
-        String comparatorName,
-        String string1,
-        String string2) throws LookupException
-    {
-        Equals comparatorObj =
-            ComparatorManager.getInstance().newInstance(comparatorName);
+    public static boolean is(String comparatorName, String string1,
+            String string2) throws LookupException {
+        Equals comparatorObj = ComparatorManager.getInstance().newInstance(
+                comparatorName);
         return comparatorObj.equals(string1, string2);
     }
 
-
-
-
-
-
-
-
     /**
-     * Method <code>matches</code> answers a boolean indicating if the parameter 
+     * Method <code>matches</code> answers a boolean indicating if the
+     * parameter
      * <code>string/code> is matched by the patterm <code>glob</code> using an
      * instance of <code>comparatorName</code>.
      * @param comparatorName
@@ -310,18 +293,11 @@
      * @param glob
      * @return boolean
      */
-    public static boolean matches(
-        String comparatorName,
-        String string,
-        String glob) throws SieveException
-    {
-        Matches comparatorObj =
-            ComparatorManager.getInstance().newInstance(comparatorName);
-        return comparatorObj.matches(string, glob);        
+    public static boolean matches(String comparatorName, String string,
+            String glob) throws SieveException {
+        Matches comparatorObj = ComparatorManager.getInstance().newInstance(
+                comparatorName);
+        return comparatorObj.matches(string, glob);
     }
-
-
-
-        
 
 }

Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/comparators/Contains.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/comparators/Contains.java?rev=578033&r1=578032&r2=578033&view=diff
==============================================================================
--- james/jsieve/trunk/src/main/java/org/apache/jsieve/comparators/Contains.java (original)
+++ james/jsieve/trunk/src/main/java/org/apache/jsieve/comparators/Contains.java Fri Sep 21 02:32:00 2007
@@ -17,23 +17,22 @@
  * under the License.                                           *
  ****************************************************************/
 
-
 package org.apache.jsieve.comparators;
 
 /**
  * Interface Contains defines the method signatures for contains comparators.
  */
-public interface Contains
-{
-    
+public interface Contains {
+
     /**
      * Method contains answers a <code>boolean</code> indicating if parameter
-     * <code>container</code> contains parameter <code>content</code> using the
-     * comparison rules defind by the implementation.
+     * <code>container</code> contains parameter <code>content</code> using
+     * the comparison rules defind by the implementation.
+     * 
      * @param container
      * @param content
      * @return boolean
      */
-    public boolean contains(String container, String content);    
+    public boolean contains(String container, String content);
 
 }

Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/comparators/Equals.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/comparators/Equals.java?rev=578033&r1=578032&r2=578033&view=diff
==============================================================================
--- james/jsieve/trunk/src/main/java/org/apache/jsieve/comparators/Equals.java (original)
+++ james/jsieve/trunk/src/main/java/org/apache/jsieve/comparators/Equals.java Fri Sep 21 02:32:00 2007
@@ -17,18 +17,17 @@
  * under the License.                                           *
  ****************************************************************/
 
-
 package org.apache.jsieve.comparators;
 
 /**
  * Interface Equals defines the method signatures for equals comparators.
  */
-public interface Equals
-{
+public interface Equals {
     /**
      * Method equals answers a <code>boolean</code> indicating if parameter
-     * <code>string1</code> is equal to parameter <code>string2</code> using the
-     * comparison rules defind by the implementation.
+     * <code>string1</code> is equal to parameter <code>string2</code> using
+     * the comparison rules defind by the implementation.
+     * 
      * @param string1
      * @param string2
      * @return boolean

Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/comparators/MatchTypeTags.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/comparators/MatchTypeTags.java?rev=578033&r1=578032&r2=578033&view=diff
==============================================================================
--- james/jsieve/trunk/src/main/java/org/apache/jsieve/comparators/MatchTypeTags.java (original)
+++ james/jsieve/trunk/src/main/java/org/apache/jsieve/comparators/MatchTypeTags.java Fri Sep 21 02:32:00 2007
@@ -17,17 +17,17 @@
  * under the License.                                           *
  ****************************************************************/
 
-
 package org.apache.jsieve.comparators;
 
 /**
- * Interface MatchTypeTags defines the String constants used to specify
- * an MATCH-TYPE tag. 
+ * Interface MatchTypeTags defines the String constants used to specify an
+ * MATCH-TYPE tag.
  */
-public interface MatchTypeTags
-{
+public interface MatchTypeTags {
     public static final String IS_TAG = ":is";
+
     public static final String CONTAINS_TAG = ":contains";
-    public static final String MATCHES_TAG = ":matches";         
+
+    public static final String MATCHES_TAG = ":matches";
 
 }

Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/comparators/Matches.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/comparators/Matches.java?rev=578033&r1=578032&r2=578033&view=diff
==============================================================================
--- james/jsieve/trunk/src/main/java/org/apache/jsieve/comparators/Matches.java (original)
+++ james/jsieve/trunk/src/main/java/org/apache/jsieve/comparators/Matches.java Fri Sep 21 02:32:00 2007
@@ -17,7 +17,6 @@
  * under the License.                                           *
  ****************************************************************/
 
-
 package org.apache.jsieve.comparators;
 
 import org.apache.jsieve.exception.SieveException;
@@ -25,12 +24,12 @@
 /**
  * Interface Matches defines the method signatures for matches comparators.
  */
-public interface Matches
-{
+public interface Matches {
     /**
      * Method matches answers a <code>boolean</code> indicating if parameter
      * <code>string1</code> matches the pattern in parameter <code>glob</code>
      * using the matching rules defind by the implementation.
+     * 
      * @param string
      * @param glob
      * @return boolean

Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/comparators/Octet.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/comparators/Octet.java?rev=578033&r1=578032&r2=578033&view=diff
==============================================================================
--- james/jsieve/trunk/src/main/java/org/apache/jsieve/comparators/Octet.java (original)
+++ james/jsieve/trunk/src/main/java/org/apache/jsieve/comparators/Octet.java Fri Sep 21 02:32:00 2007
@@ -17,50 +17,45 @@
  * under the License.                                           *
  ****************************************************************/
 
-
 package org.apache.jsieve.comparators;
 
 import org.apache.jsieve.exception.SievePatternException;
 
 /**
- * Class Octet implements the EQUALITY operation of the i;octet comparator as defined
- * by RFC2244, section 3.4 - "For the equality function, two strings are equal if 
- * they are the same length and contain the same octets in the same order. NIL is
- * equal only to itself".
+ * Class Octet implements the EQUALITY operation of the i;octet comparator as
+ * defined by RFC2244, section 3.4 - "For the equality function, two strings are
+ * equal if they are the same length and contain the same octets in the same
+ * order. NIL is equal only to itself".
  */
-public class Octet implements Comparator
-{
+public class Octet implements Comparator {
 
     /**
      * Constructor for Octet.
      */
-    public Octet()
-    {
+    public Octet() {
         super();
     }
 
     /**
      * @see org.apache.jsieve.comparators.Equals#equals(String, String)
      */
-    public boolean equals(String string1, String string2)
-    {
+    public boolean equals(String string1, String string2) {
         return ComparatorUtils.equals(string1, string2);
     }
 
     /**
      * @see org.apache.jsieve.comparators.Contains#contains(String, String)
      */
-    public boolean contains(String container, String content)
-    {
+    public boolean contains(String container, String content) {
         return ComparatorUtils.contains(container, content);
     }
 
     /**
      * @see org.apache.jsieve.comparators.Matches#matches(String, String)
      */
-    public boolean matches(String string, String glob) throws SievePatternException
-    {
-       return ComparatorUtils.matches(string, glob);      
+    public boolean matches(String string, String glob)
+            throws SievePatternException {
+        return ComparatorUtils.matches(string, glob);
     }
 
 }

Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/exception/CommandException.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/exception/CommandException.java?rev=578033&r1=578032&r2=578033&view=diff
==============================================================================
--- james/jsieve/trunk/src/main/java/org/apache/jsieve/exception/CommandException.java (original)
+++ james/jsieve/trunk/src/main/java/org/apache/jsieve/exception/CommandException.java Fri Sep 21 02:32:00 2007
@@ -17,50 +17,47 @@
  * under the License.                                           *
  ****************************************************************/
 
-
 package org.apache.jsieve.exception;
 
 /**
- * Class <code>CommandException</code> indicates an exceptional condition encountered
- * while executing a Command.
+ * Class <code>CommandException</code> indicates an exceptional condition
+ * encountered while executing a Command.
  * 
  */
-public class CommandException extends OperationException
-{
+public class CommandException extends OperationException {
 
     /**
      * Constructor for CommandException.
      */
-    public CommandException()
-    {
+    public CommandException() {
         super();
     }
 
     /**
      * Constructor for CommandException.
+     * 
      * @param message
      */
-    public CommandException(String message)
-    {
+    public CommandException(String message) {
         super(message);
     }
 
     /**
      * Constructor for CommandException.
+     * 
      * @param message
      * @param cause
      */
-    public CommandException(String message, Throwable cause)
-    {
+    public CommandException(String message, Throwable cause) {
         super(message, cause);
     }
 
     /**
      * Constructor for CommandException.
+     * 
      * @param cause
      */
-    public CommandException(Throwable cause)
-    {
+    public CommandException(Throwable cause) {
         super(cause);
     }
 

Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/exception/FeatureException.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/exception/FeatureException.java?rev=578033&r1=578032&r2=578033&view=diff
==============================================================================
--- james/jsieve/trunk/src/main/java/org/apache/jsieve/exception/FeatureException.java (original)
+++ james/jsieve/trunk/src/main/java/org/apache/jsieve/exception/FeatureException.java Fri Sep 21 02:32:00 2007
@@ -17,49 +17,46 @@
  * under the License.                                           *
  ****************************************************************/
 
-
 package org.apache.jsieve.exception;
 
 /**
  * Class FeatureException indicates an exceptional condition encountered while
  * evaluating a feature of Sieve.
  */
-public class FeatureException extends SieveException
-{
+public class FeatureException extends SieveException {
 
     /**
      * Constructor for FeatureException.
      */
-    public FeatureException()
-    {
+    public FeatureException() {
         super();
     }
 
     /**
      * Constructor for FeatureException.
+     * 
      * @param message
      */
-    public FeatureException(String message)
-    {
+    public FeatureException(String message) {
         super(message);
     }
 
     /**
      * Constructor for FeatureException.
+     * 
      * @param message
      * @param cause
      */
-    public FeatureException(String message, Throwable cause)
-    {
+    public FeatureException(String message, Throwable cause) {
         super(message, cause);
     }
 
     /**
      * Constructor for FeatureException.
+     * 
      * @param cause
      */
-    public FeatureException(Throwable cause)
-    {
+    public FeatureException(Throwable cause) {
         super(cause);
     }
 

Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/exception/InternetAddressException.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/exception/InternetAddressException.java?rev=578033&r1=578032&r2=578033&view=diff
==============================================================================
--- james/jsieve/trunk/src/main/java/org/apache/jsieve/exception/InternetAddressException.java (original)
+++ james/jsieve/trunk/src/main/java/org/apache/jsieve/exception/InternetAddressException.java Fri Sep 21 02:32:00 2007
@@ -17,49 +17,46 @@
  * under the License.                                           *
  ****************************************************************/
 
-
 package org.apache.jsieve.exception;
 
 /**
- * Class InternetAddressException indicates an exceptional condition encountered 
+ * Class InternetAddressException indicates an exceptional condition encountered
  * while evaluating an Internet Address.
  */
-public class InternetAddressException extends SieveException
-{
+public class InternetAddressException extends SieveException {
 
     /**
      * Constructor for InternetAddressException.
      */
-    public InternetAddressException()
-    {
+    public InternetAddressException() {
         super();
     }
 
     /**
      * Constructor for InternetAddressException.
+     * 
      * @param message
      */
-    public InternetAddressException(String message)
-    {
+    public InternetAddressException(String message) {
         super(message);
     }
 
     /**
      * Constructor for InternetAddressException.
+     * 
      * @param message
      * @param cause
      */
-    public InternetAddressException(String message, Throwable cause)
-    {
+    public InternetAddressException(String message, Throwable cause) {
         super(message, cause);
     }
 
     /**
      * Constructor for InternetAddressException.
+     * 
      * @param cause
      */
-    public InternetAddressException(Throwable cause)
-    {
+    public InternetAddressException(Throwable cause) {
         super(cause);
     }
 

Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/exception/LookupException.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/exception/LookupException.java?rev=578033&r1=578032&r2=578033&view=diff
==============================================================================
--- james/jsieve/trunk/src/main/java/org/apache/jsieve/exception/LookupException.java (original)
+++ james/jsieve/trunk/src/main/java/org/apache/jsieve/exception/LookupException.java Fri Sep 21 02:32:00 2007
@@ -17,49 +17,46 @@
  * under the License.                                           *
  ****************************************************************/
 
-
 package org.apache.jsieve.exception;
 
 /**
  * Class LookupException indicates an exceptional condition encountered while
  * locating a Sieve resource.
  */
-public class LookupException extends SieveException
-{
+public class LookupException extends SieveException {
 
     /**
      * Constructor for LookupException.
      */
-    public LookupException()
-    {
+    public LookupException() {
         super();
     }
 
     /**
      * Constructor for LookupException.
+     * 
      * @param message
      */
-    public LookupException(String message)
-    {
+    public LookupException(String message) {
         super(message);
     }
 
     /**
      * Constructor for LookupException.
+     * 
      * @param message
      * @param cause
      */
-    public LookupException(String message, Throwable cause)
-    {
+    public LookupException(String message, Throwable cause) {
         super(message, cause);
     }
 
     /**
      * Constructor for LookupException.
+     * 
      * @param cause
      */
-    public LookupException(Throwable cause)
-    {
+    public LookupException(Throwable cause) {
         super(cause);
     }
 

Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/exception/OperationException.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/exception/OperationException.java?rev=578033&r1=578032&r2=578033&view=diff
==============================================================================
--- james/jsieve/trunk/src/main/java/org/apache/jsieve/exception/OperationException.java (original)
+++ james/jsieve/trunk/src/main/java/org/apache/jsieve/exception/OperationException.java Fri Sep 21 02:32:00 2007
@@ -17,50 +17,47 @@
  * under the License.                                           *
  ****************************************************************/
 
-
 package org.apache.jsieve.exception;
 
 /**
- * Class <code>OperationException</code> indicates an exceptional condition 
+ * Class <code>OperationException</code> indicates an exceptional condition
  * encountered while executing an Operation.
  * 
  */
-public class OperationException extends SieveException
-{
+public class OperationException extends SieveException {
 
     /**
      * Constructor for OperationException.
      */
-    public OperationException()
-    {
+    public OperationException() {
         super();
     }
 
     /**
      * Constructor for OperationException.
+     * 
      * @param message
      */
-    public OperationException(String message)
-    {
+    public OperationException(String message) {
         super(message);
     }
 
     /**
      * Constructor for OperationException.
+     * 
      * @param message
      * @param cause
      */
-    public OperationException(String message, Throwable cause)
-    {
+    public OperationException(String message, Throwable cause) {
         super(message, cause);
     }
 
     /**
      * Constructor for OperationException.
+     * 
      * @param cause
      */
-    public OperationException(Throwable cause)
-    {
+    public OperationException(Throwable cause) {
         super(cause);
     }
 

Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/exception/SieveException.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/exception/SieveException.java?rev=578033&r1=578032&r2=578033&view=diff
==============================================================================
--- james/jsieve/trunk/src/main/java/org/apache/jsieve/exception/SieveException.java (original)
+++ james/jsieve/trunk/src/main/java/org/apache/jsieve/exception/SieveException.java Fri Sep 21 02:32:00 2007
@@ -17,49 +17,46 @@
  * under the License.                                           *
  ****************************************************************/
 
-
 package org.apache.jsieve.exception;
 
 /**
- * Class <code>SieveException</code> indicates an exceptional condition encountered
- * within Sieve.
+ * Class <code>SieveException</code> indicates an exceptional condition
+ * encountered within Sieve.
  */
-public class SieveException extends Exception
-{
+public class SieveException extends Exception {
 
     /**
      * Constructor for SieveException.
      */
-    public SieveException()
-    {
+    public SieveException() {
         super();
     }
 
     /**
      * Constructor for SieveException.
+     * 
      * @param message
      */
-    public SieveException(String message)
-    {
+    public SieveException(String message) {
         super(message);
     }
 
     /**
      * Constructor for SieveException.
+     * 
      * @param message
      * @param cause
      */
-    public SieveException(String message, Throwable cause)
-    {
+    public SieveException(String message, Throwable cause) {
         super(message, cause);
     }
 
     /**
      * Constructor for SieveException.
+     * 
      * @param cause
      */
-    public SieveException(Throwable cause)
-    {
+    public SieveException(Throwable cause) {
         super(cause);
     }
 

Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/exception/SievePatternException.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/exception/SievePatternException.java?rev=578033&r1=578032&r2=578033&view=diff
==============================================================================
--- james/jsieve/trunk/src/main/java/org/apache/jsieve/exception/SievePatternException.java (original)
+++ james/jsieve/trunk/src/main/java/org/apache/jsieve/exception/SievePatternException.java Fri Sep 21 02:32:00 2007
@@ -17,49 +17,46 @@
  * under the License.                                           *
  ****************************************************************/
 
-
 package org.apache.jsieve.exception;
 
 /**
- * Class <code>SievePatternException</code> indicates an exceptional condition 
+ * Class <code>SievePatternException</code> indicates an exceptional condition
  * encountered while evaluating a glob expression.
  */
-public class SievePatternException extends SieveException
-{
+public class SievePatternException extends SieveException {
 
     /**
      * Constructor for SievePatternException.
      */
-    public SievePatternException()
-    {
+    public SievePatternException() {
         super();
     }
 
     /**
      * Constructor for SievePatternException.
+     * 
      * @param message
      */
-    public SievePatternException(String message)
-    {
+    public SievePatternException(String message) {
         super(message);
     }
 
     /**
      * Constructor for SievePatternException.
+     * 
      * @param message
      * @param cause
      */
-    public SievePatternException(String message, Throwable cause)
-    {
+    public SievePatternException(String message, Throwable cause) {
         super(message, cause);
     }
 
     /**
      * Constructor for SievePatternException.
+     * 
      * @param cause
      */
-    public SievePatternException(Throwable cause)
-    {
+    public SievePatternException(Throwable cause) {
         super(cause);
     }
 

Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/exception/StopException.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/exception/StopException.java?rev=578033&r1=578032&r2=578033&view=diff
==============================================================================
--- james/jsieve/trunk/src/main/java/org/apache/jsieve/exception/StopException.java (original)
+++ james/jsieve/trunk/src/main/java/org/apache/jsieve/exception/StopException.java Fri Sep 21 02:32:00 2007
@@ -17,49 +17,47 @@
  * under the License.                                           *
  ****************************************************************/
 
-
 package org.apache.jsieve.exception;
 
 /**
- * Class <code>StopException</code> indicates that evaluation should be terminated.
- * Typically, this exception is thrown when a Stop Command is encountered.
+ * Class <code>StopException</code> indicates that evaluation should be
+ * terminated. Typically, this exception is thrown when a Stop Command is
+ * encountered.
  */
-public class StopException extends SieveException
-{
+public class StopException extends SieveException {
 
     /**
      * Constructor for StopException.
      */
-    public StopException()
-    {
+    public StopException() {
         super();
     }
 
     /**
      * Constructor for StopException.
+     * 
      * @param message
      */
-    public StopException(String message)
-    {
+    public StopException(String message) {
         super(message);
     }
 
     /**
      * Constructor for StopException.
+     * 
      * @param message
      * @param cause
      */
-    public StopException(String message, Throwable cause)
-    {
+    public StopException(String message, Throwable cause) {
         super(message, cause);
     }
 
     /**
      * Constructor for StopException.
+     * 
      * @param cause
      */
-    public StopException(Throwable cause)
-    {
+    public StopException(Throwable cause) {
         super(cause);
     }
 

Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/exception/SyntaxException.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/exception/SyntaxException.java?rev=578033&r1=578032&r2=578033&view=diff
==============================================================================
--- james/jsieve/trunk/src/main/java/org/apache/jsieve/exception/SyntaxException.java (original)
+++ james/jsieve/trunk/src/main/java/org/apache/jsieve/exception/SyntaxException.java Fri Sep 21 02:32:00 2007
@@ -17,50 +17,47 @@
  * under the License.                                           *
  ****************************************************************/
 
-
 package org.apache.jsieve.exception;
 
 /**
- * Class <code>SyntaxException</code> indicates an exceptional condition encountered
- * while evaluating the operands of a Sieve operation, such as a Command, Test or 
- * Comparator.
+ * Class <code>SyntaxException</code> indicates an exceptional condition
+ * encountered while evaluating the operands of a Sieve operation, such as a
+ * Command, Test or Comparator.
  */
-public class SyntaxException extends SieveException
-{
+public class SyntaxException extends SieveException {
 
     /**
      * Constructor for SyntaxException.
      */
-    public SyntaxException()
-    {
+    public SyntaxException() {
         super();
     }
 
     /**
      * Constructor for SyntaxException.
+     * 
      * @param message
      */
-    public SyntaxException(String message)
-    {
+    public SyntaxException(String message) {
         super(message);
     }
 
     /**
      * Constructor for SyntaxException.
+     * 
      * @param message
      * @param cause
      */
-    public SyntaxException(String message, Throwable cause)
-    {
+    public SyntaxException(String message, Throwable cause) {
         super(message, cause);
     }
 
     /**
      * Constructor for SyntaxException.
+     * 
      * @param cause
      */
-    public SyntaxException(Throwable cause)
-    {
+    public SyntaxException(Throwable cause) {
         super(cause);
     }
 

Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/exception/TestException.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/exception/TestException.java?rev=578033&r1=578032&r2=578033&view=diff
==============================================================================
--- james/jsieve/trunk/src/main/java/org/apache/jsieve/exception/TestException.java (original)
+++ james/jsieve/trunk/src/main/java/org/apache/jsieve/exception/TestException.java Fri Sep 21 02:32:00 2007
@@ -17,50 +17,47 @@
  * under the License.                                           *
  ****************************************************************/
 
-
 package org.apache.jsieve.exception;
 
 /**
- * Class <code>TestException</code> indicates an exceptional condition encountered
- * while executing a Test.
+ * Class <code>TestException</code> indicates an exceptional condition
+ * encountered while executing a Test.
  * 
  */
-public class TestException extends OperationException
-{
+public class TestException extends OperationException {
 
     /**
      * Constructor for TestException.
      */
-    public TestException()
-    {
+    public TestException() {
         super();
     }
 
     /**
      * Constructor for TestException.
+     * 
      * @param message
      */
-    public TestException(String message)
-    {
+    public TestException(String message) {
         super(message);
     }
 
     /**
      * Constructor for TestException.
+     * 
      * @param message
      * @param cause
      */
-    public TestException(String message, Throwable cause)
-    {
+    public TestException(String message, Throwable cause) {
         super(message, cause);
     }
 
     /**
      * Constructor for TestException.
+     * 
      * @param cause
      */
-    public TestException(Throwable cause)
-    {
+    public TestException(Throwable cause) {
         super(cause);
     }
 

Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/mail/Action.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/mail/Action.java?rev=578033&r1=578032&r2=578033&view=diff
==============================================================================
--- james/jsieve/trunk/src/main/java/org/apache/jsieve/mail/Action.java (original)
+++ james/jsieve/trunk/src/main/java/org/apache/jsieve/mail/Action.java Fri Sep 21 02:32:00 2007
@@ -17,14 +17,12 @@
  * under the License.                                           *
  ****************************************************************/
 
-
 package org.apache.jsieve.mail;
 
 /**
- * Interface <code>Action</code> defines the final state of a 
+ * Interface <code>Action</code> defines the final state of a
  * <code>MailAdapter</code> instance.
  */
-public interface Action
-{
+public interface Action {
 
 }

Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/mail/ActionFileInto.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/mail/ActionFileInto.java?rev=578033&r1=578032&r2=578033&view=diff
==============================================================================
--- james/jsieve/trunk/src/main/java/org/apache/jsieve/mail/ActionFileInto.java (original)
+++ james/jsieve/trunk/src/main/java/org/apache/jsieve/mail/ActionFileInto.java Fri Sep 21 02:32:00 2007
@@ -17,64 +17,58 @@
  * under the License.                                           *
  ****************************************************************/
 
-
 package org.apache.jsieve.mail;
 
 /**
- * Class ActionFileInto encapsulates the information required to file a mail into a
- * location.
- * See RFC 3028, Section 4.2.
+ * Class ActionFileInto encapsulates the information required to file a mail
+ * into a location. See RFC 3028, Section 4.2.
  */
-public class ActionFileInto implements Action
-{
+public class ActionFileInto implements Action {
     /**
-     * A String representation of the location to which the message should be moved.
-     */ 
+     * A String representation of the location to which the message should be
+     * moved.
+     */
     private String fieldDestination;
 
     /**
      * Constructor for ActionFileInto.
      */
-    private ActionFileInto()
-    {
+    private ActionFileInto() {
         super();
     }
-    
+
     /**
      * Constructor for ActionFileInto.
      */
-    public ActionFileInto(String destination)
-    {
+    public ActionFileInto(String destination) {
         this();
         setDestination(destination);
-    }    
+    }
 
     /**
      * Returns the destination.
+     * 
      * @return String
      */
-    public String getDestination()
-    {
+    public String getDestination() {
         return fieldDestination;
     }
 
     /**
      * @see java.lang.Object#toString()
      */
-    public String toString()
-    {
-        return "Action: "
-            + getClass().getName()
-            + ", destination: "
-            + getDestination();
+    public String toString() {
+        return "Action: " + getClass().getName() + ", destination: "
+                + getDestination();
     }
 
     /**
      * Sets the destination.
-     * @param destination The destination to set
+     * 
+     * @param destination
+     *                The destination to set
      */
-    protected void setDestination(String destination)
-    {
+    protected void setDestination(String destination) {
         fieldDestination = destination;
     }
 

Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/mail/ActionKeep.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/mail/ActionKeep.java?rev=578033&r1=578032&r2=578033&view=diff
==============================================================================
--- james/jsieve/trunk/src/main/java/org/apache/jsieve/mail/ActionKeep.java (original)
+++ james/jsieve/trunk/src/main/java/org/apache/jsieve/mail/ActionKeep.java Fri Sep 21 02:32:00 2007
@@ -17,29 +17,25 @@
  * under the License.                                           *
  ****************************************************************/
 
-
 package org.apache.jsieve.mail;
 
 /**
- * Class ActionKeep encapsulates the information required to keep a mail.
- * See RFC 3028, Section 4.4.
+ * Class ActionKeep encapsulates the information required to keep a mail. See
+ * RFC 3028, Section 4.4.
  */
-public class ActionKeep implements Action
-{
+public class ActionKeep implements Action {
 
     /**
      * Constructor for ActionKeep.
      */
-    public ActionKeep()
-    {
+    public ActionKeep() {
         super();
     }
 
     /**
      * @see java.lang.Object#toString()
      */
-    public String toString()
-    {
+    public String toString() {
         return "Action: " + getClass().getName();
     }
 

Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/mail/ActionRedirect.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/mail/ActionRedirect.java?rev=578033&r1=578032&r2=578033&view=diff
==============================================================================
--- james/jsieve/trunk/src/main/java/org/apache/jsieve/mail/ActionRedirect.java (original)
+++ james/jsieve/trunk/src/main/java/org/apache/jsieve/mail/ActionRedirect.java Fri Sep 21 02:32:00 2007
@@ -17,60 +17,53 @@
  * under the License.                                           *
  ****************************************************************/
 
-
 package org.apache.jsieve.mail;
 
 /**
- * Class ActionRedirect encapsulates the information required to redirect a mail.
- * See RFC 3028, Section 4.3.
+ * Class ActionRedirect encapsulates the information required to redirect a
+ * mail. See RFC 3028, Section 4.3.
  */
-public class ActionRedirect implements Action
-{
+public class ActionRedirect implements Action {
     private String fieldAddress;
 
     /**
      * Constructor for ActionRedirect.
      */
-    private ActionRedirect()
-    {
+    private ActionRedirect() {
         super();
     }
-    
+
     /**
      * Constructor for ActionRedirect.
      */
-    public ActionRedirect(String address)
-    {
+    public ActionRedirect(String address) {
         this();
         setAddress(address);
     }
-    
+
     /**
      * @see java.lang.Object#toString()
      */
-    public String toString()
-    {
-        return "Action: "
-            + getClass().getName()
-            + ", address: "
-            + getAddress();
-    }        
+    public String toString() {
+        return "Action: " + getClass().getName() + ", address: " + getAddress();
+    }
 
     /**
      * Returns the address.
+     * 
      * @return String
      */
-    public String getAddress()
-    {
+    public String getAddress() {
         return fieldAddress;
     }
 
     /**
      * Sets the address.
-     * @param address The address to set
+     * 
+     * @param address
+     *                The address to set
      */
-    protected void setAddress(String address)
-    {
+    protected void setAddress(String address) {
         fieldAddress = address;
     }
 



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