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/modules/actions/controls Maximize.java Restore.java
Date Tue, 07 May 2002 15:16:08 GMT
ggolden     02/05/07 08:16:08

  Modified:    webapp/WEB-INF/templates/vm/screens/html Home.vm
               src/java/org/apache/jetspeed/modules/actions
                        JetspeedSessionValidator.java
               src/java/org/apache/jetspeed/modules/actions/controls
                        Maximize.java Restore.java
  Removed:     webapp/WEB-INF/templates/vm/screens/html Maximize.vm
  Log:
  merged Maximize behavior into Home.vm
  removed Maximize.vm
  Maximize still based on user.getTemp("js_peid") - removed old tmp "portlet" code
  JetspeedSessionValidator no longer is concerned at all with Maximize behavior
  
  Revision  Changes    Path
  1.3       +9 -2      jakarta-jetspeed/webapp/WEB-INF/templates/vm/screens/html/Home.vm
  
  Index: Home.vm
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/screens/html/Home.vm,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Home.vm	22 Jul 2001 20:32:47 -0000	1.2
  +++ Home.vm	7 May 2002 15:16:07 -0000	1.3
  @@ -1,2 +1,9 @@
  -$data.setMode("default")
  -$jetspeed.getPane("default")
  \ No newline at end of file
  +## test for a maximized portlet
  +#if (($data.User) && ($data.User.getTemp("js_peid")))
  +    $data.setMode("maximize")
  +    $jetspeed.getPortletById($data.User.getTemp("js_peid"))
  +## process as a regular page request
  +#else
  +    $data.setMode("default")
  +    $jetspeed.getPane("default")
  +#end
  
  
  
  1.17      +1 -8      jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/JetspeedSessionValidator.java
  
  Index: JetspeedSessionValidator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/JetspeedSessionValidator.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- JetspeedSessionValidator.java	1 Apr 2002 18:05:57 -0000	1.16
  +++ JetspeedSessionValidator.java	7 May 2002 15:16:08 -0000	1.17
  @@ -83,7 +83,7 @@
   @author <a href="mailto:ingo@raleigh.ibm.com">Ingo Schuster</a>
   @author <a href="mailto:raphael@apache.org">RaphaŽl Luta</a>
   @author <a href="mailto:sgala@apache.org">Santiago Gala</a>
  -@version $Id: JetspeedSessionValidator.java,v 1.16 2002/04/01 18:05:57 taylor Exp $
  +@version $Id: JetspeedSessionValidator.java,v 1.17 2002/05/07 15:16:08 ggolden Exp $
   */
   public class JetspeedSessionValidator extends TemplateSessionValidator
   {
  @@ -153,13 +153,6 @@
           }
           
           data.getUser().setTemp("locale", locale);
  -        
  -
  -        String maximizedPortlet = (String)jdata.getUser().getTemp("js_peid");
  -        if (maximizedPortlet != null) {
  -            jdata.setJs_peid(maximizedPortlet);
  -            jdata.setScreenTemplate("Maximize");
  -        }
   
           // if a portlet is referenced in the parameters request, store it
           // in the RunData object
  
  
  
  1.9       +0 -4      jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/controls/Maximize.java
  
  Index: Maximize.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/controls/Maximize.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Maximize.java	22 Mar 2002 18:42:06 -0000	1.8
  +++ Maximize.java	7 May 2002 15:16:08 -0000	1.9
  @@ -105,13 +105,9 @@
                 + rundata.getUser().getName() + ")");
               return;
           }
  -        Portlet portlet = PortletFactory.getPortlet(entry);
   
           //record that this portlet is now maximized
  -        jdata.getUser().setTemp("portlet",portlet.getName());  // FIXME: Remove this as
part of the PEID conversion
           jdata.getUser().setTemp("js_peid",peid);
  -        jdata.setJs_peid(peid);
  -        jdata.setScreenTemplate("Maximize");
   
       }
   }
  
  
  
  1.11      +0 -1      jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/controls/Restore.java
  
  Index: Restore.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/controls/Restore.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Restore.java	22 Mar 2002 18:42:06 -0000	1.10
  +++ Restore.java	7 May 2002 15:16:08 -0000	1.11
  @@ -116,7 +116,6 @@
           }
   
           //remove the maximized portlet name - nothing is maximized now
  -        jdata.getUser().removeTemp("portlet");
           jdata.getUser().removeTemp("js_peid");
   
           jdata.setScreenTemplate("Home");
  
  
  

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