Revision: 884
          http://stripes.svn.sourceforge.net/stripes/?rev=884&view=rev
Author:   javelotinfo
Date:     2008-04-14 12:19:30 -0700 (Mon, 14 Apr 2008)

Log Message:
-----------
Fix for STS-543

Modified Paths:
--------------
    trunk/stripes/src/net/sourceforge/stripes/tag/InputTagSupport.java

Modified: trunk/stripes/src/net/sourceforge/stripes/tag/InputTagSupport.java
===================================================================
--- trunk/stripes/src/net/sourceforge/stripes/tag/InputTagSupport.java  
2008-04-11 16:43:38 UTC (rev 883)
+++ trunk/stripes/src/net/sourceforge/stripes/tag/InputTagSupport.java  
2008-04-14 19:19:30 UTC (rev 884)
@@ -16,6 +16,7 @@
 
 import net.sourceforge.stripes.action.ActionBean;
 import net.sourceforge.stripes.controller.ParameterName;
+import net.sourceforge.stripes.controller.StripesConstants;
 import net.sourceforge.stripes.controller.StripesFilter;
 import net.sourceforge.stripes.exception.StripesJspException;
 import net.sourceforge.stripes.exception.StripesRuntimeException;
@@ -250,11 +251,20 @@
         try { form = getParentFormTag(); }
         catch (StripesJspException sje) { /* Do nothing. */}
 
-        return LocalizationUtility.getLocalizedFieldName(name,
-                                                         form == null ? null : 
form.getAction(),
-                                                         form == null ? null : 
form.getActionBeanClass(),
-                                                         locale);
+        String actionPath = null;
+        Class<? extends ActionBean> beanClass = null;
 
+        if (form != null) {
+            actionPath = form.getAction();
+            beanClass = form.getActionBeanClass();
+        }
+        else {
+            ActionBean mainBean = (ActionBean) 
getPageContext().getRequest().getAttribute(StripesConstants.REQ_ATTR_ACTION_BEAN);
+            if (mainBean != null) {
+                beanClass = mainBean.getClass();
+            }
+        }
+        return LocalizationUtility.getLocalizedFieldName(name, actionPath, 
beanClass, locale);
     }
     
     protected ValidationMetadata getValidationMetadata() throws 
StripesJspException {


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference 
Don't miss this year's exciting event. There's still time to save $100. 
Use priority code J8TL2D2. 
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
Stripes-development mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/stripes-development

Reply via email to