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 12:13:24 GMT
ingo        01/04/03 05:13:24

  Modified:    src/java/org/apache/jetspeed/modules/pages
                        JetspeedTemplatePage.java
  Log:
  [default.jsp bug] more log statements
  
  Revision  Changes    Path
  1.6       +4 -17     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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- JetspeedTemplatePage.java	2001/03/08 17:11:41	1.5
  +++ JetspeedTemplatePage.java	2001/04/03 12:13:24	1.6
  @@ -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.5 2001/03/08 17:11:41 ingo Exp $
  + * @version $Id: JetspeedTemplatePage.java,v 1.6 2001/04/03 12:13:24 ingo Exp $
    */
   public class JetspeedTemplatePage extends DefaultPage
   {
  @@ -144,16 +144,6 @@
           // is hardcoded into the Screen in this instance.  In this case this
           // action is skipped.
   
  -//<Temporary FIX: new turbine will make it obsolete>        
  -        // Get the locale store it in the user object
  -        Locale tmplocale = LocaleDetector.getLocale(data);
  -        if (tmplocale == null) {
  -            tmplocale = new Locale(
  -                     TurbineResources.getString("locale.default.language", "en"),
  -                     TurbineResources.getString("locale.default.country", "US"));
  -        }
  -       	data.getUser().setTemp("locale", tmplocale);
  -//</Temporary FIX>        
           if ( data.hasScreen() )
               data.setScreenTemplate( "Ecs" );
   
  @@ -187,13 +177,10 @@
   
           // Get the layout template and the correct Screen.
           String layoutTemplate = TurbineTemplate.getLayoutTemplateName(template);
  -        data.getTemplateInfo().setLayoutTemplate(layoutTemplate);
  +        data.setLayoutTemplate(layoutTemplate);
  +        Log.note("JetspeedTemplatePage: layoutTemplate is finally " + layoutTemplate);
           
  -        String screenTemplate = ( (org.apache.jetspeed.services.template.JetspeedTemplateService)
  -                                  TurbineServices.getInstance().
  -                                  getService(org.apache.turbine.services.template.TemplateService.SERVICE_NAME)
)
  -                                .getScreenTemplateName(template);
  -// FIX ME with new TURBINE        String screenTemplate = TurbineTemplate.getScreenTemplateName(template);
  +        String screenTemplate = TurbineTemplate.getScreenTemplateName(template);
           Log.note("JetspeedTemplatePage: screenTemplate is finally " + screenTemplate);
           data.setScreenTemplate( screenTemplate );
   
  
  
  

---------------------------------------------------------------------
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