From 918111b8074e77b96a85dbd96f6541a578abc664 Mon Sep 17 00:00:00 2001
From: "Donald J. Brown" <mrdon@apache.org>
Date: Sat, 12 Apr 2008 12:16:41 +0000
Subject: [PATCH] Fixing javadoc, minor code improvements WW-2589

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@647439 13f79535-47bb-0310-9956-ffa450edef68
---
 .../struts2/validators/DWRValidator.java      | 27 ++++++-------------
 1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/plugins/dwr/src/main/java/org/apache/struts2/validators/DWRValidator.java b/plugins/dwr/src/main/java/org/apache/struts2/validators/DWRValidator.java
index f143b724f..3d62475f8 100644
--- a/plugins/dwr/src/main/java/org/apache/struts2/validators/DWRValidator.java
+++ b/plugins/dwr/src/main/java/org/apache/struts2/validators/DWRValidator.java
@@ -56,12 +56,12 @@ import com.opensymphony.xwork2.util.logging.LoggerFactory;
  * <pre>
  * <!-- START SNIPPET: dwrConfiguration -->
  *
- * &lt;dwr&lt;
- *    &lt;allow&lt;
- *      &lt;create creator="new" javascript="validator" class="org.apache.struts2.validators.DWRValidator"/&lt;
- *      &lt;convert converter="bean" match="com.opensymphony.xwork2.ValidationAwareSupport"/&lt;
- *    &lt;/allow&lt;
- * &lt;/dwr&lt;
+ * &lt;dwr&gt;
+ *    &lt;allow&gt;
+ *      &lt;create creator="new" javascript="validator" class="org.apache.struts2.validators.DWRValidator"/&gt;
+ *      &lt;convert converter="bean" match="com.opensymphony.xwork2.ValidationAwareSupport"/&gt;
+ *    &lt;/allow&gt;
+ * &lt;/dwr&gt;
  *
  * <!-- END SNIPPET: dwrConfiguration -->
  * </pre>
@@ -69,19 +69,6 @@ import com.opensymphony.xwork2.util.logging.LoggerFactory;
 public class DWRValidator {
     private static final Logger LOG = LoggerFactory.getLogger(DWRValidator.class);
     
-    private ActionProxyFactory actionProxyFactory;
-    private ActionMapper actionMapper;
-
-    @Inject
-    public void setActionMapper(ActionMapper actionMapper) {
-        this.actionMapper = actionMapper;
-    }
-
-    @Inject
-    public void setActionProxyFactory(ActionProxyFactory fac) {
-        this.actionProxyFactory = fac;
-    }
-
     public ValidationAwareSupport doPost(String namespace, String action, Map params) throws Exception {
         HttpServletRequest req = WebContextFactory.get().getHttpServletRequest();
         ServletContext servletContext = WebContextFactory.get().getServletContext();
@@ -106,8 +93,10 @@ public class DWRValidator {
                 servletContext);
 
         try {
+            ActionMapper actionMapper = du.getContainer().getInstance(ActionMapper.class);
             ActionMapping mapping = actionMapper.getMappingFromActionName(action);
             ActionInvocation inv = new ValidatorActionInvocation(ctx, true);
+            ActionProxyFactory actionProxyFactory = du.getContainer().getInstance(ActionProxyFactory.class);
             ActionProxy proxy = actionProxyFactory.createActionProxy(inv, namespace, mapping.getName(), mapping.getMethod(), true, true);
             proxy.execute();
             Object a = proxy.getAction();