portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ggol...@apache.org
Subject cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/services/portletfactory JetspeedPortletFactoryService.java
Date Wed, 15 May 2002 14:54:20 GMT
ggolden     02/05/15 07:54:20

  Modified:    src/java/org/apache/jetspeed/services/portletfactory
                        JetspeedPortletFactoryService.java
  Log:
  update a portlet found in the cache's config and name
  as well as its id and meta data.  This assures that the portlet
  found with a config has that, possibly newly updated config.
  
  Revision  Changes    Path
  1.12      +8 -10     jakarta-jetspeed/src/java/org/apache/jetspeed/services/portletfactory/JetspeedPortletFactoryService.java
  
  Index: JetspeedPortletFactoryService.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/portletfactory/JetspeedPortletFactoryService.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- JetspeedPortletFactoryService.java	15 May 2002 02:46:10 -0000	1.11
  +++ JetspeedPortletFactoryService.java	15 May 2002 14:54:20 -0000	1.12
  @@ -94,7 +94,7 @@
    * Simple implementation of the PortalFactoryService.
    * 
    * @author <a href="mailto:raphael@apache.org">RaphaŽl Luta</a>
  - * @version $Id: JetspeedPortletFactoryService.java,v 1.11 2002/05/15 02:46:10 ggolden
Exp $
  + * @version $Id: JetspeedPortletFactoryService.java,v 1.12 2002/05/15 14:54:20 ggolden
Exp $
    */
   public class JetspeedPortletFactoryService extends TurbineBaseService
       implements PortletFactoryService
  @@ -255,10 +255,13 @@
                    && ( portlet instanceof Cacheable )
                    && (! ((Cacheable)portlet).getExpire().isExpired()) )
               {
  -                // set the new context for this portlet
  -                // the layout contraints will be reset when it gets added to
  -                // a portlet set, based on the PSML markup
  -                PortletConfig conf = portlet.getPortletConfig();
  +                // update the config for the portlet to the current one
  +                // Note: this is what was used to find the cached portlet.
  +                // Note: the init params may have changed in the psml since caching,
  +                //       this will update the portlet to use them.
  +                portlet.setPortletConfig( pc );
  +                portlet.setID( id );
  +                portlet.setName( pc.getName() );
   
                   //FIXME: we now avoid to override metainfo when nothing is set
                   //in the markup, so that cached portlets can keep their metainfo
  @@ -281,11 +284,6 @@
                           portlet.setDescription( meta.getDescription() );
                       }
                   }
  -                    
  -                conf.setPortletSkin( pc.getPortletSkin() );
  -
  -                // make sure the portlet has the id required
  -                portlet.setID( id );
   
                   //FIXME: Notice here we are putting the portlet without wrapper
                   //in the cache, and we must wrap it on return.
  
  
  

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


Mime
View raw message