Index: struts/src/java/org/apache/velocity/tools/struts/ErrorsTool.java
===================================================================
RCS file: /home/cvspublic/jakarta-velocity-tools/struts/src/java/org/apache/velocity/tools/struts/ErrorsTool.java,v
retrieving revision 1.1
diff -u -r1.1 ErrorsTool.java
--- struts/src/java/org/apache/velocity/tools/struts/ErrorsTool.java	12 Mar 2002 11:36:49 -0000	1.1
+++ struts/src/java/org/apache/velocity/tools/struts/ErrorsTool.java	12 Mar 2002 17:29:33 -0000
@@ -54,8 +54,9 @@
 
 package org.apache.velocity.tools.struts;
 
-import java.util.Locale;
 import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.Locale;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
@@ -66,8 +67,6 @@
 import org.apache.velocity.tools.view.context.ViewContext;
 import org.apache.velocity.tools.view.tools.ContextTool;
 
-import java.util.Iterator;
-
 /**
  * <p>Context tool to work with the Struts error messages.
  * Extends ServletContextTool to profit from the logging
@@ -196,14 +195,7 @@
             return false;
         }
 
-        if (errors.size(property) > 0)
-        {
-            return true;
-        }
-        else
-        {
-            return false;
-        }
+        return (errors.size(property) > 0);
     }
 
 
@@ -260,8 +252,15 @@
      */
     public ArrayList get(String property) 
     {
-        if ( errors == null || errors.empty())
+        if (errors == null || errors.empty())
+        {
+            return null;
+        }
+        
+        if (resources == null) 
         {
+            log(ERROR, "Message resources are not available.");
+            //FIXME? should we return the list of error keys instead?
             return null;
         }
         
@@ -269,27 +268,18 @@
         if (property == null)
         {
             errormsgs = errors.get();
-            if ( !(errormsgs.hasNext()) ) 
-            {
-                return null;
-            }       
         }
         else
         {
             errormsgs = errors.get(property);
-            if ( !(errormsgs.hasNext()) ) 
-            {
-                return null;
-            }       
         }
-
-        ArrayList list = new ArrayList();
-
-        if (resources == null) 
+        
+        if (!(errormsgs.hasNext())) 
         {
-            log(ERROR, "Message resources are not available.");
             return null;
-        }
+        }       
+
+        ArrayList list = new ArrayList();
         
         while (errormsgs.hasNext())
         {
Index: struts/src/java/org/apache/velocity/tools/struts/FormTool.java
===================================================================
RCS file: /home/cvspublic/jakarta-velocity-tools/struts/src/java/org/apache/velocity/tools/struts/FormTool.java,v
retrieving revision 1.1
diff -u -r1.1 FormTool.java
--- struts/src/java/org/apache/velocity/tools/struts/FormTool.java	12 Mar 2002 11:36:49 -0000	1.1
+++ struts/src/java/org/apache/velocity/tools/struts/FormTool.java	12 Mar 2002 17:29:33 -0000
@@ -157,7 +157,7 @@
      * <pre>   
      * Example:
      * #set ($defaults = $form.bean) 
-     * &lt;input type="text" name="username" value="$form.username"&gt;
+     * &lt;input type="text" name="username" value="$defaults.username"&gt;
      * </pre>
      *
      * @return the {@link ActionForm} associated with this request or 
Index: struts/src/java/org/apache/velocity/tools/struts/LinkTool.java
===================================================================
RCS file: /home/cvspublic/jakarta-velocity-tools/struts/src/java/org/apache/velocity/tools/struts/LinkTool.java,v
retrieving revision 1.1
diff -u -r1.1 LinkTool.java
--- struts/src/java/org/apache/velocity/tools/struts/LinkTool.java	12 Mar 2002 11:36:49 -0000	1.1
+++ struts/src/java/org/apache/velocity/tools/struts/LinkTool.java	12 Mar 2002 17:29:33 -0000
@@ -75,7 +75,7 @@
  * that class.</p>
  *
  * @author <a href="mailto:sidler@teamup.com">Gabe Sidler</a>
- * @author <a href="mailto:nathan@esh.com">Nathan Bubna</a>
+ * @author <a href="mailto:nathan@esha.com">Nathan Bubna</a>
  *
  * @version $Id: LinkTool.java,v 1.1 2002/03/12 11:36:49 sidler Exp $
  * 
@@ -244,7 +244,7 @@
      */
     public LinkTool setAction(String action)
     {
-        return new LinkTool (this, StrutsUtils.getActionMappingURL(application, request, action));
+        return new LinkTool(this, StrutsUtils.getActionMappingURL(application, request, action));
     }