Author: nbubna
Date: Sun Apr 29 14:36:38 2007
New Revision: 533562
URL: http://svn.apache.org/viewvc?view=rev&rev=533562
Log:
bring velstruts tools up to speed with the new setup/tool-initialization support
Modified:
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/struts/ActionMessagesTool.java
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/struts/ErrorsTool.java
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/struts/FormTool.java
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/struts/MessageResourcesTool.java
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/struts/TilesTool.java
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/struts/ValidatorTool.java
Modified:
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/struts/ActionMessagesTool.java
URL:
http://svn.apache.org/viewvc/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/struts/ActionMessagesTool.java?view=diff&rev=533562&r1=533561&r2=533562
==============================================================================
---
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/struts/ActionMessagesTool.java
(original)
+++
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/struts/ActionMessagesTool.java
Sun Apr 29 14:36:38 2007
@@ -22,6 +22,7 @@
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.struts.action.ActionMessage;
@@ -80,10 +81,10 @@
* @param obj the current ViewContext
* @throws IllegalArgumentException if the param is not a ViewContext
*/
- public void init(Object obj)
+ public void setup(Map params)
{
//setup superclass instance members
- super.init(obj);
+ super.setup(params);
this.actionMsgs = StrutsUtils.getMessages(this.request);
}
Modified:
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/struts/ErrorsTool.java
URL:
http://svn.apache.org/viewvc/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/struts/ErrorsTool.java?view=diff&rev=533562&r1=533561&r2=533562
==============================================================================
---
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/struts/ErrorsTool.java
(original)
+++
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/struts/ErrorsTool.java
Sun Apr 29 14:36:38 2007
@@ -19,6 +19,7 @@
* under the License.
*/
+import java.util.Map;
import org.apache.velocity.tools.config.DefaultKey;
import org.apache.velocity.tools.config.ValidScope;
@@ -61,10 +62,10 @@
* @param obj the current ViewContext
* @throws IllegalArgumentException if the param is not a ViewContext
*/
- public void init(Object obj)
+ public void setup(Map params)
{
//setup superclass instance members
- super.init(obj);
+ super.setup(params);
this.actionMsgs = StrutsUtils.getErrors(this.request);
}
Modified:
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/struts/FormTool.java
URL:
http://svn.apache.org/viewvc/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/struts/FormTool.java?view=diff&rev=533562&r1=533561&r2=533562
==============================================================================
---
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/struts/FormTool.java
(original)
+++
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/struts/FormTool.java
Sun Apr 29 14:36:38 2007
@@ -19,12 +19,13 @@
* under the License.
*/
+import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
-
import org.apache.struts.action.ActionForm;
import org.apache.velocity.tools.view.ViewContext;
-
+import org.apache.velocity.tools.config.DefaultKey;
+import org.apache.velocity.tools.config.ValidScope;
/**
* <p>View tool to work with HTML forms in Struts.</p>
@@ -48,6 +49,8 @@
* @since VelocityTools 1.0
* @version $Id$
*/
[EMAIL PROTECTED]("form")
[EMAIL PROTECTED]("request")
public class FormTool
{
@@ -83,15 +86,9 @@
* @param obj the current ViewContext
* @throws IllegalArgumentException if the param is not a ViewContext
*/
- public void init(Object obj)
+ public void setup(Map params)
{
- if (!(obj instanceof ViewContext))
- {
- throw new IllegalArgumentException("Tool can only be initialized
with a ViewContext");
- }
-
- ViewContext context = (ViewContext)obj;
- this.request = context.getRequest();
+ this.request = (HttpServletRequest)params.get(ViewContext.REQUEST);
this.session = request.getSession(false);
}
Modified:
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/struts/MessageResourcesTool.java
URL:
http://svn.apache.org/viewvc/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/struts/MessageResourcesTool.java?view=diff&rev=533562&r1=533561&r2=533562
==============================================================================
---
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/struts/MessageResourcesTool.java
(original)
+++
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/struts/MessageResourcesTool.java
Sun Apr 29 14:36:38 2007
@@ -20,6 +20,7 @@
*/
import java.util.Locale;
+import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.ServletContext;
import org.apache.commons.logging.Log;
@@ -51,16 +52,11 @@
* @param obj the current ViewContext
* @throws IllegalArgumentException if the param is not a ViewContext
*/
- public void init(Object obj)
+ public void setup(Map params)
{
- if (!(obj instanceof ViewContext))
- {
- throw new IllegalArgumentException("Tool can only be initialized
with a ViewContext");
- }
-
- ViewContext context = (ViewContext)obj;
- this.request = context.getRequest();
- this.application = context.getServletContext();
+ this.request = (HttpServletRequest)params.get(ViewContext.REQUEST);
+ this.application =
(ServletContext)params.get(ViewContext.SERVLET_CONTEXT_KEY);
+
this.resources =
StrutsUtils.getMessageResources(request, application);
this.locale =
Modified:
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/struts/TilesTool.java
URL:
http://svn.apache.org/viewvc/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/struts/TilesTool.java?view=diff&rev=533562&r1=533561&r2=533562
==============================================================================
---
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/struts/TilesTool.java
(original)
+++
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/struts/TilesTool.java
Sun Apr 29 14:36:38 2007
@@ -99,18 +99,13 @@
* @param obj the current ViewContext
* @throws IllegalArgumentException if the param is not a ViewContext
*/
- public void init(Object obj)
+ public void setVelocityContext(Context context)
{
- if (!(obj instanceof ViewContext))
+ if (context == null)
{
- throw new IllegalArgumentException("Tool can only be initialized
with a ViewContext");
+ throw new NullPointerException("velocity context should not be
null");
}
-
- ViewContext viewContext = (ViewContext)obj;
- this.velocityContext = viewContext.getVelocityContext();
- this.request = viewContext.getRequest();
- this.response = viewContext.getResponse();
- this.application = viewContext.getServletContext();
+ this.velocityContext = context;
}
/***************************** View Helpers ******************************/
Modified:
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/struts/ValidatorTool.java
URL:
http://svn.apache.org/viewvc/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/struts/ValidatorTool.java?view=diff&rev=533562&r1=533561&r2=533562
==============================================================================
---
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/struts/ValidatorTool.java
(original)
+++
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/struts/ValidatorTool.java
Sun Apr 29 14:36:38 2007
@@ -26,11 +26,9 @@
import java.util.List;
import java.util.Locale;
import java.util.Map;
-
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
-
import org.apache.commons.validator.Field;
import org.apache.commons.validator.Form;
import org.apache.commons.validator.ValidatorAction;
@@ -46,6 +44,7 @@
import org.apache.velocity.tools.config.DefaultKey;
import org.apache.velocity.tools.config.ValidScope;
import org.apache.velocity.tools.view.ViewContext;
+import org.apache.velocity.tools.view.ViewToolContext;
/**
* <p>View tool that works with Struts Validator to
@@ -160,20 +159,14 @@
* @param obj the current ViewContext
* @throws IllegalArgumentException if the param is not a ViewContext
*/
- public void init(Object obj)
+ public void setup(Map params)
{
- if (!(obj instanceof ViewContext))
- {
- throw new IllegalArgumentException(
- "Tool can only be initialized with a ViewContext");
- }
-
- this.context = (ViewContext)obj;
- this.request = context.getRequest();
+ this.context = (ViewContext)params.get(ViewToolContext.CONTEXT_KEY);
+ this.request = (HttpServletRequest)params.get(ViewContext.REQUEST);
this.session = request.getSession(false);
- this.app = context.getServletContext();
+ this.app = (ServletContext)params.get(ViewContext.SERVLET_CONTEXT_KEY);
- Boolean b = (Boolean)context.getAttribute("XHTML");
+ Boolean b = (Boolean)params.get("XHTML");
if (b != null)
{
this.xhtml = b.booleanValue();
