portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jf...@apache.org
Subject cvs commit: jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/impl PortletAggregatorImpl.java PageAggregatorImpl.java
Date Thu, 02 Sep 2004 17:09:15 GMT
jford       2004/09/02 10:09:15

  Modified:    portal/src/java/org/apache/jetspeed/aggregator/impl
                        PortletAggregatorImpl.java PageAggregatorImpl.java
  Log:
  CSS styles not stored in the request object
  
  PR: JIRA #JS2-89
  
  Revision  Changes    Path
  1.7       +3 -3      jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletAggregatorImpl.java
  
  Index: PortletAggregatorImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletAggregatorImpl.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- PortletAggregatorImpl.java	2 Aug 2004 17:58:05 -0000	1.6
  +++ PortletAggregatorImpl.java	2 Sep 2004 17:09:15 -0000	1.7
  @@ -84,12 +84,12 @@
       private void addStyle(RequestContext context, String decoratorName, String decoratorType)

       {
           log.debug("addStyle: decoratorName=" + decoratorName + ", decoratorType=" + decoratorType
);
  -        Set cssUrls = (Set) context.getSessionAttribute("cssUrls");
  +        Set cssUrls = (Set) context.getAttribute("cssUrls");
   
           if (cssUrls == null)
           {
               cssUrls = new HashSet();
  -            context.setSessionAttribute("cssUrls", cssUrls);
  +            context.setAttribute("cssUrls", cssUrls);
           }
           
           //cssUrls.add("/WEB-INF/decorations/" + decoratorType + "/html/" + decoratorName
+ "/css/styles.css");
  
  
  
  1.12      +3 -3      jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/impl/PageAggregatorImpl.java
  
  Index: PageAggregatorImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/impl/PageAggregatorImpl.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- PageAggregatorImpl.java	6 Aug 2004 19:05:21 -0000	1.11
  +++ PageAggregatorImpl.java	2 Sep 2004 17:09:15 -0000	1.12
  @@ -273,12 +273,12 @@
       
       private void addStyle(RequestContext context, String decoratorName, String decoratorType)

       {
  -        Set cssUrls = (Set) context.getSessionAttribute("cssUrls");
  +        Set cssUrls = (Set) context.getAttribute("cssUrls");
   
           if (cssUrls == null)
           {
               cssUrls = new HashSet();
  -            context.setSessionAttribute("cssUrls", cssUrls);
  +            context.setAttribute("cssUrls", cssUrls);
           }
           
           if(decoratorType.equals(Fragment.LAYOUT))
  
  
  

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