portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From i...@apache.org
Subject cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/modules/pages JetspeedTemplatePage.java
Date Tue, 03 Apr 2001 15:50:16 GMT
ingo        01/04/03 08:50:16

  Modified:    src/java/org/apache/jetspeed/modules/pages
                        JetspeedTemplatePage.java
  Log:
  [fix] layout/default.jsp problem
  
  Revision  Changes    Path
  1.7       +6 -6      jakarta-jetspeed/src/java/org/apache/jetspeed/modules/pages/JetspeedTemplatePage.java
  
  Index: JetspeedTemplatePage.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/pages/JetspeedTemplatePage.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- JetspeedTemplatePage.java	2001/04/03 12:13:24	1.6
  +++ JetspeedTemplatePage.java	2001/04/03 15:50:15	1.7
  @@ -125,7 +125,7 @@
    *
    * @author <a href="mailto:john.mcnally@clearink.com">John D. McNally</a>
    * @author <a href="mailto:mbryson@mont.mindspring.com">Dave Bryson</a>
  - * @version $Id: JetspeedTemplatePage.java,v 1.6 2001/04/03 12:13:24 ingo Exp $
  + * @version $Id: JetspeedTemplatePage.java,v 1.7 2001/04/03 15:50:15 ingo Exp $
    */
   public class JetspeedTemplatePage extends DefaultPage
   {
  @@ -175,14 +175,14 @@
               Log.note("JetspeedTemplatePage: calculated template = " + template);
           }
   
  -        // Get the layout template and the correct Screen.
  -        String layoutTemplate = TurbineTemplate.getLayoutTemplateName(template);
  -        data.setLayoutTemplate(layoutTemplate);
  -        Log.note("JetspeedTemplatePage: layoutTemplate is finally " + layoutTemplate);
  -        
  +        // Get screen and layout template (first screen then layout!!) and the correct
Screen.
           String screenTemplate = TurbineTemplate.getScreenTemplateName(template);
           Log.note("JetspeedTemplatePage: screenTemplate is finally " + screenTemplate);
           data.setScreenTemplate( screenTemplate );
  +
  +        String layoutTemplate = TurbineTemplate.getLayoutTemplateName(template);
  +        data.setLayoutTemplate(layoutTemplate);
  +        Log.note("JetspeedTemplatePage: layoutTemplate is finally " + layoutTemplate);
   
           if ( !data.hasScreen() )
           {
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org


Mime
View raw message