cvs commit: jakarta-slide/src/taglib/struts/org/apache/slide/taglib/tag/struts StrutsTagUtils.java

[cmlenz]

cmlenz      01/09/21 10:03:44

  Modified:    src/taglib/struts/org/apache/slide/taglib/tag/struts
                        StrutsTagUtils.java
  Log:
  Use the 'namespace' context-parameter if available
  
  Revision  Changes    Path
  1.3       +14 -6     
jakarta-slide/src/taglib/struts/org/apache/slide/taglib/tag/struts/StrutsTagUtils.java
  
  Index: StrutsTagUtils.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/src/taglib/struts/org/apache/slide/taglib/tag/struts/StrutsTagUtils.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- StrutsTagUtils.java       2001/09/21 16:59:02     1.2
  +++ StrutsTagUtils.java       2001/09/21 17:03:44     1.3
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-slide/src/taglib/struts/org/apache/slide/taglib/tag/struts/StrutsTagUtils.java,v
 1.2 2001/09/21 16:59:02 cmlenz Exp $
  - * $Revision: 1.2 $
  - * $Date: 2001/09/21 16:59:02 $
  + * $Header: 
/home/cvs/jakarta-slide/src/taglib/struts/org/apache/slide/taglib/tag/struts/StrutsTagUtils.java,v
 1.3 2001/09/21 17:03:44 cmlenz Exp $
  + * $Revision: 1.3 $
  + * $Date: 2001/09/21 17:03:44 $
    *
    * ====================================================================
    *
  @@ -86,7 +86,7 @@
    * Struts tag library, especially the <code>&lt;logic:iterate&gt;</code> tag.
    * 
    * @author <a href="mailto:[EMAIL PROTECTED]";>Christopher Lenz</a>
  - * @version $Revision: 1.2 $
  + * @version $Revision: 1.3 $
    */
   public class StrutsTagUtils {
       
  @@ -160,10 +160,18 @@
               tag = tag.getParent();
           }
           
  -        // return the default namespace
  +        // not nested in a namespace tag, so return either:
  +        // - the namespace specified as context parameter or
  +        // - the default namespace
           DomainBean domain = findDomain(from, context);
           if (domain != null) {
  -            return domain.getDefaultNamespace();
  +            String namespaceName = 
  +                context.getServletContext().getInitParameter("namespace");
  +            if (namespaceName != null) {
  +                bean = domain.getNamespace(namespaceName);
  +            } else {
  +                bean = domain.getDefaultNamespace();
  +            }
           }
           
           return null;