You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@velocity.apache.org by si...@apache.org on 2002/03/13 23:08:54 UTC
cvs commit: jakarta-velocity-tools/struts/src/java/org/apache/velocity/tools/struts ErrorsTool.java FormTool.java LinkTool.java
sidler 02/03/13 14:08:54
Modified: struts/src/java/org/apache/velocity/tools/struts
ErrorsTool.java FormTool.java LinkTool.java
Log:
Patched several typos and little inefficiencies per feedback of Nathan Bubna.
Revision Changes Path
1.2 +17 -26 jakarta-velocity-tools/struts/src/java/org/apache/velocity/tools/struts/ErrorsTool.java
Index: ErrorsTool.java
===================================================================
RCS file: /home/cvs/jakarta-velocity-tools/struts/src/java/org/apache/velocity/tools/struts/ErrorsTool.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ErrorsTool.java 12 Mar 2002 11:36:49 -0000 1.1
+++ ErrorsTool.java 13 Mar 2002 22:08:54 -0000 1.2
@@ -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,7 +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.
@@ -75,7 +75,7 @@
*
* @author <a href="mailto:sidler@teamup.com">Gabe Sidler</a>
*
- * @version $Id: ErrorsTool.java,v 1.1 2002/03/12 11:36:49 sidler Exp $
+ * @version $Id: ErrorsTool.java,v 1.2 2002/03/13 22:08:54 sidler Exp $
*
*/
public class ErrorsTool extends ServletContextTool
@@ -196,14 +196,7 @@
return false;
}
- if (errors.size(property) > 0)
- {
- return true;
- }
- else
- {
- return false;
- }
+ return (errors.size(property) > 0);
}
@@ -260,37 +253,35 @@
*/
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;
+ }
+
Iterator errormsgs;
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())
{
ActionError errormsg = (ActionError)errormsgs.next();
1.2 +2 -2 jakarta-velocity-tools/struts/src/java/org/apache/velocity/tools/struts/FormTool.java
Index: FormTool.java
===================================================================
RCS file: /home/cvs/jakarta-velocity-tools/struts/src/java/org/apache/velocity/tools/struts/FormTool.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FormTool.java 12 Mar 2002 11:36:49 -0000 1.1
+++ FormTool.java 13 Mar 2002 22:08:54 -0000 1.2
@@ -71,7 +71,7 @@
*
* @author <a href="mailto:sidler@teamup.com">Gabe Sidler</a>
*
- * @version $Id: FormTool.java,v 1.1 2002/03/12 11:36:49 sidler Exp $
+ * @version $Id: FormTool.java,v 1.2 2002/03/13 22:08:54 sidler Exp $
*
*/
public class FormTool extends ServletContextTool
@@ -157,7 +157,7 @@
* <pre>
* Example:
* #set ($defaults = $form.bean)
- * <input type="text" name="username" value="$form.username">
+ * <input type="text" name="username" value="$defaults.username">
* </pre>
*
* @return the {@link ActionForm} associated with this request or
1.2 +3 -3 jakarta-velocity-tools/struts/src/java/org/apache/velocity/tools/struts/LinkTool.java
Index: LinkTool.java
===================================================================
RCS file: /home/cvs/jakarta-velocity-tools/struts/src/java/org/apache/velocity/tools/struts/LinkTool.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LinkTool.java 12 Mar 2002 11:36:49 -0000 1.1
+++ LinkTool.java 13 Mar 2002 22:08:54 -0000 1.2
@@ -75,9 +75,9 @@
* 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 $
+ * @version $Id: LinkTool.java,v 1.2 2002/03/13 22:08:54 sidler Exp $
*
*/
public class LinkTool extends ServletContextTool
@@ -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));
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>