You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@velocity.apache.org by nb...@apache.org on 2003/08/02 22:42:04 UTC

cvs commit: jakarta-velocity-tools/src/java/org/apache/velocity/tools/view/servlet ServletToolboxManager.java

nbubna      2003/08/02 13:42:04

  Modified:    src/java/org/apache/velocity/tools/view/context
                        ViewContext.java
               src/java/org/apache/velocity/tools/view/servlet
                        ServletToolboxManager.java
  Log:
  add support for standard XHTML mode indicator
  
  Revision  Changes    Path
  1.4       +4 -1      jakarta-velocity-tools/src/java/org/apache/velocity/tools/view/context/ViewContext.java
  
  Index: ViewContext.java
  ===================================================================
  RCS file: /home/cvs/jakarta-velocity-tools/src/java/org/apache/velocity/tools/view/context/ViewContext.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ViewContext.java	30 Jul 2003 22:02:30 -0000	1.3
  +++ ViewContext.java	2 Aug 2003 20:42:04 -0000	1.4
  @@ -89,6 +89,9 @@
       /** Key used for the servlet context object. */
       public static final String APPLICATION = "application";
   
  +    /** Key used for XHTML setting (tells tools and macros to output XHTML). */
  +    public static final String XHTML = "XHTML";
  +
   
       /**
        * <p>Returns the instance of {@link HttpServletRequest} for this request.</p>
  
  
  
  1.7       +15 -1     jakarta-velocity-tools/src/java/org/apache/velocity/tools/view/servlet/ServletToolboxManager.java
  
  Index: ServletToolboxManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-velocity-tools/src/java/org/apache/velocity/tools/view/servlet/ServletToolboxManager.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ServletToolboxManager.java	30 Jul 2003 22:04:00 -0000	1.6
  +++ ServletToolboxManager.java	2 Aug 2003 20:42:04 -0000	1.7
  @@ -265,6 +265,20 @@
       }
   
   
  +    /**
  +     * <p>Sets an application attribute to tell velocimacros and tools 
  +     * (especially the LinkTool) whether they should output XHTML or HTML.</p>
  +     *
  +     * @see ViewContext.XHTML
  +     */
  +    public void setXhtml(Boolean value)
  +    {
  +        servletContext.setAttribute(ViewContext.XHTML, value);
  +        Velocity.info("ServletToolboxManager: " + ViewContext.XHTML + 
  +                      " is set to " + value);
  +    }
  +
  +
       // ------------------------------ XMLToolboxManager Overrides -------------
   
       protected RuleSet getRuleSet()