niallp      2004/08/09 19:36:16

  Modified:    src/share/org/apache/struts/tiles TilesUtil.java
                        TilesUtilImpl.java
  Log:
  Bug 30485 - Remove "static" modifier from doInclude() method in TilesUtilImpl
  
  Revision  Changes    Path
  1.13      +4 -4      jakarta-struts/src/share/org/apache/struts/tiles/TilesUtil.java
  
  Index: TilesUtil.java
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/tiles/TilesUtil.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- TilesUtil.java    14 Mar 2004 06:23:43 -0000      1.12
  +++ TilesUtil.java    10 Aug 2004 02:36:15 -0000      1.13
  @@ -134,7 +134,7 @@
        */
       public static void doInclude(String uri, PageContext pageContext)
           throws IOException, ServletException {
  -        TilesUtilImpl.doInclude(uri, pageContext);
  +        tilesUtilImpl.doInclude(uri, pageContext);
       }
   
       /**
  
  
  
  1.9       +4 -4      
jakarta-struts/src/share/org/apache/struts/tiles/TilesUtilImpl.java
  
  Index: TilesUtilImpl.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/tiles/TilesUtilImpl.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- TilesUtilImpl.java        14 Mar 2004 06:23:43 -0000      1.8
  +++ TilesUtilImpl.java        10 Aug 2004 02:36:15 -0000      1.9
  @@ -95,7 +95,7 @@
        * @param uri Uri or Definition name to forward.
        * @param pageContext Current page context.
        */
  -    public static void doInclude(String uri, PageContext pageContext)
  +    public void doInclude(String uri, PageContext pageContext)
           throws IOException, ServletException {
               
           pageContext.include(uri);
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to