portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/controls Customize.java
Date Wed, 11 Aug 2004 06:45:42 GMT
taylor      2004/08/10 23:45:42

  Modified:    src/java/org/apache/jetspeed/modules/actions/controls
                        Customize.java
  Log:
  completing support for window state and mode integration for JSR 168 portlets running in
Fusion
  help, edit, min, max, restore
  originating from both j1 actions and j2 links, test keep state in tabs, and combinations
of max + modes
  
  CVS: ----------------------------------------------------------------------
  CVS: PR:
  CVS:   If this change addresses a PR in the problem report tracking
  CVS:   database, then enter the PR number(s) here.
  CVS: Obtained from:
  CVS:   If this change has been taken from another system, such as NCSA,
  CVS:   then name the system in this line, otherwise delete it.
  CVS: Submitted by:
  CVS:   If this code has been contributed to Apache by someone else; i.e.,
  CVS:   they sent us a patch or a new module, then include their name/email
  CVS:   address here. If this is your work then delete this line.
  CVS: Reviewed by:
  CVS:   If we are doing pre-commit code reviews and someone else has
  CVS:   reviewed your changes, include their name(s) here.
  CVS:   If you have not had it reviewed then delete this line.
  
  Revision  Changes    Path
  1.19      +13 -1     jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/controls/Customize.java
  
  Index: Customize.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/controls/Customize.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- Customize.java	23 Feb 2004 02:50:53 -0000	1.18
  +++ Customize.java	11 Aug 2004 06:45:42 -0000	1.19
  @@ -24,7 +24,9 @@
   import org.apache.jetspeed.portal.Portlet;
   import org.apache.jetspeed.portal.PortletSet;
   import org.apache.jetspeed.portal.PortletControl;
  +import org.apache.jetspeed.services.resources.FusionResources;
   import org.apache.jetspeed.services.rundata.JetspeedRunData;
  +import org.apache.jetspeed.om.profile.Entry;
   import org.apache.jetspeed.om.profile.Profile;
   import org.apache.jetspeed.om.profile.ProfileLocator;
   import org.apache.jetspeed.services.logging.JetspeedLogFactoryService;
  @@ -49,6 +51,7 @@
    */
   public class Customize extends Action
   {
  +    private static final String J2_ENTITY = FusionResources.getString(FusionResources.J2_ENTITY);
 
       
       /**
        * Static initialization of the logger for this class
  @@ -70,12 +73,21 @@
           {
               return;
           }
  -
  +        
           // read some parameters
           String editMediaType = jdata.getParameters().getString ("mtype");
           String resetStack = jdata.getParameters().getString ("reset");
           String peid = jdata.getParameters().getString("js_peid");
   
  +        Entry entry = jdata.getProfile().getDocument().getEntryById(peid);
  +        if (entry != null)
  +        {
  +            if (null != entry.getParameter(J2_ENTITY))
  +            {
  +                    return; // JSR 168 portlet, let it handle its own Help Mode
  +            }
  +        }
  +        
           // get the customization state for this page
           SessionState customizationState = jdata.getPageSessionState();
   
  
  
  

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